Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions app/src/main/java/umc/com/mobile/project/MainActivity.kt
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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()
}
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down
10 changes: 7 additions & 3 deletions app/src/main/java/umc/com/mobile/project/ui/home/HomeFragment.kt
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ class HomeFragment : Fragment() {
): View {
_binding = FragmentHomeBinding.inflate(inflater, container, false)

navigateGradDateFragment() // 졸업 예정일로 이동
saveCheeringMemo() // 응원의 한마디
navigateFragment() // 페이지 이동
saveCheeringMemo() // 응원의 한마디 연결

return binding.root
}
Expand All @@ -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() {
Expand Down
6 changes: 3 additions & 3 deletions app/src/main/res/layout/fragment_home.xml
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@

<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/btn_cheering_word_move"
style="@style/MediumFont.10"
style="@style/MediumFont.12"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="15dp"
Expand Down Expand Up @@ -226,8 +226,8 @@
app:layout_constraintTop_toTopOf="parent" />

<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/tv_home_etc"
style="@style/MediumFont.12"
android:id="@+id/btn_navigate_grad_info"
style="@style/MediumFont.14"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="20dp"
Expand Down
Loading