diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 6bf8b6de..f5119afc 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -34,7 +34,7 @@ android { applicationId = "com.doyoonkim.knutice" minSdk = 31 targetSdk = 35 - versionCode = 26 + versionCode = 27 versionName = "1.5.0" testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" diff --git a/common/src/main/res/values-ja/strings.xml b/common/src/main/res/values-ja/strings.xml index 15118a04..b35b4c74 100644 --- a/common/src/main/res/values-ja/strings.xml +++ b/common/src/main/res/values-ja/strings.xml @@ -89,4 +89,6 @@ 就職 提出できません. リクエストの処理中にエラーが発生しました。 + 就職アラム + 新しい就職公知があればアラムを取りたい \ No newline at end of file diff --git a/common/src/main/res/values-ko-rKR/strings.xml b/common/src/main/res/values-ko-rKR/strings.xml index 2f2d289e..6de925a7 100644 --- a/common/src/main/res/values-ko-rKR/strings.xml +++ b/common/src/main/res/values-ko-rKR/strings.xml @@ -36,10 +36,10 @@ 장학 공지 알림 학사 공지 알림 행사 공지 알림 - 새로운 일반 공지가 올라오면 알림을 받을래요. - 새로운 장학 공지가 올라오면 알림을 받을래요. - 새로운 학사 공지가 올라오면 알림을 받을래요. - 새로운 행사 공지가 올라오면 알림을 받을래요. + 헉교의 주요 공지와 다양한 소식을 알려드려요 + 수강, 성적, 졸업 등 학사 운영과 관련된 다양한 소식을 알려드려요 + 장학금의 신청 자격, 절차, 일정 등과 관련된 다양한 소식을 알랴드려요 + 학교에서 진행되는 각종 교육, 문화, 진로 등 다양한 소식을 알려드려요 알림 설정 알림 설정하기 북마크 수정 @@ -89,4 +89,6 @@ 취업공지 오류가 발생했습니다. 요청을 처리하는 중 오류가 발생했어요. + 취업 공지 알림 + 채용 정보, 취업 지원 프로그램, 진로 상담 등 학생들의 진로 설계를 돕기 위한 소식을 알려드려요 \ No newline at end of file diff --git a/common/src/main/res/values/strings.xml b/common/src/main/res/values/strings.xml index feac737a..9d8ba5ec 100644 --- a/common/src/main/res/values/strings.xml +++ b/common/src/main/res/values/strings.xml @@ -100,4 +100,6 @@ Career News Submission Unavailable Error occurred while processing your request. + Career Notices + Get push notification when new career notice is being posted. \ No newline at end of file diff --git a/feature/main/src/main/java/com/doyoonkim/main/preference/NotificationPreferencesScreen.kt b/feature/main/src/main/java/com/doyoonkim/main/preference/NotificationPreferencesScreen.kt index f7c53ab2..83ab383d 100644 --- a/feature/main/src/main/java/com/doyoonkim/main/preference/NotificationPreferencesScreen.kt +++ b/feature/main/src/main/java/com/doyoonkim/main/preference/NotificationPreferencesScreen.kt @@ -200,7 +200,7 @@ fun NotificationPreferencesScreen( subTitleText = stringResource(R.string.event_notification_channel_description), primaryColor = MaterialTheme.colorScheme.title, secondaryColor = MaterialTheme.colorScheme.subTitle, - hasBottomDivider = false + hasBottomDivider = true ) { Switch( checked = uiStatus.isEachChannelAllowed[3], @@ -214,7 +214,30 @@ fun NotificationPreferencesScreen( enabled = uiStatus.isMainNotificationPermissionGranted && uiStatus.isSyncCompleted ) } + + RoundedCornerColumnTextItemWithExtraOnRight( + modifier = Modifier.padding(start = 10.dp), + verticalPadding = 15.dp, + titleText = stringResource(R.string.employment_notification_channel_name), + subTitleText = stringResource(R.string.employment_notification_channel_descrption), + primaryColor = MaterialTheme.colorScheme.title, + secondaryColor = MaterialTheme.colorScheme.subTitle, + hasBottomDivider = false + ) { + Switch( + checked = uiStatus.isEachChannelAllowed[4], + colors = SwitchDefaults.colors().copy( + checkedTrackColor = MaterialTheme.colorScheme.variantPurple, + checkedThumbColor = Color.White + ), + onCheckedChange = { + viewModel.updateChannelPreferenceState(4, it) + }, + enabled = uiStatus.isMainNotificationPermissionGranted && uiStatus.isSyncCompleted + ) + } } + if (!uiStatus.isSyncCompleted) { Box( modifier = Modifier.fillMaxSize() diff --git a/feature/main/src/main/java/com/doyoonkim/main/viewmodel/NotificationPreferencesViewModel.kt b/feature/main/src/main/java/com/doyoonkim/main/viewmodel/NotificationPreferencesViewModel.kt index ab4f931a..cf6b9325 100644 --- a/feature/main/src/main/java/com/doyoonkim/main/viewmodel/NotificationPreferencesViewModel.kt +++ b/feature/main/src/main/java/com/doyoonkim/main/viewmodel/NotificationPreferencesViewModel.kt @@ -31,7 +31,8 @@ class NotificationPreferencesViewModel @Inject constructor( 0 to NoticeCategory.GENERAL_NEWS, 1 to NoticeCategory.ACADEMIC_NEWS, 2 to NoticeCategory.SCHOLARSHIP_NEWS, - 3 to NoticeCategory.EVENT_NEWS + 3 to NoticeCategory.EVENT_NEWS, + 4 to NoticeCategory.EMPLOYMENT_NEWS ) fun updateMainNotificationPermissionStatus(status: Boolean) = @@ -93,7 +94,8 @@ class NotificationPreferencesViewModel @Inject constructor( status.general, status.academic, status.scholarship, - status.event + status.event, + status.employment ), isSyncCompleted = true, isError = false @@ -122,7 +124,7 @@ class NotificationPreferencesViewModel @Inject constructor( data class NotificationPreferencesState( val isMainNotificationPermissionGranted: Boolean = false, - val isEachChannelAllowed: List = listOf(false, false, false, false), + val isEachChannelAllowed: List = listOf(false, false, false, false, false), val isSyncCompleted: Boolean = false, val isError: Boolean = false ) \ No newline at end of file