CI/CD Pull Request 테스트

.github/workflows/android.yml

@@ -2,9 +2,9 @@ name: Android CI CD
 
 on:
   push:
-    branches: [ "main", "develop", "release" ]
+    branches: [ "main", "develop", "release", "feature/*" ]
   pull_request:
-    branches: [ "main", "develop", "release" ]
+    branches: [ "main", "develop", "release", "feature/*" ]
 
 jobs:
   build:
@@ -60,38 +60,51 @@ jobs:
       - name: Build clean
         run: ./gradlew clean
 
-      - name: Run Android lint
-        run: ./gradlew lint
+      #      - name: Run Android lint
+      #        run: ./gradlew lint
 
       - name: Build assemble debug apk
         run: ./gradlew assembleDebug --stacktrace
 
-      - name: Build assemble release aab
-        run: ./gradlew bundleRelease --stacktrace
+      #      - name: Build assemble release aab
+      #        run: ./gradlew bundleRelease --stacktrace
 
       - name: Upload Debug APK
-        if: github.event_name == 'push' && (github.ref == 'refs/heads/develop' || github.ref == 'refs/heads/release')
         uses: actions/upload-artifact@v4
         with:
           name: debug
           path: ./app/build/outputs/apk/debug/app-debug.apk
 
-      - name: Upload Release APK
-        if: github.event_name == 'push' && github.ref == 'refs/heads/main'
-        uses: actions/upload-artifact@v4
-        with:
-          name: release
-          path: ./app/build/outputs/bundle/release/app-release.aab
+      #      - name: Upload Release APK
+      #        if: github.event_name == 'push' && github.ref == 'refs/heads/main'
+      #        uses: actions/upload-artifact@v4
+      #        with:
+      #          name: release
+      #          path: ./app/build/outputs/bundle/release/app-release.aab
 
       - name: Upload apk to Firebase App Distribution
-        if: github.event_name == 'push' && (github.ref == 'refs/heads/develop' || github.ref == 'refs/heads/release')
+        if: github.event_name == 'pull_request' && (
+          github.ref == 'refs/heads/develop' ||
+          startsWith(github.ref, 'refs/heads/feature/')
+          )
         uses: wzieba/Firebase-Distribution-Github-Action@v1
         with:
           appId: ${{ secrets.FIREBASE_APP_ID }}
           serviceCredentialsFileContent: ${{ secrets.CREDENTIAL_FILE_CONTENT }}
           groups: testers
           file: app/build/outputs/apk/debug/app-debug.apk
 
+      - name: Notify Slack about new distribution
+        if: github.event_name == 'push'
+        run: |
+          curl -X POST -H 'Content-type: application/json' \
+          --data "{
+            \"text\": \"🔥 Firebase Distribution 업로드 완료! \n🔧 브랜치: ${GITHUB_REF##*/}\n🔗 커밋: ${GITHUB_SHA}\"
+          }" \
+          "$SLACK_WEBHOOK_URL_FIREBASE_DISTRIBUTION"
+        env:
+          SLACK_WEBHOOK_URL_FIREBASE_DISTRIBUTION: ${{ secrets.SLACK_WEBHOOK_URL_FIREBASE_DISTRIBUTION }}
+
       - name: Publish to Play Store
         if: github.event_name == 'push' && github.ref == 'refs/heads/main'
         uses: r0adkll/upload-google-play@v1

app/build.gradle.kts

@@ -78,9 +78,6 @@ dependencies {
     implementation(libs.timber)
     implementation(libs.billing)
 
-    debugImplementation(libs.bundles.flipper)
-    releaseImplementation(libs.flipper.noop)
-
     implementation(libs.hilt.android)
     kapt(libs.hilt.compiler)
 }

app/src/main/java/com/nextroom/nextroom/NextRoomApplication.kt

@@ -1,46 +1,20 @@
 package com.nextroom.nextroom
 
 import android.app.Application
-import com.facebook.flipper.android.AndroidFlipperClient
-import com.facebook.flipper.android.utils.FlipperUtils
-import com.facebook.flipper.plugins.inspector.DescriptorMapping
-import com.facebook.flipper.plugins.inspector.InspectorFlipperPlugin
-import com.facebook.flipper.plugins.network.NetworkFlipperPlugin
-import com.facebook.flipper.plugins.sharedpreferences.SharedPreferencesFlipperPlugin
-import com.facebook.soloader.SoLoader
 import dagger.hilt.android.HiltAndroidApp
 import timber.log.Timber
 import javax.inject.Inject
 
 @HiltAndroidApp
 class NextRoomApplication : Application() {
     @Inject
-    lateinit var flipperNetworkPlugin: NetworkFlipperPlugin
+    lateinit var flavorExtraFunction: FlavorExtraFunction
 
     override fun onCreate() {
         super.onCreate()
         if (BuildConfig.DEBUG) {
             Timber.plant(Timber.DebugTree())
-        }
-
-        setDebugTool()
-    }
-
-    private fun setDebugTool() {
-        SoLoader.init(this, false)
-
-        if (BuildConfig.DEBUG && FlipperUtils.shouldEnableFlipper(this)) {
-            val client = AndroidFlipperClient.getInstance(this)
-            client.addPlugin(InspectorFlipperPlugin(this, DescriptorMapping.withDefaults()))
-            client.addPlugin(
-                InspectorFlipperPlugin(
-                    applicationContext,
-                    DescriptorMapping.withDefaults(),
-                ),
-            )
-            client.addPlugin(SharedPreferencesFlipperPlugin(this, "app-settings.json"))
-            client.addPlugin(flipperNetworkPlugin)
-            client.start()
+            flavorExtraFunction.initializeFlipper()
         }
     }
 }

