Merge pull request #2 from f-lab-edu/issue-1

Dukoo1 · web-flow · commit 1d5c8e85ae93 · 2024-12-29T19:25:56.000+09:00
[#1] 모듈간 기본 네비게이션 구현
diff --git a/app/build.gradle b/app/build.gradle
@@ -5,12 +5,12 @@ plugins {
 
 android {
     namespace 'com.chaeny.busoda'
-    compileSdk rootProject.compileSdkVersion
+    compileSdk libs.versions.compileSdk.get().toInteger()
 
     defaultConfig {
         applicationId "com.chaeny.busoda"
-        minSdk rootProject.minSdkVersion
-        targetSdk rootProject.targetSdkVersion
+        minSdk libs.versions.minSdk.get().toInteger()
+        targetSdk libs.versions.targetSdk.get().toInteger()
         versionCode 1
         versionName "1.0"
 
@@ -33,8 +33,8 @@ android {
 }
 
 dependencies {
-    implementation "androidx.navigation:navigation-fragment-ktx:$rootProject.navigationVersion"
-    implementation "androidx.navigation:navigation-ui-ktx:$rootProject.navigationVersion"
+    implementation libs.navigation.fragment
+    implementation libs.navigation.ui
 
     implementation libs.androidx.core.ktx
     implementation libs.androidx.appcompat
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
@@ -10,5 +10,5 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         app:defaultNavHost="true"
-        app:navGraph="@navigation/stop_nav_graph" />
+        app:navGraph="@navigation/main_nav_graph" />
 </FrameLayout>
diff --git a/app/src/main/res/navigation/main_nav_graph.xml b/app/src/main/res/navigation/main_nav_graph.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<navigation xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/main_nav_graph"
+    app:startDestination="@id/stoplist_nav_graph">
+
+    <include app:graph="@navigation/stoplist_nav_graph" />
+    <include app:graph="@navigation/stopdetail_nav_graph" />
+
+</navigation>
diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml
@@ -2,15 +2,15 @@
     <!-- Base application theme. -->
     <style name="Theme.Busoda" parent="Theme.MaterialComponents.DayNight.NoActionBar">
         <!-- Primary brand color. -->
-        <item name="colorPrimary">@color/purple_200</item>
-        <item name="colorPrimaryVariant">#C9E9D2</item>
+        <item name="colorPrimary">@color/main_green</item>
+        <item name="colorPrimaryVariant">@color/purple_200</item>
         <item name="colorOnPrimary">@color/black</item>
         <!-- Secondary brand color. -->
         <item name="colorSecondary">@color/teal_200</item>
         <item name="colorSecondaryVariant">@color/teal_200</item>
         <item name="colorOnSecondary">@color/black</item>
         <!-- Status bar color. -->
-        <item name="android:statusBarColor">?attr/colorPrimaryVariant</item>
+        <item name="android:statusBarColor">?attr/colorPrimary</item>
         <!-- Customize your theme here. -->
     </style>
 </resources>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
@@ -7,4 +7,5 @@
     <color name="teal_700">#FF018786</color>
     <color name="black">#FF000000</color>
     <color name="white">#FFFFFFFF</color>
+    <color name="main_green">#C9E9D2</color>
 </resources>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
@@ -2,15 +2,15 @@
     <!-- Base application theme. -->
     <style name="Theme.Busoda" parent="Theme.MaterialComponents.DayNight.NoActionBar">
         <!-- Primary brand color. -->
-        <item name="colorPrimary">@color/purple_500</item>
-        <item name="colorPrimaryVariant">#C9E9D2</item>
+        <item name="colorPrimary">@color/main_green</item>
+        <item name="colorPrimaryVariant">@color/purple_500</item>
         <item name="colorOnPrimary">@color/white</item>
         <!-- Secondary brand color. -->
         <item name="colorSecondary">@color/teal_200</item>
         <item name="colorSecondaryVariant">@color/teal_700</item>
         <item name="colorOnSecondary">@color/black</item>
         <!-- Status bar color. -->
-        <item name="android:statusBarColor">?attr/colorPrimaryVariant</item>
+        <item name="android:statusBarColor">?attr/colorPrimary</item>
         <!-- Customize your theme here. -->
     </style>
 </resources>
diff --git a/build.gradle b/build.gradle
@@ -1,14 +1,4 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
-buildscript {
-    ext {
-        compileSdkVersion = 35
-        minSdkVersion = 31
-        targetSdkVersion = 35
-
-        navigationVersion = '2.8.5'
-    }
-}
-
 plugins {
     alias(libs.plugins.android.application) apply false
     alias(libs.plugins.kotlin.android) apply false
diff --git a/feature/stopdetail/build.gradle b/feature/stopdetail/build.gradle
@@ -5,14 +5,14 @@ plugins {
 
 android {
     namespace 'com.chaeny.busoda.stopdetail'
-    compileSdk rootProject.compileSdkVersion
+    compileSdk libs.versions.compileSdk.get().toInteger()
 
     buildFeatures {
         viewBinding = true
     }
 
     defaultConfig {
-        minSdk rootProject.minSdkVersion
+        minSdk libs.versions.minSdk.get().toInteger()
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles "consumer-rules.pro"
@@ -34,6 +34,8 @@ android {
 }
 
 dependencies {
+    implementation libs.navigation.fragment
+    implementation libs.navigation.ui
 
     implementation libs.androidx.core.ktx
     implementation libs.androidx.appcompat
diff --git a/feature/stopdetail/src/main/java/com/chaeny/busoda/stopdetail/StopDetailFragment.kt b/feature/stopdetail/src/main/java/com/chaeny/busoda/stopdetail/StopDetailFragment.kt
@@ -9,13 +9,20 @@ import com.chaeny.busoda.stopdetail.databinding.FragmentStopDetailBinding
 
 class StopDetailFragment : Fragment() {
 
+    private lateinit var binding: FragmentStopDetailBinding
+
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
         savedInstanceState: Bundle?
     ): View {
-        val binding = FragmentStopDetailBinding.inflate(inflater, container, false)
+        binding = FragmentStopDetailBinding.inflate(inflater, container, false)
+        initDataReceiver()
         return binding.root
     }
 
+    private fun initDataReceiver() {
+        binding.stopDetailTextView.text = arguments?.getString("data") ?: "No Data"
+    }
+
 }
diff --git a/feature/stopdetail/src/main/res/layout/fragment_stop_detail.xml b/feature/stopdetail/src/main/res/layout/fragment_stop_detail.xml
@@ -6,11 +6,10 @@
     tools:context=".StopDetailFragment">
 
     <TextView
-        android:id="@+id/stop_list_text_view"
+        android:id="@+id/stop_detail_text_view"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
-        android:text="bus stop detail"
         android:textSize="50sp" />
 
 </FrameLayout>
diff --git a/feature/stopdetail/src/main/res/navigation/stopdetail_nav_graph.xml b/feature/stopdetail/src/main/res/navigation/stopdetail_nav_graph.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<navigation xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/stopdetail_nav_graph"
+    app:startDestination="@id/stop_detail_fragment">
+
+    <fragment
+        android:id="@+id/stop_detail_fragment"
+        android:name="com.chaeny.busoda.stopdetail.StopDetailFragment"
+        tools:layout="@layout/fragment_stop_detail">
+
+        <deepLink
+            app:uri="android-app://com.chaeny.busoda/fragment_stop_detail?data={data}" />
+
+        <argument
+            android:name="data"
+            app:argType="string" />
+    </fragment>
+
+</navigation>
diff --git a/feature/stoplist/build.gradle b/feature/stoplist/build.gradle
@@ -5,14 +5,14 @@ plugins {
 
 android {
     namespace 'com.chaeny.busoda.stoplist'
-    compileSdk rootProject.compileSdkVersion
+    compileSdk libs.versions.compileSdk.get().toInteger()
 
     buildFeatures {
         viewBinding = true
     }
 
     defaultConfig {
-        minSdk rootProject.minSdkVersion
+        minSdk libs.versions.minSdk.get().toInteger()
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles "consumer-rules.pro"
@@ -34,6 +34,8 @@ android {
 }
 
 dependencies {
+    implementation libs.navigation.fragment
+    implementation libs.navigation.ui
 
     implementation libs.androidx.core.ktx
     implementation libs.androidx.appcompat
diff --git a/feature/stoplist/src/main/java/com/chaeny/busoda/stoplist/StopListFragment.kt b/feature/stoplist/src/main/java/com/chaeny/busoda/stoplist/StopListFragment.kt
@@ -5,17 +5,41 @@ import androidx.fragment.app.Fragment
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.core.net.toUri
+import androidx.navigation.NavDeepLinkRequest
+import androidx.navigation.fragment.findNavController
 import com.chaeny.busoda.stoplist.databinding.FragmentStopListBinding
 
 class StopListFragment : Fragment() {
 
+    private lateinit var binding: FragmentStopListBinding
+
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
         savedInstanceState: Bundle?
     ): View {
-        val binding = FragmentStopListBinding.inflate(inflater, container, false)
+        binding = FragmentStopListBinding.inflate(inflater, container, false)
+        initButtonAction()
         return binding.root
     }
 
+    private fun initButtonAction() {
+        binding.sendLeftButton.setOnClickListener {
+            navigateToStopDetail("🚌")
+        }
+
+        binding.sendArriveButton.setOnClickListener {
+            navigateToStopDetail("🚍")
+        }
+    }
+
+    private fun navigateToStopDetail(data: String) {
+        val uri = "android-app://com.chaeny.busoda/fragment_stop_detail?data=$data".toUri()
+        val request = NavDeepLinkRequest.Builder
+            .fromUri(uri)
+            .build()
+        findNavController().navigate(request)
+    }
+
 }
diff --git a/feature/stoplist/src/main/res/layout/fragment_stop_list.xml b/feature/stoplist/src/main/res/layout/fragment_stop_list.xml
@@ -1,16 +1,27 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".StopListFragment">
+    android:gravity="center"
+    android:orientation="vertical">
 
-    <TextView
-        android:id="@+id/stop_list_text_view"
-        android:layout_width="wrap_content"
+    <com.google.android.material.button.MaterialButton
+        android:id="@+id/send_left_button"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:text="bus stop list"
-        android:textSize="50sp" />
+        android:layout_margin="20dp"
+        android:text="@string/left"
+        android:textColor="?attr/colorOnSecondary"
+        app:backgroundTint="?attr/colorPrimary" />
 
-</FrameLayout>
+    <com.google.android.material.button.MaterialButton
+        android:id="@+id/send_arrive_button"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_margin="20dp"
+        android:text="@string/arrive"
+        android:textColor="?attr/colorOnSecondary"
+        app:backgroundTint="?attr/colorPrimary" />
+
+</LinearLayout>
diff --git a/feature/stoplist/src/main/res/navigation/stoplist_nav_graph.xml b/feature/stoplist/src/main/res/navigation/stoplist_nav_graph.xml
@@ -2,22 +2,13 @@
 <navigation xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/stop_nav_graph"
+    android:id="@+id/stoplist_nav_graph"
     app:startDestination="@id/stop_list_fragment">
 
     <fragment
         android:id="@+id/stop_list_fragment"
         android:name="com.chaeny.busoda.stoplist.StopListFragment"
         tools:layout="@layout/fragment_stop_list">
-        <action
-            android:id="@+id/action_stop_list_fragment_to_stop_detail_fragment"
-            app:destination="@id/stop_detail_fragment" />
-    </fragment>
-
-    <fragment
-        android:id="@+id/stop_detail_fragment"
-        android:name="com.chaeny.busoda.stopdetail.StopDetailFragment"
-        tools:layout="@layout/fragment_stop_detail">
     </fragment>
 
 </navigation>
diff --git a/feature/stoplist/src/main/res/values/strings.xml b/feature/stoplist/src/main/res/values/strings.xml
@@ -1,4 +1,4 @@
 <resources>
-    <!-- TODO: Remove or change this placeholder text -->
-    <string name="hello_blank_fragment">Hello blank fragment</string>
+    <string name="left">출발</string>
+    <string name="arrive">도착</string>
 </resources>
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -7,6 +7,10 @@ junitVersion = "1.2.1"
 espressoCore = "3.6.1"
 appcompat = "1.7.0"
 material = "1.12.0"
+compileSdk = "35"
+minSdk = "31"
+targetSdk = "35"
+navigation = "2.8.5"
 
 [libraries]
 androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" }
@@ -15,6 +19,8 @@ androidx-junit = { group = "androidx.test.ext", name = "junit", version.ref = "j
 androidx-espresso-core = { group = "androidx.test.espresso", name = "espresso-core", version.ref = "espressoCore" }
 androidx-appcompat = { group = "androidx.appcompat", name = "appcompat", version.ref = "appcompat" }
 material = { group = "com.google.android.material", name = "material", version.ref = "material" }
+navigation-fragment = { module = "androidx.navigation:navigation-fragment-ktx", version.ref = "navigation" }
+navigation-ui = { module = "androidx.navigation:navigation-ui-ktx", version.ref = "navigation" }
 
 [plugins]
 android-application = { id = "com.android.application", version.ref = "agp" }
