📌 일기작성 날짜선택 viewPager 수정 (#103)

* [style] string 정리 * [fix] 달력 스와이프 시 Month Text변경
MJU-SW-Contest-2024 · Aug 14, 2024 · 5415932 · 5415932
1 parent ac903df
commit 5415932
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 15 deletions.
diff --git a/Nabi/presentation/src/main/java/com/nabi/nabi/views/diary/add/AddDiarySelectDateFragment.kt b/Nabi/presentation/src/main/java/com/nabi/nabi/views/diary/add/AddDiarySelectDateFragment.kt
@@ -5,6 +5,7 @@ import android.app.AlertDialog
 import android.view.LayoutInflater
 import androidx.fragment.app.activityViewModels
 import androidx.fragment.app.viewModels
+import androidx.viewpager2.widget.ViewPager2
 import com.nabi.domain.model.diary.DiaryDbEntity
 import com.nabi.domain.model.diary.DiarySelectInfo
 import com.nabi.nabi.R
@@ -74,8 +75,16 @@ class AddDiarySelectDateFragment :
             vpCalendarMonth.adapter = calendarAdapter
             vpCalendarMonth.setCurrentItem(Int.MAX_VALUE / 2, false)
             vpCalendarMonth.offscreenPageLimit = 1
-        }
 
+            vpCalendarMonth.registerOnPageChangeCallback(object : ViewPager2.OnPageChangeCallback() {
+                override fun onPageSelected(position: Int) {
+                    super.onPageSelected(position)
+
+                    val calendar = getCalendarForPosition(position)
+                    binding.tvSelectMonth.text = dateEnglishOnlyMonthFormat.format(calendar.time)
+                }
+            })
+        }
         updateCurrentMonthText(binding.vpCalendarMonth.currentItem)
     }
 
@@ -153,7 +162,7 @@ class AddDiarySelectDateFragment :
             tempDiary?.diaryTempContent,
             selectedDate.diaryEntryDate
         )
-        (requireActivity() as MainActivity).replaceFragment(fragment, false)
+        (requireActivity() as MainActivity).replaceFragment(fragment, true)
     }
 
     private fun updateCalendarMonth(monthDifference: Int) {

diff --git a/Nabi/presentation/src/main/res/layout/fragment_sign_nickname.xml b/Nabi/presentation/src/main/res/layout/fragment_sign_nickname.xml
@@ -25,7 +25,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintVertical_chainStyle="packed"
 
-            android:text="닉네임 설정"
+            android:text="@string/text_set_nickname"
             android:fontFamily="@font/pretendard_medium"
             android:textStyle="bold"
             android:textColor="#272727"
@@ -39,7 +39,7 @@
             app:layout_constraintTop_toBottomOf="@id/tv_title"
             app:layout_constraintBottom_toTopOf="@id/tv_comment"
 
-            android:hint="닉네임을 입력해주세요"
+            android:hint="@string/hint_set_nickname"
             android:background="@drawable/selector_edittext_nickname"
             android:textColorHint="@color/selector_edittext_nickname_colors"
             android:textColor="@color/black"

diff --git a/Nabi/presentation/src/main/res/layout/item_search_diary.xml b/Nabi/presentation/src/main/res/layout/item_search_diary.xml
@@ -34,16 +34,5 @@
         style="@style/search_result_regular_14px"
         android:maxLines="2"
         android:ellipsize="end"/>
-
-<!--    <View-->
-<!--        android:id="@+id/divider"-->
-<!--        android:layout_width="match_parent"-->
-<!--        android:layout_height="0.5dp"-->
-
-<!--        app:layout_constraintTop_toBottomOf="@id/tv_content"-->
-<!--        app:layout_constraintBottom_toBottomOf="parent"-->
-<!--        android:layout_marginTop="8dp"-->
-
-<!--        android:background="@color/gray2"/>-->
 
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/Nabi/presentation/src/main/res/values/strings.xml b/Nabi/presentation/src/main/res/values/strings.xml
@@ -15,6 +15,10 @@
     <string name="text_recent_login">최근에 이용했어요!</string>
     <string name="text_team_name">Team 너의비밀친구</string>
 
+    <!-- 닉네임 설정 페이지 -->
+    <string name="text_set_nickname">닉네임 설정</string>
+    <string name="hint_set_nickname">닉네임을 입력해주세요</string>
+
     <!-- 달력 -->
     <string name="text_week_monday">M</string>
     <string name="text_week_tuesday">T</string>