diff --git a/README.md b/README.md index bbf45f9..81fb2e4 100644 --- a/README.md +++ b/README.md @@ -10,4 +10,3 @@ TODO: - w introduction dodać widok-instrukcję z kodem QR - kopiowanie "assetów" podczas wyświetlania splash screen - remove dead code -- do not show splash when switching back to app \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index c95c6aa..ae106b3 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -80,7 +80,6 @@ dependencies { implementation 'androidx.appcompat:appcompat:1.4.1' implementation 'androidx.core:core-ktx:1.7.0' implementation 'androidx.constraintlayout:constraintlayout:2.1.3' - implementation "androidx.core:core-splashscreen:1.0.1" implementation 'com.google.android.material:material:1.5.0' implementation 'com.journeyapps:zxing-android-embedded:4.3.0' implementation 'androidx.legacy:legacy-support-v4:1.0.0' diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index b37f11c..246b71e 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -42,7 +42,7 @@ android:icon="@mipmap/poszukiwacz_launcher" android:label="@string/app_name" android:supportsRtl="true" - android:theme="@style/Theme.App.Starting"> + android:theme="@style/LaunchTheme"> + android:theme="@style/LaunchTheme"> diff --git a/app/src/main/java/pl/marianjureczko/poszukiwacz/activity/main/MainActivity.kt b/app/src/main/java/pl/marianjureczko/poszukiwacz/activity/main/MainActivity.kt index 03a13b5..2765ded 100644 --- a/app/src/main/java/pl/marianjureczko/poszukiwacz/activity/main/MainActivity.kt +++ b/app/src/main/java/pl/marianjureczko/poszukiwacz/activity/main/MainActivity.kt @@ -9,7 +9,6 @@ import android.os.Bundle import android.util.Log import androidx.activity.compose.setContent import androidx.compose.runtime.Composable -import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen import androidx.navigation.NavType import androidx.navigation.compose.NavHost import androidx.navigation.compose.composable @@ -62,7 +61,6 @@ class MainActivity : PermissionActivity() { @SuppressLint("SourceLockedOrientationActivity") override fun onCreate(savedInstanceState: Bundle?) { - val splashScreen = installSplashScreen() super.onCreate(savedInstanceState) requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_PORTRAIT diff --git a/app/src/main/res/drawable/launch_background.xml b/app/src/main/res/drawable/launch_background.xml new file mode 100644 index 0000000..3296081 --- /dev/null +++ b/app/src/main/res/drawable/launch_background.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/values-v31/styles.xml b/app/src/main/res/values-v31/styles.xml new file mode 100644 index 0000000..f32f09f --- /dev/null +++ b/app/src/main/res/values-v31/styles.xml @@ -0,0 +1,8 @@ + + + + \ 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 471544c..b5e2182 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -1,9 +1,7 @@ -