From 86b9cf5d25fa590c271897f8415e6459eb12729f Mon Sep 17 00:00:00 2001 From: dkyuuum Date: Sun, 14 Jan 2024 22:52:20 +0900 Subject: [PATCH 1/4] =?UTF-8?q?Rename:=20=EC=A1=B8=EC=97=85=20=EC=9A=94?= =?UTF-8?q?=EA=B1=B4=20viewModel=20=ED=8F=B4=EB=8D=94=20=EC=9D=B4=EB=8F=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/mobile/project/ui/gradInfo/CompletionStateFragment.kt | 1 + .../com/mobile/project/ui/gradInfo/GradConditionFragment.kt | 1 + .../umc/com/mobile/project/ui/gradInfo/GradInfoFragment.kt | 1 + .../java/umc/com/mobile/project/ui/gradInfo/GradeFragment.kt | 4 +--- .../project/ui/gradInfo/{ => viewmodel}/GradInfoViewModel.kt | 2 +- 5 files changed, 5 insertions(+), 4 deletions(-) rename app/src/main/java/umc/com/mobile/project/ui/gradInfo/{ => viewmodel}/GradInfoViewModel.kt (84%) 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 From 5afd759b5851b6f69a1bffd1b11b2583330f8282 Mon Sep 17 00:00:00 2001 From: dkyuuum Date: Sun, 14 Jan 2024 22:52:44 +0900 Subject: [PATCH 2/4] =?UTF-8?q?Design:=20=EC=84=A4=EC=A0=95=20fragment=20u?= =?UTF-8?q?i=20#34?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/res/layout/fragment_setting.xml | 381 +++++++++++++------ 1 file changed, 258 insertions(+), 123 deletions(-) diff --git a/app/src/main/res/layout/fragment_setting.xml b/app/src/main/res/layout/fragment_setting.xml index d5eeeae8..3d3ec373 100644 --- a/app/src/main/res/layout/fragment_setting.xml +++ b/app/src/main/res/layout/fragment_setting.xml @@ -1,126 +1,261 @@ - - - - - - - - - - - - - - - - - - - - - - - - + + - - - - - - \ No newline at end of file + android:layout_height="match_parent"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file From 85c952da932b8da194f1a7c1d9f67133590750d1 Mon Sep 17 00:00:00 2001 From: dkyuuum Date: Sun, 14 Jan 2024 22:58:08 +0900 Subject: [PATCH 3/4] =?UTF-8?q?Feat:=20=ED=99=88=EC=97=90=EC=84=9C=20?= =?UTF-8?q?=EB=8D=94=EB=B3=B4=EA=B8=B0=20=ED=81=B4=EB=A6=AD=20=EC=8B=9C=20?= =?UTF-8?q?=EC=A1=B8=EC=97=85=20=EC=9A=94=EA=B1=B4=20=ED=8E=98=EC=9D=B4?= =?UTF-8?q?=EC=A7=80=EB=A1=9C=20=EC=9D=B4=EB=8F=99=20#5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../umc/com/mobile/project/ui/home/HomeFragment.kt | 10 +++++++--- app/src/main/res/layout/fragment_home.xml | 6 +++--- app/src/main/res/navigation/mobile_navigation.xml | 3 +++ 3 files changed, 13 insertions(+), 6 deletions(-) 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 @@ + Date: Sun, 14 Jan 2024 23:02:12 +0900 Subject: [PATCH 4/4] =?UTF-8?q?Fix:=20=ED=94=84=EB=9E=98=EA=B7=B8=EB=A8=BC?= =?UTF-8?q?=ED=8A=B8=20=EC=9D=B4=EB=8F=99=20=ED=9B=84=20=EB=8B=A4=EC=8B=9C?= =?UTF-8?q?=20navibar=20=ED=81=B4=EB=A6=AD=20=EC=8B=9C=20=EC=9D=B4?= =?UTF-8?q?=EB=8F=99=20=EB=90=98=EC=A7=80=20=EC=95=8A=EB=8A=94=20=EB=B2=84?= =?UTF-8?q?=EA=B7=B8=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/umc/com/mobile/project/MainActivity.kt | 11 +++++++++++ 1 file changed, 11 insertions(+) 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