diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 493dcd13..f41bec51 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 24b042f0..5e55b658 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,6 +33,7 @@ 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.platform.LocalContext import androidx.compose.ui.unit.dp import coil3.compose.AsyncImage import com.runnect.runnect.R @@ -303,6 +304,12 @@ private fun MenuItem( @Composable private fun VersionSection() { + val context = LocalContext.current + val versionName = remember { + runCatching { + context.packageManager.getPackageInfo(context.packageName, 0).versionName ?: "" + }.getOrDefault("") + } val textStyle = RunnectTheme.textStyle Row( modifier = Modifier @@ -318,7 +325,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 00000000..b73fe914 --- /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 00000000..d65dc4e7 --- /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 00000000..660125c8 --- /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 00000000..f3791b85 --- /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 00000000..744be8df --- /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 00000000..34d08b6e --- /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 00000000..bc11942f --- /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 00000000..899bd160 --- /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 00000000..9e397a92 --- /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 00000000..3f9bac8c --- /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 00000000..6641fe6c --- /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 00000000..c7a2437f --- /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 00000000..56de8cc9 --- /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 7b34c49e..37698436 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 닉네임 수정 완료 닉네임을 입력하세요