Skip to content

[FIX/#309] 2차 QA 매칭, 알림 뷰 문구 수정 #310

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
seungjunGong merged 6 commits into from
Apr 9, 2026
Merged

[FIX/#309] 2차 QA 매칭, 알림 뷰 문구 수정 #310

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
905a469
[chore/#309] strings.xml에 tools:ignore="MissingTranslation" 속성 추가
seungjunGong Apr 6, 2026
53f6924
[chore/#309] 알림 화면 종목 문구 변경 및 다이얼로그 문자열 리소스화
seungjunGong Apr 6, 2026
ed7c902
[chore/#309] 매칭 관리 탭 관련 문구 수정
seungjunGong Apr 6, 2026
c1d36c2
[del/#309] 필요 없는 코드 제거
seungjunGong Apr 7, 2026
2bc7587
[del/#309] 필요 없는 코드 제거
seungjunGong Apr 7, 2026
f0a4024
[merge/#310] pulled develop
seungjunGong Apr 9, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions app/src/main/java/com/smashing/app/data/repository/api/UserRepository.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
package com.smashing.app.data.repository.api

import com.smashing.app.data.model.review.GameReviewResult
import com.smashing.app.data.model.profile.user.UserProfileInfo
import com.smashing.app.data.model.review.GameReviewResult

interface UserRepository {
suspend fun getUserProfileId(): String?
suspend fun getUserNickname(): String?
suspend fun setUserInfo(userProfileId: String, userNickname: String)
suspend fun clearUserInfo()
suspend fun getUserInfoDetail(
userProfileId: String,
sportCode: String?,
Expand Down
6 changes: 0 additions & 6 deletions app/src/main/java/com/smashing/app/data/repository/impl/UserRepositoryImpl.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,6 @@ class UserRepositoryImpl @Inject constructor(
override suspend fun getUserNickname(): String? =
localUserDataSource.getUserNickName()

override suspend fun setUserInfo(userProfileId: String, userNickname: String) =
localUserDataSource.setUserInfo(userProfileId, userNickname)

override suspend fun clearUserInfo() =
localUserDataSource.clearUserInfo()

override suspend fun getUserInfoDetail(
userProfileId: String,
sportCode: String?
Expand Down
3 changes: 1 addition & 2 deletions app/src/main/java/com/smashing/app/data/type/SportType.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,7 @@ enum class SportType(
);

companion object {
fun findSportType(sportId: Long): SportType = entries.find { it.id == sportId } ?: PING_PONG
fun findSportTypeToSportName(sportName: String): SportType = entries.find { it.sportName == sportName } ?: PING_PONG
fun findSportTypeToSportCode(sportCode: String): SportType = entries.find { it.code == sportCode } ?: PING_PONG
}
}
}
7 changes: 2 additions & 5 deletions app/src/main/java/com/smashing/app/presentation/confirmreview/ConfirmReviewScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,13 @@ import androidx.lifecycle.compose.collectAsStateWithLifecycle
import com.smashing.app.R.drawable.ic_thumbs_down_lg
import com.smashing.app.R.drawable.ic_thumbs_up_double_lg
import com.smashing.app.R.drawable.ic_thumbs_up_lg
import com.smashing.app.R.string.review
import com.smashing.app.R.string.confirm
import com.smashing.app.R.string.confirm_review_arrived_with_nickname
import com.smashing.app.R.string.review
import com.smashing.app.core.designsystem.component.button.SmashingButton
import com.smashing.app.core.designsystem.component.topbar.SmashingDefaultTopBar
import com.smashing.app.core.designsystem.style.ButtonStyle
import com.smashing.app.core.designsystem.state.TopBarState
import com.smashing.app.core.designsystem.style.ButtonStyle
import com.smashing.app.core.designsystem.theme.SmashingAndroidTheme
import com.smashing.app.core.designsystem.theme.SmashingTheme
import com.smashing.app.data.type.ReviewRatingType
Expand All @@ -43,7 +43,6 @@ fun ConfirmReviewRoute(

ConfirmReviewScreen(
uiState = uiState,
onBackClick = navigateUp,
onConfirmClick = navigateUp,
modifier = modifier,
)
Expand All @@ -52,7 +51,6 @@ fun ConfirmReviewRoute(
@Composable
private fun ConfirmReviewScreen(
uiState: ConfirmReviewContract.State,
onBackClick: () -> Unit,
onConfirmClick: () -> Unit,
modifier: Modifier = Modifier,
) {
Expand Down Expand Up @@ -126,7 +124,6 @@ private fun ConfirmReviewScreenPreview() {
reviewText = "매너가 좋으셨습니다. 다음에 또 해요!",
tags = persistentListOf("시간 약속을 잘 지켜요", "경기 매너가 좋아요"),
),
onBackClick = {},
onConfirmClick = {},
)
}
Expand Down
18 changes: 13 additions & 5 deletions app/src/main/java/com/smashing/app/presentation/notice/NoticeScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,10 @@ import androidx.lifecycle.compose.LocalLifecycleOwner
import androidx.lifecycle.compose.collectAsStateWithLifecycle
import androidx.lifecycle.flowWithLifecycle
import com.smashing.app.R
import com.smashing.app.R.string.no
import com.smashing.app.R.string.notice_change_dialog_change_btn
import com.smashing.app.R.string.notice_change_dialog_subtitle
import com.smashing.app.R.string.notice_change_dialog_title
import com.smashing.app.core.designsystem.component.appicon.AppIcon
import com.smashing.app.core.designsystem.component.dialog.SmashingDialog
import com.smashing.app.core.designsystem.component.topbar.SmashingDefaultTopBar
Expand All @@ -30,9 +34,11 @@ import com.smashing.app.core.designsystem.theme.SmashingAndroidTheme
import com.smashing.app.core.designsystem.theme.SmashingTheme
import com.smashing.app.core.extension.onBottomReached
import com.smashing.app.data.model.notification.Notification
import com.smashing.app.data.type.SportType
import com.smashing.app.presentation.matching.type.MatchingType
import com.smashing.app.presentation.notice.component.NoticeItem


@Composable
fun NoticeRoute(
navigateUp: () -> Unit,
Expand Down Expand Up @@ -136,14 +142,16 @@ private fun NoticeScreen(
)

if (uiState.isChangeDialogVisible) {
val sportName = uiState.targetChangeSport.sportType.sportName
val sport = uiState.targetChangeSport.sportType
val sportText = sport.sportName + if (sport == SportType.BADMINTON) "으로" else "로"

SmashingDialog(
title = "${sportName}로 종목을 변경하시겠어요?",
title = stringResource(notice_change_dialog_title, sportText),
onDismissClick = onDismissChangeProfile,
subtitle = "종목은 재변경 가능합니다.",
subtitle = stringResource(notice_change_dialog_subtitle),
type = DialogStyle.ALERT,
confirmText = "변경하기",
dismissText = "아니요",
confirmText = stringResource(notice_change_dialog_change_btn),
dismissText = stringResource(no),
onConfirmClick = onConfirmChangeProfile,
)
}
Expand Down
13 changes: 8 additions & 5 deletions app/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<resources>
<resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">

@coderabbitai coderabbitai Bot Apr 7, 2026

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue | 🟠 Major

전역 MissingTranslation 무시는 범위를 축소하는 것이 안전합니다.

Line 1에서 루트 resources에 tools:ignore="MissingTranslation"를 걸면 신규 문자열 번역 누락이 계속 숨겨집니다. 필요한 항목에만 국소적으로 suppress 하거나, 임시 대응이라면 추후 제거 계획을 명시해 주세요.

🤖 Prompt for AI Agents 
Verify each finding against the current code and only fix it if needed.

In `@app/src/main/res/values/strings.xml` at line 1, Root-level
tools:ignore="MissingTranslation" on the <resources> element hides all
missing-translation warnings; change it to target only the specific string(s)
that intentionally lack translations (move tools:ignore="MissingTranslation"
from the root to the individual <string> entries that need suppression) and add
a TODO comment or tracking identifier in those string entries indicating this is
temporary and when/why it should be removed; update any affected identifiers
(string names) accordingly so the suppression is localized and auditable.


<!--Common -->
<string name="home">홈</string>
<string name="matching_search">매칭 탐색</string>
Expand Down Expand Up @@ -361,14 +362,14 @@
<string name="matching_btn_canceled">매칭 취소 대기 중</string>
<string name="matching_btn_unknown">unknown</string>
<string name="matching_receive">받은 매칭</string>
<string name="matching_receive_empty">받은 요청이 없어요</string>
<string name="matching_receive_empty">받은 매칭이 없어요</string>
<string name="matching_send">보낸 매칭</string>
<string name="matching_send_empty">보낸 요청이 없어요</string>
<string name="matching_send_empty">보낸 매칭이 없어요</string>
<string name="matching_confirm">매칭 확정</string>
<string name="matching_confirm_empty">확정된 매칭이 없어요</string>
<string name="matching_empty_description">직접 경쟁을 신청해보세요!</string>
<string name="matching_send_dialog_title">요청을 취소하시겠습니까?</string>
<string name="matching_send_dialog_description">요청 취소 시 24시간 후 재요청할 수 있습니다.</string>
<string name="matching_send_dialog_description">취소 시 24시간 후 재요청할 수 있습니다.</string>
<string name="matching_accepted_dialog_title">정말 매칭을 취소하시겠습니까?</string>
<string name="matching_accepted_dialog_description">매칭 상대도 동의해야 취소가 완료됩니다.</string>

Expand All @@ -384,6 +385,9 @@

<!--Notice -->
<string name="notice">알림</string>
<string name="notice_change_dialog_title">%s 종목을 변경하시겠어요?</string>
<string name="notice_change_dialog_subtitle">종목은 내 프로필에서 재변경 가능합니다.</string>
<string name="notice_change_dialog_change_btn">변경하기</string>

<!--Profile-->
<string name="profile_add_sports_label">+</string>
Expand Down Expand Up @@ -445,5 +449,4 @@
<string name="mypage_logout_message">정말 로그아웃하시겠습니까?</string>



</resources>
Loading