[QA] 연락처 외 수정사항 반영

Near/app/build.gradle.kts

@@ -18,7 +18,7 @@ android {
         applicationId = "com.alarmy.near"
         minSdk = 27
         targetSdk = 35
-        versionCode = 3
+        versionCode = 4
         versionName = "1.0"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"

Near/app/src/main/java/com/alarmy/near/data/mapper/FriendMapper.kt

@@ -13,6 +13,9 @@ import com.alarmy.near.network.response.AnniversaryEntity
 import com.alarmy.near.network.response.ContactFrequencyEntity
 import com.alarmy.near.network.response.FriendEntity
 import com.alarmy.near.utils.logger.NearLog
+import java.time.LocalDate
+import java.time.format.DateTimeFormatter
+import java.util.Locale
 
 fun FriendEntity.toModel(): Friend =
     Friend(
@@ -26,8 +29,25 @@ fun FriendEntity.toModel(): Friend =
         memo = memo,
         phone = phone,
         lastContactAt = lastContactAt,
+        isContactToday = lastContactAt?.isToday() ?: false,
+        lastContactFormat = lastContactAt?.contactFormat(),
     )
 
+fun String.contactFormat(): String {
+    val inputFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd")
+    val outputFormatter = DateTimeFormatter.ofPattern("M월 d일")
+
+    val date = LocalDate.parse(this, inputFormatter)
+    return date.format(outputFormatter)
+}
+
+private fun String.isToday(): Boolean {
+    val formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd", Locale.KOREA)
+    val targetDate = LocalDate.parse(this, formatter)
+    val today = LocalDate.now()
+    return targetDate == today
+}
+
 fun ContactFrequencyEntity.toModel(): ContactFrequency =
     ContactFrequency(
         reminderInterval = contactWeek.toReminderInterval(),
@@ -46,7 +66,7 @@ fun Friend.toRequest(): FriendRequest =
         name = name,
         relation = relation.toString(),
         contactFrequency = contactFrequency.toRequest(),
-        birthday = birthday,
+        birthday = birthday?.replace(".", "-"),
         anniversaryList = anniversaryList.map { it.toRequest() },
         memo = memo,
         phone = phone,

Near/app/src/main/java/com/alarmy/near/data/repository/DefaultFriendRepository.kt

@@ -39,6 +39,11 @@ class DefaultFriendRepository
                 )
             }
 
