🚀 :: v2.2.9 (#458)

Author: uson1004

.DS_Store

@@ -34,3 +34,7 @@ google-cloud-platform.json
 
 # Android Profiling
 *.hprof
+
+.DS_Store
+
+*.aab

.gitignore

@@ -13,11 +13,11 @@ plugins {
 }
 
 android {
-    namespace = "team.retum.jobisandroidv2"
+    namespace = "team.retum.jobis"
     compileSdk = ProjectProperties.COMPILE_SDK
 
     defaultConfig {
-        applicationId = "team.retum.jobisandroidv2"
+        applicationId = "team.retum.jobis"
         minSdk = ProjectProperties.MIN_SDK
         targetSdk = ProjectProperties.TARGET_SDK
         versionCode = ProjectProperties.VERSION_CODE
@@ -114,6 +114,7 @@ dependencies {
     implementation(project(":feature:company"))
     implementation(project(":feature:review"))
     implementation(project(":feature:application"))
+    implementation(project(":feature:employment"))
 
     implementation(platform(libs.androidx.compose.bom))
     implementation(libs.androidx.navigation.compose)

app/build.gradle.kts

@@ -7,7 +7,7 @@
     <uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
 
     <application
-        android:name=".JobisApplication"
+        android:name="team.retum.jobisandroidv2.JobisApplication"
         android:allowBackup="true"
         android:dataExtractionRules="@xml/data_extraction_rules"
         android:fullBackupContent="@xml/backup_rules"
@@ -18,7 +18,7 @@
         android:theme="@style/Theme.JobisAndroidV2"
         tools:targetApi="31">
         <activity
-            android:name=".MainActivity"
+            android:name="team.retum.jobisandroidv2.MainActivity"
             android:exported="true"
             android:label="@string/app_name"
             android:theme="@style/Theme.JobisAndroidV2">
@@ -29,7 +29,7 @@
             </intent-filter>
         </activity>
         <service
-            android:name=".service.JobisMessagingService"
+            android:name="team.retum.jobisandroidv2.service.JobisMessagingService"
             android:exported="true">
             <intent-filter>
                 <action android:name="com.google.firebase.MESSAGING_EVENT" />

app/src/main/AndroidManifest.xml

@@ -24,6 +24,7 @@ class JobisApplication : Application() {
 
         Thread.setDefaultUncaughtExceptionHandler { _, e ->
             Firebase.crashlytics.recordException(e)
+            // TODO : 에러 로그 메세지
 
             when (e) {
                 is OfflineException -> makeToast(InternetErrorMsg)

app/src/main/java/team/retum/jobisandroidv2/JobisApplication.kt

@@ -10,6 +10,8 @@ import team.retum.common.model.ApplicationData
 import team.retum.company.navigation.navigateToCompanies
 import team.retum.company.navigation.navigateToCompanyDetails
 import team.retum.company.navigation.navigateToSearchCompanies
+import team.retum.employment.navigation.navigateToEmployment
+import team.retum.employment.navigation.navigateToEmploymentDetail
 import team.retum.jobis.application.navigation.navigateToApplication
 import team.retum.jobis.change.password.navigation.navigateToComparePassword
 import team.retum.jobis.change.password.navigation.navigateToResetPassword
@@ -134,6 +136,14 @@ internal class JobisNavigator(
         navController.navigateToRoot(applicationId = applicationId)
     }
 
+    fun navigateToEmployment() {
+        navController.navigateToEmployment()
+    }
+
+    fun navigateToEmploymentDetail(classId: Long) {
+        navController.navigateToEmploymentDetail(classId = classId)
+    }
+
     fun navigateToWinterIntern() {
         navController.navigateToWinterIntern()
     }

app/src/main/java/team/retum/jobisandroidv2/JobisNavigator.kt

@@ -13,6 +13,7 @@ import com.google.android.play.core.install.model.UpdateAvailability
 import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.coroutines.launch
 import team.retum.device.DeviceTokenManager
+import team.retum.jobis.R
 import team.retum.jobisandroidv2.ui.JobisApp
 import team.retum.jobisdesignsystemv2.foundation.JobisDesignSystemV2Theme
 import team.retum.jobisdesignsystemv2.toast.JobisToast

app/src/main/java/team/retum/jobisandroidv2/MainActivity.kt

@@ -6,6 +6,8 @@ import team.retum.bug.navigation.reportBug
 import team.retum.company.navigation.companies
 import team.retum.company.navigation.companyDetails
 import team.retum.company.navigation.searchCompanies
+import team.retum.employment.navigation.employment
+import team.retum.employment.navigation.employmentDetail
 import team.retum.jobis.application.navigation.application
 import team.retum.jobis.interests.navigation.interests
 import team.retum.jobis.notice.navigation.noticeDetails
@@ -34,6 +36,7 @@ internal fun NavGraphBuilder.mainNavigation(
     ) {
         root(
             onAlarmClick = navigator::navigateToNotification,
+            onEmploymentClick = navigator::navigateToEmployment,
             onWinterInternClick = navigator::navigateToWinterIntern,
             onRecruitmentDetailsClick = navigator::navigateToRecruitmentDetails,
             onCompaniesClick = navigator::navigateToCompanies,
@@ -57,12 +60,20 @@ internal fun NavGraphBuilder.mainNavigation(
             },
             navigateToRecruitment = navigator::navigateToRecruitmentDetails,
             navigateToHome = navigator::navigateToRoot,
+            navigateToNotice = navigator::navigateToNoticeDetails,
         )
         recruitmentDetails(
             onBackPressed = navigator::popBackStackIfNotHome,
             onApplyClick = navigator::navigateToApplication,
             navigateToCompanyDetails = navigator::navigateToCompanyDetails,
         )
+        employment(
+            onBackPressed = navigator::popBackStackIfNotHome,
+            onClassClick = navigator::navigateToEmploymentDetail,
+        )
+        employmentDetail(
+            onBackPressed = navigator::popBackStackIfNotHome,
+        )
         reportBug(onBackPressed = navigator::popBackStackIfNotHome)
         interests(onBackPressed = navigator::popBackStackIfNotHome)
         noticeDetails(onBackPressed = navigator::popBackStackIfNotHome)

app/src/main/java/team/retum/jobisandroidv2/navigation/MainNavigation.kt

@@ -12,6 +12,7 @@ const val APPLICATION_ID = "applicationId"
 
 fun NavGraphBuilder.root(
     onAlarmClick: () -> Unit,
+    onEmploymentClick: () -> Unit,
     onWinterInternClick: () -> Unit,
     onRecruitmentDetailsClick: (Long) -> Unit,
     onCompaniesClick: () -> Unit,
@@ -35,6 +36,7 @@ fun NavGraphBuilder.root(
         Root(
             applicationId = it.arguments?.getString(APPLICATION_ID)?.toLong(),
             onAlarmClick = onAlarmClick,
+            onEmploymentClick = onEmploymentClick,
             onWinterInternClick = onWinterInternClick,
             onRecruitmentDetailsClick = onRecruitmentDetailsClick,
             onCompaniesClick = onCompaniesClick,

app/src/main/java/team/retum/jobisandroidv2/root/RootNavigation.kt

@@ -7,7 +7,6 @@ import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.material.ExperimentalMaterialApi
 import androidx.compose.material.ModalBottomSheetLayout
 import androidx.compose.material.ModalBottomSheetState
 import androidx.compose.material.ModalBottomSheetValue
@@ -41,11 +40,11 @@ import team.retum.jobisdesignsystemv2.foundation.JobisTheme
 import team.retum.jobisdesignsystemv2.foundation.JobisTypography
 import team.retum.jobisdesignsystemv2.text.JobisText
 
-@OptIn(ExperimentalMaterialApi::class)
 @Composable
 internal fun Root(
     applicationId: Long?,
     onAlarmClick: () -> Unit,
+    onEmploymentClick: () -> Unit,
     onWinterInternClick: () -> Unit,
     onRecruitmentDetailsClick: (Long) -> Unit,
     onCompaniesClick: () -> Unit,
@@ -79,6 +78,7 @@ internal fun Root(
                 sheetState.show()
             }
         },
+        onEmploymentClick = onEmploymentClick,
         onWinterInternClick = onWinterInternClick,
         onRecruitmentDetailsClick = onRecruitmentDetailsClick,
         onCompaniesClick = onCompaniesClick,
@@ -104,14 +104,14 @@ internal fun Root(
     )
 }
 
-@OptIn(ExperimentalMaterialApi::class)
 @SuppressLint("UnusedMaterial3ScaffoldPaddingParameter")
 @Composable
 private fun RootScreen(
     navController: NavHostController = rememberNavController(),
     sheetState: ModalBottomSheetState,
     applicationId: Long?,
     onAlarmClick: () -> Unit,
+    onEmploymentClick: () -> Unit,
     onWinterInternClick: () -> Unit,
     onRecruitmentDetailsClick: (Long) -> Unit,
     onRecruitmentFilterClick: () -> Unit,
@@ -157,6 +157,7 @@ private fun RootScreen(
                     onAlarmClick = onAlarmClick,
                     showRejectionModal = showRejectionModal,
                     onCompaniesClick = onCompaniesClick,
+                    onEmploymentClick = onEmploymentClick,
                     onWinterInternClick = onWinterInternClick,
                     navigateToRecruitmentDetails = navigateToRecruitmentDetails,
                     navigatedFromNotifications = navigatedFromNotifications,