feat: jetpack navigation 및 바텀시트 프래그먼트 추가 #12

android/Staccato_AN/app/build.gradle.kts

@@ -27,6 +27,9 @@ android {
             )
         }
     }
+    dataBinding {
+        enable = true
+    }
     compileOptions {
         sourceCompatibility = JavaVersion.VERSION_1_8
         targetCompatibility = JavaVersion.VERSION_1_8
@@ -87,4 +90,8 @@ dependencies {
     // Mockk
     testImplementation(libs.mockk.android)
     testImplementation(libs.mockk.agent)
+
+    // Navigation
+    implementation(libs.androidx.navigation.fragment.ktx)
+    implementation(libs.androidx.navigation.ui.ktx)
 }

android/Staccato_AN/app/src/main/AndroidManifest.xml

@@ -1,22 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools">
-
-    <!--  카메라(추후 기능 추가) -->
+    <!-- 카메라(추후 기능 추가) -->
     <uses-feature
         android:name="android.hardware.camera"
-        android:required="false" />
-
-    <!-- 인터넷 -->
-    <uses-permission android:name="android.permission.INTERNET" />
-    <!-- 위치 -->
+        android:required="false" /> <!-- 인터넷 -->
+    <uses-permission android:name="android.permission.INTERNET" /> <!-- 위치 -->
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
-    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
-    <!-- 앨범 -->
+    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" /> <!-- 앨범 -->
     <uses-permission android:name="android.permission.READ_MEDIA_IMAGES" />
-    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
-    <!--  카메라(추후 기능 추가) -->
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" /> <!-- 카메라(추후 기능 추가) -->
     <uses-permission android:name="android.permission.CAMERA" />
 
     <application
@@ -30,7 +23,19 @@
         android:theme="@style/Theme.Staccato_AN"
         tools:targetApi="31">
         <activity
-            android:name=".MainActivity"
+            android:name=".presentation.visitupdate.VisitUpdateActivity"
+            android:exported="false" />
+        <activity
+            android:name=".presentation.travelupdate.TravelUpdateActivity"
+            android:exported="false" />
+        <activity
+            android:name=".presentation.visitcreation.VisitCreationActivity"
+            android:exported="false" />
+        <activity
+            android:name=".presentation.travelcreation.TravelCreationActivity"
+            android:exported="false" />
+        <activity
+            android:name=".presentation.main.MainActivity"
             android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -40,4 +45,4 @@
         </activity>
     </application>
 
-</manifest>
+</manifest>

android/Staccato_AN/app/src/main/java/com/woowacourse/staccato/presentation/base/BindingActivity.kt

@@ -0,0 +1,26 @@
+package com.woowacourse.staccato.presentation.base
+
+import android.os.Bundle
+import androidx.appcompat.app.AppCompatActivity
+import androidx.databinding.DataBindingUtil
+import androidx.databinding.ViewDataBinding
+
+abstract class BindingActivity<T : ViewDataBinding> : AppCompatActivity() {
+    abstract val layoutResourceId: Int
+    private var _binding: T? = null
+    val binding
+        get() = requireNotNull(_binding)
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        _binding = DataBindingUtil.setContentView(this, layoutResourceId)
+        initStartView(savedInstanceState)
+    }
+
+    abstract fun initStartView(savedInstanceState: Bundle?)
+
+    override fun onDestroy() {
+        super.onDestroy()
+        _binding = null
+    }
+}

android/Staccato_AN/app/src/main/java/com/woowacourse/staccato/presentation/base/BindingFragment.kt

@@ -0,0 +1,33 @@
+package com.woowacourse.staccato.presentation.base
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.annotation.LayoutRes
+import androidx.databinding.DataBindingUtil
+import androidx.databinding.ViewDataBinding
+import androidx.fragment.app.Fragment
+
+abstract class BindingFragment<T : ViewDataBinding>(
+    @LayoutRes private val layoutRes: Int,
+) : Fragment() {
+    private var _binding: T? = null
+    protected val binding
+        get() = requireNotNull(_binding)
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?,
+    ): View? {
+        _binding = DataBindingUtil.inflate(inflater, layoutRes, container, false)
+        binding.lifecycleOwner = viewLifecycleOwner
+        return binding.root
+    }
+
+    override fun onDestroyView() {
+        super.onDestroyView()
+        _binding = null
+    }
+}

android/Staccato_AN/app/src/main/java/com/woowacourse/staccato/presentation/main/MainActivity.kt

