Merge pull request #223 from YAPP-Github/refactor/#222-module-dependency-cleanup

[REFACTOR] 모듈간의 의존성을 깔끔하게 정리해보자

Author: DongChyeon

app/build.gradle.kts

@@ -29,21 +29,24 @@ android {
 
 dependencies {
     implementation(projects.core.common)
+    implementation(projects.core.analytics)
     implementation(projects.core.buildconfig)
     implementation(projects.core.network)
     implementation(projects.core.designsystem)
     implementation(projects.core.datastore)
     implementation(projects.core.alarm)
     implementation(projects.core.media)
+    implementation(projects.core.ui)
     implementation(projects.data)
     implementation(projects.domain)
+    implementation(projects.feature.splash)
     implementation(projects.feature.onboarding)
     implementation(projects.feature.home)
     implementation(projects.feature.alarmInteraction)
     implementation(projects.feature.fortune)
     implementation(projects.feature.mission)
     implementation(projects.feature.setting)
-    implementation(projects.feature.navigator)
+    implementation(projects.feature.webview)
     implementation(libs.firebase.analytics)
     implementation(libs.firebase.crashlytics)
     implementation(libs.play.services.ads)

app/src/main/AndroidManifest.xml

@@ -30,7 +30,7 @@
             android:value="@string/admob_app_id" />
 
         <activity
-            android:name="com.yapp.navigator.MainActivity"
+            android:name="com.yapp.orbit.MainActivity"
             android:windowSoftInputMode="adjustResize"
             android:exported="true"
             android:label="@string/app_name"

…/java/com/yapp/navigator/MainActivity.kt …main/java/com/yapp/orbit/MainActivity.ktfeature/navigator/src/main/java/com/yapp/navigator/MainActivity.kt renamed to app/src/main/java/com/yapp/orbit/MainActivity.kt feature/navigator/src/main/java/com/yapp/navigator/MainActivity.kt renamed to app/src/main/java/com/yapp/orbit/MainActivity.kt

@@ -1,4 +1,4 @@
-package com.yapp.navigator
+package com.yapp.orbit
 
 import android.annotation.SuppressLint
 import android.content.pm.ActivityInfo

…/java/com/yapp/navigator/OrbitNavHost.kt …main/java/com/yapp/orbit/OrbitNavHost.ktfeature/navigator/src/main/java/com/yapp/navigator/OrbitNavHost.kt renamed to app/src/main/java/com/yapp/orbit/OrbitNavHost.kt feature/navigator/src/main/java/com/yapp/navigator/OrbitNavHost.kt renamed to app/src/main/java/com/yapp/orbit/OrbitNavHost.kt

@@ -1,4 +1,4 @@
-package com.yapp.navigator
+package com.yapp.orbit
 
 import android.annotation.SuppressLint
 import androidx.compose.animation.AnimatedVisibility

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

@@ -16,6 +16,8 @@ internal fun Project.configureComposeAndroid() {
             val bom = libs.findLibrary("compose.bom").get()
             add("implementation", platform(bom))
 
+            add("implementation", libs.findLibrary("activity.compose").get())
+
             add("implementation", libs.findLibrary("compose.material3").get())
             add("implementation", libs.findLibrary("compose.ui").get())
             add("implementation", libs.findLibrary("compose.ui.tooling.preview").get())

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

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

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

@@ -19,7 +19,6 @@ dependencies {
     implementation(project(":core:ui"))
 
     val libs = project.extensions.libs
-    implementation(libs.findLibrary("hilt-navigation-compose").get())
     implementation(libs.findLibrary("compose-navigation").get())
     implementation(libs.findLibrary("lifecycle-viewmodel").get())
     implementation(libs.findLibrary("lifecycle-runtime").get())

core/alarm/build.gradle.kts

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

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

@@ -9,17 +9,18 @@ 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 com.yapp.domain.scheduler.AlarmScheduler
 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(
+class AndroidAlarmScheduler @Inject constructor(
     private val app: Application,
     private val alarmManager: AlarmManager,
-) {
-    fun scheduleAlarm(alarm: Alarm) {
+) : AlarmScheduler {
+    override fun scheduleAlarm(alarm: Alarm) {
         val selectedDays = alarm.repeatDays.toAlarmDays()
 
         if (selectedDays.isEmpty()) {
@@ -46,7 +47,7 @@ class AlarmHelper @Inject constructor(
         Log.d("AlarmHelper", "Scheduled weekly alarm for $day at: $triggerMillis")
     }
 
-    fun unScheduleAlarm(alarm: Alarm) {
+    override fun unScheduleAlarm(alarm: Alarm) {
         val selectedDays = alarm.repeatDays.toAlarmDays()
 
         if (selectedDays.isEmpty()) {