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 dc0b53c1..a409634d 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 @@ -36,13 +36,13 @@ class HomeFragment : Fragment() { binding.lifecycleOwner = viewLifecycleOwner binding.vm = viewModel - navigateFragment() // 페이지 이동 - saveCheeringMemo() // 응원의 한마디 연결 viewModel.getUserInfo() // 홈 화면 정보 조회 api + + navigateFragment() + saveCheeringMemo() // 응원의 한마디 연결 setupRecyclerView() // recyclerView 연결 setupHomeInfoRetrofit() // 홈 화면 ui 연결 - return binding.root } @@ -56,6 +56,7 @@ class HomeFragment : Fragment() { _binding = null } + // 페이지 이동 private fun navigateFragment() { binding.btnCheeringWordMove.setOnClickListener { navigate(R.id.action_fragment_home_to_fragment_date) @@ -107,6 +108,10 @@ class HomeFragment : Fragment() { binding.tvGradeSemester.text = it?.result?.futureTimeTableDto?.keys?.joinToString(separator = ", ") + + val dDay = it?.result?.dday ?: 0 +// binding.progressbarToGrad.progress = 1460 - dDay + binding.progressbarToGrad.progress = 1095 // 임의값 }) } } \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_progressbar.xml b/app/src/main/res/drawable/bg_progressbar.xml index 2b4d07d2..f71331dc 100644 --- a/app/src/main/res/drawable/bg_progressbar.xml +++ b/app/src/main/res/drawable/bg_progressbar.xml @@ -1,26 +1,19 @@ - - + - - + + + - - - - - - - - + - + + - - + + - + diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml index 26950fda..42f260fa 100644 --- a/app/src/main/res/layout/fragment_home.xml +++ b/app/src/main/res/layout/fragment_home.xml @@ -241,12 +241,12 @@ android:id="@+id/progressbar_to_grad" style="@style/Widget.AppCompat.ProgressBar.Horizontal" android:layout_width="match_parent" - android:max="100" android:layout_height="match_parent" + android:progressDrawable="@drawable/bg_progressbar" android:layout_marginStart="20dp" android:layout_marginTop="50dp" android:layout_marginEnd="20dp" - android:background="@drawable/bg_progressbar" + android:max="1460" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/tv_graduate_content" /> @@ -320,10 +320,10 @@ android:layout_width="match_parent" android:layout_height="0dp" android:visibility="invisible" - app:visibleIf="@{vm.planStatus}" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toTopOf="parent"> + app:layout_constraintTop_toTopOf="parent" + app:visibleIf="@{vm.planStatus}">