@@ -0,0 +1,137 @@
+package com.woowacourse.staccato.presentation.main
+
+import android.os.Bundle
+import android.widget.Toast
+import androidx.activity.addCallback
+import androidx.activity.result.contract.ActivityResultContracts
+import androidx.constraintlayout.widget.ConstraintLayout
+import androidx.navigation.NavController
+import androidx.navigation.NavOptions
+import androidx.navigation.fragment.NavHostFragment
+import com.google.android.material.bottomsheet.BottomSheetBehavior
+import com.google.android.material.bottomsheet.BottomSheetBehavior.STATE_COLLAPSED
+import com.google.android.material.bottomsheet.BottomSheetBehavior.STATE_EXPANDED
+import com.woowacourse.staccato.R
+import com.woowacourse.staccato.databinding.ActivityMainBinding
+import com.woowacourse.staccato.presentation.base.BindingActivity
+import com.woowacourse.staccato.presentation.travelcreation.TravelCreationActivity
+import com.woowacourse.staccato.presentation.visitcreation.VisitCreationActivity
+
+class MainActivity : BindingActivity<ActivityMainBinding>() {
+    override val layoutResourceId: Int
+        get() = R.layout.activity_main
+
+    private lateinit var behavior: BottomSheetBehavior<ConstraintLayout>
+    private lateinit var navHostFragment: NavHostFragment
+    private lateinit var navController: NavController
+
+    private val travelCreationLauncher =
+        registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { result ->
+            if (result.resultCode == RESULT_OK) {
+                result.data?.let {
+                    Toast.makeText(this, "새로운 여행을 만들었어요!", Toast.LENGTH_SHORT).show()
+                    navigateTo(R.id.travelFragment, R.id.timelineFragment)
+                }
+            }
+        }
+
+    val travelUpdateLauncher =
+        registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { result ->
+            if (result.resultCode == RESULT_OK) {
+                result.data?.let {
+                    Toast.makeText(this, "여행을 수정했어요!", Toast.LENGTH_SHORT).show()
+                    navigateTo(R.id.travelFragment, R.id.timelineFragment)
+                }
+            }
+        }
+
+    private val visitCreationLauncher =
+        registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { result ->
+            if (result.resultCode == RESULT_OK) {
+                result.data?.let {
+                    Toast.makeText(this, "새로운 방문 기록을 만들었어요!", Toast.LENGTH_SHORT).show()
+                    navigateTo(R.id.visitFragment, R.id.visitFragment)
+                }
+            }
+        }
+
+    val visitUpdateLauncher =
+        registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { result ->
+            if (result.resultCode == RESULT_OK) {
+                result.data?.let {
+                    Toast.makeText(this, "방문 기록을 수정했어요!", Toast.LENGTH_SHORT).show()
+                    navigateTo(R.id.visitFragment, R.id.visitFragment)
+                }
+            }
+        }
+
+    override fun initStartView(savedInstanceState: Bundle?) {
+        setupBottomSheetController()
+        setupBottomSheetNavigation()
+        setupBackPressedHandler()
+    }
+
+    private fun setupBackPressedHandler() {
+        var backPressedTime = 0L
+        onBackPressedDispatcher.addCallback {
+            if (behavior.state == STATE_EXPANDED) {
+                behavior.state = STATE_COLLAPSED
+            } else {
+                handleBackPressedTwice(backPressedTime).also {
+                    backPressedTime = it
+                }
+            }
+        }
+    }
+
+    private fun handleBackPressedTwice(backPressedTime: Long): Long {
+        val currentTime = System.currentTimeMillis()
+        if (currentTime - backPressedTime >= 3000L) {
+            Toast.makeText(this@MainActivity, "버튼을 한 번 더 누르면 종료됩니다.", Toast.LENGTH_SHORT)
+                .show()
+        } else {
+            finish()
+        }
+        return currentTime
+    }
+
+    private fun setupBottomSheetController() {
+        behavior = BottomSheetBehavior.from(binding.constraintBottomSheet)
+        navHostFragment =
+            supportFragmentManager.findFragmentById(R.id.fragment_container) as NavHostFragment
+        navController = navHostFragment.navController
+    }
+
+    private fun setupBottomSheetNavigation() {
+        binding.btnTravelCreate.setOnClickListener {
+            TravelCreationActivity.startWithResultLauncher(
+                this,
+                travelCreationLauncher,
+            )
+        }
+        binding.btnVisitCreate.setOnClickListener {
+            VisitCreationActivity.startWithResultLauncher(
+                this,
+                visitCreationLauncher,
+            )
+        }
+        binding.btnTimeline.setOnClickListener {
+            navigateTo(R.id.timelineFragment, R.id.timelineFragment)
+        }
+    }
+
+    private fun navigateTo(
+        navigateToId: Int,
+        popUpToId: Int,
+    ) {
+        val navOptions = buildNavOptions(popUpToId)
+        navController.navigate(navigateToId, null, navOptions)
+        behavior.state = STATE_EXPANDED
+    }
+
+    private fun buildNavOptions(popUpToId: Int) =
+        NavOptions.Builder()
+            .setLaunchSingleTop(true)
+            .setPopUpTo(popUpToId, false)
+            .build()
+}

