1.3.0 (먼저 approved 해주셔야 될 거 같아요)

.gitignore

@@ -16,4 +16,5 @@ local.properties
 deploymentTargetDropDown.xml
 /config.json
 /.idea/other.xml
-/.idea/deploymentTargetSelector.xml
+/.idea/deploymentTargetSelector.xml
+.kotlin/

README.md

@@ -43,8 +43,8 @@
 ## 멀티 모듈의 관심사 분리 및 아키텍처 적용
 <img width="591" alt="image" src="https://github.com/user-attachments/assets/96590045-3cf8-4c52-b9fd-ea5e3c5d4195">
 
-## MVVM 적용
-<img width="380" alt="image" src="https://github.com/user-attachments/assets/979d10ac-d57a-4654-9668-476284c9ef2b">
+## UI Layer 패턴 - MVVM+MVI 혼합
+<img width="600" alt="image" src="https://github.com/user-attachments/assets/9fe84cf7-92d1-4e14-b23c-0e0ad0451c20">
 
 ### 데이터 전달 및 상태관리 구체화 구조
 <img width="420" alt="image" src="https://github.com/user-attachments/assets/c1fcf841-7baa-4bea-8bf2-63dcaeb66455">

app/build.gradle.kts

@@ -1,12 +1,11 @@
 import java.util.*
 
 plugins {
-    id("com.android.application")
+    alias(libs.plugins.android.application)
     id("com.google.android.gms.oss-licenses-plugin")
-    id("org.jetbrains.kotlin.android")
-    id("dagger.hilt.android.plugin")
-    id("com.google.dagger.hilt.android")
-    id("com.google.gms.google-services")
+    alias(libs.plugins.kotlin.android)
+    alias(libs.plugins.hilt.android)
+    alias(libs.plugins.google.services)
     kotlin("kapt")
 }
 
