From 1cba2780a9caea9e349926f7828d6997f5738aa4 Mon Sep 17 00:00:00 2001
From: yxxyn20 <dbtndus0527@gmail.com>
Date: Thu, 23 Jun 2022 13:48:07 +0900
Subject: [PATCH] =?UTF-8?q?#27=20=EB=82=B4=EB=B9=84=EA=B2=8C=EC=9D=B4?=
 =?UTF-8?q?=EC=85=98=20=EB=B0=94:=20=EC=BD=94=EB=93=9C=20=EC=9E=91?=
 =?UTF-8?q?=EC=84=B1=20=EB=B0=8F=20=EC=95=A1=ED=8B=B0=EB=B9=84=ED=8B=B0=20?=
 =?UTF-8?q?=EC=97=B0=EA=B2=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../.idea/deploymentTargetDropDown.xml        |  17 ++
 SHAPEUP2022/.idea/misc.xml                    |   5 +
 SHAPEUP2022/app/src/main/AndroidManifest.xml  |  14 +-
 .../com/example/shape_up_2022/MainActivity.kt |  40 +++-
 .../example/shape_up_2022/MyPageActivity.kt   |  30 ++-
 .../shape_up_2022/SimulationActivity.kt       |  31 +++
 .../com/example/shape_up_2022/ToDoActivity.kt |  30 +++
 .../src/main/res/drawable/ic_icon_home.xml    |   4 +
 .../app/src/main/res/drawable/ic_icon_map.xml |   4 +
 .../src/main/res/drawable/ic_icon_mypage.xml  |   4 +
 .../main/res/drawable/ic_icon_simulation.xml  |   5 +
 .../src/main/res/drawable/ic_icon_todo.xml    |   7 +
 .../src/main/res/layout/activity_my_page.xml  |  51 ++++
 .../src/main/res/layout/activity_to_do.xml    |  46 ++++
 .../app/src/main/res/layout/main_page.xml     | 226 +++++++++++++-----
 .../src/main/res/layout/simulation_main.xml   |  46 ++++
 16 files changed, 484 insertions(+), 76 deletions(-)
 create mode 100644 SHAPEUP2022/.idea/deploymentTargetDropDown.xml
 create mode 100644 SHAPEUP2022/app/src/main/res/drawable/ic_icon_home.xml
 create mode 100644 SHAPEUP2022/app/src/main/res/drawable/ic_icon_map.xml
 create mode 100644 SHAPEUP2022/app/src/main/res/drawable/ic_icon_mypage.xml
 create mode 100644 SHAPEUP2022/app/src/main/res/drawable/ic_icon_simulation.xml
 create mode 100644 SHAPEUP2022/app/src/main/res/drawable/ic_icon_todo.xml

diff --git a/SHAPEUP2022/.idea/deploymentTargetDropDown.xml b/SHAPEUP2022/.idea/deploymentTargetDropDown.xml
new file mode 100644
index 0000000..50ec46c
--- /dev/null
+++ b/SHAPEUP2022/.idea/deploymentTargetDropDown.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="deploymentTargetDropDown">
+    <targetSelectedWithDropDown>
+      <Target>
+        <type value="QUICK_BOOT_TARGET" />
+        <deviceKey>
+          <Key>
+            <type value="VIRTUAL_DEVICE_PATH" />
+            <value value="C:\Users\dbtnd\.android\avd\Pixel_2_API_31_7.avd" />
+          </Key>
+        </deviceKey>
+      </Target>
+    </targetSelectedWithDropDown>
+    <timeTargetWasSelectedWithDropDown value="2022-06-23T03:34:55.766714500Z" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/SHAPEUP2022/.idea/misc.xml b/SHAPEUP2022/.idea/misc.xml
index e6f8584..f356ae7 100644
--- a/SHAPEUP2022/.idea/misc.xml
+++ b/SHAPEUP2022/.idea/misc.xml
@@ -3,6 +3,11 @@
   <component name="DesignSurface">
     <option name="filePathToZoomLevelMap">
       <map>
