app/src/main/AndroidManifest.xml

@@ -6,7 +6,7 @@
     <uses-permission android:name="android.permission.INTERNET" />
 
     <application
-        android:name="com.fastest.pass.di.App"
+        android:name="com.fastest.pass.app.App"
         android:allowBackup="true"
         android:dataExtractionRules="@xml/data_extraction_rules"
         android:fullBackupContent="@xml/backup_rules"
@@ -17,7 +17,7 @@
         android:theme="@style/Theme.FastestPass"
         tools:targetApi="31">
         <activity
-            android:name="com.fastest.pass.di.MainActivity"
+            android:name="com.fastest.pass.app.MainActivity"
             android:exported="true"
             >
 <!--            <meta-data-->

app/src/main/java/com/fastest/pass/account/presentation/ui/fragment/AccountFragment.kt

@@ -13,7 +13,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.ComposeView
 import androidx.compose.ui.res.colorResource
 import androidx.fragment.app.viewModels
-import com.fastest.pass.di.BaseFragment
+import com.fastest.pass.app.BaseFragment
 import com.fastest.pass.R
 import com.fastest.pass.account.presentation.ui.components.AccountScreen
 import com.fastest.pass.account.presentation.ui.components.ClickType

app/src/main/java/com/fastest/pass/di/App.kt

@@ -1,4 +1,4 @@
-package com.fastest.pass.di
+package com.fastest.pass.app
 
 import android.app.Application
 import dagger.hilt.android.HiltAndroidApp

app/src/main/java/com/fastest/pass/di/AppModule.kt

@@ -1,4 +1,4 @@
-package com.fastest.pass.di
+package com.fastest.pass.app
 
 import dagger.Module
 import dagger.Provides

app/src/main/java/com/fastest/pass/di/BaseFragment.kt

@@ -1,4 +1,4 @@
-package com.fastest.pass.di
+package com.fastest.pass.app
 
 import android.os.Bundle
 import android.util.Log

app/src/main/java/com/fastest/pass/di/BaseUseCase.kt

