kotlin-hands-on · pahill · Jul 1, 2024 · Jul 30, 2024 · Jun 30, 2025 · Jul 2, 2025
diff --git a/.gitignore b/.gitignore
@@ -1,10 +1,18 @@
-.gradle
 *.iml
-.idea/
-build/
-out/
+.kotlin
+.gradle
+**/build/
+xcuserdata
+!src/**/build/
 local.properties
+.idea
 .DS_Store
-xcuserdata/
-Pods/
-/.kotlin/
+captures
+.externalNativeBuild
+.cxx
+*.xcodeproj/*
+!*.xcodeproj/project.pbxproj
+!*.xcodeproj/xcshareddata/
+!*.xcodeproj/project.xcworkspace/
+!*.xcworkspace/contents.xcworkspacedata
+**/xcshareddata/WorkspaceSettings.xcsettings
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -3,10 +3,7 @@ plugins {
     // in each subproject's classloader
     alias(libs.plugins.androidApplication) apply false
     alias(libs.plugins.androidLibrary) apply false
-    alias(libs.plugins.jetbrainsCompose) apply false
-    alias(libs.plugins.compose.compiler) apply false
+    alias(libs.plugins.composeMultiplatform) apply false
+    alias(libs.plugins.composeCompiler) apply false
     alias(libs.plugins.kotlinMultiplatform) apply false
-    alias(libs.plugins.kotlinxSerialization) apply false
-    alias(libs.plugins.sqldelight) apply false
-    id("org.jetbrains.kotlinx.kover") version "0.9.1"
 }
