From 204213597540fb4d7728c452658afcfea4cdeaec Mon Sep 17 00:00:00 2001 From: unam98 Date: Fri, 8 May 2026 14:47:50 +0900 Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=EB=A7=88=EC=9D=B4=ED=8E=98=EC=9D=B4?= =?UTF-8?q?=EC=A7=80=20=EB=B2=84=EA=B7=B8=20=EC=88=98=EC=A0=95=203?= =?UTF-8?q?=EA=B1=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - READ_MEDIA_IMAGES 권한 제거: 갤러리 접근 코드 없음, FileProvider 기반으로 동작하여 불필요. Play Store 정책 위반 해소 - 버전 정보 동적 표시: 하드코딩된 v. 1.0.4 → PackageManager에서 versionName 읽어 표시 - 스탬프 이미지 복구: getIdentifier() 동적 참조로 인해 미사용 리소스 정리 시 오탐 삭제된 13개 파일 복구 (목표 보상/프로필 이미지 빈 공간 수정) --- app/src/main/AndroidManifest.xml | 5 ++--- .../presentation/mypage/MyPageScreen.kt | 7 ++++++- .../res/drawable/mypage_img_stamp_basic.xml | 15 +++++++++++++++ .../main/res/drawable/mypage_img_stamp_c1.xml | 12 ++++++++++++ .../main/res/drawable/mypage_img_stamp_c2.xml | 15 +++++++++++++++ .../main/res/drawable/mypage_img_stamp_c3.xml | 18 ++++++++++++++++++ .../main/res/drawable/mypage_img_stamp_r1.xml | 12 ++++++++++++ .../main/res/drawable/mypage_img_stamp_r2.xml | 15 +++++++++++++++ .../main/res/drawable/mypage_img_stamp_r3.xml | 18 ++++++++++++++++++ .../main/res/drawable/mypage_img_stamp_s1.xml | 12 ++++++++++++ .../main/res/drawable/mypage_img_stamp_s2.xml | 15 +++++++++++++++ .../main/res/drawable/mypage_img_stamp_s3.xml | 18 ++++++++++++++++++ .../main/res/drawable/mypage_img_stamp_u1.xml | 12 ++++++++++++ .../main/res/drawable/mypage_img_stamp_u2.xml | 15 +++++++++++++++ .../main/res/drawable/mypage_img_stamp_u3.xml | 18 ++++++++++++++++++ app/src/main/res/values/strings.xml | 1 - 16 files changed, 203 insertions(+), 5 deletions(-) create mode 100644 app/src/main/res/drawable/mypage_img_stamp_basic.xml create mode 100644 app/src/main/res/drawable/mypage_img_stamp_c1.xml create mode 100644 app/src/main/res/drawable/mypage_img_stamp_c2.xml create mode 100644 app/src/main/res/drawable/mypage_img_stamp_c3.xml create mode 100644 app/src/main/res/drawable/mypage_img_stamp_r1.xml create mode 100644 app/src/main/res/drawable/mypage_img_stamp_r2.xml create mode 100644 app/src/main/res/drawable/mypage_img_stamp_r3.xml create mode 100644 app/src/main/res/drawable/mypage_img_stamp_s1.xml create mode 100644 app/src/main/res/drawable/mypage_img_stamp_s2.xml create mode 100644 app/src/main/res/drawable/mypage_img_stamp_s3.xml create mode 100644 app/src/main/res/drawable/mypage_img_stamp_u1.xml create mode 100644 app/src/main/res/drawable/mypage_img_stamp_u2.xml create mode 100644 app/src/main/res/drawable/mypage_img_stamp_u3.xml diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 493dcd132..f41bec51f 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -6,10 +6,9 @@ - - + - diff --git a/app/src/main/java/com/runnect/runnect/presentation/mypage/MyPageScreen.kt b/app/src/main/java/com/runnect/runnect/presentation/mypage/MyPageScreen.kt index 24b042f0e..d4ee1aa5c 100644 --- a/app/src/main/java/com/runnect/runnect/presentation/mypage/MyPageScreen.kt +++ b/app/src/main/java/com/runnect/runnect/presentation/mypage/MyPageScreen.kt @@ -34,6 +34,7 @@ import androidx.compose.ui.draw.clip import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp +import androidx.compose.ui.platform.LocalContext import coil3.compose.AsyncImage import com.runnect.runnect.R import com.runnect.runnect.presentation.ui.theme.G1 @@ -303,6 +304,10 @@ private fun MenuItem( @Composable private fun VersionSection() { + val context = LocalContext.current + val versionName = remember { + context.packageManager.getPackageInfo(context.packageName, 0).versionName + } val textStyle = RunnectTheme.textStyle Row( modifier = Modifier @@ -318,7 +323,7 @@ private fun VersionSection() { color = G2 ) Text( - text = stringResource(R.string.my_page_version), + text = "v. $versionName", style = textStyle.regular14, color = G2 ) diff --git a/app/src/main/res/drawable/mypage_img_stamp_basic.xml b/app/src/main/res/drawable/mypage_img_stamp_basic.xml new file mode 100644 index 000000000..b73fe914d --- /dev/null +++ b/app/src/main/res/drawable/mypage_img_stamp_basic.xml @@ -0,0 +1,15 @@ + + + + + diff --git a/app/src/main/res/drawable/mypage_img_stamp_c1.xml b/app/src/main/res/drawable/mypage_img_stamp_c1.xml new file mode 100644 index 000000000..d65dc4e76 --- /dev/null +++ b/app/src/main/res/drawable/mypage_img_stamp_c1.xml @@ -0,0 +1,12 @@ + + + + diff --git a/app/src/main/res/drawable/mypage_img_stamp_c2.xml b/app/src/main/res/drawable/mypage_img_stamp_c2.xml new file mode 100644 index 000000000..660125c8b --- /dev/null +++ b/app/src/main/res/drawable/mypage_img_stamp_c2.xml @@ -0,0 +1,15 @@ + + + + + diff --git a/app/src/main/res/drawable/mypage_img_stamp_c3.xml b/app/src/main/res/drawable/mypage_img_stamp_c3.xml new file mode 100644 index 000000000..f3791b858 --- /dev/null +++ b/app/src/main/res/drawable/mypage_img_stamp_c3.xml @@ -0,0 +1,18 @@ + + + + + + diff --git a/app/src/main/res/drawable/mypage_img_stamp_r1.xml b/app/src/main/res/drawable/mypage_img_stamp_r1.xml new file mode 100644 index 000000000..744be8df3 --- /dev/null +++ b/app/src/main/res/drawable/mypage_img_stamp_r1.xml @@ -0,0 +1,12 @@ + + + + diff --git a/app/src/main/res/drawable/mypage_img_stamp_r2.xml b/app/src/main/res/drawable/mypage_img_stamp_r2.xml new file mode 100644 index 000000000..34d08b6e0 --- /dev/null +++ b/app/src/main/res/drawable/mypage_img_stamp_r2.xml @@ -0,0 +1,15 @@ + + + + + diff --git a/app/src/main/res/drawable/mypage_img_stamp_r3.xml b/app/src/main/res/drawable/mypage_img_stamp_r3.xml new file mode 100644 index 000000000..bc11942f2 --- /dev/null +++ b/app/src/main/res/drawable/mypage_img_stamp_r3.xml @@ -0,0 +1,18 @@ + + + + + + diff --git a/app/src/main/res/drawable/mypage_img_stamp_s1.xml b/app/src/main/res/drawable/mypage_img_stamp_s1.xml new file mode 100644 index 000000000..899bd1607 --- /dev/null +++ b/app/src/main/res/drawable/mypage_img_stamp_s1.xml @@ -0,0 +1,12 @@ + + + + diff --git a/app/src/main/res/drawable/mypage_img_stamp_s2.xml b/app/src/main/res/drawable/mypage_img_stamp_s2.xml new file mode 100644 index 000000000..9e397a927 --- /dev/null +++ b/app/src/main/res/drawable/mypage_img_stamp_s2.xml @@ -0,0 +1,15 @@ + + + + + diff --git a/app/src/main/res/drawable/mypage_img_stamp_s3.xml b/app/src/main/res/drawable/mypage_img_stamp_s3.xml new file mode 100644 index 000000000..3f9bac8cf --- /dev/null +++ b/app/src/main/res/drawable/mypage_img_stamp_s3.xml @@ -0,0 +1,18 @@ + + + + + + diff --git a/app/src/main/res/drawable/mypage_img_stamp_u1.xml b/app/src/main/res/drawable/mypage_img_stamp_u1.xml new file mode 100644 index 000000000..6641fe6ce --- /dev/null +++ b/app/src/main/res/drawable/mypage_img_stamp_u1.xml @@ -0,0 +1,12 @@ + + + + diff --git a/app/src/main/res/drawable/mypage_img_stamp_u2.xml b/app/src/main/res/drawable/mypage_img_stamp_u2.xml new file mode 100644 index 000000000..c7a2437f6 --- /dev/null +++ b/app/src/main/res/drawable/mypage_img_stamp_u2.xml @@ -0,0 +1,15 @@ + + + + + diff --git a/app/src/main/res/drawable/mypage_img_stamp_u3.xml b/app/src/main/res/drawable/mypage_img_stamp_u3.xml new file mode 100644 index 000000000..56de8cc97 --- /dev/null +++ b/app/src/main/res/drawable/mypage_img_stamp_u3.xml @@ -0,0 +1,18 @@ + + + + + + diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 7b34c49e9..376984363 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -81,7 +81,6 @@ 설정 버전 정보 - v. 1.0.4 닉네임 수정 완료 닉네임을 입력하세요 From 6e44d8ec1a463a5ea954382727277b841aaacae0 Mon Sep 17 00:00:00 2001 From: unam98 Date: Fri, 8 May 2026 14:57:24 +0900 Subject: [PATCH 2/2] =?UTF-8?q?fix:=20versionName=20null=20=EC=B2=98?= =?UTF-8?q?=EB=A6=AC=20=EB=B0=8F=20import=20=EC=88=9C=EC=84=9C=20=EC=A0=95?= =?UTF-8?q?=EB=A0=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - API 33+에서 PackageInfo.versionName이 String?로 반환될 수 있어 null 처리 추가 - LocalContext import 알파벳 순서 정렬 --- .../com/runnect/runnect/presentation/mypage/MyPageScreen.kt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/runnect/runnect/presentation/mypage/MyPageScreen.kt b/app/src/main/java/com/runnect/runnect/presentation/mypage/MyPageScreen.kt index d4ee1aa5c..5e55b6584 100644 --- a/app/src/main/java/com/runnect/runnect/presentation/mypage/MyPageScreen.kt +++ b/app/src/main/java/com/runnect/runnect/presentation/mypage/MyPageScreen.kt @@ -33,8 +33,8 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.draw.clip import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource -import androidx.compose.ui.unit.dp import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.unit.dp import coil3.compose.AsyncImage import com.runnect.runnect.R import com.runnect.runnect.presentation.ui.theme.G1 @@ -306,7 +306,9 @@ private fun MenuItem( private fun VersionSection() { val context = LocalContext.current val versionName = remember { - context.packageManager.getPackageInfo(context.packageName, 0).versionName + runCatching { + context.packageManager.getPackageInfo(context.packageName, 0).versionName ?: "" + }.getOrDefault("") } val textStyle = RunnectTheme.textStyle Row(