+        <entry key="..\:/1_otcroz/Pet_start_app_update/Pet-Startup-App/SHAPEUP2022/app/src/main/res/drawable/ic_icon_home.xml" value="0.1575" />
+        <entry key="..\:/1_otcroz/Pet_start_app_update/Pet-Startup-App/SHAPEUP2022/app/src/main/res/layout/activity_my_page.xml" value="0.17708333333333334" />
+        <entry key="..\:/1_otcroz/Pet_start_app_update/Pet-Startup-App/SHAPEUP2022/app/src/main/res/layout/activity_to_do.xml" value="0.136" />
+        <entry key="..\:/1_otcroz/Pet_start_app_update/Pet-Startup-App/SHAPEUP2022/app/src/main/res/layout/main_page.xml" value="0.1734375" />
+        <entry key="..\:/1_otcroz/Pet_start_app_update/Pet-Startup-App/SHAPEUP2022/app/src/main/res/layout/simulation_main.xml" value="0.17708333333333334" />
         <entry key="..\:/2.Hwater00/kotlin_SHAE-UP/Pet-Startup-App/SHAPEUP2022/app/src/main/res/layout/activity_achieve.xml" value="0.25364583333333335" />
         <entry key="..\:/2.Hwater00/kotlin_SHAE-UP/Pet-Startup-App/SHAPEUP2022/app/src/main/res/layout/activity_main.xml" value="0.25364583333333335" />
         <entry key="..\:/2.Hwater00/kotlin_SHAE-UP/Pet-Startup-App/SHAPEUP2022/app/src/main/res/layout/activity_to_do.xml" value="0.25364583333333335" />
diff --git a/SHAPEUP2022/app/src/main/AndroidManifest.xml b/SHAPEUP2022/app/src/main/AndroidManifest.xml
index c05b54f..7c05150 100644
--- a/SHAPEUP2022/app/src/main/AndroidManifest.xml
+++ b/SHAPEUP2022/app/src/main/AndroidManifest.xml
@@ -14,12 +14,8 @@
             android:exported="false" />
         <activity
             android:name=".TempMainActivity"
-            android:exported="false">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
+            android:exported="true">
 
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
         </activity>
         <activity
             android:name=".SettingActivity"
@@ -44,7 +40,13 @@
             android:exported="true" />
         <activity
             android:name=".MainActivity"
-            android:exported="true"></activity>
+            android:exported="true">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
         <activity
             android:name=".ToDoActivity"
             android:exported="false" /> <!-- 정보 -->
diff --git a/SHAPEUP2022/app/src/main/java/com/example/shape_up_2022/MainActivity.kt b/SHAPEUP2022/app/src/main/java/com/example/shape_up_2022/MainActivity.kt
index 9b1a7a1..4bd0595 100644
--- a/SHAPEUP2022/app/src/main/java/com/example/shape_up_2022/MainActivity.kt
+++ b/SHAPEUP2022/app/src/main/java/com/example/shape_up_2022/MainActivity.kt
@@ -1,5 +1,6 @@
 package com.example.shape_up_2022
 
+import android.content.Intent
 import android.os.Bundle
 import android.util.Log
 import androidx.appcompat.app.AppCompatActivity
