From c48a486b1f8faf3993fe2759960fd210bb7636ed Mon Sep 17 00:00:00 2001
From: Shashidhara Gopal <shashidhara.gopal@navi.com>
Date: Mon, 4 Nov 2019 14:31:25 +0530
Subject: [PATCH 01/17] Enable data binding, update dependencies and add
 kotlin-kapt plugin

---
 app/build.gradle                              | 14 +++++++++----
 .../android_customer_app/login/Login.kt       |  2 ++
 .../login/LoginActivity.kt                    | 21 +++++++++++++++++++
 .../login/LoginViewModel.kt                   | 16 ++++++++++++++
 app/src/main/res/layout/activity_login.xml    |  6 ++++++
 5 files changed, 55 insertions(+), 4 deletions(-)
 create mode 100644 app/src/main/java/com/navi/medici/android_customer_app/login/Login.kt
 create mode 100644 app/src/main/java/com/navi/medici/android_customer_app/login/LoginActivity.kt
 create mode 100644 app/src/main/java/com/navi/medici/android_customer_app/login/LoginViewModel.kt
 create mode 100644 app/src/main/res/layout/activity_login.xml

diff --git a/app/build.gradle b/app/build.gradle
index 389b8564c1..942889cd22 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -4,6 +4,8 @@ apply plugin: 'kotlin-android'
 
 apply plugin: 'kotlin-android-extensions'
 
+apply plugin: 'kotlin-kapt'
+
 android {
     compileSdkVersion 29
     buildToolsVersion "29.0.2"
@@ -21,15 +23,19 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
+    dataBinding {
+        enabled true
+    }
 }
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-    implementation 'androidx.appcompat:appcompat:1.0.2'
-    implementation 'androidx.core:core-ktx:1.0.2'
+    implementation 'androidx.appcompat:appcompat:1.1.0'
+    implementation 'androidx.core:core-ktx:1.1.0'
     implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
     testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.0'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.1'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
+    implementation 'androidx.lifecycle:lifecycle-extensions:2.1.0'
 }
diff --git a/app/src/main/java/com/navi/medici/android_customer_app/login/Login.kt b/app/src/main/java/com/navi/medici/android_customer_app/login/Login.kt
new file mode 100644
index 0000000000..de5868c11d
--- /dev/null
+++ b/app/src/main/java/com/navi/medici/android_customer_app/login/Login.kt
@@ -0,0 +1,2 @@
+package com.navi.medici.android_customer_app.login
+
diff --git a/app/src/main/java/com/navi/medici/android_customer_app/login/LoginActivity.kt b/app/src/main/java/com/navi/medici/android_customer_app/login/LoginActivity.kt
new file mode 100644
index 0000000000..7d988d08e4
--- /dev/null
+++ b/app/src/main/java/com/navi/medici/android_customer_app/login/LoginActivity.kt
@@ -0,0 +1,21 @@
+package com.navi.medici.android_customer_app.activities
+
+import android.os.Bundle
+import androidx.appcompat.app.AppCompatActivity
+import androidx.core.widget.addTextChangedListener
+import androidx.lifecycle.ViewModelProviders
+import com.navi.medici.android_customer_app.R
+import com.navi.medici.android_customer_app.view_models.LoginViewModel
+import kotlinx.android.synthetic.main.activity_login.*
+
+class LoginActivity : AppCompatActivity() {
+    private lateinit var loginViewModel: LoginViewModel
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_login)
+
+        loginViewModel = ViewModelProviders.of(this).get(LoginViewModel::class.java)
+        edit_phone.addTextChangedListener { loginViewModel.onChangePhoneNumber(it.toString()) }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/navi/medici/android_customer_app/login/LoginViewModel.kt b/app/src/main/java/com/navi/medici/android_customer_app/login/LoginViewModel.kt
new file mode 100644
index 0000000000..cd0faf3d04
--- /dev/null
+++ b/app/src/main/java/com/navi/medici/android_customer_app/login/LoginViewModel.kt
@@ -0,0 +1,16 @@
+package com.navi.medici.android_customer_app.view_models
+
+import androidx.lifecycle.ViewModel
+
+class LoginViewModel : ViewModel() {
+    private var phoneNumber = String()
+
+    fun onChangePhoneNumber(phoneNumber: String) {
+        this.phoneNumber = phoneNumber
+        if (isValidPhoneNumber()) {
+
+        }
+    }
+
+    private fun isValidPhoneNumber(): Boolean = phoneNumber.length == 10
+}
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
new file mode 100644
index 0000000000..61a4490a43
--- /dev/null
+++ b/app/src/main/res/layout/activity_login.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout
+    xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file

From 7201fedc7b941e0e61044d32372110e6f3321056 Mon Sep 17 00:00:00 2001
From: Shashidhara Gopal <shashidhara.gopal@navi.com>
Date: Mon, 4 Nov 2019 14:33:25 +0530
Subject: [PATCH 02/17] Remove action bar

---
 app/src/main/res/values/styles.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 5885930df6..0eb88fe335 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -1,7 +1,7 @@
 <resources>
 
     <!-- Base application theme. -->
-    <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
+    <style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
         <!-- Customize your theme here. -->
         <item name="colorPrimary">@color/colorPrimary</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>

From fe7fa9105c8fb8c2f8563cfc7c1ebabcef3e81de Mon Sep 17 00:00:00 2001
From: Shashidhara Gopal <shashidhara.gopal@navi.com>
Date: Mon, 4 Nov 2019 14:33:41 +0530
Subject: [PATCH 03/17] Update app name

---
 app/src/main/res/values/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index a68bce1b16..011a1f4396 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,3 +1,3 @@
 <resources>
-    <string name="app_name">android-customer-app</string>
+    <string name="app_name">navi</string>
 </resources>

From 268114e2289751e55e3b82c0dca6786b878cda00 Mon Sep 17 00:00:00 2001
From: Shashidhara Gopal <shashidhara.gopal@navi.com>
Date: Mon, 4 Nov 2019 14:36:02 +0530
Subject: [PATCH 04/17] Add layout for login activity

---
 app/src/main/res/layout/activity_login.xml | 95 +++++++++++++++++++++-
 1 file changed, 91 insertions(+), 4 deletions(-)

diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
index 61a4490a43..e7f32d1cce 100644
--- a/app/src/main/res/layout/activity_login.xml
+++ b/app/src/main/res/layout/activity_login.xml
@@ -1,6 +1,93 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout
-    xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent"
-    android:layout_height="match_parent">
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
 
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+    <data>
+
+        <variable
+            name="countryCode"
+            type="String" />
+
+        <variable
+            name="phoneLabel"
+            type="String" />
+
+        <variable
+            name="createNewAccount"
+            type="String" />
+
+        <variable
+            name="termsAndConditions"
+            type="String" />
+
+    </data>
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <TextView
+            android:id="@+id/country_code_text"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="32dp"
+            android:text="@{countryCode}"
+            android:textSize="18sp"
+            app:layout_constraintBottom_toBottomOf="@+id/phone_edit"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="@+id/phone_edit" />
+
+        <EditText
+            android:id="@+id/phone_edit"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="16dp"
+            android:layout_marginEnd="32dp"
+            android:backgroundTint="@android:color/darker_gray"
+            android:ems="10"
+            android:importantForAutofill="no"
+            android:inputType="phone"
+            android:maxLength="10"
+            android:textColorHighlight="@android:color/darker_gray"
+            android:textColorLink="@android:color/darker_gray"
+            android:textSize="18sp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toEndOf="@+id/country_code_text"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <TextView
+            android:id="@+id/phone_label_text"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="32dp"
+            android:layout_marginBottom="40dp"
+            android:text="@{phoneLabel}"
+            android:textSize="24sp"
+            app:layout_constraintBottom_toTopOf="@+id/phone_edit"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toEndOf="@+id/country_code_text" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="56dp"
+            android:text="@{createNewAccount}"
+            android:textSize="24sp"
+            android:textStyle="bold"
+            app:layout_constraintBottom_toTopOf="@+id/phone_label_text"
+            app:layout_constraintStart_toStartOf="@+id/phone_label_text" />
+
+        <TextView
+            android:id="@+id/terms_conditions_text"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="80dp"
+            android:layout_marginEnd="32dp"
+            android:text="@{termsAndConditions}"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toEndOf="@+id/country_code_text"
+            app:layout_constraintTop_toBottomOf="@+id/phone_edit" />
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</layout>
\ No newline at end of file

