Skip to content

Commit 8003a14

Browse files
easyhoooneasyhooon
committed
[fix] string resources 참조되지 않는 문제 해결
LottieImage .raw 접근 방법 수정 Res.raw -> files/~~.json
1 parent 2a96539 commit 8003a14

File tree

16 files changed

+42
-53
lines changed

16 files changed

+42
-53
lines changed

‎androidApp/src/main/res/drawable/ic_dummy_splash.xml

+20
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
<vector xmlns:android="http://schemas.android.com/apk/res/android"
2+
android:width="108dp"
3+
android:height="108dp"
4+
android:viewportWidth="192"
5+
android:viewportHeight="192">
6+
<group android:scaleX="0.67"
7+
android:scaleY="0.67"
8+
android:translateX="31.68"
9+
android:translateY="31.68">
10+
<path
11+
android:pathData="M0,0h192v192h-192z"
12+
android:fillColor="#f9fafb"/>
13+
<path
14+
android:pathData="M39,40C39,33.37 44.37,28 51,28L123.37,28C134.01,28 139.38,40.83 131.92,48.41L95.72,85.22L59.49,121.49C51.93,129.06 39,123.7 39,113.01L39,40Z"
15+
android:fillColor="#f9fafb"/>
16+
<path
17+
android:pathData="M152,151C152,157.63 146.63,163 140,163L67.63,163C56.99,163 51.61,150.17 59.08,142.59L95.28,105.78L131.51,69.51C139.07,61.94 152,67.3 152,77.99L152,151Z"
18+
android:fillColor="#f9fafb"/>
19+
</group>
20+
</vector>

‎androidApp/src/main/res/values/strings.xml

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<resources>
3+
<!-- AppName-->
4+
<string name="app_name">반다라트</string>
5+
<string name="app_name_dev">반다라트.dev</string>
6+
</resources>

‎composeApp/src/commonMain/composeResources/raw/lottie_empty_box.json ‎composeApp/src/commonMain/composeResources/files/empty_box.json

File renamed without changes.

‎composeApp/src/commonMain/composeResources/raw/lottie_finish.json ‎composeApp/src/commonMain/composeResources/files/finish.json

File renamed without changes.

‎composeApp/src/commonMain/composeResources/raw/lottie_loading_animation.json ‎composeApp/src/commonMain/composeResources/files/loading_animation.json

File renamed without changes.

‎composeApp/src/commonMain/composeResources/raw/lottie_onboarding_en.json ‎composeApp/src/commonMain/composeResources/files/onboarding_en.json

File renamed without changes.

‎composeApp/src/commonMain/composeResources/raw/lottie_onboarding_kr.json ‎composeApp/src/commonMain/composeResources/files/onboarding_kr.json

File renamed without changes.

‎composeApp/src/commonMain/composeResources/raw/lottie_splash.json ‎composeApp/src/commonMain/composeResources/files/splash.json

File renamed without changes.

‎composeApp/src/commonMain/composeResources/values-en/strings.xml

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
<?xml version="1.0" encoding="utf-8"?>
21
<resources>
32
<!-- AppName-->
43
<string name="app_name">Bandalart</string>

‎composeApp/src/commonMain/composeResources/values-ja/strings.xml

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
<?xml version="1.0" encoding="utf-8"?>
21
<resources>
32
<!-- AppName-->
43
<string name="app_name">バンダラート</string>

‎composeApp/src/commonMain/composeResources/values/strings.xml

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
<?xml version="1.0" encoding="utf-8"?>
21
<resources>
32
<!-- AppName-->
43
<string name="app_name">반다라트</string>

‎composeApp/src/commonMain/kotlin/com/nexters/bandalart/core/ui/component/LoadingIndicator.kt

+3-2
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,10 @@ import androidx.compose.ui.Modifier
1515
import androidx.compose.ui.graphics.Color.Companion.Black
1616
import androidx.compose.ui.graphics.Color.Companion.White
1717
import androidx.compose.ui.unit.dp
18-
import bandalart.composeapp.generated.resources.Res
1918
import com.nexters.bandalart.core.common.extension.noRippleClickable
2019

