Server setup redesign (#137)

* Server setup redesign

* Remove stub navigation

* Update translations / UI

* Update models

* Implement keyboard hide effect

Author: ShiftHackZ

app/build.gradle

@@ -25,6 +25,7 @@ android {
 
         buildConfigField "String", "HORDE_AI_SIGN_UP_URL", "\"https://stablehorde.net/register\""
         buildConfigField "String", "HUGGING_FACE_INFO_URL", "\"https://huggingface.co/docs/api-inference/index\""
+        buildConfigField "String", "OPEN_AI_INFO_URL", "\"https://platform.openai.com/api-keys\""
         buildConfigField "String", "UPDATE_API_URL", "\"https://sdai.moroz.cc\""
         buildConfigField "String", "DEMO_MODE_API_URL", "\"https://sdai.moroz.cc\""
         buildConfigField "String", "POLICY_URL", "\"https://sdai.moroz.cc/policy.html\""

app/src/main/java/com/shifthackz/aisdv1/app/di/ProvidersModule.kt

@@ -93,6 +93,7 @@ val providersModule = module {
             override val hordeUrl: String = BuildConfig.HORDE_AI_URL
             override val hordeSignUpUrl: String = BuildConfig.HORDE_AI_SIGN_UP_URL
             override val huggingFaceUrl: String = BuildConfig.HUGGING_FACE_INFO_URL
+            override val openAiInfoUrl: String = BuildConfig.OPEN_AI_INFO_URL
             override val privacyPolicyUrl: String = BuildConfig.POLICY_URL
             override val gitHubSourceUrl: String = BuildConfig.GITHUB_SOURCE_URL
             override val setupInstructionsUrl: String = BuildConfig.SETUP_INSTRUCTIONS_URL

core/common/src/main/java/com/shifthackz/aisdv1/core/common/links/LinksProvider.kt

@@ -4,6 +4,7 @@ interface LinksProvider {
     val hordeUrl: String
     val hordeSignUpUrl: String
     val huggingFaceUrl: String
+    val openAiInfoUrl: String
     val privacyPolicyUrl: String
     val gitHubSourceUrl: String
     val setupInstructionsUrl: String

core/ui/src/main/java/com/shifthackz/aisdv1/core/ui/MviContract.kt

@@ -3,7 +3,9 @@
 package com.shifthackz.aisdv1.core.ui
 
 interface MviState
+interface MviIntent
 interface MviEffect
 
 object EmptyState : MviState
+object EmptyIntent : MviIntent
 object EmptyEffect : MviEffect

core/ui/src/main/java/com/shifthackz/aisdv1/core/ui/MviExtensions.kt

@@ -2,10 +2,44 @@
 
 package com.shifthackz.aisdv1.core.ui
 
+import androidx.compose.material3.MaterialTheme
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.luminance
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import com.shifthackz.aisdv1.core.viewmodel.MviViewModel
+import com.shifthackz.aisdv1.core.viewmodel.MviViewModel2
+
+@Composable
+fun <S : MviState, I: MviIntent, E : MviEffect> MviComposable2(
+    viewModel: MviViewModel2<S, I, E>,
+    effectHandler: (E) -> Unit = {},
+    statusBarColor: Color = MaterialTheme.colorScheme.background,
+    statusBarDarkIcons: Boolean = statusBarColor.luminance() > 0.5f,
+    navigationBarColor: Color =  MaterialTheme.colorScheme.background,
+    content: @Composable (S) -> Unit,
+) = object : MviScreen2<S, I, E>(viewModel) {
+
+    @Composable
+    override fun statusBarColor(): Color = statusBarColor
+
+    @Composable
+    override fun statusBarDarkIcons(): Boolean = statusBarDarkIcons
+
+    @Composable
+    override fun navigationBarColor(): Color = navigationBarColor
+
+    @Composable
+    override fun Content() {
+        val state = viewModel.state.collectAsStateWithLifecycle().value
+        content(state)
+    }
+
+    override fun processEffect(effect: E) {
+        effectHandler(effect)
+    }
+}.Build()
+
 
 @Composable
 fun <S : MviState, E : MviEffect> MviComposable(

core/ui/src/main/java/com/shifthackz/aisdv1/core/ui/MviScreen2.kt

@@ -0,0 +1,28 @@
+@file:Suppress("MemberVisibilityCanBePrivate")
+
+package com.shifthackz.aisdv1.core.ui
+
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import com.shifthackz.aisdv1.core.viewmodel.MviViewModel
+import com.shifthackz.aisdv1.core.viewmodel.MviViewModel2
+
+abstract class MviScreen2<S : MviState, I : MviIntent, E : MviEffect>(
+    private val viewModel: MviViewModel2<S, I, E>,
+) : Screen() {
+
+    @Composable
+    override fun Build() {
+        LaunchedEffect(KEY_EFFECTS_PROCESSOR) {
+            viewModel.effectStream.collect(::processEffect)
+        }
+        ApplySystemUiColors()
+        Content()
+    }
+
+    protected open fun processEffect(effect: E) = Unit
+
+    companion object {
+        private const val KEY_EFFECTS_PROCESSOR = "key_effects_processor"
+    }
+}

core/ui/src/main/java/com/shifthackz/aisdv1/core/viewmodel/MviRxViewModel2.kt

@@ -0,0 +1,20 @@
+@file:Suppress("unused")
+
+package com.shifthackz.aisdv1.core.viewmodel
+
+import com.shifthackz.aisdv1.core.contract.RxDisposableContract
+import com.shifthackz.aisdv1.core.ui.MviEffect
+import com.shifthackz.aisdv1.core.ui.MviIntent
+import com.shifthackz.aisdv1.core.ui.MviState
+import io.reactivex.rxjava3.disposables.CompositeDisposable
+
+abstract class MviRxViewModel2<S : MviState, I : MviIntent, E : MviEffect> : MviViewModel2<S, I, E>(),
+    RxDisposableContract {
+
+    override val compositeDisposable = CompositeDisposable()
+
+    override fun onCleared() {
+        super.onCleared()
+        compositeDisposable.clear()
+    }
+}

core/ui/src/main/java/com/shifthackz/aisdv1/core/viewmodel/MviViewModel2.kt

@@ -0,0 +1,53 @@
+@file:Suppress("MemberVisibilityCanBePrivate", "unused")
+
+package com.shifthackz.aisdv1.core.viewmodel
+
+import android.util.Log
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import com.shifthackz.aisdv1.core.common.log.debugLog
+import com.shifthackz.aisdv1.core.ui.BuildConfig
+import com.shifthackz.aisdv1.core.ui.MviEffect
+import com.shifthackz.aisdv1.core.ui.MviIntent
+import com.shifthackz.aisdv1.core.ui.MviState
+import kotlinx.coroutines.CoroutineExceptionHandler
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.channels.Channel
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.flow.receiveAsFlow
+import kotlinx.coroutines.flow.update
+import kotlinx.coroutines.launch
+
+abstract class MviViewModel2<S : MviState, I : MviIntent, E : MviEffect> : ViewModel() {
+
+    private val mutableState: MutableStateFlow<S> by lazy { MutableStateFlow(emptyState) }
+    private val effectChannel: Channel<E> = Channel()
+
+    private val exceptionHandler = CoroutineExceptionHandler { _, throwable ->
+        throwable.printStackTrace()
+    }
+
+    protected val currentState: S
+        get() = state.value
+
+    val state: StateFlow<S> by lazy { mutableState.asStateFlow() }
+    val effectStream: Flow<E> = effectChannel.receiveAsFlow()
+
+    abstract val emptyState: S
+
+    abstract fun handleIntent(intent: I)
+
+    open fun updateState(mutation: (S) -> S) = mutableState.update {
+        if (BuildConfig.DEBUG) debugLog("NEW STATE : $state")
+        mutation(it)
+    }
+
+    fun emitEffect(effect: E) {
+        viewModelScope.launch(Dispatchers.Main.immediate + exceptionHandler) {
+            effectChannel.send(effect)
+        }
+    }
+}

data/src/main/java/com/shifthackz/aisdv1/data/preference/PreferenceManagerImpl.kt

@@ -154,6 +154,6 @@ class PreferenceManagerImpl(
         private const val KEY_HUGGING_FACE_MODEL_KEY = "key_hugging_face_model_key"
         private const val KEY_LOCAL_NN_API = "key_local_nn_api"
         private const val KEY_LOCAL_MODEL_ID = "key_local_model_id"
-        private const val KEY_FORCE_SETUP_AFTER_UPDATE = "force_upd_setup_v0.x.x-v0.5.3"
+        private const val KEY_FORCE_SETUP_AFTER_UPDATE = "force_upd_setup_v0.x.x-v0.5.8"
     }
 }

domain/src/main/java/com/shifthackz/aisdv1/domain/entity/FeatureTag.kt

@@ -0,0 +1,12 @@
+package com.shifthackz.aisdv1.domain.entity
+
+enum class FeatureTag {
+    Txt2Img,
+    Img2Img,
+    Lora,
+    TextualInversion,
+    HyperNetworks,
+    Batch,
+    MultipleModels,
+    Offline,
+}