Merge pull request #26 from fethij/feature_download_images

Feature download images

Author: fethij

.idea/kotlinc.xml

@@ -4,8 +4,8 @@ import org.gradle.api.Project
 import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
 import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension
-import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl
 
+@OptIn(org.jetbrains.kotlin.gradle.ExperimentalWasmDsl::class)
 internal fun Project.configureKotlinMultiplatform(
     extension: KotlinMultiplatformExtension
 ) = extension.apply {
@@ -20,7 +20,6 @@ internal fun Project.configureKotlinMultiplatform(
 
     jvm("desktop")
 
-    @OptIn(ExperimentalWasmDsl::class)
     wasmJs { browser() }
 
     listOf(iosArm64(), iosSimulatorArm64())
@@ -33,6 +32,7 @@ internal fun Project.configureKotlinMultiplatform(
                 implementation(libs.findLibrary("kotlinx.coroutines.core").get())
                 api(libs.findLibrary("koin.core").get())
                 implementation(libs.findLibrary("kermit").get())
+                implementation(libs.findLibrary("arrow.core").get())
             }
 
             androidMain {

build-logic/convention/src/main/kotlin/com/tewelde/rijksmuseum/KotlinMultiplatform.kt

@@ -75,6 +75,8 @@ kotlin {
             implementation(libs.ktor.client.core)
             implementation(libs.coil.compose)
             implementation(libs.coil.network.ktor)
+
+            implementation(libs.filekit.core)
         }
 
         desktopMain.dependencies {

composeApp/build.gradle.kts

@@ -1,7 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools">
 
     <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"
+        android:maxSdkVersion="28"
+        tools:ignore="ScopedStorage" />
 
     <application
         android:name=".RijksmuseumApplication"

composeApp/src/androidMain/AndroidManifest.xml

@@ -1,5 +1,6 @@
 package com.tewelde.rijksmuseum
 
+import android.app.Activity
 import android.graphics.Color
 import android.os.Bundle
 import androidx.activity.ComponentActivity
@@ -9,15 +10,33 @@ import androidx.activity.enableEdgeToEdge
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.core.view.WindowCompat
+import com.tewelde.rijksmuseum.di.appModule
+import io.github.vinceglb.filekit.core.FileKit
+import org.koin.android.ext.koin.androidContext
+import org.koin.android.ext.koin.androidLogger
+import org.koin.core.context.startKoin
+import org.koin.dsl.module
 
 class MainActivity : ComponentActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        startKoin {
+            androidLogger()
+            androidContext(applicationContext)
+            modules(
+                appModule,
+                module {
+                    single<Activity> { this@MainActivity }
+                }
+            )
+        }
+
         enableEdgeToEdge(
             statusBarStyle = SystemBarStyle.light(Color.TRANSPARENT, Color.TRANSPARENT),
             navigationBarStyle = SystemBarStyle.light(Color.TRANSPARENT, Color.TRANSPARENT)
         )
         WindowCompat.setDecorFitsSystemWindows(window, false)
+        FileKit.init(this)
         setContent {
             App()
         }

composeApp/src/androidMain/kotlin/com/tewelde/rijksmuseum/MainActivity.kt

@@ -1,19 +1,5 @@
 package com.tewelde.rijksmuseum
 
 import android.app.Application
-import com.tewelde.rijksmuseum.di.appModule
-import org.koin.android.ext.koin.androidContext
-import org.koin.android.ext.koin.androidLogger
-import org.koin.core.context.startKoin
 
-class RijksmuseumApplication: Application() {
-
-    override fun onCreate() {
-        super.onCreate()
-        startKoin {
-            androidLogger()
-            androidContext(this@RijksmuseumApplication)
-            modules(appModule)
-        }
-    }
-}
+class RijksmuseumApplication: Application()

composeApp/src/androidMain/kotlin/com/tewelde/rijksmuseum/RijksmuseumApplication.kt

@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <!-- TODO-->
     <color name="rijksmuseum_launcher_background">#FFFFFF</color>
 </resources>

composeApp/src/androidMain/res/values/rijksmuseum_launcher_background.xml

@@ -1,6 +1,8 @@
 package com.tewelde.rijksmuseum
 
+import androidx.compose.material3.SnackbarHostState
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.remember
 import coil3.ImageLoader
 import coil3.PlatformContext
 import coil3.annotation.ExperimentalCoilApi
@@ -12,7 +14,7 @@ import coil3.request.CachePolicy
 import coil3.request.crossfade
 import coil3.util.DebugLogger
 import com.tewelde.rijksmuseum.navigation.RijksmuseumNavGraph
-import com.tewelde.rijksmuseum.theme.RijksmuseumTheme
+import com.tewelde.rijksmuseum.core.designsystem.theme.RijksmuseumTheme
 import okio.FileSystem
 import org.jetbrains.compose.ui.tooling.preview.Preview
 import org.koin.compose.KoinContext
@@ -27,8 +29,7 @@ fun App(disableDiskCache: Boolean = false) {
                 if (disableDiskCache) context.asyncImageLoader() else
                     context.asyncImageLoader().enableDiskCache()
             }
-
-            RijksmuseumNavGraph()
+            RijksmuseumNavGraph(snackbarHostState = remember { SnackbarHostState() })
         }
     }
 }

composeApp/src/commonMain/kotlin/com/tewelde/rijksmuseum/App.kt

@@ -6,9 +6,10 @@ import coil3.network.NetworkFetcher
 import coil3.network.ktor.asNetworkClient
 import com.tewelde.rijksmuseum.feature.arts.di.artsModule
 import io.ktor.client.HttpClient
+import org.koin.dsl.module
 
 @OptIn(ExperimentalCoilApi::class)
-val appModule = org.koin.dsl.module {
+val appModule = module {
     includes(artsModule)
     single {
         NetworkFetcher.Factory(

composeApp/src/commonMain/kotlin/com/tewelde/rijksmuseum/di/appModule.kt

@@ -1,5 +1,7 @@
 package com.tewelde.rijksmuseum.navigation
 
+import androidx.compose.material3.SnackbarHostState
+import androidx.compose.material3.SnackbarResult
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.lifecycle.ViewModel
@@ -23,11 +25,12 @@ import org.koin.compose.currentKoinScope
 @Composable
 fun RijksmuseumNavGraph(
     modifier: Modifier = Modifier,
+    snackbarHostState: SnackbarHostState,
     startDestination: RijksmuseumDestination = RijksmuseumDestination.Gallery,
     navController: NavHostController = rememberNavController(),
 ) {
     NavHost(
-        modifier = Modifier.then(modifier),
+        modifier = modifier,
         startDestination = startDestination.route,
         navController = navController,
     ) {
@@ -42,14 +45,22 @@ fun RijksmuseumNavGraph(
             DetailScreenRoute(
                 objectId = id,
                 viewModel = viewModel,
-                onBackClick = navController::popBackStack
+                onBackClick = navController::navigateUp,
+                snackbarHostState = snackbarHostState,
+                onShowSnackbar = { message, action, duration ->
+                    snackbarHostState.showSnackbar(
+                        message = message,
+                        actionLabel = action,
+                        duration = duration,
+                    ) == SnackbarResult.ActionPerformed
+                }
             )
         }
     }
 }
 
 @Composable
-inline fun <reified T: ViewModel> koinViewModel(): T {
+inline fun <reified T : ViewModel> koinViewModel(): T {
     val scope = currentKoinScope()
     return viewModel {
         scope.get<T>()