From 759f584a678bbe9a68c949f27162f3b54067fa53 Mon Sep 17 00:00:00 2001 From: IllusionMan1212 Date: Sat, 17 Jun 2023 04:29:29 +0300 Subject: [PATCH] refactor: switch to SplashScreen API --- app/src/main/AndroidManifest.xml | 58 +++++++++--------- .../npsbrowser/activities/MainActivity.kt | 3 + .../npsbrowser/activities/SplashActivity.kt | 35 ----------- .../main/res/layout/single_app_fragment.xml | 2 +- app/src/main/res/values-night/colors.xml | 2 +- app/src/main/res/values/colors.xml | 3 +- app/src/main/res/values/strings.xml | 59 ++++++++++--------- app/src/main/res/values/styles.xml | 10 +++- 8 files changed, 74 insertions(+), 98 deletions(-) delete mode 100644 app/src/main/java/com/illusionware/npsbrowser/activities/SplashActivity.kt diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index f0b49aa..2dc2646 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,29 +1,31 @@ - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/java/com/illusionware/npsbrowser/activities/MainActivity.kt b/app/src/main/java/com/illusionware/npsbrowser/activities/MainActivity.kt index 7f293e9..a1468e2 100644 --- a/app/src/main/java/com/illusionware/npsbrowser/activities/MainActivity.kt +++ b/app/src/main/java/com/illusionware/npsbrowser/activities/MainActivity.kt @@ -2,6 +2,7 @@ package com.illusionware.npsbrowser.activities import android.os.Bundle import android.view.MenuItem +import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen import androidx.fragment.app.FragmentManager import com.illusionware.npsbrowser.R import com.illusionware.npsbrowser.fragments.mainactivity.MainActivityFragment @@ -9,6 +10,8 @@ import com.illusionware.npsbrowser.fragments.mainactivity.MainActivityFragment class MainActivity : BaseActivity(), FragmentManager.OnBackStackChangedListener { override fun onCreate(savedInstanceState: Bundle?) { + installSplashScreen() + super.onCreate(savedInstanceState) setTheme(R.style.NPSTheme) setContentView(R.layout.activity_main) diff --git a/app/src/main/java/com/illusionware/npsbrowser/activities/SplashActivity.kt b/app/src/main/java/com/illusionware/npsbrowser/activities/SplashActivity.kt deleted file mode 100644 index 4b50089..0000000 --- a/app/src/main/java/com/illusionware/npsbrowser/activities/SplashActivity.kt +++ /dev/null @@ -1,35 +0,0 @@ -package com.illusionware.npsbrowser.activities - -import android.content.Intent -import android.os.Bundle -import android.view.View - -class SplashActivity : BaseActivity() { - - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) - - startActivity(Intent(this, MainActivity::class.java)) - finish() - } - - override fun onWindowFocusChanged(hasFocus: Boolean) { - super.onWindowFocusChanged(hasFocus) - if (hasFocus) hideSystemUI() - } - - private fun hideSystemUI() { - // Enables regular immersive mode. - // For "lean back" mode, remove SYSTEM_UI_FLAG_IMMERSIVE. - // Or for "sticky immersive," replace it with SYSTEM_UI_FLAG_IMMERSIVE_STICKY - window.decorView.systemUiVisibility = (View.SYSTEM_UI_FLAG_IMMERSIVE - // Set the content to appear under the system bars so that the - // content doesn't resize when the system bars hide and show. - or View.SYSTEM_UI_FLAG_LAYOUT_STABLE - or View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION - or View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN - // Hide the nav bar and status bar - or View.SYSTEM_UI_FLAG_HIDE_NAVIGATION - or View.SYSTEM_UI_FLAG_FULLSCREEN) - } -} \ No newline at end of file diff --git a/app/src/main/res/layout/single_app_fragment.xml b/app/src/main/res/layout/single_app_fragment.xml index 5b489e9..c348cc5 100644 --- a/app/src/main/res/layout/single_app_fragment.xml +++ b/app/src/main/res/layout/single_app_fragment.xml @@ -13,7 +13,7 @@ android:fontFamily="sans-serif-light" android:gravity="center" android:textAlignment="center" - android:textColor="@color/colorAccent" + android:textColor="@color/colorError" android:textSize="24sp" android:textStyle="bold" app:layout_constraintBottom_toBottomOf="parent" diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml index 31dee36..511a0b0 100644 --- a/app/src/main/res/values-night/colors.xml +++ b/app/src/main/res/values-night/colors.xml @@ -7,5 +7,5 @@ #515151 #DFFFFFFF #000000 - #F93422 + #F93422 diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 1402ef2..b9e53cd 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -7,5 +7,6 @@ #888888 #111111 #FFFFFF - #F93422 + #F93422 + #545FBF diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 89696d9..fd9b383 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,34 +1,35 @@ - NPS Browser - Settings - Search - Download - Copy zRIF - Content ID - Size - Minimum Firmware Version - Single app icon - Warning: No license was provided for this content. - CART ONLY GAME - Warning: No download link was provided for this content. - Downloading... - An error occurred while downloading. please try again - PKG URL Copied to Clipboard - zRIF Copied to Clipboard - Content ID Copied to Clipboard - Appearance - Theme - Layout + NPS Browser + Settings + Search + Download + Copy zRIF + Content ID + Size + Minimum Firmware Version + Single app icon + Warning: No license was provided for this content. + CART ONLY GAME + Warning: No download link was provided for this content. + Downloading... + An error occurred while downloading. please try again + PKG URL Copied to Clipboard + zRIF Copied to Clipboard + Content ID Copied to Clipboard + Appearance + Theme + Layout - - Light - Dark - Use System Default - + + Light + Dark + Use System Default + - - List - Grid - + + List + Grid + + thing diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index db42ad3..a8938a1 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -30,9 +30,13 @@ true -