diff --git a/app/build.gradle.kts b/app/build.gradle.kts index e3e53218..9af53cfb 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -16,6 +16,8 @@ android { dependencies { implementation(project(":core:design-system")) + implementation(libs.junit) androidTestImplementation(libs.androidx.test.ext) + implementation(libs.androidx.core.splashscreen) } \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 0507bad7..003e3c64 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -17,7 +17,7 @@ android:name=".MainActivity" android:exported="true" android:label="@string/app_name" - android:theme="@style/Theme.GOMSAndroidV2"> + android:theme="@style/Theme.App.Starting"> diff --git a/app/src/main/java/com/goms/goms_android_v2/MainActivity.kt b/app/src/main/java/com/goms/goms_android_v2/MainActivity.kt index 34ceca46..0827593d 100644 --- a/app/src/main/java/com/goms/goms_android_v2/MainActivity.kt +++ b/app/src/main/java/com/goms/goms_android_v2/MainActivity.kt @@ -11,6 +11,7 @@ import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.tooling.preview.Preview +import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen import com.goms.design_system.theme.GomsTheme import dagger.hilt.android.AndroidEntryPoint @@ -19,6 +20,7 @@ class MainActivity : ComponentActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) setContent { + installSplashScreen() GomsTheme { colors, typography -> // A surface container using the 'background' color from the theme Box( diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml index 8f274998..d7fbf876 100644 --- a/app/src/main/res/values/themes.xml +++ b/app/src/main/res/values/themes.xml @@ -2,4 +2,11 @@ \ No newline at end of file diff --git a/core/design-system/src/main/java/com/goms/design_system/util/systemUi.kt b/core/design-system/src/main/java/com/goms/design_system/util/systemUi.kt index 6ecb0283..cd8bf3c5 100644 --- a/core/design-system/src/main/java/com/goms/design_system/util/systemUi.kt +++ b/core/design-system/src/main/java/com/goms/design_system/util/systemUi.kt @@ -12,12 +12,12 @@ fun ApplySystemUi(isDarkTheme: Boolean) { val view = LocalView.current val context = view.context as? Activity ?: return - val statusBarColor = Color.Transparent + val statusBarColor = if (isDarkTheme) Color.Black else Color.White val navigationBarColor = if (isDarkTheme) Color.Black else Color.White WindowCompat.setDecorFitsSystemWindows(context.window, false) val insetsController = WindowCompat.getInsetsController(context.window, view) - insetsController.isAppearanceLightStatusBars = isDarkTheme + insetsController.isAppearanceLightStatusBars = !isDarkTheme context.window.statusBarColor = statusBarColor.toArgb() context.window.navigationBarColor = navigationBarColor.toArgb() } \ No newline at end of file diff --git a/core/design-system/src/main/res/drawable/ic_goms.xml b/core/design-system/src/main/res/drawable/ic_goms.xml new file mode 100644 index 00000000..6b0c3068 --- /dev/null +++ b/core/design-system/src/main/res/drawable/ic_goms.xml @@ -0,0 +1,15 @@ + + + + + diff --git a/core/design-system/src/main/res/drawable/ic_splash.xml b/core/design-system/src/main/res/drawable/ic_splash.xml new file mode 100644 index 00000000..01801576 --- /dev/null +++ b/core/design-system/src/main/res/drawable/ic_splash.xml @@ -0,0 +1,7 @@ + + \ No newline at end of file