🚀 :: v2.0.7

.github/CODEOWNERS

@@ -0,0 +1 @@
+*.* @Team-return/jobis-android

app/build.gradle.kts

@@ -26,7 +26,16 @@ android {
 
     buildTypes {
         release {
-            isMinifyEnabled = false
+            isMinifyEnabled = true
+            isShrinkResources = true
+            proguardFiles(
+                getDefaultProguardFile("proguard-android-optimize.txt"),
+                "proguard-rules.pro",
+            )
+        }
+        debug {
+            isMinifyEnabled = true
+            isShrinkResources = true
             proguardFiles(
                 getDefaultProguardFile("proguard-android-optimize.txt"),
                 "proguard-rules.pro",

app/proguard-rules.pro

@@ -0,0 +1,97 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile
+
+# Add *one* of the following rules to your Proguard configuration file.
+# Alternatively, you can annotate classes and class members with @androidx.annotation.Keep
+
+# Add *one* of the following rules to your Proguard configuration file.
+# Alternatively, you can annotate classes and class members with @androidx.annotation.Keep
+
+# keep everything in this package from being removed or renamed
+-keep class team.** { *; }
+
+# keep everything in this package from being renamed only
+-keepnames class team.** { *; }
+# Add *one* of the following rules to your Proguard configuration file.
+# Alternatively, you can annotate classes and class members with @androidx.annotation.Keep
+
+# keep everything in this package from being removed or renamed
+-keep class okhttp3.** { *; }
+
+# keep everything in this package from being renamed only
+-keepnames class okhttp3.** { *; }
+# Add *one* of the following rules to your Proguard configuration file.
+# Alternatively, you can annotate classes and class members with @androidx.annotation.Keep
+
+# keep everything in this package from being removed or renamed
+-keep class kotlin.** { *; }
+
+# keep everything in this package from being renamed only
+-keepnames class kotlin.** { *; }
+# Add *one* of the following rules to your Proguard configuration file.
+# Alternatively, you can annotate classes and class members with @androidx.annotation.Keep
+
+# keep everything in this package from being removed or renamed
+-keep class okio.** { *; }
+
+# keep everything in this package from being renamed only
+-keepnames class okio.** { *; }
+# Add *one* of the following rules to your Proguard configuration file.
+# Alternatively, you can annotate classes and class members with @androidx.annotation.Keep
+
+# keep everything in this package from being removed or renamed
+-keep class java.** { *; }
+
+# keep everything in this package from being renamed only
+-keepnames class java.** { *; }
+# Add *one* of the following rules to your Proguard configuration file.
+# Alternatively, you can annotate classes and class members with @androidx.annotation.Keep
+
+# keep everything in this package from being removed or renamed
+-keep class retrofit2.** { *; }
+
+# keep everything in this package from being renamed only
+-keepnames class retrofit2.** { *; }
+# Add *one* of the following rules to your Proguard configuration file.
+# Alternatively, you can annotate classes and class members with @androidx.annotation.Keep
+
+# keep everything in this package from being removed or renamed
+-keep class org.** { *; }
+
+# keep everything in this package from being renamed only
+-keepnames class org.** { *; }
+# Add *one* of the following rules to your Proguard configuration file.
+# Alternatively, you can annotate classes and class members with @androidx.annotation.Keep
+
+# keep everything in this package from being removed or renamed
+-keep class javax.** { *; }
+
+# keep everything in this package from being renamed only
+-keepnames class javax.** { *; }
+# Add *one* of the following rules to your Proguard configuration file.
+# Alternatively, you can annotate classes and class members with @androidx.annotation.Keep
+
+# keep everything in this package from being removed or renamed
+-keep class _COROUTINE.** { *; }
+
+# keep everything in this package from being renamed only
+-keepnames class _COROUTINE.** { *; }

buildSrc/src/main/kotlin/ProjectProperties.kt

@@ -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 = 8
-    const val VERSION_NAME = "2.0.6"
+    const val VERSION_CODE = 9
+    const val VERSION_NAME = "2.0.7"
     const val COMPOSE_COMPILER_EXTENSION = "1.5.6"
     const val JVM_TARGET = "18"
 }

feature/change-password/src/main/res/values/strings.xml

@@ -4,7 +4,6 @@
     <string name="title_reset_password">새로 사용할\n비밀번호를 입력해주세요</string>
     <string name="password">비밀번호</string>
     <string name="hint_password">계정의 비밀번호를 설정해주세요</string>
-    <string name="information_password">8 ~ 16자, 영문자, 숫자, 특수문자 포함</string>
     <string name="check_password">비밀번호 확인</string>
     <string name="hint_check_password">위 비밀번호를 한 번 더 입력해주세요</string>
     <string name="complete">완료</string>

feature/home/src/main/res/values/strings.xml

@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="employment_rate">%s기 대마고\n학생들의 취업</string>
-    <string name="employment_rate_current">현재 %s명이 취업했어용</string>
 
-    <string name="search_other_companies">다른 기업들\n탐색하기</string>
     <string name="experiential_field_training">체험형 \n현장실습</string>
     <string name="how_about_other_companies">다른 기업들은 어떨까?\n다른 기업들 둘러 보러 가기</string>
 
@@ -13,7 +11,6 @@
     <string name="description_apply_status">승인요청 및 반려 상태엔 재지원 가능</string>
     <string name="empty_apply_companies">현재 지원한 기업이 없어요</string>
 
-    <string name="reason">사유 보기</string>
     <string name="reason_rejection">반려 사유</string>
     <string name="re_apply">재지원 하기</string>
 

feature/mypage/src/main/res/values/strings.xml

@@ -11,7 +11,6 @@
     <string name="membership_withdrawal">회원 탈퇴</string>
     <string name="bug_report">버그 제보</string>
     <string name="to_bug_report">버그 제보하기</string>
-    <string name="bug_report_box">버그 제보함</string>
     <string name="write_interview_review">면접 후기를 적어주세요!</string>
     <string name="go_write">작성하러 가기 →</string>
     <string name="sign_out_modal_title">JOBIS에서 로그아웃 하시겠어요?</string>

feature/recruitment/src/main/java/team/retum/jobis/recruitment/ui/RecruitmentDetailsScreen.kt

@@ -427,7 +427,7 @@ private fun BottomBar(
                     id = if (isApplicable) {
                         R.string.apply
                     } else {
-                        R.string.can_do_apply_third
+                        R.string.can_do_not_apply
                     },
                 ),
                 style = JobisTypography.SubHeadLine,
@@ -457,7 +457,11 @@ private fun BottomBar(
                 },
             ),
             contentDescription = "bookmark",
-            tint = JobisTheme.colors.onPrimary,
+            tint = if (isBookmark) {
+                JobisTheme.colors.onPrimary
+            } else {
+                JobisTheme.colors.onSurfaceVariant
+            },
         )
     }
 }

