Generation form redesign (#44)

ShiftHackZ · web-flow · commit 451bff689df8 · 2023-05-28T12:27:34.000+03:00
* Generation form redesign

* Update
diff --git a/data/src/main/java/com/shifthackz/aisdv1/data/preference/PreferenceManagerImpl.kt b/data/src/main/java/com/shifthackz/aisdv1/data/preference/PreferenceManagerImpl.kt
@@ -53,6 +53,13 @@ class PreferenceManagerImpl(
             .apply()
             .also { onPreferencesChanged() }
 
+    override var formAdvancedOptionsAlwaysShow: Boolean
+        get() = preferences.getBoolean(KEY_FORM_ALWAYS_SHOW_ADVANCED_OPTIONS, false)
+        set(value) = preferences.edit()
+            .putBoolean(KEY_FORM_ALWAYS_SHOW_ADVANCED_OPTIONS, value)
+            .apply()
+            .also { onPreferencesChanged() }
+
     override fun observe(): Flowable<Settings> = preferencesChangedSubject
         .toFlowable(BackpressureStrategy.LATEST)
         .map {
@@ -62,6 +69,7 @@ class PreferenceManagerImpl(
                 useSdAiCloud = useSdAiCloud,
                 monitorConnectivity = monitorConnectivity,
                 autoSaveAiResults = autoSaveAiResults,
+                formAdvancedOptionsAlwaysShow = formAdvancedOptionsAlwaysShow,
             )
         }
 
@@ -73,5 +81,6 @@ class PreferenceManagerImpl(
         private const val KEY_SD_AI_CLOUD_MODE = "key_sd_ai_cloud_mode"
         private const val KEY_MONITOR_CONNECTIVITY = "key_monitor_connectivity"
         private const val KEY_AI_AUTO_SAVE = "key_ai_auto_save"
+        private const val KEY_FORM_ALWAYS_SHOW_ADVANCED_OPTIONS = "key_always_show_advanced_options"
     }
 }
diff --git a/domain/src/main/java/com/shifthackz/aisdv1/domain/entity/Settings.kt b/domain/src/main/java/com/shifthackz/aisdv1/domain/entity/Settings.kt
@@ -6,4 +6,5 @@ data class Settings(
     val useSdAiCloud: Boolean,
     val monitorConnectivity: Boolean,
     val autoSaveAiResults: Boolean,
+    val formAdvancedOptionsAlwaysShow: Boolean,
 )
diff --git a/domain/src/main/java/com/shifthackz/aisdv1/domain/preference/PreferenceManager.kt b/domain/src/main/java/com/shifthackz/aisdv1/domain/preference/PreferenceManager.kt
@@ -9,6 +9,7 @@ interface PreferenceManager {
     var useSdAiCloud: Boolean
     var monitorConnectivity: Boolean
     var autoSaveAiResults: Boolean
+    var formAdvancedOptionsAlwaysShow: Boolean
 
     fun observe(): Flowable<Settings>
 }
diff --git a/presentation/src/main/java/com/shifthackz/aisdv1/presentation/core/GenerationMviState.kt b/presentation/src/main/java/com/shifthackz/aisdv1/presentation/core/GenerationMviState.kt
@@ -4,6 +4,8 @@ import com.shifthackz.aisdv1.core.model.UiText
 import com.shifthackz.aisdv1.core.ui.MviState
 
 abstract class GenerationMviState : MviState {
+    abstract val advancedToggleButtonVisible: Boolean
+    abstract val advancedOptionsVisible: Boolean
     abstract val prompt: String
     abstract val negativePrompt: String
     abstract val width: String
@@ -22,6 +24,8 @@ abstract class GenerationMviState : MviState {
         get() = widthValidationError != null || heightValidationError != null
 
     open fun copyState(
+        advancedToggleButtonVisible: Boolean = this.advancedToggleButtonVisible,
+        advancedOptionsVisible: Boolean = this.advancedOptionsVisible,
         prompt: String = this.prompt,
         negativePrompt: String = this.negativePrompt,
         width: String = this.width,
diff --git a/presentation/src/main/java/com/shifthackz/aisdv1/presentation/core/GenerationMviViewModel.kt b/presentation/src/main/java/com/shifthackz/aisdv1/presentation/core/GenerationMviViewModel.kt
@@ -11,23 +11,43 @@ import com.shifthackz.aisdv1.core.common.schedulers.subscribeOnMainThread
 import com.shifthackz.aisdv1.core.ui.MviEffect
 import com.shifthackz.aisdv1.core.viewmodel.MviRxViewModel
 import com.shifthackz.aisdv1.domain.entity.StableDiffusionSampler
+import com.shifthackz.aisdv1.domain.preference.PreferenceManager
 import com.shifthackz.aisdv1.domain.usecase.coin.ObserveCoinsUseCase
 import com.shifthackz.aisdv1.domain.usecase.sdsampler.GetStableDiffusionSamplersUseCase
 import io.reactivex.rxjava3.kotlin.subscribeBy
 
 abstract class GenerationMviViewModel<S : GenerationMviState, E : MviEffect>(
     buildInfoProvider: BuildInfoProvider,
+    preferenceManager: PreferenceManager,
     observeCoinsUseCase: ObserveCoinsUseCase,
     getStableDiffusionSamplersUseCase: GetStableDiffusionSamplersUseCase,
     schedulersProvider: SchedulersProvider,
 ) : MviRxViewModel<S, E>() {
 
     init {
+        !preferenceManager.observe()
+            .subscribeOnMainThread(schedulersProvider)
+            .subscribeBy(
+                onError = ::errorLog,
+                onComplete = EmptyLambda,
+                onNext = { settings ->
+                    currentState
+                        .copyState(
+                            advancedToggleButtonVisible = !settings.formAdvancedOptionsAlwaysShow
+                        )
+                        .let { state ->
+                            if (!settings.formAdvancedOptionsAlwaysShow) state
+                            else state.copyState(advancedOptionsVisible = true)
+                        }
+                        .let(::setGenerationState)
+                }
+            )
+
         !getStableDiffusionSamplersUseCase()
             .map { samplers -> samplers.map(StableDiffusionSampler::name) }
             .subscribeOnMainThread(schedulersProvider)
             .subscribeBy(
-                onError = { t -> t.printStackTrace() },
+                onError = ::errorLog,
                 onSuccess = { samplers ->
                     currentState
                         .copyState(
@@ -53,7 +73,11 @@ abstract class GenerationMviViewModel<S : GenerationMviState, E : MviEffect>(
         }
     }
 
-    fun updatePrompt(value: String) = (currentState)
+    fun toggleAdvancedOptions(value: Boolean) = currentState
+        .copyState(advancedOptionsVisible = value)
+        .let(::setGenerationState)
+
+    fun updatePrompt(value: String) = currentState
         .copyState(prompt = value)
         .let(::setGenerationState)
 
diff --git a/presentation/src/main/java/com/shifthackz/aisdv1/presentation/features/AnalyticsEvents.kt b/presentation/src/main/java/com/shifthackz/aisdv1/presentation/features/AnalyticsEvents.kt
@@ -60,6 +60,11 @@ data class AutoSaveAiResultsChanged(val value: Boolean) : AnalyticsEvent(
     name = "settings_auto_save_change",
     parameters = mapOf("enabled" to "$value"),
 )
+
+data class FormAdvancedOptionsAlwaysShowChanged(val value: Boolean) : AnalyticsEvent(
+    name = "settings_form_advanced_options_always_show_change",
+    parameters = mapOf("enabled" to "$value"),
+)
 //endregion
 
 //region GENERATION EVENTS
diff --git a/presentation/src/main/java/com/shifthackz/aisdv1/presentation/screen/img2img/ImageToImageContract.kt b/presentation/src/main/java/com/shifthackz/aisdv1/presentation/screen/img2img/ImageToImageContract.kt
@@ -15,6 +15,8 @@ data class ImageToImageState(
     val imageBase64: String = "",
     val screenDialog: Dialog = Dialog.None,
     val denoisingStrength: Float = 0.75f,
+    override val advancedToggleButtonVisible: Boolean = true,
+    override val advancedOptionsVisible: Boolean = false,
     override val prompt: String = "",
     override val negativePrompt: String = "",
     override val width: String = 512.toString(),
@@ -48,6 +50,8 @@ data class ImageToImageState(
     }
 
     override fun copyState(
+        advancedToggleButtonVisible: Boolean,
+        advancedOptionsVisible: Boolean,
         prompt: String,
         negativePrompt: String,
         width: String,
@@ -62,6 +66,8 @@ data class ImageToImageState(
         heightValidationError: UiText?,
         generateButtonEnabled: Boolean
     ): GenerationMviState = copy(
+        advancedToggleButtonVisible = advancedToggleButtonVisible,
+        advancedOptionsVisible = advancedOptionsVisible,
         prompt = prompt,
         negativePrompt = negativePrompt,
         width = width,
diff --git a/presentation/src/main/java/com/shifthackz/aisdv1/presentation/screen/img2img/ImageToImageScreen.kt b/presentation/src/main/java/com/shifthackz/aisdv1/presentation/screen/img2img/ImageToImageScreen.kt
@@ -6,6 +6,7 @@ import androidx.compose.foundation.*
 import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.AutoFixNormal
 import androidx.compose.material.icons.filled.BrowseGallery
 import androidx.compose.material.icons.filled.Camera
 import androidx.compose.material.icons.filled.Delete
@@ -26,12 +27,12 @@ import com.shifthackz.aisdv1.domain.entity.AiGenerationResult
 import com.shifthackz.aisdv1.presentation.R
 import com.shifthackz.aisdv1.presentation.theme.sliderColors
 import com.shifthackz.aisdv1.presentation.utils.Constants
-import com.shifthackz.aisdv1.presentation.widget.GenerationInputForm
 import com.shifthackz.aisdv1.presentation.widget.coins.AvailableCoinsComposable
 import com.shifthackz.aisdv1.presentation.widget.dialog.ErrorDialog
 import com.shifthackz.aisdv1.presentation.widget.dialog.GenerationImageResultDialog
 import com.shifthackz.aisdv1.presentation.widget.dialog.NoSdAiCoinsDialog
 import com.shifthackz.aisdv1.presentation.widget.dialog.ProgressDialog
+import com.shifthackz.aisdv1.presentation.widget.input.GenerationInputForm
 import com.shz.imagepicker.imagepicker.ImagePickerCallback
 import org.koin.androidx.compose.koinViewModel
 
@@ -51,6 +52,7 @@ class ImageToImageScreen(
             onTakePhoto = { takePhoto(viewModel::updateInputImage) },
             onClearPhoto = viewModel::clearInputImage,
             onDenoisingStrengthUpdated = viewModel::updateDenoisingStrength,
+            onShowAdvancedOptionsToggle = viewModel::toggleAdvancedOptions,
             onPromptUpdated = viewModel::updatePrompt,
             onNegativePromptUpdated = viewModel::updateNegativePrompt,
             onWidthUpdated = viewModel::updateWidth,
@@ -79,6 +81,7 @@ private fun ScreenContent(
     onTakePhoto: () -> Unit = {},
     onClearPhoto: () -> Unit = {},
     onDenoisingStrengthUpdated: (Float) -> Unit,
+    onShowAdvancedOptionsToggle: (Boolean) -> Unit = {},
     onPromptUpdated: (String) -> Unit = {},
     onNegativePromptUpdated: (String) -> Unit = {},
     onWidthUpdated: (String) -> Unit = {},
@@ -122,6 +125,7 @@ private fun ScreenContent(
                     )
                     GenerationInputForm(
                         state = state,
+                        onShowAdvancedOptionsToggle = onShowAdvancedOptionsToggle,
                         onPromptUpdated = onPromptUpdated,
                         onNegativePromptUpdated = onNegativePromptUpdated,
                         onWidthUpdated = onWidthUpdated,
@@ -168,7 +172,13 @@ private fun ScreenContent(
                         onClick = onGenerateClicked,
                         enabled = !state.hasValidationErrors && !state.imageState.isEmpty,
                     ) {
+                        Icon(
+                            modifier = Modifier.size(18.dp),
+                            imageVector = Icons.Default.AutoFixNormal,
+                            contentDescription = "Imagine",
+                        )
                         Text(
+                            modifier = Modifier.padding(start = 8.dp),
                             text = stringResource(id = R.string.action_generate)
                         )
                     }
diff --git a/presentation/src/main/java/com/shifthackz/aisdv1/presentation/screen/img2img/ImageToImageViewModel.kt b/presentation/src/main/java/com/shifthackz/aisdv1/presentation/screen/img2img/ImageToImageViewModel.kt
@@ -34,6 +34,7 @@ class ImageToImageViewModel(
     private val analytics: Analytics,
 ) : GenerationMviViewModel<ImageToImageState, ImageToImageEffect>(
     buildInfoProvider,
+    preferenceManager,
     observeCoinsUseCase,
     getStableDiffusionSamplersUseCase,
     schedulersProvider,
diff --git a/presentation/src/main/java/com/shifthackz/aisdv1/presentation/screen/settings/SettingsContract.kt b/presentation/src/main/java/com/shifthackz/aisdv1/presentation/screen/settings/SettingsContract.kt
@@ -19,6 +19,7 @@ sealed interface SettingsState : MviState {
         val sdModelSelected: String,
         val monitorConnectivity: Boolean,
         val autoSaveAiResults: Boolean,
+        val formAdvancedOptionsAlwaysShow: Boolean,
         val appVersion: String,
         val showRewardedSdAiAd: Boolean,
         val showSdModelSelector: Boolean,
diff --git a/presentation/src/main/java/com/shifthackz/aisdv1/presentation/screen/settings/SettingsScreen.kt b/presentation/src/main/java/com/shifthackz/aisdv1/presentation/screen/settings/SettingsScreen.kt
@@ -49,6 +49,7 @@ class SettingsScreen(
             onLaunchRewarded = launchRewarded,
             onMonitorConnectivityChanged = viewModel::changeMonitorConnectivitySetting,
             onAutoSaveAiResultChanged = viewModel::changeAutoSaveAiResultSetting,
+            onFormAdvancedOptionsAlwaysShowChanged = viewModel::changeFormAdvancedOptionsAlwaysShow,
             onClearAppCacheItemClick = viewModel::launchClearAppCacheDialog,
             onReportProblemItemClick = shareLogFile,
             onCheckUpdatesItemClick = onCheckUpdatesItemClick,
@@ -76,6 +77,7 @@ private fun ScreenContent(
     onLaunchRewarded: () -> Unit = {},
     onMonitorConnectivityChanged: (Boolean) -> Unit = {},
     onAutoSaveAiResultChanged: (Boolean) -> Unit = {},
+    onFormAdvancedOptionsAlwaysShowChanged: (Boolean) -> Unit = {},
 
     onClearAppCacheItemClick: () -> Unit = {},
     onReportProblemItemClick: () -> Unit = {},
@@ -115,6 +117,7 @@ private fun ScreenContent(
                         onLaunchRewarded = onLaunchRewarded,
                         onMonitorConnectivityChanged = onMonitorConnectivityChanged,
                         onAutoSaveAiResultChanged = onAutoSaveAiResultChanged,
+                        onFormAdvancedOptionsAlwaysShowChanged = onFormAdvancedOptionsAlwaysShowChanged,
                         onClearAppCacheItemClick = onClearAppCacheItemClick,
                         onReportProblemItemClick = onReportProblemItemClick,
                         onCheckUpdatesItemClick = onCheckUpdatesItemClick,
@@ -182,6 +185,7 @@ private fun ContentSettingsState(
     onSdModelItemClick: () -> Unit = {},
     onLaunchRewarded: () -> Unit = {},
     onAutoSaveAiResultChanged: (Boolean) -> Unit = {},
+    onFormAdvancedOptionsAlwaysShowChanged: (Boolean) -> Unit = {},
     onMonitorConnectivityChanged: (Boolean) -> Unit = {},
     onClearAppCacheItemClick: () -> Unit = {},
     onReportProblemItemClick: () -> Unit = {},
@@ -257,6 +261,21 @@ private fun ContentSettingsState(
                 )
             }
         )
+        SettingsItem(
+            modifier = itemModifier,
+            startIcon = Icons.Default.DynamicForm,
+            text = R.string.settings_item_advanced_form_default.asUiText(),
+            onClick = {
+                onFormAdvancedOptionsAlwaysShowChanged(!state.formAdvancedOptionsAlwaysShow)
+            },
+            endValueContent = {
+                Switch(
+                    modifier = Modifier.padding(horizontal = 8.dp),
+                    checked = state.formAdvancedOptionsAlwaysShow,
+                    onCheckedChange = onFormAdvancedOptionsAlwaysShowChanged,
+                )
+            }
+        )
         SettingsItem(
             modifier = itemModifier,
             startIcon = Icons.Default.DeleteForever,
@@ -329,6 +348,7 @@ private fun PreviewStateContent() {
             showRewardedSdAiAd = true,
             monitorConnectivity = true,
             autoSaveAiResults = true,
+            formAdvancedOptionsAlwaysShow = false,
             showSdModelSelector = true,
             showMonitorConnectionOption = true,
             showRateGooglePlay = true,
diff --git a/presentation/src/main/java/com/shifthackz/aisdv1/presentation/screen/settings/SettingsStateProducer.kt b/presentation/src/main/java/com/shifthackz/aisdv1/presentation/screen/settings/SettingsStateProducer.kt
@@ -26,6 +26,7 @@ class SettingsStateProducer(
             sdModelSelected = modelData.firstOrNull { it.second }?.first?.title ?: "",
             monitorConnectivity = preferenceManager.monitorConnectivity,
             autoSaveAiResults = preferenceManager.autoSaveAiResults,
+            formAdvancedOptionsAlwaysShow = preferenceManager.formAdvancedOptionsAlwaysShow,
             appVersion = version,
             showRewardedSdAiAd = preferenceManager.useSdAiCloud,
             showSdModelSelector = !preferenceManager.useSdAiCloud,
diff --git a/presentation/src/main/java/com/shifthackz/aisdv1/presentation/screen/settings/SettingsViewModel.kt b/presentation/src/main/java/com/shifthackz/aisdv1/presentation/screen/settings/SettingsViewModel.kt
@@ -10,6 +10,7 @@ import com.shifthackz.aisdv1.domain.preference.PreferenceManager
 import com.shifthackz.aisdv1.domain.usecase.caching.ClearAppCacheUseCase
 import com.shifthackz.aisdv1.domain.usecase.sdmodel.SelectStableDiffusionModelUseCase
 import com.shifthackz.aisdv1.presentation.features.AutoSaveAiResultsChanged
+import com.shifthackz.aisdv1.presentation.features.FormAdvancedOptionsAlwaysShowChanged
 import com.shifthackz.aisdv1.presentation.features.MonitorConnectionChanged
 import com.shifthackz.aisdv1.presentation.features.SdModelSelected
 import com.shifthackz.aisdv1.presentation.features.SettingsCacheCleared
@@ -78,6 +79,12 @@ class SettingsViewModel(
         ?.copy(autoSaveAiResults = value)
         ?.let(::setState)
         ?.also { analytics.logEvent(AutoSaveAiResultsChanged(value)) }
+
+    fun changeFormAdvancedOptionsAlwaysShow(value: Boolean) = (currentState as? SettingsState.Content)
+        ?.also { preferenceManager.formAdvancedOptionsAlwaysShow = value }
+        ?.copy(formAdvancedOptionsAlwaysShow = value)
+        ?.let(::setState)
+        ?.also { analytics.logEvent(FormAdvancedOptionsAlwaysShowChanged(value)) }
     //endregion
 
     //region UI STATES METHODS
diff --git a/presentation/src/main/java/com/shifthackz/aisdv1/presentation/screen/txt2img/TextToImageContract.kt b/presentation/src/main/java/com/shifthackz/aisdv1/presentation/screen/txt2img/TextToImageContract.kt
@@ -11,6 +11,8 @@ import com.shifthackz.aisdv1.presentation.core.GenerationMviState
 
 data class TextToImageState(
     val screenDialog: Dialog = Dialog.None,
+    override val advancedToggleButtonVisible: Boolean = true,
+    override val advancedOptionsVisible: Boolean = false,
     override val prompt: String = "",
     override val negativePrompt: String = "",
     override val width: String = 512.toString(),
@@ -35,6 +37,8 @@ data class TextToImageState(
     }
 
     override fun copyState(
+        advancedToggleButtonVisible: Boolean,
+        advancedOptionsVisible: Boolean,
         prompt: String,
         negativePrompt: String,
         width: String,
@@ -49,6 +53,8 @@ data class TextToImageState(
         heightValidationError: UiText?,
         generateButtonEnabled: Boolean
     ): GenerationMviState = copy(
+        advancedToggleButtonVisible = advancedToggleButtonVisible,
+        advancedOptionsVisible = advancedOptionsVisible,
         prompt = prompt,
         negativePrompt = negativePrompt,
         width = width,
diff --git a/presentation/src/main/java/com/shifthackz/aisdv1/presentation/screen/txt2img/TextToImageScreen.kt b/presentation/src/main/java/com/shifthackz/aisdv1/presentation/screen/txt2img/TextToImageScreen.kt
diff --git a/presentation/src/main/java/com/shifthackz/aisdv1/presentation/screen/txt2img/TextToImageViewModel.kt b/presentation/src/main/java/com/shifthackz/aisdv1/presentation/screen/txt2img/TextToImageViewModel.kt
diff --git a/presentation/src/main/java/com/shifthackz/aisdv1/presentation/widget/input/GenerationInputForm.kt b/presentation/src/main/java/com/shifthackz/aisdv1/presentation/widget/input/GenerationInputForm.kt
diff --git a/presentation/src/main/java/com/shifthackz/aisdv1/presentation/widget/item/SettingsItem.kt b/presentation/src/main/java/com/shifthackz/aisdv1/presentation/widget/item/SettingsItem.kt
diff --git a/presentation/src/main/res/values-uk/strings.xml b/presentation/src/main/res/values-uk/strings.xml
diff --git a/presentation/src/main/res/values/strings.xml b/presentation/src/main/res/values/strings.xml

Original file line number	Diff line number	Diff line change
`@@ -6,4 +6,5 @@ data class Settings(`
`6`	`6`	`val useSdAiCloud: Boolean,`
`7`	`7`	`val monitorConnectivity: Boolean,`
`8`	`8`	`val autoSaveAiResults: Boolean,`
	`9`	`+ val formAdvancedOptionsAlwaysShow: Boolean,`
`9`	`10`	`)`
Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,7 @@ interface PreferenceManager {`
`9`	`9`	`var useSdAiCloud: Boolean`
`10`	`10`	`var monitorConnectivity: Boolean`
`11`	`11`	`var autoSaveAiResults: Boolean`
	`12`	`+ var formAdvancedOptionsAlwaysShow: Boolean`
`12`	`13`
`13`	`14`	`fun observe(): Flowable<Settings>`
`14`	`15`	`}`