#6 onboarding/온보딩 화면 : 디자인 포맷 설정 📰

- rough_ui에서 가져온 커밋 conflict 해결
hometerview · Aug 1, 2022 · f3dd063 · f3dd063
1 parent d565d3b
commit f3dd063
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 20 deletions.
diff --git a/app/src/main/java/com/ftw/hometerview/ui/loading/LoadingActivity.kt b/app/src/main/java/com/ftw/hometerview/ui/loading/LoadingActivity.kt
@@ -7,6 +7,7 @@ import android.os.Bundle
 import com.bumptech.glide.Glide
 import com.ftw.hometerview.R
 import com.ftw.hometerview.databinding.ActivityLoadingBinding
+import com.ftw.hometerview.ui.main.MainActivity
 
 class LoadingActivity : AppCompatActivity() {
 
@@ -24,7 +25,11 @@ class LoadingActivity : AppCompatActivity() {
         binding = ActivityLoadingBinding.inflate(layoutInflater)
         setContentView(binding.root)
 
-        Glide.with(this).load(R.raw.loading).into(binding.loadView);
+        Glide.with(this).load(R.raw.loading).into(binding.loadView)
+
+        binding.loadView.setOnClickListener {
+            startActivity(MainActivity.newIntent(this))
+        }
     }
 
 }
diff --git a/app/src/main/java/com/ftw/hometerview/ui/main/MainActivity.kt b/app/src/main/java/com/ftw/hometerview/ui/main/MainActivity.kt
@@ -4,14 +4,12 @@ import android.content.Context
 import android.content.Intent
 import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
-import android.os.Parcelable
 import androidx.databinding.DataBindingUtil
 import androidx.fragment.app.Fragment
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.lifecycleScope
 import androidx.lifecycle.repeatOnLifecycle
 import com.ftw.hometerview.R
-import kotlinx.parcelize.Parcelize
 import com.ftw.hometerview.databinding.ActivityMainBinding
 import com.ftw.hometerview.ui.main.favorite.FavoriteFragment
 import com.ftw.hometerview.ui.main.home.HomeFragment
@@ -25,18 +23,11 @@ import kotlinx.coroutines.launch
 class MainActivity : AppCompatActivity() {
 
     companion object {
-        val ARGUMENT_KEY = "ARGUMENT_KEY"
-        fun newIntent(context: Context, a: String, b: Int): Intent {
+        fun newIntent(context: Context): Intent {
             return Intent(context, MainActivity::class.java)
-                .putExtra(ARGUMENT_KEY, Argument(a, b))
         }
     }
 
-
-    companion object {
-        fun newIntent(context: Context): Intent = Intent(context, MainActivity::class.java)
-    }
-
     @Inject
     lateinit var viewModel: MainViewModel
 
@@ -48,9 +39,6 @@ class MainActivity : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
-        intent.getParcelableExtra<Argument>(ARGUMENT_KEY)?.let {
-
-        } ?: finish()
 
         DataBindingUtil.setContentView<ActivityMainBinding>(this, R.layout.activity_main)
             .apply {
@@ -80,9 +68,4 @@ class MainActivity : AppCompatActivity() {
             .commitAllowingStateLoss()
     }
 
-    @Parcelize
-    private data class Argument(
-        val a: String,
-        val b: Int
-    ) : Parcelable
 }
diff --git a/app/src/main/java/com/ftw/hometerview/ui/splash/SplashActivity.kt b/app/src/main/java/com/ftw/hometerview/ui/splash/SplashActivity.kt
@@ -9,7 +9,6 @@ import androidx.appcompat.app.AppCompatActivity
 import androidx.lifecycle.lifecycleScope
 import com.ftw.hometerview.R
 import com.ftw.hometerview.ui.main.MainActivity
-import com.ftw.hometerview.ui.onboardingresult.OnboardingResultActivity
 import dagger.hilt.android.AndroidEntryPoint
 import javax.inject.Inject
 import kotlinx.coroutines.launch