more fixes

2024-07-16 07:43:08 +03:00
parent c8b1d72f08
commit a696425dc8
52 changed files with 113 additions and 251 deletions
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android">
-
-</manifest>
@@ -1,9 +1,9 @@
-package com.meloda.fast.auth.login
+package dev.meloda.fast.auth.login

 import androidx.compose.ui.test.assertHasClickAction
 import androidx.compose.ui.test.junit4.createComposeRule
 import androidx.compose.ui.test.onNodeWithTag
-import com.meloda.fast.auth.login.presentation.LoginScreen
+import dev.meloda.fast.auth.login.presentation.LoginScreen
 import org.junit.Rule
 import org.junit.Test

@@ -1,9 +1,9 @@
-package com.meloda.fast.auth.login
+package dev.meloda.fast.auth.login

 import androidx.compose.ui.test.assertHasClickAction
 import androidx.compose.ui.test.junit4.createComposeRule
 import androidx.compose.ui.test.onNodeWithTag
-import com.meloda.fast.auth.login.presentation.LogoScreen
+import dev.meloda.fast.auth.login.presentation.LogoScreen
 import org.junit.Rule
 import org.junit.Test

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android">
-
-</manifest>
@@ -1,9 +1,8 @@
-package com.meloda.fast.auth.login
+package dev.meloda.fast.auth.login

 import android.util.Log
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
-import dev.meloda.fast.auth.login.BuildConfig
 import dev.meloda.fast.common.LongPollController
 import dev.meloda.fast.common.UserConfig
 import dev.meloda.fast.common.VkConstants
@@ -16,16 +15,15 @@ import dev.meloda.fast.data.api.users.UsersUseCase
 import dev.meloda.fast.data.db.AccountsRepository
 import dev.meloda.fast.data.processState
 import dev.meloda.fast.datastore.AppSettings
-import dev.meloda.fast.datastore.UserSettings
 import dev.meloda.fast.model.database.AccountEntity
 import dev.meloda.fast.network.OAuthErrorDomain