@@ -22,8 +21,8 @@ android {
         applicationId = "com.hmoa.app"
         minSdk = 26
         targetSdk = 34
-        versionCode = 33
-        versionName = "1.2.0"
+        versionCode = 36
+        versionName = "1.3.0"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         manifestPlaceholders["REDIRECTION_PATH"] = localProperties["REDIRECTION_PATH"] as String
@@ -63,7 +62,7 @@ android {
         compose = true
     }
     composeOptions {
-        kotlinCompilerExtensionVersion = "1.5.0"
+        kotlinCompilerExtensionVersion = "1.5.7"
     }
     packaging {
         resources {
@@ -75,11 +74,6 @@ android {
 
 
 dependencies {
-    val hilt_version = "2.48.1"
-    val hilt_viewmodel_version = "1.0.0-alpha03"
-    val hilt_nav_compose_version = "1.0.0"
-    val kakao_version = "2.20.5"
-
     implementation(project(":feature-home"))
     implementation(project(":feature-authentication"))
     implementation(project(":feature-userInfo"))
@@ -96,41 +90,22 @@ dependencies {
     implementation(project(":core-repository"))
     implementation(project(":core-common"))
 
-    implementation("io.github.bootpay:android:4.4.0") //boot pay
-
-    implementation("com.kakao.sdk:v2-all:${kakao_version}")// 전체 모듈 설치, 2.11.0 버전부터 지원
-    implementation("com.kakao.sdk:v2-user:${kakao_version}") // 카카오 로그인 API 모듈
-    implementation("com.kakao.sdk:v2-talk:${kakao_version}") // 카카오톡 채널, 카카오톡 소셜, 카카오톡 메시지 API 모듈
-    implementation("com.kakao.sdk:v2-share:${kakao_version}") // 카카오톡 공유 API 모듈
-    implementation("com.kakao.sdk:v2-friend:${kakao_version}") // 피커 API 모듈
-    implementation("com.kakao.sdk:v2-cert:${kakao_version}") // 카카오 인증서비스 API 모듈
-    implementation("com.google.dagger:hilt-android:$hilt_version")
-    implementation("com.google.dagger:hilt-compiler:$hilt_version")
-    kapt("com.google.dagger:hilt-android-compiler:$hilt_version")
-    testAnnotationProcessor("com.google.dagger:hilt-compiler:$hilt_version")
-    implementation("androidx.hilt:hilt-navigation-compose:$hilt_nav_compose_version")
-    kapt("androidx.hilt:hilt-compiler:$hilt_viewmodel_version")
-    implementation("androidx.compose.material:material:1.2.0-beta02")
-    implementation("androidx.compose.material3:material3:1.2.0")
-    implementation("androidx.compose.ui:ui-tooling-preview")
-    implementation("androidx.compose.ui:ui:1.1.0")
-    implementation("androidx.navigation:navigation-compose:2.7.0")
-    implementation("androidx.core:core-ktx:1.9.0")
-    implementation("androidx.appcompat:appcompat:1.6.1")
-    implementation("com.google.android.material:material:1.8.0")
-    implementation("androidx.core:core-splashscreen:1.2.0-alpha01")
-    // Import the Firebase BoM
-    implementation(platform("com.google.firebase:firebase-bom:32.8.1"))
-    // When using the BoM, don't specify versions in Firebase dependencies
-    implementation("com.google.firebase:firebase-messaging:21.1.0")
-    implementation("com.google.firebase:firebase-analytics")
-    //google login
-    implementation("com.google.android.gms:play-services-auth:21.0.0")
-    implementation("com.google.gms:google-services:4.4.1")
-    //open licence
-    implementation("com.google.android.gms:play-services-oss-licenses:17.0.0")
-
-    testImplementation("junit:junit:4.13.2")
-    androidTestImplementation("androidx.test.ext:junit:1.1.5")
-    androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1")
+    implementation(libs.app.update.ktx)
+    implementation(libs.bootpay) //부트페이
+    implementation(libs.bundles.kakao.login) // kakao
+    implementation(libs.bundles.hilt) // hilt
+    kapt(libs.hilt.android.compiler)
+    testAnnotationProcessor(libs.hilt.compiler)
+    kapt(libs.hilt.viewmodel)
+    implementation(libs.bundles.ui)
+    implementation(libs.navigation.compose)
+    implementation(libs.bundles.basic)
+    implementation(libs.google.material)
+    implementation(libs.splash.screen) // splash
+    implementation(libs.bundles.firebase) // firebase
+    implementation(libs.bundles.google.login) //google
+    implementation(libs.open.licenses)
+    testImplementation(libs.junit)
+    androidTestImplementation(libs.junit.ext)
+    androidTestImplementation(libs.espresso)
 }

app/src/main/AndroidManifest.xml

@@ -30,7 +30,7 @@
             android:usesCleartextTraffic="true"
             tools:targetApi="31">
         <activity
-                android:name=".MainActivity"
+                android:name=".view.MainActivity"
                 android:exported="true"
                 android:theme="@style/SplashTheme"
                 android:launchMode="singleTask">
@@ -64,12 +64,12 @@
             </intent-filter>
         </activity> <!-- 서비스를 추가하고 인텐트 필터를 설정한다. -->
         <service
-                android:name=".FcmAppService"
+                android:name=".service.FcmAppService"
                 android:exported="false">
             <intent-filter>
                 <action android:name="com.google.firebase.MESSAGING_EVENT"/>
             </intent-filter>
         </service>
     </application>
 
-</manifest>
+</manifest>

app/src/main/java/com/hmoa/app/navigation/NavHost.kt

@@ -3,23 +3,92 @@ package com.hmoa.app.navigation
 import androidx.compose.runtime.Composable
 import androidx.navigation.NavHostController
 import androidx.navigation.compose.NavHost
-import com.hmoa.feature_authentication.navigation.*
+import com.hmoa.feature_authentication.navigation.loginScreen
+import com.hmoa.feature_authentication.navigation.navigateToLogin
+import com.hmoa.feature_authentication.navigation.navigateToPickNickname
+import com.hmoa.feature_authentication.navigation.navigateToPickPersonalInfo
+import com.hmoa.feature_authentication.navigation.navigateToSignup
+import com.hmoa.feature_authentication.navigation.pickNicknameScreen
+import com.hmoa.feature_authentication.navigation.pickPersonalInfoScreen
+import com.hmoa.feature_authentication.navigation.signupScreen
 import com.hmoa.feature_brand.navigation.brandScreen
 import com.hmoa.feature_brand.navigation.brandSearchScreen
 import com.hmoa.feature_brand.navigation.navigateToBrand
-import com.hmoa.feature_community.Navigation.*
+import com.hmoa.feature_community.Navigation.navigateToCommunityCommentEditRoute
+import com.hmoa.feature_community.Navigation.navigateToCommunityDescriptionRoute
+import com.hmoa.feature_community.Navigation.navigateToCommunityEditRoute
+import com.hmoa.feature_community.Navigation.navigateToCommunityPage
+import com.hmoa.feature_community.Navigation.navigateToCommunityPostRoute
+import com.hmoa.feature_community.Navigation.navigateToCommunityRoute
+import com.hmoa.feature_community.Navigation.navigateToCommunitySearchRoute
+import com.hmoa.feature_community.Navigation.nestedCommunityGraph
 import com.hmoa.feature_fcm.alarmRoute
-import com.hmoa.feature_hbti.navigation.*
-import com.hmoa.feature_home.navigation.*
+import com.hmoa.feature_hbti.navigation.addAddress
+import com.hmoa.feature_hbti.navigation.editReview
+import com.hmoa.feature_hbti.navigation.hbtiProcessScreen
+import com.hmoa.feature_hbti.navigation.hbtiScreen
+import com.hmoa.feature_hbti.navigation.hbtiSurveyLoadingScreen
+import com.hmoa.feature_hbti.navigation.hbtiSurveyResultScreen
+import com.hmoa.feature_hbti.navigation.hbtiSurveyScreen
+import com.hmoa.feature_hbti.navigation.navigateToAddAddress
+import com.hmoa.feature_hbti.navigation.navigateToEditReview
+import com.hmoa.feature_hbti.navigation.navigateToHbti
+import com.hmoa.feature_hbti.navigation.navigateToHbtiProcess
+import com.hmoa.feature_hbti.navigation.navigateToHbtiSurvey
+import com.hmoa.feature_hbti.navigation.navigateToHbtiSurveyLoading
+import com.hmoa.feature_hbti.navigation.navigateToHbtiSurveyResult
+import com.hmoa.feature_hbti.navigation.navigateToNotePick
+import com.hmoa.feature_hbti.navigation.navigateToNotePickResult
+import com.hmoa.feature_hbti.navigation.navigateToOrder
+import com.hmoa.feature_hbti.navigation.navigateToOrderResult
+import com.hmoa.feature_hbti.navigation.navigateToPerfumeRecommendation
+import com.hmoa.feature_hbti.navigation.navigateToPerfumeRecommendationResult
+import com.hmoa.feature_hbti.navigation.navigateToReview
+import com.hmoa.feature_hbti.navigation.navigateToWriteReview
+import com.hmoa.feature_hbti.navigation.notePickResult
+import com.hmoa.feature_hbti.navigation.notePickScreen
+import com.hmoa.feature_hbti.navigation.order
+import com.hmoa.feature_hbti.navigation.orderResult
+import com.hmoa.feature_hbti.navigation.perfumeRecommendationResultRoute
+import com.hmoa.feature_hbti.navigation.perfumeRecommendationRoute
+import com.hmoa.feature_hbti.navigation.review
+import com.hmoa.feature_hbti.navigation.writeReview
+import com.hmoa.feature_home.navigation.allPerfumeScreen
+import com.hmoa.feature_home.navigation.homeScreen
+import com.hmoa.feature_home.navigation.navigateToAllPerfume
+import com.hmoa.feature_home.navigation.navigateToHome
+import com.hmoa.feature_home.navigation.perfumeSearchScreen
 import com.hmoa.feature_hpedia.Navigation.navigateToHPedia
 import com.hmoa.feature_hpedia.Navigation.navigateToHPediaDescRoute
 import com.hmoa.feature_hpedia.Navigation.navigateToHPediaSearchRoute
 import com.hmoa.feature_hpedia.Navigation.nestedHPediaGraph
 import com.hmoa.feature_magazine.Navigation.magazineDesc
 import com.hmoa.feature_magazine.Navigation.magazineMain
 import com.hmoa.feature_magazine.Navigation.navigateToMagazineDesc
-import com.hmoa.feature_perfume.navigation.*
-import com.hmoa.feature_userinfo.navigation.*
+import com.hmoa.feature_perfume.navigation.createNewPerfumeComment
+import com.hmoa.feature_perfume.navigation.editMyPerfumeComment
+import com.hmoa.feature_perfume.navigation.navigateToCreateNewperfumeComment
+import com.hmoa.feature_perfume.navigation.navigateToPerfume
+import com.hmoa.feature_perfume.navigation.navigateToPerfumeComment
+import com.hmoa.feature_perfume.navigation.navigateToSpecificPerfumeComment
+import com.hmoa.feature_perfume.navigation.perfumeComment
+import com.hmoa.feature_perfume.navigation.perfumeScreen
+import com.hmoa.feature_perfume.navigation.specificComment
+import com.hmoa.feature_userinfo.navigation.navigateToBack
+import com.hmoa.feature_userinfo.navigation.navigateToEditProfilePage
+import com.hmoa.feature_userinfo.navigation.navigateToMyActivity
+import com.hmoa.feature_userinfo.navigation.navigateToMyBirth
+import com.hmoa.feature_userinfo.navigation.navigateToMyCommentPage
+import com.hmoa.feature_userinfo.navigation.navigateToMyFavoriteCommentPage
+import com.hmoa.feature_userinfo.navigation.navigateToMyFavoritePerfume
+import com.hmoa.feature_userinfo.navigation.navigateToMyGenderPage
+import com.hmoa.feature_userinfo.navigation.navigateToMyInfoPage
+import com.hmoa.feature_userinfo.navigation.navigateToMyPostPage
+import com.hmoa.feature_userinfo.navigation.navigateToMyReview
+import com.hmoa.feature_userinfo.navigation.navigateToOrderRecord
+import com.hmoa.feature_userinfo.navigation.navigateToRefund
+import com.hmoa.feature_userinfo.navigation.navigateToRefundRecord
+import com.hmoa.feature_userinfo.navigation.nestedUserInfoGraph
 
 @Composable
 fun SetUpNavGraph(
@@ -110,9 +179,7 @@ fun SetUpNavGraph(
             navCommunityCommentEdit = navController::navigateToCommunityCommentEditRoute,
             onErrorHandleLoginAgain = navController::navigateToLogin,
             navLogin = navController::navigateToLogin,
-            navHome = navController::navigateToHome,
-            navHPedia = navController::navigateToHPedia,
-            popStack = { navController.popBackStack() }
+            navHPedia = navController::navigateToHPedia
         )
 
         /** perfume 모듈 */

app/src/main/java/com/hmoa/app/FcmAppService.kt → app/src/main/java/com/hmoa/app/service/FcmAppService.kt

@@ -1,4 +1,4 @@
-package com.hmoa.app
+package com.hmoa.app.service
 
 import android.app.Notification
 import android.app.NotificationChannel
@@ -8,28 +8,36 @@ import android.content.Context
 import android.content.Intent
 import com.google.firebase.messaging.FirebaseMessagingService
 import com.google.firebase.messaging.RemoteMessage
+import com.hmoa.app.view.MainActivity
 
 class FcmAppService : FirebaseMessagingService() {
     override fun onNewToken(token: String) {
         super.onNewToken(token)
     }
+
     override fun onMessageReceived(remoteMessage: RemoteMessage) {
         super.onMessageReceived(remoteMessage)
 
-        if(remoteMessage.data.isNotEmpty()){
+        if (remoteMessage.data.isNotEmpty()) {
             sendNotification(remoteMessage.data)
         }
     }
-    private fun sendNotification(fcmData : Map<String, String>){
+
+    private fun sendNotification(fcmData: Map<String, String>) {
         val CHANNEL_DEFAULT_IMPORTANCE = "channelId"
         val ONGOING_NOTIFICATION = 1
 
-        val notificationIntent = Intent(this, MainActivity::class.java).apply{
+        val notificationIntent = Intent(this, MainActivity::class.java).apply {
             addFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK)
-            putExtra("deeplink",fcmData["deeplink"])
-            putExtra("id",fcmData["id"])
+            putExtra("deeplink", fcmData["deeplink"])
+            putExtra("id", fcmData["id"])
         }
-        val pendingIntent = PendingIntent.getActivity(this, 0, notificationIntent, PendingIntent.FLAG_IMMUTABLE or PendingIntent.FLAG_UPDATE_CURRENT)
+        val pendingIntent = PendingIntent.getActivity(
+            this,
+            0,
+            notificationIntent,
+            PendingIntent.FLAG_IMMUTABLE or PendingIntent.FLAG_UPDATE_CURRENT
+        )
 
         val notification = Notification.Builder(this, CHANNEL_DEFAULT_IMPORTANCE)
             .setContentTitle(fcmData["title"])
@@ -41,9 +49,10 @@ class FcmAppService : FirebaseMessagingService() {
 
         val notificationManager = getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
 
-        val channel = NotificationChannel(CHANNEL_DEFAULT_IMPORTANCE, "HMOA Channel", NotificationManager.IMPORTANCE_DEFAULT)
+        val channel =
+            NotificationChannel(CHANNEL_DEFAULT_IMPORTANCE, "HMOA Channel", NotificationManager.IMPORTANCE_DEFAULT)
         notificationManager.createNotificationChannel(channel)
 
         notificationManager.notify(ONGOING_NOTIFICATION, notification)
     }
-}
+}