From 5ebcc7f9736277e8fc273eba01ad81d2cdff25d3 Mon Sep 17 00:00:00 2001
From: "seona.Yang" <75965560+yang1318@users.noreply.github.com>
Date: Mon, 20 Nov 2023 17:53:54 +0900
Subject: [PATCH 1/6] rename: move MainActivity into ui package

---
 AOS/app/src/main/AndroidManifest.xml                         | 2 +-
 .../java/boostcamp/and07/mindsync/{ => ui}/MainActivity.kt   | 5 +++--
 AOS/app/src/main/res/layout/activity_main.xml                | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)
 rename AOS/app/src/main/java/boostcamp/and07/mindsync/{ => ui}/MainActivity.kt (79%)

diff --git a/AOS/app/src/main/AndroidManifest.xml b/AOS/app/src/main/AndroidManifest.xml
index 86ed66ae..8e471b69 100644
--- a/AOS/app/src/main/AndroidManifest.xml
+++ b/AOS/app/src/main/AndroidManifest.xml
@@ -13,7 +13,7 @@
         android:theme="@style/Theme.MindSync"
         tools:targetApi="31">
         <activity
-            android:name="MainActivity"
+            android:name=".ui.MainActivity"
             android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
diff --git a/AOS/app/src/main/java/boostcamp/and07/mindsync/MainActivity.kt b/AOS/app/src/main/java/boostcamp/and07/mindsync/ui/MainActivity.kt
similarity index 79%
rename from AOS/app/src/main/java/boostcamp/and07/mindsync/MainActivity.kt
rename to AOS/app/src/main/java/boostcamp/and07/mindsync/ui/MainActivity.kt
index 27622c9d..f8599143 100644
--- a/AOS/app/src/main/java/boostcamp/and07/mindsync/MainActivity.kt
+++ b/AOS/app/src/main/java/boostcamp/and07/mindsync/ui/MainActivity.kt
@@ -1,7 +1,8 @@
-package boostcamp.and07.mindsync
+package boostcamp.and07.mindsync.ui
 
-import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
+import androidx.appcompat.app.AppCompatActivity
+import boostcamp.and07.mindsync.R
 
 class MainActivity : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
diff --git a/AOS/app/src/main/res/layout/activity_main.xml b/AOS/app/src/main/res/layout/activity_main.xml
index 5a268596..54ea7512 100644
--- a/AOS/app/src/main/res/layout/activity_main.xml
+++ b/AOS/app/src/main/res/layout/activity_main.xml
@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".MainActivity">
+    tools:context=".ui.MainActivity">
 
     <boostcamp.and07.mindsync.ui.view.LineView
         android:layout_width="match_parent"

