From 31813fd547af66b4ba9f7e0674078d1071464425 Mon Sep 17 00:00:00 2001
From: JunJangE <wnswkd486@gmail.com>
Date: Wed, 17 Jul 2024 20:59:05 +0900
Subject: [PATCH 1/2] =?UTF-8?q?feat:=20=EB=AA=A8=EC=9E=84,=20=EC=B1=84?=
 =?UTF-8?q?=ED=8C=85=20Fragment,=20=EB=82=B4=EB=B9=84=EA=B2=8C=EC=9D=B4?=
 =?UTF-8?q?=EC=85=98=20=EC=97=B0=EA=B2=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../presentation/ui/MainActivity.kt           |  4 +--
 .../app/src/main/res/layout/activity_main.xml |  1 +
 .../src/main/res/menu/menu_main_bottom.xml    |  4 +--
 .../main/res/navigation/navigation_main.xml   | 31 +++++++++++++++++--
 4 files changed, 34 insertions(+), 6 deletions(-)

diff --git a/android/app/src/main/java/com/woowacourse/friendogly/presentation/ui/MainActivity.kt b/android/app/src/main/java/com/woowacourse/friendogly/presentation/ui/MainActivity.kt
index e651b3384..61c07c2fb 100644
--- a/android/app/src/main/java/com/woowacourse/friendogly/presentation/ui/MainActivity.kt
+++ b/android/app/src/main/java/com/woowacourse/friendogly/presentation/ui/MainActivity.kt
@@ -27,7 +27,7 @@ class MainActivity : BaseActivity<ActivityMainBinding>(R.layout.activity_main) {
 
         navController.addOnDestinationChangedListener { _, destination, _ ->
             when (destination.id) {
-                R.id.homeFragment, R.id.woofFragment, R.id.chatFragment, R.id.myPageFragment -> showBottomNav()
+                R.id.groupListFragment, R.id.woofFragment, R.id.chatListFragment, R.id.myPageFragment -> showBottomNav()
                 else -> hideBottomNav()
             }
         }
@@ -49,7 +49,7 @@ class MainActivity : BaseActivity<ActivityMainBinding>(R.layout.activity_main) {
                 super.onBackPressed()
             } else {
                 when (navController.currentDestination?.id) {
-                    R.id.homeFragment -> {
+                    R.id.groupListFragment -> {
                         if (System.currentTimeMillis() - waitTime >= 1500) {
                             waitTime = System.currentTimeMillis()
                             showToastMessage(getString(R.string.on_back_pressed_Message))
diff --git a/android/app/src/main/res/layout/activity_main.xml b/android/app/src/main/res/layout/activity_main.xml
index c0d54e6e9..19dc22c8b 100644
--- a/android/app/src/main/res/layout/activity_main.xml
+++ b/android/app/src/main/res/layout/activity_main.xml
@@ -33,6 +33,7 @@
             android:id="@+id/bottom_navi"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:background="@color/white"
             android:clipChildren="false"
             app:elevation="0dp"
             app:itemActiveIndicatorStyle="@android:color/transparent"
diff --git a/android/app/src/main/res/menu/menu_main_bottom.xml b/android/app/src/main/res/menu/menu_main_bottom.xml
index 22e8880db..486d9ec8e 100644
--- a/android/app/src/main/res/menu/menu_main_bottom.xml
+++ b/android/app/src/main/res/menu/menu_main_bottom.xml
@@ -2,7 +2,7 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
 
     <item
-        android:id="@+id/homeFragment"
+        android:id="@+id/groupListFragment"
         android:enabled="true"
         android:icon="@drawable/ic_home"
         android:title="@string/bottom_home" />
@@ -14,7 +14,7 @@
         android:title="@string/bottom_woof" />
 
     <item
-        android:id="@+id/chatFragment"
+        android:id="@+id/chatListFragment"
         android:enabled="true"
         android:icon="@drawable/ic_chat"
         android:title="@string/bottom_chat" />
diff --git a/android/app/src/main/res/navigation/navigation_main.xml b/android/app/src/main/res/navigation/navigation_main.xml
index 0aff73b7d..1181fdda9 100644
--- a/android/app/src/main/res/navigation/navigation_main.xml
+++ b/android/app/src/main/res/navigation/navigation_main.xml
@@ -3,11 +3,11 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/navigation_graph"
-    app:startDestination="@id/myPageFragment">
+    app:startDestination="@id/groupListFragment">
 
     <action
         android:id="@+id/action_home_fragment"
-        app:destination="@id/myPageFragment"
+        app:destination="@id/groupListFragment"
         app:enterAnim="@anim/nav_default_enter_anim"
         app:exitAnim="@anim/nav_default_exit_anim"
         app:popEnterAnim="@anim/nav_default_enter_anim"
@@ -15,6 +15,33 @@
         app:popUpTo="@id/navigation_graph"
         app:popUpToInclusive="true" />
 
+
+    <fragment
+        android:id="@+id/groupListFragment"
+        android:name="com.woowacourse.friendogly.presentation.ui.group.list.GroupListFragment"
+        android:label="GroupListFragment"
+        tools:layout="@layout/fragment_group_list">
+
+        <action
+            android:id="@+id/action_groupListFragment_to_myPageFragment"
+            app:destination="@id/myPageFragment" />
+        <action
+            android:id="@+id/action_groupListFragment_to_chatListFragment"
+            app:destination="@id/chatListFragment" />
+
+    </fragment>
+
+
+    <fragment
+        android:id="@+id/chatListFragment"
+        android:name="com.woowacourse.friendogly.presentation.ui.chatlist.ChatListFragment"
+        android:label="ChatListFragment"
+        tools:layout="@layout/fragment_chat_list">
+
+
+    </fragment>
+
+
     <fragment
         android:id="@+id/myPageFragment"
         android:name="com.woowacourse.friendogly.presentation.ui.mypage.MyPageFragment"

From e212f54a0dd06fffdb72301ad5c1afd835a6c5ee Mon Sep 17 00:00:00 2001
From: JunJangE <wnswkd486@gmail.com>
Date: Fri, 19 Jul 2024 17:00:26 +0900
Subject: [PATCH 2/2] =?UTF-8?q?feat:=20=EB=A9=8D=EB=A9=8D=EC=A7=96?=
 =?UTF-8?q?=EA=B8=B0=20=ED=8C=A8=EC=9D=B4=EC=A7=80=20=EB=82=B4=EB=B9=84?=
 =?UTF-8?q?=EA=B2=8C=EC=9D=B4=EC=85=98=20=EC=97=B0=EA=B2=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 android/app/src/main/res/navigation/navigation_main.xml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/android/app/src/main/res/navigation/navigation_main.xml b/android/app/src/main/res/navigation/navigation_main.xml
index 3fa3d1bbb..e833d10aa 100644
--- a/android/app/src/main/res/navigation/navigation_main.xml
+++ b/android/app/src/main/res/navigation/navigation_main.xml
@@ -31,6 +31,13 @@
 
     </fragment>
 
+    <fragment
+        android:id="@+id/woofFragment"
+        android:name="com.woowacourse.friendogly.presentation.ui.woof.WoofFragment"
+        android:label="WoofFragment"
+        tools:layout="@layout/fragment_woof">
+    </fragment>
+
 
     <fragment
         android:id="@+id/chatListFragment"