@@ -9,7 +10,7 @@ import androidx.fragment.app.FragmentTransaction
 import com.example.shape_up_2022.databinding.MainPageBinding
 
 class MainActivity : AppCompatActivity() {
-    private val binding by lazy { MainPageBinding.inflate(layoutInflater)}
+    private val binding by lazy {MainPageBinding.inflate(layoutInflater)}
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -20,9 +21,42 @@ class MainActivity : AppCompatActivity() {
 
         // 프래그먼트 연결 - 캘린더 프래그먼트
         viewFragment(MainCalenderFragment() , R.id.fragment_calender)
+        
+        
+        // 탭바 연결
+        binding.navHome.setOnClickListener {
+            val intent_home = Intent(this, MainActivity::class.java)
+            startActivity(intent_home)
+            overridePendingTransition(0, 0)
+            finish()
+        }
+
+        binding.navTodo.setOnClickListener {
+            val intent_todo = Intent(this, ToDoActivity::class.java)
+            startActivity(intent_todo)
+            overridePendingTransition(0, 0)
+            finish()
+        }
+
+        binding.navSimulation.setOnClickListener {
+            val intent_simul = Intent(this, SimulationActivity::class.java)
+            startActivity(intent_simul)
+            overridePendingTransition(0, 0)
+            finish()
+        }
+
+        binding.navMap.setOnClickListener {
+
+        }
+
+        binding.navMypage.setOnClickListener {
+            val intent_mypage = Intent(this, MyPageActivity::class.java)
+            startActivity(intent_mypage)
+            overridePendingTransition(0, 0)
+            finish()
+        }
+
 
-        // 프래그먼트 연결 - 여러가지 메뉴
-        viewFragment(MainRecyclerViewFragment(), R.id.fragmentView_recycler)
     }
 
     // 프래그먼트 연결
diff --git a/SHAPEUP2022/app/src/main/java/com/example/shape_up_2022/MyPageActivity.kt b/SHAPEUP2022/app/src/main/java/com/example/shape_up_2022/MyPageActivity.kt
index 7de0768..0b25a72 100644
--- a/SHAPEUP2022/app/src/main/java/com/example/shape_up_2022/MyPageActivity.kt
+++ b/SHAPEUP2022/app/src/main/java/com/example/shape_up_2022/MyPageActivity.kt
@@ -52,10 +52,38 @@ class MyPageActivity : AppCompatActivity() {
 
         binding.gotosetting.setOnClickListener{
 
-
             val intent = Intent(this, SettingActivity::class.java)
             startActivity(intent)
         }
+
+        // 탭바 연결
+        binding.navHome.setOnClickListener {
+            val intent_home = Intent(this, MainActivity::class.java)
+            startActivity(intent_home)
+            overridePendingTransition(0, 0);
+        }
+
+        binding.navTodo.setOnClickListener {
+            val intent_todo = Intent(this, ToDoActivity::class.java)
+            startActivity(intent_todo)
+            overridePendingTransition(0, 0);
+        }
+
+        binding.navSimulation.setOnClickListener {
+            val intent_simul = Intent(this, SimulationActivity::class.java)
+            startActivity(intent_simul)
+            overridePendingTransition(0, 0);
+        }
+
+        binding.navMap.setOnClickListener {
+
+        }
+
+        binding.navMypage.setOnClickListener {
+            val intent_mypage = Intent(this, MyPageActivity::class.java)
+            startActivity(intent_mypage)
+            overridePendingTransition(0, 0);
+        }
     }
 
     private fun calculateInSampleSize(fileUri: Uri, reqWidth: Int, reqHeight: Int): Int {
diff --git a/SHAPEUP2022/app/src/main/java/com/example/shape_up_2022/SimulationActivity.kt b/SHAPEUP2022/app/src/main/java/com/example/shape_up_2022/SimulationActivity.kt
index 11ddab4..d3238ae 100644
--- a/SHAPEUP2022/app/src/main/java/com/example/shape_up_2022/SimulationActivity.kt
+++ b/SHAPEUP2022/app/src/main/java/com/example/shape_up_2022/SimulationActivity.kt
@@ -1,5 +1,6 @@
 package com.example.shape_up_2022
 
+import android.content.Intent
 import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
 import android.view.View
@@ -40,5 +41,35 @@ class SimulationActivity : AppCompatActivity() {
             binding.indoor.visibility = View.VISIBLE
         }
 
+
+        // 탭바 연결
+        binding.navHome.setOnClickListener {
+            val intent_home = Intent(this, MainActivity::class.java)
+            startActivity(intent_home)
+            overridePendingTransition(0, 0);
+        }
+
+        binding.navTodo.setOnClickListener {
+            val intent_todo = Intent(this, ToDoActivity::class.java)
+            startActivity(intent_todo)
+            overridePendingTransition(0, 0);
+        }
+
+        binding.navSimulation.setOnClickListener {
+            val intent_simul = Intent(this, SimulationActivity::class.java)
+            startActivity(intent_simul)
+            overridePendingTransition(0, 0);
+        }
+
+        binding.navMap.setOnClickListener {
+
+        }
+
+        binding.navMypage.setOnClickListener {
+            val intent_mypage = Intent(this, MyPageActivity::class.java)
+            startActivity(intent_mypage)
+            overridePendingTransition(0, 0);
+        }
+
     }
 }
\ No newline at end of file
diff --git a/SHAPEUP2022/app/src/main/java/com/example/shape_up_2022/ToDoActivity.kt b/SHAPEUP2022/app/src/main/java/com/example/shape_up_2022/ToDoActivity.kt
index df070fd..8691b3a 100644
--- a/SHAPEUP2022/app/src/main/java/com/example/shape_up_2022/ToDoActivity.kt
+++ b/SHAPEUP2022/app/src/main/java/com/example/shape_up_2022/ToDoActivity.kt
@@ -2,6 +2,7 @@ package com.example.shape_up_2022
 
 import android.app.AlertDialog
 import android.content.DialogInterface
+import android.content.Intent
 import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
 import android.util.Log
