Release/release 2.0.2

.github/workflows/android-ci.yml

@@ -27,7 +27,7 @@ jobs:
       - name: Create API Certificate
         run: |
           echo "sdk.dir=$ANDROID_SDK_ROOT" > ./local.properties
-          echo "native_app_key=\"${{ secrets.NATIVE_APP_KEY }}\"" >> ./local.properties
+          echo "NATIVE_APP_KEY=\"${{ secrets.NATIVE_APP_KEY }}\"" >> ./local.properties
           echo "CLOVA_OCR_DOCUMENT_SECRET=\"${{ secrets.CLOVA_OCR_DOCUMENT_SECRET }}\"" >> ./local.properties
           echo "CLOVA_OCR_DOCUMENT_BASEURL=\"${{ secrets.CLOVA_OCR_DOCUMENT_BASEURL }}\"" >> ./local.properties
 
@@ -84,7 +84,7 @@ jobs:
         - name: Create API Certificate
           run: |
             echo "sdk.dir=$ANDROID_SDK_ROOT" > ./local.properties
-            echo "native_app_key=\"${{ secrets.NATIVE_APP_KEY }}\"" >> ./local.properties
+            echo "NATIVE_APP_KEY=\"${{ secrets.NATIVE_APP_KEY }}\"" >> ./local.properties
             echo "CLOVA_OCR_DOCUMENT_SECRET=\"${{ secrets.CLOVA_OCR_DOCUMENT_SECRET }}\"" >> ./local.properties
             echo "CLOVA_OCR_DOCUMENT_BASEURL=\"${{ secrets.CLOVA_OCR_DOCUMENT_BASEURL }}\"" >> ./local.properties        
 

app/build.gradle.kts

