Merge remote-tracking branch 'origin/dev'

Author: bywindow

.gitignore

@@ -1,5 +1,6 @@
 /build
 .kotlin/
+/.idea
 
 # Created by https://www.gitignore.io/api/kotlin,androidstudio
 # Edit at https://www.gitignore.io/?templates=kotlin,androidstudio

app/build.gradle.kts

@@ -61,6 +61,7 @@ dependencies {
     implementation(project(":core:data:onboarding"))
     implementation(project(":core:data:setting"))
     implementation(project(":core:data:user"))
+    implementation(project(":core:data:history"))
     implementation(project(":core:push"))
     implementation(project(":core:notification"))
 }

build-logic/src/main/kotlin/com/goalpanzi/mission_mate/convention/KotlinAndroid.kt

@@ -11,7 +11,7 @@ internal fun Project.configureKotlinAndroid() {
     pluginManager.apply("org.jetbrains.kotlin.android")
 
     androidExtension.apply {
-        compileSdk = 34
+        compileSdk = 36
 
         defaultConfig {
             minSdk = 26

build-logic/src/main/kotlin/missionmate.android.feature.gradle.kts

@@ -29,6 +29,7 @@ dependencies {
     implementation(project(":core:domain:common"))
     implementation(project(":core:domain:auth"))
     implementation(project(":core:domain:onboarding"))
+    implementation(project(":core:domain:history"))
     implementation(project(":core:ui"))
 
 }

core/data/auth/src/main/java/com/goalpanzi/mission_mate/core/data/auth/AuthTokenExpirationHandler.kt

@@ -4,6 +4,7 @@ import com.goalpanzi.mission_mate.core.datastore.datasource.AuthDataSource
 import com.goalpanzi.mission_mate.core.datastore.datasource.DefaultDataSource
 import com.goalpanzi.mission_mate.core.datastore.datasource.MissionDataSource
 import com.goalpanzi.mission_mate.core.navigation.NavigationEventHandler
+import com.goalpanzi.mission_mate.core.navigation.model.RouteModel
 import com.goalpanzi.mission_mate.core.navigation.di.AuthNavigation
 import com.goalpanzi.mission_mate.core.network.TokenExpirationHandler
 import kotlinx.coroutines.flow.collect
@@ -18,7 +19,7 @@ class AuthTokenExpirationHandler @Inject constructor(
 
     override suspend fun handleRefreshTokenExpiration() {
         clearCachedData()
-        authNavigationEventHandler.triggerRouteToNavigate("RouteModel.Login")
+        authNavigationEventHandler.triggerRouteToNavigate(RouteModel.Login)
     }
 
     private suspend fun clearCachedData(){

core/data/history/.gitignore

@@ -0,0 +1 @@
+/build

core/data/history/build.gradle.kts

@@ -0,0 +1,55 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+
+plugins {
+    alias(libs.plugins.android.library)
+    alias(libs.plugins.jetbrains.kotlin.android)
+    alias(libs.plugins.hilt.android)
+    alias(libs.plugins.kotlin.ksp)
+}
+
+android {
+    namespace = "com.goalpanzi.mission_mate.core.data.history"
+    compileSdk = 34
+
+    defaultConfig {
+        minSdk = 26
+
+        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+    }
+
+    buildTypes {
+        release {
+            proguardFiles(
+                getDefaultProguardFile("proguard-android-optimize.txt"),
+                "proguard-rules.pro"
+            )
+        }
+    }
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
+    }
+    kotlin {
+        compilerOptions {
+            jvmTarget.set(JvmTarget.JVM_17)
+        }
+    }
+}
+
+dependencies {
+
+    implementation(libs.bundles.test)
+    implementation(libs.bundles.coroutines)
+    implementation(libs.retrofit)
+
+    ksp(libs.hilt.compiler)
+    implementation(libs.hilt.android)
+
+    implementation(project(":core:data:common"))
+    implementation(project(":core:data:mission"))
+    implementation(project(":core:domain:common"))
+    implementation(project(":core:domain:history"))
+    implementation(project(":core:domain:mission"))
+    implementation(project(":core:network"))
+    implementation(project(":core:datastore"))
+}

core/data/history/consumer-rules.pro

@@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile

core/data/history/proguard-rules.pro

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+
+</manifest>