@@ -77,5 +78,34 @@ class ToDoActivity : AppCompatActivity() {
         binding.todoAdd.setOnClickListener {
             alert.show()
         }
+
+        // 탭바 연결
+        binding.navHome.setOnClickListener {
+            val intent_home = Intent(this, MainActivity::class.java)
+            startActivity(intent_home)
+            overridePendingTransition(0, 0);
+        }
+
+        binding.navTodo.setOnClickListener {
+            val intent_todo = Intent(this, ToDoActivity::class.java)
+            startActivity(intent_todo)
+            overridePendingTransition(0, 0);
+        }
+
+        binding.navSimulation.setOnClickListener {
+            val intent_simul = Intent(this, SimulationActivity::class.java)
+            startActivity(intent_simul)
+            overridePendingTransition(0, 0);
+        }
+
+        binding.navMap.setOnClickListener {
+
+        }
+
+        binding.navMypage.setOnClickListener {
+            val intent_mypage = Intent(this, MyPageActivity::class.java)
+            startActivity(intent_mypage)
+            overridePendingTransition(0, 0);
+        }
     }
 }
\ No newline at end of file
diff --git a/SHAPEUP2022/app/src/main/res/drawable/ic_icon_home.xml b/SHAPEUP2022/app/src/main/res/drawable/ic_icon_home.xml
new file mode 100644
index 0000000..c8928a3
--- /dev/null
+++ b/SHAPEUP2022/app/src/main/res/drawable/ic_icon_home.xml
@@ -0,0 +1,4 @@
+<vector android:height="35dp" android:viewportHeight="24"
+    android:viewportWidth="24" android:width="35dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF9966" android:pathData="M19,9.3V5C19,4.45 18.55,4 18,4H17C16.45,4 16,4.45 16,5V6.6L12.67,3.6C12.29,3.26 11.71,3.26 11.33,3.6L2.97,11.13C2.63,11.43 2.84,12 3.3,12H5V19C5,19.55 5.45,20 6,20H9C9.55,20 10,19.55 10,19V14H14V19C14,19.55 14.45,20 15,20H18C18.55,20 19,19.55 19,19V12H20.7C21.16,12 21.38,11.43 21.03,11.13L19,9.3ZM10,10C10,8.9 10.9,8 12,8C13.1,8 14,8.9 14,10H10Z"/>
+</vector>
diff --git a/SHAPEUP2022/app/src/main/res/drawable/ic_icon_map.xml b/SHAPEUP2022/app/src/main/res/drawable/ic_icon_map.xml
new file mode 100644
index 0000000..9ec2501
--- /dev/null
+++ b/SHAPEUP2022/app/src/main/res/drawable/ic_icon_map.xml
@@ -0,0 +1,4 @@
+<vector android:height="29dp" android:viewportHeight="24"
+    android:viewportWidth="24" android:width="29dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF9966" android:pathData="M12,2C7.589,2 4,5.589 4,9.995C3.971,16.44 11.696,21.784 12,22C12,22 20.029,16.44 20,10C20,5.589 16.411,2 12,2ZM12,14C9.79,14 8,12.21 8,10C8,7.79 9.79,6 12,6C14.21,6 16,7.79 16,10C16,12.21 14.21,14 12,14Z"/>
+</vector>
diff --git a/SHAPEUP2022/app/src/main/res/drawable/ic_icon_mypage.xml b/SHAPEUP2022/app/src/main/res/drawable/ic_icon_mypage.xml
new file mode 100644
index 0000000..3b453e7
--- /dev/null
+++ b/SHAPEUP2022/app/src/main/res/drawable/ic_icon_mypage.xml
@@ -0,0 +1,4 @@
+<vector android:height="29dp" android:viewportHeight="24"
+    android:viewportWidth="24" android:width="29dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF9966" android:pathData="M7.5,6.5C7.5,8.981 9.519,11 12,11C14.481,11 16.5,8.981 16.5,6.5C16.5,4.019 14.481,2 12,2C9.519,2 7.5,4.019 7.5,6.5ZM20,21H21V20C21,16.141 17.859,13 14,13H10C6.14,13 3,16.141 3,20V21H20Z"/>
+</vector>
diff --git a/SHAPEUP2022/app/src/main/res/drawable/ic_icon_simulation.xml b/SHAPEUP2022/app/src/main/res/drawable/ic_icon_simulation.xml
new file mode 100644
index 0000000..b154e49
--- /dev/null
+++ b/SHAPEUP2022/app/src/main/res/drawable/ic_icon_simulation.xml
@@ -0,0 +1,5 @@
+<vector android:height="29dp" android:viewportHeight="24"
+    android:viewportWidth="24" android:width="29dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF9966" android:pathData="M21,6H19L17.73,4.73C17.2707,4.2702 16.6498,4.0083 16,4H13.5C13.3599,3.4388 13.0394,2.9391 12.5878,2.5778C12.1361,2.2165 11.5783,2.0135 11,2V8.36C11.0514,9.3699 11.4506,10.331 12.13,11.08C13.2486,12.1553 14.7116,12.8 16.26,12.9L19.71,11.52C20.1148,11.3575 20.4793,11.1087 20.7781,10.7909C21.0768,10.4731 21.3027,10.094 21.44,9.68L22,8.15C22.0152,8.0472 22.0152,7.9428 22,7.84V7C22,6.7348 21.8946,6.4804 21.7071,6.2929C21.5196,6.1054 21.2652,6 21,6ZM16,8C15.8022,8 15.6089,7.9413 15.4444,7.8315C15.28,7.7216 15.1518,7.5654 15.0761,7.3827C15.0004,7.2 14.9806,6.9989 15.0192,6.8049C15.0578,6.6109 15.153,6.4328 15.2929,6.2929C15.4327,6.153 15.6109,6.0578 15.8049,6.0192C15.9989,5.9806 16.2,6.0004 16.3827,6.0761C16.5654,6.1518 16.7216,6.28 16.8315,6.4444C16.9414,6.6089 17,6.8022 17,7C17,7.2652 16.8946,7.5196 16.7071,7.7071C16.5196,7.8946 16.2652,8 16,8Z"/>
+    <path android:fillColor="#FF9966" android:pathData="M11.38,11.74C10.6824,10.976 10.2266,10.0226 10.07,9H6C5.7328,9.0177 5.4649,8.9781 5.2142,8.8838C4.9635,8.7895 4.7359,8.6428 4.5465,8.4535C4.3572,8.2641 4.2105,8.0365 4.1162,7.7858C4.0219,7.5351 3.9823,7.2672 4,7C4,6.7348 3.8946,6.4804 3.7071,6.2929C3.5196,6.1054 3.2652,6 3,6C2.7348,6 2.4804,6.1054 2.2929,6.2929C2.1054,6.4804 2,6.7348 2,7C2.0101,7.694 2.174,8.3771 2.48,9C2.8173,9.6541 3.3481,10.1884 4,10.53V22H7V17H13V22H16V13.87C14.2555,13.7326 12.6174,12.9773 11.38,11.74V11.74Z"/>
+</vector>
diff --git a/SHAPEUP2022/app/src/main/res/drawable/ic_icon_todo.xml b/SHAPEUP2022/app/src/main/res/drawable/ic_icon_todo.xml
new file mode 100644
index 0000000..feeb4cb
--- /dev/null
+++ b/SHAPEUP2022/app/src/main/res/drawable/ic_icon_todo.xml
@@ -0,0 +1,7 @@
+<vector android:height="25dp" android:viewportHeight="20"
+    android:viewportWidth="20" android:width="25dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <group>
+        <clip-path android:pathData="M0,0h20v20h-20z"/>
+        <path android:fillColor="#FF9966" android:pathData="M2.5,19.375C2.4999,19.4835 2.5281,19.5902 2.5818,19.6845C2.6355,19.7789 2.7128,19.8576 2.8061,19.913C2.8995,19.9684 3.0056,19.9985 3.1141,20.0004C3.2227,20.0022 3.3298,19.9758 3.425,19.9238L10,16.3363L16.575,19.9238C16.6702,19.9758 16.7774,20.0022 16.8859,20.0004C16.9944,19.9985 17.1005,19.9684 17.1939,19.913C17.2872,19.8576 17.3645,19.7789 17.4182,19.6845C17.4719,19.5902 17.5001,19.4835 17.5,19.375V2.5C17.5,1.837 17.2366,1.2011 16.7678,0.7322C16.2989,0.2634 15.663,0 15,0L5,0C4.337,0 3.7011,0.2634 3.2322,0.7322C2.7634,1.2011 2.5,1.837 2.5,2.5V19.375ZM10,5.5125C11.7337,3.7313 16.0675,6.85 10,10.8588C3.9325,6.85 8.2662,3.7325 10,5.515V5.5125Z"/>
+    </group>
+</vector>
diff --git a/SHAPEUP2022/app/src/main/res/layout/activity_my_page.xml b/SHAPEUP2022/app/src/main/res/layout/activity_my_page.xml
index cb3a5f9..fe670a4 100644
--- a/SHAPEUP2022/app/src/main/res/layout/activity_my_page.xml
+++ b/SHAPEUP2022/app/src/main/res/layout/activity_my_page.xml
@@ -133,5 +133,56 @@
 
 
     </LinearLayout>
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1" />
+    <!--Tab bar-->
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal">
+
+        <ImageButton
+            android:id="@+id/nav_home"
+            android:layout_width="0dp"
+            android:layout_weight="1"
+            android:layout_height="60dp"
+            android:backgroundTint="#ffffff"
+            android:src="@drawable/ic_icon_home"/>
+
+        <ImageButton
+            android:id="@+id/nav_todo"
+            android:layout_width="0dp"
+            android:layout_weight="1"
+            android:layout_height="60dp"
+            android:backgroundTint="#00001111"
+            android:src="@drawable/ic_icon_todo"/>
+
+        <ImageButton
+            android:id="@+id/nav_simulation"
+            android:layout_width="0dp"
+            android:layout_weight="1"
+            android:layout_height="60dp"
+            android:backgroundTint="#00001111"
+            android:src="@drawable/ic_icon_simulation"/>
+
+        <ImageButton
+            android:id="@+id/nav_map"
+            android:layout_width="0dp"
+            android:layout_weight="1"
+            android:layout_height="60dp"
+            android:backgroundTint="#00001111"
+            android:src="@drawable/ic_icon_map"/>
+
+        <ImageButton
+            android:id="@+id/nav_mypage"
+            android:layout_width="0dp"
+            android:layout_weight="1"
+            android:layout_height="60dp"
+            android:backgroundTint="#00001111"
+            android:src="@drawable/ic_icon_mypage"/>
+    </LinearLayout>
+
 
 </LinearLayout>