data/build.gradle.kts

@@ -46,6 +46,12 @@ android {
     buildFeatures {
         buildConfig = true
     }
+    sourceSets.getByName("debug") {
+        java.setSrcDirs(listOf("src/debug/java"))
+    }
+    sourceSets.getByName("release") {
+        java.setSrcDirs(listOf("src/release/java"))
+    }
 }
 
 dependencies {

data/src/debug/java/com/nextroom/nextroom/FlavorExtraFunction.kt

@@ -0,0 +1,45 @@
+package com.nextroom.nextroom
+
+import android.content.Context
+import com.facebook.flipper.android.AndroidFlipperClient
+import com.facebook.flipper.android.utils.FlipperUtils
+import com.facebook.flipper.plugins.inspector.DescriptorMapping
+import com.facebook.flipper.plugins.inspector.InspectorFlipperPlugin
+import com.facebook.flipper.plugins.network.FlipperOkhttpInterceptor
+import com.facebook.flipper.plugins.network.NetworkFlipperPlugin
+import com.facebook.flipper.plugins.sharedpreferences.SharedPreferencesFlipperPlugin
+import com.facebook.soloader.SoLoader
+import com.nextroom.nextroom.data.BuildConfig
+import okhttp3.Interceptor
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class FlavorExtraFunction @Inject constructor(
+    private val context: Context,
+) {
+    private lateinit var flipperNetworkPlugin: NetworkFlipperPlugin
+
+    fun initializeFlipper() {
+        SoLoader.init(context, false)
+
+        if (BuildConfig.DEBUG && FlipperUtils.shouldEnableFlipper(context)) {
+            flipperNetworkPlugin = NetworkFlipperPlugin()
+            val client = AndroidFlipperClient.getInstance(context)
+            client.addPlugin(InspectorFlipperPlugin(context, DescriptorMapping.withDefaults()))
+            client.addPlugin(
+                InspectorFlipperPlugin(
+                    context,
+                    DescriptorMapping.withDefaults(),
+                ),
+            )
+            client.addPlugin(SharedPreferencesFlipperPlugin(context, "app-settings.json"))
+            client.addPlugin(flipperNetworkPlugin)
+            client.start()
+        }
+    }
+
+    fun getFlipperInterceptor(): Interceptor {
+        return FlipperOkhttpInterceptor(flipperNetworkPlugin, true)
+    }
+}

data/src/main/java/com/nextroom/nextroom/data/di/NetworkModule.kt

@@ -1,7 +1,7 @@
 package com.nextroom.nextroom.data.di
 
-import com.facebook.flipper.plugins.network.FlipperOkhttpInterceptor
-import com.facebook.flipper.plugins.network.NetworkFlipperPlugin
+import android.content.Context
+import com.nextroom.nextroom.FlavorExtraFunction
 import com.nextroom.nextroom.data.BuildConfig
 import com.nextroom.nextroom.data.datasource.AuthDataSource
 import com.nextroom.nextroom.data.datasource.TokenDataSource
@@ -12,7 +12,9 @@ import com.nextroom.nextroom.data.network.ResultCallAdapterFactory
 import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn
+import dagger.hilt.android.qualifiers.ApplicationContext
 import dagger.hilt.components.SingletonComponent
+import okhttp3.Interceptor
 import okhttp3.OkHttpClient
 import okhttp3.logging.HttpLoggingInterceptor
 import retrofit2.Retrofit
@@ -76,7 +78,7 @@ object NetworkModule {
     fun provideAuthOkHttpClient(
         authInterceptor: AuthInterceptor,
         authAuthenticator: AuthAuthenticator,
-        flipperPlugin: NetworkFlipperPlugin,
+        flipperInterceptor: Interceptor?,
     ): OkHttpClient {
         val loggingInterceptor = HttpLoggingInterceptor().apply {
             level = if (BuildConfig.DEBUG) {
@@ -91,15 +93,19 @@ object NetworkModule {
             .authenticator(authAuthenticator)
             .addInterceptor(authInterceptor)
             .addInterceptor(loggingInterceptor)
-            .addInterceptor(FlipperOkhttpInterceptor(flipperPlugin, true))
+            .apply {
+                flipperInterceptor?.let {
+                    addInterceptor(it)
+                }
+            }
             .build()
     }
 
     @Singleton
     @Provides
     @Named("defaultOkHttpClient")
     fun provideDefaultOkHttpClient(
-        flipperPlugin: NetworkFlipperPlugin,
+        flipperInterceptor: Interceptor?,
     ): OkHttpClient {
         val loggingInterceptor = HttpLoggingInterceptor().apply {
             level = if (BuildConfig.DEBUG) {
@@ -112,7 +118,11 @@ object NetworkModule {
             .connectTimeout(10, TimeUnit.SECONDS)
             .readTimeout(10, TimeUnit.SECONDS)
             .addInterceptor(loggingInterceptor)
-            .addNetworkInterceptor(FlipperOkhttpInterceptor(flipperPlugin))
+            .apply {
+                flipperInterceptor?.let {
+                    addInterceptor(it)
+                }
+            }
             .build()
     }
 
@@ -134,7 +144,17 @@ object NetworkModule {
 
     @Singleton
     @Provides
-    fun provideNetworkFlipperPlugin(): NetworkFlipperPlugin {
-        return NetworkFlipperPlugin()
+    fun provideFlipperInterceptor(
+        flavorExtraFunction: FlavorExtraFunction,
+    ): Interceptor? {
+        return flavorExtraFunction.getFlipperInterceptor()
+    }
+
+    @Singleton
+    @Provides
+    fun provideFlavorExtraFunction(
+        @ApplicationContext context: Context,
+    ): FlavorExtraFunction {
+        return FlavorExtraFunction(context)
     }
 }

data/src/release/java/com/nextroom/nextroom/FlavorExtraFunction.kt

@@ -0,0 +1,17 @@
+package com.nextroom.nextroom
+
+import android.content.Context
+import okhttp3.Interceptor
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class FlavorExtraFunction @Inject constructor(
+    private val context: Context,
+) {
+    fun initializeFlipper() {
+        // do nothing
+    }
+
+    fun getFlipperInterceptor(): Interceptor? = null
+}

gradle/libs.versions.toml

@@ -3,8 +3,8 @@ minSdk = "24"
 review = "2.0.1"
 reviewKtx = "2.0.1"
 targetSdk = "34"
-versionCode = "61"
-versionName = "1.4.6"
+versionCode = "65"
+versionName = "1.4.7"
 compileSdk = "34"
 targetJvm = "17"
 kotlin = "1.9.10"

presentation/src/main/java/com/nextroom/nextroom/presentation/ui/SubscriptionPromotionBottomSheet.kt

@@ -17,10 +17,12 @@ import com.google.android.material.bottomsheet.BottomSheetDialog
 import com.google.android.material.bottomsheet.BottomSheetDialogFragment
 import com.nextroom.nextroom.presentation.NavGraphDirections
 import com.nextroom.nextroom.presentation.R
+import com.nextroom.nextroom.presentation.common.NROneButtonDialog
 import com.nextroom.nextroom.presentation.databinding.BottomSheetSubscriptionPromotionBinding
 import com.nextroom.nextroom.presentation.databinding.ItemBenefitBinding
 import com.nextroom.nextroom.presentation.extension.dpToPx
 import com.nextroom.nextroom.presentation.extension.repeatOnStarted
+import com.nextroom.nextroom.presentation.extension.safeNavigate
 import com.nextroom.nextroom.presentation.extension.snackbar
 import com.nextroom.nextroom.presentation.extension.toast
 import com.nextroom.nextroom.presentation.ui.billing.BillingEvent
@@ -95,11 +97,14 @@ class SubscriptionPromotionBottomSheet : BottomSheetDialogFragment() {
         binding.acbSubscribe.setOnClickListener {
             viewModel.container.stateFlow.value.plan.plans.firstOrNull()?.let {
                 binding.pbLoading.isVisible = true
-                billingViewModel.buyPlans(
-                    productId = it.subscriptionProductId,
-                    tag = "",
-                    upDowngrade = false,
-                )
+                try {
+                    billingViewModel.buyPlans(
+                        productId = it.subscriptionProductId,
+                        upDowngrade = false,
+                    )
+                } catch (e: Exception) {
+                    showErrorDialog(e.message ?: "")
+                }
             }
         }
         binding.ivClose.setOnClickListener {
@@ -167,6 +172,18 @@ class SubscriptionPromotionBottomSheet : BottomSheetDialogFragment() {
         }
     }
 
+    private fun showErrorDialog(errorText: String) {
+        NavGraphDirections
+            .moveToNrOneButtonDialog(
+                NROneButtonDialog.NROneButtonArgument(
+                    title = getString(R.string.dialog_noti),
+                    message = getString(R.string.error_something),
+                    btnText = getString(R.string.text_confirm),
+                    errorText = errorText
+                )
+            ).also { findNavController().safeNavigate(it) }
+    }
+
     data class Benefit(
         val title: String,
         val desc: String,

presentation/src/main/java/com/nextroom/nextroom/presentation/ui/billing/BillingEvent.kt

@@ -2,5 +2,5 @@ package com.nextroom.nextroom.presentation.ui.billing
 
 sealed interface BillingEvent {
     data object PurchaseAcknowledged : BillingEvent
-    data class PurchaseFailed(val purchaseState: Int) : BillingEvent
+    data class PurchaseFailed(val errorMessage: String = "", val purchaseState: Int? = null) : BillingEvent
 }