- flavours compartmentalised

Took 10 hours 11 minutes

app/src/main/AndroidManifest.xml

@@ -1,18 +1,47 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="h_mal.appttude.com">
+    package="h_mal.appttude.com.driver">
     <!-- To auto-complete the email text field in the login form with the user's emails -->
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
 
     <application
-        android:name="h_mal.appttude.com.application.DriverApplication"
+        android:name="h_mal.appttude.com.driver.application.DriverApplication"
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
+        <activity
+            android:name="h_mal.appttude.com.driver.ui.user.LoginActivity"
+            android:label="@string/app_name"
+            android:theme="@style/AppTheme.NoActionBar.User"
+            android:exported="true">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <action android:name="android.intent.action.VIEW" />
 
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+        <activity
+            android:name="h_mal.appttude.com.driver.ui.MainActivity"
+            android:configChanges="orientation|screenSize"
+            android:label="@string/app_name"
+            android:theme="@style/AppTheme.NoActionBar" />
+        <activity
+            android:name="h_mal.appttude.com.driver.ui.update.UpdateActivity"
+            android:theme="@style/AppTheme.NoActionBar.Update" />
+
+        <provider
+            android:name="androidx.core.content.FileProvider"
+            android:authorities="h_mal.appttude.com.driver"
+            android:exported="false"
+            android:grantUriPermissions="true">
+            <meta-data
+                android:name="android.support.FILE_PROVIDER_PATHS"
+                android:resource="@xml/file_paths" />
+        </provider>
     </application>
 
 </manifest>

app/src/main/java/h_mal/appttude/com/data/Roles.kt

@@ -1,4 +0,0 @@
-package h_mal.appttude.com.data
-
-const val DRIVER = "driver"
-const val ADMIN = "super_user"

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