\ No newline at end of file
diff --git a/SHAPEUP2022/app/src/main/res/layout/activity_to_do.xml b/SHAPEUP2022/app/src/main/res/layout/activity_to_do.xml
index ac8ea9e..48a4e87 100644
--- a/SHAPEUP2022/app/src/main/res/layout/activity_to_do.xml
+++ b/SHAPEUP2022/app/src/main/res/layout/activity_to_do.xml
@@ -98,4 +98,50 @@
         android:gravity="center"
         android:text="여백..."
         android:layout_weight="1" />
+    <!--Tab bar-->
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal">
+
+        <ImageButton
+            android:id="@+id/nav_home"
+            android:layout_width="0dp"
+            android:layout_weight="1"
+            android:layout_height="60dp"
+            android:backgroundTint="#ffffff"
+            android:src="@drawable/ic_icon_home"/>
+
+        <ImageButton
+            android:id="@+id/nav_todo"
+            android:layout_width="0dp"
+            android:layout_weight="1"
+            android:layout_height="60dp"
+            android:backgroundTint="#00001111"
+            android:src="@drawable/ic_icon_todo"/>
+
+        <ImageButton
+            android:id="@+id/nav_simulation"
+            android:layout_width="0dp"
+            android:layout_weight="1"
+            android:layout_height="60dp"
+            android:backgroundTint="#00001111"
+            android:src="@drawable/ic_icon_simulation"/>
+
+        <ImageButton
+            android:id="@+id/nav_map"
+            android:layout_width="0dp"
+            android:layout_weight="1"
+            android:layout_height="60dp"
+            android:backgroundTint="#00001111"
+            android:src="@drawable/ic_icon_map"/>
+
+        <ImageButton
+            android:id="@+id/nav_mypage"
+            android:layout_width="0dp"
+            android:layout_weight="1"
+            android:layout_height="60dp"
+            android:backgroundTint="#00001111"
+            android:src="@drawable/ic_icon_mypage"/>
+    </LinearLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/SHAPEUP2022/app/src/main/res/layout/main_page.xml b/SHAPEUP2022/app/src/main/res/layout/main_page.xml
index 15a0127..ff02299 100644
--- a/SHAPEUP2022/app/src/main/res/layout/main_page.xml
+++ b/SHAPEUP2022/app/src/main/res/layout/main_page.xml
@@ -1,82 +1,176 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_height="match_parent"
+    android:layout_width="match_parent"
     android:orientation="vertical">
 
