Feat: 홈 progressBar 연결 #5

FOR-GRAD · Feb 8, 2024 · b33238a · b33238a
1 parent 8d0f59f
commit b33238a
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 24 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
@@ -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 // 임의값
 		})
 	}
 }
diff --git a/app/src/main/res/drawable/bg_progressbar.xml b/app/src/main/res/drawable/bg_progressbar.xml
@@ -1,26 +1,19 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:cornersandroid="http://schemas.android.com/aapt">
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:id="@android:id/background">
         <shape>
-            <corners android:radius="6dp" />
-            <solid android:color="@color/light_gray" />
+            <corners android:radius="4dp"/>
+            <stroke android:width="3dp" android:color="@color/light_gray"/>
+            <solid android:color="@color/light_gray"/>
         </shape>
     </item>
-    <item android:id="@android:id/secondaryProgress">
-        <clip>
-            <shape>
-                <corners android:radius="6dp" />
-                <solid android:color="#B2CCFF" />
-            </shape>
-        </clip>
-    </item>
+
     <item android:id="@android:id/progress">
-        <clip>
+
+        <scale android:scaleWidth="100%">
             <shape>
-                <corners android:radius="6dp" />
-                <solid android:color="@color/white" />
+                <corners android:radius="4dp"/>
+                <solid android:color="@color/white"/>
             </shape>
-        </clip>
+        </scale>
     </item>
 </layer-list>
diff --git 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}">
 
                             <androidx.appcompat.widget.AppCompatTextView
                                 style="@style/MediumFont.13"