1.3.0 버전 푸시

.github/workflows/android.yml

@@ -46,12 +46,11 @@ jobs:
       - name: Grant execute permission for gradlew
         run: chmod +x gradlew
 
+      - name: Clear Gradle Cache
+        run: ./gradlew clean
+
       - name: Build for debug with Gradle
         run: ./gradlew assembleDebug
 
-      - name: Upload APK
-        if: github.ref == 'refs/heads/master'
-        uses: actions/upload-artifact@v4
-        with:
-          name: app
-          path: app/build/outputs/apk/release
+#      - name: unit test
+#        run: ./gradlew test

.gitignore

@@ -15,3 +15,6 @@
 local.properties
 deploymentTargetDropDown.xml
 /config.json
+/.idea/other.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,12 +21,13 @@ android {
         applicationId = "com.hmoa.app"
         minSdk = 26
         targetSdk = 34
-        versionCode = 23
-        versionName = "1.1.2"
+        versionCode = 36
+        versionName = "1.3.0"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         manifestPlaceholders["REDIRECTION_PATH"] = localProperties["REDIRECTION_PATH"] as String
         buildConfigField("String", "NATIVE_APP_KEY", localProperties["NATIVE_APP_KEY"] as String)
+        buildConfigField("String", "BOOTPAY_APPLICATION_ID", localProperties["BOOTPAY_APPLICATION_ID"] as String)
     }
 
     signingConfigs {
@@ -50,10 +50,6 @@ android {
             signingConfig = signingConfigs.getByName("release")
             isDebuggable = false
         }
-        debug {
-            signingConfig = signingConfigs.getByName("debug")
-            isDebuggable = true
-        }
     }
     compileOptions {
         sourceCompatibility = JavaVersion.VERSION_1_8
@@ -66,82 +62,50 @@ android {
         compose = true
     }
     composeOptions {
-        kotlinCompilerExtensionVersion = "1.5.0"
+        kotlinCompilerExtensionVersion = "1.5.7"
     }
     packaging {
         resources {
             excludes += "META-INF/gradle/incremental.annotation.processors"
         }
     }
-
-    applicationVariants.all {
-        this.mergeResourcesProvider.configure {
-            doLast {
-                copy {
-                    from(":HMOA_ANDROID_SECRET")
-                }
-            }
-        }
-    }
-
 }
 
 
 
 dependencies {
-    val hilt_version = "2.48.1"
-    val hilt_viewmodel_version = "1.0.0-alpha03"
-    val hilt_nav_compose_version = "1.0.0"
-
     implementation(project(":feature-home"))
     implementation(project(":feature-authentication"))
     implementation(project(":feature-userInfo"))
     implementation(project(":feature-community"))
     implementation(project(":feature-perfume"))
     implementation(project(":feature-brand"))
     implementation(project(":feature-hpedia"))
-    implementation(project(":feature-like"))
     implementation(project(":feature-fcm"))
     implementation(project(":feature-magazine"))
+    implementation(project(":feature-hbti"))
     implementation(project(":core-designsystem"))
     implementation(project(":core-model"))
     implementation(project(":core-domain"))
     implementation(project(":core-repository"))
     implementation(project(":core-common"))
 
-    implementation("com.kakao.sdk:v2-all:2.19.0")// 전체 모듈 설치, 2.11.0 버전부터 지원
-    implementation("com.kakao.sdk:v2-user:2.19.0") // 카카오 로그인 API 모듈
-    implementation("com.kakao.sdk:v2-talk:2.19.0") // 카카오톡 채널, 카카오톡 소셜, 카카오톡 메시지 API 모듈
-    implementation("com.kakao.sdk:v2-share:2.19.0") // 카카오톡 공유 API 모듈
-    implementation("com.kakao.sdk:v2-friend:2.19.0") // 피커 API 모듈
-    implementation("com.kakao.sdk:v2-cert:2.19.0") // 카카오 인증서비스 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)
+}