midou/citra
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "citra_android: Use androidx splash screen (#6355)" (#6357)

Browse Source 
This reverts commit 27c280534d.
This commit is contained in:
GPUCode 2023-03-17 10:34:00 +02:00 committed by GitHub
parent 27c280534d
commit a2fd43deab
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 1 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/android/app/build.gradle
View File

@ -126,7 +126,6 @@ dependencies {
implementation 'androidx.fragment:fragment:1.5.3' implementation 'androidx.fragment:fragment:1.5.3'
implementation "androidx.slidingpanelayout:slidingpanelayout:1.2.0" implementation "androidx.slidingpanelayout:slidingpanelayout:1.2.0"
implementation 'com.google.android.material:material:1.6.1' implementation 'com.google.android.material:material:1.6.1'
implementation 'androidx.core:core-splashscreen:1.0.0'
// For loading huge screenshots from the disk. // For loading huge screenshots from the disk.
implementation 'com.squareup.picasso:picasso:2.71828' implementation 'com.squareup.picasso:picasso:2.71828'

2
src/android/app/src/main/AndroidManifest.xml
View File

@ -44,7 +44,7 @@
<activity <activity
android:name="org.citra.citra_emu.ui.main.MainActivity" android:name="org.citra.citra_emu.ui.main.MainActivity"
android:theme="@style/Theme.Citra.Splash.Main" android:theme="@style/Theme.Citra.Main"
android:resizeableActivity="false"> android:resizeableActivity="false">
<!-- This intentfilter marks this Activity as the one that gets launched from Home screen. --> <!-- This intentfilter marks this Activity as the one that gets launched from Home screen. -->

4
src/android/app/src/main/java/org/citra/citra_emu/ui/main/MainActivity.java
View File

@ -11,7 +11,6 @@ import android.widget.Toast;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.appcompat.app.AppCompatActivity; import androidx.appcompat.app.AppCompatActivity;
import androidx.appcompat.widget.Toolbar; import androidx.appcompat.widget.Toolbar;
import androidx.core.splashscreen.SplashScreen;
import org.citra.citra_emu.NativeLibrary; import org.citra.citra_emu.NativeLibrary;
import org.citra.citra_emu.R; import org.citra.citra_emu.R;
@ -49,9 +48,6 @@ public final class MainActivity extends AppCompatActivity implements MainView {
@Override @Override
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
SplashScreen splashScreen = SplashScreen.installSplashScreen(this);
splashScreen.setKeepOnScreenCondition(() -> !DirectoryInitialization.areCitraDirectoriesReady());
ThemeUtil.applyTheme(this); ThemeUtil.applyTheme(this);
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);

6
src/android/app/src/main/res/values/themes.xml
View File

@ -1,12 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<style name="Theme.Citra.Splash.Main" parent="Theme.SplashScreen">
<item name="windowSplashScreenBackground">@color/citra_surface</item>
<item name="windowSplashScreenAnimatedIcon">@drawable/ic_citra</item>
<item name="postSplashScreenTheme">@style/Theme.Citra.Main</item>
</style>
<style name="Theme.Citra.Main" parent="Theme.Material3.DayNight.NoActionBar"> <style name="Theme.Citra.Main" parent="Theme.Material3.DayNight.NoActionBar">
<!-- Main theme colors --> <!-- Main theme colors -->
<item name="colorPrimary">@color/citra_primary</item> <item name="colorPrimary">@color/citra_primary</item>