Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
65ffe2a
πŸš€ :: v2.2.6
parkuiery Nov 7, 2024
16a3719
fix :: 이메일 μ˜ˆμ™Έμ²˜λ¦¬ λ©”μ„Έμ§€ μˆ˜μ •
parkuiery Nov 8, 2024
009bf2a
refactor :: ktlint
parkuiery Nov 8, 2024
67a8654
fix :: 사진 λ³€κ²½ μ˜ˆμ™Έμ²˜λ¦¬ μΆ”κ°€
parkuiery Nov 8, 2024
10816ad
fix :: μ˜ˆμ™Έμ²˜λ¦¬ λ©”μ„Έμ§€ μˆ˜μ •
parkuiery Nov 8, 2024
fc562d8
fix :: navigation λ³€κ²½
parkuiery Nov 8, 2024
e0ec5a5
fix :: tab 색상 animation λ³€κ²½
parkuiery Nov 9, 2024
84b23ac
refactor :: λ””λ°”μ΄μŠ€ 토큰 제거 api 제거
parkuiery Nov 9, 2024
e6be735
refactor :: ktlint
parkuiery Nov 9, 2024
b609033
refactor :: ktlint
parkuiery Nov 9, 2024
9e6efc7
refactor :: 인증 λ²„νŠΌ 색상 λ³€κ²½
parkuiery Nov 10, 2024
d8605d0
refactor :: 쀑볡 if 제거
parkuiery Nov 10, 2024
89f23ca
refactor :: 쀑볡 if 제거
parkuiery Nov 10, 2024
a623533
πŸ”— :: (#435) λ‘œκ·Έμ•„μ›ƒ 토큰 μ‚­μ œ api 제거
parkuiery Nov 10, 2024
59f2e6e
πŸ”— :: (#426) 뢁마크 이동 버그
parkuiery Nov 10, 2024
305cbdf
πŸ”— :: (#430) λΉ„λ°€λ²ˆν˜Έ μ°ΎκΈ° 이메일 인증 버그
parkuiery Nov 10, 2024
ec00f97
πŸ”— :: (#427) 이메일 쀑볡 버그
parkuiery Nov 10, 2024
519f292
πŸ”— :: (#428) ν”„λ‘œν•„ μˆ˜μ • μ˜ˆμ™Έμ²˜λ¦¬
parkuiery Nov 10, 2024
6c01afb
πŸ”— :: (#434) μ•Œλ¦Ό 리슀트 νƒ­ λ ˆμ΄μ•„μ›ƒ 버그
parkuiery Nov 10, 2024
70d776d
πŸ”— :: (#436) 인증 λ²„νŠΌ ν™œμ„±ν™”
parkuiery Nov 10, 2024
85b3744
chore :: 버전 μ—…λ°μ΄νŠΈ
parkuiery Nov 10, 2024
2e566f6
fix :: release note μˆ˜μ •
parkuiery Nov 10, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions app/src/main/play/release-notes/ko-KR/default.txt
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
[v2.2.6]
[v2.2.7]
β€’ μžμž˜ν•œ 버그λ₯Ό μˆ˜μ •ν–ˆμ–΄μš”.

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

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

[ 버그 μˆ˜μ • ]
β€’ μ›Ήλ·° 버그λ₯Ό μˆ˜μ •ν–ˆμ–΄μš”.
β€’ 리이슈 버그λ₯Ό μˆ˜μ •ν–ˆμ–΄μš”.
β€’ λ‘œκ·Έμ•„μ›ƒ 버그λ₯Ό μˆ˜μ •ν–ˆμ–΄μš”.
β€’ λΆλ§ˆν¬μ—μ„œ 이동이 μ•ˆλ˜λŠ” 버그λ₯Ό μˆ˜μ •ν–ˆμ–΄μš”.
4 changes: 2 additions & 2 deletions buildSrc/src/main/kotlin/ProjectProperties.kt
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ object ProjectProperties {
const val COMPILE_SDK = 34
const val MIN_SDK = 28
const val TARGET_SDK = 34
const val VERSION_CODE = 20
const val VERSION_NAME = "2.2.6"
const val VERSION_CODE = 21
const val VERSION_NAME = "2.2.7"
const val COMPOSE_COMPILER_EXTENSION = "1.5.6"
const val JVM_TARGET = "18"
}
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,6 @@ class UserRepositoryImpl @Inject constructor(
}

override suspend fun signOut() {
remoteUserDataSource.deleteDeviceToken()
localUserDataSource.clearUserInformation()
}

Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
package team.retum.jobisdesignsystemv2.tab

import androidx.compose.animation.animateColorAsState
import androidx.compose.animation.core.Spring
import androidx.compose.animation.core.spring
import androidx.compose.foundation.background
import androidx.compose.foundation.horizontalScroll
import androidx.compose.foundation.layout.Row
Expand All @@ -11,7 +8,6 @@ import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.rememberScrollState
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.runtime.Composable
import androidx.compose.runtime.getValue
import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.clip
import androidx.compose.ui.text.style.TextAlign
Expand Down Expand Up @@ -41,26 +37,11 @@ fun TabBar(
.horizontalScroll(rememberScrollState()),
) {
tabs.forEachIndexed { index, category ->
val textColor by animateColorAsState(
targetValue = if (index == selectedTabIndex) {
JobisTheme.colors.onBackground
} else {
JobisTheme.colors.onSurfaceVariant
},
label = "",
)
val backgroundColor by animateColorAsState(
targetValue = if (index == selectedTabIndex) {
JobisTheme.colors.background
} else {
JobisTheme.colors.inverseSurface
},
label = "",
animationSpec = spring(
dampingRatio = Spring.DampingRatioHighBouncy,
stiffness = Spring.StiffnessVeryLow,
),
)
val (textColor, backgroundColor) = if (index == selectedTabIndex) {
JobisTheme.colors.onBackground to JobisTheme.colors.background
} else {
JobisTheme.colors.onSurfaceVariant to JobisTheme.colors.inverseSurface
}

JobisText(
modifier = Modifier
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -106,11 +106,18 @@ private fun JobisVerificationButton(
modifier: Modifier = Modifier,
onVerificationClick: () -> Unit,
isSendAuthenticationCode: Boolean,
enabled: Boolean = false,
) {
val (textColor, backgroundColor) = if (enabled) {
JobisTheme.colors.primary to JobisTheme.colors.onPrimary
} else {
JobisTheme.colors.onSurfaceVariant to JobisTheme.colors.surfaceVariant
}

Box(
modifier = modifier
.background(
color = JobisTheme.colors.primary,
color = backgroundColor,
shape = RoundedCornerShape(8.dp),
)
.padding(
Expand All @@ -119,6 +126,7 @@ private fun JobisVerificationButton(
)
.clickable(
onClick = onVerificationClick,
enabled = enabled,
),
) {
JobisText(
Expand All @@ -130,7 +138,7 @@ private fun JobisVerificationButton(
},
),
style = JobisTypography.Body,
color = JobisTheme.colors.onSurfaceVariant,
color = textColor,
)
}
}
Expand Down Expand Up @@ -235,6 +243,7 @@ private fun TextField(
JobisVerificationButton(
onVerificationClick = onVerificationClick,
isSendAuthenticationCode = isSendAuthenticationCode,
enabled = value().isNotEmpty(),
)
}
content()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,14 +55,17 @@ internal class MyPageViewModel @Inject constructor(
uri = uri,
)
viewModelScope.launch(Dispatchers.IO) {
createPresignedUrlUseCase(files = listOf(file.name)).onSuccess {
uploadFileUseCase(
presignedUrl = it.urls.first().preSignedUrl,
file = file,
)
val profileImageUrl = it.urls.first().filePath
editProfileImage(profileImageUrl = profileImageUrl)
}
createPresignedUrlUseCase(files = listOf(file.name))
.onSuccess {
uploadFileUseCase(
presignedUrl = it.urls.first().preSignedUrl,
file = file,
)
val profileImageUrl = it.urls.first().filePath
editProfileImage(profileImageUrl = profileImageUrl)
}.onFailure {
postSideEffect(MyPageSideEffect.BadEditProfileImage)
}
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,5 +22,11 @@ fun NavGraphBuilder.recruitments(
}

fun NavHostController.navigateToRecruitments() {
navigate(NAVIGATION_RECRUITMENTS)
navigate(NAVIGATION_RECRUITMENTS) {
popUpTo(0) {
saveState = true
}
launchSingleTop = true
restoreState = true
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,12 @@ internal class InputEmailViewModel @Inject constructor(
}

is ConflictException -> {
setState { state.value.copy(showEmailDescription = true) }
setState {
state.value.copy(
emailDescriptionType = DescriptionType.Error,
showEmailDescription = true,
)
}
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ internal fun VerifyEmail(
is VerifyEmailSideEffect.NotFoundStudent -> {
JobisToast.create(
context = context,
message = context.getString(R.string.toast_check_email),
message = context.getString(R.string.toast_not_found_email),
drawable = JobisIcon.Error,
).show()
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,12 @@ internal class VerifyEmailViewModel @Inject constructor(
}

is ConflictException -> {
setState { state.value.copy(showEmailDescription = true) }
setState {
state.value.copy(
emailDescriptionType = DescriptionType.Error,
showEmailDescription = true,
)
}
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion feature/verify-email/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,5 @@

<string name="toast_check_email_validation">이메일 ν˜•μ‹μ„ ν™•μΈν•΄μ£Όμ„Έμš”</string>

<string name="toast_check_email">이메일을 ν™•μΈν•΄μ£Όμ„Έμš”</string>
<string name="toast_not_found_email">λ“±λ‘λœ 이메일이 μ•„λ‹ˆμ—μš”</string>
</resources>
Loading