Merge pull request #106 from Nexters/fix/background-image

[FIX] Background 이미지가 언제나 화면 전체를 채우도록 수정

Author: easyhooon

app/src/main/AndroidManifest.xml

@@ -11,7 +11,7 @@
 
     <application
         android:name=".ILabApplication"
-        android:allowBackup="true"
+        android:allowBackup="false"
         android:dataExtractionRules="@xml/data_extraction_rules"
         android:fullBackupContent="@xml/backup_rules"
         android:icon="@mipmap/ic_launcher"

build-logic/src/main/kotlin/com/nexters/ilab/android/Config.kt

@@ -4,8 +4,8 @@ internal object ApplicationConfig {
     const val MinSdk = 26
     const val TargetSdk = 34
     const val CompileSdk = 34
-    const val VersionCode = 3
-    const val VersionName = "1.0.2"
+    const val VersionCode = 4
+    const val VersionName = "1.0.3"
     val JavaVersion = org.gradle.api.JavaVersion.VERSION_17
     const val JavaVersionAsInt = 17
 }

core/ui/src/main/kotlin/com/nexters/ilab/core/ui/component/Image.kt

@@ -97,7 +97,7 @@ fun BackgroundImage(
     resId: Int,
     contentDescription: String,
     modifier: Modifier = Modifier,
-    contentScale: ContentScale = ContentScale.Fit,
+    contentScale: ContentScale = ContentScale.Crop,
 ) {
     if (LocalInspectionMode.current) {
         Box(modifier = Modifier.fillMaxSize())

feature/home/src/main/kotlin/com/nexters/ilab/android/feature/home/HomeScreen.kt

@@ -71,7 +71,6 @@ import com.nexters.ilab.core.ui.component.PagerIndicator
 import com.nexters.ilab.core.ui.component.ServerErrorDialog
 import com.nexters.ilab.core.ui.component.TopAppBarNavigationType
 
-// TODO 하단 스타일과 스타일 입력 화면 연동
 @Composable
 internal fun HomeRoute(
     padding: PaddingValues,

feature/login/src/main/kotlin/com/nexters/ilab/android/feature/login/LoginScreen.kt

@@ -74,6 +74,7 @@ internal fun LoginRoute(
                             resource.getString(R.string.unknown_error_message)
                         }
                     }
+
                     is SocketTimeoutException -> resource.getString(R.string.server_error_message)
                     else -> resource.getString(R.string.unknown_error_message)
                 },
@@ -139,10 +140,6 @@ internal fun LoginScreen(
     onLoginClick: () -> Unit,
 ) {
     Box(modifier = Modifier.fillMaxSize()) {
-        if (uiState.isLoading) {
-            LoadingIndicator(modifier = Modifier.fillMaxSize())
-        }
-
         BackgroundImage(
             resId = R.drawable.bg_login_screen,
             contentDescription = "Background Image for Login Screen",
@@ -153,6 +150,9 @@ internal fun LoginScreen(
         LoginContent(
             onLoginClick = onLoginClick,
         )
+        if (uiState.isLoading) {
+            LoadingIndicator()
+        }
     }
 }