@@ -1,4 +1,4 @@
-package com.fastest.pass.di
+package com.fastest.pass.app
 
 sealed class Result<out T> {
     data class Success<out T>(val data: T) : Result<T>()

app/src/main/java/com/fastest/pass/di/GenericLoader.kt

@@ -1,5 +1,7 @@
-package com.fastest.pass.di
+package com.fastest.pass.app
 
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.size
 import androidx.compose.material3.CircularProgressIndicator
 import androidx.compose.runtime.Composable
@@ -8,6 +10,7 @@ import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableFloatStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
+import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.colorResource
 import androidx.compose.ui.unit.dp
@@ -17,6 +20,7 @@ import kotlinx.coroutines.delay
 @Composable
 fun GenericLoader(loader: Boolean) {
     if (loader) {
+
         var progress by remember { mutableFloatStateOf(0.1F) }
 
         LaunchedEffect(key1 = Unit) {
@@ -29,12 +33,18 @@ fun GenericLoader(loader: Boolean) {
             }
         }
 
-        CircularProgressIndicator(
-            progress = { progress },
-            modifier = Modifier
-                .size(50.dp),
-            color = colorResource(id = R.color.yellow_text),
-            strokeWidth = 5.dp,
-        )
+        Box(modifier = Modifier.fillMaxSize(),
+            contentAlignment = Alignment.Center){
+            CircularProgressIndicator(
+                progress = { progress },
+                modifier = Modifier
+                    .size(50.dp)
+                    .align(Alignment.Center),
+                color = colorResource(id = R.color.yellow_text),
+                strokeWidth = 5.dp,
+            )
+        }
+
+
     }
 }

app/src/main/java/com/fastest/pass/di/MainActivity.kt

@@ -1,4 +1,4 @@
-package com.fastest.pass.di
+package com.fastest.pass.app
 
 import android.app.AlertDialog
 import android.os.Bundle

app/src/main/java/com/fastest/pass/di/UIState.kt

@@ -1,4 +1,4 @@
-package com.fastest.pass.di
+package com.fastest.pass.app
 
 data class UIState<T>(
     var isLoading:Boolean = false,

app/src/main/java/com/fastest/pass/di/WebResponse.kt

@@ -1,4 +1,4 @@
-package com.fastest.pass.di
+package com.fastest.pass.app
 
 data class WebResponse<T>(
     val status: Boolean,

app/src/main/java/com/fastest/pass/browse/presentation/ui/fragment/BrowseFragment.kt

@@ -14,7 +14,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.ComposeView
 import androidx.compose.ui.res.colorResource
 import androidx.fragment.app.activityViewModels
-import com.fastest.pass.di.BaseFragment
+import com.fastest.pass.app.BaseFragment
 import com.fastest.pass.R
 import com.fastest.pass.browse.presentation.ui.components.BrowseScreen
 import com.fastest.pass.browse.presentation.ui.components.ClickTypeItemBrowse

app/src/main/java/com/fastest/pass/browse/presentation/ui/fragment/NewItemBrowseFragment.kt

@@ -16,7 +16,7 @@ import androidx.compose.ui.platform.ComposeView
 import androidx.compose.ui.res.colorResource
 import androidx.fragment.app.activityViewModels
 import androidx.fragment.app.viewModels
-import com.fastest.pass.di.BaseFragment
+import com.fastest.pass.app.BaseFragment
 import com.fastest.pass.R
 import com.fastest.pass.browse.presentation.ui.components.ClickTypeItemBrowse
 import com.fastest.pass.browse.presentation.ui.components.ClickTypeNewItemBrowse

app/src/main/java/com/fastest/pass/dashboard/presentation/ui/fragment/DashboardFragment.kt

@@ -11,7 +11,7 @@ import androidx.compose.foundation.layout.navigationBarsPadding
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.ComposeView
 import androidx.compose.ui.res.colorResource
-import com.fastest.pass.di.BaseFragment
+import com.fastest.pass.app.BaseFragment
 import com.fastest.pass.R
 import com.fastest.pass.dashboard.presentation.ui.component.BottomTab
 import com.fastest.pass.ui.theme.FastestPassTheme

app/src/main/java/com/fastest/pass/forgotpassword/presentation/ui/ForgotPasswordFragment.kt

@@ -6,7 +6,7 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.compose.ui.platform.ComposeView
 import androidx.fragment.app.viewModels
-import com.fastest.pass.di.BaseFragment
+import com.fastest.pass.app.BaseFragment
 import com.fastest.pass.forgotpassword.presentation.ui.components.ClickType
 import com.fastest.pass.forgotpassword.presentation.ui.components.ForgotPasswordScreen
 import com.fastest.pass.forgotpassword.presentation.viewmodels.ForgotPasswordViewmodel

app/src/main/java/com/fastest/pass/forgotpassword/presentation/ui/ForgotPasswordVerifyFragment.kt

@@ -6,7 +6,7 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.compose.ui.platform.ComposeView
 import androidx.fragment.app.viewModels
-import com.fastest.pass.di.BaseFragment
+import com.fastest.pass.app.BaseFragment
 import com.fastest.pass.forgotpassword.presentation.ui.components.ClickTypeForgotVerify
 import com.fastest.pass.forgotpassword.presentation.ui.components.ForgotPasswordVerifyScreen
 import com.fastest.pass.forgotpassword.presentation.viewmodels.ForgotPasswordVerifyViewModel

app/src/main/java/com/fastest/pass/home/presentation/ui/fragment/AddNewItemsFragment.kt

@@ -13,7 +13,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.ComposeView
 import androidx.compose.ui.res.colorResource
 import androidx.fragment.app.activityViewModels
-import com.fastest.pass.di.BaseFragment
+import com.fastest.pass.app.BaseFragment
 import com.fastest.pass.R
 import com.fastest.pass.home.presentation.ui.components.AddNewItemsScreen
 import com.fastest.pass.home.presentation.ui.components.ClickTypeAddNewItem

app/src/main/java/com/fastest/pass/home/presentation/ui/fragment/HomeFragment.kt

@@ -13,7 +13,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.ComposeView
 import androidx.compose.ui.res.colorResource
 import androidx.fragment.app.viewModels
-import com.fastest.pass.di.BaseFragment
+import com.fastest.pass.app.BaseFragment
 import com.fastest.pass.R
 import com.fastest.pass.home.presentation.ui.components.ClickType
 import com.fastest.pass.home.presentation.ui.components.HomeScreen

app/src/main/java/com/fastest/pass/home/presentation/ui/fragment/NewItemFormFragment.kt

@@ -16,7 +16,7 @@ import androidx.compose.ui.platform.ComposeView
 import androidx.compose.ui.res.colorResource
 import androidx.fragment.app.activityViewModels
 import androidx.fragment.app.viewModels
-import com.fastest.pass.di.BaseFragment
+import com.fastest.pass.app.BaseFragment
 import com.fastest.pass.R
 import com.fastest.pass.home.presentation.ui.components.ClickTypeAddNewItem
 import com.fastest.pass.home.presentation.ui.components.ClickTypeNewItemForm

app/src/main/java/com/fastest/pass/login/data/model/LoginResponse.kt

@@ -1,7 +1,7 @@
 package com.fastest.pass.login.data.model
 
 data class LoginResponse(
-    val status: Boolean,
-    val message: String,
+    val id: Boolean,
+    val firstname: String,
 )
 

app/src/main/java/com/fastest/pass/login/data/model/LoginResult.kt

@@ -1,9 +0,0 @@
-/*
-package com.fastest.pass.login.data.model
-
-sealed class LoginResult {
-    data object None : LoginResult()
-    data object Loading : LoginResult()
-    data class Success(val loginResponse: LoginResponse<Any>) : LoginResult()
-    data class Error(val message: String) : LoginResult()
-}*/

app/src/main/java/com/fastest/pass/login/data/remote/LoginApiService.kt

@@ -1,6 +1,6 @@
 package com.fastest.pass.login.data.remote
 
-import com.fastest.pass.di.WebResponse
+import com.fastest.pass.app.WebResponse
 import com.fastest.pass.login.data.model.LoginRequest
 import com.fastest.pass.login.data.model.LoginResponse
 import retrofit2.http.Body

app/src/main/java/com/fastest/pass/login/data/repository/LoginRepositoryImpl.kt

@@ -1,6 +1,6 @@
 package com.fastest.pass.login.data.repository
 
-import com.fastest.pass.di.WebResponse
+import com.fastest.pass.app.WebResponse
 import com.fastest.pass.login.data.model.LoginRequest
 import com.fastest.pass.login.data.model.LoginResponse
 import com.fastest.pass.login.data.remote.LoginApiService

app/src/main/java/com/fastest/pass/login/domain/repository/LoginRepository.kt

@@ -1,6 +1,6 @@
 package com.fastest.pass.login.domain.repository
 
-import com.fastest.pass.di.WebResponse
+import com.fastest.pass.app.WebResponse
 import com.fastest.pass.login.data.model.LoginRequest
 import com.fastest.pass.login.data.model.LoginResponse
 

app/src/main/java/com/fastest/pass/login/domain/usecase/LoginUseCase.kt

@@ -1,8 +1,8 @@
 package com.fastest.pass.login.domain.usecase
 
 import android.util.Log
-import com.fastest.pass.di.BaseUseCase
-import com.fastest.pass.di.WebResponse
+import com.fastest.pass.app.BaseUseCase
+import com.fastest.pass.app.WebResponse
 import com.fastest.pass.login.data.model.LoginRequest
 import com.fastest.pass.login.data.model.LoginResponse
 import com.fastest.pass.login.domain.repository.LoginRepository

app/src/main/java/com/fastest/pass/login/presentation/ui/LoginFragment.kt

@@ -10,14 +10,13 @@ import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.padding
 import androidx.compose.material.Scaffold
-import androidx.compose.runtime.collectAsState
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.ComposeView
 import androidx.compose.ui.res.colorResource
 import androidx.fragment.app.viewModels
-import com.fastest.pass.di.BaseFragment
+import com.fastest.pass.app.BaseFragment
 import com.fastest.pass.R
-import com.fastest.pass.di.GenericLoader
+import com.fastest.pass.app.GenericLoader
 import com.fastest.pass.login.presentation.ui.components.ClickType
 import com.fastest.pass.login.presentation.ui.components.LoginScreen
 import com.fastest.pass.login.presentation.viewmodels.LoginViewModel

app/src/main/java/com/fastest/pass/login/presentation/ui/components/LoginScreen.kt

@@ -154,30 +154,6 @@ fun LoginScreen(
                 }
             }
         }
-
-       /* if (loader) {
-            var progress by remember { mutableFloatStateOf(0.1F) }
-
-            LaunchedEffect(key1 = Unit) {
-                while (true) {
-                    for (i in 1..100) {
-                        progress = i.toFloat()/100F
-                        delay(50)
-                    }
-                    progress = 0.1F
-                }
-            }
-
-            CircularProgressIndicator(
-                progress = { progress },
-                modifier = Modifier
-                    .size(50.dp)
-                    .align(Alignment.Center),
-                color = colorResource(id = R.color.yellow_text),
-                strokeWidth = 5.dp,
-            )
-        }*/
-
     }
 }
 

