Merge pull request #478 from team-yello/feature/#475/tutorial-compose-refactoring

[REFACTORING/#475] Tutorial / Compose 리팩토링

Author: minju1459

app/src/main/AndroidManifest.xml

@@ -102,29 +102,13 @@
             android:screenOrientation="portrait" />
 
         <activity
-            android:name=".presentation.tutorial.TutorialAActivity"
-            android:exported="false"
-            android:screenOrientation="portrait" />
-        <activity
-            android:name=".presentation.tutorial.TutorialBActivity"
-            android:exported="false"
-            android:screenOrientation="portrait" />
-        <activity
-            android:name=".presentation.tutorial.TutorialCActivity"
-            android:exported="false"
-            android:screenOrientation="portrait" />
-        <activity
-            android:name=".presentation.tutorial.TutorialDActivity"
+            android:name=".presentation.tutorial.TutorialActivity"
             android:exported="false"
             android:screenOrientation="portrait" />
         <activity
             android:name=".presentation.tutorial.TutorialEndActivity"
             android:exported="false"
             android:screenOrientation="portrait" />
-        <activity
-            android:name=".presentation.tutorial.TutorialEndPlusActivity"
-            android:exported="false"
-            android:screenOrientation="portrait" />
 
         <activity
             android:name=".presentation.main.MainActivity"

app/src/main/java/com/el/yello/presentation/auth/SignInActivity.kt

@@ -13,7 +13,7 @@ import com.el.yello.presentation.main.MainActivity
 import com.el.yello.presentation.onboarding.activity.EditNameActivity
 import com.el.yello.presentation.onboarding.activity.GetAlarmActivity
 import com.el.yello.presentation.onboarding.fragment.checkName.CheckNameDialog
-import com.el.yello.presentation.tutorial.TutorialAActivity
+import com.el.yello.presentation.tutorial.TutorialActivity
 import com.el.yello.util.extension.yelloSnackbar
 import com.el.yello.util.manager.AmplitudeManager
 import com.example.ui.base.BindingActivity
@@ -111,7 +111,7 @@ class SignInActivity : BindingActivity<ActivitySignInBinding>(R.layout.activity_
                 is UiState.Success -> {
                     if (viewModel.getIsFirstLoginData()) {
                         if (viewModel.isResigned) {
-                            startActivity(TutorialAActivity.newIntent(this, false))
+                            startActivity(TutorialActivity.newIntent(this, false))
                         } else {
                             startMainActivity()
                         }

app/src/main/java/com/el/yello/presentation/onboarding/activity/GetAlarmActivity.kt

@@ -10,7 +10,7 @@ import androidx.activity.result.contract.ActivityResultContracts
 import androidx.core.content.ContextCompat
 import com.el.yello.R
 import com.el.yello.databinding.ActivityGetAlarmBinding
-import com.el.yello.presentation.tutorial.TutorialAActivity
+import com.el.yello.presentation.tutorial.TutorialActivity
 import com.el.yello.util.manager.AmplitudeManager
 import com.example.ui.base.BindingActivity
 import com.example.ui.extension.boolExtra
@@ -39,10 +39,10 @@ class GetAlarmActivity :
     private fun startTutorialActivity() {
         val isCodeTextEmpty =
             intent.getBooleanExtra(OnBoardingActivity.EXTRA_CODE_TEXT_EMPTY, false)
-        val intent = TutorialAActivity.newIntent(this, false).apply {
+        val intent = TutorialActivity.newIntent(this, false).apply {
             addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP)
             putExtra(OnBoardingActivity.EXTRA_CODE_TEXT_EMPTY, isCodeTextEmpty)
-            putExtra(TutorialAActivity.EXTRA_FROM_ONBOARDING, isFromOnBoarding)
+            putExtra(TutorialActivity.EXTRA_FROM_ONBOARDING, isFromOnBoarding)
         }
         startActivity(intent)
         finish()

app/src/main/java/com/el/yello/presentation/tutorial/TutorialAActivity.kt

@@ -0,0 +1,56 @@
+package com.el.yello.presentation.tutorial
+
+import android.content.Context
+import android.content.Intent
+import android.os.Bundle
+import androidx.activity.ComponentActivity
+import androidx.activity.compose.setContent
+import com.el.yello.presentation.main.MainActivity
+import com.el.yello.presentation.onboarding.activity.OnBoardingActivity.Companion.EXTRA_CODE_TEXT_EMPTY
+import com.el.yello.presentation.tutorial.screen.TutorialRoute
+import com.example.ui.compose.theme.YelloTheme
+import com.example.ui.extension.boolExtra
+import dagger.hilt.android.AndroidEntryPoint
+
+@AndroidEntryPoint
+class TutorialActivity : ComponentActivity() {
+
+    private val isFromOnBoarding by boolExtra()
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        
+        val isCodeTextEmpty = intent.getBooleanExtra(EXTRA_CODE_TEXT_EMPTY, false)
+        
+        setContent {
+            YelloTheme {
+                TutorialRoute(
+                    isCodeTextEmpty = isCodeTextEmpty,
+                    isFromOnBoarding = isFromOnBoarding,
+                    navigateToTutorialEnd = {
+                        val intent = TutorialEndActivity.newIntent(this@TutorialActivity, isPlus = !isCodeTextEmpty)
+                        startActivity(intent)
+                        finish()
+                    },
+                    navigateToMainActivity = {
+                        val intent = Intent(this@TutorialActivity, MainActivity::class.java).apply {
+                            addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP)
+                        }
+                        startActivity(intent)
+                        finish()
+                    }
+                )
+            }
+        }
+    }
+
+    companion object {
+        @JvmStatic
+        fun newIntent(context: Context, isFromOnBoarding: Boolean) =
+            Intent(context, TutorialActivity::class.java).apply {
+                putExtra(EXTRA_FROM_ONBOARDING, isFromOnBoarding)
+            }
+
+        const val EXTRA_FROM_ONBOARDING = "isFromOnBoarding"
+    }
+}