-    <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:app="http://schemas.android.com/apk/res-auto"
-        android:orientation="vertical"
+    <ScrollView
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_marginTop="16dp"
-        android:layout_marginHorizontal="16dp">
+        android:layout_height="0dp"
+        android:layout_weight="1"
+        android:orientation="vertical">
 
-        <!--툴바 설정-->
-
-        <!--강아지 기본 정보 및 상태-->
-        <LinearLayout
+        <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="100dp"
-            android:background="#aabbff"
-            android:orientation="horizontal">
-
-            <!--강아지 사진-->
-            <androidx.cardview.widget.CardView
-                app:cardCornerRadius="30dp"
-                android:layout_width="80dp"
-                android:layout_height="80dp"
-                android:layout_margin="10dp">
-                <ImageView
-                    android:id="@+id/puppy_profile_image"
-                    android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_marginHorizontal="16dp"
+            android:layout_marginTop="16dp"
+            android:orientation="vertical">
+
+            <!--강아지 기본 정보 및 상태-->
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="100dp"
+                android:background="#aabbff"
+                android:orientation="horizontal">
+
+                <!--강아지 사진-->
+                <androidx.cardview.widget.CardView
+                    android:layout_width="80dp"
+                    android:layout_height="80dp"
+                    android:layout_margin="10dp"
+                    app:cardCornerRadius="30dp">
+
+                    <ImageView
+                        android:id="@+id/puppy_profile_image"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:background="@color/white"
+                        android:scaleType="centerCrop"
+                        android:src="@drawable/ic_icon_dog_orange" />
+                </androidx.cardview.widget.CardView>
+
+                <!--이름, 상태-->
+                <LinearLayout
+                    android:layout_width="wrap_content"
                     android:layout_height="match_parent"