-import com.meloda.fast.auth.login.model.CaptchaArguments
-import com.meloda.fast.auth.login.model.LoginError
-import com.meloda.fast.auth.login.model.LoginScreenState
-import com.meloda.fast.auth.login.model.LoginUserBannedArguments
-import com.meloda.fast.auth.login.model.LoginValidationArguments
-import com.meloda.fast.auth.login.model.LoginValidationResult
-import com.meloda.fast.auth.login.validation.LoginValidator
+import dev.meloda.fast.auth.login.model.CaptchaArguments
+import dev.meloda.fast.auth.login.model.LoginError
+import dev.meloda.fast.auth.login.model.LoginScreenState
+import dev.meloda.fast.auth.login.model.LoginUserBannedArguments
+import dev.meloda.fast.auth.login.model.LoginValidationArguments
+import dev.meloda.fast.auth.login.model.LoginValidationResult
+import dev.meloda.fast.auth.login.validation.LoginValidator
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.MutableStateFlow
@@ -72,7 +70,6 @@ class LoginViewModelImpl(
    private val usersUseCase: UsersUseCase,
    private val accountsRepository: AccountsRepository,
    private val loginValidator: LoginValidator,
-    private val userSettings: UserSettings,
    private val longPollController: LongPollController
 ) : ViewModel(), LoginViewModel {

@@ -1,7 +1,7 @@
-package com.meloda.fast.auth.login
+package dev.meloda.fast.auth.login

 import dev.meloda.fast.data.State
-import com.meloda.fast.auth.login.model.AuthInfo
+import dev.meloda.fast.auth.login.model.AuthInfo
 import kotlinx.coroutines.flow.Flow

 interface OAuthUseCase {
@@ -1,4 +1,4 @@
-package com.meloda.fast.auth.login
+package dev.meloda.fast.auth.login

 import dev.meloda.fast.data.State
 import dev.meloda.fast.data.api.oauth.OAuthRepository
@@ -6,7 +6,7 @@ import dev.meloda.fast.network.OAuthErrorDomain
 import dev.meloda.fast.network.ValidationType
 import dev.meloda.fast.network.VkOAuthError
 import dev.meloda.fast.network.VkOAuthErrorType
-import com.meloda.fast.auth.login.model.AuthInfo
+import dev.meloda.fast.auth.login.model.AuthInfo
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.flow

@@ -1,10 +1,10 @@
-package com.meloda.fast.auth.login.di
+package dev.meloda.fast.auth.login.di

-import com.meloda.fast.auth.login.LoginViewModel
-import com.meloda.fast.auth.login.LoginViewModelImpl
-import com.meloda.fast.auth.login.OAuthUseCase
-import com.meloda.fast.auth.login.OAuthUseCaseImpl
-import com.meloda.fast.auth.login.validation.LoginValidator
+import dev.meloda.fast.auth.login.LoginViewModel
+import dev.meloda.fast.auth.login.LoginViewModelImpl
+import dev.meloda.fast.auth.login.OAuthUseCase
+import dev.meloda.fast.auth.login.OAuthUseCaseImpl
+import dev.meloda.fast.auth.login.validation.LoginValidator
 import org.koin.androidx.viewmodel.dsl.viewModelOf
 import org.koin.core.module.dsl.singleOf
 import org.koin.dsl.bind
@@ -1,4 +1,4 @@
-package com.meloda.fast.auth.login.model
+package dev.meloda.fast.auth.login.model

 data class AuthInfo(
    val userId: Int?,
@@ -1,4 +1,4 @@
-package com.meloda.fast.auth.login.model
+package dev.meloda.fast.auth.login.model

 import android.os.Parcelable
 import kotlinx.parcelize.Parcelize
@@ -1,8 +0,0 @@
-package com.meloda.fast.auth.login.model
-
-data class LoginArguments(val code: String) {
-
-    companion object {
-        val EMPTY: LoginArguments = LoginArguments(code = "")
-    }
-}
@@ -1,4 +1,4 @@
-package com.meloda.fast.auth.login.model
+package dev.meloda.fast.auth.login.model

 import androidx.compose.runtime.Immutable

@@ -1,4 +1,4 @@
-package com.meloda.fast.auth.login.model
+package dev.meloda.fast.auth.login.model

 import androidx.compose.runtime.Immutable

@@ -1,4 +1,4 @@
-package com.meloda.fast.auth.login.model
+package dev.meloda.fast.auth.login.model

 import android.os.Parcelable
 import kotlinx.parcelize.Parcelize
@@ -1,4 +1,4 @@
-package com.meloda.fast.auth.login.model
+package dev.meloda.fast.auth.login.model

 import android.os.Parcelable
 import kotlinx.parcelize.Parcelize
@@ -1,4 +1,4 @@
-package com.meloda.fast.auth.login.model
+package dev.meloda.fast.auth.login.model

 sealed class LoginValidationResult {

@@ -1,17 +1,17 @@
-package com.meloda.fast.auth.login.navigation
+package dev.meloda.fast.auth.login.navigation

 import androidx.navigation.NavBackStackEntry
 import androidx.navigation.NavController
 import androidx.navigation.NavGraphBuilder
 import androidx.navigation.compose.composable
 import dev.meloda.fast.common.extensions.navigation.sharedViewModel
-import com.meloda.fast.auth.login.LoginViewModel
-import com.meloda.fast.auth.login.LoginViewModelImpl
-import com.meloda.fast.auth.login.model.CaptchaArguments
-import com.meloda.fast.auth.login.model.LoginValidationArguments
-import com.meloda.fast.auth.login.model.LoginUserBannedArguments
-import com.meloda.fast.auth.login.presentation.LoginRoute
-import com.meloda.fast.auth.login.presentation.LogoRoute
+import dev.meloda.fast.auth.login.LoginViewModel
+import dev.meloda.fast.auth.login.LoginViewModelImpl
+import dev.meloda.fast.auth.login.model.CaptchaArguments
+import dev.meloda.fast.auth.login.model.LoginValidationArguments
+import dev.meloda.fast.auth.login.model.LoginUserBannedArguments
+import dev.meloda.fast.auth.login.presentation.LoginRoute
+import dev.meloda.fast.auth.login.presentation.LogoRoute
 import kotlinx.serialization.Serializable

@Serializable
@@ -1,4 +1,4 @@
-package com.meloda.fast.auth.login.presentation
+package dev.meloda.fast.auth.login.presentation

 import androidx.compose.animation.AnimatedVisibility
 import androidx.compose.animation.fadeIn
@@ -58,13 +58,13 @@ import dev.meloda.fast.ui.components.TextFieldErrorText
 import dev.meloda.fast.ui.theme.LocalThemeConfig
 import dev.meloda.fast.ui.util.handleEnterKey
 import dev.meloda.fast.ui.util.handleTabKey
-import com.meloda.fast.auth.login.LoginViewModel
-import com.meloda.fast.auth.login.LoginViewModelImpl
-import com.meloda.fast.auth.login.model.CaptchaArguments
-import com.meloda.fast.auth.login.model.LoginError
-import com.meloda.fast.auth.login.model.LoginScreenState
-import com.meloda.fast.auth.login.model.LoginUserBannedArguments
-import com.meloda.fast.auth.login.model.LoginValidationArguments
+import dev.meloda.fast.auth.login.LoginViewModel
+import dev.meloda.fast.auth.login.LoginViewModelImpl
+import dev.meloda.fast.auth.login.model.CaptchaArguments
+import dev.meloda.fast.auth.login.model.LoginError
+import dev.meloda.fast.auth.login.model.LoginScreenState
+import dev.meloda.fast.auth.login.model.LoginUserBannedArguments
+import dev.meloda.fast.auth.login.model.LoginValidationArguments
 import org.koin.androidx.compose.koinViewModel
 import dev.meloda.fast.ui.R as UiR

@@ -1,4 +1,4 @@
-package com.meloda.fast.auth.login.presentation
+package dev.meloda.fast.auth.login.presentation

 import androidx.compose.animation.core.animateDpAsState
 import androidx.compose.foundation.ExperimentalFoundationApi
@@ -32,8 +32,8 @@ import androidx.compose.ui.unit.LayoutDirection
 import androidx.compose.ui.unit.dp
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import dev.meloda.fast.ui.theme.LocalThemeConfig
-import com.meloda.fast.auth.login.LoginViewModel
-import com.meloda.fast.auth.login.LoginViewModelImpl
+import dev.meloda.fast.auth.login.LoginViewModel
+import dev.meloda.fast.auth.login.LoginViewModelImpl
 import org.koin.androidx.compose.koinViewModel
 import dev.meloda.fast.ui.R as UiR

@@ -1,8 +1,8 @@
-package com.meloda.fast.auth.login.validation
+package dev.meloda.fast.auth.login.validation

 import dev.meloda.fast.common.extensions.addIf
-import com.meloda.fast.auth.login.model.LoginScreenState
-import com.meloda.fast.auth.login.model.LoginValidationResult
+import dev.meloda.fast.auth.login.model.LoginScreenState
+import dev.meloda.fast.auth.login.model.LoginValidationResult

 class LoginValidator {

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android">
-
-</manifest>
@@ -13,9 +13,9 @@ import dev.meloda.fast.auth.validation.navigation.validationScreen
 import dev.meloda.fast.auth.userbanned.model.UserBannedArguments
 import dev.meloda.fast.auth.userbanned.navigation.navigateToUserBanned
 import dev.meloda.fast.auth.userbanned.navigation.userBannedRoute
-import com.meloda.fast.auth.login.navigation.Logo
-import com.meloda.fast.auth.login.navigation.loginScreen
-import com.meloda.fast.auth.login.navigation.navigateToLogin
+import dev.meloda.fast.auth.login.navigation.Logo
+import dev.meloda.fast.auth.login.navigation.loginScreen
+import dev.meloda.fast.auth.login.navigation.navigateToLogin
 import kotlinx.serialization.Serializable
 import java.net.URLEncoder

@@ -2,7 +2,7 @@ package dev.meloda.fast.auth

 import dev.meloda.fast.auth.captcha.di.captchaModule
 import dev.meloda.fast.auth.validation.di.validationModule
-import com.meloda.fast.auth.login.di.loginModule
+import dev.meloda.fast.auth.login.di.loginModule
 import org.koin.dsl.module

 val authModule = module {
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android">
-
-</manifest>
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android">
-
-</manifest>
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android">
-
-</manifest>
@@ -1,5 +0,0 @@
-package dev.meloda.fast.friends.model
-
-enum class OnlineState {
-    OFFLINE, ONLINE, ONLINE_MOBILE
-}
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android">
-
-</manifest>
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android">
-
-</manifest>
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android">
-
-</manifest>
@@ -48,9 +48,6 @@ import dev.meloda.fast.common.model.UiImage
 import dev.meloda.fast.photoviewer.PhotoViewViewModel
 import dev.meloda.fast.photoviewer.model.PhotoViewState

-@OptIn(
-    ExperimentalFoundationApi::class,
-)
@Composable
 fun PhotoViewScreenContent(
    onBackClick: () -> Unit,
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android">
-
-</manifest>
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android">
-
-</manifest>
@@ -104,10 +104,10 @@ class SettingsViewModelImpl(
            }

            SettingsKeys.KEY_DEBUG_HIDE_DEBUG_LIST -> {
-                val showDebugCategory = AppSettings.Debug.showDebugCategory
-                if (!showDebugCategory) return
+                if (!AppSettings.Debug.showDebugCategory) return

-                onSettingsItemChanged(key, false)
+                AppSettings.Debug.showDebugCategory = false
+                userSettings.onShowDebugCategoryChanged(false)

                createSettings()

@@ -122,7 +122,8 @@ class SettingsViewModelImpl(
            SettingsKeys.KEY_ACTIVITY_SEND_ONLINE_STATUS -> {
                if (AppSettings.Debug.showDebugCategory) return

-                onSettingsItemChanged(key, true)
+                AppSettings.Debug.showDebugCategory = true
+                userSettings.onShowDebugCategoryChanged(true)

                createSettings()

@@ -1,7 +0,0 @@
-package dev.meloda.fast.settings.model
-
-import dev.meloda.fast.common.model.UiText
-
-fun interface TitleProvider<T, S : SettingsItem<T>> {
-    fun provideTitle(item: S): UiText?
-}