Web UI & Custom navigation & UX Improvements (#224)

* Web UI & custom navigation

* Update

* Update drawer header

* Implemented Donate screen

* Removed obsolete parameter

Author: ShiftHackZ

core/common/src/main/java/com/shifthackz/aisdv1/core/common/extensions/DateExtensions.kt

@@ -1,7 +1,8 @@
 package com.shifthackz.aisdv1.core.common.extensions
 
 import java.text.SimpleDateFormat
-import java.util.*
+import java.util.Date
+import java.util.Locale
 
 fun Date.getRawDay(): Int = SimpleDateFormat("dd", Locale.ROOT).format(this).toInt()
 
@@ -16,3 +17,19 @@ fun Date.getDayRange(): Pair<Date, Date> {
     val end = formatter.parse("${prefix}T23:59:59.999") ?: this
     return start to end
 }
+
+fun Date.format(
+    format: String = "yyyy-MM-dd",
+    locale: Locale = Locale.ROOT,
+): String = runCatching {
+    val df = SimpleDateFormat(format, locale)
+    df.format(this)
+}.getOrDefault("")
+
+fun String.toDate(
+    format: String = "yyyy-MM-dd",
+    locale: Locale = Locale.ROOT,
+): Date = runCatching {
+    val df = SimpleDateFormat(format, locale)
+    df.parse(this)
+}.getOrDefault(Date())

data/src/main/java/com/shifthackz/aisdv1/data/di/LocalDataSourceModule.kt

@@ -12,6 +12,7 @@ import com.shifthackz.aisdv1.data.local.StabilityAiCreditsLocalDataSource
 import com.shifthackz.aisdv1.data.local.StableDiffusionHyperNetworksLocalDataSource
 import com.shifthackz.aisdv1.data.local.StableDiffusionModelsLocalDataSource
 import com.shifthackz.aisdv1.data.local.StableDiffusionSamplersLocalDataSource
+import com.shifthackz.aisdv1.data.local.SupportersLocalDataSource
 import com.shifthackz.aisdv1.data.local.SwarmUiModelsLocalDataSource
 import com.shifthackz.aisdv1.domain.datasource.DownloadableModelDataSource
 import com.shifthackz.aisdv1.domain.datasource.EmbeddingsDataSource
@@ -23,6 +24,7 @@ import com.shifthackz.aisdv1.domain.datasource.StabilityAiCreditsDataSource
 import com.shifthackz.aisdv1.domain.datasource.StableDiffusionHyperNetworksDataSource
 import com.shifthackz.aisdv1.domain.datasource.StableDiffusionModelsDataSource
 import com.shifthackz.aisdv1.domain.datasource.StableDiffusionSamplersDataSource
+import com.shifthackz.aisdv1.domain.datasource.SupportersDataSource
 import com.shifthackz.aisdv1.domain.datasource.SwarmUiModelsDataSource
 import com.shifthackz.aisdv1.domain.gateway.DatabaseClearGateway
 import org.koin.android.ext.koin.androidContext
@@ -45,5 +47,6 @@ val localDataSourceModule = module {
     factoryOf(::GenerationResultLocalDataSource) bind GenerationResultDataSource.Local::class
     factoryOf(::DownloadableModelLocalDataSource) bind DownloadableModelDataSource.Local::class
     factoryOf(::HuggingFaceModelsLocalDataSource) bind HuggingFaceModelsDataSource.Local::class
+    factoryOf(::SupportersLocalDataSource) bind SupportersDataSource.Local::class
     factory { MediaStoreGatewayFactory(androidContext(), get()).invoke() }
 }

data/src/main/java/com/shifthackz/aisdv1/data/di/RemoteDataSourceModule.kt

@@ -20,6 +20,7 @@ import com.shifthackz.aisdv1.data.remote.StableDiffusionHyperNetworksRemoteDataS
 import com.shifthackz.aisdv1.data.remote.StableDiffusionLorasRemoteDataSource
 import com.shifthackz.aisdv1.data.remote.StableDiffusionModelsRemoteDataSource
 import com.shifthackz.aisdv1.data.remote.StableDiffusionSamplersRemoteDataSource
+import com.shifthackz.aisdv1.data.remote.SupportersRemoteDataSource
 import com.shifthackz.aisdv1.data.remote.SwarmUiEmbeddingsRemoteDataSource
 import com.shifthackz.aisdv1.data.remote.SwarmUiGenerationRemoteDataSource
 import com.shifthackz.aisdv1.data.remote.SwarmUiLorasRemoteDataSource
@@ -41,6 +42,7 @@ import com.shifthackz.aisdv1.domain.datasource.StableDiffusionGenerationDataSour
 import com.shifthackz.aisdv1.domain.datasource.StableDiffusionHyperNetworksDataSource
 import com.shifthackz.aisdv1.domain.datasource.StableDiffusionModelsDataSource
 import com.shifthackz.aisdv1.domain.datasource.StableDiffusionSamplersDataSource
+import com.shifthackz.aisdv1.domain.datasource.SupportersDataSource
 import com.shifthackz.aisdv1.domain.datasource.SwarmUiGenerationDataSource
 import com.shifthackz.aisdv1.domain.datasource.SwarmUiModelsDataSource
 import com.shifthackz.aisdv1.domain.datasource.SwarmUiSessionDataSource
@@ -87,6 +89,7 @@ val remoteDataSourceModule = module {
     factoryOf(::ServerConfigurationRemoteDataSource) bind ServerConfigurationDataSource.Remote::class
     factoryOf(::RandomImageRemoteDataSource) bind RandomImageDataSource.Remote::class
     factoryOf(::DownloadableModelRemoteDataSource) bind DownloadableModelDataSource.Remote::class
+    factoryOf(::SupportersRemoteDataSource) bind SupportersDataSource.Remote::class
     factoryOf(::HuggingFaceModelsRemoteDataSource) bind HuggingFaceModelsDataSource.Remote::class
     factoryOf(::StabilityAiGenerationRemoteDataSource) bind StabilityAiGenerationDataSource.Remote::class
     factoryOf(::StabilityAiCreditsRemoteDataSource) bind StabilityAiCreditsDataSource.Remote::class

data/src/main/java/com/shifthackz/aisdv1/data/di/RepositoryModule.kt

@@ -20,6 +20,7 @@ import com.shifthackz.aisdv1.data.repository.StableDiffusionGenerationRepository
 import com.shifthackz.aisdv1.data.repository.StableDiffusionHyperNetworksRepositoryImpl
 import com.shifthackz.aisdv1.data.repository.StableDiffusionModelsRepositoryImpl
 import com.shifthackz.aisdv1.data.repository.StableDiffusionSamplersRepositoryImpl
+import com.shifthackz.aisdv1.data.repository.SupportersRepositoryImpl
 import com.shifthackz.aisdv1.data.repository.SwarmUiGenerationRepositoryImpl
 import com.shifthackz.aisdv1.data.repository.SwarmUiModelsRepositoryImpl
 import com.shifthackz.aisdv1.data.repository.TemporaryGenerationResultRepositoryImpl
@@ -42,6 +43,7 @@ import com.shifthackz.aisdv1.domain.repository.StableDiffusionGenerationReposito
 import com.shifthackz.aisdv1.domain.repository.StableDiffusionHyperNetworksRepository
 import com.shifthackz.aisdv1.domain.repository.StableDiffusionModelsRepository
 import com.shifthackz.aisdv1.domain.repository.StableDiffusionSamplersRepository
+import com.shifthackz.aisdv1.domain.repository.SupportersRepository
 import com.shifthackz.aisdv1.domain.repository.SwarmUiGenerationRepository
 import com.shifthackz.aisdv1.domain.repository.SwarmUiModelsRepository
 import com.shifthackz.aisdv1.domain.repository.TemporaryGenerationResultRepository
@@ -80,4 +82,5 @@ val repositoryModule = module {
     factoryOf(::RandomImageRepositoryImpl) bind RandomImageRepository::class
     factoryOf(::DownloadableModelRepositoryImpl) bind DownloadableModelRepository::class
     factoryOf(::HuggingFaceModelsRepositoryImpl) bind HuggingFaceModelsRepository::class
+    factoryOf(::SupportersRepositoryImpl) bind SupportersRepository::class
 }

data/src/main/java/com/shifthackz/aisdv1/data/local/SupportersLocalDataSource.kt

@@ -0,0 +1,23 @@
+package com.shifthackz.aisdv1.data.local
+
+import com.shifthackz.aisdv1.data.mappers.mapDomainToEntity
+import com.shifthackz.aisdv1.data.mappers.mapEntityToDomain
+import com.shifthackz.aisdv1.domain.datasource.SupportersDataSource
+import com.shifthackz.aisdv1.domain.entity.Supporter
+import com.shifthackz.aisdv1.storage.db.persistent.dao.SupporterDao
+import com.shifthackz.aisdv1.storage.db.persistent.entity.SupporterEntity
+import io.reactivex.rxjava3.core.Completable
+import io.reactivex.rxjava3.core.Single
+
+internal class SupportersLocalDataSource(
+    private val dao: SupporterDao,
+) : SupportersDataSource.Local {
+
+    override fun save(data: List<Supporter>): Completable = dao
+        .deleteAll()
+        .andThen(dao.insertList(data.mapDomainToEntity()))
+
+    override fun getAll(): Single<List<Supporter>> = dao
+        .queryAll()
+        .map(List<SupporterEntity>::mapEntityToDomain)
+}

data/src/main/java/com/shifthackz/aisdv1/data/mappers/SupportersMappers.kt

@@ -0,0 +1,46 @@
+package com.shifthackz.aisdv1.data.mappers
+
+import com.shifthackz.aisdv1.core.common.extensions.toDate
+import com.shifthackz.aisdv1.domain.entity.Supporter
+import com.shifthackz.aisdv1.network.model.SupporterRaw
+import com.shifthackz.aisdv1.storage.db.persistent.entity.SupporterEntity
+import java.util.Date
+
+//region RAW --> DOMAIN
+fun List<SupporterRaw>.mapRawToDomain(): List<Supporter> = map(SupporterRaw::mapRawToDomain)
+
+fun SupporterRaw.mapRawToDomain(): Supporter = with(this) {
+    Supporter(
+        id = id ?: -1,
+        name = name ?: "",
+        date = date?.toDate() ?: Date(),
+        message = message ?: "",
+    )
+}
+//endregion
+
+//region DOMAIN --> ENTITY
+fun List<Supporter>.mapDomainToEntity(): List<SupporterEntity> = map(Supporter::mapDomainToEntity)
+
+fun Supporter.mapDomainToEntity(): SupporterEntity = with(this) {
+    SupporterEntity(
+        id = id,
+        name = name,
+        date = date,
+        message = message,
+    )
+}
+//endregion
+
+//region ENTITY --> DOMAIN
+fun List<SupporterEntity>.mapEntityToDomain(): List<Supporter> = map(SupporterEntity::mapEntityToDomain)
+
+fun SupporterEntity.mapEntityToDomain(): Supporter = with(this) {
+    Supporter(
+        id = id,
+        name = name,
+        date = date,
+        message = message,
+    )
+}
+//endregion

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

@@ -5,6 +5,7 @@ import com.shifthackz.aisdv1.core.common.extensions.fixUrlSlashes
 import com.shifthackz.aisdv1.core.common.extensions.shouldUseNewMediaStore
 import com.shifthackz.aisdv1.domain.entity.ColorToken
 import com.shifthackz.aisdv1.domain.entity.DarkThemeToken
+import com.shifthackz.aisdv1.domain.entity.FeatureTag
 import com.shifthackz.aisdv1.domain.entity.HuggingFaceModel
 import com.shifthackz.aisdv1.domain.entity.ServerSource
 import com.shifthackz.aisdv1.domain.entity.Settings
@@ -50,7 +51,7 @@ class PreferenceManagerImpl(
             .also { onPreferencesChanged() }
 
     override var monitorConnectivity: Boolean
-        get() = if (source != ServerSource.AUTOMATIC1111) false
+        get() = if (!source.featureTags.contains(FeatureTag.OwnServer)) false
         else preferences.getBoolean(KEY_MONITOR_CONNECTIVITY, true)
         set(value) = preferences.edit()
             .putBoolean(KEY_MONITOR_CONNECTIVITY, value)

data/src/main/java/com/shifthackz/aisdv1/data/remote/SupportersRemoteDataSource.kt

@@ -0,0 +1,17 @@
+package com.shifthackz.aisdv1.data.remote
+
+import com.shifthackz.aisdv1.data.mappers.mapRawToDomain
+import com.shifthackz.aisdv1.domain.datasource.SupportersDataSource
+import com.shifthackz.aisdv1.domain.entity.Supporter
+import com.shifthackz.aisdv1.network.api.sdai.DonateApi
+import com.shifthackz.aisdv1.network.model.SupporterRaw
+import io.reactivex.rxjava3.core.Single
+
+internal class SupportersRemoteDataSource(
+    private val api: DonateApi,
+) : SupportersDataSource.Remote {
+
+    override fun fetch(): Single<List<Supporter>> = api
+        .fetchSupporters()
+        .map(List<SupporterRaw>::mapRawToDomain)
+}

data/src/main/java/com/shifthackz/aisdv1/data/repository/SupportersRepositoryImpl.kt

@@ -0,0 +1,23 @@
+package com.shifthackz.aisdv1.data.repository
+
+import com.shifthackz.aisdv1.domain.datasource.SupportersDataSource
+import com.shifthackz.aisdv1.domain.entity.Supporter
+import com.shifthackz.aisdv1.domain.repository.SupportersRepository
+import io.reactivex.rxjava3.core.Completable
+import io.reactivex.rxjava3.core.Single
+
+internal class SupportersRepositoryImpl(
+    private val rds: SupportersDataSource.Remote,
+    private val lds: SupportersDataSource.Local,
+) : SupportersRepository {
+
+    override fun fetchSupporters(): Completable = rds
+        .fetch()
+        .flatMapCompletable(lds::save)
+
+    override fun fetchAndGetSupporters(): Single<List<Supporter>> = fetchSupporters()
+        .onErrorComplete()
+        .andThen(getSupporters())
+
+    override fun getSupporters(): Single<List<Supporter>> = lds.getAll()
+}

data/src/test/java/com/shifthackz/aisdv1/data/local/SupportersLocalDataSourceTest.kt

@@ -0,0 +1,117 @@
+package com.shifthackz.aisdv1.data.local
+
+import com.shifthackz.aisdv1.data.mocks.mockSupporterEntities
+import com.shifthackz.aisdv1.data.mocks.mockSupporters
+import com.shifthackz.aisdv1.storage.db.persistent.dao.SupporterDao
+import io.mockk.every
+import io.mockk.mockk
+import io.reactivex.rxjava3.core.Completable
+import io.reactivex.rxjava3.core.Single
+import org.junit.Test
+
+class SupportersLocalDataSourceTest {
+
+    private val stubException = Throwable("Database error.")
+    private val stubDao = mockk<SupporterDao>()
+
+    private val localDataSource = SupportersLocalDataSource(stubDao)
+
+    @Test
+    fun `given attempt to get supporters, dao returns list, expected valid domain model list value`() {
+        every {
+            stubDao.queryAll()
+        } returns Single.just(mockSupporterEntities)
+
+        localDataSource
+            .getAll()
+            .test()
+            .assertNoErrors()
+            .assertValue { mockSupporters.size == it.size }
+            .await()
+            .assertComplete()
+    }
+
+    @Test
+    fun `given attempt to get supporters, dao returns empty list, expected empty domain model list value`() {
+        every {
+            stubDao.queryAll()
+        } returns Single.just(emptyList())
+
+        localDataSource
+            .getAll()
+            .test()
+            .assertNoErrors()
+            .assertValue(emptyList())
+            .await()
+            .assertComplete()
+    }
+
+    @Test
+    fun `given attempt to get supporters, dao throws exception, expected error value`() {
+        every {
+            stubDao.queryAll()
+        } returns Single.error(stubException)
+
+        localDataSource
+            .getAll()
+            .test()
+            .assertError(stubException)
+            .assertNoValues()
+            .await()
+            .assertNotComplete()
+    }
+
+    @Test
+    fun `given attempt to insert supporters, dao replaces list, expected complete value`() {
+        every {
+            stubDao.deleteAll()
+        } returns Completable.complete()
+
+        every {
+            stubDao.insertList(any())
+        } returns Completable.complete()
+
+        localDataSource
+            .save(mockSupporters)
+            .test()
+            .assertNoErrors()
+            .await()
+            .assertComplete()
+    }
+
+    @Test
+    fun `given attempt to insert supporters, dao throws exception during delete, expected error value`() {
+        every {
+            stubDao.deleteAll()
+        } returns Completable.error(stubException)
+
+        every {
+            stubDao.insertList(any())
+        } returns Completable.complete()
+
+        localDataSource
+            .save(mockSupporters)
+            .test()
+            .assertError(stubException)
+            .await()
+            .assertNotComplete()
+    }
+
+    @Test
+    fun `given attempt to insert supporters, dao throws exception during insertion, expected error value`() {
+        every {
+            stubDao.deleteAll()
+        } returns Completable.complete()
+
+        every {
+            stubDao.insertList(any())
+        } returns Completable.error(stubException)
+
+        localDataSource
+            .save(mockSupporters)
+            .test()
+            .assertError(stubException)
+            .await()
+            .assertNotComplete()
+    }
+}