-                    android:background="@color/white"
-                    android:src="@drawable/ic_icon_dog_orange"
-                    android:scaleType="centerCrop"/>
-                <!--    android:scaleType="centerCrop" : 가로/세로 길이 중 짧은 쪽을 맞춰줌-->
-            </androidx.cardview.widget.CardView>
+                    android:layout_margin="10dp"
+                    android:orientation="vertical">
+
+                    <TextView
+                        android:id="@+id/puppy_profile_name"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="10dp"
+                        android:text="코코"
+                        android:textSize="24dp"
+                        android:textStyle="bold" />
+
+                    <TextView
+                        android:id="@+id/puppy_profile_status"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="현재 상태: 기쁨"
+                        android:textSize="16dp" />
+                </LinearLayout>
+            </LinearLayout>
 
-            <!--이름, 상태-->
+            <!--캘린더 프래그먼트-->
             <LinearLayout
-                android:layout_width="wrap_content"
+                android:id="@+id/fragment_calender"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="20dp"
+                android:background="#ff1188"
+                android:orientation="vertical" />
+
+            <!--이미지 버튼-->
+            <HorizontalScrollView
+                android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:orientation="vertical"
-                android:layout_margin="10dp">
-                <TextView
-                    android:id="@+id/puppy_profile_name"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="코코"
-                    android:textStyle="bold"
-                    android:textSize="24dp"
-                    android:layout_marginTop="10dp"/>
-                <TextView
-                    android:id="@+id/puppy_profile_status"
-                    android:layout_width="wrap_content"
+                android:layout_weight="1"
+                android:orientation="horizontal"
+                android:layout_marginTop="15dp">
+                <LinearLayout
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:text="현재 상태: 기쁨"
-                    android:textSize="16dp"/>
-            </LinearLayout>
+                    android:orientation="horizontal">
+                    <Button
+                        android:id="@+id/menu_btn_1"
+                        android:text="오늘의 TIP"
+                        android:textSize="20dp"
+                        android:layout_width="150dp"
+                        android:layout_height="200dp"
+                        android:backgroundTint="#FF9966"
+                        android:layout_marginRight="10dp"/>
+                    <Button
+                        android:id="@+id/menu_btn_2"
+                        android:textSize="20dp"
+                        android:text="훈련 영상 모아보기"
+                        android:layout_width="150dp"
+                        android:layout_height="match_parent"
+                        android:backgroundTint="#FF9966"
+                        android:layout_marginRight="10dp"/>
+                    <Button
+                        android:id="@+id/menu_btn_3"
+                        android:textSize="20dp"
+                        android:text="반려견 케어성향 점검"
+                        android:layout_width="150dp"
+                        android:layout_height="match_parent"
+                        android:backgroundTint="#FF9966"
+                        android:layout_marginRight="10dp"/>
+                    <Button
+                        android:id="@+id/menu_btn_4"
+                        android:textSize="20dp"
+                        android:text="강아지 지갑"
+                        android:layout_width="150dp"
+                        android:layout_height="match_parent"
+                        android:backgroundTint="#FF9966"
+                        android:layout_marginRight="10dp"/>
+                </LinearLayout>
+
+            </HorizontalScrollView>
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="50dp" />
         </LinearLayout>
