Merge pull request #255 from YAPP-Github/release/1.1.3

Merge release/1.1.3 to develop

Author: DongChyeon

.github/workflows/android_ci.yml

@@ -7,13 +7,6 @@ on:
             - '**/*.kt'
             - 'build.gradle'
             - 'app/**'
-    push:
-        branches:
-            - 'release/**'
-        paths:
-            - '**/*.kt'
-            - 'build.gradle'
-            - 'app/**'
 
 jobs:
   build:

app/build.gradle.kts

@@ -8,10 +8,11 @@ plugins {
 
 android {
     namespace = "com.yapp.orbit"
+    compileSdk = 35
 
     defaultConfig {
-        versionCode = 5
-        versionName = "1.0.3"
+        versionCode = 6
+        versionName = "1.1.3"
         targetSdk = 35
     }
 
@@ -53,4 +54,6 @@ dependencies {
     implementation(libs.firebase.crashlytics)
     implementation(libs.play.services.ads)
     implementation(libs.kotlin.reflect)
+    implementation(libs.hilt.worker)
+    implementation(libs.androidx.work.runtime)
 }

app/src/main/AndroidManifest.xml

@@ -11,6 +11,7 @@
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE_MEDIA_PLAYBACK" />
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
 
     <application
         android:name=".OrbitApplication"
@@ -46,9 +47,7 @@
                 <action android:name="android.intent.action.VIEW" />
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
-                <data
-                    android:scheme="orbitapp"
-                    android:host="mission"/>
+                <data android:scheme="orbitapp" />
             </intent-filter>
         </activity>
 
@@ -80,5 +79,15 @@
         <service
             android:name="com.yapp.alarm.services.AlarmService"
             android:foregroundServiceType="mediaPlayback" />
+
+        <provider
+            android:name="androidx.startup.InitializationProvider"
+            android:authorities="${applicationId}.androidx-startup"
+            android:exported="false"
+            tools:node="merge">
+            <meta-data
+                android:name="androidx.work.WorkManagerInitializer"
+                tools:node="remove" />
+        </provider>
     </application>
 </manifest>

app/src/main/java/com/yapp/orbit/OrbitApplication.kt

@@ -1,13 +1,24 @@
 package com.yapp.orbit
 
 import android.app.Application
+import androidx.hilt.work.HiltWorkerFactory
+import androidx.work.Configuration
 import com.google.android.gms.ads.MobileAds
 import dagger.hilt.android.HiltAndroidApp
+import javax.inject.Inject
 
 @HiltAndroidApp
-class OrbitApplication : Application() {
+class OrbitApplication() : Application(), Configuration.Provider {
+
+    @Inject lateinit var workerFactory: HiltWorkerFactory
+
     override fun onCreate() {
         super.onCreate()
         MobileAds.initialize(this)
     }
+
+    override val workManagerConfiguration: Configuration
+        get() = Configuration.Builder()
+            .setWorkerFactory(workerFactory)
+            .build()
 }

app/src/main/java/com/yapp/orbit/OrbitNavHost.kt

@@ -6,24 +6,16 @@ import androidx.compose.animation.fadeIn
 import androidx.compose.animation.fadeOut
 import androidx.compose.animation.slideInVertically
 import androidx.compose.animation.slideOutVertically
-import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.BoxScope
-import androidx.compose.foundation.layout.WindowInsets
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.navigationBars
+import androidx.compose.foundation.layout.navigationBarsPadding
 import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.windowInsetsBottomHeight
 import androidx.compose.material3.Scaffold
 import androidx.compose.material3.SnackbarHost
 import androidx.compose.material3.SnackbarHostState
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.remember
-import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.unit.dp
-import androidx.compose.ui.zIndex
 import androidx.navigation.compose.NavHost
 import com.yapp.common.navigation.OrbitNavigator
 import com.yapp.common.navigation.rememberOrbitNavigator
@@ -34,9 +26,9 @@ import com.yapp.mission.missionScreen
 import com.yapp.onboarding.onboardingNavGraph
 import com.yapp.setting.settingNavGraph
 import com.yapp.splash.splashScreen
-import com.yapp.ui.component.bottomsheet.OrbitBottomSheetLayout
 import com.yapp.ui.component.bottomsheet.OrbitBottomSheetState
 import com.yapp.ui.component.bottomsheet.rememberOrbitBottomSheetState
+import com.yapp.ui.component.navigation.NavigationBarScrim
 import com.yapp.ui.component.snackbar.CustomSnackBarVisuals
 import com.yapp.ui.component.snackbar.OrbitSnackBar
 import com.yapp.webview.webViewScreen
@@ -51,18 +43,16 @@ internal fun OrbitNavHost(
     val snackBarHostState = remember { SnackbarHostState() }
 
     Box {
-        OrbitBottomSheetLayout(sheetState = bottomSheetState) {
-            Scaffold(
-                modifier = modifier,
-                snackbarHost = { OrbitSnackBarHost(snackBarHostState) },
-                containerColor = OrbitTheme.colors.gray_900,
-            ) {
-                OrbitNavigationGraph(
-                    navigator = navigator,
-                    bottomSheetState = bottomSheetState,
-                    snackBarHostState = snackBarHostState,
-                )
-            }
+        Scaffold(
+            modifier = modifier,
+            snackbarHost = { OrbitSnackBarHost(snackBarHostState) },
+            containerColor = OrbitTheme.colors.gray_900,
+        ) {
+            OrbitNavigationGraph(
+                navigator = navigator,
+                bottomSheetState = bottomSheetState,
+                snackBarHostState = snackBarHostState,
+            )
         }
 
         NavigationBarScrim()
@@ -76,6 +66,7 @@ private fun OrbitNavigationGraph(
     snackBarHostState: SnackbarHostState,
 ) {
     NavHost(
+        modifier = Modifier.navigationBarsPadding(),
         navController = navigator.navController,
         startDestination = navigator.startDestination,
     ) {
@@ -89,18 +80,6 @@ private fun OrbitNavigationGraph(
     }
 }
 
-@Composable
-private fun BoxScope.NavigationBarScrim() {
-    Box(
-        modifier = Modifier
-            .align(Alignment.BottomCenter)
-            .fillMaxWidth()
-            .windowInsetsBottomHeight(WindowInsets.navigationBars)
-            .background(Color.Black)
-            .zIndex(1f),
-    )
-}
-
 @Composable
 private fun OrbitSnackBarHost(
     snackBarHostState: SnackbarHostState,

app/src/main/java/com/yapp/orbit/di/AppVersionModule.kt

@@ -0,0 +1,18 @@
+package com.yapp.orbit.di
+
+import com.yapp.orbit.BuildConfig
+import dagger.Module
+import dagger.Provides
+import dagger.hilt.InstallIn
+import dagger.hilt.components.SingletonComponent
+import javax.inject.Named
+import javax.inject.Singleton
+
+@Module
+@InstallIn(SingletonComponent::class)
+object AppVersionModule {
+    @Provides
+    @Singleton
+    @Named("appVersion")
+    fun provideAppVersion(): String = BuildConfig.VERSION_NAME
+}

build-logic/src/main/java/com/yapp/convention/HiltAndroid.kt

@@ -14,7 +14,9 @@ internal fun Project.configureHiltAndroid() {
     dependencies {
         "implementation"(libs.findLibrary("hilt.android").get())
         "ksp"(libs.findLibrary("hilt.android.compiler").get())
+        "ksp"(libs.findLibrary("androidx-hilt-compiler").get())
         "implementation"(libs.findLibrary("hilt-navigation-compose").get())
+        "implementation"(libs.findLibrary("hilt-worker").get())
     }
 }
 

build-logic/src/main/java/orbit.android.feature.gradle.kts

@@ -1,13 +1,10 @@
-import com.yapp.convention.configureHiltAndroid
 import com.yapp.convention.libs
 
 plugins {
     id("orbit.android.library")
     id("orbit.android.compose")
 }
 
-configureHiltAndroid()
-
 dependencies {
     implementation(project(":core:designsystem"))
     implementation(project(":core:ui"))

core/alarm/src/main/java/com/yapp/alarm/AndroidAlarmScheduler.kt

@@ -2,6 +2,7 @@ package com.yapp.alarm
 
 import android.app.AlarmManager
 import android.app.Application
+import android.util.Log
 import com.yapp.alarm.pendingIntent.schedule.createAlarmReceiverPendingIntentForSchedule
 import com.yapp.alarm.pendingIntent.schedule.createAlarmReceiverPendingIntentForUnSchedule
 import com.yapp.domain.model.Alarm
@@ -16,6 +17,15 @@ class AndroidAlarmScheduler @Inject constructor(
     private val alarmTimeCalculator: AlarmTimeCalculator,
 ) : AlarmScheduler {
 
+    private fun logSchedule(tag: String, alarm: Alarm, triggerMillis: Long, extra: String = "") {
+        Log.d("ScheduleTrace", "scheduleAlarm Called", Throwable())
+        Log.d(
+            "AlarmSchedule",
+            "[$tag] id=${alarm.id}, repeatDays=${alarm.repeatDays}, " +
+                "time=${java.time.Instant.ofEpochMilli(triggerMillis)} $extra",
+        )
+    }
+
     override fun scheduleAlarm(alarm: Alarm) {
         val selectedDays = alarm.repeatDays.toAlarmDays()
 
@@ -31,7 +41,7 @@ class AndroidAlarmScheduler @Inject constructor(
     private fun setRepeatingAlarm(day: AlarmDay, alarm: Alarm) {
         val triggerMillis = alarmTimeCalculator.calculateNextRepeatingTimeMillis(alarm, day)
         val pendingIntent = createAlarmReceiverPendingIntentForSchedule(app, alarm, day)
-
+        logSchedule("REPEAT", alarm, triggerMillis, "day=$day")
         alarmManager.setExactAndAllowWhileIdle(
             AlarmManager.RTC_WAKEUP,
             triggerMillis,
@@ -42,7 +52,7 @@ class AndroidAlarmScheduler @Inject constructor(
     private fun setNonRepeatingAlarm(alarm: Alarm) {
         val triggerMillis = alarmTimeCalculator.calculateNonRepeatingTimeMillis(alarm)
         val pendingIntent = createAlarmReceiverPendingIntentForSchedule(app, alarm)
-
+        logSchedule("NON_REPEAT", alarm, triggerMillis)
         alarmManager.setExactAndAllowWhileIdle(
             AlarmManager.RTC_WAKEUP,
             triggerMillis,
@@ -53,7 +63,7 @@ class AndroidAlarmScheduler @Inject constructor(
     fun rescheduleUpcomingWeeklyAlarm(alarm: Alarm, day: AlarmDay) {
         val triggerMillis = alarmTimeCalculator.calculateNextWeeklyRescheduledTimeMillis(alarm, day)
         val pendingIntent = createAlarmReceiverPendingIntentForSchedule(app, alarm, day)
-
+        logSchedule("RESCHEDULE_WEEKLY", alarm, triggerMillis, "day=$day")
         alarmManager.setExactAndAllowWhileIdle(
             AlarmManager.RTC_WAKEUP,
             triggerMillis,

core/alarm/src/main/java/com/yapp/alarm/receivers/AlarmInteractionActivityReceiver.kt

@@ -3,18 +3,18 @@ package com.yapp.alarm.receivers
 import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
-import android.util.Log
 import androidx.activity.ComponentActivity
 import androidx.core.net.toUri
 import com.yapp.alarm.AlarmConstants
+import com.yapp.domain.model.FortuneCreateStatus
+import com.yapp.domain.model.MissionType
 import com.yapp.domain.repository.FortuneRepository
 import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.flow.firstOrNull
+import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.launch
-import java.time.LocalDate
-import java.time.format.DateTimeFormatter
+import kotlinx.coroutines.withContext
 import javax.inject.Inject
 
 @AndroidEntryPoint
@@ -31,29 +31,69 @@ class AlarmInteractionActivityReceiver(private val activity: ComponentActivity)
 
             if (!isSnoozed) {
                 val notificationId = intent.getLongExtra(AlarmConstants.EXTRA_NOTIFICATION_ID, -1L)
-                val missionType = intent.getIntExtra(AlarmConstants.EXTRA_MISSION_TYPE, -1)
+                val missionTypeRaw = intent.getIntExtra(AlarmConstants.EXTRA_MISSION_TYPE, -1)
                 val missionCount = intent.getIntExtra(AlarmConstants.EXTRA_MISSION_COUNT, -1)
 
-                if (notificationId == -1L || missionType == -1 || missionCount == -1) {
-                    Log.e("AlarmInteraction", "필수 값 누락")
-                    return
-                }
+                val missionType = MissionType.fromInt(missionTypeRaw)
+
+                val hasValidMissionData = (
+                    notificationId != -1L &&
+                        missionType != MissionType.NONE &&
+                        missionCount != -1
+                    )
+
+                val pending = goAsync()
+                CoroutineScope(Dispatchers.Main).launch {
+                    try {
+                        if (!hasValidMissionData) {
+                            val (fortuneCreateStatus, hasUnseenFortune) = withContext(Dispatchers.IO) {
+                                val status = fortuneRepository.fortuneCreateStatusFlow.first()
+                                val unseen = fortuneRepository.hasUnseenFortuneFlow.first()
+                                status to unseen
+                            }
 
-                CoroutineScope(Dispatchers.IO).launch {
-                    val fortuneDate = fortuneRepository.fortuneDateFlow.firstOrNull()
-                    val todayDate = LocalDate.now().format(DateTimeFormatter.ISO_DATE)
-
-                    if (fortuneDate != todayDate) {
-                        context?.let {
-                            val uriString =
-                                "orbitapp://mission?notificationId=$notificationId&missionType=$missionType&missionCount=$missionCount"
-                            val missionIntent =
-                                Intent(Intent.ACTION_VIEW, uriString.toUri()).apply {
-                                    addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
-                                    setPackage(context.packageName)
+                            when (fortuneCreateStatus) {
+                                is FortuneCreateStatus.Creating -> {
+                                    context?.let { ctx ->
+                                        val uri = "orbitapp://fortune".toUri()
+                                        val fortuneIntent = Intent(Intent.ACTION_VIEW, uri).apply {
+                                            addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+                                            setPackage(ctx.packageName)
+                                        }
+                                        ctx.startActivity(fortuneIntent)
+                                    }
                                 }
-                            it.startActivity(missionIntent)
+
+                                is FortuneCreateStatus.Success -> {
+                                    if (hasUnseenFortune) {
+                                        context?.let { ctx ->
+                                            val uri = "orbitapp://fortune".toUri()
+                                            val fortuneIntent =
+                                                Intent(Intent.ACTION_VIEW, uri).apply {
+                                                    addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+                                                    setPackage(ctx.packageName)
+                                                }
+                                            ctx.startActivity(fortuneIntent)
+                                        }
+                                    }
+                                }
+
+                                FortuneCreateStatus.Failure, FortuneCreateStatus.Idle -> { }
+                            }
+                        } else {
+                            context?.let { ctx ->
+                                val uriString =
+                                    "orbitapp://mission?notificationId=$notificationId&missionType=${missionType.value}&missionCount=$missionCount"
+                                val missionIntent =
+                                    Intent(Intent.ACTION_VIEW, uriString.toUri()).apply {
+                                        addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+                                        setPackage(ctx.packageName)
+                                    }
+                                ctx.startActivity(missionIntent)
+                            }
                         }
+                    } finally {
+                        pending.finish()
                     }
                 }
             }