[fix] 마이페이지 ui 수정

Author: fredleeJH

SPOTeam_android/.idea/misc.xml

@@ -14,10 +14,8 @@ class AuthInterceptor(private val context: Context) : Interceptor {
     override fun intercept(chain: Interceptor.Chain): Response {
         var request = chain.request()
 
-        // 현재 저장된 액세스 토큰 가져오기
         val currentToken = getAccessTokenFromPreferences()
 
-        // 특정 URL에 Authorization 헤더를 제외하고 추가
         if (currentToken != null &&
             !request.url.toString().contains("/spot/check/login-id") &&
             !request.url.toString().contains("/spot/check/email")
@@ -31,8 +29,7 @@ class AuthInterceptor(private val context: Context) : Interceptor {
         var response = chain.proceed(request)
 
         // 토큰 만료 처리: 401 또는 400 상태 코드 확인
-        if (response.code == 401) {
-            Log.d("AuthInterceptor", "Token expired. Attempting to refresh token...")
+        if (response.code == 401 || response.code == 400) {
 
             synchronized(this) {
                 // 갱신된 액세스 토큰 확인

SPOTeam_android/app/src/main/java/com/example/spoteam_android/Authenticator.kt

@@ -64,7 +64,7 @@ class RegionPreferenceFragment : Fragment() {
             transaction.commit()
         }
 
-        binding.editReasonCancelBt.setOnClickListener {
+        binding.checklistspotLocationPlusBt.setOnClickListener {
             goToLocationFragment()
         }
         binding.fragmentRegionPreferenceBackBt.setOnClickListener {
@@ -129,7 +129,7 @@ class RegionPreferenceFragment : Fragment() {
 
             val textView = TextView(requireContext()).apply {
                 text = regionText
-                textSize = 12f
+                textSize = 14.4f
                 setPadding(30, 35, 50, 35) // 패딩 설정
                 setTextColor(resources.getColor(R.color.b500, null))
                 setBackgroundResource(R.drawable.button_background) // 커스텀 배경 적용
@@ -140,8 +140,8 @@ class RegionPreferenceFragment : Fragment() {
                     LinearLayout.LayoutParams.MATCH_PARENT,
                     LinearLayout.LayoutParams.WRAP_CONTENT
                 ).apply {
-                    marginStart = 15
-                    marginEnd = 15
+                    marginStart = 20
+                    marginEnd = 20
                     topMargin = 25
                 }
                 layoutParams = params

SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/RegionPreferenceFragment.kt

@@ -31,7 +31,7 @@ class LocationStudyFragment : Fragment() {
         setupSearchFunctionality()
         loadLocalTsvFile()
 
-        binding.fragmentIntroduceStudyBackBt.setOnClickListener {
+        binding.fragmentLocationStudyBackBt.setOnClickListener {
             goToPreviusFragment()
         }
         return binding.root

SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/LocationStudyFragment.kt

@@ -192,26 +192,17 @@ class MemberStudyFragment : Fragment() {
     }
 
     private fun updateChildAlpha() {
+        val layoutManager = binding.rvMemberStudyNum.layoutManager as LinearLayoutManager
+        val firstVisible = layoutManager.findFirstVisibleItemPosition()
+        val lastVisible = layoutManager.findLastVisibleItemPosition()
 
-        for (i in 0 until binding.rvMemberStudyNum.childCount) {
-            val child = binding.rvMemberStudyNum.getChildAt(i) ?: continue
-
-            val location = IntArray(2)
-            child.getLocationInWindow(location)
-            val childCenterX = location[0] + child.width / 2
-
-            val rvLocation = IntArray(2)
-            binding.rvMemberStudyNum.getLocationInWindow(rvLocation)
-            val rvCenterX = rvLocation[0] + binding.rvMemberStudyNum.width / 2
-
-            val distanceFromCenter = kotlin.math.abs(rvCenterX - childCenterX)
-            val maxDistance = binding.rvMemberStudyNum.width / 2
-            val ratio = distanceFromCenter.toFloat() / maxDistance
-            val alpha = 1f - ratio.coerceIn(0f, 0.7f)
-
-            child.alpha = alpha
+        for (i in firstVisible..lastVisible) {
+            val view = layoutManager.findViewByPosition(i) ?: continue
+            val alpha = if (i == firstVisible || i == lastVisible) 0.4f else 1f
+            view.alpha = alpha
         }
     }
 
 
+
 }

SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/MemberStudyFragment.kt

@@ -44,7 +44,6 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/activity_checklist_tb"/>
 
-    <!-- GridLayout을 ChipGroup 바깥으로 이동 -->
     <GridLayout
         android:id="@+id/activity_checklist_chipGroup"
         android:layout_width="match_parent"

SPOTeam_android/app/src/main/res/layout/activity_check_list_category.xml

@@ -132,7 +132,6 @@
             app:chipMinHeight="47.52dp" />
     </com.google.android.flexbox.FlexboxLayout>
 
-    <!-- 다음 버튼 -->
     <android.widget.Button
         android:id="@+id/activity_checklist_studypurpose_checklistspot_next_bt"
         android:layout_width="0dp"

SPOTeam_android/app/src/main/res/layout/activity_check_list_study_purpose.xml

@@ -31,7 +31,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="10dp"
-        android:text="로그아웃 하시겠습니까?"
+        android:text="로그아웃 할까요?"
         android:textColor="@color/black"
         android:textSize="19dp"
         android:fontFamily="@font/suit_bold"

SPOTeam_android/app/src/main/res/layout/dialog_logout.xml

@@ -43,7 +43,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="20dp"
-        android:text="수정이 완료되었습니다.\n사용자 님을 응원해요! 화이팅!"
+        android:text="수정이 완료되었어요.\n사용자 님의 목표를 응원해요!"
         android:textColor="@color/black"
         android:gravity="center"
         android:lineSpacingExtra="4dp"

SPOTeam_android/app/src/main/res/layout/dialog_purpose_upload_complete.xml

@@ -26,26 +26,29 @@
             android:id="@+id/fragment_activity_fee_study_tv"
             android:text="스터디 만들기"
             android:textColor="@color/black"
-            android:textSize="16dp"
+            android:textSize="15dp"
             android:layout_marginStart="20dp"
-            android:fontFamily="@font/suit_semi_bold"
+            android:fontFamily="@font/suit_variable_font"
+            android:textFontWeight="600"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:drawablePadding="20dp"/>
 
     </LinearLayout>
 
 
+
     <ProgressBar
         android:id="@+id/fragment_activity_fee_study_pb"
         android:layout_width="match_parent"
-        android:layout_height="4dp"
+        android:layout_height="2.88dp"
         android:background="#D8D8D8"
-        android:layout_marginTop="20dp"
+        android:layout_marginTop="10dp"
         app:layout_constraintTop_toBottomOf="@id/fragment_activity_fee_study_ll"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent"/>
 
+
     <TextView
         android:id="@+id/fragment_activity_fee_study_activity_tv"
         android:layout_width="wrap_content"
@@ -112,6 +115,8 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         android:layout_marginTop="40dp"
+        android:layout_marginStart="20dp"
+        android:layout_marginEnd="20dp"
         android:visibility="gone"
         app:layout_constraintTop_toBottomOf="@id/fragment_online_study_chipgroup">
 
@@ -122,9 +127,9 @@
             android:layout_alignParentStart="true"
             android:layout_centerVertical="true"
             android:layout_gravity="start|center"
-            android:layout_marginStart="15dp"
             android:text="총 활동비"
-            android:fontFamily="@font/suit_semi_bold"
+            android:fontFamily="@font/suit_variable_font"
+            android:textFontWeight="600"
             android:textColor="@color/black"
             android:textSize="15dp" />
 
@@ -135,8 +140,9 @@
             android:layout_gravity="end|center"
             android:text="₩"
             android:textColor="@color/black"
-            android:fontFamily="@font/suit_bold"
-            android:layout_marginEnd="130dp"/>
+            android:fontFamily="@font/suit_variable_font"
+            android:textFontWeight="600"
+            android:layout_marginEnd="120dp"/>
 
 
 
@@ -146,13 +152,13 @@
             android:layout_width="110dp"
             android:layout_height="40dp"
             android:layout_gravity="end|center"
-            android:layout_marginEnd="15dp"
             android:background="@drawable/edittext_rounded_corner_rectangle"
             android:layout_weight="1"
             android:ems="10"
             android:inputType="number"
             android:textSize="14dp"
-            android:fontFamily="@font/suit_bold"
+            android:fontFamily="@font/suit_variable_font"
+            android:textFontWeight="600"
             android:textColor="@color/black"
             android:padding="10dp"/>
     </FrameLayout>