From 1e40a18827e16f8e270124200b52bf972565949e Mon Sep 17 00:00:00 2001
From: Shashidhara Gopal <shashidhara.gopal@navi.com>
Date: Mon, 4 Nov 2019 14:36:32 +0530
Subject: [PATCH 05/17] Add login data class

---
 .../java/com/navi/medici/android_customer_app/login/Login.kt   | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/src/main/java/com/navi/medici/android_customer_app/login/Login.kt b/app/src/main/java/com/navi/medici/android_customer_app/login/Login.kt
index de5868c11d..db9d962300 100644
--- a/app/src/main/java/com/navi/medici/android_customer_app/login/Login.kt
+++ b/app/src/main/java/com/navi/medici/android_customer_app/login/Login.kt
@@ -1,2 +1,5 @@
 package com.navi.medici.android_customer_app.login
 
+data class Login(var phoneNumber: String) {
+    fun isValidPhoneNumber(): Boolean = phoneNumber.length == 10
+}
\ No newline at end of file

From 62f31be12e1a9ea7375f6b4b707bf74e851745b5 Mon Sep 17 00:00:00 2001
From: Shashidhara Gopal <shashidhara.gopal@navi.com>
Date: Mon, 4 Nov 2019 14:37:31 +0530
Subject: [PATCH 06/17] Add login view model

---
 .../android_customer_app/login/LoginViewModel.kt      | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/com/navi/medici/android_customer_app/login/LoginViewModel.kt b/app/src/main/java/com/navi/medici/android_customer_app/login/LoginViewModel.kt
index cd0faf3d04..2156a2f3ee 100644
--- a/app/src/main/java/com/navi/medici/android_customer_app/login/LoginViewModel.kt
+++ b/app/src/main/java/com/navi/medici/android_customer_app/login/LoginViewModel.kt
@@ -1,16 +1,13 @@
-package com.navi.medici.android_customer_app.view_models
+package com.navi.medici.android_customer_app.login
 
 import androidx.lifecycle.ViewModel
 
 class LoginViewModel : ViewModel() {
-    private var phoneNumber = String()
+    private val login = Login("")
 
     fun onChangePhoneNumber(phoneNumber: String) {
-        this.phoneNumber = phoneNumber
-        if (isValidPhoneNumber()) {
-
+        login.phoneNumber = phoneNumber
+        if (login.isValidPhoneNumber()) {
         }
     }
-
-    private fun isValidPhoneNumber(): Boolean = phoneNumber.length == 10
 }
\ No newline at end of file

From 9dfd88d1efa81836ed3c84dd6d5df9a6321ec36a Mon Sep 17 00:00:00 2001
From: Shashidhara Gopal <shashidhara.gopal@navi.com>
Date: Mon, 4 Nov 2019 14:37:54 +0530
Subject: [PATCH 07/17] Add login activity

---
 app/src/main/AndroidManifest.xml              |  2 +-
 .../login/LoginActivity.kt                    | 19 +++++++++++++------
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index b89ddd7bb1..886a183adb 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -9,7 +9,7 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
-        <activity android:name=".MainActivity">
+        <activity android:name=".login.LoginActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
diff --git a/app/src/main/java/com/navi/medici/android_customer_app/login/LoginActivity.kt b/app/src/main/java/com/navi/medici/android_customer_app/login/LoginActivity.kt
index 7d988d08e4..45335b0053 100644
--- a/app/src/main/java/com/navi/medici/android_customer_app/login/LoginActivity.kt
+++ b/app/src/main/java/com/navi/medici/android_customer_app/login/LoginActivity.kt
@@ -1,21 +1,28 @@
-package com.navi.medici.android_customer_app.activities
+package com.navi.medici.android_customer_app.login
 
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.widget.addTextChangedListener
+import androidx.databinding.DataBindingUtil
 import androidx.lifecycle.ViewModelProviders
 import com.navi.medici.android_customer_app.R
-import com.navi.medici.android_customer_app.view_models.LoginViewModel
-import kotlinx.android.synthetic.main.activity_login.*
+import com.navi.medici.android_customer_app.databinding.ActivityLoginBinding
 
 class LoginActivity : AppCompatActivity() {
     private lateinit var loginViewModel: LoginViewModel
+    private lateinit var binding: ActivityLoginBinding
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        setContentView(R.layout.activity_login)
-
         loginViewModel = ViewModelProviders.of(this).get(LoginViewModel::class.java)
-        edit_phone.addTextChangedListener { loginViewModel.onChangePhoneNumber(it.toString()) }
+        binding = DataBindingUtil.setContentView(this, R.layout.activity_login)
+
+        binding.createNewAccount = "Create New Account"
+        binding.phoneLabel = "Enter your mobile number to register with Navi"
+        binding.countryCode = "+91"
+        binding.termsAndConditions =
+            "By proceeding, you agree to our Terms & Conditions & Privacy Policy. Standard operator charges may apply for sms."
+
+        binding.phoneEdit.addTextChangedListener { loginViewModel.onChangePhoneNumber(it.toString()) }
     }
 }
\ No newline at end of file

From ad719a66d1fa967acf9c0e841f01afee3c8b6ed3 Mon Sep 17 00:00:00 2001
From: Shashidhara Gopal <shashidhara.gopal@navi.com>
Date: Mon, 4 Nov 2019 16:41:28 +0530
Subject: [PATCH 08/17] Add retrofit

---
 app/build.gradle                                              | 4 ++++
 .../navi/medici/android_customer_app/login/LoginApiService.kt | 2 ++
 .../navi/medici/android_customer_app/login/LoginRepository.kt | 2 ++
 3 files changed, 8 insertions(+)
 create mode 100644 app/src/main/java/com/navi/medici/android_customer_app/login/LoginApiService.kt
 create mode 100644 app/src/main/java/com/navi/medici/android_customer_app/login/LoginRepository.kt

diff --git a/app/build.gradle b/app/build.gradle
index 942889cd22..2d3b234876 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -6,6 +6,8 @@ apply plugin: 'kotlin-android-extensions'
 
 apply plugin: 'kotlin-kapt'
 
