Release 0.3.1 to main

.editorconfig

@@ -8,3 +8,6 @@ trim_trailing_whitespace = true
 [*.{kt,kts}]
 ktlint_function_naming_ignore_when_annotated_with = Composable
 ktlint_standard_annotation = disabled
+
+[*Test.kt]
+ktlint_standard_function-naming = disabled

.github/workflows/android-ci.yml

@@ -38,6 +38,7 @@ jobs:
           echo "google.webClientId=${{ secrets.GOOGLE_WEB_CLIENT_ID }}" >> local.properties
           echo "kakao.nativeAppKey=${{ secrets.KAKAO_NATIVE_APP_KEY }}" >> local.properties
           echo "kakao.nativeAppKeyDebug=${{ secrets.KAKAO_NATIVE_APP_KEY_DEBUG }}" >> local.properties
+          echo "mixpanel.token=${{ secrets.MIXPANEL_TOKEN }}" >> local.properties
 
       - name: Decode Keystore
         run: echo "${{ secrets.KEYSTORE_BASE64 }}" | base64 --decode > app/keystore.jks

.github/workflows/distribute.yml

@@ -56,6 +56,7 @@ jobs:
           echo "google.webClientId=${{ secrets.GOOGLE_WEB_CLIENT_ID }}" >> local.properties
           echo "kakao.nativeAppKey=${{ secrets.KAKAO_NATIVE_APP_KEY }}" >> local.properties
           echo "kakao.nativeAppKeyDebug=${{ secrets.KAKAO_NATIVE_APP_KEY_DEBUG }}" >> local.properties
+          echo "mixpanel.token=${{ secrets.MIXPANEL_TOKEN }}" >> local.properties
 
       - name: Decode Keystore
         run: echo "${{ secrets.KEYSTORE_BASE64 }}" | base64 --decode > app/keystore.jks

app/build.gradle.kts