app/src/main/java/com/fastest/pass/login/presentation/viewmodels/LoginViewModel.kt

@@ -1,12 +1,11 @@
 package com.fastest.pass.login.presentation.viewmodels
 
-import android.util.Log
 import androidx.compose.runtime.State
 import androidx.compose.runtime.mutableStateOf
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
-import com.fastest.pass.di.UIState
-import com.fastest.pass.di.WebResponse
+import com.fastest.pass.app.UIState
+import com.fastest.pass.app.WebResponse
 import com.fastest.pass.login.data.model.LoginRequest
 import com.fastest.pass.login.data.model.LoginResponse
 import com.fastest.pass.login.domain.usecase.LoginUseCase
@@ -15,31 +14,17 @@ import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.launch
 import javax.inject.Inject
-import com.fastest.pass.di.Result
+import com.fastest.pass.app.Result
 @HiltViewModel
 class LoginViewModel @Inject constructor(
     private val loginUseCase: LoginUseCase
 ) : ViewModel() {
 
-    private val _router = MutableStateFlow<LoginRoute>(LoginRoute.OpenNoneScreen)
-    val router: MutableStateFlow<LoginRoute> = _router
-
-  /*  private val _loginResponse = MutableStateFlow<LoginResponse<Any>>(LoginResponse(false, ""))
-    val loginResponse: MutableStateFlow<LoginResponse<Any>> = _loginResponse*/
-
     private var _loginResponse =
         mutableStateOf(UIState<WebResponse<LoginResponse>>())
     val loginResponse: State<UIState<WebResponse<LoginResponse>>> =
         _loginResponse
 
-
-    private val _loader = MutableStateFlow<Boolean>(false)
-    val loader: MutableStateFlow<Boolean> = _loader
-
-    fun navigateTo(loginRoute: LoginRoute) {
-        _router.value = loginRoute
-    }
-
     fun login(email: String, password: String) {
         viewModelScope.launch {
             val request = LoginRequest(email, password)
@@ -50,28 +35,21 @@ class LoginViewModel @Inject constructor(
                     }
 
                     is Result.Success -> {
-                        _loginResponse.value = UIState(true,result.data)
+                        _loginResponse.value = UIState(false,result.data)
                     }
 
                     is Result.Failure -> {
-
+                        _loginResponse.value = UIState(false)
                     }
                 }
             }
         }
     }
 
