diff --git a/android/Omnivore/app/build.gradle.kts b/android/Omnivore/app/build.gradle.kts index c37b13c12..06dd9ee08 100644 --- a/android/Omnivore/app/build.gradle.kts +++ b/android/Omnivore/app/build.gradle.kts @@ -168,6 +168,8 @@ dependencies { implementation(libs.androidx.lifecycle.runtimeCompose) + implementation("androidx.core:core-splashscreen:1.0.1") + } apollo { diff --git a/android/Omnivore/app/src/main/AndroidManifest.xml b/android/Omnivore/app/src/main/AndroidManifest.xml index dce141df0..cd041b041 100644 --- a/android/Omnivore/app/src/main/AndroidManifest.xml +++ b/android/Omnivore/app/src/main/AndroidManifest.xml @@ -15,15 +15,14 @@ android:icon="@mipmap/ic_launcher" android:label="@string/app_name" android:supportsRtl="true" - android:theme="@style/Theme.Omnivore" android:largeHeap="true" tools:targetApi="31"> + android:theme="@style/Theme.Omnivore.Splash" + android:windowSoftInputMode="adjustResize"> @@ -32,8 +31,7 @@ + android:exported="true"> diff --git a/android/Omnivore/app/src/main/java/app/omnivore/omnivore/MainActivity.kt b/android/Omnivore/app/src/main/java/app/omnivore/omnivore/MainActivity.kt index 233a285d4..0e4c818ee 100644 --- a/android/Omnivore/app/src/main/java/app/omnivore/omnivore/MainActivity.kt +++ b/android/Omnivore/app/src/main/java/app/omnivore/omnivore/MainActivity.kt @@ -9,13 +9,13 @@ import androidx.activity.viewModels import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.ui.Modifier +import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen import androidx.core.view.ViewCompat import androidx.core.view.WindowCompat import androidx.core.view.WindowInsetsCompat import app.omnivore.omnivore.feature.auth.LoginViewModel import app.omnivore.omnivore.feature.components.LabelsViewModel import app.omnivore.omnivore.feature.editinfo.EditInfoViewModel -import app.omnivore.omnivore.feature.library.LibraryViewModel import app.omnivore.omnivore.feature.library.SearchViewModel import app.omnivore.omnivore.feature.root.RootView import app.omnivore.omnivore.feature.save.SaveViewModel @@ -32,6 +32,9 @@ import kotlinx.coroutines.launch @AndroidEntryPoint class MainActivity : ComponentActivity() { override fun onCreate(savedInstanceState: Bundle?) { + + installSplashScreen() + super.onCreate(savedInstanceState) val loginViewModel: LoginViewModel by viewModels() diff --git a/android/Omnivore/app/src/main/res/drawable/ic_launcher_dark.xml b/android/Omnivore/app/src/main/res/drawable/ic_launcher_dark.xml new file mode 100644 index 000000000..14e4bcec9 --- /dev/null +++ b/android/Omnivore/app/src/main/res/drawable/ic_launcher_dark.xml @@ -0,0 +1,9 @@ + + + diff --git a/android/Omnivore/app/src/main/res/drawable/ic_launcher_light.xml b/android/Omnivore/app/src/main/res/drawable/ic_launcher_light.xml new file mode 100644 index 000000000..768ceabd6 --- /dev/null +++ b/android/Omnivore/app/src/main/res/drawable/ic_launcher_light.xml @@ -0,0 +1,9 @@ + + + diff --git a/android/Omnivore/app/src/main/res/values-night/colors.xml b/android/Omnivore/app/src/main/res/values-night/colors.xml new file mode 100644 index 000000000..43b1e6380 --- /dev/null +++ b/android/Omnivore/app/src/main/res/values-night/colors.xml @@ -0,0 +1,4 @@ + + + #262626 + diff --git a/android/Omnivore/app/src/main/res/values-night/themes.xml b/android/Omnivore/app/src/main/res/values-night/themes.xml new file mode 100644 index 000000000..1a9b6693f --- /dev/null +++ b/android/Omnivore/app/src/main/res/values-night/themes.xml @@ -0,0 +1,17 @@ + + + + + + + + diff --git a/android/Omnivore/app/src/main/res/values/colors.xml b/android/Omnivore/app/src/main/res/values/colors.xml index fdb6f43db..39c31200a 100644 --- a/android/Omnivore/app/src/main/res/values/colors.xml +++ b/android/Omnivore/app/src/main/res/values/colors.xml @@ -12,6 +12,5 @@ #E6E4BF #F8D457 - - + #FCFCFC diff --git a/android/Omnivore/app/src/main/res/values/themes.xml b/android/Omnivore/app/src/main/res/values/themes.xml index f08194bdc..d63370f10 100644 --- a/android/Omnivore/app/src/main/res/values/themes.xml +++ b/android/Omnivore/app/src/main/res/values/themes.xml @@ -1,22 +1,19 @@ - + - - +