From 01e590f7f24b7c9b12d3a5cd3baa8a499472b99f Mon Sep 17 00:00:00 2001
From: "seona.Yang" <75965560+yang1318@users.noreply.github.com>
Date: Mon, 20 Nov 2023 18:16:45 +0900
Subject: [PATCH 2/6] design(#51): create MindmapFragment

---
 .../mindsync/ui/mindmap/MindmapFragment.kt    | 10 ++++++++++
 .../src/main/res/layout/fragment_mindmap.xml  | 20 +++++++++++++++++++
 2 files changed, 30 insertions(+)
 create mode 100644 AOS/app/src/main/java/boostcamp/and07/mindsync/ui/mindmap/MindmapFragment.kt
 create mode 100644 AOS/app/src/main/res/layout/fragment_mindmap.xml

diff --git a/AOS/app/src/main/java/boostcamp/and07/mindsync/ui/mindmap/MindmapFragment.kt b/AOS/app/src/main/java/boostcamp/and07/mindsync/ui/mindmap/MindmapFragment.kt
new file mode 100644
index 00000000..3170c0c5
--- /dev/null
+++ b/AOS/app/src/main/java/boostcamp/and07/mindsync/ui/mindmap/MindmapFragment.kt
@@ -0,0 +1,10 @@
+package boostcamp.and07.mindsync.ui.mindmap
+
+import boostcamp.and07.mindsync.R
+import boostcamp.and07.mindsync.databinding.FragmentMindmapBinding
+import boostcamp.and07.mindsync.ui.base.BaseFragment
+
+class MindmapFragment : BaseFragment<FragmentMindmapBinding>(R.layout.fragment_mindmap) {
+    override fun initView() {
+    }
+}
diff --git a/AOS/app/src/main/res/layout/fragment_mindmap.xml b/AOS/app/src/main/res/layout/fragment_mindmap.xml
new file mode 100644
index 00000000..2eef97f1
--- /dev/null
+++ b/AOS/app/src/main/res/layout/fragment_mindmap.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <data>
+
+    </data>
+
+    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        tools:context=".ui.mindmap.MindmapFragment">
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:text="Hello" />
+
+    </FrameLayout>
+</layout>

From 1f5a3a46ec58e995d4ba287af589f2c4b01c19c2 Mon Sep 17 00:00:00 2001
From: "seona.Yang" <75965560+yang1318@users.noreply.github.com>
Date: Mon, 20 Nov 2023 21:26:21 +0900
Subject: [PATCH 3/6] =?UTF-8?q?design(#51):=20fragment=5Fmindmap.xml=20?=
 =?UTF-8?q?=EB=B0=94=ED=85=80=20=EB=B2=84=ED=8A=BC=20=EB=94=94=EC=9E=90?=
 =?UTF-8?q?=EC=9D=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 AOS/app/src/main/res/drawable/ic_remove.xml   | 10 ++++
 .../src/main/res/layout/fragment_mindmap.xml  | 54 ++++++++++++++++---
 2 files changed, 58 insertions(+), 6 deletions(-)
 create mode 100644 AOS/app/src/main/res/drawable/ic_remove.xml

diff --git a/AOS/app/src/main/res/drawable/ic_remove.xml b/AOS/app/src/main/res/drawable/ic_remove.xml
new file mode 100644
index 00000000..55ecbbc9
--- /dev/null
+++ b/AOS/app/src/main/res/drawable/ic_remove.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="25dp"
+    android:height="25dp"
+    android:tint="#000000"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM17,13L7,13v-2h10v2z" />
+</vector>
diff --git a/AOS/app/src/main/res/layout/fragment_mindmap.xml b/AOS/app/src/main/res/layout/fragment_mindmap.xml
index 2eef97f1..6f35125c 100644
--- a/AOS/app/src/main/res/layout/fragment_mindmap.xml
+++ b/AOS/app/src/main/res/layout/fragment_mindmap.xml
@@ -1,20 +1,62 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layout 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">
 
     <data>
 
     </data>
 
-    <FrameLayout
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         tools:context=".ui.mindmap.MindmapFragment">
 
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:text="Hello" />
+        <LinearLayout
+            android:id="@+id/ll_mindmap_bottom_bar"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:background="@color/gray1"
+            android:orientation="horizontal"
+            android:paddingHorizontal="30dp"
+            android:paddingVertical="15dp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent">
 
-    </FrameLayout>
+            <ImageButton
+                android:id="@+id/imgbtn_mindmap_add"
+                android:layout_width="25dp"
+                android:layout_height="25dp"
+                android:layout_weight="1"
+                android:background="@android:color/transparent"
+                android:src="@drawable/ic_add" />
+
+            <ImageButton
+                android:id="@+id/imgbtn_mindmap_remove"
+                android:layout_width="25dp"
+                android:layout_height="25dp"
+                android:layout_weight="1"
+                android:background="@android:color/transparent"
+                android:src="@drawable/ic_remove" />
+
+            <ImageButton
+                android:id="@+id/imgbtn_mindmap_edit"
+                android:layout_width="25dp"
+                android:layout_height="25dp"
+                android:layout_weight="1"
+                android:background="@android:color/transparent"
+                android:src="@drawable/ic_outlined_drawing" />
+
+            <ImageButton
+                android:id="@+id/imgbtn_mindmap_back"
+                android:layout_width="25dp"
+                android:layout_height="25dp"
+                android:layout_weight="1"
+                android:background="@android:color/transparent"
+                android:src="@drawable/ic_undo" />
+
+        </LinearLayout>
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
 </layout>

From b0ecf7337dba5178cfa84e698e6ace5fc6300318 Mon Sep 17 00:00:00 2001
From: "seona.Yang" <75965560+yang1318@users.noreply.github.com>
Date: Mon, 20 Nov 2023 21:37:07 +0900
Subject: [PATCH 4/6] =?UTF-8?q?design(#51):=20activity=5Fmain.xml=20?=
 =?UTF-8?q?=EC=BD=94=EB=93=9C=20fragment=5Fmindmap.xml=20=EB=A1=9C=20?=
 =?UTF-8?q?=EC=98=AE=EA=B9=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 AOS/app/src/main/res/layout/activity_main.xml | 24 ++++---------------
 .../src/main/res/layout/fragment_mindmap.xml  | 16 +++++++++++++
 AOS/app/src/main/res/navigation/nav_graph.xml | 11 +++++++++
 3 files changed, 32 insertions(+), 19 deletions(-)
 create mode 100644 AOS/app/src/main/res/navigation/nav_graph.xml

diff --git a/AOS/app/src/main/res/layout/activity_main.xml b/AOS/app/src/main/res/layout/activity_main.xml
index 54ea7512..59a6a3fb 100644
--- a/AOS/app/src/main/res/layout/activity_main.xml
+++ b/AOS/app/src/main/res/layout/activity_main.xml
@@ -6,25 +6,11 @@
     android:layout_height="match_parent"
     tools:context=".ui.MainActivity">
 
-    <boostcamp.and07.mindsync.ui.view.LineView
+    <androidx.fragment.app.FragmentContainerView
+        android:id="@+id/fcv_main_nav_host"
+        android:name="androidx.navigation.fragment.NavHostFragment"
         android:layout_width="match_parent"
-        android:layout_height="match_parent" />
-
-    <boostcamp.and07.mindsync.ui.view.NodeView
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="Hello World!"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        android:layout_height="match_parent"
+        app:navGraph="@navigation/nav_graph" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/AOS/app/src/main/res/layout/fragment_mindmap.xml b/AOS/app/src/main/res/layout/fragment_mindmap.xml
index 6f35125c..9d7d6c41 100644
--- a/AOS/app/src/main/res/layout/fragment_mindmap.xml
+++ b/AOS/app/src/main/res/layout/fragment_mindmap.xml
@@ -12,6 +12,22 @@
         android:layout_height="match_parent"
         tools:context=".ui.mindmap.MindmapFragment">
 
+        <boostcamp.and07.mindsync.ui.view.LineView
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            app:layout_constraintBottom_toTopOf="@id/ll_mindmap_bottom_bar"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <boostcamp.and07.mindsync.ui.view.NodeView
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            app:layout_constraintBottom_toTopOf="@id/ll_mindmap_bottom_bar"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
         <LinearLayout
             android:id="@+id/ll_mindmap_bottom_bar"
             android:layout_width="0dp"
diff --git a/AOS/app/src/main/res/navigation/nav_graph.xml b/AOS/app/src/main/res/navigation/nav_graph.xml
new file mode 100644
index 00000000..38a8e1d2
--- /dev/null
+++ b/AOS/app/src/main/res/navigation/nav_graph.xml
@@ -0,0 +1,11 @@
+<?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/nav_graph"
+    app:startDestination="@id/mindmapFragment">
+
+    <fragment
+        android:id="@+id/mindmapFragment"
+        android:name="boostcamp.and07.mindsync.ui.mindmap.MindmapFragment"
+        android:label="MindmapFragment" />
+</navigation>
\ No newline at end of file

From ad855d841c715ba7cca5bff87f295e157a72cd7c Mon Sep 17 00:00:00 2001
From: "seona.Yang" <75965560+yang1318@users.noreply.github.com>
Date: Mon, 20 Nov 2023 23:39:27 +0900
Subject: [PATCH 5/6] =?UTF-8?q?design(#51):=20bottom=20bar=EC=9D=98=20back?=
 =?UTF-8?q?ground=20color=20=EB=B3=80=EA=B2=BD=20=EB=B0=8F=20=20paddingVer?=
 =?UTF-8?q?tical=20=EC=A6=9D=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

구분이 어렵다는 피드백을 받고 backgruond color를 gray1 에서 gray2로 변경
---
 AOS/app/src/main/res/layout/fragment_mindmap.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/AOS/app/src/main/res/layout/fragment_mindmap.xml b/AOS/app/src/main/res/layout/fragment_mindmap.xml
index 9d7d6c41..e164bda2 100644
--- a/AOS/app/src/main/res/layout/fragment_mindmap.xml
+++ b/AOS/app/src/main/res/layout/fragment_mindmap.xml
@@ -32,10 +32,10 @@
             android:id="@+id/ll_mindmap_bottom_bar"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:background="@color/gray1"
+            android:background="@color/gray2"
             android:orientation="horizontal"
             android:paddingHorizontal="30dp"
-            android:paddingVertical="15dp"
+            android:paddingVertical="20dp"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent">

From f6b4715dd0ca7f2457eb64e37614923c50721fd4 Mon Sep 17 00:00:00 2001
From: "seona.Yang" <75965560+yang1318@users.noreply.github.com>
Date: Tue, 21 Nov 2023 00:07:20 +0900
Subject: [PATCH 6/6] =?UTF-8?q?refactor(#51):=20Bottom=20bar=EC=9D=98=20?=
 =?UTF-8?q?=EA=B5=AC=ED=98=84=EC=9D=84=20LinearLayout=EC=97=90=EC=84=9C=20?=
 =?UTF-8?q?Group=EC=9D=84=20=EC=9D=B4=EC=9A=A9=ED=95=98=EB=8F=84=EB=A1=9D?=
 =?UTF-8?q?=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/res/layout/fragment_mindmap.xml  | 96 +++++++++++--------
 1 file changed, 58 insertions(+), 38 deletions(-)

diff --git a/AOS/app/src/main/res/layout/fragment_mindmap.xml b/AOS/app/src/main/res/layout/fragment_mindmap.xml
index e164bda2..b5afc7c5 100644
--- a/AOS/app/src/main/res/layout/fragment_mindmap.xml
+++ b/AOS/app/src/main/res/layout/fragment_mindmap.xml
@@ -15,7 +15,6 @@
         <boostcamp.and07.mindsync.ui.view.LineView
             android:layout_width="0dp"
             android:layout_height="0dp"
-            app:layout_constraintBottom_toTopOf="@id/ll_mindmap_bottom_bar"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
@@ -23,56 +22,77 @@
         <boostcamp.and07.mindsync.ui.view.NodeView
             android:layout_width="0dp"
             android:layout_height="0dp"
-            app:layout_constraintBottom_toTopOf="@id/ll_mindmap_bottom_bar"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
-        <LinearLayout
-            android:id="@+id/ll_mindmap_bottom_bar"
+        <androidx.constraintlayout.widget.Group
             android:layout_width="0dp"
-            android:layout_height="wrap_content"
+            android:layout_height="0dp"
+            android:visibility="gone"
+            app:constraint_referenced_ids="imgbtn_mindmap_add,imgbtn_mindmap_back,imgbtn_mindmap_remove,imgbtn_mindmap_edit,view_mindmap_side_bar"
+            app:layout_constraintBottom_toBottomOf="@id/view_mindmap_side_bar"
+            app:layout_constraintEnd_toEndOf="@id/view_mindmap_side_bar"
+            app:layout_constraintStart_toStartOf="@id/view_mindmap_side_bar"
+            app:layout_constraintTop_toTopOf="@id/view_mindmap_side_bar" />
+
+        <View
+            android:id="@+id/view_mindmap_side_bar"
+            android:layout_width="0dp"
+            android:layout_height="60dp"
             android:background="@color/gray2"
-            android:orientation="horizontal"
-            android:paddingHorizontal="30dp"
-            android:paddingVertical="20dp"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent">
+            app:layout_constraintStart_toStartOf="parent" />
 
-            <ImageButton
-                android:id="@+id/imgbtn_mindmap_add"
-                android:layout_width="25dp"
-                android:layout_height="25dp"
-                android:layout_weight="1"
-                android:background="@android:color/transparent"
-                android:src="@drawable/ic_add" />
+        <ImageButton
+            android:id="@+id/imgbtn_mindmap_add"
+            android:layout_width="25dp"
+            android:layout_height="25dp"
+            android:background="@android:color/transparent"
+            android:src="@drawable/ic_add"
+            app:layout_constraintBottom_toBottomOf="@id/view_mindmap_side_bar"
+            app:layout_constraintEnd_toStartOf="@id/imgbtn_mindmap_remove"
+            app:layout_constraintHorizontal_chainStyle="spread"
+            app:layout_constraintStart_toStartOf="@id/view_mindmap_side_bar"
+            app:layout_constraintTop_toTopOf="@id/view_mindmap_side_bar" />
 
-            <ImageButton
-                android:id="@+id/imgbtn_mindmap_remove"
-                android:layout_width="25dp"
-                android:layout_height="25dp"
-                android:layout_weight="1"
-                android:background="@android:color/transparent"
-                android:src="@drawable/ic_remove" />
+        <ImageButton
+            android:id="@+id/imgbtn_mindmap_remove"
+            android:layout_width="25dp"
+            android:layout_height="25dp"
+            android:background="@android:color/transparent"
+            android:src="@drawable/ic_remove"
+            app:layout_constraintBottom_toBottomOf="@id/view_mindmap_side_bar"
+            app:layout_constraintEnd_toStartOf="@id/imgbtn_mindmap_edit"
+            app:layout_constraintHorizontal_chainStyle="spread"
+            app:layout_constraintStart_toEndOf="@id/imgbtn_mindmap_add"
+            app:layout_constraintTop_toTopOf="@id/view_mindmap_side_bar" />
 
-            <ImageButton
-                android:id="@+id/imgbtn_mindmap_edit"
-                android:layout_width="25dp"
-                android:layout_height="25dp"
-                android:layout_weight="1"
-                android:background="@android:color/transparent"
-                android:src="@drawable/ic_outlined_drawing" />
+        <ImageButton
+            android:id="@+id/imgbtn_mindmap_edit"
+            android:layout_width="25dp"
+            android:layout_height="25dp"
+            android:background="@android:color/transparent"
+            android:src="@drawable/ic_outlined_drawing"
+            app:layout_constraintBottom_toBottomOf="@id/view_mindmap_side_bar"
+            app:layout_constraintEnd_toStartOf="@id/imgbtn_mindmap_back"
+            app:layout_constraintHorizontal_chainStyle="spread"
+            app:layout_constraintStart_toEndOf="@id/imgbtn_mindmap_remove"
+            app:layout_constraintTop_toTopOf="@id/view_mindmap_side_bar" />
 
-            <ImageButton
-                android:id="@+id/imgbtn_mindmap_back"
-                android:layout_width="25dp"
-                android:layout_height="25dp"
-                android:layout_weight="1"
-                android:background="@android:color/transparent"
-                android:src="@drawable/ic_undo" />
+        <ImageButton
+            android:id="@+id/imgbtn_mindmap_back"
+            android:layout_width="25dp"
+            android:layout_height="25dp"
+            android:background="@android:color/transparent"
+            android:src="@drawable/ic_undo"
+            app:layout_constraintBottom_toBottomOf="@id/view_mindmap_side_bar"
+            app:layout_constraintEnd_toEndOf="@id/view_mindmap_side_bar"
+            app:layout_constraintHorizontal_chainStyle="spread"
+            app:layout_constraintStart_toEndOf="@id/imgbtn_mindmap_edit"
+            app:layout_constraintTop_toTopOf="@id/view_mindmap_side_bar" />
 
-        </LinearLayout>
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 </layout>