Skip to content

Commit 64332ea

Browse files
authored
πŸš€ :: v2.2.7
2 parents 26ca886 + 2e566f6 commit 64332ea

File tree

11 files changed

+54
-46
lines changed

11 files changed

+54
-46
lines changed
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
[v2.2.6]
1+
[v2.2.7]
22
β€’ μžμž˜ν•œ 버그λ₯Ό μˆ˜μ •ν–ˆμ–΄μš”.
33

44
[ μƒˆλ‘œμš΄ κΈ°λŠ₯ ]
55
-
66

77
[ κ°œμ„ λœ 점 ]
8-
-
8+
β€’ 인증 ν™”λ©΄μ˜ λ²„νŠΌ λ””μžμΈμ˜ μš”μ†Œλ₯Ό κ°œμ„ ν–ˆμ–΄μš”.
99

1010
[ 버그 μˆ˜μ • ]
11-
β€’ μ›Ήλ·° 버그λ₯Ό μˆ˜μ •ν–ˆμ–΄μš”.
12-
β€’ 리이슈 버그λ₯Ό μˆ˜μ •ν–ˆμ–΄μš”.
11+
β€’ λ‘œκ·Έμ•„μ›ƒ 버그λ₯Ό μˆ˜μ •ν–ˆμ–΄μš”.
12+
β€’ λΆλ§ˆν¬μ—μ„œ 이동이 μ•ˆλ˜λŠ” 버그λ₯Ό μˆ˜μ •ν–ˆμ–΄μš”.

β€ŽbuildSrc/src/main/kotlin/ProjectProperties.ktβ€Ž

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ object ProjectProperties {
22
const val COMPILE_SDK = 34
33
const val MIN_SDK = 28
44
const val TARGET_SDK = 34
5-
const val VERSION_CODE = 20
6-
const val VERSION_NAME = "2.2.6"
5+
const val VERSION_CODE = 21
6+
const val VERSION_NAME = "2.2.7"
77
const val COMPOSE_COMPILER_EXTENSION = "1.5.6"
88
const val JVM_TARGET = "18"
99
}

β€Žcore/data/src/main/java/team/retum/data/repository/user/UserRepositoryImpl.ktβ€Ž

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@ class UserRepositoryImpl @Inject constructor(
5656
}
5757

5858
override suspend fun signOut() {
59-
remoteUserDataSource.deleteDeviceToken()
6059
localUserDataSource.clearUserInformation()
6160
}
6261

β€Žcore/design-system/src/main/java/team/retum/jobisdesignsystemv2/tab/TabBar.ktβ€Ž

Lines changed: 5 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
package team.retum.jobisdesignsystemv2.tab
22

