Gallery not loading fix (#64)

ShiftHackZ · web-flow · commit ea1f85ff073d · 2023-07-20T14:36:09.000Z
* Gallery not loading fix - Patch 1

* Gallery not loading fix - Patch 2
diff --git a/app/src/main/java/com/shifthackz/aisdv1/app/AiStableDiffusionClientApp.kt b/app/src/main/java/com/shifthackz/aisdv1/app/AiStableDiffusionClientApp.kt
@@ -32,7 +32,7 @@ class AiStableDiffusionClientApp : Application() {
             *featureModule,
             preferenceModule,
             providersModule,
-            domainModule,
+            *domainModule,
             *dataModule,
             networkModule,
             databaseModule,
diff --git a/core/imageprocessing/build.gradle b/core/imageprocessing/build.gradle
@@ -12,5 +12,6 @@ android {
 dependencies {
     implementation project(":core:common")
     implementation di.koinCore
+    implementation di.koinAndroid
     implementation reactive.rxkotlin
 }
diff --git a/core/imageprocessing/src/main/java/com/shifthackz/aisdv1/core/imageprocessing/Base64ToBitmapConverter.kt b/core/imageprocessing/src/main/java/com/shifthackz/aisdv1/core/imageprocessing/Base64ToBitmapConverter.kt
@@ -1,6 +1,7 @@
 package com.shifthackz.aisdv1.core.imageprocessing
 
 import android.graphics.Bitmap
+import com.shifthackz.aisdv1.core.common.log.errorLog
 import com.shifthackz.aisdv1.core.imageprocessing.Base64ToBitmapConverter.Input
 import com.shifthackz.aisdv1.core.imageprocessing.Base64ToBitmapConverter.Output
 import com.shifthackz.aisdv1.core.imageprocessing.contract.RxImageProcessor
@@ -12,6 +13,7 @@ private typealias Base64ToBitmapProcessor = RxImageProcessor<Input, Output>
 
 class Base64ToBitmapConverter(
     private val processingScheduler: Scheduler,
+    private val fallbackBitmap: Bitmap,
 ) : Base64ToBitmapProcessor {
 
     override operator fun invoke(input: Input): Single<Output> = Single
@@ -21,6 +23,10 @@ class Base64ToBitmapConverter(
                 onFailure = emitter::onError,
             )
         }
+        .onErrorReturn { t ->
+            errorLog(t)
+            Output(fallbackBitmap)
+        }
         .subscribeOn(processingScheduler)
 
     private fun convert(input: Input): Result<Output> = runCatching {
diff --git a/core/imageprocessing/src/main/java/com/shifthackz/aisdv1/core/imageprocessing/di/ImageProcessingModule.kt b/core/imageprocessing/src/main/java/com/shifthackz/aisdv1/core/imageprocessing/di/ImageProcessingModule.kt
@@ -1,14 +1,20 @@
 package com.shifthackz.aisdv1.core.imageprocessing.di
 
+import android.graphics.BitmapFactory
 import com.shifthackz.aisdv1.core.common.schedulers.SchedulersProvider
 import com.shifthackz.aisdv1.core.imageprocessing.Base64ToBitmapConverter
 import com.shifthackz.aisdv1.core.imageprocessing.BitmapToBase64Converter
+import com.shifthackz.aisdv1.core.imageprocessing.R
+import org.koin.android.ext.koin.androidContext
 import org.koin.dsl.module
 
 val imageProcessingModule = module {
 
     factory {
-        Base64ToBitmapConverter(get<SchedulersProvider>().computation)
+        Base64ToBitmapConverter(
+            get<SchedulersProvider>().computation,
+            BitmapFactory.decodeResource(androidContext().resources, R.drawable.ic_broken),
+        )
     }
 
     factory {
diff --git a/core/imageprocessing/src/main/res/drawable/ic_broken.webp b/core/imageprocessing/src/main/res/drawable/ic_broken.webp
diff --git a/domain/src/main/java/com/shifthackz/aisdv1/domain/di/DomainModule.kt b/domain/src/main/java/com/shifthackz/aisdv1/domain/di/DomainModule.kt
@@ -16,6 +16,8 @@ import com.shifthackz.aisdv1.domain.usecase.connectivity.TestConnectivityUseCase
 import com.shifthackz.aisdv1.domain.usecase.connectivity.TestConnectivityUseCaseImpl
 import com.shifthackz.aisdv1.domain.usecase.connectivity.TestHordeApiKeyUseCase
 import com.shifthackz.aisdv1.domain.usecase.connectivity.TestHordeApiKeyUseCaseImpl
+import com.shifthackz.aisdv1.domain.usecase.debug.DebugInsertBadBase64UseCase
+import com.shifthackz.aisdv1.domain.usecase.debug.DebugInsertBadBase64UseCaseImpl
 import com.shifthackz.aisdv1.domain.usecase.gallery.DeleteGalleryItemUseCase
 import com.shifthackz.aisdv1.domain.usecase.gallery.DeleteGalleryItemUseCaseImpl
 import com.shifthackz.aisdv1.domain.usecase.gallery.GetAllGalleryUseCase
@@ -52,7 +54,7 @@ import org.koin.core.module.dsl.factoryOf
 import org.koin.dsl.bind
 import org.koin.dsl.module
 
-val domainModule = module {
+internal val useCasesModule = module {
     factoryOf(::TextToImageUseCaseImpl) bind TextToImageUseCase::class
     factoryOf(::ImageToImageUseCaseImpl) bind ImageToImageUseCase::class
     factoryOf(::PingStableDiffusionServiceUseCaseImpl) bind PingStableDiffusionServiceUseCase::class
@@ -78,3 +80,9 @@ val domainModule = module {
     factoryOf(::ObserveMotdUseCaseImpl) bind ObserveMotdUseCase::class
     factoryOf(::ObserveHordeProcessStatusUseCaseImpl) bind ObserveHordeProcessStatusUseCase::class
 }
+
+internal val debugModule = module {
+    factoryOf(::DebugInsertBadBase64UseCaseImpl) bind DebugInsertBadBase64UseCase::class
+}
+
+val domainModule = (useCasesModule + debugModule).toTypedArray()
diff --git a/domain/src/main/java/com/shifthackz/aisdv1/domain/usecase/debug/DebugInsertBadBase64UseCase.kt b/domain/src/main/java/com/shifthackz/aisdv1/domain/usecase/debug/DebugInsertBadBase64UseCase.kt
@@ -0,0 +1,7 @@
+package com.shifthackz.aisdv1.domain.usecase.debug
+
+import io.reactivex.rxjava3.core.Completable
+
+interface DebugInsertBadBase64UseCase {
+    operator fun invoke(): Completable
+}
diff --git a/domain/src/main/java/com/shifthackz/aisdv1/domain/usecase/debug/DebugInsertBadBase64UseCaseImpl.kt b/domain/src/main/java/com/shifthackz/aisdv1/domain/usecase/debug/DebugInsertBadBase64UseCaseImpl.kt
@@ -0,0 +1,37 @@
+package com.shifthackz.aisdv1.domain.usecase.debug
+
+import com.shifthackz.aisdv1.domain.entity.AiGenerationResult
+import com.shifthackz.aisdv1.domain.repository.GenerationResultRepository
+import io.reactivex.rxjava3.core.Completable
+import java.util.Date
+
+class DebugInsertBadBase64UseCaseImpl(
+    private val repository: GenerationResultRepository,
+) : DebugInsertBadBase64UseCase {
+
+    override fun invoke(): Completable = repository
+            .insert(stubBadBase64Generation)
+            .ignoreElement()
+
+    companion object {
+        private val stubBadBase64Generation = AiGenerationResult(
+            0L,
+            image = System.currentTimeMillis().toString(),
+            inputImage = "",
+            createdAt = Date(),
+            type = AiGenerationResult.Type.TEXT_TO_IMAGE,
+            prompt = "",
+            negativePrompt = "",
+            width = 512,
+            height = 512,
+            samplingSteps = 30,
+            cfgScale = 0f,
+            restoreFaces = false,
+            sampler = "",
+            seed = "",
+            subSeed = "",
+            subSeedStrength = 0f,
+            denoisingStrength = 0f,
+        )
+    }
+}
diff --git a/presentation/src/main/java/com/shifthackz/aisdv1/presentation/activity/AiStableDiffusionActivity.kt b/presentation/src/main/java/com/shifthackz/aisdv1/presentation/activity/AiStableDiffusionActivity.kt
@@ -22,6 +22,8 @@ import com.shifthackz.aisdv1.core.extensions.openUrl
 import com.shifthackz.aisdv1.domain.feature.ad.AdFeature
 import com.shifthackz.aisdv1.domain.feature.analytics.Analytics
 import com.shifthackz.aisdv1.presentation.features.*
+import com.shifthackz.aisdv1.presentation.screen.debug.DebugMenuAccessor
+import com.shifthackz.aisdv1.presentation.screen.debug.DebugMenuScreen
 import com.shifthackz.aisdv1.presentation.screen.gallery.detail.GalleryDetailScreen
 import com.shifthackz.aisdv1.presentation.screen.gallery.detail.GalleryDetailSharing
 import com.shifthackz.aisdv1.presentation.screen.gallery.detail.GalleryDetailViewModel
@@ -46,6 +48,7 @@ class AiStableDiffusionActivity : ComponentActivity(), ImagePickerFeature, FileS
     private val galleryDetailSharing: GalleryDetailSharing by inject()
     private val adFeature: AdFeature by inject()
     private val analytics: Analytics by inject()
+    private val debugMenuAccessor: DebugMenuAccessor by inject()
 
     private val viewModel: AiStableDiffusionViewModel by viewModel()
     private val versionCheckerViewModel: VersionCheckerViewModel by viewModel()
@@ -172,6 +175,11 @@ class AiStableDiffusionActivity : ComponentActivity(), ImagePickerFeature, FileS
                                     rewardCallback = viewModel::earnRewardedCoins,
                                 )
                             },
+                            launchDebugMenu = {
+                                if (debugMenuAccessor.invoke()) {
+                                    navController.navigate(Constants.ROUTE_DEBUG)
+                                }
+                            },
                             shareLogFile = {
                                 ReportProblemEmailComposer().invoke(this@AiStableDiffusionActivity)
                             },
@@ -207,6 +215,13 @@ class AiStableDiffusionActivity : ComponentActivity(), ImagePickerFeature, FileS
                                 },
                             ).Build()
                         }
+
+                        composable(Constants.ROUTE_DEBUG) {
+                            DebugMenuScreen(
+                                viewModel = koinViewModel(),
+                                onNavigateBack = { navController.navigateUp() },
+                            ).Build()
+                        }
                     }
                     VersionCheckerComposable(
                         viewModel = versionCheckerViewModel,
diff --git a/presentation/src/main/java/com/shifthackz/aisdv1/presentation/di/PresentationModule.kt b/presentation/src/main/java/com/shifthackz/aisdv1/presentation/di/PresentationModule.kt
@@ -3,6 +3,7 @@ package com.shifthackz.aisdv1.presentation.di
 import androidx.core.app.NotificationManagerCompat
 import com.shifthackz.aisdv1.presentation.core.GenerationFormUpdateEvent
 import com.shifthackz.aisdv1.presentation.notification.SdaiPushNotificationManager
+import com.shifthackz.aisdv1.presentation.screen.debug.DebugMenuAccessor
 import com.shifthackz.aisdv1.presentation.screen.gallery.detail.GalleryDetailBitmapExporter
 import com.shifthackz.aisdv1.presentation.screen.gallery.detail.GalleryDetailSharing
 import com.shifthackz.aisdv1.presentation.screen.gallery.list.GalleryExporter
@@ -20,4 +21,5 @@ val presentationModule = (viewModelModule + module {
     factoryOf(::GalleryDetailSharing)
     factoryOf(::SettingsStateProducer)
     singleOf(::GenerationFormUpdateEvent)
+    singleOf(::DebugMenuAccessor)
 }).toTypedArray()
diff --git a/presentation/src/main/java/com/shifthackz/aisdv1/presentation/di/ViewModelModule.kt b/presentation/src/main/java/com/shifthackz/aisdv1/presentation/di/ViewModelModule.kt
@@ -3,6 +3,7 @@ package com.shifthackz.aisdv1.presentation.di
 import com.shifthackz.aisdv1.core.common.links.LinksProvider
 import com.shifthackz.aisdv1.presentation.activity.AiStableDiffusionViewModel
 import com.shifthackz.aisdv1.presentation.modal.history.InputHistoryViewModel
+import com.shifthackz.aisdv1.presentation.screen.debug.DebugMenuViewModel
 import com.shifthackz.aisdv1.presentation.screen.gallery.detail.GalleryDetailViewModel
 import com.shifthackz.aisdv1.presentation.screen.gallery.list.GalleryViewModel
 import com.shifthackz.aisdv1.presentation.screen.home.HomeNavigationViewModel
@@ -35,6 +36,7 @@ val viewModelModule = module {
     viewModelOf(::AvailableCoinsViewModel)
     viewModelOf(::MotdViewModel)
     viewModelOf(::InputHistoryViewModel)
+    viewModelOf(::DebugMenuViewModel)
 
     viewModel { parameters ->
         val launchSource = ServerSetupLaunchSource.fromKey(parameters.get())
diff --git a/presentation/src/main/java/com/shifthackz/aisdv1/presentation/screen/debug/DebugMenuAccessor.kt b/presentation/src/main/java/com/shifthackz/aisdv1/presentation/screen/debug/DebugMenuAccessor.kt
@@ -0,0 +1,20 @@
+package com.shifthackz.aisdv1.presentation.screen.debug
+
+import com.shifthackz.aisdv1.core.common.appbuild.BuildInfoProvider
+import com.shifthackz.aisdv1.presentation.utils.Constants
+
+class DebugMenuAccessor(private val buildInfoProvider: BuildInfoProvider) {
+
+    private var tapCount = 0;
+
+    operator fun invoke(): Boolean {
+        if (buildInfoProvider.isDebug) {
+            tapCount++
+            if (tapCount >= Constants.DEBUG_MENU_ACCESS_TAPS) {
+                tapCount = 0;
+                return true
+            }
+        }
+        return false
+    }
+}
diff --git a/presentation/src/main/java/com/shifthackz/aisdv1/presentation/screen/debug/DebugMenuScreen.kt b/presentation/src/main/java/com/shifthackz/aisdv1/presentation/screen/debug/DebugMenuScreen.kt
@@ -0,0 +1,108 @@
+@file:OptIn(ExperimentalMaterial3Api::class)
+
+package com.shifthackz.aisdv1.presentation.screen.debug
+
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.verticalScroll
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.SettingsEthernet
+import androidx.compose.material.icons.outlined.ArrowBack
+import androidx.compose.material3.CenterAlignedTopAppBar
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Scaffold
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import com.shifthackz.aisdv1.core.model.asUiText
+import com.shifthackz.aisdv1.core.ui.EmptyEffect
+import com.shifthackz.aisdv1.core.ui.EmptyState
+import com.shifthackz.aisdv1.core.ui.MviScreen
+import com.shifthackz.aisdv1.presentation.R
+import com.shifthackz.aisdv1.presentation.widget.item.SettingsItem
+
+class DebugMenuScreen(
+    private val viewModel: DebugMenuViewModel,
+    private val onNavigateBack: () -> Unit = {},
+) : MviScreen<EmptyState, EmptyEffect>(viewModel) {
+
+    @Composable
+    override fun Content() {
+        ScreenContent(
+            modifier = Modifier.fillMaxSize(),
+            onNavigateBack = onNavigateBack,
+            onInsertBadBase64 = viewModel::insertBadBase64,
+        )
+    }
+}
+
+@Composable
+private fun ScreenContent(
+    modifier: Modifier = Modifier,
+    onNavigateBack: () -> Unit = {},
+    onInsertBadBase64: () -> Unit = {},
+) {
+    Scaffold(
+        modifier = modifier,
+        topBar = {
+            CenterAlignedTopAppBar(
+                title = {
+                    Text(
+                        text = stringResource(id = R.string.title_debug_menu),
+                        style = MaterialTheme.typography.headlineMedium,
+                    )
+                },
+                navigationIcon = {
+                    IconButton(
+                        onClick = onNavigateBack,
+                        content = {
+                            Icon(
+                                Icons.Outlined.ArrowBack,
+                                contentDescription = "Back button",
+                            )
+                        },
+                    )
+                },
+            )
+        }
+    ) { paddingValues ->
+        Column(
+            modifier = Modifier
+                .verticalScroll(rememberScrollState())
+                .padding(paddingValues)
+                .padding(horizontal = 16.dp),
+        ) {
+            val headerModifier = Modifier.padding(vertical = 16.dp)
+            val itemModifier = Modifier
+                .fillMaxWidth()
+                .padding(bottom = 8.dp)
+
+            Text(
+                modifier = headerModifier,
+                text = stringResource(id = R.string.debug_section_qa),
+                style = MaterialTheme.typography.headlineSmall,
+            )
+            SettingsItem(
+                modifier = itemModifier,
+                startIcon = Icons.Default.SettingsEthernet,
+                text = R.string.debug_action_bad_base64.asUiText(),
+                onClick = onInsertBadBase64,
+            )
+        }
+    }
+}
+
+@Composable
+@Preview(showSystemUi = true, showBackground = true)
+private fun DebugMenuScreenPreview() {
+    ScreenContent()
+}
diff --git a/presentation/src/main/java/com/shifthackz/aisdv1/presentation/screen/debug/DebugMenuViewModel.kt b/presentation/src/main/java/com/shifthackz/aisdv1/presentation/screen/debug/DebugMenuViewModel.kt
@@ -0,0 +1,22 @@
+package com.shifthackz.aisdv1.presentation.screen.debug
+
+import com.shifthackz.aisdv1.core.common.log.errorLog
+import com.shifthackz.aisdv1.core.common.schedulers.SchedulersProvider
+import com.shifthackz.aisdv1.core.common.schedulers.subscribeOnMainThread
+import com.shifthackz.aisdv1.core.ui.EmptyEffect
+import com.shifthackz.aisdv1.core.ui.EmptyState
+import com.shifthackz.aisdv1.core.viewmodel.MviRxViewModel
+import com.shifthackz.aisdv1.domain.usecase.debug.DebugInsertBadBase64UseCase
+import io.reactivex.rxjava3.kotlin.subscribeBy
+
+class DebugMenuViewModel(
+    private val debugInsertBadBase64UseCase: DebugInsertBadBase64UseCase,
+    private val schedulersProvider: SchedulersProvider,
+) : MviRxViewModel<EmptyState, EmptyEffect>() {
+
+    override val emptyState = EmptyState
+
+    fun insertBadBase64() = !debugInsertBadBase64UseCase()
+        .subscribeOnMainThread(schedulersProvider)
+        .subscribeBy(::errorLog)
+}
diff --git a/presentation/src/main/java/com/shifthackz/aisdv1/presentation/screen/home/HomeNavigationGraph.kt b/presentation/src/main/java/com/shifthackz/aisdv1/presentation/screen/home/HomeNavigationGraph.kt
@@ -31,6 +31,7 @@ fun NavGraphBuilder.homeScreenNavGraph(
     launchInAppReview: () -> Unit = {},
     launchUrl: (String) -> Unit = {},
     launchRewarded: () -> Unit = {},
+    launchDebugMenu: () -> Unit = {},
     shareLogFile: () -> Unit = {},
 ) {
     addDestination(
@@ -56,6 +57,7 @@ fun NavGraphBuilder.homeScreenNavGraph(
                         launchInAppReview = launchInAppReview,
                         launchUrl = launchUrl,
                         launchRewarded = launchRewarded,
+                        launchDebugMenu = launchDebugMenu,
                         shareLogFile = shareLogFile,
                     ),
                 ),
@@ -131,6 +133,7 @@ private fun settingsTab(
     launchInAppReview: () -> Unit = {},
     launchUrl: (String) -> Unit = {},
     launchRewarded: () -> Unit = {},
+    launchDebugMenu: () -> Unit = {},
     shareLogFile: () -> Unit = {},
 ) = HomeNavigationItem(
     stringResource(id = R.string.home_tab_settings),
@@ -146,6 +149,7 @@ private fun settingsTab(
             launchInAppReview = launchInAppReview,
             launchUrl = launchUrl,
             launchRewarded = launchRewarded,
+            launchDebugMenu = launchDebugMenu,
             shareLogFile = shareLogFile,
         ).Build()
     }
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
diff --git a/presentation/src/main/java/com/shifthackz/aisdv1/presentation/utils/Constants.kt b/presentation/src/main/java/com/shifthackz/aisdv1/presentation/utils/Constants.kt
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
`@@ -12,5 +12,6 @@ android {`
`12`	`12`	`dependencies {`
`13`	`13`	`implementation project(":core:common")`
`14`	`14`	`implementation di.koinCore`
	`15`	`+ implementation di.koinAndroid`
`15`	`16`	`implementation reactive.rxkotlin`
`16`	`17`	`}`