Skip to content

Commit 0dd451c

Browse files
authored
[MERGE] #407 -> develop
[HOTFIX/#407] ν™ˆν™”λ©΄ 였λ₯˜ μˆ˜μ •
2 parents ac76dc5 + d7a4249 commit 0dd451c

File tree

5 files changed

+6
-8
lines changed

5 files changed

+6
-8
lines changed

β€Žapp/build.gradle.ktsβ€Ž

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ android {
1818
create("release") {
1919
keyAlias = properties.getProperty("release.keyAlias")
2020
keyPassword = properties.getProperty("release.keyPassword")
21-
storeFile = file(properties.getProperty("release.storeFile") + "/terning/terning.jks")
21+
storeFile = file(properties.getProperty("release.storeFile"))
2222
storePassword = properties.getProperty("release.storePassword")
2323
}
2424
}

β€Žfeature/home/src/main/java/com/terning/feature/home/HomeRoute.ktβ€Ž

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -292,7 +292,7 @@ fun HomeScreen(
292292
.padding(paddingValues)
293293
) {
294294
Image(
295-
imageVector = ImageVector.vectorResource(R.drawable.ic_terning_logo_typo),
295+
painter = painterResource(R.drawable.ic_terning_logo_typo),
296296
modifier = Modifier.padding(start = 24.dp, top = 16.dp, bottom = 16.dp),
297297
contentDescription = "home logo"
298298
)

β€Žfeature/home/src/main/java/com/terning/feature/home/component/HomeUpcomingEmptyFilter.ktβ€Ž

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,8 @@ import androidx.compose.material3.Text
1212
import androidx.compose.runtime.Composable
1313
import androidx.compose.ui.Alignment
1414
import androidx.compose.ui.Modifier
15-
import androidx.compose.ui.graphics.vector.ImageVector
1615
import androidx.compose.ui.res.painterResource
1716
import androidx.compose.ui.res.stringResource
18-
import androidx.compose.ui.res.vectorResource
1917
import androidx.compose.ui.text.style.TextAlign
2018
import androidx.compose.ui.unit.dp
2119
import com.terning.core.designsystem.extension.customShadow
@@ -46,7 +44,7 @@ fun HomeUpcomingEmptyFilter(
4644
horizontalAlignment = Alignment.CenterHorizontally,
4745
) {
4846
Image(
49-
imageVector = ImageVector.vectorResource(R.drawable.ic_home_scrap_empty),
47+
painter = painterResource(R.drawable.ic_home_scrap_empty),
5048
modifier = Modifier
5149
.padding(top = 23.dp)
5250
.size(44.dp),

β€Žfeature/search/src/main/java/com/terning/feature/search/search/SearchRoute.ktβ€Ž

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ fun SearchScreen(
131131
.padding(paddingValues)
132132
) {
133133
Image(
134-
imageVector = ImageVector.vectorResource(R.drawable.ic_terning_logo_typo),
134+
painter = painterResource(R.drawable.ic_terning_logo_typo),
135135
modifier = Modifier
136136
.padding(start = 24.dp, top = 16.dp),
137137
contentDescription = "logo typo"

β€Žgradle/libs.versions.tomlβ€Ž

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
compileSdk = "35"
33
minSdk = "28"
44
targetSdk = "35"
5-
versionName = "1.3.7"
6-
versionCode = "103070"
5+
versionName = "1.3.8"
6+
versionCode = "103080"
77
jvmTarget = "1.8"
88

99
## Android gradle plugin

0 commit comments

Comments
Β (0)