Merge pull request #1188 from DimensionDev/feature/desktop

Feature/desktop

Author: Tlaster

.github/workflows/desktop.yml

@@ -0,0 +1,42 @@
+name: Desktop CI
+
+on:
+  push:
+    branches:
+      - master
+      - release
+      - develop
+    tags:
+      - '**'
+    paths-ignore:
+      - '**.md'
+      - '**.yml'
+  pull_request:
+    branches:
+      - master
+      - release
+      - develop
+
+jobs:
+  build:
+    runs-on: [ubuntu-latest]
+    timeout-minutes: 30
+
+    steps:
+      - uses: yumis-coconudge/clean-workspace-action@v1
+
+      - uses: actions/checkout@v3
+        with:
+          submodules: true
+      - name: Set up JDK
+        uses: actions/setup-java@v3
+        with:
+          distribution: 'zulu'
+          java-version: 21
+
+      # Build with Gradle
+      - name: Build with Gradle
+        env:
+          BUILD_NUMBER: ${{github.run_number}}
+          BUILD_VERSION: ${{github.ref_name}}
+        run: ./gradlew :desktop:build :desktop:check --stacktrace

app/build.gradle.kts

@@ -1,6 +1,8 @@
+
 import com.google.firebase.crashlytics.buildtools.gradle.CrashlyticsPlugin
 import com.google.gms.googleservices.GoogleServicesPlugin
 import java.util.Properties
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 plugins {
     alias(libs.plugins.android.application)
@@ -84,9 +86,6 @@ android {
         sourceCompatibility = JavaVersion.toVersion(libs.versions.java.get())
         targetCompatibility = JavaVersion.toVersion(libs.versions.java.get())
     }
-    kotlinOptions {
-        jvmTarget = libs.versions.java.get()
-    }
     buildFeatures {
         compose = true
         buildConfig = true
@@ -136,7 +135,7 @@ dependencies {
     implementation(libs.kotlinx.coroutines.play.services)
     implementation(projects.shared)
     implementation(projects.shared.ui)
-    implementation(projects.shared.ui.component)
+    implementation(projects.composeUi)
     implementation(libs.androidx.splash)
     implementation(libs.materialKolor)
     implementation(libs.colorpicker.compose)

app/src/main/java/dev/dimension/flare/App.kt

@@ -15,6 +15,7 @@ import dev.dimension.flare.common.AnimatedPngDecoder
 import dev.dimension.flare.common.AnimatedWebPDecoder
 import dev.dimension.flare.di.KoinHelper
 import dev.dimension.flare.di.androidModule
+import dev.dimension.flare.di.composeUiModule
 import io.ktor.client.HttpClient
 import org.koin.android.ext.koin.androidContext
 import org.koin.core.context.startKoin
@@ -26,7 +27,7 @@ class App :
         super.onCreate()
         startKoin {
             androidContext(this@App)
-            modules(KoinHelper.modules() + androidModule)
+            modules(KoinHelper.modules() + androidModule + composeUiModule)
         }
     }
 

…imension/flare/data/model/TabSettings.kt …/dimension/flare/data/model/DataStore.ktapp/src/main/java/dev/dimension/flare/data/model/TabSettings.kt renamed to app/src/main/java/dev/dimension/flare/data/model/DataStore.kt app/src/main/java/dev/dimension/flare/data/model/TabSettings.kt renamed to app/src/main/java/dev/dimension/flare/data/model/DataStore.kt

@@ -1,10 +1,6 @@
 package dev.dimension.flare.data.model
 
-import android.content.Context
 import androidx.compose.ui.graphics.vector.ImageVector
-import androidx.datastore.core.DataStore
-import androidx.datastore.core.handlers.ReplaceFileCorruptionHandler
-import androidx.datastore.dataStore
 import compose.icons.FontAwesomeIcons
 import compose.icons.fontawesomeicons.Brands
 import compose.icons.fontawesomeicons.Solid
@@ -70,12 +66,3 @@ internal fun IconType.Material.MaterialIcon.toIcon(): ImageVector =
         IconType.Material.MaterialIcon.Messages -> FontAwesomeIcons.Solid.Message
         IconType.Material.MaterialIcon.Rss -> FontAwesomeIcons.Solid.SquareRss
     }
-
-internal val Context.tabSettings: DataStore<TabSettings> by dataStore(
-    fileName = "tab_settings.pb",
-    serializer = TabSettingsSerializer,
-    corruptionHandler =
-        ReplaceFileCorruptionHandler {
-            TabSettingsSerializer.defaultValue
-        },
-)

app/src/main/java/dev/dimension/flare/data/repository/SettingsRepository.kt

@@ -5,7 +5,6 @@ import dev.dimension.flare.common.ComposeInAppNotification
 import dev.dimension.flare.common.InAppNotification
 import dev.dimension.flare.common.PodcastManager
 import dev.dimension.flare.common.VideoDownloadHelper
-import dev.dimension.flare.data.repository.SettingsRepository
 import dev.dimension.flare.ui.component.VideoPlayerPool
 import org.koin.core.module.dsl.singleOf
 import org.koin.dsl.binds
@@ -14,7 +13,6 @@ import org.koin.dsl.module
 @UnstableApi
 val androidModule =
     module {
-        singleOf(::SettingsRepository)
         singleOf(::VideoPlayerPool)
         singleOf(::ComposeInAppNotification) binds arrayOf(InAppNotification::class, ComposeInAppNotification::class)
         singleOf(::VideoDownloadHelper)

app/src/main/java/dev/dimension/flare/di/AndroidModule.kt

@@ -30,21 +30,6 @@ fun AppContainer(afterInit: () -> Unit) {
 
 @Composable
 fun FlareApp(content: @Composable () -> Unit) {
-//    setSingletonImageLoaderFactory { context ->
-//        ImageLoader.Builder(context)
-//            .components {
-//                if (Build.VERSION.SDK_INT >= 28) {
-//                    add(AnimatedImageDecoder.Factory())
-//                } else {
-//                    add(GifDecoder.Factory())
-//                }
-//                add(AnimatedPngDecoder.Factory())
-//                add(SvgDecoder.Factory())
-//                add(AnimatedWebPDecoder.Factory())
-//            }
-//            .crossfade(true)
-//            .build()
-//    }
     val settingsRepository = koinInject<SettingsRepository>()
     val appearanceSettings by settingsRepository.appearanceSettings.collectAsState(
         AppearanceSettings(),