- changes to drawer layout and page

- changes to storage ref in process retrieval in process

app/build.gradle

@@ -155,7 +155,7 @@ dependencies {
     implementation 'com.synnapps:carouselview:0.1.5'
     / * Glide */
     implementation 'com.github.bumptech.glide:glide:4.12.0'
-    annotationProcessor 'com.github.bumptech.glide:compiler:4.12.0'
+    kapt 'com.github.bumptech.glide:compiler:4.12.0'
     / * OKHttp */
     implementation 'com.squareup.okhttp3:okhttp:4.10.0'
     / * Kotlin Reflect */
@@ -172,4 +172,6 @@ dependencies {
     kapt "com.github.permissions-dispatcher:permissionsdispatcher-processor:${dispatcher_ver}"
     / * Date utils * /
     implementation 'net.danlew:android.joda:2.12.5'
+    / * FirebaseUI Storage only * /
+    implementation 'com.firebaseui:firebase-ui-storage:7.2.0'
 }

app/src/admin/java/h_mal/appttude/com/driver/ui/HomeSuperUserFragment.kt

@@ -14,6 +14,7 @@ import com.firebase.ui.database.FirebaseRecyclerOptions
 import com.google.firebase.database.DataSnapshot
 import h_mal.appttude.com.driver.R
 import h_mal.appttude.com.driver.base.BaseFirebaseAdapter
+import h_mal.appttude.com.driver.base.BaseFirebaseListAdapter
 import h_mal.appttude.com.driver.base.BaseFragment
 import h_mal.appttude.com.driver.base.CustomViewHolder
 import h_mal.appttude.com.driver.data.USER_CONST

app/src/admin/java/h_mal/appttude/com/driver/viewmodels/SuperUserViewModel.kt

@@ -22,7 +22,8 @@ class SuperUserViewModel(
     }
 
     fun createFirebaseOptions(sort: SortOption? = null) {
-        val ref = firebaseDatabaseSource.getUsersRef().orderByChild("role").startAt("driver").endAt("driver")
+        val ref = firebaseDatabaseSource.getUsersRef().orderByChild("role").startAt("driver")
+            .endAt("driver")
 
         sort?.isNotNull { preferenceProvider.setSortOption(it.label) }
 

app/src/admin/res/layout/activity_main.xml

@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.drawerlayout.widget.DrawerLayout 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:id="@+id/drawer_layout"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:fitsSystemWindows="true"
-    tools:openDrawer="start">
-
-    <include
-        android:id="@+id/app_bar_layout"
-        layout="@layout/app_bar_main"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent" />
-
-    <com.google.android.material.navigation.NavigationView
-        android:id="@+id/nav_view"
-        android:layout_width="wrap_content"
-        android:layout_height="match_parent"
-        android:layout_gravity="start"
-        android:fitsSystemWindows="true"
-        app:itemTextColor="@android:color/white"
-        app:headerLayout="@layout/nav_header_main"
-        app:menu="@menu/activity_main_drawer">
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_gravity="bottom"
-            android:orientation="vertical">
-
-            <TextView
-                android:id="@+id/logout"
-                style="@style/headerStyle"
-                android:background="@color/colour_nine"
-                android:textSize="14sp"
-                android:layout_width="match_parent"
-                android:layout_height="48dp"
-                android:gravity="center"
-                android:text="@string/logout"
-                android:textStyle="bold" />
-        </LinearLayout>
-    </com.google.android.material.navigation.NavigationView>
-
-</androidx.drawerlayout.widget.DrawerLayout>

app/src/admin/res/navigation/main_navigation.xml

@@ -5,11 +5,6 @@
     android:id="@+id/main_navigation"
     app:startDestination="@id/homeAdminFragment">
 
-    <activity
-        android:id="@+id/nav_user_settings"
-        android:name="h_mal.appttude.com.driver.ui.update.UpdateActivity"
-        android:label="fragment_profile"
-        tools:layout="@layout/update_activity" />
     <fragment
         android:id="@+id/homeAdminFragment"
         android:name="h_mal.appttude.com.driver.ui.HomeSuperUserFragment"

app/src/driver/java/h_mal/appttude/com/driver/ui/DriverHomeFragment.kt

@@ -12,7 +12,7 @@ import h_mal.appttude.com.driver.utils.show
 import h_mal.appttude.com.driver.viewmodels.RoleViewModel
 
 
-class HomeFragment :
+class DriverHomeFragment :
     BaseFragment<RoleViewModel, FragmentHomeDriverBinding>() {
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {

app/src/driver/java/h_mal/appttude/com/driver/ui/MainActivity.kt

@@ -1,52 +0,0 @@
-package h_mal.appttude.com.driver.ui
-
-
-import android.os.Bundle
-import com.google.firebase.auth.FirebaseUser
-import h_mal.appttude.com.driver.R
-import h_mal.appttude.com.driver.base.DrawerActivity
-import h_mal.appttude.com.driver.databinding.ActivityMainBinding
-import h_mal.appttude.com.driver.databinding.NavHeaderMainBinding
-import h_mal.appttude.com.driver.utils.setGlideImage
-import h_mal.appttude.com.driver.viewmodels.MainViewModel
-
-
-class MainActivity : DrawerActivity<MainViewModel, ActivityMainBinding>() {
-
-    override val containerId: Int = R.id.container
-    override val drawerLayoutId: Int = R.id.drawer_layout
-    override val toolbarId: Int = R.id.toolbar
-    override val navViewId: Int = R.id.nav_view
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-
-        viewModel.getUserDetails()
-        setupLogoutInDrawer()
-    }
-
-    override fun onSuccess(data: Any?) {
-        super.onSuccess(data)
-
-        when (data) {
-            is FirebaseUser -> {
-                setupDrawer(data)
-            }
-        }
-
-    }
-
-    private fun setupDrawer(user: FirebaseUser) {
-        NavHeaderMainBinding.inflate(layoutInflater).apply {
-            driverEmail.text = user.email
-            driverName.text = user.displayName
-            profileImage.setGlideImage(user.photoUrl)
-        }
-    }
-
-    private fun setupLogoutInDrawer() {
-        binding.logout.setOnClickListener {
-            viewModel.logOut()
-        }
-    }
-}

app/src/driver/java/h_mal/appttude/com/driver/ui/driverprofile/DriverLicenseFragment.kt

@@ -1,6 +1,7 @@
 package h_mal.appttude.com.driver.ui.driverprofile
 
 import android.net.Uri
+import com.google.firebase.storage.StorageReference
 import h_mal.appttude.com.driver.base.DataSubmissionBaseFragment
 import h_mal.appttude.com.driver.databinding.FragmentDriverLicenseBinding
 import h_mal.appttude.com.driver.dialogs.DateDialog
@@ -36,9 +37,12 @@ class DriverLicenseFragment :
     override fun setFields(data: DriversLicense) {
         super.setFields(data)
         applyBinding {
-            driversliImg.setGlideImage(data.licenseImageString)
             licNo.setText(data.licenseNumber)
             licExpiry.setText(data.licenseExpiry)
+
+            data.licenseImageString?.setImages{
+                driversliImg.setGlideImage(it.second)
+            }
         }
     }
 

app/src/driver/java/h_mal/appttude/com/driver/ui/driverprofile/DriverProfileFragment.kt

@@ -1,6 +1,7 @@
 package h_mal.appttude.com.driver.ui.driverprofile
 
 import android.net.Uri
+import com.google.firebase.storage.StorageReference
 import h_mal.appttude.com.driver.base.DataSubmissionBaseFragment
 import h_mal.appttude.com.driver.databinding.FragmentDriverProfileBinding
 import h_mal.appttude.com.driver.dialogs.DateDialog
@@ -52,13 +53,16 @@ class DriverProfileFragment :
     override fun setFields(data: DriverProfile) {
         super.setFields(data)
         applyBinding {
-            driverPic.setGlideImage(data.driverPic)
             namesInput.setText(data.forenames)
             addressInput.setText(data.address)
             postcodeInput.setText(data.postcode)
             dobInput.setText(data.dob)
             niNumber.setText(data.ni)
             dateFirst.setText(data.dateFirst)
+
+            data.driverPic?.setImages {
+                driverPic.setGlideImage(it.second)
+            }
         }
     }
 

app/src/driver/java/h_mal/appttude/com/driver/ui/driverprofile/PrivateHireLicenseFragment.kt

@@ -1,6 +1,7 @@
 package h_mal.appttude.com.driver.ui.driverprofile
 
 import android.net.Uri
+import com.google.firebase.storage.StorageReference
 import h_mal.appttude.com.driver.base.DataSubmissionBaseFragment
 import h_mal.appttude.com.driver.databinding.FragmentPrivateHireLicenseBinding
 import h_mal.appttude.com.driver.dialogs.DateDialog
@@ -39,9 +40,9 @@ class PrivateHireLicenseFragment : DataSubmissionBaseFragment
     override fun setFields(data: PrivateHireLicense) {
         super.setFields(data)
         applyBinding {
-            imageView2.setGlideImage(data.phImageString)
             phNo.setText(data.phNumber)
             phExpiry.setText(data.phExpiry)
+            data.phImageString?.setImages { imageView2.setGlideImage(it.second) }
         }
     }
 

app/src/driver/java/h_mal/appttude/com/driver/ui/vehicleprofile/InsuranceFragment.kt

@@ -4,6 +4,7 @@ import android.net.Uri
 import android.os.Bundle
 import android.view.View
 import android.widget.ImageView
+import com.google.firebase.storage.StorageReference
 import h_mal.appttude.com.driver.base.DataSubmissionBaseFragment
 import h_mal.appttude.com.driver.databinding.FragmentInsuranceBinding
 import h_mal.appttude.com.driver.dialogs.DateDialog
@@ -45,6 +46,7 @@ class InsuranceFragment :
                         imageView.setGlideImage(list[i] as Uri)
                     }
                     is String -> imageView.setGlideImage(list[i] as String)
+                    is StorageReference -> imageView.setGlideImage(list[i] as StorageReference)
                 }
             }
             carouselView.pageCount = list.size
