Skip to content

Commit 370cfeb

Browse files
unam98unam98
authored
Merge pull request #388 from Runnect/feature/fix-mypage-release-bugs
마이페이지 버그 수정 3건 (권한/버전/스탬프 이미지)
2 parents ed2d9f1 + 6e44d8e commit 370cfeb

16 files changed

Lines changed: 205 additions & 5 deletions

‎app/src/main/AndroidManifest.xml‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,9 @@
66
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
77
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
88

9-
<!-- 미디어 접근 권한 (API 레벨별 조건부) -->
10-
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"
9+
<!-- 미디어 접근 권한 (API 32 이하에서만 필요, 앱은 FileProvider로 임시 파일 처리) -->
10+
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"
1111
android:maxSdkVersion="32" />
12-
<uses-permission android:name="android.permission.READ_MEDIA_IMAGES" />
1312

1413
<!-- Foreground Service 관련 -->
1514
<uses-permission android:name="android.permission.FOREGROUND_SERVICE" />

‎app/src/main/java/com/runnect/runnect/presentation/mypage/MyPageScreen.kt‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ import androidx.compose.ui.Modifier
3333
import androidx.compose.ui.draw.clip
3434
import androidx.compose.ui.res.painterResource
3535
import androidx.compose.ui.res.stringResource
36+
import androidx.compose.ui.platform.LocalContext
3637
import androidx.compose.ui.unit.dp
3738
import coil3.compose.AsyncImage
3839
import com.runnect.runnect.R
@@ -305,6 +306,12 @@ private fun MenuItem(
305306

306307
@Composable
307308
private fun VersionSection() {
309+
val context = LocalContext.current
310+
val versionName = remember {
311+
runCatching {
312+
context.packageManager.getPackageInfo(context.packageName, 0).versionName ?: ""
313+
}.getOrDefault("")
314+
}
308315
val textStyle = RunnectTheme.textStyle
309316
Row(
310317
modifier = Modifier
@@ -320,7 +327,7 @@ private fun VersionSection() {
320327
color = G2
321328
)
322329
Text(
323-
text = stringResource(R.string.my_page_version),
330+
text = "v. $versionName",
324331
style = textStyle.regular14,
325332
color = G2
326333
)

‎app/src/main/res/drawable/mypage_img_stamp_basic.xml‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
<vector xmlns:android="http://schemas.android.com/apk/res/android"
2+
android:width="96dp"
3+
android:height="96dp"
4+
android:viewportWidth="96"
5+
android:viewportHeight="96">
6+
<path
7+
android:pathData="M48,48m-48,0a48,48 0,1 1,96 0a48,48 0,1 1,-96 0"
8+
android:fillColor="#D5D4FF"/>
9+
<path
10+
android:pathData="M48.5,41.5m-17.5,0a17.5,17.5 0,1 1,35 0a17.5,17.5 0,1 1,-35 0"
11+
android:fillColor="#ffffff"/>
12+
<path
13+
android:pathData="M48,66C27.2,66 19.333,78.667 18,85C22.167,88.667 34,96 48,96C62,96 73.833,88.667 78,85C76.667,78.667 68.8,66 48,66Z"
14+
android:fillColor="#ffffff"/>
15+
</vector>

‎app/src/main/res/drawable/mypage_img_stamp_c1.xml‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
<vector xmlns:android="http://schemas.android.com/apk/res/android"
2+
android:width="80dp"
3+
android:height="80dp"
4+
android:viewportWidth="80"
5+
android:viewportHeight="80">
6+
<path
7+
android:pathData="M40,40m-40,0a40,40 0,1 1,80 0a40,40 0,1 1,-80 0"
8+
android:fillColor="#ffffff"/>
9+
<path
10+
android:pathData="M38.204,62.958L17.887,42.571C16.704,41.384 16.704,39.464 17.887,38.277L38.204,17.89C39.387,16.703 41.3,16.703 42.483,17.89L62.8,38.277C63.983,39.464 63.983,41.384 62.8,42.571L42.483,62.958C41.3,64.141 39.383,64.141 38.204,62.958Z"
11+
android:fillColor="#593EEC"/>
12+
</vector>

‎app/src/main/res/drawable/mypage_img_stamp_c2.xml‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
<vector xmlns:android="http://schemas.android.com/apk/res/android"
2+
android:width="80dp"
3+
android:height="80dp"
4+
android:viewportWidth="80"
5+
android:viewportHeight="80">
6+
<path
7+
android:pathData="M40,40m-40,0a40,40 0,1 1,80 0a40,40 0,1 1,-80 0"
8+
android:fillColor="#ffffff"/>
9+
<path
10+
android:pathData="M38.204,62.958L17.887,42.571C16.704,41.384 16.704,39.464 17.887,38.277L38.204,17.89C39.387,16.703 41.3,16.703 42.483,17.89L62.8,38.277C63.983,39.464 63.983,41.384 62.8,42.571L42.483,62.958C41.3,64.141 39.383,64.141 38.204,62.958Z"
11+
android:fillColor="#593EEC"/>
12+
<path
13+
android:pathData="M40.341,56.378L24.44,40.422L40.341,24.466L56.243,40.422L40.341,56.378ZM25.882,40.422L40.341,54.932L54.801,40.422L40.341,25.913L25.882,40.422Z"
14+
android:fillColor="#F7D198"/>
15+
</vector>

‎app/src/main/res/drawable/mypage_img_stamp_c3.xml‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
<vector xmlns:android="http://schemas.android.com/apk/res/android"
2+
android:width="80dp"
3+
android:height="80dp"
4+
android:viewportWidth="80"
5+
android:viewportHeight="80">
6+
<path
7+
android:pathData="M40,40m-40,0a40,40 0,1 1,80 0a40,40 0,1 1,-80 0"
8+
android:fillColor="#ffffff"/>
9+
<path
10+
android:pathData="M38.204,62.958L17.887,42.571C16.704,41.384 16.704,39.464 17.887,38.277L38.204,17.89C39.387,16.703 41.3,16.703 42.483,17.89L62.8,38.277C63.983,39.464 63.983,41.384 62.8,42.571L42.483,62.958C41.3,64.141 39.387,64.141 38.204,62.958Z"
11+
android:fillColor="#593EEC"/>
12+
<path
13+
android:pathData="M40.341,56.378L24.44,40.422L40.341,24.466L56.243,40.422L40.341,56.378ZM25.882,40.422L40.341,54.932L54.801,40.422L40.341,25.913L25.882,40.422Z"
14+
android:fillColor="#F7D198"/>
15+
<path
16+
android:pathData="M47.154,40.42L40.342,33.585L33.531,40.42L40.342,47.255L47.154,40.42Z"
17+
android:fillColor="#F7D198"/>
18+
</vector>

‎app/src/main/res/drawable/mypage_img_stamp_r1.xml‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
<vector xmlns:android="http://schemas.android.com/apk/res/android"
2+
android:width="80dp"
3+
android:height="80dp"
4+
android:viewportWidth="80"
5+
android:viewportHeight="80">
6+
<path
7+
android:pathData="M40,40m-40,0a40,40 0,1 1,80 0a40,40 0,1 1,-80 0"
8+
android:fillColor="#ffffff"/>
9+
<path
10+
android:pathData="M58.507,58.721L47.075,53.734C46.499,53.482 45.835,53.785 45.641,54.381L41.843,66.263C41.54,67.214 40.211,67.255 39.847,66.328L35.289,54.715C35.061,54.129 34.376,53.873 33.817,54.16L22.73,59.876C21.844,60.332 20.876,59.423 21.275,58.51L26.262,47.077C26.514,46.501 26.211,45.837 25.615,45.643L13.737,41.848C12.786,41.545 12.745,40.216 13.672,39.852L25.284,35.294C25.87,35.065 26.126,34.381 25.84,33.822L20.124,22.734C19.667,21.848 20.577,20.881 21.49,21.279L32.922,26.266C33.497,26.518 34.161,26.215 34.356,25.619L38.154,13.737C38.457,12.786 39.785,12.745 40.15,13.672L44.708,25.285C44.936,25.871 45.62,26.127 46.179,25.84L57.267,20.124C58.153,19.668 59.12,20.577 58.722,21.49L53.735,32.923C53.482,33.499 53.786,34.163 54.382,34.357L66.263,38.155C67.214,38.458 67.255,39.787 66.328,40.152L54.716,44.71C54.13,44.938 53.874,45.623 54.16,46.181L59.876,57.27C60.329,58.149 59.42,59.119 58.507,58.721Z"
11+
android:fillColor="#593EEC"/>
12+
</vector>

‎app/src/main/res/drawable/mypage_img_stamp_r2.xml‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
<vector xmlns:android="http://schemas.android.com/apk/res/android"
2+
android:width="80dp"
3+
android:height="80dp"
4+
android:viewportWidth="80"
5+
android:viewportHeight="80">
6+
<path
7+
android:pathData="M40,40m-40,0a40,40 0,1 1,80 0a40,40 0,1 1,-80 0"
8+
android:fillColor="#ffffff"/>
9+
<path
10+
android:pathData="M58.413,58.775L47.006,53.781C46.431,53.529 45.769,53.832 45.575,54.429L41.785,66.326C41.482,67.278 40.157,67.319 39.793,66.391L35.245,54.763C35.017,54.177 34.334,53.921 33.776,54.207L22.712,59.931C21.829,60.388 20.863,59.477 21.261,58.563L26.237,47.116C26.489,46.54 26.186,45.875 25.591,45.68L13.735,41.877C12.787,41.574 12.746,40.243 13.671,39.878L25.258,35.315C25.843,35.086 26.098,34.401 25.812,33.841L20.109,22.739C19.653,21.852 20.561,20.883 21.472,21.282L32.879,26.276C33.453,26.528 34.116,26.225 34.31,25.628L38.1,13.738C38.403,12.786 39.728,12.745 40.092,13.673L44.64,25.301C44.868,25.887 45.551,26.143 46.109,25.856L57.173,20.133C58.056,19.676 59.022,20.587 58.624,21.501L53.648,32.948C53.396,33.524 53.699,34.189 54.294,34.383L66.15,38.187C67.098,38.49 67.139,39.82 66.214,40.185L54.627,44.749C54.042,44.978 53.787,45.663 54.073,46.223L59.776,57.325C60.232,58.201 59.324,59.174 58.413,58.775Z"
11+
android:fillColor="#593EEC"/>
12+
<path
13+
android:pathData="M40.533,58.321L36.73,48.593L27.474,53.382L31.638,43.804L21.716,40.622L31.41,36.805L26.638,27.517L36.182,31.696L39.354,21.74L43.158,31.467L52.413,26.678L48.249,36.256L58.171,39.438L48.477,43.255L53.25,52.543L43.705,48.364L40.533,58.321ZM37.263,47.164L40.435,55.268L43.076,46.973L51.03,50.455L47.053,42.716L55.129,39.534L46.866,36.884L50.336,28.902L42.624,32.893L39.452,24.789L36.811,33.084L28.857,29.601L32.834,37.341L24.758,40.523L33.021,43.173L29.551,51.155L37.263,47.164Z"
14+
android:fillColor="#F7D198"/>
15+
</vector>

‎app/src/main/res/drawable/mypage_img_stamp_r3.xml‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
<vector xmlns:android="http://schemas.android.com/apk/res/android"
2+
android:width="80dp"
3+
android:height="80dp"
4+
android:viewportWidth="80"
5+
android:viewportHeight="80">
6+
<path
7+
android:pathData="M40,40m-40,0a40,40 0,1 1,80 0a40,40 0,1 1,-80 0"
8+
android:fillColor="#ffffff"/>
9+
<path
10+
android:pathData="M58.513,58.722L47.081,53.735C46.505,53.482 45.841,53.786 45.646,54.382L41.848,66.263C41.545,67.214 40.216,67.255 39.852,66.328L35.294,54.716C35.065,54.13 34.381,53.874 33.822,54.16L22.734,59.876C21.848,60.333 20.88,59.423 21.279,58.51L26.266,47.078C26.518,46.503 26.215,45.839 25.619,45.644L13.737,41.846C12.786,41.543 12.745,40.215 13.672,39.85L25.285,35.292C25.871,35.064 26.127,34.38 25.84,33.821L20.124,22.733C19.668,21.847 20.577,20.88 21.49,21.278L32.923,26.265C33.499,26.517 34.163,26.214 34.354,25.618L38.152,13.737C38.455,12.786 39.784,12.745 40.148,13.672L44.706,25.284C44.935,25.87 45.619,26.126 46.178,25.84L57.266,20.124C58.152,19.667 59.119,20.577 58.721,21.49L53.734,32.922C53.482,33.497 53.785,34.161 54.381,34.356L66.263,38.154C67.214,38.457 67.255,39.785 66.328,40.15L54.715,44.708C54.129,44.936 53.873,45.62 54.16,46.179L59.876,57.267C60.336,58.153 59.426,59.12 58.513,58.722Z"
11+
android:fillColor="#593EEC"/>
12+
<path
13+
android:pathData="M40.72,58.159L36.916,48.431L27.66,53.22L31.824,43.642L21.902,40.46L31.597,36.643L26.824,27.356L36.369,31.534L39.54,21.578L43.344,31.305L52.6,26.517L48.436,36.094L58.358,39.277L48.664,43.093L53.436,52.381L43.891,48.203L40.72,58.159ZM37.45,47.002L40.621,55.106L43.263,46.811L51.216,50.293L47.239,42.554L55.316,39.372L47.049,36.722L50.52,28.74L42.807,32.731L39.636,24.627L36.994,32.919L29.041,29.436L33.018,37.175L24.941,40.358L33.208,43.008L29.737,50.989L37.45,47.002Z"
14+
android:fillColor="#F7D198"/>
15+
<path
16+
android:pathData="M45.839,45.474L41.649,43.644L40.257,48L38.589,43.744L34.526,45.839L36.352,41.649L32,40.257L36.256,38.589L34.161,34.526L38.351,36.352L39.74,32L41.411,36.256L45.474,34.161L43.644,38.348L48,39.74L43.744,41.411L45.839,45.474Z"
17+
android:fillColor="#F7D198"/>
18+
</vector>

‎app/src/main/res/drawable/mypage_img_stamp_s1.xml‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
<vector xmlns:android="http://schemas.android.com/apk/res/android"
2+
android:width="80dp"
3+
android:height="80dp"
4+
android:viewportWidth="80"
5+
android:viewportHeight="80">
6+
<path
7+
android:pathData="M40,40m-40,0a40,40 0,1 1,80 0a40,40 0,1 1,-80 0"
8+
android:fillColor="#ffffff"/>
9+
<path
10+
android:pathData="M62.863,41.92L49.885,49.016C49.517,49.217 49.217,49.517 49.016,49.885L41.921,62.863C41.089,64.379 38.911,64.379 38.08,62.863L30.984,49.885C30.783,49.517 30.483,49.217 30.115,49.016L17.137,41.92C15.621,41.089 15.621,38.911 17.137,38.08L30.112,30.984C30.48,30.783 30.78,30.483 30.981,30.115L38.076,17.137C38.908,15.621 41.086,15.621 41.917,17.137L49.013,30.115C49.214,30.483 49.514,30.783 49.882,30.984L62.86,38.08C64.38,38.911 64.38,41.092 62.863,41.92Z"
11+
android:fillColor="#593EEC"/>
12+
</vector>

0 commit comments

Comments
 (0)