From 1dff1c3fe833f5b690ad6324914f5dff7813fb11 Mon Sep 17 00:00:00 2001 From: Charles Lombardo Date: Tue, 19 Jul 2022 00:23:57 -0400 Subject: [PATCH 1/2] Android: Add Androidx splash screen to wait for directory initialization --- Source/Android/app/build.gradle | 1 + .../Android/app/src/main/AndroidManifest.xml | 6 +++--- .../dolphinemu/ui/main/MainActivity.java | 5 +++++ .../src/main/res/drawable-hdpi/ic_dolphin.png | Bin 2037 -> 0 bytes .../main/res/drawable-xhdpi/ic_dolphin.png | Bin 2692 -> 0 bytes .../main/res/drawable-xxhdpi/ic_dolphin.png | Bin 4122 -> 0 bytes .../app/src/main/res/drawable/ic_dolphin.xml | 20 ++++++++++++++++++ .../app/src/main/res/values-night/colors.xml | 2 ++ .../app/src/main/res/values/colors.xml | 2 ++ .../app/src/main/res/values/themes.xml | 6 ++++++ 10 files changed, 39 insertions(+), 3 deletions(-) delete mode 100644 Source/Android/app/src/main/res/drawable-hdpi/ic_dolphin.png delete mode 100644 Source/Android/app/src/main/res/drawable-xhdpi/ic_dolphin.png delete mode 100644 Source/Android/app/src/main/res/drawable-xxhdpi/ic_dolphin.png create mode 100644 Source/Android/app/src/main/res/drawable/ic_dolphin.xml diff --git a/Source/Android/app/build.gradle b/Source/Android/app/build.gradle index 72779c3fb5..525c7be0fd 100644 --- a/Source/Android/app/build.gradle +++ b/Source/Android/app/build.gradle @@ -103,6 +103,7 @@ dependencies { implementation 'androidx.fragment:fragment:1.4.1' implementation 'androidx.slidingpanelayout:slidingpanelayout:1.2.0' implementation 'com.google.android.material:material:1.6.0' + implementation 'androidx.core:core-splashscreen:1.0.0' // Android TV UI libraries. implementation 'androidx.leanback:leanback:1.0.0' diff --git a/Source/Android/app/src/main/AndroidManifest.xml b/Source/Android/app/src/main/AndroidManifest.xml index 78bd53c35f..e1352b47c2 100644 --- a/Source/Android/app/src/main/AndroidManifest.xml +++ b/Source/Android/app/src/main/AndroidManifest.xml @@ -49,13 +49,13 @@ + android:theme="@style/Theme.Dolphin.Splash"> - + - + diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/main/MainActivity.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/main/MainActivity.java index 1224fa0397..c0238617f9 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/main/MainActivity.java +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/main/MainActivity.java @@ -14,6 +14,7 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.appcompat.app.AppCompatActivity; import androidx.appcompat.widget.Toolbar; +import androidx.core.splashscreen.SplashScreen; import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; import androidx.viewpager.widget.ViewPager; @@ -55,6 +56,10 @@ public final class MainActivity extends AppCompatActivity @Override protected void onCreate(Bundle savedInstanceState) { + SplashScreen splashScreen = SplashScreen.installSplashScreen(this); + splashScreen.setKeepOnScreenCondition( + () -> !DirectoryInitialization.areDolphinDirectoriesReady()); + super.onCreate(savedInstanceState); setContentView(R.layout.activity_main); diff --git a/Source/Android/app/src/main/res/drawable-hdpi/ic_dolphin.png b/Source/Android/app/src/main/res/drawable-hdpi/ic_dolphin.png deleted file mode 100644 index e50a86dac11e7aa333882860ded133bc4bcfe012..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2037 zcmeAS@N?(olHy`uVBq!ia0y~yVDJE84mJh`hS0a0-5D6z_jtNEhEy=VIoQa+z`)S3 z;O|QDl}sS!jM!p^V(sq5KV+|$9p9Fob^Eni@a=79Q**7)t(a-`_D0MR2vvfNepLT^rtoLiby2@n6 z{|PNopBD!f{t1-$Ht}wnJWKQAUJ3s@Q{#&CC5yYc?`_!5GgW&-_3eFw|;VFp@yxBh}7ZVClYr*EH~+|UT2*DT4YY<oR+azYlbTyIC3RL6jY;V{7RbyL4oj<$*wdW1C{o8xVy2$|UO(*=!*2_AG9}My5Di`K zzTn}>;c=$IMIG8uvwoinPivh8pZMnD>=;<4;*J|8T*lJJ z4_cjn%lM-BnQ7-Cg-dpqzP@?2cDD`dmBap%Ya%CJ3Vsk!_vWHH@09Z=6<&lqF0jdx zY1|omIB?$q@iROUlRv&a(Q&p{slYq>FYn5aXX<>O`|MgC>C(m3eD6}|yiL{_1wxT8 z&o7(!A<30tX5c)N1&J0yTaP~4@Yd!_wa0veeJl92OBnXv>YjA|x;^8IDMJ6v`t^RP ziZ#S3tL_ToIr;wBlTH7ncz&M>?a`MDJ#pAO@AaPVQm6ntr6<(wy*lLXBLHr%rjs(es<#xnI5N@#h&YxMpfBe9Uo{{kDz6vKhbR zn;)J1aYyyL#<~C_PlFu-c3uY-e0p+1cwakX?57E~Ewg{v)re@lvkL!Y_e18~@BG76 zcO|dHOlaDq+&}4}(u6>*SFy(<%02C`X|Kt7=hW8tKk>|0Tc)q4t72Nq6R+4m(R|!# zy^*O^KPnwjnl&B9}SY;Kd5I3wRJ9RKE2%A@ArGnm1{iK3)o!vcE|RE<(ayl z>}t(?MQ*kW7H;a`wU6t2%5dubv)-bUAL4gf<_n+Jf2Qq!zlfjdUXa1RZyX0L_6t18 zvVJew^Dw3^c9o58+1JxoPne6u&3PFT-r+7Fw`ZzZ0Pkke<(W>E4sHM0tIqoFJzQb5 z`Fq&XfDnbryMq5ZeRr^_n0e3j56{)-%L)#=y1M;c^0Q4*`ox_46+P)w=2yK@miWeP zcbut7d-I-0ipRr6Zb%p%YZYa9m$>4gma7`)`%`JBeGT?mw0#v0Nw+EpT)?&Wj)J-5 zlyycccGg^*z3%dc-~!>Fn%ANO%x_DiNO=4VQJJyMg4?KE^!J1X_X4g*HnF4|ept8a zoEO`7RvFgV{#54c8B@~Nc1wJh<+pKd?Yvm=ac$Z+?J1i@gyXJ7*3}#_z83rDtewgV z^{J|p>q>+k8glAC)d*Sq>P^U>|E&M{*R0M|OehbczD{k%S5ubf_-p&06 zGdE9KeL3y6t;ClpvWfCadQ3B{xeVK#rO_OiJ`KGz>> zKVEq1?i!Z6)hmpWg^#XbxjRK}_Kk+W*X3lmLDe$Pr|t6&zXMh23<=z}i|maTX9|~r OBs^XHT-G@yGywoTG~f0B diff --git a/Source/Android/app/src/main/res/drawable-xhdpi/ic_dolphin.png b/Source/Android/app/src/main/res/drawable-xhdpi/ic_dolphin.png deleted file mode 100644 index f20aa29c6ab0d5091fa39138ff35888b9abbcdb8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2692 zcmeAS@N?(olHy`uVBq!ia0y~yU`POA4mJh`hDS5XEf^TMyggkULn;{G9BgD@U|?ui z@OP#7N+u8!glEKNGxU|bTqJ89sl09O)}Qvjk4F5yxh=Q-b)eD4%^jP!EvzCLgv2e-=07J_P>36N8gxMw(85{Vhg}u(7JjzzO5UmQ<=$i+uUBX6n#{8Kl32o0J_lF*7r5CnDJoIv#jzz0 z`Kv^B1qUsVReW~+eOku{^JUi*Ca(CPyo2G$Rh1{asSiVrK2VZ4un^V1%$^OJ6zl=x6+X*2m-V#K{lpNQbzld~CB z)pJ)Iyzxm|BCde(-=pM$f7!P=KZ}2UZoJi{jJpi3#S_8eV#XGk6^f3zSAA%XoG*s4%1i49&&N+)chLDQL;$o z#pgKAJCDC7MI2NWn&NWzf}PC%ZEVg(=O*v?o$&Lhl-`$EM#EW?IoBU$H%y$nD6?96 zp~AoKFZ?15x4L9(625Ao$hrPOt9kv-2`=~BFD^CrWGInxU$cX&|H$8hf7Rm0!a~fy z@68gb=L+^_h`Ms;`Q#tsJ3s8buj!WXN^;fQ0O=rxe+gNgFJy#Y$MEc)zb&am@~nc^!f9_l=bcm)(2Cw`s zk$b286MR^se1#r-nc?-Mf90Y1CI8gs`Y-;x{CMc2gBwFGji&D&BFUM4}YEZ%cN+l%(C;(KPu#;Pt>%#TRY3rJ3mW{>9T%e zh~})b7nkmEZ2jBL^x&kGfO7eP9;S~5Pk&xsA@n9=U48SWbq5N{)Uwot6Cb5VZa;G6 ziCmQ6qsjBU{SsUZXPp;X(z~i5`?+~oMz8j<1s9M0NJ=sMX8QE`f;ZVFwR)?fFSK^W zC*9?H_~^Or{yQClt1s&C=^r!I`XQso@;a%9xx{_?1Hn(4rBAX>NPn)3m?-ntK5}); znZGAkm}IZTCK%Y(eti%l*|yeYvdliA>FsNesa)fAoO-DHPq*wgu1&}OZ2y^PEic^B z^y60S6+L&CD*x5%%}=(iW0>{C>q>y)yfog%eACIgVtQ}SA6hbP&er39r1oF$l-SEP z@5%CxKcOZee9QOqJFLz#4mdFHyvd74@7#?JX5WnD(R7(y;%~LDxwYF)`MB`w?{}|X z&u5KSIMtca^66LYPv)=DS2B;-uXtTO)wM$|Em6~K4YR=>0saa1tvdsjdfy4maQ8ak z8)a!d8f}E_OIe?yjfJYKa%Inq{HSj&8~{gZ@p~ap7{4J-b^2(qf1!n%F!v`aG{2u*3vT~%rQw|YyS4~OvicRnAF zXSRChRp?myZQM3Y*sj7v8jR6{kE1zb!DKb(^7d*8!cFMNTqHOZa1Nd)c_UR9`gx$Wyg9dg&W2 zi~b1_`k!KNhp{H|_MCh#a<%4HaDKq=wN^nncQ4-NtB=|f=5#iW@xPDB$p)U7#U*p= z#l$8(e*ZgNSxJL?@e2P^nOU60S6L$+)Q(;H-1Y3nH}BOempy-aw(^>HNw3Q-rn@t) z>~i=J8M-4SDtnij)Er*T_=|JD?UaiV=gQmm>39QQIao3Zu)_yC5wa1?q+X26RmKw>WseV$CUSTR`G5>8lLd2Xyc~nsN;*4C!y-;Hz8j)m=O_-leTG#H&!dANV^i~d(9d`-E&ZFjlTZF_&!BU6iQmaR{d zE?O@PX)9UuX4>481FwGn-SS{^QS|eS*55qYj4O^tPS|VeRUIe9y4IhoQsCLjpZ}vT ze4D0l&YQ`^ZTgba7uH2j)JvZ@^O-KkI^K`6oA!U-wpQDu^elV)8NvIBx+`MhBqbco zwrS*A9-X)RYvU81ZXy1V-wG8SALmV%F!DFNAh5RHZcz+xeyZZ5iMn&bUQPTPAhdSU z?V@-+_w(CdZ=d&b-eq^!U1#~6q;hOkZ>;~a`aApV9la4{_6;mjPZgbZwhLr*Y}-G- z<=vDmzw95n{Qp>QAN_0LG4Gb+Hmwoo-+uj{Bz}MOBPO-28XPA-EdQ=A@NnA}sjADy zPfsyM?p-M2*}#66RX}jPV4?b4p>>D8EERg%^xBA9y!L*V-%4f(wB zXms|zgj|-JGS(kdL(Ev%u$o$?u8-Po8pZc<@Bg zr}A4gaDEOWem@Ws;7!=_q)_S;&Bfm(+WPx5WMV?{ws5I&$1zT{N@ S-C0)yKs--ZKbLh*2~7Ytw4A0#j?O_o%1K} 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 diff --git a/Source/Android/app/src/main/res/drawable/ic_dolphin.xml b/Source/Android/app/src/main/res/drawable/ic_dolphin.xml new file mode 100644 index 0000000000..1cc88d50f5 --- /dev/null +++ b/Source/Android/app/src/main/res/drawable/ic_dolphin.xml @@ -0,0 +1,20 @@ + + + + + + + + + + + diff --git a/Source/Android/app/src/main/res/values-night/colors.xml b/Source/Android/app/src/main/res/values-night/colors.xml index 8db7ef7bc5..d792ba7d42 100644 --- a/Source/Android/app/src/main/res/values-night/colors.xml +++ b/Source/Android/app/src/main/res/values-night/colors.xml @@ -4,6 +4,8 @@ #2196f3 #FFFFFF + #1A1C1E + #444444 #36ff0000 diff --git a/Source/Android/app/src/main/res/values/colors.xml b/Source/Android/app/src/main/res/values/colors.xml index 46bb372e2c..e6dc65f906 100644 --- a/Source/Android/app/src/main/res/values/colors.xml +++ b/Source/Android/app/src/main/res/values/colors.xml @@ -4,6 +4,8 @@ #21b0f3 #ffffff + #FDFCFF + #444444 #36ff0000 diff --git a/Source/Android/app/src/main/res/values/themes.xml b/Source/Android/app/src/main/res/values/themes.xml index 110242a302..5b9dd6859d 100644 --- a/Source/Android/app/src/main/res/values/themes.xml +++ b/Source/Android/app/src/main/res/values/themes.xml @@ -1,5 +1,11 @@ + + + +