🔗 :: (#382) 알림 없음 화면 추가

parkuiery · web-flow · commit 67f174202531 · 2024-10-11T23:48:37.000+09:00
diff --git a/core/design-system/src/main/java/team/retum/jobisdesignsystemv2/empty/EmptyContent.kt b/core/design-system/src/main/java/team/retum/jobisdesignsystemv2/empty/EmptyContent.kt
@@ -0,0 +1,56 @@
+package team.retum.jobisdesignsystemv2.empty
+
+import androidx.compose.foundation.Image
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.size
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.unit.dp
+import team.retum.jobisdesignsystemv2.foundation.JobisIcon
+import team.retum.jobisdesignsystemv2.foundation.JobisTheme
+import team.retum.jobisdesignsystemv2.foundation.JobisTypography
+import team.retum.jobisdesignsystemv2.text.JobisText
+
+@Composable
+fun EmptyContent(
+    modifier: Modifier = Modifier,
+    title: String,
+    description: String? = null,
+) {
+    Column(
+        modifier = modifier.fillMaxSize(),
+        verticalArrangement = Arrangement.Center,
+        horizontalAlignment = Alignment.CenterHorizontally,
+    ) {
+        Image(
+            modifier = Modifier.size(128.dp),
+            painter = painterResource(JobisIcon.Empty),
+            contentDescription = "empty content",
+        )
+        Spacer(modifier = Modifier.height(16.dp))
+        Column(
+            modifier = Modifier.fillMaxWidth(),
+            verticalArrangement = Arrangement.spacedBy(4.dp),
+            horizontalAlignment = Alignment.CenterHorizontally,
+        ) {
+            JobisText(
+                text = title,
+                style = JobisTypography.SubHeadLine,
+            )
+            description?.let {
+                JobisText(
+                    text = it,
+                    style = JobisTypography.Description,
+                    color = JobisTheme.colors.onSurfaceVariant,
+                )
+            }
+        }
+    }
+}
diff --git a/core/design-system/src/main/java/team/retum/jobisdesignsystemv2/foundation/JobisIcon.kt b/core/design-system/src/main/java/team/retum/jobisdesignsystemv2/foundation/JobisIcon.kt
@@ -35,4 +35,5 @@ object JobisIcon {
     val File = R.drawable.ic_file
     val SnowMan = R.drawable.ic_snow_man
     val Notification = R.drawable.ic_notification
+    val Empty = R.drawable.ic_empty
 }
diff --git a/core/design-system/src/main/res/drawable/ic_empty.png b/core/design-system/src/main/res/drawable/ic_empty.png
diff --git a/feature/company/src/main/java/team/retum/company/ui/SearchCompaniesScreen.kt b/feature/company/src/main/java/team/retum/company/ui/SearchCompaniesScreen.kt
@@ -1,21 +1,12 @@
 package team.retum.company.ui
 
-import androidx.compose.foundation.Image
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.size
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
-import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.text.style.TextAlign
-import androidx.compose.ui.unit.dp
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import kotlinx.collections.immutable.ImmutableList
@@ -25,9 +16,8 @@ import team.retum.company.viewmodel.CompaniesState
 import team.retum.company.viewmodel.CompaniesViewModel
 import team.retum.jobis.company.R
 import team.retum.jobisdesignsystemv2.appbar.JobisSmallTopAppBar
+import team.retum.jobisdesignsystemv2.empty.EmptyContent
 import team.retum.jobisdesignsystemv2.foundation.JobisTheme
-import team.retum.jobisdesignsystemv2.foundation.JobisTypography
-import team.retum.jobisdesignsystemv2.text.JobisText
 import team.retum.jobisdesignsystemv2.textfield.JobisTextField
 import team.retum.usecase.entity.CompaniesEntity
 
@@ -78,36 +68,10 @@ private fun SearchCompaniesScreen(
             fetchNextPage = fetchNextPage,
         )
         if (state.showCompaniesEmptyContent) {
-            EmptySearchContent()
+            EmptyContent(
+                title = stringResource(id = R.string.not_found_company),
+                description = stringResource(id = R.string.double_check),
+            )
         }
     }
 }