+    </ScrollView>
 
-        <!--캘린더 프래그먼트-->
-        <LinearLayout
-            android:id="@+id/fragment_calender"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="20dp"
-            android:orientation="vertical"
-            android:background="#ff1188"/>
-
-        <!--리사이클러 뷰 프래그먼트-->
-        <LinearLayout
-            android:id="@+id/fragmentView_recycler"
-            android:layout_width="match_parent"
-            android:layout_height="0dp"
+    <!--Tab bar-->
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal">
+
+        <ImageButton
+            android:id="@+id/nav_home"
+            android:layout_width="0dp"
+            android:layout_weight="1"
+            android:layout_height="60dp"
+            android:backgroundTint="#ffffff"
+            android:src="@drawable/ic_icon_home"/>
+
+        <ImageButton
+            android:id="@+id/nav_todo"
+            android:layout_width="0dp"
+            android:layout_weight="1"
+            android:layout_height="60dp"
+            android:backgroundTint="#00001111"
+            android:src="@drawable/ic_icon_todo"/>
+
+        <ImageButton
+            android:id="@+id/nav_simulation"
+            android:layout_width="0dp"
+            android:layout_weight="1"
+            android:layout_height="60dp"
+            android:backgroundTint="#00001111"
+            android:src="@drawable/ic_icon_simulation"/>
+
+        <ImageButton
+            android:id="@+id/nav_map"
+            android:layout_width="0dp"
+            android:layout_weight="1"
+            android:layout_height="60dp"
+            android:backgroundTint="#00001111"
+            android:src="@drawable/ic_icon_map"/>
+
+        <ImageButton
+            android:id="@+id/nav_mypage"
+            android:layout_width="0dp"
             android:layout_weight="1"
-            android:layout_marginTop="20dp"
-            android:orientation="vertical"
-            android:background="#22ee34"/>
+            android:layout_height="60dp"
+            android:backgroundTint="#00001111"
+            android:src="@drawable/ic_icon_mypage"/>
     </LinearLayout>
-</ScrollView>
\ No newline at end of file
+</LinearLayout>
\ No newline at end of file
diff --git a/SHAPEUP2022/app/src/main/res/layout/simulation_main.xml b/SHAPEUP2022/app/src/main/res/layout/simulation_main.xml
index deb8729..f61446b 100644
--- a/SHAPEUP2022/app/src/main/res/layout/simulation_main.xml
+++ b/SHAPEUP2022/app/src/main/res/layout/simulation_main.xml
@@ -208,10 +208,56 @@
                 </ScrollView>
 
             </FrameLayout>
+            <!--Tab bar-->
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal">
+
+                <ImageButton
+                    android:id="@+id/nav_home"
+                    android:layout_width="0dp"
+                    android:layout_weight="1"
+                    android:layout_height="60dp"
+                    android:backgroundTint="#ffffff"
+                    android:src="@drawable/ic_icon_home"/>
+
+                <ImageButton
+                    android:id="@+id/nav_todo"
+                    android:layout_width="0dp"
+                    android:layout_weight="1"
+                    android:layout_height="60dp"
+                    android:backgroundTint="#00001111"
+                    android:src="@drawable/ic_icon_todo"/>
 
+                <ImageButton
+                    android:id="@+id/nav_simulation"
+                    android:layout_width="0dp"
+                    android:layout_weight="1"
+                    android:layout_height="60dp"
+                    android:backgroundTint="#00001111"
+                    android:src="@drawable/ic_icon_simulation"/>
+
+                <ImageButton
+                    android:id="@+id/nav_map"
+                    android:layout_width="0dp"
+                    android:layout_weight="1"
+                    android:layout_height="60dp"
+                    android:backgroundTint="#00001111"
+                    android:src="@drawable/ic_icon_map"/>
+
+                <ImageButton
+                    android:id="@+id/nav_mypage"
+                    android:layout_width="0dp"
+                    android:layout_weight="1"
+                    android:layout_height="60dp"
+                    android:backgroundTint="#00001111"
+                    android:src="@drawable/ic_icon_mypage"/>
+            </LinearLayout>
         </LinearLayout>
 
 
     </FrameLayout>
 
+
 </LinearLayout>
\ No newline at end of file