@@ -30,8 +30,8 @@ android {
 
     defaultConfig {
         applicationId = "com.sseotdabwa.buyornot"
-        versionCode = 6
-        versionName = "0.3.0"
+        versionCode = 7
+        versionName = "0.3.1"
 
         buildConfigField("String", "KAKAO_NATIVE_APP_KEY", "\"${localProperties.getProperty("kakao.nativeAppKey", "")}\"")
         manifestPlaceholders["NATIVE_APP_KEY"] = localProperties.getProperty("kakao.nativeAppKey", "")
@@ -101,6 +101,7 @@ android {
 
 dependencies {
     implementation(projects.domain)
+    implementation(projects.core.analytics)
     implementation(projects.core.data)
     implementation(projects.core.network)
     implementation(projects.core.datastore)

core/analytics/build.gradle.kts

@@ -0,0 +1,43 @@
+import java.util.Properties
+
+plugins {
+    id("buyornot.android.library")
+    alias(libs.plugins.hilt)
+    alias(libs.plugins.ksp)
+}
+
+val localProperties =
+    Properties().apply {
+        val localPropertiesFile = rootProject.file("local.properties")
+        if (localPropertiesFile.exists()) {
+            localPropertiesFile.inputStream().use { load(it) }
+        }
+    }
+
+android {
+    namespace = "com.sseotdabwa.buyornot.core.analytics"
+
+    buildFeatures {
+        buildConfig = true
+    }
+
+    buildTypes {
+        debug {
+            buildConfigField("String", "MIXPANEL_TOKEN", "\"\"")
+        }
+        release {
+            buildConfigField(
+                "String",
+                "MIXPANEL_TOKEN",
+                "\"${localProperties.getProperty("mixpanel.token", "")}\"",
+            )
+        }
+    }
+}
+
+dependencies {
+    implementation(libs.mixpanel.android)
+
+    implementation(libs.hilt.android)
+    ksp(libs.hilt.compiler)
+}

core/analytics/src/main/java/com/sseotdabwa/buyornot/core/analytics/Analytics.kt

@@ -0,0 +1,5 @@
+package com.sseotdabwa.buyornot.core.analytics
+
+interface Analytics {
+    fun track(event: AnalyticsEvent)
+}

core/analytics/src/main/java/com/sseotdabwa/buyornot/core/analytics/AnalyticsEvent.kt

@@ -0,0 +1,34 @@
+package com.sseotdabwa.buyornot.core.analytics
+
+sealed class AnalyticsEvent {
+    data class FeedViewed(
+        val firstVisibleItemIndex: Int,
+    ) : AnalyticsEvent()
+
+    data class FeedExited(
+        val timeSpentSeconds: Float,
+        val lastVisibleItemIndex: Int,
+    ) : AnalyticsEvent()
+
+    data class VoteSubmitted(
+        val feedId: Long,
+        val voteChoice: String,
+        val feedCategory: String,
+    ) : AnalyticsEvent()
+
+    data class VoteCreateStarted(
+        val entrySource: String,
+        val isLoggedIn: Boolean,
+    ) : AnalyticsEvent()
+
+    data class VoteCreateCompleted(
+        val itemId: Long,
+        val voteTitle: String,
+        val optionCount: Int,
+    ) : AnalyticsEvent()
+
+    data class VoteCreateAbandoned(
+        val filledFields: List<String>,
+        val lastStep: String?,
+    ) : AnalyticsEvent()
+}

core/analytics/src/main/java/com/sseotdabwa/buyornot/core/analytics/DebugAnalytics.kt

@@ -0,0 +1,9 @@
+package com.sseotdabwa.buyornot.core.analytics
+
+import android.util.Log
+
+class DebugAnalytics : Analytics {
+    override fun track(event: AnalyticsEvent) {
+        Log.d("Analytics", event.toString())
+    }
+}

core/analytics/src/main/java/com/sseotdabwa/buyornot/core/analytics/MixpanelAnalytics.kt

@@ -0,0 +1,53 @@
+package com.sseotdabwa.buyornot.core.analytics
+
+import com.mixpanel.android.mpmetrics.MixpanelAPI
+import org.json.JSONArray
+import org.json.JSONObject
+
+class MixpanelAnalytics(
+    private val mixpanel: MixpanelAPI,
+) : Analytics {
+    override fun track(event: AnalyticsEvent) {
+        val (name, props) = event.toMixpanel()
+        mixpanel.track(name, props)
+    }
+
+    private fun AnalyticsEvent.toMixpanel(): Pair<String, JSONObject> {
+        val props = JSONObject()
+        val name =
+            when (this) {
+                is AnalyticsEvent.FeedViewed -> {
+                    props.put("first_visible_item_index", firstVisibleItemIndex)
+                    "feed_viewed"
+                }
+                is AnalyticsEvent.FeedExited -> {
+                    props.put("time_spent_seconds", timeSpentSeconds)
+                    props.put("last_visible_item_index", lastVisibleItemIndex)
+                    "feed_exited"
+                }
+                is AnalyticsEvent.VoteSubmitted -> {
+                    props.put("feed_id", feedId)
+                    props.put("vote_choice", voteChoice)
+                    props.put("feed_category", feedCategory)
+                    "vote_submitted"
+                }
+                is AnalyticsEvent.VoteCreateStarted -> {
+                    props.put("entry_source", entrySource)
+                    props.put("is_logged_in", isLoggedIn)
+                    "vote_create_started"
+                }
+                is AnalyticsEvent.VoteCreateCompleted -> {
+                    props.put("item_id", itemId)
+                    props.put("vote_title", voteTitle)
+                    props.put("option_count", optionCount)
+                    "vote_create_completed"
+                }
+                is AnalyticsEvent.VoteCreateAbandoned -> {
+                    props.put("filled_fields", JSONArray(filledFields))
+                    if (lastStep != null) props.put("last_step", lastStep)
+                    "vote_create_abandoned"
+                }
+            }
+        return name to props
+    }
+}

core/analytics/src/main/java/com/sseotdabwa/buyornot/core/analytics/di/AnalyticsModule.kt

@@ -0,0 +1,35 @@
+package com.sseotdabwa.buyornot.core.analytics.di
+
+import android.content.Context
+import com.mixpanel.android.mpmetrics.MixpanelAPI
+import com.sseotdabwa.buyornot.core.analytics.Analytics
+import com.sseotdabwa.buyornot.core.analytics.BuildConfig
+import com.sseotdabwa.buyornot.core.analytics.DebugAnalytics
+import com.sseotdabwa.buyornot.core.analytics.MixpanelAnalytics
+import dagger.Module
+import dagger.Provides
+import dagger.hilt.InstallIn
+import dagger.hilt.android.qualifiers.ApplicationContext
+import dagger.hilt.components.SingletonComponent
+import javax.inject.Singleton
+
+@Module
+@InstallIn(SingletonComponent::class)
+object AnalyticsModule {
+    @Provides
+    @Singleton
+    fun provideAnalytics(
+        @ApplicationContext context: Context,
+    ): Analytics =
+        if (BuildConfig.DEBUG) {
+            DebugAnalytics()
+        } else {
+            val mixpanel =
+                MixpanelAPI.getInstance(
+                    context,
+                    BuildConfig.MIXPANEL_TOKEN,
+                    true,
+                )
+            MixpanelAnalytics(mixpanel)
+        }
+}

core/designsystem/src/main/java/com/sseotdabwa/buyornot/core/designsystem/components/ActionPopup.kt

@@ -132,7 +132,11 @@ fun ActionPopupContent(
     ) {
         val pressedColor = BuyOrNotTheme.colors.gray200
         Column(
-            modifier = Modifier.padding(6.dp),
+            modifier =
+                Modifier.padding(
+                    horizontal = 6.dp,
+                    vertical = 10.dp,
+                ),
             verticalArrangement = Arrangement.spacedBy(4.dp),
         ) {
             items.forEach { (label, onClick) ->

core/designsystem/src/main/java/com/sseotdabwa/buyornot/core/designsystem/components/ActionSheet.kt

@@ -6,7 +6,6 @@ import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.width
@@ -64,7 +63,11 @@ fun ActionSheet(
         LazyColumn(
             modifier = Modifier.fillMaxWidth(),
             verticalArrangement = Arrangement.spacedBy(18.dp),
-            contentPadding = PaddingValues(vertical = 16.dp),
+            contentPadding =
+                PaddingValues(
+                    top = 26.dp,
+                    bottom = 30.dp,
+                ),
         ) {
             items(
                 count = actions.size,
@@ -92,9 +95,11 @@ private fun ActionItemRow(
         modifier =
             Modifier
                 .fillMaxWidth()
-                .height(30.dp)
                 .clickable(onClick = onClick)
-                .padding(horizontal = 24.dp),
+                .padding(
+                    horizontal = 24.dp,
+                    vertical = 6.dp,
+                ),
         verticalAlignment = Alignment.CenterVertically,
         horizontalArrangement = Arrangement.Start,
     ) {

core/designsystem/src/main/java/com/sseotdabwa/buyornot/core/designsystem/components/FeedCard.kt

@@ -86,6 +86,7 @@ fun FeedCard(
     productLink: String? = null,
     onLinkClick: (url: String) -> Unit = {},
     showProductLinkTooltip: Boolean = false,
+    onTooltipDismiss: () -> Unit = {},
     onImageClick: (imageUrls: List<String>, page: Int) -> Unit = { _, _ -> },
 ) {
     val hasVoted = userVotedOptionIndex != null
@@ -140,7 +141,10 @@ fun FeedCard(
                 price = price,
                 productLink = productLink,
                 showTooltip = tooltipVisible,
-                onTooltipDismiss = { tooltipVisible = false },
+                onTooltipDismiss = {
+                    tooltipVisible = false
+                    onTooltipDismiss()
+                },
                 onFullscreenClick = { page -> onImageClick(productImageUrls, page) },
                 onLinkClick = onLinkClick,
             )

feature/auth/build.gradle.kts

@@ -33,4 +33,8 @@ dependencies {
 
     implementation(platform(libs.firebase.bom))
     implementation(libs.firebase.messaging)
+
+    testImplementation(libs.junit)
+    testImplementation(libs.kotlin.test)
+    testImplementation(libs.kotlinx.coroutines.test)
 }

feature/auth/src/main/java/com/sseotdabwa/buyornot/feature/auth/ui/SplashViewModel.kt

@@ -5,6 +5,7 @@ import android.util.Log
 import androidx.core.content.pm.PackageInfoCompat
 import androidx.lifecycle.viewModelScope
 import com.sseotdabwa.buyornot.core.ui.base.BaseViewModel
+import com.sseotdabwa.buyornot.domain.model.AppUpdateInfo
 import com.sseotdabwa.buyornot.domain.model.UpdateStrategy
 import com.sseotdabwa.buyornot.domain.model.UserType
 import com.sseotdabwa.buyornot.domain.repository.AppPreferencesRepository
@@ -20,9 +21,36 @@ import javax.inject.Inject
 import kotlin.coroutines.cancellation.CancellationException
 
 private const val SPLASH_TIMEOUT_MILLIS = 2300L
-private const val SOFT_UPDATE_INTERVAL_MILLIS = 24 * 60 * 60 * 1000L
+internal const val SOFT_UPDATE_INTERVAL_MILLIS = 24 * 60 * 60 * 1000L
 private const val TAG = "SplashUpdate"
 
+internal fun resolveUpdateDialogType(
+    currentVersion: Int,
+    updateInfo: AppUpdateInfo?,
+    lastSoftUpdateShownTime: Long,
+    now: Long,
+): UpdateDialogType {
+    if (updateInfo == null) return UpdateDialogType.None
+
+    return when {
+        currentVersion < updateInfo.minimumVersion -> UpdateDialogType.Force
+        // currentVersion >= latestVersion이면 이미 최신 버전이므로 FORCE 팝업 표시 안 함
+        updateInfo.updateStrategy == UpdateStrategy.FORCE &&
+            currentVersion < updateInfo.latestVersion -> UpdateDialogType.Force
+        updateInfo.updateStrategy == UpdateStrategy.SOFT &&
+            currentVersion < updateInfo.latestVersion -> {
+            // lastSoftUpdateShownTime이 미래 값이면 시계 역행으로 판단, 표시된 적 없는 것으로 처리
+            val effectiveLastShown = if (lastSoftUpdateShownTime > now) 0L else lastSoftUpdateShownTime
+            if (now - effectiveLastShown >= SOFT_UPDATE_INTERVAL_MILLIS) {
+                UpdateDialogType.Soft
+            } else {
+                UpdateDialogType.None
+            }
+        }
+        else -> UpdateDialogType.None
+    }
+}
+
 /**
  * 스플래시 화면을 위한 ViewModel
  *
@@ -93,30 +121,21 @@ class SplashViewModel @Inject constructor(
 
     private suspend fun determineDialogType(
         currentVersion: Int,
-        updateInfo: com.sseotdabwa.buyornot.domain.model.AppUpdateInfo?,
+        updateInfo: AppUpdateInfo?,
     ): UpdateDialogType {
-        if (updateInfo == null) return UpdateDialogType.None
-
-        return when {
-            currentVersion < updateInfo.minimumVersion -> UpdateDialogType.Force
-            updateInfo.updateStrategy == UpdateStrategy.FORCE -> UpdateDialogType.Force
-            updateInfo.updateStrategy == UpdateStrategy.SOFT &&
-                currentVersion < updateInfo.latestVersion -> {
-                val lastShown = appPreferencesRepository.lastSoftUpdateShownTime.first()
-                if (System.currentTimeMillis() - lastShown >= SOFT_UPDATE_INTERVAL_MILLIS) {
-                    UpdateDialogType.Soft
-                } else {
-                    UpdateDialogType.None
-                }
-            }
-            else -> UpdateDialogType.None
-        }
+        val now = System.currentTimeMillis()
+        val lastShown = appPreferencesRepository.lastSoftUpdateShownTime.first()
+        return resolveUpdateDialogType(currentVersion, updateInfo, lastShown, now)
     }
 
     private fun dismissSoftUpdate() {
         viewModelScope.launch {
             try {
                 appPreferencesRepository.updateLastSoftUpdateShownTime(System.currentTimeMillis())
+            } catch (e: CancellationException) {
+                throw e
+            } catch (e: Exception) {
+                Log.e(TAG, "Failed to save soft update shown time", e)
             } finally {
                 updateState { it.copy(updateDialogType = UpdateDialogType.None) }
             }