+        override fun fetchMonthlyCompleteFriends(): Flow<List<MonthlyFriend>> =
+            apiCallFlow {
+                friendService.fetchMonthlyCompleteFriends().map { it.toModel() }
+            }
+
         override fun fetchFriendById(friendId: String): Flow<Friend> =
             flow {
                 emit(friendService.fetchFriendById(friendId).toModel())

Near/app/src/main/java/com/alarmy/near/data/repository/FriendRepository.kt

@@ -2,9 +2,9 @@ package com.alarmy.near.data.repository
 
 import com.alarmy.near.model.Friend
 import com.alarmy.near.model.FriendRecord
-import com.alarmy.near.network.response.FriendInitItemEntity
 import com.alarmy.near.model.friendsummary.FriendSummary
 import com.alarmy.near.model.monthly.MonthlyFriend
+import com.alarmy.near.network.response.FriendInitItemEntity
 import com.alarmy.near.presentation.feature.friendcontactcycle.model.FriendContactUIModel
 import kotlinx.coroutines.flow.Flow
 
@@ -13,6 +13,8 @@ interface FriendRepository {
 
     fun fetchMonthlyFriends(): Flow<List<MonthlyFriend>>
 
+    fun fetchMonthlyCompleteFriends(): Flow<List<MonthlyFriend>>
+
     fun fetchFriendById(friendId: String): Flow<Friend>
 
     fun updateFriend(
@@ -26,5 +28,8 @@ interface FriendRepository {
 
     fun recordContact(friendId: String): Flow<String>
 
-    fun initFriends(contacts: List<FriendContactUIModel>, providerType: String): Flow<List<FriendInitItemEntity>>
+    fun initFriends(
+        contacts: List<FriendContactUIModel>,
+        providerType: String,
+    ): Flow<List<FriendInitItemEntity>>
 }

Near/app/src/main/java/com/alarmy/near/model/Friend.kt

@@ -22,17 +22,9 @@ data class Friend(
     val memo: String?,
     val phone: String?,
     val lastContactAt: String?, // "2025-07-16"
-) : Parcelable {
-    val isContactedToday: Boolean
-        get() = lastContactAt?.isToday() ?: false
-
-    private fun String.isToday(): Boolean {
-        val formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd", Locale.KOREA)
-        val targetDate = LocalDate.parse(this, formatter)
-        val today = LocalDate.now()
-        return targetDate == today
-    }
-}
+    val lastContactFormat: String? = null, // 친구 상세에 쓰이는 포맷 TODO 추후 UI 모델 분리
+    val isContactToday: Boolean? = null, // 친구 상세에 쓰이는 포맷 TODO 추후 UI 모델 분리
+) : Parcelable
 
 @Serializable
 @Parcelize

Near/app/src/main/java/com/alarmy/near/model/monthly/MonthlyFriend.kt

@@ -13,7 +13,7 @@ data class MonthlyFriend(
     fun daysUntilNextContact(today: LocalDate): String {
         val daysBetween = getDaysBetween(today)
         return when {
-            daysBetween == 0L -> "D-day"
+            daysBetween == 0L -> "D-DAY"
             daysBetween > 0L -> "D-$daysBetween"
             else -> "D+${-daysBetween}" // 과거 날짜
         }

Near/app/src/main/java/com/alarmy/near/network/service/FriendService.kt

@@ -22,6 +22,9 @@ interface FriendService {
     @GET("/friend/monthly")
     suspend fun fetchMonthlyFriends(): List<MonthlyFriendEntity>
 
+    @GET("/friend/monthly/complete")
+    suspend fun fetchMonthlyCompleteFriends(): List<MonthlyFriendEntity>
+
     @GET("/friend/{friendId}")
     suspend fun fetchFriendById(
         @Path("friendId") friendId: String,

Near/app/src/main/java/com/alarmy/near/presentation/feature/friendcontactcycle/components/ContactCycleContent.kt

@@ -27,6 +27,7 @@ import androidx.compose.ui.unit.dp
 import com.alarmy.near.R
 import com.alarmy.near.model.ReminderInterval
 import com.alarmy.near.presentation.feature.friendcontactcycle.model.FriendContactUIModel
+import com.alarmy.near.presentation.ui.component.bottomsheet.CycleSettingBottomSheet
 import com.alarmy.near.presentation.ui.component.checkbox.NearBackgroundCheckbox
 import com.alarmy.near.presentation.ui.extension.onNoRippleClick
 import com.alarmy.near.presentation.ui.theme.NearTheme
@@ -64,10 +65,10 @@ fun ColumnScope.ContactCycleContent(
         )
     }
 
-    Spacer(modifier = Modifier.size(14.dp))
-
     // 한번에 설정이 활성화되었을 때만 표시
     if (isBulkSettingEnabled) {
+        Spacer(modifier = Modifier.size(12.dp))
+
         Row(
             modifier =
                 Modifier
@@ -85,7 +86,9 @@ fun ColumnScope.ContactCycleContent(
             verticalAlignment = Alignment.CenterVertically,
         ) {
             Text(
-                text = selectedCycle?.let { DateExtension.getCycleText(it) } ?: stringResource(R.string.friend_contact_cycle_weekly_format, DateExtension.getTodayDayOfWeekInKorean()),
+                text =
+                    selectedCycle?.let { DateExtension.getCycleText(it) }
+                        ?: stringResource(R.string.friend_contact_cycle_weekly_format, DateExtension.getTodayDayOfWeekInKorean()),
                 style = NearTheme.typography.B2_14_MEDIUM,
                 color = NearTheme.colors.BLACK_1A1A1A,
             )
@@ -101,7 +104,7 @@ fun ColumnScope.ContactCycleContent(
 
     // 리스트가 있을 때만 밑에 리스트 표시
     if (contacts.isNotEmpty()) {
-        Spacer(modifier = Modifier.size(16.dp))
+        Spacer(modifier = Modifier.size(24.dp))
 
         LazyColumn(
             modifier = Modifier.weight(1f),

Near/app/src/main/java/com/alarmy/near/presentation/feature/friendcontactcycle/components/ContactLoadContent.kt

@@ -117,7 +117,7 @@ fun FriendListItem(
             modifier = Modifier.weight(1f),
         ) {
             Image(
-                painter = painterResource(R.drawable.img_100_character_default),
+                painter = painterResource(R.drawable.img_64_user_gray),
                 contentDescription = null,
                 modifier = Modifier.size(24.dp),
             )