-
-@Composable
-private fun EmptySearchContent() {
-    Column(
-        modifier = Modifier
-            .background(JobisTheme.colors.background)
-            .fillMaxSize()
-            .padding(vertical = 160.dp),
-        horizontalAlignment = Alignment.CenterHorizontally,
-    ) {
-        Image(
-            modifier = Modifier.size(128.dp),
-            painter = painterResource(id = R.drawable.ic_empty_company),
-            contentDescription = "empty bookmark",
-        )
-        Spacer(modifier = Modifier.height(16.dp))
-        JobisText(
-            text = stringResource(id = R.string.not_found_company),
-            style = JobisTypography.HeadLine,
-        )
-        Spacer(modifier = Modifier.height(8.dp))
-        JobisText(
-            text = stringResource(id = R.string.double_check),
-            style = JobisTypography.Body,
-            color = JobisTheme.colors.onSurfaceVariant,
-            textAlign = TextAlign.Center,
-        )
-    }
-}
diff --git a/feature/notice/src/main/java/team/retum/jobis/notice/ui/NoticesScreen.kt b/feature/notice/src/main/java/team/retum/jobis/notice/ui/NoticesScreen.kt
@@ -27,6 +27,7 @@ import team.retum.jobis.notice.viewmodel.NoticesSideEffect
 import team.retum.jobis.notice.viewmodel.NoticesViewModel
 import team.retum.jobis.notification.R
 import team.retum.jobisdesignsystemv2.appbar.JobisSmallTopAppBar
+import team.retum.jobisdesignsystemv2.empty.EmptyContent
 import team.retum.jobisdesignsystemv2.foundation.JobisIcon
 import team.retum.jobisdesignsystemv2.foundation.JobisTheme
 import team.retum.jobisdesignsystemv2.foundation.JobisTypography
@@ -93,6 +94,9 @@ private fun NoticesScreen(
                 )
             }
         }
+        if (notices.isEmpty()) {
+            EmptyContent(title = stringResource(id = R.string.no_notice))
+        }
     }
 }
 
diff --git a/feature/notice/src/main/res/values/string.xml b/feature/notice/src/main/res/values/string.xml
@@ -6,4 +6,5 @@
     <string name="failed_download">다운로드에 실패했습니다</string>
     <string name="success_download">다운로드가 완료되었어요!</string>
     <string name="open">열기</string>
+    <string name="no_notice">아직 공지사항이 없어요</string>
 </resources>
diff --git a/feature/notification/src/main/java/team/retum/notification/ui/NotificationsScreen.kt b/feature/notification/src/main/java/team/retum/notification/ui/NotificationsScreen.kt
@@ -28,6 +28,7 @@ import kotlinx.collections.immutable.ImmutableList
 import kotlinx.collections.immutable.toPersistentList
 import team.retum.alarm.R
 import team.retum.jobisdesignsystemv2.appbar.JobisSmallTopAppBar
+import team.retum.jobisdesignsystemv2.empty.EmptyContent
 import team.retum.jobisdesignsystemv2.foundation.JobisTheme
 import team.retum.jobisdesignsystemv2.foundation.JobisTypography
 import team.retum.jobisdesignsystemv2.tab.TabBar
@@ -108,8 +109,7 @@ private fun NotificationsScreen(
             onSelectTab = onSelectTab,
         )
         LazyColumn(
-            modifier = Modifier
-                .fillMaxWidth(),
+            modifier = Modifier.fillMaxWidth(),
         ) {
             items(notificationList) {
                 NotificationContent(
@@ -122,6 +122,9 @@ private fun NotificationsScreen(
                 )
             }
         }
+        if (notificationList.isEmpty()) {
+            EmptyContent(title = stringResource(id = R.string.no_notification))
+        }
     }
 }
 
diff --git a/feature/notification/src/main/res/values/strings.xml b/feature/notification/src/main/res/values/strings.xml
@@ -14,4 +14,5 @@
     <string name="recruitment_notification">모집의뢰서 알림</string>
     <string name="cannot_current_notification_status">설정된 알림을 가져오지 못했어요</string>
     <string name="change_notification_fail">알림을 변경에 실패했어요</string>
+    <string name="no_notification">아직 알림이 없어요</string>
 </resources>
diff --git a/feature/recruitment/src/main/java/team/retum/jobis/recruitment/ui/SearchRecruitmentScreen.kt b/feature/recruitment/src/main/java/team/retum/jobis/recruitment/ui/SearchRecruitmentScreen.kt
@@ -1,21 +1,12 @@
 package team.retum.jobis.recruitment.ui
 
-import androidx.compose.foundation.Image
 import androidx.compose.foundation.background
-import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.size
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
-import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.unit.dp
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import kotlinx.collections.immutable.ImmutableList
@@ -25,10 +16,9 @@ import team.retum.jobis.recruitment.ui.component.RecruitmentItems
 import team.retum.jobis.recruitment.viewmodel.RecruitmentViewModel
 import team.retum.jobis.recruitment.viewmodel.RecruitmentsState
 import team.retum.jobisdesignsystemv2.appbar.JobisSmallTopAppBar
+import team.retum.jobisdesignsystemv2.empty.EmptyContent
 import team.retum.jobisdesignsystemv2.foundation.JobisIcon
 import team.retum.jobisdesignsystemv2.foundation.JobisTheme
