- mid commit

Took 4 hours 2 minutes

app/src/main/java/h_mal/appttude/com/driver/application/DriverApplication.kt

@@ -1,6 +1,9 @@
 package h_mal.appttude.com.driver.application
 
 import android.app.Application
+import com.google.firebase.auth.FirebaseAuth
+import com.google.firebase.database.FirebaseDatabase
+import com.google.firebase.storage.FirebaseStorage
 import h_mal.appttude.com.driver.data.FirebaseAuthSource
 import h_mal.appttude.com.driver.data.FirebaseDatabaseSource
 import h_mal.appttude.com.driver.data.FirebaseStorageSource
@@ -15,6 +18,16 @@ import org.kodein.di.generic.singleton
 
 class DriverApplication : Application(), KodeinAware {
 
+    override fun onCreate() {
+        super.onCreate()
+
+        val localHost = "10.0.2.2"
+
+        FirebaseAuth.getInstance().useEmulator(localHost, 9099)
+        FirebaseDatabase.getInstance().useEmulator(localHost, 9000)
+        FirebaseStorage.getInstance().useEmulator(localHost, 9199)
+    }
+
     // Kodein aware to initialise the classes used for DI
     override val kodein = Kodein.lazy {
         import(androidXModule(this@DriverApplication))

app/src/main/java/h_mal/appttude/com/driver/base/BaseActivity.kt

@@ -45,8 +45,6 @@ abstract class BaseActivity<V : BaseViewModel, VB : ViewBinding> : AppCompatActi
         { defaultViewModelCreationExtras }
     )
 
-    private var loading: Boolean = false
-
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         configureObserver()
@@ -95,7 +93,6 @@ abstract class BaseActivity<V : BaseViewModel, VB : ViewBinding> : AppCompatActi
      */
     open fun onStarted() {
         loadingView.fadeIn()
-        loading = true
         mIdlingResource?.setIdleState(false)
     }
 
@@ -104,7 +101,6 @@ abstract class BaseActivity<V : BaseViewModel, VB : ViewBinding> : AppCompatActi
      */
     open fun onSuccess(data: Any?) {
         loadingView.fadeOut()
-        loading = false
         mIdlingResource?.setIdleState(true)
     }
 
@@ -114,7 +110,6 @@ abstract class BaseActivity<V : BaseViewModel, VB : ViewBinding> : AppCompatActi
     open fun onFailure(error: String?) {
         error?.let { displayToast(it) }
         loadingView.fadeOut()
-        loading = false
         mIdlingResource?.setIdleState(true)
     }
 
@@ -140,7 +135,8 @@ abstract class BaseActivity<V : BaseViewModel, VB : ViewBinding> : AppCompatActi
 
 
     override fun onBackPressed() {
-        if (!loading) super.onBackPressed()
+        loadingView.hide()
+        super.onBackPressed()
     }
 
     /**

app/src/main/java/h_mal/appttude/com/driver/base/DrawerActivity.kt

@@ -48,7 +48,6 @@ abstract class DrawerActivity<V : BaseViewModel, VB : ViewBinding> : BaseActivit
         appBarConfiguration = AppBarConfiguration(navController.graph, drawerLayout)
         navView.setupWithNavController(navController)
         setupActionBarWithNavController(navController, appBarConfiguration)
-
     }
 
     override fun onSupportNavigateUp(): Boolean {

app/src/main/res/layout/update_overview_fragment.xml

@@ -44,13 +44,13 @@
         android:text="@string/update_password" />
 
     <com.google.android.material.button.MaterialButton
-        style="@style/TextButton.WithIcon"
         android:id="@+id/update_profile_button"
-        android:layout_marginBottom="12dp"
+        style="@style/TextButton.WithIcon"
+        android:layout_marginBottom="8dp"
+        android:text="@string/update_profile"
         app:layout_constraintBottom_toTopOf="@id/delete_profile"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        android:text="@string/update_profile" />
+        app:layout_constraintStart_toStartOf="parent" />
 
     <com.google.android.material.button.MaterialButton
         style="@style/TextButton.WithIcon"