minhaj преди 2 седмици
родител
ревизия
645cef636a
променени са 32 файла, в които са добавени 37 реда и са изтрити 47 реда
  1. 2 2
      app/src/main/AndroidManifest.xml
  2. 1 1
      app/src/main/java/com/fastest/pass/account/presentation/ui/fragment/AccountFragment.kt
  3. 1 1
      app/src/main/java/com/fastest/pass/di/App.kt
  4. 1 1
      app/src/main/java/com/fastest/pass/di/AppModule.kt
  5. 1 1
      app/src/main/java/com/fastest/pass/di/BaseFragment.kt
  6. 1 1
      app/src/main/java/com/fastest/pass/di/BaseUseCase.kt
  7. 1 1
      app/src/main/java/com/fastest/pass/di/GenericLoader.kt
  8. 1 1
      app/src/main/java/com/fastest/pass/di/MainActivity.kt
  9. 1 1
      app/src/main/java/com/fastest/pass/di/UIState.kt
  10. 1 1
      app/src/main/java/com/fastest/pass/di/WebResponse.kt
  11. 1 1
      app/src/main/java/com/fastest/pass/browse/presentation/ui/fragment/BrowseFragment.kt
  12. 1 1
      app/src/main/java/com/fastest/pass/browse/presentation/ui/fragment/NewItemBrowseFragment.kt
  13. 1 1
      app/src/main/java/com/fastest/pass/dashboard/presentation/ui/fragment/DashboardFragment.kt
  14. 1 1
      app/src/main/java/com/fastest/pass/forgotpassword/presentation/ui/ForgotPasswordFragment.kt
  15. 1 1
      app/src/main/java/com/fastest/pass/forgotpassword/presentation/ui/ForgotPasswordVerifyFragment.kt
  16. 1 1
      app/src/main/java/com/fastest/pass/home/presentation/ui/fragment/AddNewItemsFragment.kt
  17. 1 1
      app/src/main/java/com/fastest/pass/home/presentation/ui/fragment/HomeFragment.kt
  18. 1 1
      app/src/main/java/com/fastest/pass/home/presentation/ui/fragment/NewItemFormFragment.kt
  19. 2 2
      app/src/main/java/com/fastest/pass/login/data/model/LoginResponse.kt
  20. 0 9
      app/src/main/java/com/fastest/pass/login/data/model/LoginResult.kt
  21. 1 1
      app/src/main/java/com/fastest/pass/login/data/remote/LoginApiService.kt
  22. 1 1
      app/src/main/java/com/fastest/pass/login/data/repository/LoginRepositoryImpl.kt
  23. 1 1
      app/src/main/java/com/fastest/pass/login/domain/repository/LoginRepository.kt
  24. 2 2
      app/src/main/java/com/fastest/pass/login/domain/usecase/LoginUseCase.kt
  25. 2 2
      app/src/main/java/com/fastest/pass/login/presentation/ui/LoginFragment.kt
  26. 3 4
      app/src/main/java/com/fastest/pass/login/presentation/viewmodels/LoginViewModel.kt
  27. 1 1
      app/src/main/java/com/fastest/pass/masterlogin/presentation/ui/MasterLoginFragment.kt
  28. 1 1
      app/src/main/java/com/fastest/pass/mastersignup/presentation/ui/MasterSignUpFragment.kt
  29. 1 1
      app/src/main/java/com/fastest/pass/security/presentation/ui/fragment/SecurityFragment.kt
  30. 1 1
      app/src/main/java/com/fastest/pass/signup/presentation/ui/SignUpFragment.kt
  31. 1 1
      app/src/main/java/com/fastest/pass/splash/presentation/ui/SplashFragment.kt
  32. 1 1
      app/src/main/java/com/fastest/pass/welcome/presentation/ui/fragment/WelcomeFragment.kt

+ 2 - 2
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-->

+ 1 - 1
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

+ 1 - 1
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

+ 1 - 1
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

+ 1 - 1
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

+ 1 - 1
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>()

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

@@ -1,4 +1,4 @@
-package com.fastest.pass.di
+package com.fastest.pass.app
 
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.fillMaxSize

+ 1 - 1
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

+ 1 - 1
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,

+ 1 - 1
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,

+ 1 - 1
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

+ 1 - 1
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

+ 1 - 1
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

+ 1 - 1
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

+ 1 - 1
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

+ 1 - 1
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

+ 1 - 1
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

+ 1 - 1
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

+ 2 - 2
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,
 )
 

+ 0 - 9
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()
-}*/

+ 1 - 1
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

+ 1 - 1
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

+ 1 - 1
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
 

+ 2 - 2
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

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

@@ -14,9 +14,9 @@ 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

+ 3 - 4
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,7 +14,7 @@ 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

+ 1 - 1
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

+ 1 - 1
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

+ 1 - 1
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

+ 1 - 1
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

+ 1 - 1
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

+ 1 - 1
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