[Feat] 온보딩 노출 정책 변경, Build Flavor

.github/workflows/debug_build_ci.yml

@@ -25,7 +25,7 @@ jobs:
         echo '${{ secrets.LOCAL_PROPERTIES }}' >> ./local.properties
 
     - name: Access Google-Service file
-      run: echo '${{ secrets.GOOGLE_SERVICES_JSON }}' > ./app/google-services.json
+      run: echo '${{ secrets.GOOGLE_SERVICES_JSON }}' > ./acon/google-services.json
 
     - name: Grant execute permission for gradlew
       run: chmod +x gradlew

app/build.gradle.kts → acon/build.gradle.kts

@@ -1,5 +1,3 @@
-import utils.androidTestImplementation
-
 /** See AndroidApplicationConventionPlugin.kt */
 
 plugins {
@@ -9,11 +7,24 @@ plugins {
     alias(libs.plugins.acon.android.library.haze)
     alias(libs.plugins.acon.android.library.naver.map)
     alias(libs.plugins.acon.firebase)
+    alias(libs.plugins.acon.common.unit.test)
 }
 
 android {
     namespace = "com.acon.acon"
 
+    flavorDimensions += "distributionChannel"
+    productFlavors {
+        create("qa") {
+            dimension = "distributionChannel"
+            buildConfigField("boolean", "IS_QA_BUILD", "true")
+        }
+        create("production") {
+            dimension = "distributionChannel"
+            buildConfigField("boolean", "IS_QA_BUILD", "false")
+        }
+    }
+
     buildTypes {
         debug {
             applicationIdSuffix = ".debug"
@@ -35,11 +46,19 @@ android {
     }
 }
 
+androidComponents {
+    beforeVariants(selector().all()) { variant ->
+        if (variant.name == "productionDebug") {
+            variant.enable = false
+        }
+    }
+}
+
 dependencies {
 
     implementation(projects.core.designsystem)
     implementation(projects.core.map)
-    implementation(projects.core.adsApi)
+    implementation(projects.core.ads)
     implementation(projects.core.analytics)
     implementation(projects.core.navigation)
     implementation(projects.core.ui)
@@ -56,20 +75,10 @@ dependencies {
     implementation(projects.feature.settings)
     implementation(projects.feature.profile)
 
-    implementation(projects.provider.adsImpl)
-
     implementation(libs.branch.io)
     implementation(libs.google.services.ads)
     implementation(libs.play.services.location)
     implementation(libs.startup)
 
     implementation(libs.androidx.core.splashscreen)
-
-    testImplementation(libs.bundles.non.android.test)
-    testRuntimeOnly(libs.bundles.junit5.runtime)
-    androidTestImplementation(libs.bundles.android.test)
-}
-
-tasks.withType<Test> {
-    useJUnitPlatform()
 }

app/proguard-rules.pro → acon/proguard-rules.pro

@@ -138,4 +138,6 @@
 
 -dontwarn androidx.**
 -keep class androidx.** { *; }
--keep interface androidx.** { *; }
+-keep interface androidx.** { *; }
+
+-keep class com.acon.core.data.dto.entity.OnboardingPreferencesEntity { *; }

app/src/main/java/com/acon/acon/MainActivity.kt → acon/src/main/java/com/acon/acon/MainActivity.kt

@@ -35,8 +35,6 @@ import androidx.core.view.WindowCompat
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import androidx.lifecycle.lifecycleScope
 import androidx.navigation.compose.rememberNavController
-import com.acon.acon.core.ads_api.AdProvider
-import com.acon.acon.core.ads_api.LocalSpotListAdProvider
 import com.acon.acon.core.analytics.amplitude.AconAmplitude
 import com.acon.acon.core.analytics.constants.EventNames
 import com.acon.acon.core.common.DeepLinkHandler
@@ -50,6 +48,7 @@ import com.acon.acon.core.designsystem.effect.rememberHazeState
 import com.acon.acon.core.designsystem.theme.AconTheme
 import com.acon.acon.core.navigation.LocalNavController
 import com.acon.acon.core.navigation.route.AreaVerificationRoute
+import com.acon.acon.core.navigation.route.OnboardingRoute
 import com.acon.acon.core.navigation.route.SpotRoute
 import com.acon.acon.core.navigation.utils.navigateAndClear
 import com.acon.acon.core.ui.activityComponentEntryPoint
@@ -58,16 +57,15 @@ import com.acon.acon.core.ui.compose.LocalDeepLinkHandler
 import com.acon.acon.core.ui.compose.LocalLocation
 import com.acon.acon.core.ui.compose.LocalRequestLocationPermission
 import com.acon.acon.core.ui.compose.LocalRequestSignIn
-import com.acon.acon.core.ui.compose.LocalSnackbarHostState
 import com.acon.acon.core.ui.compose.LocalSignInStatus
+import com.acon.acon.core.ui.compose.LocalSnackbarHostState
 import com.acon.acon.domain.repository.AconAppRepository
+import com.acon.acon.domain.repository.OnboardingRepository
 import com.acon.acon.domain.repository.UserRepository
 import com.acon.acon.navigation.AconNavigation
-import com.acon.acon.provider.ads_impl.SpotListAdProvider
 import com.acon.acon.update.AppUpdateHandler
 import com.acon.acon.update.AppUpdateHandlerImpl
 import com.acon.acon.update.UpdateState
-import com.acon.core.social.client.GoogleAuthClient
 import com.acon.core.social.di.AuthClientEntryPoint
 import com.google.android.gms.common.api.ResolvableApiException
 import com.google.android.gms.location.LocationCallback
@@ -105,14 +103,16 @@ class MainActivity : ComponentActivity() {
     @Inject
     lateinit var userRepository: UserRepository
 
+    @Inject
+    lateinit var onboardingRepository: OnboardingRepository
+
     @Inject
     lateinit var aconAppRepository: AconAppRepository
 
     private val viewModel by viewModels<MainViewModel>()
 
     private val deepLinkHandler = DeepLinkHandler()
 
-    private val spotListAdProvider: AdProvider = SpotListAdProvider()
     private val gpsResolutionResultLauncher = registerForActivityResult(
         ActivityResultContracts.StartIntentSenderForResult()
     ) { result ->
@@ -124,8 +124,11 @@ class MainActivity : ComponentActivity() {
     }
 
     private val appUpdateManager by lazy {
-        AppUpdateManagerFactory.create(application)
+        if (!BuildConfig.IS_QA_BUILD)
+            AppUpdateManagerFactory.create(application)
+        else null
     }
+
     private val appUpdateActivityResultLauncher =
         registerForActivityResult(ActivityResultContracts.StartIntentSenderForResult()) { result ->
             when (result.resultCode) {
@@ -152,22 +155,22 @@ class MainActivity : ComponentActivity() {
                         )
                         when (result) {
                             SnackbarResult.ActionPerformed -> {
-                                appUpdateManager.completeUpdate()
+                                appUpdateManager?.completeUpdate()
                             }
 
                             SnackbarResult.Dismissed -> Unit
                         }
                     }
                 } else if (state.installStatus() == InstallStatus.INSTALLED) {
-                    appUpdateManager.unregisterListener(this)
+                    appUpdateManager?.unregisterListener(this)
                 }
             }
         }
     }
 
     private val appUpdateHandler: AppUpdateHandler by lazy {
         AppUpdateHandlerImpl(
-            appUpdateManager = appUpdateManager.apply {
+            appUpdateManager = appUpdateManager?.apply {
                 registerListener(appInstallStateListener)
             },
             aconAppRepository = aconAppRepository,
@@ -328,7 +331,6 @@ class MainActivity : ComponentActivity() {
                         viewModel.updateAmplPropertyKey(it)
                     },
                     LocalRequestLocationPermission provides ::requestLocationPermission,
-                    LocalSpotListAdProvider provides spotListAdProvider,
                     LocalDeepLinkHandler provides deepLinkHandler
                 ) {
                     AconNavigation(
@@ -346,25 +348,28 @@ class MainActivity : ComponentActivity() {
                                     val code = client.getCredentialCode() ?: return@launch
 
                                     userRepository.signIn(client.platform, code)
-                                        .onSuccess { verificationStatus ->
-                                            if (verificationStatus.hasVerifiedArea) {
-                                                navController.navigate(SpotRoute.SpotList) {
-                                                    popUpTo(navController.graph.id) {
-                                                        inclusive = true
-                                                    }
-                                                }
-                                            } else {
-                                                navController.navigateAndClear(
-                                                    AreaVerificationRoute.AreaVerification
-                                                )
-                                            }
+                                        .onSuccess { externalUUID ->
                                             if (appState.propertyKey.isNotBlank()) {
                                                 AconAmplitude.trackEvent(
                                                     eventName = EventNames.GUEST,
                                                     property = appState.propertyKey to true
                                                 )
                                             }
-                                            AconAmplitude.setUserId(verificationStatus.externalUUID)
+                                            AconAmplitude.setUserId(externalUUID.value)
+
+                                            onboardingRepository.getOnboardingPreferences().onSuccess { pref ->
+                                                if (pref.shouldShowIntroduce) {
+                                                    navController.navigateAndClear(OnboardingRoute.Introduce)
+                                                } else if (pref.shouldVerifyArea) {
+                                                    navController.navigateAndClear(AreaVerificationRoute.AreaVerification)
+                                                } else if (pref.shouldChooseDislikes) {
+                                                    navController.navigateAndClear(OnboardingRoute.ChooseDislikes)
+                                                } else {
+                                                    navController.navigateAndClear(SpotRoute.SpotList)
+                                                }
+                                            }.onFailure {
+                                                navController.navigateAndClear(SpotRoute.SpotList)
+                                            }
                                         }.onFailure { e ->
                                             Timber.e(e)
                                         }
@@ -478,9 +483,9 @@ class MainActivity : ComponentActivity() {
         }
 
         DisposableEffect(appUpdateManager) {
-            appUpdateManager.registerListener(appInstallStateListener)
+            appUpdateManager?.registerListener(appInstallStateListener)
             onDispose {
-                appUpdateManager.unregisterListener(appInstallStateListener)
+                appUpdateManager?.unregisterListener(appInstallStateListener)
             }
         }
     }

app/src/main/java/com/acon/acon/navigation/nested/AreaVerificationNavigation.kt → acon/src/main/java/com/acon/acon/navigation/nested/AreaVerificationNavigation.kt

@@ -35,7 +35,8 @@ fun NavGraphBuilder.areaVerificationNavigation(
                 skippable = LocalNavController.current.hasPreviousBackStackEntry().not(),
                 onNavigateToChooseDislikes = { navController.navigateAndClear(OnboardingRoute.ChooseDislikes) },
                 onNavigateToIntroduce = { navController.navigateAndClear(OnboardingRoute.Introduce) },
-                onNavigateToSpotList = { navController.navigateAndClear(SpotRoute.SpotList) }
+                onNavigateToSpotList = { navController.navigateAndClear(SpotRoute.SpotList) },
+                onNavigateBack = navController::navigateUp
             )
         }
 

app/src/main/java/com/acon/acon/navigation/nested/OnboardingNavigation.kt → acon/src/main/java/com/acon/acon/navigation/nested/OnboardingNavigation.kt

@@ -10,6 +10,7 @@ import androidx.navigation.compose.composable
 import androidx.navigation.compose.navigation
 import com.acon.acon.core.designsystem.effect.screenDefault
 import com.acon.acon.core.navigation.LocalNavController
+import com.acon.acon.core.navigation.route.AreaVerificationRoute
 import com.acon.acon.core.navigation.route.OnboardingRoute
 import com.acon.acon.core.navigation.route.SettingsRoute
 import com.acon.acon.core.navigation.route.SpotRoute
@@ -51,6 +52,12 @@ internal fun NavGraphBuilder.onboardingNavigation(
                 modifier = Modifier.screenDefault().statusBarsPadding(),
                 onNavigateToHome = {
                     navController.navigateAndClear(SpotRoute.Graph)
+                },
+                onNavigateToAreaVerification = {
+                    navController.navigateAndClear(AreaVerificationRoute.Graph)
+                },
+                onNavigateToChooseDislikes = {
+                    navController.navigateAndClear(OnboardingRoute.ChooseDislikes)
                 }
             )
         }

app/src/main/java/com/acon/acon/navigation/nested/SpotNavigation.kt → acon/src/main/java/com/acon/acon/navigation/nested/SpotNavigation.kt

@@ -57,6 +57,9 @@ internal fun NavGraphBuilder.spotNavigation(
                 onNavigateToAreaVerificationScreen = { lat, lon ->
                     navController.navigate(AreaVerificationRoute.VerifyInMap)
                 },
+                onNavigateToUploadPlace = {
+                    navController.navigate(UploadRoute.Place)
+                },
                 modifier = Modifier
                     .fillMaxSize()
                     .background(AconTheme.color.Gray900)

app/src/main/java/com/acon/acon/update/AppUpdateHandler.kt → acon/src/main/java/com/acon/acon/update/AppUpdateHandler.kt

@@ -35,15 +35,17 @@ interface AppUpdateHandler {
 }
 
 class AppUpdateHandlerImpl(
-    private val appUpdateManager: AppUpdateManager,
+    private val appUpdateManager: AppUpdateManager?,
     private val aconAppRepository: AconAppRepository,
     private val appUpdateActivityResultLauncher: ActivityResultLauncher<IntentSenderRequest>,
     private val application: Application,
     private val scope: CoroutineScope
 ) : AppUpdateHandler {
 
     private val appUpdateInfo = flow {
-        emit(appUpdateManager.appUpdateInfo.await())
+        appUpdateManager?.appUpdateInfo?.let {
+            emit(it.await())
+        }
     }.stateIn(
         scope = scope,
         started = SharingStarted.WhileSubscribed(5_000),
@@ -56,7 +58,7 @@ class AppUpdateHandlerImpl(
                 val packageInfo =
                     application.packageManager.getPackageInfo(application.packageName, 0)
                 packageInfo.versionName
-            } catch (e: Exception) {
+            } catch (_: Exception) {
                 null
             }
             if (currentAppVersion == null)
@@ -80,7 +82,7 @@ class AppUpdateHandlerImpl(
     }
 
     override fun startFlexibleUpdate() {
-        appUpdateManager.startUpdateFlowForResult(
+        appUpdateManager?.startUpdateFlowForResult(
             appUpdateInfo.value ?: return,
             appUpdateActivityResultLauncher,
             AppUpdateOptions.defaultOptions(AppUpdateType.FLEXIBLE)

build-logic/convention/build.gradle.kts

@@ -61,5 +61,13 @@ gradlePlugin {
             id = "com.acon.firebase"
             implementationClass = "FirebaseConventionPlugin"
         }
+        register("featureTest") {
+            id = "com.acon.feature.test"
+            implementationClass = "test.FeatureTestConventionPlugin"
+        }
+        register("commonUnitTest") {
+            id = "com.acon.common.unit.test"
+            implementationClass = "test.CommonUnitTestConventionPlugin"
+        }
     }
 }

build-logic/convention/src/main/kotlin/AndroidApplicationComposeConventionPlugin.kt

@@ -20,6 +20,7 @@ class AndroidApplicationComposeConventionPlugin: Plugin<Project> {
             extensions.configure<ApplicationExtension> {
                 buildFeatures {
                     compose = true
+                    buildConfig = true
                 }
                 composeOptions {
                     kotlinCompilerExtensionVersion =