android/Staccato_AN/app/src/main/java/com/woowacourse/staccato/presentation/timeline/TimelineFragment.kt

@@ -0,0 +1,19 @@
+package com.woowacourse.staccato.presentation.timeline
+
+import android.os.Bundle
+import android.view.View
+import androidx.navigation.fragment.findNavController
+import com.woowacourse.staccato.R
+import com.woowacourse.staccato.databinding.FragmentTimelineBinding
+import com.woowacourse.staccato.presentation.base.BindingFragment
+
+class TimelineFragment : BindingFragment<FragmentTimelineBinding>(R.layout.fragment_timeline) {
+    override fun onViewCreated(
+        view: View,
+        savedInstanceState: Bundle?,
+    ) {
+        binding.btnTimeline.setOnClickListener {
+            findNavController().navigate(R.id.action_timelineFragment_to_travelFragment)
+        }
+    }
+}

android/Staccato_AN/app/src/main/java/com/woowacourse/staccato/presentation/travel/TravelFragment.kt

@@ -0,0 +1,29 @@
+package com.woowacourse.staccato.presentation.travel
+
+import android.os.Bundle
+import android.view.View
+import androidx.navigation.fragment.findNavController
+import com.woowacourse.staccato.R
+import com.woowacourse.staccato.databinding.FragmentTravelBinding
+import com.woowacourse.staccato.presentation.base.BindingFragment
+import com.woowacourse.staccato.presentation.main.MainActivity
+import com.woowacourse.staccato.presentation.travelupdate.TravelUpdateActivity
+
+class TravelFragment : BindingFragment<FragmentTravelBinding>(R.layout.fragment_travel) {
+    override fun onViewCreated(
+        view: View,
+        savedInstanceState: Bundle?,
+    ) {
+        binding.btnTravelUpdate.setOnClickListener {
+            val travelUpdateLauncher = (activity as MainActivity).travelUpdateLauncher
+            TravelUpdateActivity.startWithResultLauncher(
+                this.requireActivity(),
+                travelUpdateLauncher,
+            )
+//            findNavController().navigate(R.id.action_travelFragment_to_travelUpdateFragment)
+        }
+        binding.btnVisit.setOnClickListener {
+            findNavController().navigate(R.id.action_travelFragment_to_visitFragment)
+        }
+    }
+}

android/Staccato_AN/app/src/main/java/com/woowacourse/staccato/presentation/travelcreation/TravelCreationActivity.kt

@@ -0,0 +1,34 @@
+package com.woowacourse.staccato.presentation.travelcreation
+
+import android.app.Activity
+import android.content.Context
+import android.content.Intent
+import android.os.Bundle
+import androidx.activity.result.ActivityResultLauncher
+import com.woowacourse.staccato.R
+import com.woowacourse.staccato.databinding.ActivityTravelCreationBinding
+import com.woowacourse.staccato.presentation.base.BindingActivity
+
+class TravelCreationActivity : BindingActivity<ActivityTravelCreationBinding>() {
+    override val layoutResourceId = R.layout.activity_travel_creation
+
+    override fun initStartView(savedInstanceState: Bundle?) {
+        binding.btnTravelCreateDone.setOnClickListener {
+            val resultIntent = Intent()
+            setResult(Activity.RESULT_OK, resultIntent)
+            finish()
+        }
+    }
+
+    companion object {
+        fun startWithResultLauncher(
+            context: Context,
+            activityLauncher: ActivityResultLauncher<Intent>,
+        ) {
+            Intent(context, TravelCreationActivity::class.java).apply {
+                // putExtra(EXTRA_TRAVEL_ID, travelId)
+                activityLauncher.launch(this)
+            }
+        }
+    }
+}