쌈@뽕한 내부 테스트 배포 ㄱㄱ?

.github/workflows/android_cd.yml

@@ -51,12 +51,17 @@ jobs:
                   FIREBASE_SECRET: ${{ secrets.FIREBASE_SECRET }}
               run: echo $FIREBASE_SECRET | base64 --decode > app/google-services.json
 
-            # 7. local.properties
-            - name: Add local.properties
+            # Add Local Properties
+            - name: Add Local Properties
               env:
                   BASE_URL: ${{ secrets.BASE_URL }}
+                  AMPLITUDE_API_KEY: ${{ secrets.AMPLITUDE_API_KEY }}
               run: |
-                  echo "base.url=\"$BASE_URL\"" >> app/local.properties
+                  echo -e "baseUrl=$BASE_URL\namplitudeApiKey=$AMPLITUDE_API_KEY" >> local.properties
+
+            # 7. Debug Local Properties Check
+            -   name: Debug Local Properties
+                run: cat local.properties
 
             # 8. Ktlint
             - name: Run Ktlint Check

.github/workflows/android_ci.yml

@@ -14,7 +14,7 @@ jobs:
     steps:
       # Gradle Cache
       - name: Cache Gradle packages
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         with:
           path: |
             ~/.gradle/caches
@@ -55,8 +55,14 @@ jobs:
       # Add Local Properties
       - name: Add Local Properties
         env:
-          BASE_URL: ${{ secrets.BASE_URL }}
-        run: echo "baseUrl=$BASE_URL" >> local.properties
+            BASE_URL: ${{ secrets.BASE_URL }}
+            AMPLITUDE_API_KEY: ${{ secrets.AMPLITUDE_API_KEY }}
+        run: |
+            echo -e "baseUrl=$BASE_URL\namplitudeApiKey=$AMPLITUDE_API_KEY" >> local.properties
+
+      # Debug Local Properties Check
+      - name: Debug Local Properties
+        run: cat local.properties
 
       # Run Lint and Build
       - name: Run lint and build

app/build.gradle.kts

