From 8e2b12e1ea5c06d5204376830cb30de91be643f1 Mon Sep 17 00:00:00 2001 From: JosJuice Date: Mon, 21 Oct 2019 15:10:39 +0200 Subject: [PATCH] GameDetailsDialog: Use labels instead of icons --- .../src/main/res/drawable-hdpi/ic_company.png | Bin 183 -> 0 bytes .../src/main/res/drawable-hdpi/ic_country.png | Bin 917 -> 0 bytes .../main/res/drawable-xhdpi/ic_company.png | Bin 136 -> 0 bytes .../main/res/drawable-xhdpi/ic_country.png | Bin 1220 -> 0 bytes .../main/res/drawable-xxhdpi/ic_company.png | Bin 196 -> 0 bytes .../main/res/drawable-xxhdpi/ic_country.png | Bin 1877 -> 0 bytes .../main/res/drawable-xxxhdpi/ic_company.png | Bin 142 -> 0 bytes .../main/res/drawable-xxxhdpi/ic_country.png | Bin 2537 -> 0 bytes .../main/res/layout/dialog_game_details.xml | 99 ++++++++++-------- .../app/src/main/res/values/strings.xml | 4 + 10 files changed, 58 insertions(+), 45 deletions(-) delete mode 100644 Source/Android/app/src/main/res/drawable-hdpi/ic_company.png delete mode 100644 Source/Android/app/src/main/res/drawable-hdpi/ic_country.png delete mode 100644 Source/Android/app/src/main/res/drawable-xhdpi/ic_company.png delete mode 100644 Source/Android/app/src/main/res/drawable-xhdpi/ic_country.png delete mode 100644 Source/Android/app/src/main/res/drawable-xxhdpi/ic_company.png delete mode 100644 Source/Android/app/src/main/res/drawable-xxhdpi/ic_country.png delete mode 100644 Source/Android/app/src/main/res/drawable-xxxhdpi/ic_company.png delete mode 100644 Source/Android/app/src/main/res/drawable-xxxhdpi/ic_country.png diff --git a/Source/Android/app/src/main/res/drawable-hdpi/ic_company.png b/Source/Android/app/src/main/res/drawable-hdpi/ic_company.png deleted file mode 100644 index 88e21de2951f8c75a828347cdc46201f4af2fae6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 183 zcmeAS@N?(olHy`uVBq!ia0vp^W+2SL0wmRZ7KH(+I!_nJkP61PH;#%nIPkCpczJ4O zYJH#LwA4bqB=-4P&c7#qDR45MF*x9H!)D)%Q#o=8t%)^hd){;Q&3woB?Em>2N?%%A z``8XPsA?#rMJ!l!-#YEn`8?5Y`_yYPul!!yoOIxmxIjo&NLIp%D=V(NbPLbr4QiZN huq2=|JN!U{?wQj09)I`l;sm;c!PC{xWt~$(69D*MNo)WB diff --git a/Source/Android/app/src/main/res/drawable-hdpi/ic_country.png b/Source/Android/app/src/main/res/drawable-hdpi/ic_country.png deleted file mode 100644 index 6e71c3a40f8044a380ce4fc88fbc6693d2b0d06b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 917 zcmV;G18V$ z7F0kJv=5EOD346=i49p648UQ0LaSEl-{8N<||X@ z6$)6AQT0)3ycYk2vMDUL4$o=N@`%t^r;{x26x!x9x@Bsk*pyzn~}8?Bs(5RWA}x*Y>lM)oAi=k58+AXgQtR? zBug#nmYT^*GxZHJk!B|ysAP{IPeYbN>dYcWGFMzi#qnVt9{ygW4~CD_0pDQiWON}8yVw7jH`~y&)3^LS8E;% z&XS1W^f;){4SY@|qXW+srqz^qU#U~HJHET-f#(98HDrtu(pfk&X*SX!O7=+d^qNPx zf@X)*71AN~U%T#l3@D5Df=Z=<}!BXP2Hus7VCBEt|3cQ zKH$IP%(Na05g7HWiQ>3oS#%x+qI>D$f@&7_%)_V%=a{-q%78vNpn09N7d??WHZID1 rkP+q35be+w4N(^9;gz)S8&hN<`DB!If%1@K00000NkvXXu0mjffYiJw diff --git a/Source/Android/app/src/main/res/drawable-xhdpi/ic_company.png b/Source/Android/app/src/main/res/drawable-xhdpi/ic_company.png deleted file mode 100644 index 26b1ccfcf4b93c66d381e88a1b5a660ece583080..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 136 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 diff --git a/Source/Android/app/src/main/res/drawable-xxxhdpi/ic_country.png b/Source/Android/app/src/main/res/drawable-xxxhdpi/ic_country.png deleted file mode 100644 index 27c03a52325b4759b2755a62ad56e4130d87a902..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2537 zcmV?%@Gw@PvOfR~#MLN(3WIWR33|mdpj6Dk3s7O!lbDL+_yd%J1$ZASLV5$!;tS9i zyag3uy@-MF0jLG;f{K!^N5j|#l!|?j2NgyAj`c{6RX}ahpb>I4kxc48KGX0jZSyngVjiA!F}WQbO+fQe2qn;; zxDc)Xu{eXaDMt5FzkM_l+r$59(G}OCNZ9w(XaQP=V$sa|qSElKp62~>?jF7`;*n12 z@>wffCt4vW#N22AS|Gyn5Zdo%b24rB3u^4)y|(6EbMS8Mdf_<{qN$MvG*vLTzQ^o6 zY^oufw%uN)hy7^VA5m_%cF980H)PNa)ZyZC%%=UWEE zADQT8@;_=tEk4(zax&ts8CWB>U|C{773f0S8b{kTP*juc0OCth4-2dx zpm9@@Tr{11v!i9Q=J}tn0jNKekJZ~dpeuY0=wh#csv^(VfO1gD8=!SiKGzCwfFAcf zpa;DGs*hsd11dsoAt3(`Frt;_fbK{LKsT8J%0Ny+0QwziW`G7kC5ZZ%0opfV0PQdX zbbG=8y2T6-%SmnEHln5a&yZxOZ`=HSKF(jSKn*7IiPw8P{diN-;N{5j{02pd#jUPlh6Z90H})3 zw<2Vtq8t#d$?>fOwMwFb0UxWU91z#DVcAf3tCbCPcMEc9PeAc)={5k(grb^nyd^Ui z<-~X@(S6Tb1ShR2s)=?0rQmJNaapyEH}%expO;2`w05v;fM2QYtF|`v>bLdYV!SP! zhxpPxBOf{ruX~}WCfVCJpR7FzW1V3!XFjS3@84hxr6+qhj^#PKM^g-gqRK}P!=ouy ziTd6|?FV@{nxdZ>Ag)`WsJ_tNbdiRiJ^dG7A=cj_#rSZOtL>lu(gZo$A8dJz?L{6E z0KKT~8QL<3*R(4@_00isZG+P24x||j(DNL7z0_ckWYVlIKd-?8pcIE=L9at9wfvG+ z7gp2uSqu5DD_heYt{r&H>k(aCEgcqNuSFV9WE1VD?eS13m-*Q&+zF-8uV`fTkT(*S z@_|;4pe>EUqA!T%NZ2qD&$`sFIXh)5sVK39|ydVG&#u20ac4cFaknS%dD58JI> zAG|0^?M#lwq5n%oh>CGV>G864H7S70goiR`qk3u0>&?Q<*X(Fr8!;D!!biLu9saR6 zRdeq~f3~Y@4;}qaiypX9nA9x5rKdkN%rq zw?qj}39drD__&C67+#Gyo@dcFo~|-Z#w;H0S=Y;$5RaE(r(imsjle5;LY!QNP1FyU zhp9>}8yBF5KQ832f;D*5V#RDB?!!`AJQw?bi0WbuZbP=m5by>pBZa&128bvF{Q=yD zFI|1WKgCVhhF&B!8Sj9Is$me8<49bEhwvJ{#4pH25ekuuU+_6z!GpL0hhr)FqjL0~ zG6{hKKmnitPyi?Z6aWeU1%LttfC4}Pph)X)5Q-~-KQiM#00000NkvXXu0mjfy5F(v diff --git a/Source/Android/app/src/main/res/layout/dialog_game_details.xml b/Source/Android/app/src/main/res/layout/dialog_game_details.xml index bc88f4c59aaa..fc6b36032099 100644 --- a/Source/Android/app/src/main/res/layout/dialog_game_details.xml +++ b/Source/Android/app/src/main/res/layout/dialog_game_details.xml @@ -51,87 +51,96 @@ app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toBottomOf="@id/banner" /> - - + app:layout_constraintTop_toBottomOf="@id/label_country" /> - + app:layout_constraintTop_toBottomOf="@id/label_company" /> - + + + app:layout_constraintStart_toEndOf="@id/label_barrier" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintBaseline_toBaselineOf="@id/label_country" /> + app:layout_constraintStart_toEndOf="@id/label_barrier" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintBaseline_toBaselineOf="@id/label_company" /> + app:layout_constraintStart_toEndOf="@id/label_barrier" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintBaseline_toBaselineOf="@id/label_game_id" /> + app:layout_constraintStart_toEndOf="@id/label_barrier" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintBaseline_toBaselineOf="@id/label_revision" /> diff --git a/Source/Android/app/src/main/res/values/strings.xml b/Source/Android/app/src/main/res/values/strings.xml index c55de039a9b7..9cf77f7eba4d 100644 --- a/Source/Android/app/src/main/res/values/strings.xml +++ b/Source/Android/app/src/main/res/values/strings.xml @@ -284,6 +284,10 @@ Extension Bindings Junk Data Found The settings file for this game contains junk data created by an old version of Dolphin. Would you like to fix this by deleting the settings file for this game? All game-specific settings and cheats that you have added will be removed. This cannot be undone. + Country + Company + Game ID + Revision Take Screenshot