diff --git a/app/src/main/java/umc/com/mobile/project/MainActivity.kt b/app/src/main/java/umc/com/mobile/project/MainActivity.kt
index 11116b22..0268f07d 100644
--- a/app/src/main/java/umc/com/mobile/project/MainActivity.kt
+++ b/app/src/main/java/umc/com/mobile/project/MainActivity.kt
@@ -4,6 +4,7 @@ import android.os.Bundle
import androidx.appcompat.app.AppCompatActivity
import androidx.navigation.NavController
import androidx.navigation.fragment.NavHostFragment
+import androidx.navigation.ui.NavigationUI
import androidx.navigation.ui.setupWithNavController
import umc.com.mobile.project.databinding.ActivityMainBinding
@@ -23,7 +24,17 @@ class MainActivity : AppCompatActivity() {
navController = navHostFragment.navController
binding.navView.setupWithNavController(navController)
+
+ binding.navView.apply {
+ setupWithNavController(navController)
+ setOnItemSelectedListener { item ->
+ NavigationUI.onNavDestinationSelected(item, navController)
+ navController.popBackStack(item.itemId, inclusive = false)
+ true
+ }
+ }
}
+
override fun onNavigateUp(): Boolean =
navController.navigateUp() || super.onNavigateUp()
}
\ No newline at end of file
diff --git a/app/src/main/java/umc/com/mobile/project/ui/gradInfo/CompletionStateFragment.kt b/app/src/main/java/umc/com/mobile/project/ui/gradInfo/CompletionStateFragment.kt
index 715197a6..11d863d2 100644
--- a/app/src/main/java/umc/com/mobile/project/ui/gradInfo/CompletionStateFragment.kt
+++ b/app/src/main/java/umc/com/mobile/project/ui/gradInfo/CompletionStateFragment.kt
@@ -7,6 +7,7 @@ import android.view.ViewGroup
import androidx.fragment.app.Fragment
import androidx.fragment.app.viewModels
import umc.com.mobile.project.databinding.FragmentCompletionStateBinding
+import umc.com.mobile.project.ui.gradInfo.viewmodel.GradInfoViewModel
class CompletionStateFragment : Fragment() {
private var _binding: FragmentCompletionStateBinding? = null
diff --git a/app/src/main/java/umc/com/mobile/project/ui/gradInfo/GradConditionFragment.kt b/app/src/main/java/umc/com/mobile/project/ui/gradInfo/GradConditionFragment.kt
index 1ddb2be4..c041fef9 100644
--- a/app/src/main/java/umc/com/mobile/project/ui/gradInfo/GradConditionFragment.kt
+++ b/app/src/main/java/umc/com/mobile/project/ui/gradInfo/GradConditionFragment.kt
@@ -7,6 +7,7 @@ import android.view.ViewGroup
import androidx.fragment.app.Fragment
import androidx.fragment.app.viewModels
import umc.com.mobile.project.databinding.FragmentGradConditionBinding
+import umc.com.mobile.project.ui.gradInfo.viewmodel.GradInfoViewModel
class GradConditionFragment : Fragment() {
private var _binding: FragmentGradConditionBinding? = null
diff --git a/app/src/main/java/umc/com/mobile/project/ui/gradInfo/GradInfoFragment.kt b/app/src/main/java/umc/com/mobile/project/ui/gradInfo/GradInfoFragment.kt
index db15e646..99561882 100644
--- a/app/src/main/java/umc/com/mobile/project/ui/gradInfo/GradInfoFragment.kt
+++ b/app/src/main/java/umc/com/mobile/project/ui/gradInfo/GradInfoFragment.kt
@@ -11,6 +11,7 @@ import com.google.android.material.tabs.TabLayout
import com.google.android.material.tabs.TabLayoutMediator
import umc.com.mobile.project.databinding.FragmentGradInfoBinding
import umc.com.mobile.project.ui.gradInfo.adapter.GradInfoVPAdapter
+import umc.com.mobile.project.ui.gradInfo.viewmodel.GradInfoViewModel
class GradInfoFragment : Fragment() {
private var _binding: FragmentGradInfoBinding? = null
diff --git a/app/src/main/java/umc/com/mobile/project/ui/gradInfo/GradeFragment.kt b/app/src/main/java/umc/com/mobile/project/ui/gradInfo/GradeFragment.kt
index 48ff1ba3..e1edbdcf 100644
--- a/app/src/main/java/umc/com/mobile/project/ui/gradInfo/GradeFragment.kt
+++ b/app/src/main/java/umc/com/mobile/project/ui/gradInfo/GradeFragment.kt
@@ -1,17 +1,15 @@
package umc.com.mobile.project.ui.gradInfo
-import android.R
import android.os.Bundle
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import android.widget.AdapterView
-import android.widget.ArrayAdapter
-import android.widget.SpinnerAdapter
import android.widget.Toast
import androidx.fragment.app.Fragment
import androidx.fragment.app.viewModels
import umc.com.mobile.project.databinding.FragmentGradeBinding
+import umc.com.mobile.project.ui.gradInfo.viewmodel.GradInfoViewModel
class GradeFragment : Fragment() {
private var _binding: FragmentGradeBinding? = null
diff --git a/app/src/main/java/umc/com/mobile/project/ui/gradInfo/GradInfoViewModel.kt b/app/src/main/java/umc/com/mobile/project/ui/gradInfo/viewmodel/GradInfoViewModel.kt
similarity index 84%
rename from app/src/main/java/umc/com/mobile/project/ui/gradInfo/GradInfoViewModel.kt
rename to app/src/main/java/umc/com/mobile/project/ui/gradInfo/viewmodel/GradInfoViewModel.kt
index 8e64e481..3bb4a5b3 100644
--- a/app/src/main/java/umc/com/mobile/project/ui/gradInfo/GradInfoViewModel.kt
+++ b/app/src/main/java/umc/com/mobile/project/ui/gradInfo/viewmodel/GradInfoViewModel.kt
@@ -1,4 +1,4 @@
-package umc.com.mobile.project.ui.gradInfo
+package umc.com.mobile.project.ui.gradInfo.viewmodel
import androidx.lifecycle.LiveData
import androidx.lifecycle.MutableLiveData
diff --git a/app/src/main/java/umc/com/mobile/project/ui/home/HomeFragment.kt b/app/src/main/java/umc/com/mobile/project/ui/home/HomeFragment.kt
index eec653ef..89a7421f 100644
--- a/app/src/main/java/umc/com/mobile/project/ui/home/HomeFragment.kt
+++ b/app/src/main/java/umc/com/mobile/project/ui/home/HomeFragment.kt
@@ -30,8 +30,8 @@ class HomeFragment : Fragment() {
): View {
_binding = FragmentHomeBinding.inflate(inflater, container, false)
- navigateGradDateFragment() // 졸업 예정일로 이동
- saveCheeringMemo() // 응원의 한마디
+ navigateFragment() // 페이지 이동
+ saveCheeringMemo() // 응원의 한마디 연결
return binding.root
}
@@ -46,10 +46,14 @@ class HomeFragment : Fragment() {
_binding = null
}
- private fun navigateGradDateFragment() {
+ private fun navigateFragment() {
binding.btnCheeringWordMove.setOnClickListener {
navigate(R.id.action_fragment_home_to_fragment_date)
}
+
+ binding.btnNavigateGradInfo.setOnClickListener {
+ navigate(R.id.action_fragment_home_to_fragment_grad_info)
+ }
}
private fun saveCheeringMemo() {
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
index 4c61840c..7c955693 100644
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -158,7 +158,7 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-
-
-
-
-
\ No newline at end of file
+ android:layout_height="match_parent">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/navigation/mobile_navigation.xml b/app/src/main/res/navigation/mobile_navigation.xml
index 6ea1ef29..68beb5a8 100644
--- a/app/src/main/res/navigation/mobile_navigation.xml
+++ b/app/src/main/res/navigation/mobile_navigation.xml
@@ -13,6 +13,9 @@
+