@@ -65,7 +67,11 @@ class InsuranceFragment :
         applyBinding {
             insurer.setText(model.insurerName)
             insuranceExp.setText(model.expiryDate)
-            model.photoStrings?.let { updateImageCarousal(it) }
+
+            data.photoStrings?.also {
+                val keys = viewModel.getMultipleImagesAndThumbnails(it).map {i -> i.key }
+                updateImageCarousal(keys)
+            }
         }
     }
 
@@ -74,4 +80,12 @@ class InsuranceFragment :
         selectedImages?.let { updateImageCarousal(it) }
     }
 
+    override fun onSuccess(data: Any?) {
+        super.onSuccess(data)
+
+        if (data is Map<*,*>) {
+            updateImageCarousal(data.map { it.value })
+        }
+    }
+
 }

app/src/driver/java/h_mal/appttude/com/driver/ui/vehicleprofile/LogbookFragment.kt

@@ -1,6 +1,7 @@
 package h_mal.appttude.com.driver.ui.vehicleprofile
 
 import android.net.Uri
+import com.google.firebase.storage.StorageReference
 import h_mal.appttude.com.driver.base.DataSubmissionBaseFragment
 import h_mal.appttude.com.driver.databinding.FragmentLogbookBinding
 import h_mal.appttude.com.driver.model.Logbook
@@ -30,8 +31,8 @@ class LogbookFragment :
     override fun setFields(data: Logbook) {
         super.setFields(data)
         applyBinding {
-            logBookImg.setGlideImage(data.photoString)
             v5cNo.setText(data.v5cnumber)
+            data.photoString?.setImages { logBookImg.setGlideImage(it.second) }
         }
 
     }

app/src/driver/java/h_mal/appttude/com/driver/ui/vehicleprofile/MotFragment.kt

@@ -1,6 +1,7 @@
 package h_mal.appttude.com.driver.ui.vehicleprofile
 
 import android.net.Uri
+import com.google.firebase.storage.StorageReference
 import h_mal.appttude.com.driver.base.DataSubmissionBaseFragment
 import h_mal.appttude.com.driver.databinding.FragmentMotBinding
 import h_mal.appttude.com.driver.dialogs.DateDialog
@@ -32,8 +33,8 @@ class MotFragment : DataSubmissionBaseFragment<MotViewModel, FragmentMotBinding,
     override fun setFields(data: Mot) {
         super.setFields(data)
         applyBinding {
-            motImg.setGlideImage(data.motImageString)
             motExpiry.setText(data.motExpiry)
+            data.motImageString?.setImages { motImg.setGlideImage(it.second) }
         }
     }
 

app/src/driver/java/h_mal/appttude/com/driver/ui/vehicleprofile/PrivateHireVehicleFragment.kt

@@ -1,6 +1,7 @@
 package h_mal.appttude.com.driver.ui.vehicleprofile
 
 import android.net.Uri
+import com.google.firebase.storage.StorageReference
 import h_mal.appttude.com.driver.base.DataSubmissionBaseFragment
 import h_mal.appttude.com.driver.databinding.FragmentPrivateHireLicenseBinding
 import h_mal.appttude.com.driver.dialogs.DateDialog
@@ -34,9 +35,9 @@ class PrivateHireVehicleFragment :
     override fun setFields(data: PrivateHireVehicle) {
         super.setFields(data)
         applyBinding {
-            imageView2.setGlideImage(data.phCarImageString)
             phNo.setText(data.phCarNumber)
             phExpiry.setText(data.phCarExpiry)
+            data.phCarImageString?.setImages { imageView2.setGlideImage(it.second) }
         }
 
     }

app/src/driver/java/h_mal/appttude/com/driver/viewmodels/DriverLicenseViewModel.kt

@@ -4,11 +4,13 @@ import android.net.Uri
 import com.google.firebase.database.DatabaseReference
 import com.google.firebase.storage.StorageReference
 import h_mal.appttude.com.driver.base.DataSubmissionBaseViewModel
+import h_mal.appttude.com.driver.data.DRIVERS_LICENSE_SREF
 import h_mal.appttude.com.driver.data.FirebaseAuthentication
 import h_mal.appttude.com.driver.data.FirebaseDatabaseSource
 import h_mal.appttude.com.driver.data.FirebaseStorageSource
 import h_mal.appttude.com.driver.model.DriversLicense
 import h_mal.appttude.com.driver.utils.Coroutines.io
