Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Component, Screen Preview 구성 #153

Merged
merged 12 commits into from
Jan 1, 2024
Merged

Component, Screen Preview 구성 #153

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
271b600
ComponentPreview annotation class 추가
easyhooon Dec 28, 2023
d57b743
LoadingScreen 네이밍 변경
easyhooon Dec 28, 2023
2284d9b
:core:ui 모듈 화면을 구성하는 컴포넌트들 프리뷰 추가
easyhooon Dec 28, 2023
4903704
DevicePreview annotation class 추가
easyhooon Dec 28, 2023
9074c79
feature 모듈 component, screen 프리뷰 추가
easyhooon Dec 28, 2023
54c9103
SplashScreen preview render problem 해결
easyhooon Dec 28, 2023
12ea5f9
spotless check success
easyhooon Dec 28, 2023
d4a4bde
BandalartBottomSheet preview 추가
easyhooon Dec 28, 2023
ba2dc29
HomeScreen preview 내에 dummy bandalart data 적용
easyhooon Dec 28, 2023
4a4f590
사용하지 않는 MainViewModel 제거
easyhooon Dec 29, 2023
b63a9b8
chore: FixedSizeText 사용된 부분 nonScaleSp 속성 제거, modifier 파라미터 순서 변경
easyhooon Dec 31, 2023
ef564e9
spotless check success
easyhooon Dec 31, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion ...ndroid/core/ui/component/LoadingScreen.kt → ...oid/core/ui/component/LoadingIndicator.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,10 @@ import com.airbnb.lottie.compose.rememberLottieComposition
import com.nexters.bandalart.android.core.ui.extension.noRippleClickable
import com.nexters.bandalart.android.core.designsystem.theme.Black
import com.nexters.bandalart.android.core.designsystem.theme.White
import com.nexters.bandalart.android.core.ui.ComponentPreview

@Composable
fun LoadingScreen(
fun LoadingIndicator(
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

회사에 들어간다면 이런 네이밍도 지적 당하기 좋았을 듯 좀 더 생각하고 이름도 짜야겠어..

modifier: Modifier = Modifier,
) {
Box(
Expand Down Expand Up @@ -64,3 +65,9 @@ fun LoadingScreen(
}
}
}

@ComponentPreview
@Composable
fun LoadingIndicatorPreview() {
LoadingIndicator()
}
4 changes: 2 additions & 2 deletions feature/home/src/main/kotlin/com/nexters/bandalart/android/feature/home/HomeScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ import com.nexters.bandalart.android.core.ui.ObserveAsEvents
import com.nexters.bandalart.android.core.ui.R
import com.nexters.bandalart.android.core.ui.ThemeColor
import com.nexters.bandalart.android.core.ui.component.BandalartDeleteAlertDialog
import com.nexters.bandalart.android.core.ui.component.LoadingScreen
import com.nexters.bandalart.android.core.ui.component.LoadingIndicator
import com.nexters.bandalart.android.core.ui.component.NetworkErrorAlertDialog
import com.nexters.bandalart.android.feature.home.model.BandalartDetailUiModel
import com.nexters.bandalart.android.feature.home.ui.HomeHeader
Expand Down Expand Up @@ -296,7 +296,7 @@ internal fun HomeScreen(
}
when {
uiState.isLoading -> {
LoadingScreen()
LoadingIndicator()
}

uiState.isShowSkeleton -> {
Expand Down
4 changes: 2 additions & 2 deletions feature/splash/src/main/kotlin/com/nexters/bandalart/android/feature/splash/SplashScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import com.nexters.bandalart.android.core.designsystem.theme.Gray50
import com.nexters.bandalart.android.core.ui.ObserveAsEvents
import com.nexters.bandalart.android.core.ui.R
import com.nexters.bandalart.android.core.ui.component.AppTitle
import com.nexters.bandalart.android.core.ui.component.LoadingScreen
import com.nexters.bandalart.android.core.ui.component.LoadingIndicator
import com.nexters.bandalart.android.core.ui.component.NetworkErrorAlertDialog
import com.nexters.bandalart.android.feature.splash.navigation.SPLASH_NAVIGATION_ROUTE

Expand Down Expand Up @@ -77,7 +77,7 @@ fun SplashScreen(

when {
uiState.isLoading -> {
LoadingScreen(modifier = Modifier.fillMaxSize())
LoadingIndicator(modifier = Modifier.fillMaxSize())
}

uiState.isNetworkErrorAlertDialogOpened -> {
Expand Down