#27 navbar 수정: 아이콘 수정 및 액티비티 연결: 업적 화면 (#68)

SHAPE-UP · Aug 7, 2022 · 4759e85 · 4759e85
1 parent a7c8a10
commit 4759e85
Show file tree

Hide file tree

Showing 13 changed files with 212 additions and 104 deletions.
diff --git a/SHAPEUP2022/.idea/misc.xml b/SHAPEUP2022/.idea/misc.xml
diff --git a/SHAPEUP2022/app/src/main/java/com/example/shape_up_2022/AchieveActivity.kt b/SHAPEUP2022/app/src/main/java/com/example/shape_up_2022/AchieveActivity.kt
@@ -1,5 +1,6 @@
 package com.example.shape_up_2022
 
+import android.content.Intent
 import com.example.progressbar.ViewPagerAdapter
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
@@ -53,5 +54,37 @@ class AchieveActivity : AppCompatActivity() {
                 3->tab.text = R.string.achieve_tab4.toString()
             }
         }.attach()
+
+        // 탭바 연결
+        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.navAchievement.setOnClickListener {
+            val intent_achieve = Intent(this, AchieveActivity::class.java)
+            startActivity(intent_achieve)
+            overridePendingTransition(0, 0)
+            finish()
+        }
+        binding.navMypage.setOnClickListener {
+            val intent_mypage = Intent(this, MyPageActivity::class.java)
+            startActivity(intent_mypage)
+            overridePendingTransition(0, 0)
+            finish()
+        }
     }
 }
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
@@ -43,8 +43,11 @@ class MainActivity : AppCompatActivity() {
             overridePendingTransition(0, 0)
             finish()
         }
-        binding.navMap.setOnClickListener {
-
+        binding.navAchievement.setOnClickListener {
+            val intent_achieve = Intent(this, AchieveActivity::class.java)
+            startActivity(intent_achieve)
+            overridePendingTransition(0, 0)
+            finish()
         }
         binding.navMypage.setOnClickListener {
             val intent_mypage = Intent(this, MyPageActivity::class.java)
@@ -76,8 +79,4 @@ class MainActivity : AppCompatActivity() {
         transaction.add(location, fragment)
         transaction.commit()
     }
-
-    fun happtyuf(){
-
-    }
 }
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
@@ -104,8 +104,11 @@ class MyPageActivity : AppCompatActivity() {
             finish()
         }
 
-        binding.navMap.setOnClickListener { // 지도
-
+        binding.navAchievement.setOnClickListener {
+            val intent_achieve = Intent(this, AchieveActivity::class.java)
+            startActivity(intent_achieve)
+            overridePendingTransition(0, 0)
+            finish()
         }
 
         binding.navMypage.setOnClickListener {

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
@@ -99,8 +99,11 @@ class SimulationActivity : AppCompatActivity() {
             finish()
         }
 
-        binding.navMap.setOnClickListener {
-
+        binding.navAchievement.setOnClickListener {
+            val intent_achieve = Intent(this, AchieveActivity::class.java)
+            startActivity(intent_achieve)
+            overridePendingTransition(0, 0)
+            finish()
         }
 
         binding.navMypage.setOnClickListener {

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
@@ -101,8 +101,11 @@ class ToDoActivity : AppCompatActivity() {
             finish()
         }
 
-        binding.navMap.setOnClickListener {
-
+        binding.navAchievement.setOnClickListener {
+            val intent_achieve = Intent(this, AchieveActivity::class.java)
+            startActivity(intent_achieve)
+            overridePendingTransition(0, 0)
+            finish()
         }
 
         binding.navMypage.setOnClickListener {

diff --git a/SHAPEUP2022/app/src/main/res/drawable/ic_icon_flags.xml b/SHAPEUP2022/app/src/main/res/drawable/ic_icon_flags.xml
@@ -0,0 +1,5 @@
+<vector android:height="32dp"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="32dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@color/base_color2" android:pathData="M14,9l-1,-2H7V5.72C7.6,5.38 8,4.74 8,4c0,-1.1 -0.9,-2 -2,-2S4,2.9 4,4c0,0.74 0.4,1.38 1,1.72V21h2v-4h5l1,2h7V9H14zM18,17h-4l-1,-2H7V9h5l1,2h5V17z"/>
+</vector>
diff --git a/SHAPEUP2022/app/src/main/res/drawable/ic_icon_flags_sel.xml b/SHAPEUP2022/app/src/main/res/drawable/ic_icon_flags_sel.xml
@@ -0,0 +1,5 @@
+<vector android:height="32dp"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="32dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@color/main_color" android:pathData="M14,9l-1,-2H7V5.72C7.6,5.38 8,4.74 8,4c0,-1.1 -0.9,-2 -2,-2S4,2.9 4,4c0,0.74 0.4,1.38 1,1.72V21h2v-4h5l1,2h7V9H14zM18,17h-4l-1,-2H7V9h5l1,2h5V17z"/>
+</vector>