-   /* fun onLoginClicked(email: String, password: String) {
-        viewModelScope.launch {
-            _loader.value = true
-            Log.d("test_api_login", "onLoginClicked => LoginViewModel")
-            val loginResult = loginUseCase(email, password)
-            _loader.value = false
+    private val _router = MutableStateFlow<LoginRoute>(LoginRoute.OpenNoneScreen)
+    val router: MutableStateFlow<LoginRoute> = _router
 
-            if (loginResult.second.status) {
-                _loginResponse.value = loginResult.second
-            }
-            Log.d("loginResult", "loginResult = ${loginResult.second.message}")
-        }
-    }*/
+    fun navigateTo(loginRoute: LoginRoute) {
+        _router.value = loginRoute
+    }
 }

app/src/main/java/com/fastest/pass/masterlogin/presentation/ui/MasterLoginFragment.kt

@@ -6,7 +6,7 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.compose.ui.platform.ComposeView
 import androidx.fragment.app.viewModels
-import com.fastest.pass.di.BaseFragment
+import com.fastest.pass.app.BaseFragment
 import com.fastest.pass.masterlogin.presentation.ui.components.ClickType
 import com.fastest.pass.masterlogin.presentation.ui.components.MasterLoginScreen
 import com.fastest.pass.masterlogin.presentation.viewmodels.MasterLoginViewModel