+def version_retrofit = '2.6.2'
+
 android {
     compileSdkVersion 29
     buildToolsVersion "29.0.2"
@@ -34,6 +36,8 @@ dependencies {
     implementation 'androidx.appcompat:appcompat:1.1.0'
     implementation 'androidx.core:core-ktx:1.1.0'
     implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
+    implementation "com.squareup.retrofit2:retrofit:$version_retrofit"
+    implementation "com.squareup.retrofit2:converter-scalars:$version_retrofit"
     testImplementation 'junit:junit:4.12'
     androidTestImplementation 'androidx.test.ext:junit:1.1.1'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
diff --git a/app/src/main/java/com/navi/medici/android_customer_app/login/LoginApiService.kt b/app/src/main/java/com/navi/medici/android_customer_app/login/LoginApiService.kt
new file mode 100644
index 0000000000..de5868c11d
--- /dev/null
+++ b/app/src/main/java/com/navi/medici/android_customer_app/login/LoginApiService.kt
@@ -0,0 +1,2 @@
+package com.navi.medici.android_customer_app.login
+
diff --git a/app/src/main/java/com/navi/medici/android_customer_app/login/LoginRepository.kt b/app/src/main/java/com/navi/medici/android_customer_app/login/LoginRepository.kt
new file mode 100644
index 0000000000..de5868c11d
--- /dev/null
+++ b/app/src/main/java/com/navi/medici/android_customer_app/login/LoginRepository.kt
@@ -0,0 +1,2 @@
+package com.navi.medici.android_customer_app.login
+

From 29812f0c7aee93dd768b6a014a0ee8563b52ebb1 Mon Sep 17 00:00:00 2001
From: Shashidhara Gopal <shashidhara.gopal@navi.com>
Date: Mon, 4 Nov 2019 16:42:09 +0530
Subject: [PATCH 09/17] Request internet permission

---
 app/src/main/AndroidManifest.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 886a183adb..ea793b5a59 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -2,6 +2,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.navi.medici.android_customer_app">
 
+    <uses-permission android:name="android.permission.INTERNET" />
+
     <application
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"

From a028c554dee3403f80ab8562192edec9414fbc84 Mon Sep 17 00:00:00 2001
From: Shashidhara Gopal <shashidhara.gopal@navi.com>
Date: Mon, 4 Nov 2019 16:43:43 +0530
Subject: [PATCH 10/17] Add login api service and move phone number validation
 to view model

---
 .../android_customer_app/login/Login.kt       |  4 +---
 .../login/LoginApiService.kt                  | 22 +++++++++++++++++++
 .../login/LoginRepository.kt                  |  2 ++
 .../login/LoginViewModel.kt                   |  4 +++-
 4 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/com/navi/medici/android_customer_app/login/Login.kt b/app/src/main/java/com/navi/medici/android_customer_app/login/Login.kt
index db9d962300..72d57e2be1 100644
--- a/app/src/main/java/com/navi/medici/android_customer_app/login/Login.kt
+++ b/app/src/main/java/com/navi/medici/android_customer_app/login/Login.kt
@@ -1,5 +1,3 @@
 package com.navi.medici.android_customer_app.login
 
-data class Login(var phoneNumber: String) {
-    fun isValidPhoneNumber(): Boolean = phoneNumber.length == 10
-}
\ No newline at end of file
+data class Login(var phoneNumber: String)
\ No newline at end of file
diff --git a/app/src/main/java/com/navi/medici/android_customer_app/login/LoginApiService.kt b/app/src/main/java/com/navi/medici/android_customer_app/login/LoginApiService.kt
index de5868c11d..66288bff94 100644
--- a/app/src/main/java/com/navi/medici/android_customer_app/login/LoginApiService.kt
+++ b/app/src/main/java/com/navi/medici/android_customer_app/login/LoginApiService.kt
@@ -1,2 +1,24 @@
 package com.navi.medici.android_customer_app.login
 
+import android.util.Log
+import retrofit2.Retrofit
+import retrofit2.converter.scalars.ScalarsConverterFactory
+import retrofit2.http.POST
+
+private const val BASE_URL = "https://jsonplaceholder.typicode.com"
+
+private val retrofit = Retrofit.Builder()
+    .addConverterFactory(ScalarsConverterFactory.create())
+    .baseUrl(BASE_URL)
+    .build()
+
+interface LoginApiService {
+    @POST("posts")
+    fun submitPhoneNumber(phoneNumber: String) {
+        Log.i("post body", phoneNumber)
+    }
+}
+
+object Retrofit {
+    val loginApi: LoginApiService by lazy { retrofit.create(LoginApiService::class.java) }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/navi/medici/android_customer_app/login/LoginRepository.kt b/app/src/main/java/com/navi/medici/android_customer_app/login/LoginRepository.kt
index de5868c11d..3114e4f697 100644
--- a/app/src/main/java/com/navi/medici/android_customer_app/login/LoginRepository.kt
+++ b/app/src/main/java/com/navi/medici/android_customer_app/login/LoginRepository.kt
@@ -1,2 +1,4 @@
 package com.navi.medici.android_customer_app.login
 
+class LoginRepository {
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/navi/medici/android_customer_app/login/LoginViewModel.kt b/app/src/main/java/com/navi/medici/android_customer_app/login/LoginViewModel.kt
index 2156a2f3ee..8131cd799f 100644
--- a/app/src/main/java/com/navi/medici/android_customer_app/login/LoginViewModel.kt
+++ b/app/src/main/java/com/navi/medici/android_customer_app/login/LoginViewModel.kt
@@ -7,7 +7,9 @@ class LoginViewModel : ViewModel() {
 
     fun onChangePhoneNumber(phoneNumber: String) {
         login.phoneNumber = phoneNumber
-        if (login.isValidPhoneNumber()) {
+        if (isValidPhoneNumber(phoneNumber)) {
         }
     }
+
+    private fun isValidPhoneNumber(phoneNumber: String): Boolean = phoneNumber.length == 10
 }
\ No newline at end of file

From 59d9e68b82be5aa62f74290253fbe40de550839b Mon Sep 17 00:00:00 2001
From: Shashidhara Gopal <shashidhara.gopal@navi.com>
Date: Mon, 4 Nov 2019 19:42:58 +0530
Subject: [PATCH 11/17] Add coroutines and gson

---
 app/build.gradle                              |  5 +++-
 .../android_customer_app/MainActivity.kt      | 12 ---------
 .../android_customer_app/SafeApiRequest.kt    | 17 +++++++++++++
 .../android_customer_app/login/Login.kt       |  3 ---
 .../android_customer_app/login/LoginApi.kt    | 25 +++++++++++++++++++
 .../login/LoginApiService.kt                  | 24 ------------------
 .../login/LoginResponse.kt                    |  8 ++++++
 7 files changed, 54 insertions(+), 40 deletions(-)
 delete mode 100644 app/src/main/java/com/navi/medici/android_customer_app/MainActivity.kt
 create mode 100644 app/src/main/java/com/navi/medici/android_customer_app/SafeApiRequest.kt
 delete mode 100644 app/src/main/java/com/navi/medici/android_customer_app/login/Login.kt
 create mode 100644 app/src/main/java/com/navi/medici/android_customer_app/login/LoginApi.kt
 delete mode 100644 app/src/main/java/com/navi/medici/android_customer_app/login/LoginApiService.kt
 create mode 100644 app/src/main/java/com/navi/medici/android_customer_app/login/LoginResponse.kt

diff --git a/app/build.gradle b/app/build.gradle
index 2d3b234876..11157863ac 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -7,6 +7,7 @@ apply plugin: 'kotlin-android-extensions'
 apply plugin: 'kotlin-kapt'
 
 def version_retrofit = '2.6.2'
+def version_kotlin_coroutines = '1.3.2'
 
 android {
     compileSdkVersion 29
@@ -37,7 +38,9 @@ dependencies {
     implementation 'androidx.core:core-ktx:1.1.0'
     implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
     implementation "com.squareup.retrofit2:retrofit:$version_retrofit"
-    implementation "com.squareup.retrofit2:converter-scalars:$version_retrofit"
+    implementation "com.squareup.retrofit2:converter-gson:$version_retrofit"
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$version_kotlin_coroutines"
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$version_kotlin_coroutines"
     testImplementation 'junit:junit:4.12'
     androidTestImplementation 'androidx.test.ext:junit:1.1.1'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
diff --git a/app/src/main/java/com/navi/medici/android_customer_app/MainActivity.kt b/app/src/main/java/com/navi/medici/android_customer_app/MainActivity.kt
deleted file mode 100644
index 8b6d59514b..0000000000
--- a/app/src/main/java/com/navi/medici/android_customer_app/MainActivity.kt
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.navi.medici.android_customer_app
-
-import androidx.appcompat.app.AppCompatActivity
-import android.os.Bundle
-
-class MainActivity : AppCompatActivity() {
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        setContentView(R.layout.activity_main)
-    }
-}
diff --git a/app/src/main/java/com/navi/medici/android_customer_app/SafeApiRequest.kt b/app/src/main/java/com/navi/medici/android_customer_app/SafeApiRequest.kt
new file mode 100644
index 0000000000..b3794ed36c
--- /dev/null
+++ b/app/src/main/java/com/navi/medici/android_customer_app/SafeApiRequest.kt
@@ -0,0 +1,17 @@
+package com.navi.medici.android_customer_app.login
+
+import retrofit2.Response
+import java.io.IOException
+
+abstract class SafeApiRequest {
+    suspend fun <T : Any> apiRequest(call: suspend () -> Response<T>): T {
+        val response = call.invoke()
+        if (response.isSuccessful) {
+            return response.body()!!
+        } else {
+            throw ApiException(response.code().toString())
+        }
+    }
+}
+
+class ApiException(message: String) : IOException(message)
\ No newline at end of file
diff --git a/app/src/main/java/com/navi/medici/android_customer_app/login/Login.kt b/app/src/main/java/com/navi/medici/android_customer_app/login/Login.kt
deleted file mode 100644
index 72d57e2be1..0000000000
--- a/app/src/main/java/com/navi/medici/android_customer_app/login/Login.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package com.navi.medici.android_customer_app.login
-
-data class Login(var phoneNumber: String)
\ No newline at end of file
diff --git a/app/src/main/java/com/navi/medici/android_customer_app/login/LoginApi.kt b/app/src/main/java/com/navi/medici/android_customer_app/login/LoginApi.kt
new file mode 100644
index 0000000000..cfb30aa4cd
--- /dev/null
+++ b/app/src/main/java/com/navi/medici/android_customer_app/login/LoginApi.kt
@@ -0,0 +1,25 @@
+package com.navi.medici.android_customer_app.login
+
+import retrofit2.Response
+import retrofit2.Retrofit
+import retrofit2.converter.gson.GsonConverterFactory
+import retrofit2.http.POST
+
+private const val BASE_URL = "https://jsonplaceholder.typicode.com/"
+
+private val retrofit = Retrofit
+    .Builder()
+    .addConverterFactory(GsonConverterFactory.create())
+    .baseUrl(BASE_URL)
+    .build()
+
+interface LoginApiService {
+    @POST("posts")
+    suspend fun submitPhoneNumber(phoneNumber: String): Response<LoginResponse>
+
+    companion object {
+        operator fun invoke(): LoginApiService {
+            return retrofit.create(LoginApiService::class.java)
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/navi/medici/android_customer_app/login/LoginApiService.kt b/app/src/main/java/com/navi/medici/android_customer_app/login/LoginApiService.kt
deleted file mode 100644
index 66288bff94..0000000000
--- a/app/src/main/java/com/navi/medici/android_customer_app/login/LoginApiService.kt
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.navi.medici.android_customer_app.login
-
-import android.util.Log
-import retrofit2.Retrofit
-import retrofit2.converter.scalars.ScalarsConverterFactory
-import retrofit2.http.POST
-
-private const val BASE_URL = "https://jsonplaceholder.typicode.com"
-
-private val retrofit = Retrofit.Builder()
-    .addConverterFactory(ScalarsConverterFactory.create())
-    .baseUrl(BASE_URL)
-    .build()
-
-interface LoginApiService {
-    @POST("posts")
-    fun submitPhoneNumber(phoneNumber: String) {
-        Log.i("post body", phoneNumber)
-    }
-}
-
-object Retrofit {
-    val loginApi: LoginApiService by lazy { retrofit.create(LoginApiService::class.java) }
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/navi/medici/android_customer_app/login/LoginResponse.kt b/app/src/main/java/com/navi/medici/android_customer_app/login/LoginResponse.kt
new file mode 100644
index 0000000000..442d80c17f
--- /dev/null
+++ b/app/src/main/java/com/navi/medici/android_customer_app/login/LoginResponse.kt
@@ -0,0 +1,8 @@
+package com.navi.medici.android_customer_app.login
+
+data class Login(
+    val id: Int,
+    val title: String,
+    val body: String,
+    val userId: Int
+)
\ No newline at end of file

From bafa88f8f94945b8f7a02abbd87234924886089d Mon Sep 17 00:00:00 2001
From: Shashidhara Gopal <shashidhara.gopal@navi.com>
Date: Mon, 4 Nov 2019 19:46:19 +0530
Subject: [PATCH 12/17] Add login repository and use coroutines to post phone
 number

---
 .../android_customer_app/SafeApiRequest.kt    |  2 +-
 .../android_customer_app/login/LoginApi.kt    | 12 +++++-----
 .../login/LoginRepository.kt                  |  5 ++++-
 .../login/LoginResponse.kt                    |  2 +-
 .../login/LoginViewModel.kt                   | 22 +++++++++++++++----
 5 files changed, 30 insertions(+), 13 deletions(-)

diff --git a/app/src/main/java/com/navi/medici/android_customer_app/SafeApiRequest.kt b/app/src/main/java/com/navi/medici/android_customer_app/SafeApiRequest.kt
index b3794ed36c..4401242b3e 100644
--- a/app/src/main/java/com/navi/medici/android_customer_app/SafeApiRequest.kt
+++ b/app/src/main/java/com/navi/medici/android_customer_app/SafeApiRequest.kt
@@ -1,4 +1,4 @@
-package com.navi.medici.android_customer_app.login
+package com.navi.medici.android_customer_app
 
 import retrofit2.Response
 import java.io.IOException
diff --git a/app/src/main/java/com/navi/medici/android_customer_app/login/LoginApi.kt b/app/src/main/java/com/navi/medici/android_customer_app/login/LoginApi.kt
index cfb30aa4cd..662063b552 100644
--- a/app/src/main/java/com/navi/medici/android_customer_app/login/LoginApi.kt
+++ b/app/src/main/java/com/navi/medici/android_customer_app/login/LoginApi.kt
@@ -3,7 +3,7 @@ package com.navi.medici.android_customer_app.login
 import retrofit2.Response
 import retrofit2.Retrofit
 import retrofit2.converter.gson.GsonConverterFactory
-import retrofit2.http.POST
+import retrofit2.http.GET
 
 private const val BASE_URL = "https://jsonplaceholder.typicode.com/"
 
@@ -13,13 +13,13 @@ private val retrofit = Retrofit
     .baseUrl(BASE_URL)
     .build()
 
-interface LoginApiService {
-    @POST("posts")
-    suspend fun submitPhoneNumber(phoneNumber: String): Response<LoginResponse>
+interface LoginApi {
+    @GET("posts/1")
+    suspend fun submitPhoneNumber(): Response<LoginResponse>
 
     companion object {
-        operator fun invoke(): LoginApiService {
-            return retrofit.create(LoginApiService::class.java)
+        operator fun invoke(): LoginApi {
+            return retrofit.create(LoginApi::class.java)
         }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/navi/medici/android_customer_app/login/LoginRepository.kt b/app/src/main/java/com/navi/medici/android_customer_app/login/LoginRepository.kt
index 3114e4f697..a1fed363c9 100644
--- a/app/src/main/java/com/navi/medici/android_customer_app/login/LoginRepository.kt
+++ b/app/src/main/java/com/navi/medici/android_customer_app/login/LoginRepository.kt
@@ -1,4 +1,7 @@
 package com.navi.medici.android_customer_app.login
 
-class LoginRepository {
+import com.navi.medici.android_customer_app.SafeApiRequest
+
+class LoginRepository(private val loginApi: LoginApi) : SafeApiRequest() {
+    suspend fun submitPhoneNumber(phoneNumber: String) = apiRequest { loginApi.submitPhoneNumber() }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/navi/medici/android_customer_app/login/LoginResponse.kt b/app/src/main/java/com/navi/medici/android_customer_app/login/LoginResponse.kt
index 442d80c17f..82293d4c11 100644
--- a/app/src/main/java/com/navi/medici/android_customer_app/login/LoginResponse.kt
+++ b/app/src/main/java/com/navi/medici/android_customer_app/login/LoginResponse.kt
@@ -1,6 +1,6 @@
 package com.navi.medici.android_customer_app.login
 
-data class Login(
+data class LoginResponse(
     val id: Int,
     val title: String,
     val body: String,
diff --git a/app/src/main/java/com/navi/medici/android_customer_app/login/LoginViewModel.kt b/app/src/main/java/com/navi/medici/android_customer_app/login/LoginViewModel.kt
index 8131cd799f..334b8ce22e 100644
--- a/app/src/main/java/com/navi/medici/android_customer_app/login/LoginViewModel.kt
+++ b/app/src/main/java/com/navi/medici/android_customer_app/login/LoginViewModel.kt
@@ -1,15 +1,29 @@
 package com.navi.medici.android_customer_app.login
 
+import android.util.Log
 import androidx.lifecycle.ViewModel
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
 
 class LoginViewModel : ViewModel() {
-    private val login = Login("")
+    private var phoneNumber: String = ""
+    private val loginRepository = LoginRepository(LoginApi())
+    private val coroutineScope = CoroutineScope(Dispatchers.Main)
 
     fun onChangePhoneNumber(phoneNumber: String) {
-        login.phoneNumber = phoneNumber
-        if (isValidPhoneNumber(phoneNumber)) {
+        this.phoneNumber = phoneNumber
+        if (isValidPhoneNumber()) {
+            submitPhoneNumber()
         }
     }
 
-    private fun isValidPhoneNumber(phoneNumber: String): Boolean = phoneNumber.length == 10
+    private fun submitPhoneNumber() {
+        coroutineScope.launch {
+            val response = loginRepository.submitPhoneNumber(phoneNumber)
+            Log.i("login response", response.toString())
+        }
+    }
+
+    private fun isValidPhoneNumber(): Boolean = phoneNumber.length == 10
 }
\ No newline at end of file

From 39317c94a8c44ddbdc4aaa294ba5e8426be140b9 Mon Sep 17 00:00:00 2001
From: Shashidhara Gopal <shashidhara.gopal@navi.com>
Date: Tue, 5 Nov 2019 12:17:06 +0530
Subject: [PATCH 13/17] Add retrofit service and remove activity main

---
 .../api/RetrofitService.kt                     | 11 +++++++++++
 .../{ => api}/SafeApiRequest.kt                |  2 +-
 .../android_customer_app/login/LoginApi.kt     | 12 ++++--------
 .../login/LoginRepository.kt                   |  2 +-
 .../login/LoginResponse.kt                     |  8 ++++----
 app/src/main/res/layout/activity_main.xml      | 18 ------------------
 6 files changed, 21 insertions(+), 32 deletions(-)
 create mode 100644 app/src/main/java/com/navi/medici/android_customer_app/api/RetrofitService.kt
 rename app/src/main/java/com/navi/medici/android_customer_app/{ => api}/SafeApiRequest.kt (89%)
 delete mode 100644 app/src/main/res/layout/activity_main.xml

diff --git a/app/src/main/java/com/navi/medici/android_customer_app/api/RetrofitService.kt b/app/src/main/java/com/navi/medici/android_customer_app/api/RetrofitService.kt
new file mode 100644
index 0000000000..25c4e9a252
--- /dev/null
+++ b/app/src/main/java/com/navi/medici/android_customer_app/api/RetrofitService.kt
@@ -0,0 +1,11 @@
+package com.navi.medici.android_customer_app.api
+
+import retrofit2.Converter
+import retrofit2.Retrofit
+
+object RetrofitService {
+    fun build(baseURL: String, converterFactory: Converter.Factory): Retrofit {
+        val retrofitBuilder = Retrofit.Builder().baseUrl(baseURL)
+        return retrofitBuilder.addConverterFactory(converterFactory).build()
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/navi/medici/android_customer_app/SafeApiRequest.kt b/app/src/main/java/com/navi/medici/android_customer_app/api/SafeApiRequest.kt
similarity index 89%
rename from app/src/main/java/com/navi/medici/android_customer_app/SafeApiRequest.kt
rename to app/src/main/java/com/navi/medici/android_customer_app/api/SafeApiRequest.kt
index 4401242b3e..f7756186fc 100644
--- a/app/src/main/java/com/navi/medici/android_customer_app/SafeApiRequest.kt
+++ b/app/src/main/java/com/navi/medici/android_customer_app/api/SafeApiRequest.kt
@@ -1,4 +1,4 @@
-package com.navi.medici.android_customer_app
+package com.navi.medici.android_customer_app.api
 
 import retrofit2.Response
 import java.io.IOException
diff --git a/app/src/main/java/com/navi/medici/android_customer_app/login/LoginApi.kt b/app/src/main/java/com/navi/medici/android_customer_app/login/LoginApi.kt
index 662063b552..23fa163b20 100644
--- a/app/src/main/java/com/navi/medici/android_customer_app/login/LoginApi.kt
+++ b/app/src/main/java/com/navi/medici/android_customer_app/login/LoginApi.kt
@@ -1,17 +1,12 @@
 package com.navi.medici.android_customer_app.login
 
+import com.navi.medici.android_customer_app.api.RetrofitService
 import retrofit2.Response
-import retrofit2.Retrofit
 import retrofit2.converter.gson.GsonConverterFactory
 import retrofit2.http.GET
 
 private const val BASE_URL = "https://jsonplaceholder.typicode.com/"
-
-private val retrofit = Retrofit
-    .Builder()
-    .addConverterFactory(GsonConverterFactory.create())
-    .baseUrl(BASE_URL)
-    .build()
+private val gsonConverterFactory = GsonConverterFactory.create()
 
 interface LoginApi {
     @GET("posts/1")
@@ -19,7 +14,8 @@ interface LoginApi {
 
     companion object {
         operator fun invoke(): LoginApi {
-            return retrofit.create(LoginApi::class.java)
+            return RetrofitService.build(BASE_URL, gsonConverterFactory)
+                .create(LoginApi::class.java)
         }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/navi/medici/android_customer_app/login/LoginRepository.kt b/app/src/main/java/com/navi/medici/android_customer_app/login/LoginRepository.kt
index a1fed363c9..f41e5d9e2c 100644
--- a/app/src/main/java/com/navi/medici/android_customer_app/login/LoginRepository.kt
+++ b/app/src/main/java/com/navi/medici/android_customer_app/login/LoginRepository.kt
@@ -1,6 +1,6 @@
 package com.navi.medici.android_customer_app.login
 
-import com.navi.medici.android_customer_app.SafeApiRequest
+import com.navi.medici.android_customer_app.api.SafeApiRequest
 
 class LoginRepository(private val loginApi: LoginApi) : SafeApiRequest() {
     suspend fun submitPhoneNumber(phoneNumber: String) = apiRequest { loginApi.submitPhoneNumber() }
diff --git a/app/src/main/java/com/navi/medici/android_customer_app/login/LoginResponse.kt b/app/src/main/java/com/navi/medici/android_customer_app/login/LoginResponse.kt
index 82293d4c11..75abab9729 100644
--- a/app/src/main/java/com/navi/medici/android_customer_app/login/LoginResponse.kt
+++ b/app/src/main/java/com/navi/medici/android_customer_app/login/LoginResponse.kt
@@ -1,8 +1,8 @@
 package com.navi.medici.android_customer_app.login
 
 data class LoginResponse(
-    val id: Int,
-    val title: String,
-    val body: String,
-    val userId: Int
+    val id: Int?,
+    val title: String?,
+    val body: String?,
+    val userId: Int?
 )
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
deleted file mode 100644
index 4fc244418b..0000000000
--- a/app/src/main/res/layout/activity_main.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context=".MainActivity">
-
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="Hello World!"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file

From 74b9ddbd6d2c6e2565b6b38818db033537851668 Mon Sep 17 00:00:00 2001
From: Shashidhara Gopal <shashidhara.gopal@navi.com>
Date: Tue, 5 Nov 2019 13:49:16 +0530
Subject: [PATCH 14/17] Wrap login data

---
 .../android_customer_app/login/Login.kt       | 10 ++++++++
 .../login/LoginActivity.kt                    |  6 +----
 .../login/LoginViewModel.kt                   |  2 +-
 app/src/main/res/layout/activity_login.xml    | 24 +++++--------------
 4 files changed, 18 insertions(+), 24 deletions(-)
 create mode 100644 app/src/main/java/com/navi/medici/android_customer_app/login/Login.kt

diff --git a/app/src/main/java/com/navi/medici/android_customer_app/login/Login.kt b/app/src/main/java/com/navi/medici/android_customer_app/login/Login.kt
new file mode 100644
index 0000000000..bbf42922e6
--- /dev/null
+++ b/app/src/main/java/com/navi/medici/android_customer_app/login/Login.kt
@@ -0,0 +1,10 @@
+package com.navi.medici.android_customer_app.login
+
+object Login {
+    const val createNewAccount: String = "Create New Account"
+    const val phoneLabel: String = "Enter your mobile number to register with Navi"
+    const val countryCode: String = "+91"
+    const val termsAndConditions: String =
+        "By proceeding, you agree to our Terms & Conditions & Privacy Policy. Standard operator charges may apply for sms."
+    var phoneNumber: String = ""
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/navi/medici/android_customer_app/login/LoginActivity.kt b/app/src/main/java/com/navi/medici/android_customer_app/login/LoginActivity.kt
index 45335b0053..98c4233650 100644
--- a/app/src/main/java/com/navi/medici/android_customer_app/login/LoginActivity.kt
+++ b/app/src/main/java/com/navi/medici/android_customer_app/login/LoginActivity.kt
@@ -17,11 +17,7 @@ class LoginActivity : AppCompatActivity() {
         loginViewModel = ViewModelProviders.of(this).get(LoginViewModel::class.java)
         binding = DataBindingUtil.setContentView(this, R.layout.activity_login)
 
-        binding.createNewAccount = "Create New Account"
-        binding.phoneLabel = "Enter your mobile number to register with Navi"
-        binding.countryCode = "+91"
-        binding.termsAndConditions =
-            "By proceeding, you agree to our Terms & Conditions & Privacy Policy. Standard operator charges may apply for sms."
+        binding.login = Login
 
         binding.phoneEdit.addTextChangedListener { loginViewModel.onChangePhoneNumber(it.toString()) }
     }
diff --git a/app/src/main/java/com/navi/medici/android_customer_app/login/LoginViewModel.kt b/app/src/main/java/com/navi/medici/android_customer_app/login/LoginViewModel.kt
index 334b8ce22e..a542484f08 100644
--- a/app/src/main/java/com/navi/medici/android_customer_app/login/LoginViewModel.kt
+++ b/app/src/main/java/com/navi/medici/android_customer_app/login/LoginViewModel.kt
@@ -7,7 +7,7 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 
 class LoginViewModel : ViewModel() {
-    private var phoneNumber: String = ""
+    private var phoneNumber: String = Login.phoneNumber
     private val loginRepository = LoginRepository(LoginApi())
     private val coroutineScope = CoroutineScope(Dispatchers.Main)
 
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
index e7f32d1cce..0ccfb110b6 100644
--- a/app/src/main/res/layout/activity_login.xml
+++ b/app/src/main/res/layout/activity_login.xml
@@ -5,20 +5,8 @@
     <data>
 
         <variable
-            name="countryCode"
-            type="String" />
-
-        <variable
-            name="phoneLabel"
-            type="String" />
-
-        <variable
-            name="createNewAccount"
-            type="String" />
-
-        <variable
-            name="termsAndConditions"
-            type="String" />
+            name="login"
+            type="com.navi.medici.android_customer_app.login.Login" />
 
     </data>
 
@@ -31,7 +19,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="32dp"
-            android:text="@{countryCode}"
+            android:text="@{login.countryCode}"
             android:textSize="18sp"
             app:layout_constraintBottom_toBottomOf="@+id/phone_edit"
             app:layout_constraintStart_toStartOf="parent"
@@ -62,7 +50,7 @@
             android:layout_height="wrap_content"
             android:layout_marginEnd="32dp"
             android:layout_marginBottom="40dp"
-            android:text="@{phoneLabel}"
+            android:text="@{login.phoneLabel}"
             android:textSize="24sp"
             app:layout_constraintBottom_toTopOf="@+id/phone_edit"
             app:layout_constraintEnd_toEndOf="parent"
@@ -72,7 +60,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginBottom="56dp"
-            android:text="@{createNewAccount}"
+            android:text="@{login.createNewAccount}"
             android:textSize="24sp"
             android:textStyle="bold"
             app:layout_constraintBottom_toTopOf="@+id/phone_label_text"
@@ -84,7 +72,7 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="80dp"
             android:layout_marginEnd="32dp"
-            android:text="@{termsAndConditions}"
+            android:text="@{login.termsAndConditions}"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@+id/country_code_text"
             app:layout_constraintTop_toBottomOf="@+id/phone_edit" />

From e9ee9345226ec7a40bb896ed1798e36e2c7895f4 Mon Sep 17 00:00:00 2001
From: Shashidhara Gopal <shashidhara.gopal@navi.com>
Date: Tue, 5 Nov 2019 16:34:42 +0530
Subject: [PATCH 15/17] Update model and view data

---
 .../navi/medici/android_customer_app/login/Login.kt  | 11 +++++------
 .../android_customer_app/login/LoginActivity.kt      |  2 +-
 .../medici/android_customer_app/login/LoginApi.kt    |  2 +-
 .../android_customer_app/login/LoginResponse.kt      |  8 --------
 .../android_customer_app/login/LoginViewData.kt      |  9 +++++++++
 .../android_customer_app/login/LoginViewModel.kt     | 10 +++++-----
 app/src/main/res/layout/activity_login.xml           | 12 ++++++------
 7 files changed, 27 insertions(+), 27 deletions(-)
 delete mode 100644 app/src/main/java/com/navi/medici/android_customer_app/login/LoginResponse.kt
 create mode 100644 app/src/main/java/com/navi/medici/android_customer_app/login/LoginViewData.kt

diff --git a/app/src/main/java/com/navi/medici/android_customer_app/login/Login.kt b/app/src/main/java/com/navi/medici/android_customer_app/login/Login.kt
index bbf42922e6..815b518e12 100644
--- a/app/src/main/java/com/navi/medici/android_customer_app/login/Login.kt
+++ b/app/src/main/java/com/navi/medici/android_customer_app/login/Login.kt
@@ -1,10 +1,9 @@
 package com.navi.medici.android_customer_app.login
 
-object Login {
-    const val createNewAccount: String = "Create New Account"
-    const val phoneLabel: String = "Enter your mobile number to register with Navi"
-    const val countryCode: String = "+91"
-    const val termsAndConditions: String =
-        "By proceeding, you agree to our Terms & Conditions & Privacy Policy. Standard operator charges may apply for sms."
+data class Login(
+    val id: Int? = 0,
+    val userId: Int? = 0,
+    val title: String? = ""
+) {
     var phoneNumber: String = ""
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/navi/medici/android_customer_app/login/LoginActivity.kt b/app/src/main/java/com/navi/medici/android_customer_app/login/LoginActivity.kt
index 98c4233650..41eb469400 100644
--- a/app/src/main/java/com/navi/medici/android_customer_app/login/LoginActivity.kt
+++ b/app/src/main/java/com/navi/medici/android_customer_app/login/LoginActivity.kt
@@ -17,7 +17,7 @@ class LoginActivity : AppCompatActivity() {
         loginViewModel = ViewModelProviders.of(this).get(LoginViewModel::class.java)
         binding = DataBindingUtil.setContentView(this, R.layout.activity_login)
 
-        binding.login = Login
+        binding.loginViewData = LoginViewData()
 
         binding.phoneEdit.addTextChangedListener { loginViewModel.onChangePhoneNumber(it.toString()) }
     }
diff --git a/app/src/main/java/com/navi/medici/android_customer_app/login/LoginApi.kt b/app/src/main/java/com/navi/medici/android_customer_app/login/LoginApi.kt
index 23fa163b20..4b1177ad2a 100644
--- a/app/src/main/java/com/navi/medici/android_customer_app/login/LoginApi.kt
+++ b/app/src/main/java/com/navi/medici/android_customer_app/login/LoginApi.kt
@@ -10,7 +10,7 @@ private val gsonConverterFactory = GsonConverterFactory.create()
 
 interface LoginApi {
     @GET("posts/1")
-    suspend fun submitPhoneNumber(): Response<LoginResponse>
+    suspend fun submitPhoneNumber(): Response<Login>
 
     companion object {
         operator fun invoke(): LoginApi {
diff --git a/app/src/main/java/com/navi/medici/android_customer_app/login/LoginResponse.kt b/app/src/main/java/com/navi/medici/android_customer_app/login/LoginResponse.kt
deleted file mode 100644
index 75abab9729..0000000000
--- a/app/src/main/java/com/navi/medici/android_customer_app/login/LoginResponse.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.navi.medici.android_customer_app.login
-
-data class LoginResponse(
-    val id: Int?,
-    val title: String?,
-    val body: String?,
-    val userId: Int?
-)
\ No newline at end of file
diff --git a/app/src/main/java/com/navi/medici/android_customer_app/login/LoginViewData.kt b/app/src/main/java/com/navi/medici/android_customer_app/login/LoginViewData.kt
new file mode 100644
index 0000000000..177dc935e6
--- /dev/null
+++ b/app/src/main/java/com/navi/medici/android_customer_app/login/LoginViewData.kt
@@ -0,0 +1,9 @@
+package com.navi.medici.android_customer_app.login
+
+data class LoginViewData(
+    val createNewAccount: String = "Create New Account",
+    val phoneLabel: String = "Enter your mobile number to register with Navi",
+    val countryCode: String = "+91",
+    val termsAndConditions: String =
+        "By proceeding, you agree to our Terms & Conditions & Privacy Policy. Standard operator charges may apply for sms."
+)
\ No newline at end of file
diff --git a/app/src/main/java/com/navi/medici/android_customer_app/login/LoginViewModel.kt b/app/src/main/java/com/navi/medici/android_customer_app/login/LoginViewModel.kt
index a542484f08..761ec10f8e 100644
--- a/app/src/main/java/com/navi/medici/android_customer_app/login/LoginViewModel.kt
+++ b/app/src/main/java/com/navi/medici/android_customer_app/login/LoginViewModel.kt
@@ -7,23 +7,23 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 
 class LoginViewModel : ViewModel() {
-    private var phoneNumber: String = Login.phoneNumber
+    private val login = Login()
     private val loginRepository = LoginRepository(LoginApi())
     private val coroutineScope = CoroutineScope(Dispatchers.Main)
 
     fun onChangePhoneNumber(phoneNumber: String) {
-        this.phoneNumber = phoneNumber
-        if (isValidPhoneNumber()) {
+        if (isValidPhoneNumber(phoneNumber)) {
+            login.phoneNumber = phoneNumber
             submitPhoneNumber()
         }
     }
 
     private fun submitPhoneNumber() {
         coroutineScope.launch {
-            val response = loginRepository.submitPhoneNumber(phoneNumber)
+            val response = loginRepository.submitPhoneNumber(login.phoneNumber)
             Log.i("login response", response.toString())
         }
     }
 
-    private fun isValidPhoneNumber(): Boolean = phoneNumber.length == 10
+    private fun isValidPhoneNumber(phoneNumber: String): Boolean = phoneNumber.length == 10
 }
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
index 0ccfb110b6..e3eaa01ae3 100644
--- a/app/src/main/res/layout/activity_login.xml
+++ b/app/src/main/res/layout/activity_login.xml
@@ -5,8 +5,8 @@
     <data>
 
         <variable
-            name="login"
-            type="com.navi.medici.android_customer_app.login.Login" />
+            name="loginViewData"
+            type="com.navi.medici.android_customer_app.login.LoginViewData" />
 
     </data>
 
@@ -19,7 +19,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="32dp"
-            android:text="@{login.countryCode}"
+            android:text="@{loginViewData.countryCode}"
             android:textSize="18sp"
             app:layout_constraintBottom_toBottomOf="@+id/phone_edit"
             app:layout_constraintStart_toStartOf="parent"
@@ -50,7 +50,7 @@
             android:layout_height="wrap_content"
             android:layout_marginEnd="32dp"
             android:layout_marginBottom="40dp"
-            android:text="@{login.phoneLabel}"
+            android:text="@{loginViewData.phoneLabel}"
             android:textSize="24sp"
             app:layout_constraintBottom_toTopOf="@+id/phone_edit"
             app:layout_constraintEnd_toEndOf="parent"
@@ -60,7 +60,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginBottom="56dp"
-            android:text="@{login.createNewAccount}"
+            android:text="@{loginViewData.createNewAccount}"
             android:textSize="24sp"
             android:textStyle="bold"
             app:layout_constraintBottom_toTopOf="@+id/phone_label_text"
@@ -72,7 +72,7 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="80dp"
             android:layout_marginEnd="32dp"
-            android:text="@{login.termsAndConditions}"
+            android:text="@{loginViewData.termsAndConditions}"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@+id/country_code_text"
             app:layout_constraintTop_toBottomOf="@+id/phone_edit" />

From 7373e4af16221ed63496f203ad8ad84e74c6f57c Mon Sep 17 00:00:00 2001
From: Shashidhara Gopal <shashidhara.gopal@navi.com>
Date: Tue, 5 Nov 2019 16:54:21 +0530
Subject: [PATCH 16/17] Remove login view data and add constants for static
 text

---
 .../android_customer_app/login/LoginActivity.kt      |  1 -
 .../android_customer_app/login/LoginViewData.kt      |  9 ---------
 app/src/main/res/layout/activity_login.xml           | 12 ++++--------
 app/src/main/res/values/strings.xml                  |  4 ++++
 4 files changed, 8 insertions(+), 18 deletions(-)
 delete mode 100644 app/src/main/java/com/navi/medici/android_customer_app/login/LoginViewData.kt

diff --git a/app/src/main/java/com/navi/medici/android_customer_app/login/LoginActivity.kt b/app/src/main/java/com/navi/medici/android_customer_app/login/LoginActivity.kt
index 41eb469400..3dcf777b21 100644
--- a/app/src/main/java/com/navi/medici/android_customer_app/login/LoginActivity.kt
+++ b/app/src/main/java/com/navi/medici/android_customer_app/login/LoginActivity.kt
@@ -17,7 +17,6 @@ class LoginActivity : AppCompatActivity() {
         loginViewModel = ViewModelProviders.of(this).get(LoginViewModel::class.java)
         binding = DataBindingUtil.setContentView(this, R.layout.activity_login)
 
-        binding.loginViewData = LoginViewData()
 
         binding.phoneEdit.addTextChangedListener { loginViewModel.onChangePhoneNumber(it.toString()) }
     }
diff --git a/app/src/main/java/com/navi/medici/android_customer_app/login/LoginViewData.kt b/app/src/main/java/com/navi/medici/android_customer_app/login/LoginViewData.kt
deleted file mode 100644
index 177dc935e6..0000000000
--- a/app/src/main/java/com/navi/medici/android_customer_app/login/LoginViewData.kt
+++ /dev/null
@@ -1,9 +0,0 @@
-package com.navi.medici.android_customer_app.login
-
-data class LoginViewData(
-    val createNewAccount: String = "Create New Account",
-    val phoneLabel: String = "Enter your mobile number to register with Navi",
-    val countryCode: String = "+91",
-    val termsAndConditions: String =
-        "By proceeding, you agree to our Terms & Conditions & Privacy Policy. Standard operator charges may apply for sms."
-)
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
index e3eaa01ae3..7e1c49ed93 100644
--- a/app/src/main/res/layout/activity_login.xml
+++ b/app/src/main/res/layout/activity_login.xml
@@ -4,10 +4,6 @@
 
     <data>
 
-        <variable
-            name="loginViewData"
-            type="com.navi.medici.android_customer_app.login.LoginViewData" />
-
     </data>
 
     <androidx.constraintlayout.widget.ConstraintLayout
@@ -19,7 +15,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="32dp"
-            android:text="@{loginViewData.countryCode}"
+            android:text="@string/country_code"
             android:textSize="18sp"
             app:layout_constraintBottom_toBottomOf="@+id/phone_edit"
             app:layout_constraintStart_toStartOf="parent"
@@ -50,7 +46,7 @@
             android:layout_height="wrap_content"
             android:layout_marginEnd="32dp"
             android:layout_marginBottom="40dp"
-            android:text="@{loginViewData.phoneLabel}"
+            android:text="@string/phone_number_label"
             android:textSize="24sp"
             app:layout_constraintBottom_toTopOf="@+id/phone_edit"
             app:layout_constraintEnd_toEndOf="parent"
@@ -60,7 +56,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginBottom="56dp"
-            android:text="@{loginViewData.createNewAccount}"
+            android:text="@string/create_new_account"
             android:textSize="24sp"
             android:textStyle="bold"
             app:layout_constraintBottom_toTopOf="@+id/phone_label_text"
@@ -72,7 +68,7 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="80dp"
             android:layout_marginEnd="32dp"
-            android:text="@{loginViewData.termsAndConditions}"
+            android:text="@string/terms_and_conditions"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@+id/country_code_text"
             app:layout_constraintTop_toBottomOf="@+id/phone_edit" />
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 011a1f4396..b3ad6ebc01 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,3 +1,7 @@
 <resources>
     <string name="app_name">navi</string>
+    <string name="country_code">+91</string>
+    <string name="phone_number_label">Enter your mobile number to register with Navi</string>
+    <string name="create_new_account">Create New Account</string>
+    <string name="terms_and_conditions"><![CDATA[By proceeding, you agree to our Terms & Conditions & Privacy Policy. Standard operator charges may apply for sms.]]></string>
 </resources>

From bc1a1d728240b96928f0051f30f687ba106771a3 Mon Sep 17 00:00:00 2001
From: Shashidhara Gopal <shashidhara.gopal@navi.com>
Date: Wed, 6 Nov 2019 11:45:43 +0530
Subject: [PATCH 17/17] Remove log statement

---
 .../navi/medici/android_customer_app/login/LoginViewModel.kt  | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/app/src/main/java/com/navi/medici/android_customer_app/login/LoginViewModel.kt b/app/src/main/java/com/navi/medici/android_customer_app/login/LoginViewModel.kt
index 761ec10f8e..0a9cb9377a 100644
--- a/app/src/main/java/com/navi/medici/android_customer_app/login/LoginViewModel.kt
+++ b/app/src/main/java/com/navi/medici/android_customer_app/login/LoginViewModel.kt
@@ -1,6 +1,5 @@
 package com.navi.medici.android_customer_app.login
 
-import android.util.Log
 import androidx.lifecycle.ViewModel
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
@@ -20,8 +19,7 @@ class LoginViewModel : ViewModel() {
 
     private fun submitPhoneNumber() {
         coroutineScope.launch {
-            val response = loginRepository.submitPhoneNumber(login.phoneNumber)
-            Log.i("login response", response.toString())
+            loginRepository.submitPhoneNumber(login.phoneNumber)
         }
     }