@@ -1,5 +1,3 @@
-import com.android.build.gradle.internal.cxx.configure.gradleLocalProperties
-
 @Suppress("DSL_SCOPE_VIOLATION")
 plugins {
     alias(libs.plugins.moneymong.android.application)
@@ -13,21 +11,21 @@ plugins {
 
 android {
     namespace = "com.moneymong.moneymong"
-    compileSdk = 34
+    compileSdk = 35
 
     defaultConfig {
         applicationId = "com.moneymong.moneymong"
         minSdk = 24
-        targetSdk = 34
+        targetSdk = 35
         versionCode = 31
-        versionName = "2.0.1"
+        versionName = "2.0.2"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables {
             useSupportLibrary = true
         }
-        buildConfigField("String", "NATIVE_APP_KEY", getApiKey("native_app_key"))
     }
+
     buildFeatures {
         buildConfig = true
     }
@@ -50,6 +48,8 @@ android {
 
 dependencies {
     implementation(projects.core.ui)
+    implementation(projects.core.analytics)
+    implementation(projects.core.android)
     implementation(projects.core.designSystem)
     implementation(projects.core.common)
     implementation(projects.core.model)
@@ -82,8 +82,4 @@ dependencies {
     testImplementation(libs.junit4)
     androidTestImplementation(libs.androidx.junit)
     androidTestImplementation(libs.androidx.test.espresso.core)
-}
-
-fun getApiKey(propertyKey: String): String {
-    return gradleLocalProperties(rootDir).getProperty(propertyKey)
-}
+}

app/src/main/java/com/moneymong/moneymong/MainActivity.kt

@@ -1,19 +1,25 @@
 package com.moneymong.moneymong
 
 import android.content.Intent
+import android.graphics.Color
 import android.net.Uri
+import android.os.Build
 import android.os.Bundle
 import androidx.activity.ComponentActivity
+import androidx.activity.SystemBarStyle
 import androidx.activity.compose.setContent
+import androidx.activity.enableEdgeToEdge
 import androidx.activity.viewModels
+import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.platform.LocalContext
 import androidx.lifecycle.compose.LifecycleStartEffect
-import com.moneymong.moneymong.common.event.EventTracker
+import com.moneymong.moneymong.analytics.AnalyticsTracker
+import com.moneymong.moneymong.analytics.LocalAnalyticsTracker
 import com.moneymong.moneymong.design_system.error.ErrorDialog
 import com.moneymong.moneymong.design_system.theme.MMTheme
 import com.moneymong.moneymong.domain.repository.token.TokenRepository
@@ -30,11 +36,20 @@ class MainActivity : ComponentActivity() {
     lateinit var tokenRepository: TokenRepository
 
     @Inject
-    lateinit var eventTracker: EventTracker
+    lateinit var analyticsTracker: AnalyticsTracker
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        eventTracker.initialize()
+        enableEdgeToEdge(
+            navigationBarStyle = SystemBarStyle.auto(
+                Color.TRANSPARENT,
+                Color.TRANSPARENT
+            )
+        ).also {
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+                window.isNavigationBarContrastEnforced = false
+            }
+        }
 
         setContent {
             val context = LocalContext.current
@@ -53,27 +68,29 @@ class MainActivity : ComponentActivity() {
                 onStopOrDispose { }
             })
 
-            MMTheme {
-                if (shouldUpdate) {
-                    ErrorDialog(
-                        message = "안정적인 머니몽 사용을 위해\n최신 버전으로 업데이트가 필요해요!",
-                        confirmText = "업데이트",
-                        onConfirm = {
-                            val playStoreUrl =
-                                "https://play.google.com/store/apps/details?id=${BuildConfig.APPLICATION_ID}"
-                            val intent = Intent(Intent.ACTION_VIEW).apply {
-                                data = Uri.parse(playStoreUrl)
-                                setPackage("com.android.vending")
+            CompositionLocalProvider(LocalAnalyticsTracker provides analyticsTracker) {
+                MMTheme {
+                    if (shouldUpdate) {
+                        ErrorDialog(
+                            message = "안정적인 머니몽 사용을 위해\n최신 버전으로 업데이트가 필요해요!",
+                            confirmText = "업데이트",
+                            onConfirm = {
+                                val playStoreUrl =
+                                    "https://play.google.com/store/apps/details?id=${BuildConfig.APPLICATION_ID}"
+                                val intent = Intent(Intent.ACTION_VIEW).apply {
+                                    data = Uri.parse(playStoreUrl)
+                                    setPackage("com.android.vending")
+                                }
+                                context.startActivity(intent)
                             }
-                            context.startActivity(intent)
-                        }
+                        )
+                    }
+
+                    MoneyMongApp(
+                        expired = expired,
+                        onChangeExpired = { expired = false }
                     )
                 }
-
-                MoneyMongApp(
-                    expired = expired,
-                    onChangeExpired = { expired = false }
-                )
             }
         }
     }

app/src/main/java/com/moneymong/moneymong/MainSideEffect.kt

@@ -1,6 +1,6 @@
 package com.moneymong.moneymong
 
-import com.moneymong.moneymong.common.base.SideEffect
+import com.moneymong.moneymong.android.SideEffect
 
 sealed class MainSideEffect: SideEffect {
 }

app/src/main/java/com/moneymong/moneymong/MainState.kt

@@ -1,6 +1,6 @@
 package com.moneymong.moneymong
 
-import com.moneymong.moneymong.common.base.State
+import com.moneymong.moneymong.android.State
 
 data class MainState(
     val shouldUpdate: Boolean = false

app/src/main/java/com/moneymong/moneymong/MainViewModel.kt

@@ -1,6 +1,6 @@
 package com.moneymong.moneymong
 
-import com.moneymong.moneymong.common.base.BaseViewModel
+import com.moneymong.moneymong.android.BaseViewModel
 import com.moneymong.moneymong.domain.usecase.version.CheckVersionUpdateUseCase
 import dagger.hilt.android.lifecycle.HiltViewModel
 import org.orbitmvi.orbit.syntax.simple.intent

build-logic/convention/src/main/java/AndroidApplicationConventionPlugin.kt

@@ -14,7 +14,7 @@ class AndroidApplicationConventionPlugin : Plugin<Project> {
 
             extensions.configure<ApplicationExtension> {
                 configureKotlinAndroid(this)
-                defaultConfig.targetSdk = 34
+                defaultConfig.targetSdk = 35
             }
         }
     }

build-logic/convention/src/main/java/AndroidLibraryConventionPlugin.kt

@@ -15,7 +15,7 @@ class AndroidLibraryConventionPlugin : Plugin<Project> {
 
             extensions.configure<LibraryExtension> {
                 configureKotlinAndroid(this)
-                defaultConfig.targetSdk = 34
+                defaultConfig.targetSdk = 35
                 configureFlavors(this)
             }
         }

build-logic/convention/src/main/java/com/moneymong/moneymong/buildlogic/convention/AndroidCompose.kt

@@ -5,7 +5,7 @@ import org.gradle.api.Project
 import org.gradle.kotlin.dsl.dependencies
 
 internal fun Project.configureAndroidCompose(
-    commonExtension: CommonExtension<*, *, *, *, *>,
+    commonExtension: CommonExtension<*, *, *, *, *, *>,
 ) {
     commonExtension.apply {
         buildFeatures {

build-logic/convention/src/main/java/com/moneymong/moneymong/buildlogic/convention/KotlinAndroid.kt

@@ -8,10 +8,10 @@ import org.gradle.kotlin.dsl.configure
 import org.gradle.kotlin.dsl.dependencies
 
 internal fun Project.configureKotlinAndroid(
-    commonExtension: CommonExtension<*, *, *, *, *>,
+    commonExtension: CommonExtension<*, *, *, *, *, *>,
 ) {
     commonExtension.apply {
-        compileSdk = 34
+        compileSdk = 35
 
         defaultConfig {
             minSdk = 24

build-logic/convention/src/main/java/com/moneymong/moneymong/buildlogic/convention/MoneyMongFlavor.kt

@@ -17,7 +17,7 @@ enum class MoneyMongFlavor(val dimension: FlavorDimension, val applicationIdSuff
 }
 
 fun configureFlavors(
-    commonExtension: CommonExtension<*, *, *, *, *>,
+    commonExtension: CommonExtension<*, *, *, *, *, *>,
     flavorConfigurationBlock: ProductFlavor.(flavor: MoneyMongFlavor) -> Unit = {}
 ) {
     commonExtension.apply {

core/analytics/.gitignore

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

core/analytics/build.gradle.kts

@@ -0,0 +1,15 @@
+@Suppress("DSL_SCOPE_VIOLATION") // TODO: Remove once KTIJ-19369 is fixed
+plugins {
+    alias(libs.plugins.moneymong.android.library)
+    alias(libs.plugins.moneymong.android.hilt)
+}
+
+android {
+    namespace = "com.moneymong.moneymong.analytics"
+}
+
+dependencies {
+    implementation(platform(libs.firebase.bom))
+    implementation(libs.firebase.analytics)
+    implementation(libs.firebase.crashlytics)
+}

core/analytics/proguard-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/analytics/src/androidTest/java/com/moneymong/moneymong/analytics/ExampleInstrumentedTest.kt

@@ -0,0 +1,24 @@
+package com.moneymong.moneymong.analytics
+
+import androidx.test.platform.app.InstrumentationRegistry
+import androidx.test.ext.junit.runners.AndroidJUnit4
+
+import org.junit.Test
+import org.junit.runner.RunWith
+
+import org.junit.Assert.*
+
+/**
+ * Instrumented test, which will execute on an Android device.
+ *
+ * See [testing documentation](http://d.android.com/tools/testing).
+ */
+@RunWith(AndroidJUnit4::class)
+class ExampleInstrumentedTest {
+    @Test
+    fun useAppContext() {
+        // Context of the app under test.
+        val appContext = InstrumentationRegistry.getInstrumentation().targetContext
+        assertEquals("com.moneymong.moneymong.analytics.test", appContext.packageName)
+    }
+}

core/analytics/src/main/AndroidManifest.xml

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

core/analytics/src/main/java/com/moneymong/moneymong/analytics/AnalyticsEvent.kt

@@ -0,0 +1,16 @@
+package com.moneymong.moneymong.analytics
+
+data class AnalyticsEvent(
+    val type: String,
+    val extras: List<Param> = emptyList(),
+) {
+    data class Param(
+        val key: String,
+        val value: String,
+    )
+
+    companion object {
+        const val SCREEN_VIEW = "screen_view"
+        const val SCREEN_NAME = "screen_name"
+    }
+}

core/analytics/src/main/java/com/moneymong/moneymong/analytics/AnalyticsModule.kt

@@ -0,0 +1,26 @@
+package com.moneymong.moneymong.analytics
+
+import com.google.firebase.Firebase
+import com.google.firebase.analytics.FirebaseAnalytics
+import com.google.firebase.analytics.analytics
+import dagger.Binds
+import dagger.Module
+import dagger.Provides
+import dagger.hilt.InstallIn
+import dagger.hilt.components.SingletonComponent
+import javax.inject.Singleton
+
+@Module
+@InstallIn(SingletonComponent::class)
+abstract class AnalyticsModule {
+
+    @Binds
+    @Singleton
+    abstract fun bindsAnalyticsTracker(firebaseAnalyticsTracker: FirebaseAnalyticsTracker): AnalyticsTracker
+
+    companion object {
+        @Provides
+        @Singleton
+        fun provideFirebaseAnalytics(): FirebaseAnalytics = Firebase.analytics
+    }
+}

core/analytics/src/main/java/com/moneymong/moneymong/analytics/AnalyticsTracker.kt

@@ -0,0 +1,5 @@
+package com.moneymong.moneymong.analytics
+
+interface AnalyticsTracker {
+    fun logEvent(event: AnalyticsEvent)
+}

core/analytics/src/main/java/com/moneymong/moneymong/analytics/CompositionEventTracker.kt

@@ -0,0 +1,7 @@
+package com.moneymong.moneymong.analytics
+
+import androidx.compose.runtime.staticCompositionLocalOf
+
+val LocalAnalyticsTracker = staticCompositionLocalOf<AnalyticsTracker> {
+    NoOpAnalyticsTracker()
+}