app/src/main/java/com/fastest/pass/mastersignup/presentation/ui/MasterSignUpFragment.kt

@@ -6,7 +6,7 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.compose.ui.platform.ComposeView
 import androidx.fragment.app.viewModels
-import com.fastest.pass.di.BaseFragment
+import com.fastest.pass.app.BaseFragment
 import com.fastest.pass.mastersignup.presentation.ui.components.ClickType
 import com.fastest.pass.mastersignup.presentation.ui.components.MasterSignUpScreen
 import com.fastest.pass.mastersignup.presentation.viewmodels.MasterSignUpViewModel

app/src/main/java/com/fastest/pass/security/presentation/ui/fragment/SecurityFragment.kt

@@ -12,7 +12,7 @@ import androidx.compose.material.Scaffold
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.ComposeView
 import androidx.compose.ui.res.colorResource
-import com.fastest.pass.di.BaseFragment
+import com.fastest.pass.app.BaseFragment
 import com.fastest.pass.R
 import com.fastest.pass.security.presentation.ui.components.SecurityScreen
 import com.fastest.pass.ui.theme.FastestPassTheme

app/src/main/java/com/fastest/pass/signup/presentation/ui/SignUpFragment.kt

@@ -6,7 +6,7 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.compose.ui.platform.ComposeView
 import androidx.fragment.app.viewModels
-import com.fastest.pass.di.BaseFragment
+import com.fastest.pass.app.BaseFragment
 import com.fastest.pass.signup.presentation.ui.components.ClickType
 import com.fastest.pass.signup.presentation.ui.components.SignUpScreen
 import com.fastest.pass.signup.presentation.viewmodels.SignUpViewModel

app/src/main/java/com/fastest/pass/splash/presentation/ui/SplashFragment.kt

@@ -9,7 +9,7 @@ import com.fastest.pass.splash.presentation.ui.components.SplashScreen
 import com.fastest.pass.splash.presentation.viewmodels.SplashViewModel
 import dagger.hilt.android.AndroidEntryPoint
 import androidx.fragment.app.viewModels
-import com.fastest.pass.di.BaseFragment
+import com.fastest.pass.app.BaseFragment
 import com.fastest.pass.splash.utils.SplashNavigation
 import com.fastest.pass.ui.theme.FastestPassTheme
 import javax.inject.Inject

app/src/main/java/com/fastest/pass/welcome/presentation/ui/fragment/WelcomeFragment.kt

@@ -13,7 +13,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.ComposeView
 import androidx.compose.ui.res.colorResource
 import androidx.fragment.app.viewModels
-import com.fastest.pass.di.BaseFragment
+import com.fastest.pass.app.BaseFragment
 import com.fastest.pass.R
 import com.fastest.pass.ui.theme.FastestPassTheme
 import com.fastest.pass.welcome.presentation.ui.component.ClickType.LOGIN_CLICK