diff --git a/composeApp/build.gradle.kts b/composeApp/build.gradle.kts
@@ -1,11 +1,12 @@
+import org.jetbrains.compose.desktop.application.dsl.TargetFormat
 import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
 import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 plugins {
     alias(libs.plugins.kotlinMultiplatform)
     alias(libs.plugins.androidApplication)
-    alias(libs.plugins.jetbrainsCompose)
-    alias(libs.plugins.compose.compiler)
+    alias(libs.plugins.composeMultiplatform)
+    alias(libs.plugins.composeCompiler)
 }
 
 kotlin {
@@ -17,6 +18,7 @@ kotlin {
     }
 
     sourceSets {
+
         androidMain.dependencies {
             implementation(compose.preview)
             implementation(libs.androidx.activity.compose)
@@ -27,23 +29,24 @@ kotlin {
         commonMain.dependencies {
             implementation(compose.runtime)
             implementation(compose.foundation)
-            implementation(compose.material)
+            implementation(compose.material3)
             implementation(compose.ui)
             implementation(compose.components.resources)
             implementation(compose.components.uiToolingPreview)
+            implementation(libs.androidx.lifecycle.viewmodel)
+            implementation(libs.androidx.lifecycle.runtimeCompose)
             implementation(projects.shared)
         }
+        commonTest.dependencies {
+            implementation(libs.kotlin.test)
+        }
     }
 }
 
 android {
     namespace = "com.jetbrains.spacetutorial"
     compileSdk = libs.versions.android.compileSdk.get().toInt()
 
-    sourceSets["main"].manifest.srcFile("src/androidMain/AndroidManifest.xml")
-    sourceSets["main"].res.srcDirs("src/androidMain/res")
-    sourceSets["main"].resources.srcDirs("src/commonMain/resources")
-
     defaultConfig {
         applicationId = "com.jetbrains.spacetutorial"
         minSdk = libs.versions.android.minSdk.get().toInt()
@@ -65,10 +68,9 @@ android {
         sourceCompatibility = JavaVersion.VERSION_11
         targetCompatibility = JavaVersion.VERSION_11
     }
-    buildFeatures {
-        compose = true
-    }
-    dependencies {
-        debugImplementation(compose.uiTooling)
-    }
 }
+
+dependencies {
+    debugImplementation(compose.uiTooling)
+}
+
diff --git a/composeApp/src/androidMain/AndroidManifest.xml b/composeApp/src/androidMain/AndroidManifest.xml
@@ -1,19 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
     <uses-permission android:name="android.permission.INTERNET" />
-
     <application
+        android:name="com.jetbrains.spacetutorial.MainApplication"
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
-        android:theme="@android:style/Theme.Material.Light.NoActionBar"
-        android:name="com.jetbrains.spacetutorial.MainApplication">
+        android:theme="@android:style/Theme.Material.Light.NoActionBar">
         <activity
-            android:exported="true"
-            android:configChanges="orientation|screenSize|screenLayout|keyboardHidden|mnc|colorMode|density|fontScale|fontWeightAdjustment|keyboard|layoutDirection|locale|mcc|navigation|smallestScreenSize|touchscreen|uiMode"
-            android:name=".MainActivity">
+            android:name="com.jetbrains.spacetutorial.MainActivity"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 

diff --git a/composeApp/src/androidMain/composeResources/drawable/compose-multiplatform.xml b/composeApp/src/androidMain/composeResources/drawable/compose-multiplatform.xml
@@ -0,0 +1,44 @@
+<vector
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:aapt="http://schemas.android.com/aapt"
+        android:width="450dp"
+        android:height="450dp"
+        android:viewportWidth="64"
+        android:viewportHeight="64">
+    <path
+            android:pathData="M56.25,18V46L32,60 7.75,46V18L32,4Z"
+            android:fillColor="#6075f2"/>
+    <path
+            android:pathData="m41.5,26.5v11L32,43V60L56.25,46V18Z"
+            android:fillColor="#6b57ff"/>
+    <path
+            android:pathData="m32,43 l-9.5,-5.5v-11L7.75,18V46L32,60Z">
+        <aapt:attr name="android:fillColor">
+            <gradient
+                    android:centerX="23.131"
+                    android:centerY="18.441"
+                    android:gradientRadius="42.132"
+                    android:type="radial">
+                <item android:offset="0" android:color="#FF5383EC"/>
+                <item android:offset="0.867" android:color="#FF7F52FF"/>
+            </gradient>
+        </aapt:attr>
+    </path>
+    <path
+            android:pathData="M22.5,26.5 L32,21 41.5,26.5 56.25,18 32,4 7.75,18Z">
+        <aapt:attr name="android:fillColor">
+            <gradient
+                    android:startX="44.172"
+                    android:startY="4.377"
+                    android:endX="17.973"
+                    android:endY="34.035"
+                    android:type="linear">
+                <item android:offset="0" android:color="#FF33C3FF"/>
+                <item android:offset="0.878" android:color="#FF5383EC"/>
+            </gradient>
+        </aapt:attr>
+    </path>
+    <path
+            android:pathData="m32,21 l9.526,5.5v11L32,43 22.474,37.5v-11z"
+            android:fillColor="#000000"/>
+</vector>
diff --git a/composeApp/src/androidMain/kotlin/com/jetbrains/spacetutorial/App.kt b/composeApp/src/androidMain/kotlin/com/jetbrains/spacetutorial/App.kt
@@ -1,65 +1,78 @@
 package com.jetbrains.spacetutorial
 
-import androidx.compose.material3.ExperimentalMaterial3Api
-import androidx.compose.material3.pulltorefresh.rememberPullToRefreshState
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.remember
-import org.koin.androidx.compose.koinViewModel
-import com.jetbrains.spacetutorial.theme.AppTheme
-import com.jetbrains.spacetutorial.entity.RocketLaunch
-import com.jetbrains.spacetutorial.theme.app_theme_successful
-import com.jetbrains.spacetutorial.theme.app_theme_unsuccessful
-import androidx.compose.material3.HorizontalDivider
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.Scaffold
-import androidx.compose.material3.Text
-import androidx.compose.material3.TopAppBar
-import androidx.compose.material3.pulltorefresh.PullToRefreshContainer
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.Alignment
 import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.items
-import androidx.compose.ui.input.nestedscroll.nestedScroll
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.HorizontalDivider
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Scaffold
+import androidx.compose.material3.Text
+import androidx.compose.material3.TopAppBar
+import androidx.compose.material3.pulltorefresh.PullToRefreshBox
+import androidx.compose.material3.pulltorefresh.rememberPullToRefreshState
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.rememberCoroutineScope
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
+import com.jetbrains.spacetutorial.entity.RocketLaunch
+import com.jetbrains.spacetutorial.theme.AppTheme
+import com.jetbrains.spacetutorial.theme.app_theme_successful
+import com.jetbrains.spacetutorial.theme.app_theme_unsuccessful
+import kotlinx.coroutines.launch
+import org.jetbrains.compose.ui.tooling.preview.Preview
+import org.koin.androidx.compose.koinViewModel
 
 @OptIn(
     ExperimentalMaterial3Api::class
 )
 @Composable
+@Preview
 fun App() {
     val viewModel = koinViewModel<RocketLaunchViewModel>()
     val state by remember { viewModel.state }
+    val coroutineScope = rememberCoroutineScope()
+    var isRefreshing by remember { mutableStateOf(false) }
     val pullToRefreshState = rememberPullToRefreshState()
-    if (pullToRefreshState.isRefreshing) {
-        viewModel.loadLaunches()
-        pullToRefreshState.endRefresh()
-    }
+
     AppTheme {
         Scaffold(
             topBar = {
-                TopAppBar(title = {
-                    Text(
-                        "SpaceX Launches",
-                        style = MaterialTheme.typography.headlineLarge
-                    )
-                })
+                TopAppBar(
+                    title = {
+                        Text(
+                            "SpaceX Launches",
+                            style = MaterialTheme.typography.headlineLarge
+                        )
+                    }
+                )
             }
         ) { padding ->
-            Box(
+            PullToRefreshBox(
                 modifier = Modifier
-                    .nestedScroll(pullToRefreshState.nestedScrollConnection)
                     .fillMaxSize()
-                    .padding(padding)
+                    .padding(padding),
+                state = pullToRefreshState,
+                isRefreshing = isRefreshing,
+                onRefresh = {
+                    isRefreshing = true
+                    coroutineScope.launch {
+                        viewModel.loadLaunches()
+                        isRefreshing = false
+                    }
+                }
             ) {
-                if (state.isLoading) {
+                if (state.isLoading && !isRefreshing) {
                     Column(
                         verticalArrangement = Arrangement.Center,
                         horizontalAlignment = Alignment.CenterHorizontally,
@@ -70,7 +83,7 @@ fun App() {
                 } else {
                     LazyColumn {
                         items(state.launches) { launch: RocketLaunch ->
-                            Column(modifier = Modifier.padding(all = 16.dp)) {
+                            Column(modifier = Modifier.padding(16.dp)) {
                                 Text(
                                     text = "${launch.missionName} - ${launch.launchYear}",
                                     style = MaterialTheme.typography.headlineSmall
@@ -82,22 +95,15 @@ fun App() {
                                 )
                                 Spacer(Modifier.height(8.dp))
                                 val details = launch.details
-                                if (details?.isNotBlank() == true) {
-                                    Text(
-                                        text = details
-                                    )
+                                if (details != null && details.isNotBlank()) {
+                                    Text(details)
                                 }
                             }
                             HorizontalDivider()
                         }
                     }
                 }
-
-                PullToRefreshContainer(
-                    state = pullToRefreshState,
-                    modifier = Modifier.align(Alignment.TopCenter)
-                )
             }
         }
     }
-}
+}
diff --git a/composeApp/src/androidMain/kotlin/com/jetbrains/spacetutorial/AppModule.kt b/composeApp/src/androidMain/kotlin/com/jetbrains/spacetutorial/AppModule.kt
@@ -3,7 +3,7 @@ package com.jetbrains.spacetutorial
 import com.jetbrains.spacetutorial.cache.AndroidDatabaseDriverFactory
 import com.jetbrains.spacetutorial.network.SpaceXApi
 import org.koin.android.ext.koin.androidContext
-import org.koin.androidx.viewmodel.dsl.viewModel
+import org.koin.core.module.dsl.viewModel
 import org.koin.dsl.module
 
 val appModule = module {

diff --git a/composeApp/src/androidMain/kotlin/com/jetbrains/spacetutorial/MainActivity.kt b/composeApp/src/androidMain/kotlin/com/jetbrains/spacetutorial/MainActivity.kt
@@ -3,11 +3,13 @@ package com.jetbrains.spacetutorial
 import android.os.Bundle
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
+import androidx.activity.enableEdgeToEdge
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.tooling.preview.Preview
 
 class MainActivity : ComponentActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
+        enableEdgeToEdge()
         super.onCreate(savedInstanceState)
 
         setContent {

diff --git a/composeApp/src/androidMain/kotlin/com/jetbrains/spacetutorial/RocketLaunchViewModel.kt b/composeApp/src/androidMain/kotlin/com/jetbrains/spacetutorial/RocketLaunchViewModel.kt
@@ -26,7 +26,6 @@ class RocketLaunchViewModel(private val sdk: SpaceXSDK) : ViewModel() {
             }
         }
     }
-
 }
 
 data class RocketLaunchScreenState(

diff --git a/composeApp/src/androidMain/kotlin/com/jetbrains/spacetutorial/theme/Color.kt b/composeApp/src/androidMain/kotlin/com/jetbrains/spacetutorial/theme/Color.kt
@@ -1,3 +1,4 @@
+
 package com.jetbrains.spacetutorial.theme
 
 import androidx.compose.ui.graphics.Color
@@ -67,4 +68,4 @@ val md_theme_dark_scrim = Color(0xFF000000)
 val app_theme_successful = Color(0xff4BB543)
 val app_theme_unsuccessful = Color(0xffFC100D)
 
-val seed = Color(0xFF5E5E5E)
+val seed = Color(0xFF5E5E5E)
-Original file line number
+Diff line change
@@ Expand Up @@
                 }
             }
         }
     }
     data class RocketLaunchScreenState(
@@ Expand Down @@