From e6d396fa51d20aa71197ed369b7a74731854f52e Mon Sep 17 00:00:00 2001
From: Mushegh98 <musheghsahakyan98@gmail.com>
Date: Thu, 21 May 2020 19:51:59 +0400
Subject: [PATCH] Changes UI Login Activity removed start new Bubble views and
 add dependency for View Model.

---
 build.gradle                                  |  1 +
 ui/build.gradle                               |  1 +
 .../android/activity/LoginActivity.java       |  4 --
 ui/src/main/res/layout/activity_login.xml     | 49 +++++--------------
 4 files changed, 14 insertions(+), 41 deletions(-)

diff --git a/build.gradle b/build.gradle
index 21acb97..6e60a78 100644
--- a/build.gradle
+++ b/build.gradle
@@ -37,6 +37,7 @@ buildscript {
         appcompatVersion = '1.1.0'
         constraintlayoutVersion = '1.1.3'
         lifecycleExtensionVersion = '2.2.0'
+        lifecycleViewModelVersion = '2.2.0'
 
         groupName = 'com.wireguard.android'
     }
diff --git a/ui/build.gradle b/ui/build.gradle
index b2c3047..9a32801 100644
--- a/ui/build.gradle
+++ b/ui/build.gradle
@@ -91,6 +91,7 @@ dependencies {
     implementation "androidx.constraintlayout:constraintlayout:$constraintlayoutVersion"
 
     implementation "androidx.lifecycle:lifecycle-extensions:$lifecycleExtensionVersion"
+    implementation "androidx.lifecycle:lifecycle-viewmodel:$lifecycleViewModelVersion"
 }
 
 tasks.withType(JavaCompile) {
diff --git a/ui/src/main/java/com/wireguard/android/activity/LoginActivity.java b/ui/src/main/java/com/wireguard/android/activity/LoginActivity.java
index bb46cda..53f84e2 100644
--- a/ui/src/main/java/com/wireguard/android/activity/LoginActivity.java
+++ b/ui/src/main/java/com/wireguard/android/activity/LoginActivity.java
@@ -25,12 +25,10 @@ public class LoginActivity extends AppCompatActivity {
     private TextView bubbleNameTitle;
     private TextView userNameTitle;
     private TextView passwordTitle;
-    private TextView question;
     private EditText bubbleName;
     private EditText userName;
     private EditText password;
     private Button sign;
-    private Button startNewBubble;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -71,11 +69,9 @@ public class LoginActivity extends AppCompatActivity {
         bubbleNameTitle = findViewById(R.id.bubbleNameTitle);
         userNameTitle = findViewById(R.id.userNameTitle);
         passwordTitle = findViewById(R.id.passwordTitle);
-        question = findViewById(R.id.question);
         bubbleName = findViewById(R.id.bubbleName);
         userName = findViewById(R.id.userName);
         password = findViewById(R.id.password);
         sign = findViewById(R.id.signButton);
-        startNewBubble = findViewById(R.id.startNewBubbleButton);
     }
 }
diff --git a/ui/src/main/res/layout/activity_login.xml b/ui/src/main/res/layout/activity_login.xml
index 96979ae..d1a33f2 100644
--- a/ui/src/main/res/layout/activity_login.xml
+++ b/ui/src/main/res/layout/activity_login.xml
@@ -16,12 +16,12 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintVertical_bias="0.119" />
+        app:layout_constraintVertical_bias="0.105" />
 
     <EditText
         android:id="@+id/bubbleName"
-        android:layout_width="88dp"
-        android:layout_height="30dp"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
         android:textSize="18sp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
@@ -43,8 +43,8 @@
 
     <EditText
         android:id="@+id/userName"
-        android:layout_width="88dp"
-        android:layout_height="30dp"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
         android:textSize="18sp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
@@ -63,56 +63,31 @@
         app:layout_constraintHorizontal_bias="0.472"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintVertical_bias="0.334" />
+        app:layout_constraintVertical_bias="0.363" />
 
     <EditText
         android:id="@+id/password"
-        android:layout_width="88dp"
-        android:layout_height="30dp"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
         android:inputType="textPassword"
         android:textSize="18sp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.504"
+        app:layout_constraintHorizontal_bias="0.51"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintVertical_bias="0.389" />
+        app:layout_constraintVertical_bias="0.435" />
 
     <Button
-        android:background="@color/secondary_color"
         android:id="@+id/signButton"
         android:layout_width="95dp"
         android:layout_height="49dp"
-        android:layout_marginBottom="356dp"
+        android:layout_marginBottom="272dp"
+        android:background="@color/secondary_color"
         android:text="@string/sign_in"
         android:textSize="15sp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.515"
         app:layout_constraintStart_toStartOf="parent" />
 
-    <TextView
-        android:id="@+id/question"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/don_t_have_a_bubble"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.582"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintVertical_bias="0.571" />
-
-    <Button
-        android:id="@+id/startNewBubbleButton"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/start_new_bubble"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.504"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintVertical_bias="0.658" />
-
 </androidx.constraintlayout.widget.ConstraintLayout>