-import team.retum.jobisdesignsystemv2.foundation.JobisTypography
-import team.retum.jobisdesignsystemv2.text.JobisText
 import team.retum.jobisdesignsystemv2.textfield.JobisTextField
 import team.retum.usecase.entity.RecruitmentsEntity
 
@@ -83,38 +73,9 @@ private fun SearchRecruitmentScreen(
             fetchNextPage = fetchNextPage,
         )
         if (state.showRecruitmentsEmptyContent) {
-            EmptyRecruitmentContent()
-        }
-    }
-}
-
-@Composable
-private fun EmptyRecruitmentContent() {
-    Column(
-        modifier = Modifier
-            .fillMaxSize()
-            .padding(bottom = 80.dp),
-        verticalArrangement = Arrangement.Center,
-        horizontalAlignment = Alignment.CenterHorizontally,
-    ) {
-        Image(
-            modifier = Modifier.size(128.dp),
-            painter = painterResource(id = R.drawable.ic_empty_company),
-            contentDescription = "empty recruitment",
-        )
-        Spacer(modifier = Modifier.height(16.dp))
-        Column(
-            horizontalAlignment = Alignment.CenterHorizontally,
-            verticalArrangement = Arrangement.spacedBy(4.dp),
-        ) {
-            JobisText(
-                text = stringResource(id = R.string.recruitment_no_content),
-                style = JobisTypography.HeadLine,
-            )
-            JobisText(
-                text = stringResource(id = R.string.retry),
-                style = JobisTypography.Body,
-                color = JobisTheme.colors.onSurfaceVariant,
+            EmptyContent(
+                title = stringResource(id = R.string.recruitment_no_content),
+                description = stringResource(id = R.string.retry),
             )
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -35,4 +35,5 @@ object JobisIcon {`
`35`	`35`	`val File = R.drawable.ic_file`
`36`	`36`	`val SnowMan = R.drawable.ic_snow_man`
`37`	`37`	`val Notification = R.drawable.ic_notification`
	`38`	`+ val Empty = R.drawable.ic_empty`
`38`	`39`	`}`
Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,7 @@ import team.retum.jobis.notice.viewmodel.NoticesSideEffect`
`27`	`27`	`import team.retum.jobis.notice.viewmodel.NoticesViewModel`
`28`	`28`	`import team.retum.jobis.notification.R`
`29`	`29`	`import team.retum.jobisdesignsystemv2.appbar.JobisSmallTopAppBar`
	`30`	`+import team.retum.jobisdesignsystemv2.empty.EmptyContent`
`30`	`31`	`import team.retum.jobisdesignsystemv2.foundation.JobisIcon`
`31`	`32`	`import team.retum.jobisdesignsystemv2.foundation.JobisTheme`
`32`	`33`	`import team.retum.jobisdesignsystemv2.foundation.JobisTypography`
`@@ -93,6 +94,9 @@ private fun NoticesScreen(`
`93`	`94`	`)`
`94`	`95`	`}`
`95`	`96`	`}`
	`97`	`+ if (notices.isEmpty()) {`
	`98`	`+ EmptyContent(title = stringResource(id = R.string.no_notice))`
	`99`	`+ }`
`96`	`100`	`}`
`97`	`101`	`}`
`98`	`102`
Original file line number	Diff line number	Diff line change
`@@ -28,6 +28,7 @@ import kotlinx.collections.immutable.ImmutableList`
`28`	`28`	`import kotlinx.collections.immutable.toPersistentList`
`29`	`29`	`import team.retum.alarm.R`
`30`	`30`	`import team.retum.jobisdesignsystemv2.appbar.JobisSmallTopAppBar`
	`31`	`+import team.retum.jobisdesignsystemv2.empty.EmptyContent`
`31`	`32`	`import team.retum.jobisdesignsystemv2.foundation.JobisTheme`
`32`	`33`	`import team.retum.jobisdesignsystemv2.foundation.JobisTypography`
`33`	`34`	`import team.retum.jobisdesignsystemv2.tab.TabBar`
`@@ -108,8 +109,7 @@ private fun NotificationsScreen(`
`108`	`109`	`onSelectTab = onSelectTab,`
`109`	`110`	`)`
`110`	`111`	`LazyColumn(`
`111`		`- modifier = Modifier`
`112`		`- .fillMaxWidth(),`
	`112`	`+ modifier = Modifier.fillMaxWidth(),`
`113`	`113`	`) {`
`114`	`114`	`items(notificationList) {`
`115`	`115`	`NotificationContent(`
`@@ -122,6 +122,9 @@ private fun NotificationsScreen(`
`122`	`122`	`)`
`123`	`123`	`}`
`124`	`124`	`}`
	`125`	`+ if (notificationList.isEmpty()) {`
	`126`	`+ EmptyContent(title = stringResource(id = R.string.no_notification))`
	`127`	`+ }`
`125`	`128`	`}`
`126`	`129`	`}`
`127`	`130`