From 38dbedba0cf1447ff5e4c1f6893a6b6c500c0e01 Mon Sep 17 00:00:00 2001
From: LEE YOU BIN <youbeene3409@naver.com>
Date: Wed, 25 Sep 2024 14:56:10 +0900
Subject: [PATCH] [fix/#841] delete StringResources

---
 .../sopt/official/feature/mypage/component/MyPageSection.kt | 1 -
 .../sopt/official/feature/mypage/component/MyPageTopBar.kt  | 6 ++----
 .../sopt/official/feature/mypage/mypage/MyPageActivity.kt   | 2 +-
 .../sopt/official/feature/mypage/signOut/SignOutActivity.kt | 2 +-
 .../mypage/soptamp/sentence/AdjustSentenceActivity.kt       | 2 +-
 feature/mypage/src/main/res/values/strings.xml              | 2 --
 6 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/feature/mypage/src/main/java/org/sopt/official/feature/mypage/component/MyPageSection.kt b/feature/mypage/src/main/java/org/sopt/official/feature/mypage/component/MyPageSection.kt
index 95f8c79b..90633d41 100644
--- a/feature/mypage/src/main/java/org/sopt/official/feature/mypage/component/MyPageSection.kt
+++ b/feature/mypage/src/main/java/org/sopt/official/feature/mypage/component/MyPageSection.kt
@@ -39,7 +39,6 @@ import org.sopt.official.designsystem.Gray900
 import org.sopt.official.designsystem.SoptTheme
 import org.sopt.official.feature.mypage.model.MyPageUiModel
 import kotlinx.collections.immutable.ImmutableList
-
 @Composable
 fun MyPageSection(items: ImmutableList<MyPageUiModel>) {
     Column(
diff --git a/feature/mypage/src/main/java/org/sopt/official/feature/mypage/component/MyPageTopBar.kt b/feature/mypage/src/main/java/org/sopt/official/feature/mypage/component/MyPageTopBar.kt
index 73bb4d9e..803884c2 100644
--- a/feature/mypage/src/main/java/org/sopt/official/feature/mypage/component/MyPageTopBar.kt
+++ b/feature/mypage/src/main/java/org/sopt/official/feature/mypage/component/MyPageTopBar.kt
@@ -24,7 +24,6 @@
  */
 package org.sopt.official.feature.mypage.component
 
-import androidx.annotation.StringRes
 import androidx.compose.material3.CenterAlignedTopAppBar
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.Icon
@@ -34,14 +33,13 @@ import androidx.compose.material3.TopAppBarDefaults
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.painterResource
-import androidx.compose.ui.res.stringResource
 import org.sopt.official.designsystem.SoptTheme
 import org.sopt.official.feature.mypage.R
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
 fun MyPageTopBar(
-    @StringRes title: Int,
+    title: String,
     onNavigationIconClick: () -> Unit,
     modifier: Modifier = Modifier
 ) {
@@ -49,7 +47,7 @@ fun MyPageTopBar(
         modifier = modifier,
         title = {
             Text(
-                text = stringResource(id = title),
+                text = title,
                 style = SoptTheme.typography.body16M
             )
         },
diff --git a/feature/mypage/src/main/java/org/sopt/official/feature/mypage/mypage/MyPageActivity.kt b/feature/mypage/src/main/java/org/sopt/official/feature/mypage/mypage/MyPageActivity.kt
index 4762302d..9a122b28 100644
--- a/feature/mypage/src/main/java/org/sopt/official/feature/mypage/mypage/MyPageActivity.kt
+++ b/feature/mypage/src/main/java/org/sopt/official/feature/mypage/mypage/MyPageActivity.kt
@@ -195,7 +195,7 @@ class MyPageActivity : AppCompatActivity() {
                     .fillMaxSize(),
                     topBar = {
                         MyPageTopBar(
-                            title = R.string.toolbar_mypage,
+                            title = "마이페이지",
                             onNavigationIconClick = { onBackPressedDispatcher.onBackPressed() }
                         )
                     }
diff --git a/feature/mypage/src/main/java/org/sopt/official/feature/mypage/signOut/SignOutActivity.kt b/feature/mypage/src/main/java/org/sopt/official/feature/mypage/signOut/SignOutActivity.kt
index 3cc33a1c..915b6600 100644
--- a/feature/mypage/src/main/java/org/sopt/official/feature/mypage/signOut/SignOutActivity.kt
+++ b/feature/mypage/src/main/java/org/sopt/official/feature/mypage/signOut/SignOutActivity.kt
@@ -78,7 +78,7 @@ class SignOutActivity : AppCompatActivity() {
                     .fillMaxSize(),
                     topBar = {
                         MyPageTopBar(
-                            title = R.string.toolbar_sign_out,
+                            title = "마이페이지",
                             onNavigationIconClick = { onBackPressedDispatcher.onBackPressed() }
                         )
                     }
diff --git a/feature/mypage/src/main/java/org/sopt/official/feature/mypage/soptamp/sentence/AdjustSentenceActivity.kt b/feature/mypage/src/main/java/org/sopt/official/feature/mypage/soptamp/sentence/AdjustSentenceActivity.kt
index 7ebb6f13..21d8037a 100644
--- a/feature/mypage/src/main/java/org/sopt/official/feature/mypage/soptamp/sentence/AdjustSentenceActivity.kt
+++ b/feature/mypage/src/main/java/org/sopt/official/feature/mypage/soptamp/sentence/AdjustSentenceActivity.kt
@@ -79,7 +79,7 @@ class AdjustSentenceActivity : AppCompatActivity() {
                     .fillMaxSize(),
                     topBar = {
                         MyPageTopBar(
-                            title = R.string.toolbar_adjust_sentence,
+                            title = "한 마디 편집",
                             onNavigationIconClick = { onBackPressedDispatcher.onBackPressed() }
                         )
                     }
diff --git a/feature/mypage/src/main/res/values/strings.xml b/feature/mypage/src/main/res/values/strings.xml
index d84f68ae..7b017ace 100644
--- a/feature/mypage/src/main/res/values/strings.xml
+++ b/feature/mypage/src/main/res/values/strings.xml
@@ -24,7 +24,6 @@
 -->
 <resources>
     <!--    mypage    -->
-    <string name="toolbar_mypage">마이페이지</string>
     <string name="mypage_change_nickname">닉네임 변경</string>
     <string name="mypage_alert_soptamp_reset_title">미션을 초기화 하실건가요?</string>
     <string name="mypage_alert_soptamp_reset_subtitle">사진, 메모가 삭제되고\n전체 미션이 미완료상태로 초기화됩니다.</string>
@@ -48,7 +47,6 @@
     <string name="change_nickname_button">닉네임 변경</string>
 
     <!--    한 마디 편집하기   -->
-    <string name="toolbar_adjust_sentence">한 마디 편집</string>
     <string name="adjust_sentence_button">저장</string>
     <string name="adjust_sentence_hint">설정된 한 마디가 없습니다.</string>
 </resources>
\ No newline at end of file