Skip to content

Satellite tracker and pass predictor for Android, inspired by Gpredict

Switched to SplashScreen API

Arty Bishop09f35579dcb5
diff --git a/app/build.gradle b/app/build.gradle
index a9ff24cf..870d50d7 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -45,6 +45,7 @@ android {
dependencies {
implementation project(':core')
implementation "com.google.android.material:material:$material_version"
+ implementation "androidx.core:core-splashscreen:$splash_screen_version"
implementation "androidx.constraintlayout:constraintlayout:$constraint_layout_version"
implementation "androidx.lifecycle:lifecycle-livedata-ktx:$lifecycle_version"
implementation "androidx.navigation:navigation-fragment-ktx:$navigation_version"
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 75c3a94a..af47317f 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -14,7 +14,7 @@
<activity
android:name=".presentation.Look4SatActivity"
android:exported="true"
- android:theme="@style/AppTheme.Splash">
+ android:theme="@style/Theme.Look4Sat.SplashScreen">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
diff --git a/app/src/main/java/com/rtbishop/look4sat/presentation/Look4SatActivity.kt b/app/src/main/java/com/rtbishop/look4sat/presentation/Look4SatActivity.kt
index 1ccd1ebe..2d8bc996 100644
--- a/app/src/main/java/com/rtbishop/look4sat/presentation/Look4SatActivity.kt
+++ b/app/src/main/java/com/rtbishop/look4sat/presentation/Look4SatActivity.kt
@@ -21,6 +21,7 @@ import android.annotation.SuppressLint
import android.content.pm.ActivityInfo
import android.os.Bundle
import androidx.appcompat.app.AppCompatActivity
+import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
import androidx.navigation.fragment.NavHostFragment
import androidx.navigation.ui.setupWithNavController
import com.rtbishop.look4sat.R
@@ -33,8 +34,8 @@ class Look4SatActivity : AppCompatActivity() {
@SuppressLint("SourceLockedOrientationActivity")
override fun onCreate(savedInstanceState: Bundle?) {
requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_PORTRAIT
- setTheme(R.style.AppTheme)
super.onCreate(savedInstanceState)
+ installSplashScreen()
val binding = ActivityMainBinding.inflate(layoutInflater)
setContentView(binding.root)
val navHost = supportFragmentManager.findFragmentById(R.id.main_nav_host) as NavHostFragment
diff --git a/app/src/main/res/drawable/splash_foreground.xml b/app/src/main/res/drawable/ic_splash_drawable.xml
similarity index 100%
rename from app/src/main/res/drawable/splash_foreground.xml
rename to app/src/main/res/drawable/ic_splash_drawable.xml
diff --git a/app/src/main/res/drawable/splash_drawable.xml b/app/src/main/res/drawable/splash_drawable.xml
deleted file mode 100644
index 018e7555..00000000
--- a/app/src/main/res/drawable/splash_drawable.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android"
- android:opacity="opaque">
- <item android:drawable="@drawable/ic_launcher_background" />
- <item
- android:drawable="@drawable/splash_foreground"
- android:gravity="center" />
-</layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 934d7c3f..8e8d86cc 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -1,10 +1,12 @@
<resources>
- <style name="AppTheme.Splash" parent="AppTheme">
- <item name="android:windowBackground">@drawable/splash_drawable</item>
+ <style name="Theme.Look4Sat.SplashScreen" parent="Theme.SplashScreen">
+ <item name="windowSplashScreenBackground">@color/greyDark</item>
+ <item name="windowSplashScreenAnimatedIcon">@drawable/ic_splash_drawable</item>
+ <item name="postSplashScreenTheme">@style/Theme.Look4Sat.Main</item>
</style>
- <style name="AppTheme" parent="Theme.MaterialComponents.NoActionBar">
+ <style name="Theme.Look4Sat.Main" parent="Theme.MaterialComponents.NoActionBar">
<item name="colorPrimary">@color/themeLight</item>
<item name="colorSecondary">@color/themeLight</item>
<item name="colorPrimaryVariant">@color/themeDark</item>
diff --git a/build.gradle b/build.gradle
index 55a0c9d3..264db984 100644
--- a/build.gradle
+++ b/build.gradle
@@ -4,6 +4,7 @@ buildscript {
kotlin_version = '1.5.30'
coroutines_version = '1.5.2-native-mt'
material_version = '1.4.0'
+ splash_screen_version = '1.0.0-alpha01'
constraint_layout_version = '2.1.0'
lifecycle_version = '2.3.1'
navigation_version = '2.3.5'