Tagged input (#140)

* Tagged input

* Tagged input | Patch 2

* Settings refactor

* Server setup modal refactor

* Gallery detail modal refactor

* Gallery modal refactor

* Color tags for extras

* Tag edit dialog

* Update strings

* Update

* Update min/max values

* Handle connectivity view

* Fix str state

Author: ShiftHackZ

data/src/main/java/com/shifthackz/aisdv1/data/gateway/ServerConnectivityGatewayImpl.kt

@@ -3,13 +3,15 @@ package com.shifthackz.aisdv1.data.gateway
 import com.shifthackz.aisdv1.data.provider.ServerUrlProvider
 import com.shifthackz.aisdv1.domain.gateway.ServerConnectivityGateway
 import com.shifthackz.aisdv1.network.connectivity.ConnectivityMonitor
-import io.reactivex.rxjava3.core.Observable
+import io.reactivex.rxjava3.core.BackpressureStrategy
+import io.reactivex.rxjava3.core.Flowable
 
 internal class ServerConnectivityGatewayImpl(
     private val connectivityMonitor: ConnectivityMonitor,
     private val serverUrlProvider: ServerUrlProvider,
 ) : ServerConnectivityGateway {
 
-    override fun observe(): Observable<Boolean> = serverUrlProvider("")
+    override fun observe(): Flowable<Boolean> = serverUrlProvider("")
         .flatMapObservable(connectivityMonitor::observe)
+        .toFlowable(BackpressureStrategy.LATEST)
 }

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

@@ -62,6 +62,13 @@ class PreferenceManagerImpl(
             .apply()
             .also { onPreferencesChanged() }
 
+    override var formPromptTaggedInput: Boolean
+        get() = preferences.getBoolean(KEY_FORM_PROMPT_TAGGED_INPUT, true)
+        set(value) = preferences.edit()
+            .putBoolean(KEY_FORM_PROMPT_TAGGED_INPUT, value)
+            .apply()
+            .also { onPreferencesChanged() }
+
     override var source: ServerSource
         get() = (preferences.getString(KEY_SERVER_SOURCE, ServerSource.AUTOMATIC1111.key) ?: ServerSource.AUTOMATIC1111.key)
             .let(ServerSource.Companion::parse)
@@ -132,6 +139,7 @@ class PreferenceManagerImpl(
                 autoSaveAiResults = autoSaveAiResults,
                 saveToMediaStore = saveToMediaStore,
                 formAdvancedOptionsAlwaysShow = formAdvancedOptionsAlwaysShow,
+                formPromptTaggedInput = formPromptTaggedInput,
                 source = source,
                 hordeApiKey = hordeApiKey,
                 localUseNNAPI = localUseNNAPI,
@@ -147,6 +155,7 @@ class PreferenceManagerImpl(
         private const val KEY_AI_AUTO_SAVE = "key_ai_auto_save"
         private const val KEY_SAVE_TO_MEDIA_STORE = "key_save_to_media_store"
         private const val KEY_FORM_ALWAYS_SHOW_ADVANCED_OPTIONS = "key_always_show_advanced_options"
+        private const val KEY_FORM_PROMPT_TAGGED_INPUT = "key_prompt_tagged_input"
         private const val KEY_SERVER_SOURCE = "key_server_source"
         private const val KEY_HORDE_API_KEY = "key_horde_api_key"
         private const val KEY_OPEN_AI_API_KEY = "key_open_ai_api_key"

dependencies.gradle

@@ -20,6 +20,7 @@ ext {
     imagePickerVersion = 'v2.0.3'
     mviVersion = '1.0.1'
     timberVersion = '5.0.1'
+    apacheLangVersion = '3.14.0'
     gsonVersion = '2.10.1'
     googleMaterialVersion = '1.9.0'
     accompanistSystemUiControllerVersion = '0.30.1'
@@ -93,6 +94,9 @@ ext {
     log = [
             timber: "com.jakewharton.timber:timber:$timberVersion",
     ]
+    apache = [
+            stringutils: "org.apache.commons:commons-lang3:$apacheLangVersion"
+    ]
     test = [
             junit: "junit:junit:$testJunitVersion",
     ]

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

@@ -7,6 +7,7 @@ data class Settings(
     val autoSaveAiResults: Boolean,
     val saveToMediaStore: Boolean,
     val formAdvancedOptionsAlwaysShow: Boolean,
+    val formPromptTaggedInput: Boolean,
     val source: ServerSource,
     val hordeApiKey: String,
     val localUseNNAPI: Boolean,

domain/src/main/java/com/shifthackz/aisdv1/domain/gateway/ServerConnectivityGateway.kt

@@ -1,7 +1,7 @@
 package com.shifthackz.aisdv1.domain.gateway
 
-import io.reactivex.rxjava3.core.Observable
+import io.reactivex.rxjava3.core.Flowable
 
 fun interface ServerConnectivityGateway {
-    fun observe(): Observable<Boolean>
+    fun observe(): Flowable<Boolean>
 }

domain/src/main/java/com/shifthackz/aisdv1/domain/preference/PreferenceManager.kt

@@ -11,6 +11,7 @@ interface PreferenceManager {
     var autoSaveAiResults: Boolean
     var saveToMediaStore: Boolean
     var formAdvancedOptionsAlwaysShow: Boolean
+    var formPromptTaggedInput: Boolean
     var source: ServerSource
     var hordeApiKey: String
     var openAiApiKey: String

domain/src/main/java/com/shifthackz/aisdv1/domain/usecase/connectivity/ObserveSeverConnectivityUseCase.kt

@@ -1,7 +1,7 @@
 package com.shifthackz.aisdv1.domain.usecase.connectivity
 
-import io.reactivex.rxjava3.core.Observable
+import io.reactivex.rxjava3.core.Flowable
 
 interface ObserveSeverConnectivityUseCase {
-    operator fun invoke(): Observable<Boolean>
+    operator fun invoke(): Flowable<Boolean>
 }

presentation/build.gradle

@@ -33,6 +33,7 @@ dependencies {
     implementation androidx.pagingRx3
 
     implementation google.material
+    implementation apache.stringutils
 
     implementation reactive.rxjava
     implementation reactive.rxkotlin

presentation/src/main/java/com/shifthackz/aisdv1/presentation/core/GenerationFormUpdateEvent.kt

@@ -1,6 +1,7 @@
 package com.shifthackz.aisdv1.presentation.core
 
 import com.shifthackz.aisdv1.domain.entity.AiGenerationResult
+import io.reactivex.rxjava3.core.BackpressureStrategy
 import io.reactivex.rxjava3.subjects.PublishSubject
 
 class GenerationFormUpdateEvent {
@@ -12,14 +13,14 @@ class GenerationFormUpdateEvent {
     fun update(generation: AiGenerationResult, route: AiGenerationResult.Type) {
         sRoute.onNext(route)
         when (route) {
-            AiGenerationResult.Type.TEXT_TO_IMAGE -> sTxt2Img
-            AiGenerationResult.Type.IMAGE_TO_IMAGE -> sImg2Img
-        }.onNext(generation)
+            AiGenerationResult.Type.TEXT_TO_IMAGE -> sTxt2Img.onNext(generation)
+            AiGenerationResult.Type.IMAGE_TO_IMAGE -> sImg2Img.onNext(generation)
+        }
     }
 
-    fun observeRoute() = sRoute
+    fun observeRoute() = sRoute.toFlowable(BackpressureStrategy.LATEST)
 
-    fun observeTxt2ImgForm() = sTxt2Img
+    fun observeTxt2ImgForm() = sTxt2Img.toFlowable(BackpressureStrategy.LATEST)
 
-    fun observeImg2ImgForm() = sImg2Img
+    fun observeImg2ImgForm() = sImg2Img.toFlowable(BackpressureStrategy.LATEST)
 }

presentation/src/main/java/com/shifthackz/aisdv1/presentation/core/GenerationMviState.kt

@@ -14,6 +14,7 @@ abstract class GenerationMviState : MviState {
     abstract val mode: ServerSource
     abstract val advancedToggleButtonVisible: Boolean
     abstract val advancedOptionsVisible: Boolean
+    abstract val formPromptTaggedInput: Boolean
     abstract val prompt: String
     abstract val negativePrompt: String
     abstract val width: String
@@ -36,6 +37,16 @@ abstract class GenerationMviState : MviState {
     abstract val batchCount: Int
     abstract val generateButtonEnabled: Boolean
 
+    open val promptKeywords: List<String>
+        get() = prompt.split(",")
+            .map { it.trim() }
+            .filter { it.isNotEmpty() }
+
+    open val negativePromptKeywords: List<String>
+        get() = negativePrompt.split(",")
+            .map { it.trim() }
+            .filter { it.isNotEmpty() }
+
     open val hasValidationErrors: Boolean
         get() = widthValidationError != null || heightValidationError != null
 
@@ -44,6 +55,7 @@ abstract class GenerationMviState : MviState {
         mode: ServerSource = this.mode,
         advancedToggleButtonVisible: Boolean = this.advancedToggleButtonVisible,
         advancedOptionsVisible: Boolean = this.advancedOptionsVisible,
+        formPromptTaggedInput: Boolean = this.formPromptTaggedInput,
         prompt: String = this.prompt,
         negativePrompt: String = this.negativePrompt,
         width: String = this.width,