feature/recruitment/src/main/java/team/retum/jobis/recruitment/ui/component/RecruitmentItems.kt

@@ -1,6 +1,5 @@
 package team.retum.jobis.recruitment.ui.component
 
-import androidx.annotation.DrawableRes
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
@@ -48,11 +47,7 @@ internal fun RecruitmentItems(
             RecruitmentItem(
                 recruitment = recruitment,
                 onClick = onRecruitmentClick,
-                bookmarkIcon = if (bookmarked) {
-                    JobisIcon.BookmarkOn
-                } else {
-                    JobisIcon.BookmarkOff
-                },
+                bookmarked = bookmarked,
                 onBookmarked = {
                     onBookmarkClick(it)
                     bookmarked = !bookmarked
@@ -69,7 +64,7 @@ internal fun RecruitmentItems(
 private fun RecruitmentItem(
     recruitment: RecruitmentsEntity.RecruitmentEntity,
     onClick: (recruitId: Long) -> Unit,
-    @DrawableRes bookmarkIcon: Int,
+    bookmarked: Boolean,
     onBookmarked: (recruitId: Long) -> Unit,
 ) {
     val whetherMilitarySupported = when (recruitment.militarySupport) {
@@ -149,10 +144,20 @@ private fun RecruitmentItem(
         Spacer(modifier = Modifier.width(4.dp))
         JobisIconButton(
             modifier = Modifier.padding(4.dp),
-            painter = painterResource(id = bookmarkIcon),
+            painter = painterResource(
+                id = if (bookmarked) {
+                    JobisIcon.BookmarkOn
+                } else {
+                    JobisIcon.BookmarkOff
+                },
+            ),
             contentDescription = "bookmark",
             onClick = { onBookmarked(recruitment.id) },
-            tint = JobisTheme.colors.onPrimary,
+            tint = if (bookmarked) {
+                JobisTheme.colors.onPrimary
+            } else {
+                JobisTheme.colors.onSurfaceVariant
+            },
         )
     }
 }

feature/recruitment/src/main/res/values/strings.xml

@@ -4,7 +4,6 @@
 
     <string name="military_supported">병역특례 O</string>
     <string name="military_not_supported">병역특례 X</string>
-    <string name="train_pay">실습 수당</string>
 
     <string name="recruitment_no_content">검색어와 관련된 모집의뢰서를 못 찾았어요</string>
     <string name="retry">제대로 입력했는지 다시 한 번 확인해주세요</string>
@@ -20,12 +19,11 @@
     <string name="recruitment_procedure">채용절차</string>
     <string name="required_grade">필수 성적</string>
     <string name="work_hours">근무시간</string>
-    <string name="convert_to_full_time_job">정규직 전환 시</string>
     <string name="wage_and_benefits">복리후생</string>
     <string name="submission_document">제출 서류</string>
     <string name="etc">기타 사항</string>
     <string name="apply">지원하기</string>
-    <string name="can_do_apply_third">3학년만 지원할 수 있어요</string>
+    <string name="can_do_not_apply">지원할 수 없어요</string>
     <string name="major_task">주요 업무</string>
 
     <string name="occurred_error">오류가 발생했습니다</string>

feature/signup/src/main/java/team/retum/signup/ui/InputEmailScreen.kt

@@ -104,6 +104,7 @@ private fun InputEmailScreen(
             showAuthenticationCodeDescription = { state.showAuthenticationCodeDescription },
             sendAuthenticationCode = { state.sendAuthenticationCode },
             remainTime = state.remainTime,
+            isResend = { state.isResend },
         )
         Spacer(modifier = Modifier.weight(1f))
         JobisButton(
@@ -127,14 +128,21 @@ private fun EmailInputs(
     showAuthenticationCodeDescription: () -> Boolean,
     sendAuthenticationCode: () -> Boolean,
     remainTime: String,
+    isResend: () -> Boolean,
 ) {
     JobisTextField(
         title = stringResource(id = R.string.email),
         value = email,
         hint = stringResource(id = R.string.hint_email),
         onValueChange = onEmailChange,
         showEmailHint = true,
-        checkDescription = stringResource(id = R.string.description_email_sent),
+        checkDescription = stringResource(
+            id = if (isResend()) {
+                R.string.description_email_re_send
+            } else {
+                R.string.description_email_sent
+            },
+        ),
         errorDescription = stringResource(id = R.string.description_conflict_email),
         showDescription = showEmailDescription,
         descriptionType = emailDescriptionType,
@@ -150,6 +158,7 @@ private fun EmailInputs(
             color = ButtonColor.Secondary,
             onClick = onAuthenticationClick,
             keyboardInteractionEnabled = false,
+            enabled = email().isNotEmpty(),
         )
     }
     JobisTextField(

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

@@ -25,6 +25,7 @@ internal class InputEmailViewModel @Inject constructor(
 ) : BaseViewModel<InputEmailState, InputEmailSideEffect>(InputEmailState.getDefaultState()) {
 
     private val timerUtil: TimerUtil = TimerUtil()
+    private var authenticationClickCount: Int = 0
 
     internal fun onNextClick() {
         setState { state.value.copy(buttonEnabled = false) }
@@ -82,6 +83,10 @@ internal class InputEmailViewModel @Inject constructor(
                         showEmailDescription = true,
                     )
                 }
+                if (authenticationClickCount > 0) {
+                    setState { state.value.copy(isResend = true) }
+                }
+                authenticationClickCount++
             }.onFailure {
                 when (it) {
                     is BadRequestException -> {
@@ -134,6 +139,7 @@ internal data class InputEmailState(
     val buttonEnabled: Boolean,
     val sendAuthenticationCode: Boolean,
     val remainTime: String,
+    val isResend: Boolean,
 ) {
     companion object {
         fun getDefaultState() = InputEmailState(
@@ -145,6 +151,7 @@ internal data class InputEmailState(
             buttonEnabled = false,
             sendAuthenticationCode = false,
             remainTime = "5:00",
+            isResend = false,
         )
     }
 }

feature/signup/src/main/res/values/strings.xml

@@ -18,12 +18,13 @@
     <string name="authentication_code">인증코드</string>
 
     <string name="authentication">인증 하기</string>
-    <string name="re_send_authentication_code">재전송</string>
+    <string name="re_send_authentication_code">재발송</string>
 
     <string name="hint_email">example</string>
     <string name="hint_authentication_code">이메일로 온 코드를 입력해주세요</string>
 
     <string name="description_email_sent">인증 메일이 발송되었어요</string>
+    <string name="description_email_re_send">인증 메일이 재발송되었어요</string>
     <string name="description_conflict_email">이미 가입 된 이메일이에요</string>
     <string name="toast_check_email_validation">이메일 형식을 확인해주세요</string>
 

feature/verify-email/src/main/res/values/strings.xml

@@ -2,7 +2,6 @@
 <resources>
     <string name="title_change_password">비밀번호 변경을 위해\n이메일을 인증해주세요</string>
     <string name="email">이메일</string>
-    <string name="authorize">인증 하기</string>
     <string name="authentication_code">인증 코드</string>
     <string name="hint_email">example</string>
     <string name="hint_authentication_code">이메일로 온 코드를 입력해주세요</string>