Merge pull request #248 from TeamDATEROAD/chore-empty-view

[chore] 엠티뷰, 에러뷰 이미지 변경
TeamDATEROAD · Sep 13, 2024 · 37236e8 · 37236e8
2 parents 7b5cf96 + 8e58d23
commit 37236e8
Show file tree

Hide file tree

Showing 26 changed files with 395 additions and 331 deletions.
diff --git a/app/src/main/java/org/sopt/dateroad/presentation/type/EmptyViewType.kt b/app/src/main/java/org/sopt/dateroad/presentation/type/EmptyViewType.kt
@@ -18,26 +18,26 @@ enum class EmptyViewType(
     ),
     READ(
         titleRes = R.string.empty_view_read,
-        imageRes = R.drawable.ic_empty_read
+        imageRes = R.drawable.img_empty_read
     ),
     LOOK(
         titleRes = R.string.empty_view_look,
-        imageRes = R.drawable.ic_empty_look
+        imageRes = R.drawable.img_empty_look
     ),
     TIMELINE(
         titleRes = R.string.empty_view_timeline,
-        imageRes = R.drawable.ic_empty_timeline
+        imageRes = R.drawable.img_empty_running
     ),
     PAST(
         titleRes = R.string.empty_view_past,
-        imageRes = R.drawable.ic_empty_default
+        imageRes = R.drawable.img_empty_envelope
     ),
     MY_COURSE_READ(
         titleRes = R.string.empty_view_my_course_read,
-        imageRes = R.drawable.ic_empty_default
+        imageRes = R.drawable.img_empty_envelope
     ),
     MY_COURSE_ENROLL(
         titleRes = R.string.empty_view_my_course_enroll,
-        imageRes = R.drawable.ic_empty_my_page_enroll
+        imageRes = R.drawable.img_empty_running
     )
 }
diff --git a/app/src/main/java/org/sopt/dateroad/presentation/ui/component/view/DateRoadEmptyView.kt b/app/src/main/java/org/sopt/dateroad/presentation/ui/component/view/DateRoadEmptyView.kt
@@ -3,9 +3,7 @@ package org.sopt.dateroad.presentation.ui.component.view
 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.fillMaxWidth
-import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
@@ -37,7 +35,6 @@ fun DateRoadEmptyView(
             contentDescription = null,
             contentScale = ContentScale.FillWidth
         )