@@ -9,8 +9,8 @@ android {
     namespace = "com.yapp.orbit"
 
     defaultConfig {
-        versionCode = 1
-        versionName = "0.0.2"
+        versionCode = 2
+        versionName = "1.0.0"
         targetSdk = 34
     }
 

app/src/main/AndroidManifest.xml

@@ -2,6 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools">
 
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.INTERNET"/>
     <uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
     <uses-permission android:name="android.permission.VIBRATE" />

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

@@ -27,15 +27,17 @@ internal val ExtensionContainer.libs: VersionCatalog
 
 internal fun CommonExtension<*, *, *, *, *, *>.addBuildConfigFields(project: Project) {
     val baseUrl = project.getLocalProperty("baseUrl", "https://default.example.com")
-    val isDebug = project.providers.gradleProperty("isDebug").orNull?.toBoolean() ?: false
+    val amplitudeApikey = project.getLocalProperty("amplitudeApiKey", "")
 
     buildTypes {
         getByName("debug") {
             buildConfigField("String", "BASE_URL", "\"$baseUrl\"")
-            buildConfigField("boolean", "DEBUG", isDebug.toString())
+            buildConfigField("String", "AMPLITUDE_API_KEY", "\"$amplitudeApikey\"")
+            buildConfigField("boolean", "DEBUG", "true")
         }
         getByName("release") {
             buildConfigField("String", "BASE_URL", "\"$baseUrl\"")
+            buildConfigField("String", "AMPLITUDE_API_KEY", "\"$amplitudeApikey\"")
             buildConfigField("boolean", "DEBUG", "false")
         }
     }

core/alarm/build.gradle.kts

@@ -10,6 +10,7 @@ android {
 }
 
 dependencies {
+    implementation(projects.core.analytics)
     implementation(projects.core.datastore)
     implementation(projects.core.designsystem)
     implementation(projects.core.media)

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

@@ -9,7 +9,19 @@ object AlarmConstants {
     const val EXTRA_NOTIFICATION_ID = "com.yapp.orbit.EXTRA_NOTIFICATION_ID"
 
     const val EXTRA_ALARM = "com.yapp.orbit.EXTRA_ALARM"
+    const val EXTRA_ALARM_DAY = "com.yapp.orbit.EXTRA_ALARM_DAY"
 
     const val EXTRA_IS_SNOOZED = "com.yapp.orbit.EXTRA_IS_SNOOZED"
     const val EXTRA_IS_DISMISS = "com.yapp.orbit.EXTRA_IS_DISMISS"
+
+    const val SNOOZE_ID_OFFSET = 10000
+
+    const val WEEK_INTERVAL_MILLIS: Long = 7 * 24 * 60 * 60 * 1000
+
+    val HOLIDAYS_2025 = setOf(
+        "2025-01-01", "2025-01-27", "2025-01-28", "2025-01-29", "2025-01-30",
+        "2025-03-01", "2025-03-03", "2025-05-05", "2025-05-06", "2025-06-06",
+        "2025-08-15", "2025-10-03", "2025-10-05", "2025-10-06", "2025-10-07",
+        "2025-10-08", "2025-10-09", "2025-12-25",
+    )
 }

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

@@ -2,17 +2,17 @@ package com.yapp.alarm
 
 import android.app.AlarmManager
 import android.app.Application
-import android.content.Intent
 import android.util.Log
 import com.yapp.alarm.pendingIntent.schedule.createAlarmReceiverPendingIntentForSchedule
 import com.yapp.alarm.pendingIntent.schedule.createAlarmReceiverPendingIntentForUnSchedule
-import com.yapp.alarm.services.AlarmService
 import com.yapp.domain.model.Alarm
 import com.yapp.domain.model.AlarmDay
 import com.yapp.domain.model.toAlarmDays
 import com.yapp.domain.model.toDayOfWeek
+import java.time.Instant
 import java.time.LocalDateTime
 import java.time.ZoneId
+import java.time.format.DateTimeFormatter
 import javax.inject.Inject
 
 class AlarmHelper @Inject constructor(
@@ -31,6 +31,21 @@ class AlarmHelper @Inject constructor(
         }
     }
 
+    fun scheduleWeeklyAlarm(alarm: Alarm, day: AlarmDay) {
+        val initialTriggerMillis = getNextAlarmTimeMillis(alarm, day) + AlarmConstants.WEEK_INTERVAL_MILLIS
+        val triggerMillis = findNextNonHolidayDate(initialTriggerMillis)
+
+        val pendingIntent = createAlarmReceiverPendingIntentForSchedule(app, alarm, day)
+
+        alarmManager.setExactAndAllowWhileIdle(
+            AlarmManager.RTC_WAKEUP,
+            triggerMillis,
+            pendingIntent,
+        )
+
+        Log.d("AlarmHelper", "Scheduled weekly alarm for $day at: $triggerMillis")
+    }
+
     fun unScheduleAlarm(alarm: Alarm) {
         val selectedDays = alarm.repeatDays.toAlarmDays()
 
@@ -53,16 +68,19 @@ class AlarmHelper @Inject constructor(
         }
     }
 
-    fun stopAlarm() {
-        app.stopService(Intent(app, AlarmService::class.java))
+    fun cancelSnoozedAlarm(alarmId: Long) {
+        val snoozedAlarmId = alarmId + AlarmConstants.SNOOZE_ID_OFFSET
+        val pendingIntent = createAlarmReceiverPendingIntentForUnSchedule(app, Alarm(id = snoozedAlarmId))
+        alarmManager.cancel(pendingIntent)
+        Log.d("AlarmHelper", "Canceled snoozed alarm with id: $snoozedAlarmId")
     }
 
     private fun setRepeatingAlarm(day: AlarmDay, alarm: Alarm) {
         val alarmReceiverPendingIntent =
             createAlarmReceiverPendingIntentForSchedule(app, alarm, day)
         val firstAlarmTriggerMillis = getNextAlarmTimeMillis(alarm, day)
 
-        Log.d("AlarmHelper", "Setting repeating alarm at: $firstAlarmTriggerMillis")
+        Log.d("AlarmHelper", "Setting repeating alarm id: ${alarm.id} at: $firstAlarmTriggerMillis")
 
         alarmManager.setExactAndAllowWhileIdle(
             AlarmManager.RTC_WAKEUP,
@@ -114,4 +132,25 @@ class AlarmHelper @Inject constructor(
 
         return epochMillis
     }
+
+    private fun findNextNonHolidayDate(initialMillis: Long): Long {
+        val dateFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd")
+
+        var adjustedMillis = initialMillis
+
+        while (true) {
+            val localDate = Instant.ofEpochMilli(adjustedMillis)
+                .atZone(ZoneId.systemDefault())
+                .toLocalDate()
+
+            val dateString = localDate.format(dateFormatter)
+
+            if (!AlarmConstants.HOLIDAYS_2025.contains(dateString)) {
+                return adjustedMillis // 공휴일이 아니라면 해당 날짜 반환
+            }
+
+            // 공휴일이라면 다음 1주 뒤로 이동
+            adjustedMillis += AlarmConstants.WEEK_INTERVAL_MILLIS
+        }
+    }
 }

core/alarm/src/main/java/com/yapp/alarm/pendingIntent/interaction/AlarmDismissPendingIntent.kt

@@ -5,6 +5,7 @@ import android.app.PendingIntent.FLAG_IMMUTABLE
 import android.app.PendingIntent.FLAG_UPDATE_CURRENT
 import android.content.Context
 import android.content.Intent
+import android.net.Uri
 import com.yapp.alarm.AlarmConstants
 import com.yapp.alarm.receivers.AlarmReceiver
 
@@ -30,3 +31,24 @@ fun createAlarmDismissIntent(
         putExtra(AlarmConstants.EXTRA_NOTIFICATION_ID, notificationId)
     }
 }
+
+fun createNavigateToMissionPendingIntent(
+    applicationContext: Context,
+    notificationId: Long,
+): PendingIntent {
+    val navigateToMissionIntent = createNavigateToMissionIntent(notificationId)
+    return PendingIntent.getActivity(
+        applicationContext,
+        notificationId.toInt(),
+        navigateToMissionIntent,
+        FLAG_UPDATE_CURRENT or FLAG_IMMUTABLE,
+    )
+}
+
+fun createNavigateToMissionIntent(
+    notificationId: Long,
+): Intent {
+    return Intent(Intent.ACTION_VIEW, Uri.parse("orbitapp://mission?notificationId=$notificationId")).apply {
+        addFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK)
+    }
+}

core/alarm/src/main/java/com/yapp/alarm/pendingIntent/schedule/ScheduleAlarmPendingIntent.kt

@@ -13,10 +13,7 @@ fun createAlarmReceiverPendingIntentForSchedule(
     alarm: Alarm,
     day: AlarmDay? = null,
 ): PendingIntent {
-    val alarmReceiverIntent = createAlarmReceiverIntent(
-        app,
-        alarm,
-    )
+    val alarmReceiverIntent = createAlarmReceiverIntent(app, alarm, day)
     return PendingIntent.getBroadcast(
         app,
         generateAlarmIntentId(alarm.id.toInt(), day),
@@ -28,15 +25,17 @@ fun createAlarmReceiverPendingIntentForSchedule(
 private fun createAlarmReceiverIntent(
     app: Application,
     alarm: Alarm,
+    day: AlarmDay? = null,
 ): Intent {
     return Intent(AlarmConstants.ACTION_ALARM_TRIGGERED).apply {
         setClass(app, AlarmReceiver::class.java)
         putExtra(AlarmConstants.EXTRA_ALARM, alarm)
+        day?.let { putExtra(AlarmConstants.EXTRA_ALARM_DAY, it.name) }
     }
 }
 
 fun generateAlarmIntentId(id: Int, day: AlarmDay?): Int {
     return day?.let {
-        (id * 10) + it.ordinal + 1
+        (id * 10) + ((day.ordinal + 6) % 7) + 1
     } ?: id
 }