@@ -1,11 +1,11 @@
-package h_mal.appttude.com.application
+package h_mal.appttude.com.driver.application
 
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.ViewModelProvider
-import h_mal.appttude.com.data.FirebaseAuthSource
-import h_mal.appttude.com.data.FirebaseDatabaseSource
-import h_mal.appttude.com.data.FirebaseStorageSource
-import h_mal.appttude.com.viewmodels.*
+import h_mal.appttude.com.driver.data.FirebaseAuthSource
+import h_mal.appttude.com.driver.data.FirebaseDatabaseSource
+import h_mal.appttude.com.driver.data.FirebaseStorageSource
+import h_mal.appttude.com.driver.viewmodels.*
 
 class ApplicationViewModelFactory(
     private val auth: FirebaseAuthSource,

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

@@ -1,9 +1,9 @@
-package h_mal.appttude.com.application
+package h_mal.appttude.com.driver.application
 
 import android.app.Application
-import h_mal.appttude.com.data.FirebaseAuthSource
-import h_mal.appttude.com.data.FirebaseDatabaseSource
-import h_mal.appttude.com.data.FirebaseStorageSource
+import h_mal.appttude.com.driver.data.FirebaseAuthSource
+import h_mal.appttude.com.driver.data.FirebaseDatabaseSource
+import h_mal.appttude.com.driver.data.FirebaseStorageSource
 import org.kodein.di.Kodein
 import org.kodein.di.KodeinAware
 import org.kodein.di.android.x.androidXModule

app/src/main/java/h_mal/appttude/com/driver/archive/ArchiveFragment.kt

@@ -1,4 +1,4 @@
-package h_mal.appttude.com.Archive
+package h_mal.appttude.com.driver.archive
 
 import android.os.Bundle
 import android.view.LayoutInflater
@@ -7,7 +7,7 @@ import android.view.ViewGroup
 import android.widget.ListView
 import androidx.fragment.app.Fragment
 import com.google.firebase.database.DatabaseReference
-import h_mal.appttude.com.R
+import h_mal.appttude.com.driver.R
 
 class ArchiveFragment : Fragment() {
     //    var archive: ArchiveObject? = null

app/src/main/java/h_mal/appttude/com/driver/archive/ArchiveObjectListAdapter.kt

@@ -1,14 +1,14 @@
-package h_mal.appttude.com.Archive
+package h_mal.appttude.com.driver.archive
 
-//import h_mal.appttude.com.Global.FirebaseClass
-//import h_mal.appttude.com.Global.ImageSwiperClass
-//import h_mal.appttude.com.Objects.ArchiveObject
+//import h_mal.appttude.com.driver.Global.FirebaseClass
+//import h_mal.appttude.com.driver.Global.ImageSwiperClass
+//import h_mal.appttude.com.driver.Objects.ArchiveObject
 import android.content.Context
 import android.view.View
 import android.view.ViewGroup
 import android.widget.BaseAdapter
 import android.widget.TextView
-import h_mal.appttude.com.utils.DateUtils.convertDateStringDatePattern
+import h_mal.appttude.com.driver.utils.DateUtils.convertDateStringDatePattern
 import java.text.ParseException
 
 class ArchiveObjectListAdapter(

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

@@ -1,4 +1,4 @@
-package h_mal.appttude.com.base
+package h_mal.appttude.com.driver.base
 
 import android.content.Intent
 import android.os.Bundle
@@ -12,10 +12,10 @@ import androidx.appcompat.app.AppCompatActivity
 import androidx.lifecycle.ViewModelLazy
 import androidx.test.espresso.IdlingResource
 import androidx.viewbinding.ViewBinding
-import h_mal.appttude.com.R
-import h_mal.appttude.com.application.ApplicationViewModelFactory
-import h_mal.appttude.com.data.ViewState
-import h_mal.appttude.com.utils.*
+import h_mal.appttude.com.driver.R
+import h_mal.appttude.com.driver.application.ApplicationViewModelFactory
+import h_mal.appttude.com.driver.data.ViewState
+import h_mal.appttude.com.driver.utils.*
 import org.kodein.di.KodeinAware
 import org.kodein.di.android.kodein
 import org.kodein.di.generic.instance
@@ -29,16 +29,18 @@ abstract class BaseActivity<V : BaseViewModel, VB : ViewBinding> : AppCompatActi
     private lateinit var loadingView: View
 
     private var _binding: VB? = null
-    private val binding: VB
+    val binding: VB
         get() = _binding ?: error("Must only access binding while fragment is attached.")
 
-
     val viewModel: V by createLazyViewModel()
 
     override val kodein by kodein()
-    val factory by instance<ApplicationViewModelFactory>()
+    private val factory by instance<ApplicationViewModelFactory>()
 
-    fun createLazyViewModel(): Lazy<V> = ViewModelLazy(
+    /**
+     * Create a lazy viewmodel based on the generic view model [V].
+     */
+    private fun createLazyViewModel(): Lazy<V> = ViewModelLazy(
         getGenericClassAt(0),
         { viewModelStore },
         { factory },
@@ -52,7 +54,10 @@ abstract class BaseActivity<V : BaseViewModel, VB : ViewBinding> : AppCompatActi
             ?.kotlin
             ?: throw IllegalStateException("Can not find class from generic argument")
 
-    fun inflateBindingByType(
+    /**
+     * Create a view binding out of the the generic [VB]
+     */
+    private fun inflateBindingByType(
         genericClassAt: KClass<VB>
     ): VB = try {
         @Suppress("UNCHECKED_CAST")
@@ -74,8 +79,14 @@ abstract class BaseActivity<V : BaseViewModel, VB : ViewBinding> : AppCompatActi
         setupView(binding)
     }
 
+
     open fun setupView(binding: VB) {}
 
+    /**
+     * Extension function which can be used in our child class for binding.
+     *
+     * @sample applyBinding { textView.text = "Hello" }
+     */
     fun applyBinding(block: VB.() -> Unit) {
         block(binding)
     }

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

@@ -1,4 +1,4 @@
-package h_mal.appttude.com.base
+package h_mal.appttude.com.driver.base
 
 import android.app.Activity
 import android.content.ClipData
@@ -11,9 +11,9 @@ import android.view.ViewGroup
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.createViewModelLazy
 import androidx.viewbinding.ViewBinding
-import h_mal.appttude.com.application.ApplicationViewModelFactory
-import h_mal.appttude.com.data.ViewState
-import h_mal.appttude.com.utils.PermissionsUtils
+import h_mal.appttude.com.driver.application.ApplicationViewModelFactory
+import h_mal.appttude.com.driver.data.ViewState
+import h_mal.appttude.com.driver.utils.PermissionsUtils
 import org.kodein.di.KodeinAware
 import org.kodein.di.android.x.kodein
 import org.kodein.di.generic.instance

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

@@ -1,9 +1,9 @@
-package h_mal.appttude.com.base
+package h_mal.appttude.com.driver.base
 
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
-import h_mal.appttude.com.data.ViewState
-import h_mal.appttude.com.utils.Event
+import h_mal.appttude.com.driver.data.ViewState
+import h_mal.appttude.com.driver.utils.Event
 
 abstract class BaseViewModel : ViewModel() {
     open val uiState: MutableLiveData<ViewState> = MutableLiveData()

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

@@ -1,4 +1,4 @@
-package h_mal.appttude.com.base
+package h_mal.appttude.com.driver.base
 
 import android.Manifest
 import android.content.Intent
@@ -8,10 +8,10 @@ import android.view.View
 import android.widget.EditText
 import androidx.core.widget.doAfterTextChanged
 import androidx.viewbinding.ViewBinding
-import h_mal.appttude.com.data.UserAuthState
-import h_mal.appttude.com.ui.user.LoginActivity
-import h_mal.appttude.com.utils.PermissionsUtils.askForPermissions
-import h_mal.appttude.com.utils.TextValidationUtils.validateEditText
+import h_mal.appttude.com.driver.data.UserAuthState
+import h_mal.appttude.com.driver.ui.user.LoginActivity
+import h_mal.appttude.com.driver.utils.PermissionsUtils.askForPermissions
+import h_mal.appttude.com.driver.utils.TextValidationUtils.validateEditText
 
 private const val IMAGE_PERMISSION_RESULT = 402
 

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

@@ -1,15 +1,15 @@
-package h_mal.appttude.com.base
+package h_mal.appttude.com.driver.base
 
 import android.net.Uri
 import com.google.firebase.database.DatabaseReference
 import com.google.firebase.storage.StorageReference
-import h_mal.appttude.com.data.FirebaseAuthentication
-import h_mal.appttude.com.data.FirebaseCompletion
-import h_mal.appttude.com.data.FirebaseDatabaseSource
-import h_mal.appttude.com.data.FirebaseStorageSource
-import h_mal.appttude.com.utils.Coroutines.io
-import h_mal.appttude.com.utils.DateUtils.getDateTimeStamp
-import h_mal.appttude.com.utils.getDataFromDatabaseRef
+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.data.FirebaseStorageSource
+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

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

@@ -0,0 +1,99 @@
+package h_mal.appttude.com.driver.base
+
+import android.os.Bundle
+import android.view.MenuItem
+import androidx.appcompat.widget.Toolbar
+import androidx.core.view.GravityCompat
+import androidx.drawerlayout.widget.DrawerLayout
+import androidx.navigation.NavController
+import androidx.navigation.findNavController
+import androidx.navigation.ui.AppBarConfiguration
+import androidx.navigation.ui.navigateUp
+import androidx.navigation.ui.setupActionBarWithNavController
+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.databinding.NavHeaderMainBinding
+import h_mal.appttude.com.driver.dialogs.ExitDialog.displayExitDialog
+import h_mal.appttude.com.driver.utils.isTrue
+import h_mal.appttude.com.driver.utils.setGlideImage
+
+abstract class DrawerActivity<V : BaseViewModel, VB : ViewBinding> : BaseActivity<V, VB>(),
+    NavigationView.OnNavigationItemSelectedListener {
+
+    abstract val containerId: Int
+    abstract val drawerLayoutId: Int
+    abstract val toolbarId: Int
+    abstract val navViewId:Int
+
+    lateinit var navController: NavController
+    lateinit var appBarConfiguration: AppBarConfiguration
+
+    lateinit var toolbar: Toolbar
+    lateinit var drawerLayout: DrawerLayout
+    lateinit var navView: NavigationView
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        toolbar = findViewById(toolbarId)
+        drawerLayout = findViewById(drawerLayoutId)
+        navView = findViewById(navViewId)
+
+        setSupportActionBar(toolbar)
+        supportActionBar?.setDisplayShowTitleEnabled(false)
+        navController = findNavController(containerId)
+
+        appBarConfiguration = AppBarConfiguration(navController.graph, drawerLayout)
+        navView.setupWithNavController(navController)
+        setupActionBarWithNavController(navController, appBarConfiguration)
+
+    }
+
+    override fun onSupportNavigateUp(): Boolean {
+        return navController.navigateUp(appBarConfiguration) || super.onSupportNavigateUp()
+    }
+
+    override fun setTitle(title: CharSequence) {
+        toolbar.title = title
+    }
+
+    override fun onBackPressed() {
+        applyBinding {
+            if (drawerLayout.isDrawerOpen(GravityCompat.START)) {
+                drawerLayout.closeDrawer(GravityCompat.START)
+            } else {
+                navController.backQueue.size.let { it >= 1 }.isTrue {
+                    super.onBackPressed()
+                    return@applyBinding
+                }
+                displayExitDialog()
+            }
+        }
+    }
+
+    override fun onSuccess(data: Any?) {
+        super.onSuccess(data)
+        when (data) {
+            is FirebaseUser -> {
+                setupDrawer(data)
+            }
+        }
+    }
+
+    private fun setupDrawer(user: FirebaseUser) {
+        applyBinding {
+            NavHeaderMainBinding.inflate(layoutInflater).apply {
+                driverEmail.text = user.email
+                driverName.text = user.displayName
+                profileImage.setGlideImage(user.photoUrl)
+            }
+        }
+    }
+
+    override fun onNavigationItemSelected(item: MenuItem): Boolean {
+        drawerLayout.closeDrawer(GravityCompat.START)
+        return true
+    }
+}

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

@@ -1,4 +1,4 @@
-package h_mal.appttude.com.data
+package h_mal.appttude.com.driver.data
 
 import com.google.firebase.database.DataSnapshot
 import com.google.firebase.database.DatabaseError

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

@@ -1,4 +1,4 @@
-package h_mal.appttude.com.data
+package h_mal.appttude.com.driver.data
 
 import android.net.Uri
 import com.google.android.gms.tasks.Task

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

@@ -1,4 +1,4 @@
-package h_mal.appttude.com.data
+package h_mal.appttude.com.driver.data
 
 import androidx.lifecycle.LiveData
 import com.google.firebase.auth.FirebaseAuth

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

@@ -1,4 +1,4 @@
-package h_mal.appttude.com.data
+package h_mal.appttude.com.driver.data
 
 import android.net.Uri
 import com.google.android.gms.tasks.Task

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

@@ -1,4 +1,4 @@
-package h_mal.appttude.com.data
+package h_mal.appttude.com.driver.data
 
 sealed class FirebaseCompletion {
     object Default : FirebaseCompletion()

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

@@ -1,4 +1,4 @@
-package h_mal.appttude.com.data
+package h_mal.appttude.com.driver.data
 
 import com.google.firebase.database.DatabaseReference
 import com.google.firebase.database.FirebaseDatabase

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

@@ -1,4 +1,4 @@
-package h_mal.appttude.com.data
+package h_mal.appttude.com.driver.data
 
 import android.net.Uri
 import com.google.firebase.storage.FirebaseStorage

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

@@ -0,0 +1,4 @@
+package h_mal.appttude.com.driver.data
+
+const val DRIVER = "driver"
+const val ADMIN = "super_user"

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

@@ -1,4 +1,4 @@
-package h_mal.appttude.com.data
+package h_mal.appttude.com.driver.data
 
 import com.google.firebase.auth.FirebaseUser
 

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

@@ -1,6 +1,6 @@
-package h_mal.appttude.com.data
+package h_mal.appttude.com.driver.data
 
-import h_mal.appttude.com.utils.Event
+import h_mal.appttude.com.driver.utils.Event
 
 
 sealed class ViewState {

app/src/main/java/h_mal/appttude/com/driver/dialogs/DateDialog.kt

@@ -1,12 +1,12 @@
-package h_mal.appttude.com.dialogs
+package h_mal.appttude.com.driver.dialogs
 
 
 import android.app.DatePickerDialog
 import android.app.DatePickerDialog.OnDateSetListener
 import android.icu.util.Calendar
 import android.widget.EditText
-import h_mal.appttude.com.R
-import h_mal.appttude.com.utils.DateUtils
+import h_mal.appttude.com.driver.R
+import h_mal.appttude.com.driver.utils.DateUtils
 
 
 private const val DATE_FORMAT = "dd/MM/yyyy"

app/src/main/java/h_mal/appttude/com/driver/dialogs/ExitDialog.kt

@@ -1,8 +1,8 @@
-package h_mal.appttude.com.dialogs
+package h_mal.appttude.com.driver.dialogs
 
 import android.app.Activity
 import android.app.AlertDialog
-import h_mal.appttude.com.R
+import h_mal.appttude.com.driver.R
 import kotlin.system.exitProcess
 
 object ExitDialog {

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

@@ -1,4 +1,4 @@
-package h_mal.appttude.com.model
+package h_mal.appttude.com.driver.model
 
 data class DriverProfile(
     var driverPic: String? = null,

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

@@ -1,4 +1,4 @@
-package h_mal.appttude.com.model
+package h_mal.appttude.com.driver.model
 
 
 data class DriversLicense(

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

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

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

@@ -1,4 +1,4 @@
-package h_mal.appttude.com.model
+package h_mal.appttude.com.driver.model
 
 
 data class Logbook(

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

@@ -1,4 +1,4 @@
-package h_mal.appttude.com.model
+package h_mal.appttude.com.driver.model
 
 
 data class Mot(

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

@@ -1,4 +1,4 @@
-package h_mal.appttude.com.model
+package h_mal.appttude.com.driver.model
 
 
 data class PrivateHireLicense(

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

@@ -1,4 +1,4 @@
-package h_mal.appttude.com.model
+package h_mal.appttude.com.driver.model
 
 
 class PrivateHireVehicle(

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

@@ -1,4 +1,4 @@
-package h_mal.appttude.com.model
+package h_mal.appttude.com.driver.model
 
 
 data class VehicleProfile(

app/src/main/java/h_mal/appttude/com/driver/ui/.idea/dictionaries

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectDictionaryState">
+    <dictionary name="h_mal" />
+  </component>
+</project>

app/src/main/java/h_mal/appttude/com/driver/ui/.idea/kotlinc.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="Kotlin2JsCompilerArguments">
+    <option name="sourceMapEmbedSources" />
+  </component>
+</project>

app/src/main/java/h_mal/appttude/com/driver/ui/.idea/misc.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="CMakeSettings">
+    <configurations>
+      <configuration PROFILE_NAME="Debug" CONFIG_NAME="Debug" />
+    </configurations>
+  </component>
+  <component name="ProjectRootManager">
+    <output url="file://$PROJECT_DIR$/out" />
+  </component>
+</project>

app/src/main/java/h_mal/appttude/com/driver/ui/.idea/modules.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/ui.iml" filepath="$PROJECT_DIR$/ui.iml" />
+    </modules>
+  </component>
+</project>

app/src/main/java/h_mal/appttude/com/driver/ui/.idea/vcs.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$/../../../../../../../.." vcs="Git" />
+  </component>
+</project>

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

@@ -1,10 +1,10 @@
-package h_mal.appttude.com.ui.update
+package h_mal.appttude.com.driver.ui.update
 
-import h_mal.appttude.com.base.BaseFragment
-import h_mal.appttude.com.databinding.FragmentDeleteProfileBinding
-import h_mal.appttude.com.utils.TextValidationUtils.validatePasswordEditText
-import h_mal.appttude.com.utils.setEnterPressedListener
-import h_mal.appttude.com.viewmodels.UpdateUserViewModel
+import h_mal.appttude.com.driver.base.BaseFragment
+import h_mal.appttude.com.driver.databinding.FragmentDeleteProfileBinding
+import h_mal.appttude.com.driver.utils.TextValidationUtils.validatePasswordEditText
+import h_mal.appttude.com.driver.utils.setEnterPressedListener
+import h_mal.appttude.com.driver.viewmodels.UpdateUserViewModel
 
 
 class DeleteProfileFragment :

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

@@ -0,0 +1,17 @@
+package h_mal.appttude.com.driver.ui.update
+
+import h_mal.appttude.com.driver.base.BaseActivity
+import h_mal.appttude.com.driver.data.FirebaseCompletion
+import h_mal.appttude.com.driver.databinding.UpdateActivityBinding
+import h_mal.appttude.com.driver.utils.displayToast
+import h_mal.appttude.com.driver.viewmodels.UpdateUserViewModel
+
+class UpdateActivity : BaseActivity<UpdateUserViewModel, UpdateActivityBinding>() {
+
+    override fun onSuccess(data: Any?) {
+        super.onSuccess(data)
+        when (data) {
+            is FirebaseCompletion.Changed -> displayToast(data.message)
+        }
+    }
+}

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

@@ -1,11 +1,11 @@
-package h_mal.appttude.com.ui.update
+package h_mal.appttude.com.driver.ui.update
 
-import h_mal.appttude.com.base.BaseFragment
-import h_mal.appttude.com.databinding.FragmentUpdateEmailBinding
-import h_mal.appttude.com.utils.TextValidationUtils.validateEmailEditText
-import h_mal.appttude.com.utils.TextValidationUtils.validatePasswordEditText
-import h_mal.appttude.com.utils.setEnterPressedListener
-import h_mal.appttude.com.viewmodels.UpdateUserViewModel
+import h_mal.appttude.com.driver.base.BaseFragment
+import h_mal.appttude.com.driver.databinding.FragmentUpdateEmailBinding
+import h_mal.appttude.com.driver.utils.TextValidationUtils.validateEmailEditText
+import h_mal.appttude.com.driver.utils.TextValidationUtils.validatePasswordEditText
+import h_mal.appttude.com.driver.utils.setEnterPressedListener
+import h_mal.appttude.com.driver.viewmodels.UpdateUserViewModel
 
 
 class UpdateEmailFragment : BaseFragment<UpdateUserViewModel, FragmentUpdateEmailBinding>() {

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

@@ -1,11 +1,11 @@
-package h_mal.appttude.com.ui.update
+package h_mal.appttude.com.driver.ui.update
 
 import android.view.View
-import h_mal.appttude.com.R
-import h_mal.appttude.com.base.BaseFragment
-import h_mal.appttude.com.databinding.UpdateOverviewFragmentBinding
-import h_mal.appttude.com.utils.navigateTo
-import h_mal.appttude.com.viewmodels.UpdateUserViewModel
+import h_mal.appttude.com.driver.R
+import h_mal.appttude.com.driver.base.BaseFragment
+import h_mal.appttude.com.driver.databinding.UpdateOverviewFragmentBinding
+import h_mal.appttude.com.driver.utils.navigateTo
+import h_mal.appttude.com.driver.viewmodels.UpdateUserViewModel
 
 class UpdateOverviewFragment : BaseFragment<UpdateUserViewModel, UpdateOverviewFragmentBinding>(),
     View.OnClickListener {

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

@@ -1,11 +1,11 @@
-package h_mal.appttude.com.ui.update
+package h_mal.appttude.com.driver.ui.update
 
-import h_mal.appttude.com.base.BaseFragment
-import h_mal.appttude.com.databinding.FragmentUpdatePasswordBinding
-import h_mal.appttude.com.utils.TextValidationUtils.validateEmailEditText
-import h_mal.appttude.com.utils.TextValidationUtils.validatePasswordEditText
-import h_mal.appttude.com.utils.setEnterPressedListener
-import h_mal.appttude.com.viewmodels.UpdateUserViewModel
+import h_mal.appttude.com.driver.base.BaseFragment
+import h_mal.appttude.com.driver.databinding.FragmentUpdatePasswordBinding
+import h_mal.appttude.com.driver.utils.TextValidationUtils.validateEmailEditText
+import h_mal.appttude.com.driver.utils.TextValidationUtils.validatePasswordEditText
+import h_mal.appttude.com.driver.utils.setEnterPressedListener
+import h_mal.appttude.com.driver.viewmodels.UpdateUserViewModel
 
 
 class UpdatePasswordFragment : BaseFragment<UpdateUserViewModel, FragmentUpdatePasswordBinding>() {

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

@@ -1,15 +1,15 @@
-package h_mal.appttude.com.ui.update
+package h_mal.appttude.com.driver.ui.update
 
 import android.Manifest.permission.READ_EXTERNAL_STORAGE
 import android.net.Uri
 import androidx.core.widget.doAfterTextChanged
 import com.google.firebase.auth.FirebaseUser
-import h_mal.appttude.com.base.BaseFragment
-import h_mal.appttude.com.databinding.FragmentUpdateProfileBinding
-import h_mal.appttude.com.utils.PermissionsUtils.askForPermissions
-import h_mal.appttude.com.utils.setEnterPressedListener
-import h_mal.appttude.com.utils.setGlideImage
-import h_mal.appttude.com.viewmodels.UpdateUserViewModel
+import h_mal.appttude.com.driver.base.BaseFragment
+import h_mal.appttude.com.driver.databinding.FragmentUpdateProfileBinding
+import h_mal.appttude.com.driver.utils.PermissionsUtils.askForPermissions
+import h_mal.appttude.com.driver.utils.setEnterPressedListener
+import h_mal.appttude.com.driver.utils.setGlideImage
+import h_mal.appttude.com.driver.viewmodels.UpdateUserViewModel
 
 const val TAG_CONST = "non-user"
 private const val IMAGE_PERMISSION_RESULT = 402

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

@@ -1,9 +1,9 @@
-package h_mal.appttude.com.ui.user
+package h_mal.appttude.com.driver.ui.user
 
-import h_mal.appttude.com.base.BaseFragment
-import h_mal.appttude.com.databinding.FragmentForgotPasswordBinding
-import h_mal.appttude.com.utils.TextValidationUtils.validateEmailEditText
-import h_mal.appttude.com.viewmodels.UserViewModel
+import h_mal.appttude.com.driver.base.BaseFragment
+import h_mal.appttude.com.driver.databinding.FragmentForgotPasswordBinding
+import h_mal.appttude.com.driver.utils.TextValidationUtils.validateEmailEditText
+import h_mal.appttude.com.driver.viewmodels.UserViewModel
 
 
 class ForgotPasswordFragment : BaseFragment<UserViewModel, FragmentForgotPasswordBinding>() {

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

@@ -1,13 +1,13 @@
-package h_mal.appttude.com.ui.user
+package h_mal.appttude.com.driver.ui.user
 
 
 import android.content.Intent
 import com.google.firebase.auth.AuthResult
 import com.google.firebase.auth.FirebaseUser
-import h_mal.appttude.com.base.BaseActivity
-import h_mal.appttude.com.databinding.ActivityLoginBinding
-import h_mal.appttude.com.ui.MainActivity
-import h_mal.appttude.com.viewmodels.UserViewModel
+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.viewmodels.UserViewModel
 
 
 /**

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

@@ -1,13 +1,13 @@
-package h_mal.appttude.com.ui.user
+package h_mal.appttude.com.driver.ui.user
 
-import h_mal.appttude.com.R
-import h_mal.appttude.com.base.BaseFragment
-import h_mal.appttude.com.databinding.FragmentLoginBinding
-import h_mal.appttude.com.utils.TextValidationUtils.validateEmailEditText
-import h_mal.appttude.com.utils.TextValidationUtils.validatePasswordEditText
-import h_mal.appttude.com.utils.navigateTo
-import h_mal.appttude.com.utils.setEnterPressedListener
-import h_mal.appttude.com.viewmodels.UserViewModel
+import h_mal.appttude.com.driver.R
+import h_mal.appttude.com.driver.base.BaseFragment
+import h_mal.appttude.com.driver.databinding.FragmentLoginBinding
+import h_mal.appttude.com.driver.utils.TextValidationUtils.validateEmailEditText
+import h_mal.appttude.com.driver.utils.TextValidationUtils.validatePasswordEditText
+import h_mal.appttude.com.driver.utils.navigateTo
+import h_mal.appttude.com.driver.utils.setEnterPressedListener
+import h_mal.appttude.com.driver.viewmodels.UserViewModel
 
 class LoginFragment : BaseFragment<UserViewModel, FragmentLoginBinding>() {
 

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

@@ -1,12 +1,12 @@
-package h_mal.appttude.com.ui.user
+package h_mal.appttude.com.driver.ui.user
 
-import h_mal.appttude.com.R
-import h_mal.appttude.com.base.BaseFragment
-import h_mal.appttude.com.databinding.FragmentRegisterBinding
-import h_mal.appttude.com.utils.TextValidationUtils.validateEmailEditText
-import h_mal.appttude.com.utils.TextValidationUtils.validatePasswordEditText
-import h_mal.appttude.com.utils.setEnterPressedListener
-import h_mal.appttude.com.viewmodels.UserViewModel
+import h_mal.appttude.com.driver.R
+import h_mal.appttude.com.driver.base.BaseFragment
+import h_mal.appttude.com.driver.databinding.FragmentRegisterBinding
+import h_mal.appttude.com.driver.utils.TextValidationUtils.validateEmailEditText
+import h_mal.appttude.com.driver.utils.TextValidationUtils.validatePasswordEditText
+import h_mal.appttude.com.driver.utils.setEnterPressedListener
+import h_mal.appttude.com.driver.viewmodels.UserViewModel
 
 class RegisterFragment :
     BaseFragment<UserViewModel, FragmentRegisterBinding>() {

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

@@ -1,13 +1,13 @@
-package h_mal.appttude.com.ui.user
+package h_mal.appttude.com.driver.ui.user
 
 import android.os.Bundle
 import android.view.View
-import h_mal.appttude.com.R
-import h_mal.appttude.com.base.BaseFragment
-import h_mal.appttude.com.data.FirebaseCompletion
-import h_mal.appttude.com.databinding.SplashScreenBinding
-import h_mal.appttude.com.utils.navigateTo
-import h_mal.appttude.com.viewmodels.UserViewModel
+import h_mal.appttude.com.driver.R
+import h_mal.appttude.com.driver.base.BaseFragment
+import h_mal.appttude.com.driver.data.FirebaseCompletion
+import h_mal.appttude.com.driver.databinding.SplashScreenBinding
+import h_mal.appttude.com.driver.utils.navigateTo
+import h_mal.appttude.com.driver.viewmodels.UserViewModel
 
 
 class SplashScreenFragment : BaseFragment<UserViewModel, SplashScreenBinding>() {

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

@@ -1,4 +1,4 @@
-package h_mal.appttude.com.utils
+package h_mal.appttude.com.driver.utils
 
 import android.content.Context
 import android.content.Intent

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

@@ -1,4 +1,4 @@
-package h_mal.appttude.com.utils
+package h_mal.appttude.com.driver.utils
 
 import android.view.View
 import android.view.animation.Animation

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

@@ -1,4 +1,4 @@
-package h_mal.appttude.com.utils
+package h_mal.appttude.com.driver.utils
 
 import androidx.test.espresso.IdlingResource
 import androidx.test.espresso.IdlingResource.ResourceCallback

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

@@ -1,4 +1,4 @@
-package h_mal.appttude.com.utils
+package h_mal.appttude.com.driver.utils
 
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers

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

@@ -1,4 +1,4 @@
-package h_mal.appttude.com.utils
+package h_mal.appttude.com.driver.utils
 
 import android.icu.util.Calendar
 import java.text.ParseException

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

@@ -1,4 +1,4 @@
-package h_mal.appttude.com.utils
+package h_mal.appttude.com.driver.utils
 
 
 inline fun Boolean.isTrue(block: () -> Unit){

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

@@ -1,10 +1,10 @@
-package h_mal.appttude.com.utils
+package h_mal.appttude.com.driver.utils
 
 import com.google.firebase.database.DataSnapshot
 import com.google.firebase.database.DatabaseError
 import com.google.firebase.database.DatabaseReference
 import com.google.firebase.database.ValueEventListener
-import h_mal.appttude.com.data.EventResponse
+import h_mal.appttude.com.driver.data.EventResponse
 import kotlin.coroutines.resume
 import kotlin.coroutines.suspendCoroutine
 

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

@@ -1,4 +1,4 @@
-package h_mal.appttude.com.utils
+package h_mal.appttude.com.driver.utils
 
 
 open class Event<out T>(private val content: T) {

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

@@ -1,4 +1,4 @@
-package h_mal.appttude.com.utils
+package h_mal.appttude.com.driver.utils
 
 import android.content.Context
 import android.content.Intent

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

@@ -1,4 +1,4 @@
-package h_mal.appttude.com.utils
+package h_mal.appttude.com.driver.utils
 
 enum class Navigations(val value: String) {
     Main("MainActivity");

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

@@ -1,4 +1,4 @@
-package h_mal.appttude.com.utils
+package h_mal.appttude.com.driver.utils
 
 import android.app.Activity
 import android.content.Context

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

@@ -1,7 +1,7 @@
-package h_mal.appttude.com.utils
+package h_mal.appttude.com.driver.utils
 
 import android.widget.EditText
-import h_mal.appttude.com.R
+import h_mal.appttude.com.driver.R
 
 
 object TextValidationUtils {

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

@@ -1,4 +1,4 @@
-package h_mal.appttude.com.utils
+package h_mal.appttude.com.driver.utils
 
 import android.annotation.SuppressLint
 import android.app.Activity
@@ -23,7 +23,7 @@ import androidx.fragment.app.Fragment
 import com.bumptech.glide.Glide
 import com.squareup.picasso.Picasso
 import com.squareup.picasso.Target
-import h_mal.appttude.com.R
+import h_mal.appttude.com.driver.R
 
 fun View.show() {
     this.visibility = View.VISIBLE

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

@@ -1,14 +1,14 @@
-package h_mal.appttude.com.viewmodels
+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.base.DataSubmissionBaseViewModel
-import h_mal.appttude.com.data.FirebaseAuthentication
-import h_mal.appttude.com.data.FirebaseDatabaseSource
-import h_mal.appttude.com.data.FirebaseStorageSource
-import h_mal.appttude.com.model.DriversLicense
-import h_mal.appttude.com.utils.Coroutines.io
+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.model.DriversLicense
+import h_mal.appttude.com.driver.utils.Coroutines.io
 
 class DriverLicenseViewModel(
     auth: FirebaseAuthentication,

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

@@ -1,14 +1,14 @@
-package h_mal.appttude.com.viewmodels
+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.base.DataSubmissionBaseViewModel
-import h_mal.appttude.com.data.FirebaseAuthentication
-import h_mal.appttude.com.data.FirebaseDatabaseSource
-import h_mal.appttude.com.data.FirebaseStorageSource
-import h_mal.appttude.com.model.DriverProfile
-import h_mal.appttude.com.utils.Coroutines.io
+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.model.DriverProfile
+import h_mal.appttude.com.driver.utils.Coroutines.io
 
 class DriverProfileViewModel(
     auth: FirebaseAuthentication,

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

@@ -1,14 +1,14 @@
-package h_mal.appttude.com.viewmodels
+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.base.DataSubmissionBaseViewModel
-import h_mal.appttude.com.data.FirebaseAuthentication
-import h_mal.appttude.com.data.FirebaseDatabaseSource
-import h_mal.appttude.com.data.FirebaseStorageSource
-import h_mal.appttude.com.model.Insurance
-import h_mal.appttude.com.utils.Coroutines.io
+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.model.Insurance
+import h_mal.appttude.com.driver.utils.Coroutines.io
 
 class InsuranceViewModel(
     auth: FirebaseAuthentication,

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

@@ -1,14 +1,14 @@
-package h_mal.appttude.com.viewmodels
+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.base.DataSubmissionBaseViewModel
-import h_mal.appttude.com.data.FirebaseAuthentication
-import h_mal.appttude.com.data.FirebaseDatabaseSource
-import h_mal.appttude.com.data.FirebaseStorageSource
-import h_mal.appttude.com.model.Logbook
-import h_mal.appttude.com.utils.Coroutines.io
+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.model.Logbook
+import h_mal.appttude.com.driver.utils.Coroutines.io
 
 class LogbookViewModel(
     auth: FirebaseAuthentication,

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

@@ -1,10 +1,10 @@
-package h_mal.appttude.com.viewmodels
+package h_mal.appttude.com.driver.viewmodels
 
-import h_mal.appttude.com.base.BaseViewModel
-import h_mal.appttude.com.data.FirebaseAuthentication
-import h_mal.appttude.com.data.FirebaseDatabaseSource
-import h_mal.appttude.com.utils.Coroutines.io
-import h_mal.appttude.com.utils.getDataFromDatabaseRef
+import h_mal.appttude.com.driver.base.BaseViewModel
+import h_mal.appttude.com.driver.data.FirebaseAuthentication
+import h_mal.appttude.com.driver.data.FirebaseDatabaseSource
+import h_mal.appttude.com.driver.utils.Coroutines.io
+import h_mal.appttude.com.driver.utils.getDataFromDatabaseRef
 
 class MainViewModel(
     private val firebaseAuth: FirebaseAuthentication,

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

@@ -1,14 +1,14 @@
-package h_mal.appttude.com.viewmodels
+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.base.DataSubmissionBaseViewModel
-import h_mal.appttude.com.data.FirebaseAuthentication
-import h_mal.appttude.com.data.FirebaseDatabaseSource
-import h_mal.appttude.com.data.FirebaseStorageSource
-import h_mal.appttude.com.model.Mot
-import h_mal.appttude.com.utils.Coroutines.io
+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.model.Mot
+import h_mal.appttude.com.driver.utils.Coroutines.io
 
 class MotViewModel(
     auth: FirebaseAuthentication,

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

@@ -1,14 +1,14 @@
-package h_mal.appttude.com.viewmodels
+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.base.DataSubmissionBaseViewModel
-import h_mal.appttude.com.data.FirebaseAuthentication
-import h_mal.appttude.com.data.FirebaseDatabaseSource
-import h_mal.appttude.com.data.FirebaseStorageSource
-import h_mal.appttude.com.model.PrivateHireLicense
-import h_mal.appttude.com.utils.Coroutines.io
+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.model.PrivateHireLicense
+import h_mal.appttude.com.driver.utils.Coroutines.io
 
 class PrivateHireLicenseViewModel(
     auth: FirebaseAuthentication,

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

@@ -1,14 +1,14 @@
-package h_mal.appttude.com.viewmodels
+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.base.DataSubmissionBaseViewModel
-import h_mal.appttude.com.data.FirebaseAuthentication
-import h_mal.appttude.com.data.FirebaseDatabaseSource
-import h_mal.appttude.com.data.FirebaseStorageSource
-import h_mal.appttude.com.model.PrivateHireVehicle
-import h_mal.appttude.com.utils.Coroutines.io
+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.model.PrivateHireVehicle
+import h_mal.appttude.com.driver.utils.Coroutines.io
 
 class PrivateHireVehicleViewModel(
     auth: FirebaseAuthentication,

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

@@ -1,12 +1,12 @@
-package h_mal.appttude.com.viewmodels
+package h_mal.appttude.com.driver.viewmodels
 
 import com.google.firebase.database.DatabaseReference
 import com.google.firebase.storage.StorageReference
-import h_mal.appttude.com.base.DataSubmissionBaseViewModel
-import h_mal.appttude.com.data.FirebaseAuthentication
-import h_mal.appttude.com.data.FirebaseDatabaseSource
-import h_mal.appttude.com.data.FirebaseStorageSource
-import h_mal.appttude.com.utils.Coroutines.io
+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.utils.Coroutines.io
 
 class RoleViewModel(
     auth: FirebaseAuthentication,

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

@@ -1,11 +1,11 @@
-package h_mal.appttude.com.viewmodels
+package h_mal.appttude.com.driver.viewmodels
 
 import android.net.Uri
-import h_mal.appttude.com.base.BaseViewModel
-import h_mal.appttude.com.data.FirebaseAuthentication
-import h_mal.appttude.com.data.FirebaseCompletion
-import h_mal.appttude.com.data.FirebaseStorageSource
-import h_mal.appttude.com.utils.Coroutines.io
+import h_mal.appttude.com.driver.base.BaseViewModel
+import h_mal.appttude.com.driver.data.FirebaseAuthentication
+import h_mal.appttude.com.driver.data.FirebaseCompletion
+import h_mal.appttude.com.driver.data.FirebaseStorageSource
+import h_mal.appttude.com.driver.utils.Coroutines.io
 import kotlinx.coroutines.tasks.await
 
 class UpdateUserViewModel(

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

@@ -1,10 +1,10 @@
-package h_mal.appttude.com.viewmodels
+package h_mal.appttude.com.driver.viewmodels
 
 import com.google.firebase.auth.AuthResult
-import h_mal.appttude.com.base.BaseViewModel
-import h_mal.appttude.com.data.FirebaseAuthentication
-import h_mal.appttude.com.data.FirebaseCompletion
-import h_mal.appttude.com.utils.Coroutines.io
+import h_mal.appttude.com.driver.base.BaseViewModel
+import h_mal.appttude.com.driver.data.FirebaseAuthentication
+import h_mal.appttude.com.driver.data.FirebaseCompletion
+import h_mal.appttude.com.driver.utils.Coroutines.io
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.tasks.await
 

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

@@ -1,13 +1,13 @@
-package h_mal.appttude.com.viewmodels
+package h_mal.appttude.com.driver.viewmodels
 
 import com.google.firebase.database.DatabaseReference
 import com.google.firebase.storage.StorageReference
-import h_mal.appttude.com.base.DataSubmissionBaseViewModel
-import h_mal.appttude.com.data.FirebaseAuthentication
-import h_mal.appttude.com.data.FirebaseDatabaseSource
-import h_mal.appttude.com.data.FirebaseStorageSource
-import h_mal.appttude.com.model.VehicleProfile
-import h_mal.appttude.com.utils.Coroutines.io
+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.model.VehicleProfile
+import h_mal.appttude.com.driver.utils.Coroutines.io
 
 class VehicleProfileViewModel(
     auth: FirebaseAuthentication,

app/src/main/java/h_mal/appttude/com/ui/update/UpdateActivity.kt

@@ -1,17 +0,0 @@
-package h_mal.appttude.com.ui.update
-
-import h_mal.appttude.com.base.BaseActivity
-import h_mal.appttude.com.data.FirebaseCompletion
-import h_mal.appttude.com.databinding.UpdateActivityBinding
-import h_mal.appttude.com.utils.displayToast
-import h_mal.appttude.com.viewmodels.UpdateUserViewModel
-
-class UpdateActivity : BaseActivity<UpdateUserViewModel, UpdateActivityBinding>() {
-
-    override fun onSuccess(data: Any?) {
-        super.onSuccess(data)
-        when (data) {
-            is FirebaseCompletion.Changed -> displayToast(data.message)
-        }
-    }
-}

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

@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@drawable/background_with_curve"
-    tools:context="h_mal.appttude.com.ui.user.LoginActivity">
+    tools:context="h_mal.appttude.com.driver.ui.user.LoginActivity">
 
     <androidx.fragment.app.FragmentContainerView
         android:id="@+id/container"

app/src/main/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.ui.HomeFragment">
+    tools:context="h_mal.appttude.com.driver.ui.HomeFragment">
 
     <TextView
         android:id="@+id/prova_title_tv"

app/src/main/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.ui.HomeFragment">
+    tools:context="h_mal.appttude.com.driver.ui.HomeFragment">
 
     <ImageView
         android:id="@+id/prova_logo"

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

@@ -9,7 +9,7 @@
     android:paddingTop="@dimen/activity_vertical_margin"
     android:paddingRight="@dimen/activity_horizontal_margin"
     android:paddingBottom="@dimen/activity_vertical_margin"
-    tools:context="h_mal.appttude.com.ui.VehicleOverallFragment">
+    tools:context="h_mal.appttude.com.driver.ui.VehicleOverallFragment">
 
     <TextView
         android:id="@+id/prova_title_tv"

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

@@ -7,7 +7,7 @@
 
     <fragment
         android:id="@+id/loginFragment"
-        android:name="h_mal.appttude.com.ui.user.LoginFragment"
+        android:name="h_mal.appttude.com.driver.ui.user.LoginFragment"
         android:label="LoginFragment"
         tools:layout="@layout/fragment_login">
         <action
@@ -27,17 +27,17 @@
     </fragment>
     <fragment
         android:id="@+id/registerFragment"
-        android:name="h_mal.appttude.com.ui.user.RegisterFragment"
+        android:name="h_mal.appttude.com.driver.ui.user.RegisterFragment"
         android:label="RegisterFragment"
         tools:layout="@layout/fragment_register" />
     <fragment
         android:id="@+id/forgotPasswordFragment"
-        android:name="h_mal.appttude.com.ui.user.ForgotPasswordFragment"
+        android:name="h_mal.appttude.com.driver.ui.user.ForgotPasswordFragment"
         android:label="fragment_forgot_password"
         tools:layout="@layout/fragment_forgot_password" />
     <fragment
         android:id="@+id/splashScreenFragment"
-        android:name="h_mal.appttude.com.ui.user.SplashScreenFragment"
+        android:name="h_mal.appttude.com.driver.ui.user.SplashScreenFragment"
         android:label="fragment_splash_screen"
         tools:layout="@layout/fragment_splash_screen">
         <action

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

@@ -6,7 +6,7 @@
 
     <fragment
         android:id="@+id/homeDriverFragment"
-        android:name="h_mal.appttude.com.ui.HomeFragment"
+        android:name="h_mal.appttude.com.driver.ui.HomeFragment"
         android:label="fragment_home"
         tools:layout="@layout/fragment_home_driver">
         <action
@@ -26,7 +26,7 @@
     </fragment>
     <fragment
         android:id="@+id/driverOverallFragment"
-        android:name="h_mal.appttude.com.ui.DriverOverallFragment"
+        android:name="h_mal.appttude.com.driver.ui.DriverOverallFragment"
         android:label="DriverOverallFragment"
         tools:layout="@layout/fragment_driver_overall">
         <action
@@ -54,7 +54,7 @@
     </fragment>
     <fragment
         android:id="@+id/vehicleOverallFragment"
-        android:name="h_mal.appttude.com.ui.VehicleOverallFragment"
+        android:name="h_mal.appttude.com.driver.ui.VehicleOverallFragment"
         android:label="VehicleOverallFragment"
         tools:layout="@layout/fragment_vehicle_overall">
         <action
@@ -96,49 +96,49 @@
     </fragment>
     <fragment
         android:id="@+id/driverProfileFragment"
-        android:name="h_mal.appttude.com.ui.driverprofile.DriverProfileFragment"
+        android:name="h_mal.appttude.com.driver.ui.driver.profile.DriverProfileFragment"
         android:label="fragment_driver_profile"
         tools:layout="@layout/fragment_driver_profile" />
     <fragment
         android:id="@+id/driverLicenseFragment"
-        android:name="h_mal.appttude.com.ui.driverprofile.DriverLicenseFragment"
+        android:name="h_mal.appttude.com.driver.ui.driver.profile.DriverLicenseFragment"
         android:label="fragment_driver_license"
         tools:layout="@layout/fragment_driver_license" />
 
 
     <fragment
         android:id="@+id/vehicleSetupFragment"
-        android:name="h_mal.appttude.com.ui.vehicleprofile.VehicleProfileFragment"
+        android:name="h_mal.appttude.com.driver.ui.vehicleprofile.VehicleProfileFragment"
         android:label="VehicleSetupFragment"
         tools:layout="@layout/fragment_vehicle_setup" />
     <fragment
         android:id="@+id/insuranceFragment"
-        android:name="h_mal.appttude.com.ui.vehicleprofile.InsuranceFragment"
+        android:name="h_mal.appttude.com.driver.ui.vehicleprofile.InsuranceFragment"
         android:label="InsuranceFragment"
         tools:layout="@layout/fragment_insurance" />
     <fragment
         android:id="@+id/motFragment"
-        android:name="h_mal.appttude.com.ui.vehicleprofile.MotFragment"
+        android:name="h_mal.appttude.com.driver.ui.vehicleprofile.MotFragment"
         android:label="MotFragment"
         tools:layout="@layout/fragment_mot" />
     <fragment
         android:id="@+id/logbookFragment"
-        android:name="h_mal.appttude.com.ui.vehicleprofile.LogbookFragment"
+        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.ui.update.UpdateActivity"
+        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.ui.driverprofile.PrivateHireLicenseFragment"
+        android:name="h_mal.appttude.com.driver.ui.driverprofile.PrivateHireLicenseFragment"
         android:label="fragment_private_hire_license"
         tools:layout="@layout/fragment_private_hire_license" />
     <fragment
         android:id="@+id/privateHireVehicleFragment"
-        android:name="h_mal.appttude.com.ui.vehicleprofile.PrivateHireVehicleFragment"
+        android:name="h_mal.appttude.com.driver.ui.vehicleprofile.PrivateHireVehicleFragment"
         android:label="fragment_private_hire_vehicle"
         tools:layout="@layout/fragment_private_hire_vehicle" />
 </navigation>

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

@@ -6,7 +6,7 @@
 
     <fragment
         android:id="@+id/updateOverviewFragment"
-        android:name="h_mal.appttude.com.ui.update.UpdateOverviewFragment"
+        android:name="h_mal.appttude.com.driver.ui.update.UpdateOverviewFragment"
         android:label="UpdateOverviewFragment"
         tools:layout="@layout/update_overview_fragment">
         <action
@@ -40,22 +40,22 @@
     </fragment>
     <fragment
         android:id="@+id/updateEmailFragment"
-        android:name="h_mal.appttude.com.ui.update.UpdateEmailFragment"
+        android:name="h_mal.appttude.com.driver.ui.update.UpdateEmailFragment"
         android:label="UpdateEmailFragment"
         tools:layout="@layout/fragment_update_email" />
     <fragment
         android:id="@+id/updatePasswordFragment"
-        android:name="h_mal.appttude.com.ui.update.UpdatePasswordFragment"
+        android:name="h_mal.appttude.com.driver.ui.update.UpdatePasswordFragment"
         android:label="UpdatePasswordFragment"
         tools:layout="@layout/fragment_update_password" />
     <fragment
         android:id="@+id/updateProfileFragment"
-        android:name="h_mal.appttude.com.ui.update.UpdateProfileFragment"
+        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/deleteProfileFragment"
-        android:name="h_mal.appttude.com.ui.update.DeleteProfileFragment"
+        android:name="h_mal.appttude.com.driver.ui.update.DeleteProfileFragment"
         android:label="fragment_delete_profile"
         tools:layout="@layout/fragment_delete_profile" />