20+
private const val LOADING_ANIMATION_LOTTIE_FILE = "files/loading_animation.json"
21+
2122
@Composable
2223
fun LoadingIndicator(
2324
modifier: Modifier = Modifier,
@@ -42,7 +43,7 @@ fun LoadingIndicator(
4243
colors = CardDefaults.cardColors(White),
4344
) {
4445
LottieImage(
45-
jsonString = Res.raw.lottie_loading_animation,
46+
jsonString = LOADING_ANIMATION_LOTTIE_FILE,
4647
iterations = Int.MAX_VALUE,
4748
modifier = Modifier
4849
.fillMaxSize()

‎composeApp/src/commonMain/kotlin/com/nexters/bandalart/feature/complete/CompleteScreen.kt

+7-1
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,10 @@ import androidx.compose.ui.unit.dp
2929
import androidx.compose.ui.unit.sp
3030
import androidx.lifecycle.compose.collectAsStateWithLifecycle
3131
import bandalart.composeapp.generated.resources.Res
32+
import bandalart.composeapp.generated.resources.complete_save
33+
import bandalart.composeapp.generated.resources.complete_share
34+
import bandalart.composeapp.generated.resources.complete_title
35+
import bandalart.composeapp.generated.resources.save_bandalart_image
3236
import com.nexters.bandalart.core.common.extension.saveUriToGallery
3337
import com.nexters.bandalart.core.common.extension.shareImage
3438
import com.nexters.bandalart.core.common.utils.ObserveAsEvents
@@ -46,6 +50,8 @@ import com.nexters.bandalart.feature.complete.viewmodel.CompleteViewModel
4650
import org.jetbrains.compose.resources.stringResource
4751
import org.koin.compose.viewmodel.koinViewModel
4852

53+
private const val FINISH_LOTTIE_FILE = "files/finish.json"
54+
4955
@Composable
5056
internal fun CompleteRoute(
5157
onNavigateBack: () -> Unit,
@@ -135,7 +141,7 @@ internal fun CompleteScreen(
135141
} else {
136142
Box {
137143
LottieImage(
138-
jsonString = Res.raw.lottie_finish,
144+
jsonString = FINISH_LOTTIE_FILE,
139145
iterations = Int.MAX_VALUE,
140146
modifier = Modifier.align(Alignment.TopCenter)
141147
)

‎composeApp/src/commonMain/kotlin/com/nexters/bandalart/feature/onboarding/OnBoardingScreen.kt

+6-12
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,9 @@ import org.jetbrains.compose.resources.vectorResource
4545
import org.koin.compose.viewmodel.koinViewModel
4646
import java.util.Locale
4747

48+
private const val ONBOARDING_KR_LOTTIE_FILE = "files/onboarding_kr.json"
49+
private const val ONBOARDING_EN_LOTTIE_FILE = "files/onboarding_en.json"
50+
4851
@Composable
4952
internal fun OnBoardingRoute(
5053
navigateToHome: (NavOptions) -> Unit,
@@ -143,14 +146,6 @@ internal fun OnBoardingScreen(
143146
)
144147
}
145148

146-
Locale.JAPANESE.language -> {
147-
Image(
148-
imageVector = vectorResource(Res.drawable.ic_onboarding_jp),
149-
contentDescription = stringResource(Res.string.delete_description),
150-
modifier = Modifier.fillMaxSize(),
151-
)
152-
}
153-
154149
else -> {
155150
Image(
156151
imageVector = vectorResource(Res.drawable.ic_onboarding_en),
@@ -194,10 +189,9 @@ internal fun OnBoardingScreen(
194189
) {
195190
LottieImage(
196191
jsonString = when (currentLocale.language) {
197-
Locale.KOREAN.language -> Res.raw.lottie_onboarding_kr
198-
Locale.ENGLISH.language -> Res.raw.lottie_onboarding_en
199-
Locale.JAPANESE.language -> Res.raw.lottie_onboarding_jp
200-
else -> Res.raw.lottie_onboarding_en
192+
Locale.KOREAN.language -> ONBOARDING_KR_LOTTIE_FILE
193+
Locale.ENGLISH.language -> ONBOARDING_EN_LOTTIE_FILE
194+
else -> ONBOARDING_EN_LOTTIE_FILE
201195
},
202196
iterations = Int.MAX_VALUE,
203197
modifier = Modifier.fillMaxSize()

‎composeApp/src/commonMain/kotlin/com/nexters/bandalart/initializer/FirebaseCrashlyticsInitializer.kt

-16
This file was deleted.

‎composeApp/src/commonMain/kotlin/com/nexters/bandalart/initializer/NapierInitializer.kt

-19
This file was deleted.

0 commit comments

Comments
 (0)