-        Spacer(modifier = Modifier.height(16.dp))
         Text(
             modifier = Modifier
                 .fillMaxWidth()

diff --git a/app/src/main/java/org/sopt/dateroad/presentation/ui/component/view/DateRoadErrorView.kt b/app/src/main/java/org/sopt/dateroad/presentation/ui/component/view/DateRoadErrorView.kt
@@ -39,7 +39,7 @@ fun DateRoadErrorView() {
         Image(
             modifier = Modifier
                 .fillMaxWidth(),
-            painter = painterResource(id = R.drawable.ic_error_server),
+            painter = painterResource(id = R.drawable.img_error_server),
             contentDescription = null
         )
         Spacer(modifier = Modifier.height(16.dp))

diff --git a/app/src/main/java/org/sopt/dateroad/presentation/ui/component/view/DateRoadLoadingView.kt b/app/src/main/java/org/sopt/dateroad/presentation/ui/component/view/DateRoadLoadingView.kt
@@ -30,7 +30,7 @@ fun DateRoadLoadingView() {
         Image(
             modifier = Modifier
                 .fillMaxWidth(),
-            painter = painterResource(id = R.drawable.ic_loading_server),
+            painter = painterResource(id = R.drawable.img_loading_server),
             contentDescription = null,
             contentScale = ContentScale.FillWidth
         )

diff --git a/...va/org/sopt/dateroad/presentation/ui/coursedetail/component/CourseDetailUnopenedDetail.kt b/...va/org/sopt/dateroad/presentation/ui/coursedetail/component/CourseDetailUnopenedDetail.kt
@@ -63,7 +63,7 @@ fun CourseDetailUnopenedDetail(
         }
         Spacer(modifier = Modifier.height(8.dp))
         Image(
-            painter = painterResource(id = R.drawable.ic_course_detail_is_not_access),
+            painter = painterResource(id = R.drawable.img_course_detail_is_not_access),
             contentDescription = null,
             modifier = Modifier
                 .align(Alignment.CenterHorizontally)

diff --git a/app/src/main/java/org/sopt/dateroad/presentation/ui/mycourse/MyCourseScreen.kt b/app/src/main/java/org/sopt/dateroad/presentation/ui/mycourse/MyCourseScreen.kt
@@ -1,7 +1,6 @@
 package org.sopt.dateroad.presentation.ui.mycourse
 
 import androidx.compose.foundation.background
-import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.fillMaxSize
@@ -11,13 +10,12 @@ import androidx.compose.foundation.lazy.items
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
-import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.platform.LocalLifecycleOwner
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.hilt.navigation.compose.hiltViewModel
+import androidx.lifecycle.compose.LocalLifecycleOwner
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import androidx.lifecycle.flowWithLifecycle
 import org.sopt.dateroad.R
@@ -111,18 +109,12 @@ fun MyCourseScreen(
         LazyColumn {
             if (myCourseUiState.courses.isEmpty()) {
                 item {
-                    Box(
-                        modifier = Modifier
-                            .fillParentMaxSize(),
-                        contentAlignment = Alignment.Center
-                    ) {
-                        DateRoadEmptyView(
-                            emptyViewType = when (myCourseUiState.myCourseType) {
-                                MyCourseType.ENROLL -> EmptyViewType.MY_COURSE_ENROLL
-                                MyCourseType.READ -> EmptyViewType.MY_COURSE_READ
-                            }
-                        )
-                    }
+                    DateRoadEmptyView(
+                        emptyViewType = when (myCourseUiState.myCourseType) {
+                            MyCourseType.ENROLL -> EmptyViewType.MY_COURSE_ENROLL
+                            MyCourseType.READ -> EmptyViewType.MY_COURSE_READ
+                        }
+                    )
                 }
             }
             items(myCourseUiState.courses) { course ->

diff --git a/app/src/main/java/org/sopt/dateroad/presentation/ui/past/PastScreen.kt b/app/src/main/java/org/sopt/dateroad/presentation/ui/past/PastScreen.kt
@@ -2,7 +2,6 @@ package org.sopt.dateroad.presentation.ui.past
 
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.fillMaxSize
@@ -11,7 +10,6 @@ import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
-import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
@@ -95,12 +93,7 @@ fun PastScreen(
             onLeftIconClick = popBackStack
         )
         if (pastUiState.timelines.isEmpty()) {
-            Box(
-                modifier = Modifier.fillMaxSize(),
-                contentAlignment = Alignment.Center
-            ) {
-                DateRoadEmptyView(emptyViewType = EmptyViewType.PAST)
-            }
+            DateRoadEmptyView(emptyViewType = EmptyViewType.PAST)
         } else {
             LazyColumn(
                 modifier = Modifier.padding(start = 16.dp, end = 16.dp, top = 6.dp, bottom = 11.dp),

diff --git a/app/src/main/java/org/sopt/dateroad/presentation/ui/profile/ProfileScreen.kt b/app/src/main/java/org/sopt/dateroad/presentation/ui/profile/ProfileScreen.kt
@@ -226,13 +226,13 @@ fun ProfileScreen(
                 Image(
                     painter = when (profileUiState.profileType) {
                         ProfileType.ENROLL -> if (profileUiState.signUp.image.isEmpty() || profileUiState.signUp.image == "null") {
-                            painterResource(id = R.drawable.ic_enroll_profile_default)
+                            painterResource(id = R.drawable.img_enroll_profile_default)
                         } else {
                             rememberAsyncImagePainter(model = profileUiState.signUp.image)
                         }
 
                         ProfileType.EDIT -> if (profileUiState.editProfile.image.isNullOrEmpty()) {
-                            painterResource(id = R.drawable.ic_enroll_profile_default)
+                            painterResource(id = R.drawable.img_enroll_profile_default)
                         } else {
                             rememberAsyncImagePainter(model = profileUiState.editProfile.image)
                         }

diff --git a/app/src/main/java/org/sopt/dateroad/presentation/ui/signin/SignInScreen.kt b/app/src/main/java/org/sopt/dateroad/presentation/ui/signin/SignInScreen.kt
@@ -115,7 +115,7 @@ fun SignInScreen(
             horizontalAlignment = Alignment.CenterHorizontally
         ) {
             Spacer(modifier = Modifier.weight(226f))
-            Image(painter = painterResource(id = R.drawable.ic_splash_logo), contentDescription = null)
+            Image(painter = painterResource(id = R.drawable.img_splash_logo), contentDescription = null)
             Spacer(modifier = Modifier.weight(167f))
             DateRoadKakaoLoginButton(
                 modifier = Modifier.padding(horizontal = 30.dp),

diff --git a/app/src/main/java/org/sopt/dateroad/presentation/ui/splash/SplashScreen.kt b/app/src/main/java/org/sopt/dateroad/presentation/ui/splash/SplashScreen.kt
@@ -22,7 +22,7 @@ fun SplashScreen() {
         horizontalAlignment = Alignment.CenterHorizontally
     ) {
         Spacer(modifier = Modifier.weight(226f / (226f + 284f)))
-        Image(painter = painterResource(id = R.drawable.ic_splash_logo), contentDescription = null)
+        Image(painter = painterResource(id = R.drawable.img_splash_logo), contentDescription = null)
         Spacer(modifier = Modifier.weight(284f / (226f + 284f)))
     }
 }

diff --git a/app/src/main/res/drawable/ic_empty_default.xml b/app/src/main/res/drawable/ic_empty_default.xml
diff --git a/app/src/main/res/drawable/ic_empty_look.png b/app/src/main/res/drawable/ic_empty_look.png