3-
import androidx.compose.animation.animateColorAsState
4-
import androidx.compose.animation.core.Spring
5-
import androidx.compose.animation.core.spring
63
import androidx.compose.foundation.background
74
import androidx.compose.foundation.horizontalScroll
85
import androidx.compose.foundation.layout.Row
@@ -11,7 +8,6 @@ import androidx.compose.foundation.layout.padding
118
import androidx.compose.foundation.rememberScrollState
129
import androidx.compose.foundation.shape.RoundedCornerShape
1310
import androidx.compose.runtime.Composable
14-
import androidx.compose.runtime.getValue
1511
import androidx.compose.ui.Modifier
1612
import androidx.compose.ui.draw.clip
1713
import androidx.compose.ui.text.style.TextAlign
@@ -41,26 +37,11 @@ fun TabBar(
4137
.horizontalScroll(rememberScrollState()),
4238
) {
4339
tabs.forEachIndexed { index, category ->
44-
val textColor by animateColorAsState(
45-
targetValue = if (index == selectedTabIndex) {
46-
JobisTheme.colors.onBackground
47-
} else {
48-
JobisTheme.colors.onSurfaceVariant
49-
},
50-
label = "",
51-
)
52-
val backgroundColor by animateColorAsState(
53-
targetValue = if (index == selectedTabIndex) {
54-
JobisTheme.colors.background
55-
} else {
56-
JobisTheme.colors.inverseSurface
57-
},
58-
label = "",
59-
animationSpec = spring(
60-
dampingRatio = Spring.DampingRatioHighBouncy,
61-
stiffness = Spring.StiffnessVeryLow,
62-
),
63-
)
40+
val (textColor, backgroundColor) = if (index == selectedTabIndex) {
41+
JobisTheme.colors.onBackground to JobisTheme.colors.background
42+
} else {
43+
JobisTheme.colors.onSurfaceVariant to JobisTheme.colors.inverseSurface
44+
}
6445

6546
JobisText(
6647
modifier = Modifier

β€Žcore/design-system/src/main/java/team/retum/jobisdesignsystemv2/textfield/JobisTextField.ktβ€Ž

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,11 +106,18 @@ private fun JobisVerificationButton(
106106
modifier: Modifier = Modifier,
107107
onVerificationClick: () -> Unit,
108108
isSendAuthenticationCode: Boolean,
109+
enabled: Boolean = false,
109110
) {
111+
val (textColor, backgroundColor) = if (enabled) {
112+
JobisTheme.colors.primary to JobisTheme.colors.onPrimary
113+
} else {
114+
JobisTheme.colors.onSurfaceVariant to JobisTheme.colors.surfaceVariant
115+
}
116+
110117
Box(
111118
modifier = modifier
112119
.background(
113-
color = JobisTheme.colors.primary,
120+
color = backgroundColor,
114121
shape = RoundedCornerShape(8.dp),
115122
)
116123
.padding(
@@ -119,6 +126,7 @@ private fun JobisVerificationButton(
119126
)
120127
.clickable(
121128
onClick = onVerificationClick,
129+
enabled = enabled,
122130
),
123131
) {
124132
JobisText(
@@ -130,7 +138,7 @@ private fun JobisVerificationButton(
130138
},
131139
),
132140
style = JobisTypography.Body,
133-
color = JobisTheme.colors.onSurfaceVariant,
141+
color = textColor,
134142
)
135143
}
136144
}
@@ -235,6 +243,7 @@ private fun TextField(
235243
JobisVerificationButton(
236244
onVerificationClick = onVerificationClick,
237245
isSendAuthenticationCode = isSendAuthenticationCode,
246+
enabled = value().isNotEmpty(),
238247
)
239248
}
240249
content()

β€Žfeature/mypage/src/main/java/team/retum/jobis/viewmodel/MyPageViewModel.ktβ€Ž

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -55,14 +55,17 @@ internal class MyPageViewModel @Inject constructor(
5555
uri = uri,
5656
)
5757
viewModelScope.launch(Dispatchers.IO) {
58-
createPresignedUrlUseCase(files = listOf(file.name)).onSuccess {
59-
uploadFileUseCase(
60-
presignedUrl = it.urls.first().preSignedUrl,
61-
file = file,
62-
)
63-
val profileImageUrl = it.urls.first().filePath
64-
editProfileImage(profileImageUrl = profileImageUrl)
65-
}
58+
createPresignedUrlUseCase(files = listOf(file.name))
59+
.onSuccess {
60+
uploadFileUseCase(
61+
presignedUrl = it.urls.first().preSignedUrl,
62+
file = file,
63+
)
64+
val profileImageUrl = it.urls.first().filePath
65+
editProfileImage(profileImageUrl = profileImageUrl)
66+
}.onFailure {
67+
postSideEffect(MyPageSideEffect.BadEditProfileImage)
68+
}
6669
}
6770
}
6871
}

β€Žfeature/recruitment/src/main/java/team/retum/jobis/recruitment/navigation/RecruitmentsNavigation.ktβ€Ž

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,5 +22,11 @@ fun NavGraphBuilder.recruitments(
2222
}
2323

2424
fun NavHostController.navigateToRecruitments() {
25-
navigate(NAVIGATION_RECRUITMENTS)
25+
navigate(NAVIGATION_RECRUITMENTS) {
26+
popUpTo(0) {
27+
saveState = true
28+
}
29+
launchSingleTop = true
30+
restoreState = true
31+
}
2632
}

β€Žfeature/signup/src/main/java/team/retum/signup/viewmodel/InputEmailViewModel.ktβ€Ž

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,12 @@ internal class InputEmailViewModel @Inject constructor(
9494
}
9595

9696
is ConflictException -> {
97-
setState { state.value.copy(showEmailDescription = true) }
97+
setState {
98+
state.value.copy(
99+
emailDescriptionType = DescriptionType.Error,
100+
showEmailDescription = true,
101+
)
102+
}
98103
}
99104
}
100105
}

β€Žfeature/verify-email/src/main/java/team/retum/jobis/verify/email/ui/VerifyEmailScreen.ktβ€Ž

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ internal fun VerifyEmail(
6868
is VerifyEmailSideEffect.NotFoundStudent -> {
6969
JobisToast.create(
7070
context = context,
71-
message = context.getString(R.string.toast_check_email),
71+
message = context.getString(R.string.toast_not_found_email),
7272
drawable = JobisIcon.Error,
7373
).show()
7474
}

β€Žfeature/verify-email/src/main/java/team/retum/jobis/verify/email/viewmodel/VerifyEmailViewModel.ktβ€Ž

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,12 @@ internal class VerifyEmailViewModel @Inject constructor(
9393
}
9494

9595
is ConflictException -> {
96-
setState { state.value.copy(showEmailDescription = true) }
96+
setState {
97+
state.value.copy(
98+
emailDescriptionType = DescriptionType.Error,
99+
showEmailDescription = true,
100+
)
101+
}
97102
}
98103
}
99104
}

0 commit comments

Comments
Β (0)