+import kotlinx.coroutines.Job
 
 class DriverLicenseViewModel(
     auth: FirebaseAuthentication,

app/src/driver/java/h_mal/appttude/com/driver/viewmodels/DriverLicenseViewModel2.kt

@@ -0,0 +1,40 @@
+package h_mal.appttude.com.driver.viewmodels
+
+import android.net.Uri
+import com.google.firebase.database.DatabaseReference
+import com.google.firebase.storage.StorageReference
+import h_mal.appttude.com.driver.base.DataSubmissionBaseViewModel
+import h_mal.appttude.com.driver.base.DataSubmissionViewModel2
+import h_mal.appttude.com.driver.data.DRIVERS_LICENSE_SREF
+import h_mal.appttude.com.driver.data.FirebaseAuthentication
+import h_mal.appttude.com.driver.data.FirebaseDatabaseSource
+import h_mal.appttude.com.driver.data.FirebaseStorageSource
+import h_mal.appttude.com.driver.data.Storage
+import h_mal.appttude.com.driver.model.DriversLicense
+import h_mal.appttude.com.driver.utils.Coroutines.io
+import kotlinx.coroutines.Job
+
+class DriverLicenseViewModel2(
+    auth: FirebaseAuthentication,
+    database: FirebaseDatabaseSource,
+    storage: FirebaseStorageSource
+) : DataSubmissionViewModel2<DriversLicense>(auth, database, storage) {
+
+    override val databaseRef: DatabaseReference = database.getDriverLicenseRef(uid)
+    override val storageRef: StorageReference = storage.driversLicenseStorageRef(uid)
+
+    override fun validateData(data: DriversLicense): Boolean {
+        // TODO Not yet implemented
+        return true
+    }
+    override fun setDataAfterUpload(data: DriversLicense, filename: String): DriversLicense {
+        return data.apply {
+            licenseImageString = filename
+        }
+    }
+
+    fun postDataToDatabase(imageUri: Uri, data: DriversLicense) {
+        postDataToDatabase(imageUri, data, Storage.DRIVERS_LICENSE)
+    }
+
+}

app/src/driver/java/h_mal/appttude/com/driver/viewmodels/DriverProfileViewModel.kt

@@ -4,11 +4,14 @@ import android.net.Uri
 import com.google.firebase.database.DatabaseReference
 import com.google.firebase.storage.StorageReference
 import h_mal.appttude.com.driver.base.DataSubmissionBaseViewModel
+import h_mal.appttude.com.driver.data.DRIVER_PROFILE
 import h_mal.appttude.com.driver.data.FirebaseAuthentication
 import h_mal.appttude.com.driver.data.FirebaseDatabaseSource
 import h_mal.appttude.com.driver.data.FirebaseStorageSource
+import h_mal.appttude.com.driver.data.PROFILE_SREF
 import h_mal.appttude.com.driver.model.DriverProfile
 import h_mal.appttude.com.driver.utils.Coroutines.io
+import kotlinx.coroutines.Job
 
 class DriverProfileViewModel(
     auth: FirebaseAuthentication,
@@ -26,7 +29,6 @@ class DriverProfileViewModel(
 
             val imageUrl = getImageUrl(localImageUri, data.driverPic)
             data.driverPic = imageUrl
-
             postDataToDatabase(data)
         }
     }

app/src/driver/java/h_mal/appttude/com/driver/viewmodels/InsuranceViewModel.kt

@@ -7,8 +7,10 @@ import h_mal.appttude.com.driver.base.DataSubmissionBaseViewModel
 import h_mal.appttude.com.driver.data.FirebaseAuthentication
 import h_mal.appttude.com.driver.data.FirebaseDatabaseSource
 import h_mal.appttude.com.driver.data.FirebaseStorageSource
+import h_mal.appttude.com.driver.data.INSURANCE_SREF
 import h_mal.appttude.com.driver.model.Insurance
 import h_mal.appttude.com.driver.utils.Coroutines.io
+import kotlinx.coroutines.Job
 
 class InsuranceViewModel(
     auth: FirebaseAuthentication,

app/src/driver/java/h_mal/appttude/com/driver/viewmodels/LogbookViewModel.kt

@@ -4,11 +4,15 @@ import android.net.Uri
 import com.google.firebase.database.DatabaseReference
 import com.google.firebase.storage.StorageReference
 import h_mal.appttude.com.driver.base.DataSubmissionBaseViewModel
+import h_mal.appttude.com.driver.data.DRIVER_PROFILE
 import h_mal.appttude.com.driver.data.FirebaseAuthentication
 import h_mal.appttude.com.driver.data.FirebaseDatabaseSource
 import h_mal.appttude.com.driver.data.FirebaseStorageSource
+import h_mal.appttude.com.driver.data.LOG_BOOK_SREF
+import h_mal.appttude.com.driver.model.DriverProfile
 import h_mal.appttude.com.driver.model.Logbook
 import h_mal.appttude.com.driver.utils.Coroutines.io
+import kotlinx.coroutines.Job
 
 class LogbookViewModel(
     auth: FirebaseAuthentication,

app/src/driver/java/h_mal/appttude/com/driver/viewmodels/MotViewModel.kt

@@ -7,8 +7,13 @@ import h_mal.appttude.com.driver.base.DataSubmissionBaseViewModel
 import h_mal.appttude.com.driver.data.FirebaseAuthentication
 import h_mal.appttude.com.driver.data.FirebaseDatabaseSource
 import h_mal.appttude.com.driver.data.FirebaseStorageSource
+import h_mal.appttude.com.driver.data.LOG_BOOK_SREF
+import h_mal.appttude.com.driver.data.MOT
+import h_mal.appttude.com.driver.data.MOT_SREF
+import h_mal.appttude.com.driver.model.Logbook
 import h_mal.appttude.com.driver.model.Mot
 import h_mal.appttude.com.driver.utils.Coroutines.io
+import kotlinx.coroutines.Job
 
 class MotViewModel(
     auth: FirebaseAuthentication,

app/src/driver/java/h_mal/appttude/com/driver/viewmodels/PrivateHireLicenseViewModel.kt

@@ -7,8 +7,12 @@ import h_mal.appttude.com.driver.base.DataSubmissionBaseViewModel
 import h_mal.appttude.com.driver.data.FirebaseAuthentication
 import h_mal.appttude.com.driver.data.FirebaseDatabaseSource
 import h_mal.appttude.com.driver.data.FirebaseStorageSource
+import h_mal.appttude.com.driver.data.MOT_SREF
+import h_mal.appttude.com.driver.data.PRIVATE_HIRE_SREF
+import h_mal.appttude.com.driver.model.Mot
 import h_mal.appttude.com.driver.model.PrivateHireLicense
 import h_mal.appttude.com.driver.utils.Coroutines.io
+import kotlinx.coroutines.Job
 
 class PrivateHireLicenseViewModel(
     auth: FirebaseAuthentication,

app/src/driver/java/h_mal/appttude/com/driver/viewmodels/PrivateHireVehicleViewModel.kt

@@ -7,8 +7,12 @@ import h_mal.appttude.com.driver.base.DataSubmissionBaseViewModel
 import h_mal.appttude.com.driver.data.FirebaseAuthentication
 import h_mal.appttude.com.driver.data.FirebaseDatabaseSource
 import h_mal.appttude.com.driver.data.FirebaseStorageSource
+import h_mal.appttude.com.driver.data.PRIVATE_HIRE_SREF
+import h_mal.appttude.com.driver.data.PRIVATE_HIRE_VEHICLE_SREF
+import h_mal.appttude.com.driver.model.PrivateHireLicense
 import h_mal.appttude.com.driver.model.PrivateHireVehicle
 import h_mal.appttude.com.driver.utils.Coroutines.io
+import kotlinx.coroutines.Job
 
 class PrivateHireVehicleViewModel(
     auth: FirebaseAuthentication,

app/src/driver/res/layout/fragment_driver_overall.xml

@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/container"
     style="@style/parent_constraint_layout"
-    tools:context="h_mal.appttude.com.driver.ui.HomeFragment">
+    tools:context="h_mal.appttude.com.driver.ui.DriverHomeFragment">
 
     <TextView
         android:id="@+id/prova_title_tv"

app/src/driver/res/layout/fragment_home_driver.xml

@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/container"
     style="@style/parent_constraint_layout"
-    tools:context="h_mal.appttude.com.driver.ui.HomeFragment">
+    tools:context="h_mal.appttude.com.driver.ui.DriverHomeFragment">
 
     <ImageView
         android:id="@+id/prova_logo"

app/src/driver/res/navigation/main_navigation.xml

@@ -6,7 +6,7 @@
 
     <fragment
         android:id="@+id/homeDriverFragment"
-        android:name="h_mal.appttude.com.driver.ui.HomeFragment"
+        android:name="h_mal.appttude.com.driver.ui.DriverHomeFragment"
         android:label="fragment_home"
         tools:layout="@layout/fragment_home_driver">
         <action
@@ -126,11 +126,6 @@
         android:name="h_mal.appttude.com.driver.ui.vehicleprofile.LogbookFragment"
         android:label="fragment_logbook"
         tools:layout="@layout/fragment_logbook" />
-    <activity
-        android:id="@+id/nav_user_settings"
-        android:name="h_mal.appttude.com.driver.ui.update.UpdateActivity"
-        android:label="fragment_profile"
-        tools:layout="@layout/update_activity" />
     <fragment
         android:id="@+id/privateHireLicenseFragment2"
         android:name="h_mal.appttude.com.driver.ui.driverprofile.PrivateHireLicenseFragment"

app/src/main/AndroidManifest.xml

@@ -23,6 +23,11 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
+        <activity
+            android:name=".ui.HomeActivity"
+            android:configChanges="orientation|screenSize"
+            android:theme="@style/AppTheme.NoActionBar"
+            android:exported="true"/>
         <activity
             android:name=".ui.MainActivity"
             android:configChanges="orientation|screenSize"

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

@@ -0,0 +1,100 @@
+package h_mal.appttude.com.driver.base
+
+import android.view.View
+import androidx.annotation.LayoutRes
+import androidx.lifecycle.LifecycleOwner
+import com.firebase.ui.database.FirebaseListAdapter
+import com.firebase.ui.database.FirebaseListOptions
+import com.google.firebase.database.DatabaseError
+import com.google.firebase.database.Query
+import h_mal.appttude.com.driver.utils.GenericsHelper.getGenericClassAt
+import h_mal.appttude.com.driver.utils.hide
+import h_mal.appttude.com.driver.utils.show
+
+
+abstract class BaseFirebaseListAdapter<T : Any>(
+    options: FirebaseListOptions<T>
+) : FirebaseListAdapter<T>(options) {
+
+//    constructor(
+//        query: Query,
+//        @LayoutRes layout: Int,
+//        lifecycleOwner: LifecycleOwner? = null
+//    ): this(
+//        FirebaseListOptions.Builder<T>()
+//            .setQuery(query, this.getGenericClassAt<T>(0).java)
+//            .setLayout(layout)
+//            .setLifecycleOwner(lifecycleOwner)
+//            .build()
+//    )
+
+    abstract val emptyView: View
+
+    override fun startListening() {
+        super.startListening()
+
+        if (count == 0) {
+            emptyView.show()
+            emptyList()
+        } else emptyView.hide()
+    }
+
+    //    private val connectivityManager =
+//        layoutInflater.context.getSystemService(ConnectivityManager::class.java) as ConnectivityManager
+//
+//    private var _binding: VB? = null
+//    val binding: VB
+//        get() = _binding ?: error("Must only access binding while fragment is attached.")
+//
+//    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): CustomViewHolder<VB> {
+//        _binding = inflateBindingByType(getGenericClassAt(1), layoutInflater)
+//        val lp = RecyclerView.LayoutParams(
+//            ViewGroup.LayoutParams.MATCH_PARENT,
+//            ViewGroup.LayoutParams.WRAP_CONTENT
+//        )
+//        binding.root.layoutParams = lp
+//        return CustomViewHolder(requireNotNull(_binding))
+//    }
+//
+//    override fun onBindViewHolder(holder: CustomViewHolder<VB>, position: Int, model: T) {}
+//
+//    override fun getItemId(position: Int): Long {
+//        return snapshots.getSnapshot(position).key?.toByteArray()
+//            ?.let { ByteBuffer.wrap(it).long } ?: super.getItemId(position)
+//    }
+//
+    fun getKeyAtPosition(position: Int) = snapshots.getSnapshot(position).key
+//
+//    override fun startListening() {
+//        super.startListening()
+//        // check if network is connected
+//        if (connectivityManager.activeNetwork == null) {
+//            connectionLost()
+//        }
+//    }
+//
+//    open fun connectionLost() {}
+//    override fun onDataChanged() {
+//        super.onDataChanged()
+//        if (itemCount == 0) emptyList()
+//    }
+//
+    override fun onError(error: DatabaseError) {
+        super.onError(error)
+        when (error.code) {
+            DatabaseError.PERMISSION_DENIED -> permissionsDenied()
+            DatabaseError.DISCONNECTED, DatabaseError.UNAVAILABLE, DatabaseError.NETWORK_ERROR -> noConnection()
+            DatabaseError.EXPIRED_TOKEN, DatabaseError.OPERATION_FAILED, DatabaseError.INVALID_TOKEN, DatabaseError.MAX_RETRIES -> authorizationError()
+            else -> cannotRetrieve()
+        }
+
+    }
+
+    open fun permissionsDenied() {}
+    open fun noConnection() {}
+    open fun cannotRetrieve() {}
+    open fun authorizationError() {}
+    open fun emptyList() {}
+}
+
+//class CustomViewHolder<VB : ViewBinding>(val viewBinding: VB) : ViewHolder(viewBinding.root)

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

@@ -1,16 +1,19 @@
 package h_mal.appttude.com.driver.base
 
 import android.content.Intent
+import android.net.Uri
 import android.os.Bundle
 import android.view.View
 import android.widget.EditText
 import androidx.core.widget.doAfterTextChanged
 import androidx.viewbinding.ViewBinding
+import com.google.firebase.storage.StorageReference
 import h_mal.appttude.com.driver.data.UserAuthState
 import h_mal.appttude.com.driver.model.Model
 import h_mal.appttude.com.driver.ui.user.LoginActivity
 import h_mal.appttude.com.driver.utils.GenericsHelper.getGenericClassAt
 import h_mal.appttude.com.driver.utils.TextValidationUtils.validateEditText
+import h_mal.appttude.com.driver.utils.setGlideImage
 import kotlin.reflect.full.createInstance
 
 abstract class DataSubmissionBaseFragment<V : DataSubmissionBaseViewModel<T>, VB : ViewBinding, T : Model> :
@@ -26,6 +29,7 @@ abstract class DataSubmissionBaseFragment<V : DataSubmissionBaseViewModel<T>, VB
                 intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_NEW_TASK)
                 startActivity(intent)
                 requireActivity().finish()
+                return@observe
             }
         }
         viewModel.getDataFromDatabase()
@@ -35,9 +39,8 @@ abstract class DataSubmissionBaseFragment<V : DataSubmissionBaseViewModel<T>, VB
     override fun onSuccess(data: Any?) {
         super.onSuccess(data)
 
-        data?.let {
+        when (data) {
-            if (it::class.java == model::class.java)
+            is Model -> setFields(data as T)
-                setFields(data as T)
         }
     }
 
@@ -67,4 +70,10 @@ abstract class DataSubmissionBaseFragment<V : DataSubmissionBaseViewModel<T>, VB
         }
     }
 
+    fun String.setImages(images: (images: Pair<StorageReference, StorageReference>) -> Unit) {
+        // check if its a ref
+        if (!contains("gs://")) return
+        images(viewModel.getImageAndThumbnail(this))
+    }
+
 }

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

@@ -11,9 +11,8 @@ import h_mal.appttude.com.driver.utils.Coroutines.io
 import h_mal.appttude.com.driver.utils.DateUtils.getDateTimeStamp
 import h_mal.appttude.com.driver.utils.getDataFromDatabaseRef
 import kotlinx.coroutines.Job
-import kotlinx.coroutines.async
-import kotlinx.coroutines.coroutineScope
 import java.io.IOException
+import java.lang.NullPointerException
 
 
 abstract class DataSubmissionBaseViewModel<T : Any>(
@@ -28,7 +27,7 @@ abstract class DataSubmissionBaseViewModel<T : Any>(
     abstract val storageRef: StorageReference?
     abstract val objectName: String
 
-    abstract fun getDataFromDatabase(): Job
+    abstract fun getDataFromDatabase(): Job?
     open fun setDataInDatabase(data: T, localImageUri: Uri?): Job = Job()
     open fun setDataInDatabase(data: T, localImageUris: List<Uri?>?): Job = Job()
     open fun setDataInDatabase(data: T) {}
@@ -82,19 +81,46 @@ abstract class DataSubmissionBaseViewModel<T : Any>(
         return listOfUrls
     }
 
-    suspend fun <T, R> Iterable<T>.mapSuspend(transform: suspend (T) -> R): List<R> =
+    fun downloadImageAndThumbnail(prefix: String) {
-        coroutineScope { map { t: T -> async { transform(t) } }.map { it.await() } }
+        if (storageRef == null) throw NullPointerException("No image(s) are available to retrieve")
 
-
+        io {
-    suspend fun <T, R> Iterable<T>.mapIndexSuspend(transform: suspend (index: Int, T) -> R) =
+            doTryOperation("Failed to retrieve image") {
-        coroutineScope {
+                val urlPair = storageRef!!.let { storage!!.getFileAndThumbnail(it, prefix) }
-            mapIndexed { index: Int, t: T ->
+                onSuccess(urlPair)
-                async {
+            }
-                    transform(
-                        index,
-                        t
-                    )
-                }
-            }.map { it.await() }
         }
+    }
+
+    fun downloadMultipleImageAndThumbnail(prefix: String) {
+        if (storageRef == null) throw NullPointerException("No image(s) are available to retrieve")
+
+        io {
+            doTryOperation("Failed to retrieve image") {
+                val urlMap = storageRef!!.let { storage!!.getMultipleFilesAndThumbnails(it, prefix) }
+                onSuccess(urlMap)
+            }
+        }
+    }
+
+
+    fun getImageAndThumbnail(filename: String): Pair<StorageReference, StorageReference> {
+        if (storageRef == null) throw NullPointerException("No image(s) are available to retrieve")
+
+        val thumbnail = StringBuilder()
+            .append("thumb_")
+            .append(filename.split(".")[0])
+            .append(".png")
+            .toString()
+
+        return Pair(
+            storageRef!!.child(filename),
+            storageRef!!.child(thumbnail)
+        )
+    }
+
+    fun getMultipleImagesAndThumbnails(filenames: MutableList<String>): Map<StorageReference, StorageReference> {
+        return filenames.associate { getImageAndThumbnail(it) }
+    }
+
 }

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

@@ -0,0 +1,63 @@
+package h_mal.appttude.com.driver.base
+
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.Observer
+import com.google.firebase.database.DatabaseReference
+import h_mal.appttude.com.driver.data.DataState
+import h_mal.appttude.com.driver.data.FirebaseAuthentication
+import h_mal.appttude.com.driver.data.FirebaseCompletion
+import h_mal.appttude.com.driver.data.FirebaseDatabaseSource
+import h_mal.appttude.com.driver.utils.Coroutines.io
+import h_mal.appttude.com.driver.utils.toLiveData
+import java.io.IOException
+
+
+abstract class DataSubmissionViewModel<T : Any>(
+    auth: FirebaseAuthentication,
+    private val database: FirebaseDatabaseSource
+) : BaseViewModel() {
+    val stateLiveData = auth.userStateListener()
+    val uid: String = auth.getUid() ?: throw IOException("User is not logged in")
+
+    abstract val databaseRef: DatabaseReference
+
+    private val refLiveData: LiveData<DataState> by lazy { databaseRef.toLiveData<T>() }
+    private val observer = Observer<DataState> {
+        when (it) {
+            is DataState.HasData<*> -> onSuccess(it.data)
+            is DataState.HasError -> onError(it.error.message)
+        }
+    }
+
+    init {
+        refLiveData.observeForever(observer)
+    }
+
+    override fun onCleared() {
+        super.onCleared()
+        refLiveData.removeObserver(observer)
+    }
+
+    // Validate the data before posting to database
+    abstract fun validateData(data: T): Boolean
+
+    @Suppress("UNCHECKED_CAST")
+    fun getDataFromDatabase(): T? {
+        return when (val data = refLiveData.value) {
+            is DataState.HasData<*> -> data.data as T
+            else -> null
+        }
+    }
+
+    open fun postDataToDatabase(data: T) {
+        io {
+            if (!validateData(data)) return@io
+            if (getDataFromDatabase() == data) return@io
+            doTryOperation("Failed to submit document") {
+                val postObject = database.postToDatabaseRed(databaseRef, data)
+                onSuccess(postObject)
+            }
+        }
+    }
+
+}

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

@@ -0,0 +1,55 @@
+package h_mal.appttude.com.driver.base
+
+import android.net.Uri
+import com.google.firebase.storage.StorageReference
+import h_mal.appttude.com.driver.data.FirebaseAuthentication
+import h_mal.appttude.com.driver.data.FirebaseDatabaseSource
+import h_mal.appttude.com.driver.data.FirebaseStorageSource
+import h_mal.appttude.com.driver.data.Storage
+import h_mal.appttude.com.driver.utils.Coroutines.io
+import h_mal.appttude.com.driver.utils.DateUtils
+
+
+abstract class DataSubmissionViewModel2<T : Any>(
+    auth: FirebaseAuthentication,
+    database: FirebaseDatabaseSource,
+    private val storage: FirebaseStorageSource
+) : DataSubmissionViewModel<T>(auth, database) {
+
+    abstract val storageRef: StorageReference
+
+    // retrieve image and thumbnail as a pair
+    fun getImageAndThumbnail(filename: String): Pair<StorageReference, StorageReference> {
+        val thumbnail = StringBuilder()
+            .append("thumb_")
+            .append(filename.split(".")[0])
+            .append(".png")
+            .toString()
+
+        return Pair(
+            storageRef.child(filename),
+            storageRef.child(thumbnail)
+        )
+    }
+
+    suspend fun uploadImage(localImageUri: Uri, storages: Storage): String {
+        val imageString = StringBuilder()
+            .append(DateUtils.getDateTimeStamp())
+            .append("_")
+            .append(storages.label)
+            .toString()
+
+        return storage.uploadImageReturnName(localImageUri, storageRef, imageString)
+    }
+
+    fun postDataToDatabase(localImageUri: Uri, data: T, storages: Storage) {
+        io {
+            val fileName = uploadImage(localImageUri, storages)
+            val afterData = setDataAfterUpload(data, fileName)
+
+            super.postDataToDatabase(afterData)
+        }
+    }
+
+    abstract fun setDataAfterUpload(data: T, filename: String): T
+}

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

@@ -0,0 +1,61 @@
+package h_mal.appttude.com.driver.base
+
+import android.net.Uri
+import com.google.firebase.storage.StorageReference
+import h_mal.appttude.com.driver.data.FirebaseAuthentication
+import h_mal.appttude.com.driver.data.FirebaseDatabaseSource
+import h_mal.appttude.com.driver.data.FirebaseStorageSource
+import h_mal.appttude.com.driver.data.Storage
+import h_mal.appttude.com.driver.utils.Coroutines.io
+import h_mal.appttude.com.driver.utils.DateUtils
+import h_mal.appttude.com.driver.utils.mapIndexSuspend
+
+
+abstract class DataSubmissionViewModel3<T : Any>(
+    auth: FirebaseAuthentication,
+    database: FirebaseDatabaseSource,
+    private val storage: FirebaseStorageSource
+) : DataSubmissionViewModel<T>(auth, database) {
+
+    abstract val storageRef: StorageReference
+
+    fun getImagesAndThumbnails(filenames: List<String>): List<Pair<StorageReference, StorageReference>> {
+        return filenames.map {
+            val thumbnail = StringBuilder()
+                .append("thumb_")
+                .append(it.split(".")[0])
+                .append(".png")
+                .toString()
+
+            Pair(
+                storageRef.child(it),
+                storageRef.child(thumbnail)
+            )
+        }
+    }
+
+    suspend fun uploadImages(localImageUris: List<Uri>, storages: Storage): List<String> {
+        return localImageUris.mapIndexSuspend { index, uri ->
+            val imageString = StringBuilder()
+                .append(DateUtils.getDateTimeStamp())
+                .append("_")
+                .append(storages.label)
+                .append("_$index")
+                .toString()
+
+            storage.uploadImageReturnName(uri, storageRef, imageString)
+        }
+    }
+
+    fun postDataToDatabase(localImageUris: List<Uri>, data: T, storages: Storage) {
+        io {
+            val files = uploadImages(localImageUris, storages)
+            val postData = setDataAfterUpload(data, files)
+
+            super.postDataToDatabase(postData)
+        }
+    }
+
+    abstract fun setDataAfterUpload(data: T, filename: List<String>): T
+
+}

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

@@ -2,6 +2,8 @@ package h_mal.appttude.com.driver.base
 
 import android.os.Bundle
 import android.view.MenuItem
+import android.widget.ImageView
+import android.widget.TextView
 import androidx.appcompat.widget.Toolbar
 import androidx.core.view.GravityCompat
 import androidx.drawerlayout.widget.DrawerLayout
@@ -14,6 +16,7 @@ import androidx.navigation.ui.setupWithNavController
 import androidx.viewbinding.ViewBinding
 import com.google.android.material.navigation.NavigationView
 import com.google.firebase.auth.FirebaseUser
+import h_mal.appttude.com.driver.R
 import h_mal.appttude.com.driver.databinding.NavHeaderMainBinding
 import h_mal.appttude.com.driver.dialogs.ExitDialog.displayExitDialog
 import h_mal.appttude.com.driver.utils.isTrue
@@ -42,12 +45,17 @@ abstract class DrawerActivity<V : BaseViewModel, VB : ViewBinding> : BaseActivit
         navView = findViewById(navViewId)
 
         setSupportActionBar(toolbar)
-        supportActionBar?.setDisplayShowTitleEnabled(false)
+//        supportActionBar?.setDisplayShowTitleEnabled(false)
         navController = findNavController(containerId)
 
         appBarConfiguration = AppBarConfiguration(navController.graph, drawerLayout)
         navView.setupWithNavController(navController)
         setupActionBarWithNavController(navController, appBarConfiguration)
+
+        toolbar.setOnMenuItemClickListener {
+            if (it.itemId == android.R.id.home) drawerLayout.openDrawer(GravityCompat.END)
+            return@setOnMenuItemClickListener true
+        }
     }
 
     override fun onSupportNavigateUp(): Boolean {
@@ -81,14 +89,10 @@ abstract class DrawerActivity<V : BaseViewModel, VB : ViewBinding> : BaseActivit
         }
     }
 
-    private fun setupDrawer(user: FirebaseUser) {
+    fun setupDrawer(user: FirebaseUser) {
-        applyBinding {
+        findViewById<TextView>(R.id.driver_email).text = user.email
-            NavHeaderMainBinding.inflate(layoutInflater).apply {
+        findViewById<TextView>(R.id.driver_name).text = user.displayName
-                driverEmail.text = user.email
+        findViewById<ImageView>(R.id.profileImage).setGlideImage(user.photoUrl)
-                driverName.text = user.displayName
-                profileImage.setGlideImage(user.photoUrl)
-            }
-        }
     }
 
     override fun onNavigationItemSelected(item: MenuItem): Boolean {

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

@@ -0,0 +1,22 @@
+package h_mal.appttude.com.driver.base
+
+import android.content.Context
+import com.bumptech.glide.Glide
+import com.bumptech.glide.Registry
+import com.bumptech.glide.annotation.GlideModule
+import com.bumptech.glide.module.AppGlideModule
+import com.firebase.ui.storage.images.FirebaseImageLoader
+import com.google.firebase.storage.StorageReference
+import java.io.InputStream
+
+
+@GlideModule
+class MyAppGlideModule : AppGlideModule() {
+    override fun registerComponents(context: Context, glide: Glide, registry: Registry) {
+        // Register FirebaseImageLoader to handle StorageReference
+        registry.append(
+            StorageReference::class.java, InputStream::class.java,
+            FirebaseImageLoader.Factory()
+        )
+    }
+}

app/src/main/java/h_mal/appttude/com/driver/data/DataState.kt

@@ -0,0 +1,9 @@
+package h_mal.appttude.com.driver.data
+
+import com.google.firebase.database.DatabaseError
+
+
+sealed class DataState {
+    class HasData<T : Any>(val data: T) : DataState()
+    class HasError(val error: DatabaseError) : DataState()
+}

app/src/main/java/h_mal/appttude/com/driver/data/FirebaseCompletion.kt

@@ -2,6 +2,7 @@ package h_mal.appttude.com.driver.data
 
 sealed class FirebaseCompletion {
     object Default : FirebaseCompletion()
+    object SuccessfullyCompleted : FirebaseCompletion()
     data class Changed(val message: String) : FirebaseCompletion()
     data class ProfileDeleted(val message: String) : FirebaseCompletion()
 }

app/src/main/java/h_mal/appttude/com/driver/data/FirebaseDatabaseSource.kt

@@ -32,13 +32,12 @@ class FirebaseDatabaseSource {
      * @return T returns data posted
      */
     suspend fun <T : Any> postToDatabaseRed(ref: DatabaseReference, data: T): T {
-        ref.setValue(data).await()
+        return ref.setValue(data).continueWith { data }.await()
-        return data
     }
 
     fun getDatabaseRefFromPath(path: String) = database.getReference(path)
 
-    val users = database.getReference(USER_CONST)
+    private val users = database.getReference(USER_CONST)
 
     fun getUsersRef() = database.reference.child(USER_CONST)
     fun getUserRef(uid: String) = users.child(uid)

app/src/main/java/h_mal/appttude/com/driver/data/FirebaseStorageSource.kt

@@ -19,12 +19,41 @@ class FirebaseStorageSource {
     private val storageRef: StorageReference by lazy { storage.reference }
 
     suspend fun uploadImage(localFilePath: Uri, path: StorageReference, filename: String): Uri {
-        val ref = path.child("$filename.jpg")
+        val ref = path.child("$filename.jpeg")
         return ref.putFile(localFilePath)
             .continueWithTask { ref.downloadUrl }
             .await()
     }
 
+    suspend fun uploadImageReturnName(localFilePath: Uri, path: StorageReference, filename: String): String {
+        val ref = path.child("$filename.jpeg")
+        return ref.putFile(localFilePath)
+            .continueWith { ref.name }
+            .await()
+    }
+
+    suspend fun uploadImageReturnRef(localFilePath: Uri, path: StorageReference, filename: String): String {
+        val ref = path.child("$filename.jpeg")
+
+        return ref.putFile(localFilePath)
+            .continueWith {
+                it.result.storage.toString()
+            }.await()
+    }
+
+    suspend fun uploadImage(localFilePath: Uri, uid: String, storage: Storage) {
+        val ref = when(storage) {
+            Storage.PROFILE -> profileImageStorageRef(uid)
+            Storage.DRIVERS_LICENSE -> driversLicenseStorageRef(uid)
+            Storage.INSURANCE -> insuranceStorageRef(uid)
+            Storage.LOG_BOOK -> logBookStorageRef(uid)
+            Storage.MOT -> motStorageRef(uid)
+            Storage.PRIVATE_HIRE -> privateHireStorageRef(uid)
+            Storage.PRIVATE_HIRE_VEHICLE -> privateHireVehicleStorageRef(uid)
+        }
+        uploadImage(localFilePath, ref, storage.label)
+    }
+
     private fun usersImagesStorageRef(uid: String) = storageRef.child(IMAGE_CONST).child(uid)
     fun profileImageStorageRef(uid: String) = usersImagesStorageRef(uid).child(PROFILE_SREF)
     fun driversLicenseStorageRef(uid: String) =
@@ -36,4 +65,37 @@ class FirebaseStorageSource {
     fun privateHireStorageRef(uid: String) = usersImagesStorageRef(uid).child(PRIVATE_HIRE_SREF)
     fun privateHireVehicleStorageRef(uid: String) =
         usersImagesStorageRef(uid).child(PRIVATE_HIRE_VEHICLE_SREF)
+
+    suspend fun downloadImage(storageReference: StorageReference): Uri? {
+        return storageReference.downloadUrl.await()
+    }
+
+    suspend fun getFileAndThumbnail(
+        ref: StorageReference,
+        prefix: String
+    ): Pair<StorageReference?, StorageReference?> {
+        val items = ref.listAll().await().items
+
+        // get storage refs for documents and thumbnail
+        val document = items.lastOrNull { !it.name.contains("thumb_") }
+        val thumbnail = items.firstOrNull { it.name.contains("thumb_${document?.name?.split(".")?.get(0)}") }
+
+        return Pair(document, thumbnail)
+    }
+
+    suspend fun getMultipleFilesAndThumbnails(
+        ref: StorageReference,
+        prefix: String
+    ): MutableMap<StorageReference, StorageReference?> {
+        val items = ref.listAll().await().items
+        val map = mutableMapOf<StorageReference, StorageReference?>()
+
+        // load map with document and thumbnail map sets
+        items.filter { it.name.startsWith(prefix) }.forEach { s ->
+            val value = items.firstOrNull { it.name.contains("thumb_${s?.name}") }
+            map[s] = value
+        }
+
+        return map
+    }
 }

app/src/main/java/h_mal/appttude/com/driver/data/Storage.kt

@@ -0,0 +1,11 @@
+package h_mal.appttude.com.driver.data
+
+enum class Storage(val label: String) {
+    PROFILE("user_profile"),
+    DRIVERS_LICENSE("drivers_license"),
+    INSURANCE("insurance_details"),
+    LOG_BOOK("log_book"),
+    MOT("mot_Details"),
+    PRIVATE_HIRE("private_hire"),
+    PRIVATE_HIRE_VEHICLE("private_hire_vehicle");
+}

app/src/main/java/h_mal/appttude/com/driver/model/Insurance.kt

@@ -1,7 +1,7 @@
 package h_mal.appttude.com.driver.model
 
 data class Insurance(
-    var photoStrings: MutableList<String?>? = null,
+    var photoStrings: MutableList<String>? = null,
     var insurerName: String? = null,
     var expiryDate: String? = null
 ) : Model

app/src/main/java/h_mal/appttude/com/driver/ui/HomeActivity.kt

@@ -2,16 +2,16 @@ package h_mal.appttude.com.driver.ui
 
 
 import android.os.Bundle
+import android.view.View
+import androidx.drawerlayout.widget.DrawerLayout.DrawerListener
 import com.google.firebase.auth.FirebaseUser
 import h_mal.appttude.com.driver.R
 import h_mal.appttude.com.driver.base.DrawerActivity
-import h_mal.appttude.com.driver.databinding.ActivityMainBinding
+import h_mal.appttude.com.driver.databinding.ActivityHomeBinding
-import h_mal.appttude.com.driver.databinding.NavHeaderMainBinding
-import h_mal.appttude.com.driver.utils.setGlideImage
 import h_mal.appttude.com.driver.viewmodels.MainViewModel
 
 
-class MainActivity : DrawerActivity<MainViewModel, ActivityMainBinding>() {
+class HomeActivity : DrawerActivity<MainViewModel,ActivityHomeBinding>() {
 
     override val containerId: Int = R.id.container
     override val drawerLayoutId: Int = R.id.drawer_layout
@@ -21,25 +21,16 @@ class MainActivity : DrawerActivity<MainViewModel, ActivityMainBinding>() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
-        viewModel.getUserDetails()
         setupLogoutInDrawer()
-    }
+        
-
+        drawerLayout.addDrawerListener(object : DrawerListener{
-    override fun onSuccess(data: Any?) {
+            override fun onDrawerSlide(drawerView: View, slideOffset: Float) { }
-        super.onSuccess(data)
+            override fun onDrawerOpened(drawerView: View) {
-        when (data) {
+                viewModel.getUserDetails()?.let { setupDrawer(it) }
-            is FirebaseUser -> {
-                setupDrawer(data)
             }
-        }
+            override fun onDrawerClosed(drawerView: View) { }
-    }
+            override fun onDrawerStateChanged(newState: Int) { }
-
+        })
-    private fun setupDrawer(user: FirebaseUser) {
-        NavHeaderMainBinding.inflate(layoutInflater).apply {
-            driverEmail.text = user.email
-            driverName.text = user.displayName
-            profileImage.setGlideImage(user.photoUrl)
-        }
     }
 
     private fun setupLogoutInDrawer() {

app/src/main/java/h_mal/appttude/com/driver/ui/HomeFragment.kt

@@ -0,0 +1,25 @@
+package h_mal.appttude.com.driver.ui
+
+import android.content.Intent
+import android.os.Bundle
+import android.view.View
+import h_mal.appttude.com.driver.base.BaseFragment
+import h_mal.appttude.com.driver.databinding.FragmentHomeBinding
+import h_mal.appttude.com.driver.viewmodels.MainViewModel
+
+
+class HomeFragment : BaseFragment<MainViewModel, FragmentHomeBinding>() {
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
+        applyBinding {
+            enter.setOnClickListener { navigateToMain() }
+        }
+    }
+
+    private fun navigateToMain() {
+        val intent = Intent(requireContext(), MainActivity::class.java)
+        startActivity(intent)
+    }
+}

app/src/main/java/h_mal/appttude/com/driver/ui/MainActivity.kt

@@ -0,0 +1,9 @@
+package h_mal.appttude.com.driver.ui
+
+
+import h_mal.appttude.com.driver.base.BaseActivity
+import h_mal.appttude.com.driver.databinding.ActivityMainBinding
+import h_mal.appttude.com.driver.viewmodels.MainViewModel
+
+
+class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>()

app/src/main/java/h_mal/appttude/com/driver/ui/user/LoginActivity.kt

@@ -6,7 +6,7 @@ import com.google.firebase.auth.AuthResult
 import com.google.firebase.auth.FirebaseUser
 import h_mal.appttude.com.driver.base.BaseActivity
 import h_mal.appttude.com.driver.databinding.ActivityLoginBinding
-import h_mal.appttude.com.driver.ui.MainActivity
+import h_mal.appttude.com.driver.ui.HomeActivity
 import h_mal.appttude.com.driver.viewmodels.UserViewModel
 
 
@@ -18,7 +18,7 @@ class LoginActivity : BaseActivity<UserViewModel, ActivityLoginBinding>() {
     override fun onSuccess(data: Any?) {
         super.onSuccess(data)
         if (data is AuthResult || data is FirebaseUser) {
-            val intent = Intent(this, MainActivity::class.java)
+            val intent = Intent(this, HomeActivity::class.java)
             intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_NEW_TASK)
             startActivity(intent)
             finish()

app/src/main/java/h_mal/appttude/com/driver/utils/Extensions.kt

@@ -1,5 +1,8 @@
 package h_mal.appttude.com.driver.utils
 
+import kotlinx.coroutines.async
+import kotlinx.coroutines.coroutineScope
+
 /**
  * Extension function that will execute high order if value is true or do nothing
  *
@@ -22,4 +25,23 @@ inline fun <T, R> T?.isNotNull(block: (T) -> R): R? {
     } else {
         null
     }
-}
+}
+
+/**
+ * Like a #Collections.map{ } function
+ * but allows for suspended actions inside
+ */
+suspend inline fun <T, R> Iterable<T>.mapIndexSuspend(crossinline transform: suspend (index: Int, T) -> R) =
+    coroutineScope {
+        mapIndexed { index: Int, t: T ->
+            async {
+                transform(
+                    index,
+                    t
+                )
+            }
+        }.map { it.await() }
+    }
+
+suspend inline fun <T, R> Iterable<T>.mapSuspend(crossinline transform: suspend (T) -> R): List<R> =
+    coroutineScope { map { t: T -> async { transform(t) } }.map { it.await() } }

app/src/main/java/h_mal/appttude/com/driver/utils/FirebaseUtils.kt

@@ -1,10 +1,16 @@
 package h_mal.appttude.com.driver.utils
 
+import androidx.lifecycle.LiveData
 import com.google.firebase.database.DataSnapshot
 import com.google.firebase.database.DatabaseError
 import com.google.firebase.database.DatabaseReference
+import com.google.firebase.database.GenericTypeIndicator
 import com.google.firebase.database.ValueEventListener
+import h_mal.appttude.com.driver.data.DataState
 import h_mal.appttude.com.driver.data.EventResponse
+import h_mal.appttude.com.driver.data.FirebaseCompletion
+import h_mal.appttude.com.driver.utils.GenericsHelper.getGenericClassAt
+import java.lang.reflect.ParameterizedType
 import kotlin.coroutines.resume
 import kotlin.coroutines.suspendCoroutine
 
@@ -34,13 +40,8 @@ suspend fun DatabaseReference.singleValueEvent(): EventResponse = suspendCorouti
  */
 suspend inline fun <reified T : Any> DatabaseReference.getDataFromDatabaseRef(): T? {
     return when (val response: EventResponse = singleValueEvent()) {
-        is EventResponse.Changed -> {
+        is EventResponse.Changed -> response.snapshot.getValue(T::class.java)
-            response.snapshot.getValue(T::class.java)
+        is EventResponse.Cancelled -> throw FirebaseException(response.error)
-        }
-
-        is EventResponse.Cancelled -> {
-            throw FirebaseException(response.error)
-        }
     }
 }
 
@@ -71,4 +72,29 @@ suspend fun <T : Any> DatabaseReference.getDataFromDatabaseRef(clazz: Class<T>):
             throw FirebaseException(response.error)
         }
     }
+}
+
+fun <T : Any> DatabaseReference.toLiveData(): LiveData<DataState> {
+    return object : LiveData<DataState>() {
+        private val listener = addValueEventListener(object : ValueEventListener{
+            override fun onDataChange(snapshot: DataSnapshot) {
+                val data = snapshot.getValue(object : GenericTypeIndicator<T>() {})
+                postValue(DataState.HasData(data ?: FirebaseCompletion.Default))
+            }
+            override fun onCancelled(error: DatabaseError) {
+                postValue(DataState.HasError(error))
+            }
+        })
+        override fun onActive() {
+            super.onActive()
+            // add listener
+            addValueEventListener(listener)
+        }
+
+        override fun onInactive() {
+            super.onInactive()
+            // remove listener
+            removeEventListener(listener)
+        }
+    }
 }

app/src/main/java/h_mal/appttude/com/driver/utils/ViewUtils.kt

@@ -19,6 +19,7 @@ import androidx.annotation.DrawableRes
 import androidx.appcompat.widget.SearchView
 import androidx.fragment.app.Fragment
 import com.bumptech.glide.Glide
+import com.google.firebase.storage.StorageReference
 import com.squareup.picasso.Picasso
 import com.squareup.picasso.Target
 import h_mal.appttude.com.driver.R
@@ -58,6 +59,7 @@ fun ImageView.setGlideImage(
         .into(this)
 }
 
+
 @SuppressLint("CheckResult")
 fun ImageView.setGlideImage(
     url: Uri?,
@@ -73,6 +75,22 @@ fun ImageView.setGlideImage(
         .into(this)
 }
 
+fun ImageView.setGlideImage(
+    ref: StorageReference?,
+    @DrawableRes placeholderRes: Int = R.drawable.choice_img_round
+) {
+
+    val c = Glide.with(context)
+        .load(ref)
+    viewTreeObserver.addOnPreDrawListener {
+        c.override(width, height)
+        true
+    }
+    c.placeholder(placeholderRes)
+        .fitCenter()
+        .into(this)
+}
+
 fun ImageView.setPicassoImage(
     url: String?,
     @DrawableRes placeholderRes: Int = R.drawable.choice_img_round

app/src/main/java/h_mal/appttude/com/driver/viewmodels/MainViewModel.kt

@@ -21,11 +21,7 @@ class MainViewModel(
     }
 
 
-    fun getUserDetails() {
+    fun getUserDetails() = firebaseAuth.getUser()
-        firebaseAuth.getUser()?.let {
-            onSuccess(it)
-        }
-    }
 
     fun logOut() {
         firebaseAuth.logOut()

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

@@ -19,7 +19,7 @@
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
         android:layout_gravity="start"
-        android:fitsSystemWindows="true"
+        android:fitsSystemWindows="false"
         app:itemTextColor="@android:color/white"
         app:headerLayout="@layout/nav_header_main"
         app:menu="@menu/activity_main_drawer">

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

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.drawerlayout.widget.DrawerLayout 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:id="@+id/drawer_layout"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:fitsSystemWindows="true"
+    tools:openDrawer="start">
+
+    <fragment
+        android:id="@+id/container"
+        android:name="androidx.navigation.fragment.NavHostFragment"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        app:defaultNavHost="true"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:navGraph="@navigation/main_navigation"
+        tools:context=".ui.auth.AuthActivity"
+        tools:ignore="FragmentTagUsage" />
+
+</androidx.drawerlayout.widget.DrawerLayout>

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

@@ -34,7 +34,7 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        app:navGraph="@navigation/main_navigation"
+        app:navGraph="@navigation/home_navigation"
         tools:context=".ui.auth.AuthActivity"
         tools:ignore="FragmentTagUsage" />
 

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

@@ -0,0 +1,55 @@
+<?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:id="@+id/container"
+    style="@style/parent_constraint_layout"
+    tools:context="h_mal.appttude.com.driver.ui.DriverHomeFragment">
+
+    <ImageView
+        android:id="@+id/prova_logo"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="24dp"
+        android:layout_marginTop="48dp"
+        android:layout_marginEnd="24dp"
+        android:adjustViewBounds="true"
+        android:src="@drawable/choice_img_round"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintWidth_percent=".50"
+        android:contentDescription="@string/image_description" />
+
+    <TextView
+        android:id="@+id/prova_title_tv"
+        style="@style/headerStyle"
+        android:layout_marginBottom="12dp"
+        android:text="@string/welcome_title"
+        android:layout_marginTop="24dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/prova_logo" />
+
+    <TextView
+        android:id="@+id/subheader"
+        style="@style/subheader"
+        android:layout_marginTop="12dp"
+        android:text="@string/welcome_subtitle"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/prova_title_tv" />
+
+    <com.google.android.material.button.MaterialButton
+        android:id="@+id/enter"
+        style="@style/TextButton.WithIcon"
+        android:layout_marginBottom="12dp"
+        android:text="@string/enter"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/subheader"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_bias="0.8" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/menu/activity_main_drawer.xml

@@ -6,12 +6,21 @@
     <item android:title="@string/user_profile">
         <menu>
             <item
-                android:id="@+id/nav_user_settings"
+                android:id="@+id/nav_update_profile"
                 android:icon="@drawable/ic_baseline_assignment_ind_24"
                 android:title="@string/update_user_profile" />
+            <item
+                android:id="@+id/nav_update_email"
+                android:icon="@drawable/ic_baseline_assignment_ind_24"
+                android:title="@string/update_email" />
+            <item
+                android:id="@+id/nav_update_password"
+                android:icon="@drawable/ic_baseline_assignment_ind_24"
+                android:title="@string/update_password" />
+            <item
+                android:id="@+id/nav_delete_profile"
+                android:icon="@drawable/ic_baseline_assignment_ind_24"
+                android:title="@string/delete_profile" />
         </menu>
-
-
     </item>
-
 </menu>

app/src/main/res/navigation/home_navigation.xml

@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<navigation 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"
+    app:startDestination="@id/homeFragment">
+
+    <fragment
+        android:id="@+id/homeFragment"
+        android:name="h_mal.appttude.com.driver.ui.HomeFragment"
+        android:label="Home"
+        tools:layout="@layout/fragment_home" />
+    <fragment
+        android:id="@+id/nav_update_email"
+        android:name="h_mal.appttude.com.driver.ui.update.UpdateEmailFragment"
+        android:label="UpdateEmailFragment"
+        tools:layout="@layout/fragment_update_email" />
+    <fragment
+        android:id="@+id/nav_update_password"
+        android:name="h_mal.appttude.com.driver.ui.update.UpdatePasswordFragment"
+        android:label="UpdatePasswordFragment"
+        tools:layout="@layout/fragment_update_password" />
+    <fragment
+        android:id="@+id/nav_update_profile"
+        android:name="h_mal.appttude.com.driver.ui.update.UpdateProfileFragment"
+        android:label="fragment_update_profile"
+        tools:layout="@layout/fragment_update_profile" />
+    <fragment
+        android:id="@+id/nav_delete_profile"
+        android:name="h_mal.appttude.com.driver.ui.update.DeleteProfileFragment"
+        android:label="fragment_delete_profile"
+        tools:layout="@layout/fragment_delete_profile" />
+</navigation>

app/src/main/res/values/strings.xml

@@ -117,4 +117,7 @@
     <string name="no_authorization_subtext">There is a problem with authentication.</string>
     <string name="image_icon_for_feedback_view">Image icon for feedback view.</string>
     <string name="user_status">user status</string>
+    <!-- TODO: Remove or change this placeholder text -->
+    <string name="hello_blank_fragment">Hello blank fragment</string>
+    <string name="enter">Continue</string>
 </resources>