From fdaa98bc4dff07a899609bf7941de8f5b9bdade9 Mon Sep 17 00:00:00 2001 From: SerpentSpirale Date: Sun, 6 Mar 2022 22:18:06 +0100 Subject: [PATCH] Fix some naming; Rename many resources --- .../src/main/AndroidManifest.xml | 4 ++-- .../java/net/kdt/pojavlaunch/JAssets.java | 4 +++- .../customcontrols/handleview/HandleView.java | 6 ++---- .../prefs/PerVersionConfigDialog.java | 6 +++++- .../src/main/res/anim/translate_left_side.xml | 5 ----- .../main/res/anim/translate_right_side.xml | 5 ----- .../main/res/drawable-hdpi/ic_flatstyle.png | Bin 1052 -> 0 bytes .../src/main/res/drawable-hdpi/ic_map_rmb.png | Bin 9797 -> 0 bytes ...es.png => ic_setting_disable_gestures.png} | Bin ...eeform_opt.png => ic_setting_freeform.png} | Bin ...lib_check.png => ic_setting_lib_check.png} | Bin .../{ic_auto_ram.png => ic_setting_ram.png} | Bin ...{tap_len.png => ic_setting_tap_length.png} | Bin .../text_select_handle_left_mtrl_alpha.png | Bin 478 -> 0 bytes .../text_select_handle_right_mtrl_alpha.png | Bin 486 -> 0 bytes ...btn_scale.png => ic_setting_btn_scale.png} | Bin .../{jre_args.png => ic_setting_jre_args.png} | Bin ...ter_1.png => ic_setting_mouse_pointer.png} | Bin .../src/main/res/drawable-mdpi/rm_jre.png | Bin 13728 -> 0 bytes .../text_select_handle_left_mtrl_alpha.png | Bin 346 -> 0 bytes .../text_select_handle_right_mtrl_alpha.png | Bin 347 -> 0 bytes ...idebar.png => ic_setting_hide_sidebar.png} | Bin .../text_select_handle_left_mtrl_alpha.png | Bin 751 -> 0 bytes .../text_select_handle_right_mtrl_alpha.png | Bin 752 -> 0 bytes .../text_select_handle_left_mtrl_alpha.png | Bin 1148 -> 0 bytes .../text_select_handle_right_mtrl_alpha.png | Bin 1155 -> 0 bytes ..._notch.png => ic_setting_ignore_notch.png} | Bin ...d.png => ic_setting_mouse_pointer_spd.png} | Bin ...r.png => ic_setting_resolution_scaler.png} | Bin ....png => ic_setting_sign_in_background.png} | Bin .../src/main/res/drawable/mouse_pointer_1.png | Bin 9015 -> 0 bytes .../text_select_handle_left_material.xml | 19 ------------------ .../text_select_handle_right_material.xml | 19 ------------------ .../src/main/res/drawable/view_handle.xml | 4 ++++ .../main/res/layout/import_control_layout.xml | 2 +- .../src/main/res/layout/launcher_login_v3.xml | 2 +- .../src/main/res/values/styles.xml | 19 ------------------ .../src/main/res/xml/pref_control.xml | 10 ++++----- .../src/main/res/xml/pref_java.xml | 4 ++-- .../src/main/res/xml/pref_misc.xml | 4 ++-- .../src/main/res/xml/pref_video.xml | 4 ++-- 41 files changed, 29 insertions(+), 88 deletions(-) delete mode 100644 app_pojavlauncher/src/main/res/anim/translate_left_side.xml delete mode 100644 app_pojavlauncher/src/main/res/anim/translate_right_side.xml delete mode 100644 app_pojavlauncher/src/main/res/drawable-hdpi/ic_flatstyle.png delete mode 100644 app_pojavlauncher/src/main/res/drawable-hdpi/ic_map_rmb.png rename app_pojavlauncher/src/main/res/drawable-hdpi/{ic_disable_gestures.png => ic_setting_disable_gestures.png} (100%) rename app_pojavlauncher/src/main/res/drawable-hdpi/{freeform_opt.png => ic_setting_freeform.png} (100%) rename app_pojavlauncher/src/main/res/drawable-hdpi/{ic_lib_check.png => ic_setting_lib_check.png} (100%) rename app_pojavlauncher/src/main/res/drawable-hdpi/{ic_auto_ram.png => ic_setting_ram.png} (100%) rename app_pojavlauncher/src/main/res/drawable-hdpi/{tap_len.png => ic_setting_tap_length.png} (100%) mode change 100755 => 100644 delete mode 100644 app_pojavlauncher/src/main/res/drawable-hdpi/text_select_handle_left_mtrl_alpha.png delete mode 100644 app_pojavlauncher/src/main/res/drawable-hdpi/text_select_handle_right_mtrl_alpha.png rename app_pojavlauncher/src/main/res/drawable-mdpi/{btn_scale.png => ic_setting_btn_scale.png} (100%) mode change 100755 => 100644 rename app_pojavlauncher/src/main/res/drawable-mdpi/{jre_args.png => ic_setting_jre_args.png} (100%) mode change 100755 => 100644 rename app_pojavlauncher/src/main/res/drawable-mdpi/{mouse_pointer_1.png => ic_setting_mouse_pointer.png} (100%) mode change 100755 => 100644 delete mode 100755 app_pojavlauncher/src/main/res/drawable-mdpi/rm_jre.png delete mode 100644 app_pojavlauncher/src/main/res/drawable-mdpi/text_select_handle_left_mtrl_alpha.png delete mode 100644 app_pojavlauncher/src/main/res/drawable-mdpi/text_select_handle_right_mtrl_alpha.png rename app_pojavlauncher/src/main/res/drawable-xhdpi/{hide_sidebar.png => ic_setting_hide_sidebar.png} (100%) mode change 100755 => 100644 delete mode 100644 app_pojavlauncher/src/main/res/drawable-xhdpi/text_select_handle_left_mtrl_alpha.png delete mode 100644 app_pojavlauncher/src/main/res/drawable-xhdpi/text_select_handle_right_mtrl_alpha.png delete mode 100644 app_pojavlauncher/src/main/res/drawable-xxhdpi/text_select_handle_left_mtrl_alpha.png delete mode 100644 app_pojavlauncher/src/main/res/drawable-xxhdpi/text_select_handle_right_mtrl_alpha.png rename app_pojavlauncher/src/main/res/drawable/{ignore_notch.png => ic_setting_ignore_notch.png} (100%) mode change 100755 => 100644 rename app_pojavlauncher/src/main/res/drawable/{mouse_pointer_spd.png => ic_setting_mouse_pointer_spd.png} (100%) rename app_pojavlauncher/src/main/res/drawable/{resolution_scaler.png => ic_setting_resolution_scaler.png} (100%) mode change 100755 => 100644 rename app_pojavlauncher/src/main/res/drawable/{sign_in_background.png => ic_setting_sign_in_background.png} (100%) delete mode 100755 app_pojavlauncher/src/main/res/drawable/mouse_pointer_1.png delete mode 100644 app_pojavlauncher/src/main/res/drawable/text_select_handle_left_material.xml delete mode 100644 app_pojavlauncher/src/main/res/drawable/text_select_handle_right_material.xml create mode 100644 app_pojavlauncher/src/main/res/drawable/view_handle.xml diff --git a/app_pojavlauncher/src/main/AndroidManifest.xml b/app_pojavlauncher/src/main/AndroidManifest.xml index d8fe8db22..28c2ea9e0 100644 --- a/app_pojavlauncher/src/main/AndroidManifest.xml +++ b/app_pojavlauncher/src/main/AndroidManifest.xml @@ -59,12 +59,12 @@ diff --git a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/JAssets.java b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/JAssets.java index 684bd6bcc..2f166583d 100644 --- a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/JAssets.java +++ b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/JAssets.java @@ -1,9 +1,11 @@ package net.kdt.pojavlaunch; +import com.google.gson.annotations.SerializedName; + import java.util.Map; public class JAssets { - public boolean mapToResources; + @SerializedName("map_to_resources") public boolean mapToResources; public Map objects; } diff --git a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/handleview/HandleView.java b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/handleview/HandleView.java index 075274dc8..4f7a7b4b3 100644 --- a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/handleview/HandleView.java +++ b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/handleview/HandleView.java @@ -31,7 +31,6 @@ import net.kdt.pojavlaunch.customcontrols.buttons.ControlButton; public abstract class HandleView extends View implements ViewPositionListener, View.OnLongClickListener { protected Drawable mDrawable; - protected Drawable mDrawableLtr; protected Drawable mDrawableRtl; private final PopupWindow mContainer; // Position with respect to the parent TextView @@ -92,8 +91,7 @@ public abstract class HandleView extends View implements ViewPositionListener, V mContainer.setWindowLayoutType(WindowManager.LayoutParams.TYPE_APPLICATION_SUB_PANEL); mContainer.setContentView(this); - mDrawableLtr = view.getContext().getDrawable(R.drawable.text_select_handle_left_material); - mDrawableRtl = view.getContext().getDrawable(R.drawable.text_select_handle_right_material); + mDrawableRtl = view.getContext().getDrawable(R.drawable.view_handle); mMinSize = view.getContext().getResources().getDimensionPixelSize(R.dimen.text_handle_min_size); setOnLongClickListener(this); @@ -201,7 +199,7 @@ public abstract class HandleView extends View implements ViewPositionListener, V protected void updateDrawable() { // final int offset = getCurrentCursorOffset(); final boolean isRtlCharAtOffset = true; // mView.getLayout().isRtlCharAt(offset); - mDrawable = isRtlCharAtOffset ? mDrawableRtl : mDrawableLtr; + mDrawable = mDrawableRtl; //isRtlCharAtOffset ? mDrawableRtl : mDrawableLtr; mHotspotX = getHotspotX(mDrawable, isRtlCharAtOffset); mHorizontalGravity = getHorizontalGravity(isRtlCharAtOffset); } diff --git a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/prefs/PerVersionConfigDialog.java b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/prefs/PerVersionConfigDialog.java index eb14119fc..d98c03407 100644 --- a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/prefs/PerVersionConfigDialog.java +++ b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/prefs/PerVersionConfigDialog.java @@ -17,7 +17,10 @@ import net.kdt.pojavlaunch.multirt.Runtime; import net.kdt.pojavlaunch.value.PerVersionConfig; import java.io.IOException; +import java.util.ArrayList; import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; import java.util.List; public class PerVersionConfigDialog{ @@ -38,7 +41,8 @@ public class PerVersionConfigDialog{ mJvmSpinner = mRootView.findViewById(R.id.pvc_javaVm); mRendererSpinner = mRootView.findViewById(R.id.pvc_renderer); - List renderList = Arrays.asList(mContext.getResources().getStringArray(R.array.renderer)); + ArrayList renderList = new ArrayList<>(5); + Collections.addAll(renderList, mContext.getResources().getStringArray(R.array.renderer)); renderList.add("Default"); mRendererNames = Arrays.asList(mContext.getResources().getStringArray(R.array.renderer_values)); mRendererSpinner.setAdapter(new ArrayAdapter<>(mContext, android.R.layout.simple_spinner_dropdown_item, renderList)); diff --git a/app_pojavlauncher/src/main/res/anim/translate_left_side.xml b/app_pojavlauncher/src/main/res/anim/translate_left_side.xml deleted file mode 100644 index 962be1cc6..000000000 --- a/app_pojavlauncher/src/main/res/anim/translate_left_side.xml +++ /dev/null @@ -1,5 +0,0 @@ - - diff --git a/app_pojavlauncher/src/main/res/anim/translate_right_side.xml b/app_pojavlauncher/src/main/res/anim/translate_right_side.xml deleted file mode 100644 index 607d4f8d0..000000000 --- a/app_pojavlauncher/src/main/res/anim/translate_right_side.xml +++ /dev/null @@ -1,5 +0,0 @@ - - diff --git a/app_pojavlauncher/src/main/res/drawable-hdpi/ic_flatstyle.png b/app_pojavlauncher/src/main/res/drawable-hdpi/ic_flatstyle.png deleted file mode 100644 index 777730532cf04e20569e94f0514893b81db87cb1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1052 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 F{|n#aibntd diff --git a/app_pojavlauncher/src/main/res/drawable-hdpi/ic_disable_gestures.png b/app_pojavlauncher/src/main/res/drawable-hdpi/ic_setting_disable_gestures.png similarity index 100% rename from app_pojavlauncher/src/main/res/drawable-hdpi/ic_disable_gestures.png rename to app_pojavlauncher/src/main/res/drawable-hdpi/ic_setting_disable_gestures.png diff --git a/app_pojavlauncher/src/main/res/drawable-hdpi/freeform_opt.png b/app_pojavlauncher/src/main/res/drawable-hdpi/ic_setting_freeform.png similarity index 100% rename from app_pojavlauncher/src/main/res/drawable-hdpi/freeform_opt.png rename to app_pojavlauncher/src/main/res/drawable-hdpi/ic_setting_freeform.png diff --git a/app_pojavlauncher/src/main/res/drawable-hdpi/ic_lib_check.png b/app_pojavlauncher/src/main/res/drawable-hdpi/ic_setting_lib_check.png similarity index 100% rename from app_pojavlauncher/src/main/res/drawable-hdpi/ic_lib_check.png rename to app_pojavlauncher/src/main/res/drawable-hdpi/ic_setting_lib_check.png diff --git a/app_pojavlauncher/src/main/res/drawable-hdpi/ic_auto_ram.png b/app_pojavlauncher/src/main/res/drawable-hdpi/ic_setting_ram.png similarity index 100% rename from app_pojavlauncher/src/main/res/drawable-hdpi/ic_auto_ram.png rename to app_pojavlauncher/src/main/res/drawable-hdpi/ic_setting_ram.png diff --git a/app_pojavlauncher/src/main/res/drawable-hdpi/tap_len.png b/app_pojavlauncher/src/main/res/drawable-hdpi/ic_setting_tap_length.png old mode 100755 new mode 100644 similarity index 100% rename from app_pojavlauncher/src/main/res/drawable-hdpi/tap_len.png rename to app_pojavlauncher/src/main/res/drawable-hdpi/ic_setting_tap_length.png diff --git a/app_pojavlauncher/src/main/res/drawable-hdpi/text_select_handle_left_mtrl_alpha.png b/app_pojavlauncher/src/main/res/drawable-hdpi/text_select_handle_left_mtrl_alpha.png deleted file mode 100644 index 9cdc25b4581dba8cf1d440f233ad79458e1ad24b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 478 zcmV<40U`d0P)T2qefINpU!KQvos*e*=z3A6l{P8Y1o7eWMK<(u+4U0 z7e<}IDT6xb<{$b3J_I4iT8piQUO0yLkRpG|Sc;9q3_L{;T9mdFyAok&k!R&Lrk7D( zAb8zEa38!1#G1IJ8{tAIHsIwo&d)TR~QgoBqggNH)gL6twyHFPV=ygrTl@TPsQNSu?WfP6#zJs8jKN2Qv2;e(Vd?OWp5^_B zV(Hjup8v3>rUA}FexCDuI3IIHr-={V!??Ylc^esb#)rN*jKjk}uQnYQT|qyehL*%s zKnu*m9ba+(mnDbZ^rw)7gvDp}uj@2@Nb7+qSNJ$~1ed(b9J<2Cv|(uDmtUmw4FG)L U{GPf85dZ)H07*qoM6N<$g0b%0j{pDw diff --git a/app_pojavlauncher/src/main/res/drawable-hdpi/text_select_handle_right_mtrl_alpha.png b/app_pojavlauncher/src/main/res/drawable-hdpi/text_select_handle_right_mtrl_alpha.png deleted file mode 100644 index 276d4809159289a7c65f44d9a6e0dd81b6f07984..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 486 zcmV@P)4l((?8 zv5~wi$e8hay3f>PqqygJ&gIl+J@dWyo_kN{81uU^3fr&+n=A_(unrkmgEXXI6_SvE zIK*HCx}eSkU{F-S2YGnn3)c;`Q08KA#;4#?uW$&x5Oys%Z6Ubm0cIfLQgF&*aM7|$ z(JKPMIexi?|N0|c>KURg1Sf=o$r&_g2PXxC-(f&II4&4WuAovgcu6?;1zP`8Fs;aj zG=t}bgA4raR~w58!F!s)3kt!Pn!z!iSCYZkn!ytaclby%xF0@*gLgE8+l7N^`b=sD z)7ti4FqkfGr)F>!?_)^?-$IS{dO9lfrl#MRhLCn}HJk{oqnlmX`RL$1C|j{_Fb3tW z1k)dxIRF3v diff --git a/app_pojavlauncher/src/main/res/drawable-mdpi/btn_scale.png b/app_pojavlauncher/src/main/res/drawable-mdpi/ic_setting_btn_scale.png old mode 100755 new mode 100644 similarity index 100% rename from app_pojavlauncher/src/main/res/drawable-mdpi/btn_scale.png rename to app_pojavlauncher/src/main/res/drawable-mdpi/ic_setting_btn_scale.png diff --git a/app_pojavlauncher/src/main/res/drawable-mdpi/jre_args.png b/app_pojavlauncher/src/main/res/drawable-mdpi/ic_setting_jre_args.png old mode 100755 new mode 100644 similarity index 100% rename from app_pojavlauncher/src/main/res/drawable-mdpi/jre_args.png rename to app_pojavlauncher/src/main/res/drawable-mdpi/ic_setting_jre_args.png diff --git a/app_pojavlauncher/src/main/res/drawable-mdpi/mouse_pointer_1.png b/app_pojavlauncher/src/main/res/drawable-mdpi/ic_setting_mouse_pointer.png old mode 100755 new mode 100644 similarity index 100% rename from app_pojavlauncher/src/main/res/drawable-mdpi/mouse_pointer_1.png rename to app_pojavlauncher/src/main/res/drawable-mdpi/ic_setting_mouse_pointer.png diff --git a/app_pojavlauncher/src/main/res/drawable-mdpi/rm_jre.png b/app_pojavlauncher/src/main/res/drawable-mdpi/rm_jre.png deleted file mode 100755 index dec16982a9887b73dc167b3854a85172058832ae..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 13728 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 diff --git a/app_pojavlauncher/src/main/res/drawable-mdpi/text_select_handle_left_mtrl_alpha.png b/app_pojavlauncher/src/main/res/drawable-mdpi/text_select_handle_left_mtrl_alpha.png deleted file mode 100644 index 95c0168cdc36bb16e2050e9cb18e32f4400b55be..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 346 zcmV-g0j2(lP)2%5q#;Np}YBC1J4MMNxLqM~Rn68s1?m>J>i z|G*Ji9PYj6c;GkRKbPmg@x1U8LkhbnqJkDW=;8)F^fAC4?(u+2&v=qJl7LUl;Rn#S zjN8H)z5+)5cWe3QE-;G_=gSjNANS^t@f|VFm-neYX*?;!`LamrvyZ7#VA~?_G{m+p z)3OL0D8)Gqi@=d$VACRStQc6c2z*ftEL#L#DaE-(D_8^`;zuFy1A7*MJ9twFbQjIG zMPM8y{6>g#2gU)`td50s)I&zjD=g7$w6bt*2Kj^1MTbf#tEdT%j07*qoM6N<$f;4`YrvLx| diff --git a/app_pojavlauncher/src/main/res/drawable-mdpi/text_select_handle_right_mtrl_alpha.png b/app_pojavlauncher/src/main/res/drawable-mdpi/text_select_handle_right_mtrl_alpha.png deleted file mode 100644 index 569332abfeaaf6e7e259a2d9fd68bd0df3065a09..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 347 zcmV-h0i^zkP)!J0%fkvj||0Pq~3@ zEL#U&2Mqjej6>us13M7{y%~-ypJX>;pf|;i)jQc%2=tz?ViDL<3Y=iwBCx3x=)dl& zMc|cE;6nbP>eEmRe76X^Pz?OA2s~B{e6a|u$P2C!cxn+?#!w;d3tJX}1=(bx1`bfP z2uxs84*sxl-#9?Z>O4-!fj;*6_M7v(&w0*sM#M&p1odDZSPa&J z&0q)E1$KiLum`k)edHiHOxnOv&;gEv6QGlv1j{97F%B#PXTU@70=x$WPy#7P_*#x$ zEAP{vd=`Hv{%(;{-N$gy$PBvy-bJ#i#q=koJP4cw)_`tiT2ez{xf9p`+Ck3%i>pxJ z^U-CD0N23h8ZXm732gV8c^5Lux@v((yveI)`S3Agc@=?&yzRE@Seld#2-M%O*OS2M z;I;vAX;cU9_abi;PYRz53GDMEa2B|4Wa*~SiKf+qygHs+Q)47NQ=5+|toh2u1orU{ zYd&U!Ck8W6%b1-W1U4JnJmNBDs|SI)(|t22@T->$JR7yA{tNtzxN6|s`zyA25O~w5 zJUxkQ_aN}DQGs8;77qfuj4ojL#+(gTM}hrx4{8SmZ(A1|tpB>LU6n znBzg@LPjxXA9!uypAGtH4l?0*6Sr+U&}xKd56Q zr@=6B9$LIU%V6nVmM|INK6Lpk0QY#Hul2IkQ;^Q$Op_diN}S7PYi|v+?zx0noCe8Z z=reJK{Fo6e_G8xR^G?S|*5_r}{!Zcq&;-u2*e?8oIBiiq00+QKo`MEVOa@E9F>njK zk#HSaidP$^XB%@`JMja3Mjm*l866TmMvi#`=*ZKaOgnwyR h&7FO!gvr-T<2y|(8@#<}Ci4IQ002ovPDHLkV1gD8WLf|K diff --git a/app_pojavlauncher/src/main/res/drawable-xhdpi/text_select_handle_right_mtrl_alpha.png b/app_pojavlauncher/src/main/res/drawable-xhdpi/text_select_handle_right_mtrl_alpha.png deleted file mode 100644 index d3602d9888ec5b8fcf1061180588fbbbb7ff0fbe..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 752 zcmV-+A-&_LhII_c`aWQ=i_|cCkL4^E~Hwe&-b_eQW@o;Jk7U zoCO`A9h?RymE+10r4_V*X3zu$(X=AJYQFM5ZG+2g!5U*-f*r5 zfd`GWF@?MUOFRhNYov`S_A*)HB?G@06!=X$gmHm?2q#3BJqX-qP+tCg+~Yyueq$$* zICnh=+yg!v75LDDz)eQm7?$u&4+7U2eTk489t5reZw<<0Z`$EO;8O6?U^C4D>kbbB zXY2ICS_ZxYD?JFT0vDvbSDU}WGcUsgj*K>f4~FD%I>a>-H|ro=w|H(y;2RwzRCp1{ ze{>i4WTgMQ2BwR%;Pd8zf$20`s^#J^CW6fp)-951X$B=+^v@KhF$r9hux^pW{EtUB zUTIDc$HC2j>j{+dYi;UN5w#L_Rfft?&KzVs0xR?}lA7S64|i4i{$Vx_>dSU0ytFo)4@fe$FuKGJsZ5Mn&Msn0000x}*Pp3fyNZ+t3oE5Oe% z#2AOkvWpZ@02*WfA3+>grVsE*0MI7>=-QPK4}dZv%D_V$;yBMUM%aPrN(SK3Sn{#i z#8zBoXUsz)fX$s}BL?h|WrA_07^MWnh;=6X{~}ggAHNel&pbTCYfTAY|kRrB{EvTFYp$}c#gCo*pM(vz!QAHBm-)WWliMB0O$CeJw#eO zt=c`!E;S2#A`Q!E0Pp2Pj;-*?=757J0FUwxM@bsTRo>k602i6!2sy0=vYO(uozNY%PD|oZbLq4y)YJ|>)*WX_ zu2OLaT;+GmOIk4JvH(zF+G>Hv=OT5N*;2^YR)Hlqskp66*EvhW8g7+K+;_R8;U8vL zvgD}+3BFRxmDGV7e8;p}?6VFF{zT0~>j0MA;3q3~>@&@E%O%5AWPo3g7G59en5>Rd zzmR)8%b?Leb&>OYtagm16L^Ut!<}|f6VhUi)BLEzbo89--p6MrTa8t?mN?I+))SRA z>v zB8MPGw~wydP1n7HHV@RGCMZ%&+bAH)qMSjcshF#Aec@Nzfu-nHme+rA&n?fsW*0E%_H>)6KwGczPZH O0000f_d(Np_ zki;IfRasj>EYemGi4bdv6+8E0O$9|Qk%CwYMGZ|&b82cDX4I9mWo|u*e!a~rhC!rw z&Ha|1zppfvaakW)VrA6bgL9a3M9r5D8#kuQ?KM+ku}CcHwE6!0^~T=KTSLo1d+o9^ z+aZ?{{rWK@Dkz}PX*&J+>y5peS*)aJz*<|4sH&LK6n7u+)(&t|D|E(E((eK5Z8T^` z(_FU!Z%GOGTJ)mDsy11r?7Zo2ThdRc+;Xwr?Wii&7&hRv)7=ET*@%T107KcJhurUk z@iZS>?BYG3SJiHBTGBnhaW+bN-5VbEj?LWy+|C@hplGL8J<=^px{&$8F6gzx3m)u- z&~n<+0KQzb#FKt?Aq~YYCX|()0CP;)de0b2<6TLC&t&e!S2MHc4CM`62!_idPkYLO ze1W5Yz$I0WTb^`TCj*{U4dTOBY`}KwlK#cXfaip@jh?kAPvE5{0xoLUkhBbx47eE> zH?rDp3-gS$!X_U@6>E~IMzR4<1c|h+-<;N2kzZ)pr!O#Y*%p`co8f*Z1A8$8M)CtL z2FInQ`u~WuuEy`n^7G-E)q!zim1IKs--@)Zlmk}e2R!6taO7B&A8;c;RqLN~JeVhN zD==`ZZ6ZJ5!vm$)Uz_ z6MOxZ#|qPGM-6mKfI8%T7c<5^;`ua+!s+;4!vezwGxX%sKCv(VBM(>Q&v|@JuPruX+##dBa4PMC|6zcy98J7W)h5F>SY?H>J{7S@ zS*#%zsjHiI-1kNub=Ji!OTS@K_k~KTRvNb4GE4O->D4rA)_IdonJ{5mjjY4RzW{r9 VK~u{Msc8TJ002ovPDHLkV1gvREKdLc diff --git a/app_pojavlauncher/src/main/res/drawable/ignore_notch.png b/app_pojavlauncher/src/main/res/drawable/ic_setting_ignore_notch.png old mode 100755 new mode 100644 similarity index 100% rename from app_pojavlauncher/src/main/res/drawable/ignore_notch.png rename to app_pojavlauncher/src/main/res/drawable/ic_setting_ignore_notch.png diff --git a/app_pojavlauncher/src/main/res/drawable/mouse_pointer_spd.png b/app_pojavlauncher/src/main/res/drawable/ic_setting_mouse_pointer_spd.png similarity index 100% rename from app_pojavlauncher/src/main/res/drawable/mouse_pointer_spd.png rename to app_pojavlauncher/src/main/res/drawable/ic_setting_mouse_pointer_spd.png diff --git a/app_pojavlauncher/src/main/res/drawable/resolution_scaler.png b/app_pojavlauncher/src/main/res/drawable/ic_setting_resolution_scaler.png old mode 100755 new mode 100644 similarity index 100% rename from app_pojavlauncher/src/main/res/drawable/resolution_scaler.png rename to app_pojavlauncher/src/main/res/drawable/ic_setting_resolution_scaler.png diff --git a/app_pojavlauncher/src/main/res/drawable/sign_in_background.png b/app_pojavlauncher/src/main/res/drawable/ic_setting_sign_in_background.png similarity index 100% rename from app_pojavlauncher/src/main/res/drawable/sign_in_background.png rename to app_pojavlauncher/src/main/res/drawable/ic_setting_sign_in_background.png diff --git a/app_pojavlauncher/src/main/res/drawable/mouse_pointer_1.png b/app_pojavlauncher/src/main/res/drawable/mouse_pointer_1.png deleted file mode 100755 index e5bb2041d07966a63bcc936e4cacab3edad7b698..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 9015 zcmX9^c_5VE*MG*0v5hhIof(xB*^MdN7_=yiR48OC`uZU00D0y04E&0 z*aa5eJb1cw@eBbd?vnZgKET`z%?tscERko&i5-0A@;_^P3jnymcie^$-(Oy303g?S z&e-r$sKa~~SB2E&tX3WJoRaAkay3lI@QO4IgW^QV<15d}xiM=v1d z0-lD&JcJOXj?!ZpnM6sFg5)j+i}1|EBijIDai@<=@3ZnrYU+R`=de#zR@i`0q@zd> zecP1N@>qH$BPe7dB5Zp*%KYEby<#h|fd|G9`%0W3v$l z%2Xj(#D5^#_%bZeGz_^v21z5KjvRRkLGcJWUgYPM6v?ADV*%%{CWWB8jvP*gByFxt z>p7*a#`qO9+xKi%IE9!Wa=cJW-#x3hxtX z0!ir*R63~z2hl=sTdKa20Gt-_%~(jWj;eqFLCAO(jvrJND+|Gc$c4_z!|?~U{(GDT zL4l~okZmw(TiOL)l1-;vA50DtD1Qrz77?TkniMh!gkQ$WaJ7*2bc2 zEgx?$OwLl;-* z{L<4;?TaQw(dWNXs9|Xxi6K^cY#E~nnr`Np? z6Pj|9T@e$$;^Ou*bG&TtViFXIqhrI@=OivP)_qHv&(+DT#6raJw`qcH+lC<@Ve3T= zLSSro4HOO04Jn;EX1QD=$ag*&Bn17Gw`yXgDr+&0E1|eS$d$G9^WCstgWf%^)i~eS zp^mD!~uDtI21i6myjB0Cy%}dnfB10u_8_?;ICl~ zrwwh>@h?D22TNOOp%OcE5tH%eocMj$w~I(FPMh6-)pHWaeuf ze8cVTAy?IsMpr9ufuSa#ZKUSbZ5=ci68(^#%c$+G$E6adz6wb`t5iFPLYuqBlduDw z^T;f|vJwL>&E&`QHy6HERy_G%Iyhq1kOyvRhZv1hvHzOQIK6}dF3{%@BpZaJ1H>cq zVAPT`hOb97w8aC|5$|67&k(7js!{@=A@vU_1GR3xcSCiS72D)L5{D%Yk{T)LyWL61 zYi8aZ<=Dyy|1CesV2SWODe7P!Lov?j-*i=5dT{UE3WT-h_(5vIw%F_m` zK@%MRot}uxs_LXiWVD-?&dP?G&-^x8`CkCcc#u;xL85C~MSb7E$}I{BiSXH-5(zp6 zMf2&i9DPQr1KtTM&OFE>JQL%4(gZVxpnHB;H=J0Fq2BmBH$ zgbh|UC*9+iTMX+;tnaBul`s2qFT5t|EXnnyx;LB${gtXiWZ@t;*t<}fJaz4hoDl-G z?0$N1Jy;f>H2XWdtUS3=y`OzsRsl>hN9~VTC$`^N1*+Fpq=`;~G*>{J=|%Z(STp06DC+}*xqOEzB~kXC30v*{R_w8$mRZU5j|BHqsO zCU=TS?Hl#p%aLxbrxV0}D(ed{V1p8-f^89*Bm^468H)WCA!4x@v&Z>`6l-YzCN4&g zEe|pPQ!+z;4`5R#rJ`pHICr(P|9S356uz#S`4@bK${a-^#2VRSPsKcdR}pHm&Z`6G zQLEm4+sfH{!nLTOCyOBgxTg8^Ei3-kw&X*ju?(8LDo=Y0h>qW|hc8B%@$G1?27T=A z^}exK^O=D+!yRkS^29a4VdYklOOY5+!6ZlpVAvhLb8BhUX@-YrP_JSaI^NCP_t|~n z9`oHqELR>c=qUOVvhX^ghscyi&xB8qDYjh{{iY35fa77&8-v@FL>F%FpZj;&`u-uj z8S3uGqxb8#I*>s%xs6!=!6nx6WPYbKlVk9O)O6H|2@-Q36(pIWS>hnY%Ich0!L8n! zVVmKc$?tiO4%WVSEo1ZnqH=ja^cwuc1Ns1&bj^vzxLq+i&p^rAn1&2#HiKuRZGoy4h-gFn}}A8kFj zovT~CrDB-5qal1pCB=gx*AZ77^XQ+LP=6-qu$uk7?fmpcfwNjM8x| zBW8?{w_iwAqUScbnonCwx&lv^g3-njGi{%cm5~L&^|nIQS{9Mjs2ORxFTC;9B+Qli+8Hd92AX44CK}4@oakgx%d2 zqj~KdA%Aj%yN(V!CPA8;o!RAr`P*T6(Jmd#eQe6jCpp%4uav*U2T+b^mGTMFpU;cW z9m9PV5*HQ6vnk!-2-Tru$yb=ENNQ@#QL}8a7^_BWRtvh_*xK1mIJeD8Ti%!?_Fe;} z2{wYXP@TqD!+uyg+2!;0PtAeu4af0aTVlt_>@dJpGH-DZQL~)^radCSvnTey zlOwytM`Rp==4T|zH1-Ljt~BrH!!JL&y&HNZO8OLEgGz@+T`%1KcbeNkaZN#;ZP&n? zYoh)1Y7xweK}Co@1jezwxepv6^Txi!zvxJzMoj!i*f2a7Dm|g@8iug>Z}mju&gM$i zo2s!>LHmk@>)CkfzID_L|Av8R&JC34l+uyGsOid0H zKfaC(5>vXgnMq<@_lb#9F*>(ZDoaAP#DA{ayD{azBF14Zm6kBR@p|k0SMITb%mDbU zhDzSLap(5sb%~<@l%<~XT=p)%=Ae-E)zZYwN0M>VxpJ}bSL#I_=ZD_?Z}%8w6w|^_ z*_+3|@B&z}(i9H)`Gjp95q#WFs_R>7mfxSRW?!B9EY_QcN+;>c&dsMrED&Y`eD$$<4GVhJzkemTocYw^yE6)VE8W>LuK zRV_qR#lbH8&x>cCALE7}JZcFjF-uc_5!`XYZd6Z5X0e126>$CX{n7&zI;bw;R_!&#-t<9;QjDM=;R};>xgKXzng5KubZdtPNUFB27k6tIonhq_I*kT-$TY0k#_;J(?3 zVKHAl`LOG635TM^SI4ju>g)Ot55{0o<31CuU@m9zkRR6}bm(8cD%4$MC%d>l{mbF? z&Q!HS6}pFzow7Xf6^ycJ94lraijn<;IQ->K5fCHR*rC!eG8;K6J@MX&vir_;tS-zv zQAUr@p;^n@Tk{l)TfYz{9LG-lnRe&BLX9LKxpS4>;9dWfYbW{iT*p%?0wzzp^%Yv? z-jH}h4yG7iWmezvc>QD{su6j0hr>)wE-Fw92wn?&vuoKrt9x{3FmUwt_nK|lD+OP* zG07sh-`ahAAB1ZcRkBAA=)r!`%fr6!eTpJ%Y64$q1kLpHs6TL^jzKO*U*uzNT^@t- z?O%zy!LGp;@pA7{g@)9qw(m&wP&9ky0KfFjZ#8>&kf{|e+w)Z=W;yz!b=)zZugdr5 z+#5u*PEI89gbX$5XZJpzUubf5fQC*zvCjOkKBTy+lQ#pEWs$3 z_UBjMdJ0U+O*!8u>hW(}ji8oHP+|M6d(LjYMimhu~KR$YEDmZ+hZpHj%_{IY0t6edHfX3yi zr7Od=;-VG0%|e)aM+Kp!oRP@RG_HVJoM20AMC+ga*UwfuHSB~wBOe|b^r;#JC&l@h zV_12%gz0xqno9>+sI$p2oNvv`-F)|z`c?9_3c`qwxn>R@HVzvfiU@>`0;=HYtbx zRZ>KZoN_|muZ`V(e9~&(rp!6!Tb189I3?M!6Y@oW(wWtJwUME3SoJ^bQsVj$jd?@e zFoim$INndYaG}Zv?+vs^P;S-nlVIj+RCJPB@p9a_?8O-Gm!2OWM{E_0T#b&y9r<_u z=H6sj1jh{!oQ6;3pGgeH`n>Hv(Xj@_Rp5#)rXWu#R9rYD@vS&%1|ikq&~tqx-}95I6;(kr9zkL> zj7M(A_>QBotO)K|C6=B%!A?}INNT#zYSJ!BYI?}4g!hCB{XXWaIPM{bQ6<-Kdga2s zrg$G9vsZGt-6BHZp1_W)BP?`*=8M%XP-2|gTc&s9e*~(SYF$Mr~T;$Qs74SMO~ zZLM&uM*Hxs_G2%pU?M9s4q?bHEzPpnHz)pLF7LlKdK|7$OZ^5yQb)VAf6 z&FJB|r<3$5f@G_2ztPzil%8mtau26P(tN*_*Ca8;Lmb@08O0*vpD4Mm&Gs)4o;%%; z_yAM$BIXKRfi|km#&Kk1dej}Yvxz!BgbH5U)oDJj3_Yx3lV4Z7S8?e4GvzmDkogSl1*LMVX5)^jTc??sXwf`@I_QHWJx4VPS7o0)l$k5L5i5LU0)gQ`Lh?OW+^EXv1%D&Zn!x1!Ki~r zp`^7dknG~B(H{MI2#L+O=ZR_o{>{$bXFK{#4-zx~Ql~aC-t_A7piAP(99HwuJXrlv zb2H`LEy%0r$qKECHa+LBHV}{X>+fbdfq!DZ1UayT*!hyz9m?;EBC*)Ub%?{VIP1j1 zX2u^L;&;fWgw6e@@6V`6M8(}n{bHi!eiJYWS~H3H@xmJKv^_spGo5{{lh2WP%N+W8 zOD}vKF)APJKpBMh-fk?DWcv|RJm!NH?#FZj_k8CQ*`9HEj`&$iiHCl-52+zHI5OC# zS(Aw&(Q*yyJOQT)`Ky+cctF~QoVK4&Zk_>*`IR5M!PH~edsH;n9Vheo-VZa!{{ zJq>kS%7H&Q$>J(s_rFfrUiiE8kuRjcB4^AqY^iINI|#F?T$qW*!3ooN6}(IbUDj|> zTlPM0d#M&MmeImC9N7BPu;(MupJ6!`?Ju17Z|~55W<5ZAPrs-z@}bLKy<<-S#$maE z`-u*QlP&u7ihoyxM(T&@kH06&8rL;OALTLl#mY4Pa~@7K%DNG@qu6YmEN8C^b);Os z96jy=?-OebXbImb!B2I=sCee;h{DRs^=M~4$HvO>;PdhDk|Dc+&l29+!uQmN{Pml; zB;@qm0jZfsChCbrKSb_`bMwp;I&Z1KBX9d^@xwa1ByV>f(lOak&A3XQSJwu-KYkvu zT+vz4zD4FrmgyX_n;Mw!pqDoK9$A-Ll8HiJI)Q>21bxJu>c-pov~YVreg#=t>2db; zW|VySEhqh7HZ;e_-b@l|1fFIgc0vgKFvCWwWaW;`+pVvxx(AS@fphb$(?b)Z^fiJ1u$<8b{Vt4j1N^R;+6ji64}w%)AxG}^<@=GKifD48 z6JX*TG3@*Iy_Y>xC_eXIvJ&Dgo$!RNR+dcsa=^HY5>DHK z&<3vrDHBzHrN(y&38{4uX`g#M>`@lqfO^idb^d4Fgv)bI~-}@{`jQea9s*((0e#pbim9snvoL{+N?L-BfVvmSK+k3MBMNi)tb@ zo`gH|MA`Y0M?AG<-tYp6h{&;v%~O6ozDnmgow%aoTwwLEmia)J#3n7GUt2qXUN=1~ zKDD7+aewm|frdlVDx;NSCW83_-}7K3p-k^aTjI##FM7dbrv-{|7{X{y4ypVWODP@K z_f;Kk8v1Bc{+B@0#1nm>qb;0@Cp%9cqMnt6Sw|_D?~!yJPf%Xtyl(_sb0%XsOZfXogHa^q*nn)!47%QfY2R33elj9{X{7H|vW~ITEd?@~#)1evM zX{NEe-X$SELVri|abv~^uvTR7fG;{xKIyR98G%7$E>lzvej#L4LxES2N&9fv1varH zQIYtA9Ya0h@b+VlQT)p`IWZ45YjyQoq`$&@_cuK;#t2;~y_nMLE+_^BeEFdC6ZP}w zZ^amt8kYpHW>v_S!U>y3%~+oHgsUb`izfwcawR97hSF^W&rSxDKI@E8d#Q}5?1KZ$PyKoBxD>v{pV9|QJ;OA}#firZ=F^qx z39cmBnfHtJ@5`M&!rgv%rkPjyjz+`rW%5bxrKsps7nrZB@wLXHruiyVKI#aAFHi!= z<1II-1iay;EFu052T@mp zTdn)Ln=Uk>&0CJz#%WMZf#Yoiahty$Qy7c!_SAEJ99xFvxvlBI<4|?zQuvoMF(~l~ zj^KPq((S(kC%?V4;Da|D9f0-DNQ-f00cH37Bvvg8-*3`TaxOb`Bsga9{MBiypgAWf zwvJR-%ti^f^3B|YH!KiTYL9#c5=DJtHd(HXM*n_#Ma2UZ5?*ul`ShjNU1+o$OE@G*tmGK$T-b zq5$`=?a;wYS3%Q3HmZwdm>LH`VG&q0@X!^6^ou4-3Il;=G-BeU4tz3BJ}}Ch#d!7- zf*M0g1vK+Bm>WU=qcu-5IUL6R7d~^PAEOx-KCw7w;v`6*i5V>2Qw82Sx7@o~1)Y^X z2n~{AJJ9yGq+vlSlJ)aI!?D8$;Wu~>w4a~CA$!+fm33?k334jNr&)|E6(DKRSZJ9a z4QHOa#X)TY4BFZq0V*#gPUem~C^-PDhr9~G(}b2OMM?({#7+jf_5iwN_YVM^*l|yFTNZ&o3otBfC0T7 zBb30Lvqi8Vr(EM)`Tj5y-2U#lJy4FOqSz-mol?!XKh5Et)%IFNI_1f6m9uGesFLxl|bY7hoEb!9+K zmMWWIiD16_?!a??pe!cx-{YKAix4Vr3~x?@=>IprK`{HRuk)V&{*J5m1WU$`7wbLf zSUL1a%WDAlF_xFdw}F4?K$Ik#kR=Yh-oJ6zv;hTiuBs~gp8A-}*)?yar$c}XR=BbuB7gkK4=G$(jt zalQQg;2mutskRkm8hLK-gGG*hae$`FY~QN~Q(0VGn7~%PrqfWH4|i^tukCbGn&bs` zh5i|Yd_M9l_0g%o@raF+qwhobo^FagS2p~gFdd><^RJwtVl(gei%9zxINH5f`?uKa z4E&Ma#)yUuwn`ETYHj8tbOT~Ln2sPdR@l^{_l|xEGm5-3zfdzRQ`M=e+_3Y{akKA1 z5=!pO4)7eJIzRBg<;C#8@2CK(^`Hq*nSxke)xfW)eA1S@A@3ndv%nrc^kio)2 z>pk>1c}Km=VE?Y*g0yXgd$Nu%dTCRX?gReDfP_&>EJg7Fy|MGWAJ}WA=D**9{)_;YVs&3q0{Ua7S`=I{QXQFPjKwIrW^uhrSV^d;l8qywzH8{6SJr)% z`ay9`ccQkHKN4@#6Q0f^&HJiW#Teph-~U^9)Ivl6WzChwSyo2m{Mwqy z8%Ev-n*Xb3yG~PX!n-3ik-g~=gp}y3^ZO9Vwhq)wS&RR`pIv}+Cg#S)1jp$A1D2~< A#sB~S diff --git a/app_pojavlauncher/src/main/res/drawable/text_select_handle_left_material.xml b/app_pojavlauncher/src/main/res/drawable/text_select_handle_left_material.xml deleted file mode 100644 index b228d3f5a..000000000 --- a/app_pojavlauncher/src/main/res/drawable/text_select_handle_left_material.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - diff --git a/app_pojavlauncher/src/main/res/drawable/text_select_handle_right_material.xml b/app_pojavlauncher/src/main/res/drawable/text_select_handle_right_material.xml deleted file mode 100644 index acacbf678..000000000 --- a/app_pojavlauncher/src/main/res/drawable/text_select_handle_right_material.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - diff --git a/app_pojavlauncher/src/main/res/drawable/view_handle.xml b/app_pojavlauncher/src/main/res/drawable/view_handle.xml new file mode 100644 index 000000000..f85c50284 --- /dev/null +++ b/app_pojavlauncher/src/main/res/drawable/view_handle.xml @@ -0,0 +1,4 @@ + + + diff --git a/app_pojavlauncher/src/main/res/layout/import_control_layout.xml b/app_pojavlauncher/src/main/res/layout/import_control_layout.xml index 4e5704f38..5aac9e3d1 100644 --- a/app_pojavlauncher/src/main/res/layout/import_control_layout.xml +++ b/app_pojavlauncher/src/main/res/layout/import_control_layout.xml @@ -12,7 +12,7 @@ android:layout_height="match_parent" android:elevation="-10dp" android:scaleType="centerCrop" - android:src="@drawable/sign_in_background" /> + android:src="@drawable/ic_setting_sign_in_background" /> diff --git a/app_pojavlauncher/src/main/res/values/styles.xml b/app_pojavlauncher/src/main/res/values/styles.xml index 0c537ead5..5067d8708 100644 --- a/app_pojavlauncher/src/main/res/values/styles.xml +++ b/app_pojavlauncher/src/main/res/values/styles.xml @@ -9,23 +9,4 @@ true @style/PreferenceThemeOverlay.v14.Material - - - - - diff --git a/app_pojavlauncher/src/main/res/xml/pref_control.xml b/app_pojavlauncher/src/main/res/xml/pref_control.xml index 982daf915..f5cc23764 100644 --- a/app_pojavlauncher/src/main/res/xml/pref_control.xml +++ b/app_pojavlauncher/src/main/res/xml/pref_control.xml @@ -9,7 +9,7 @@ @@ -21,7 +21,7 @@ app2:showSeekBarValue="true" app2:selectable="false" app2:seekBarIncrement="10" - app2:icon="@drawable/tap_len" /> + app2:icon="@drawable/ic_setting_tap_length" /> @@ -35,7 +35,7 @@ app2:showSeekBarValue="true" app2:selectable="false" app2:seekBarIncrement="5" - app2:icon="@drawable/btn_scale"/> + app2:icon="@drawable/ic_setting_btn_scale"/> @@ -48,7 +48,7 @@ android:key="mousescale" android:summary="@string/mcl_setting_subtitle_mousescale" android:title="@string/mcl_setting_title_mousescale" - app2:icon="@drawable/mouse_pointer_1" + app2:icon="@drawable/ic_setting_mouse_pointer" app2:selectable="false" app2:seekBarIncrement="5" app2:showSeekBarValue="true" /> @@ -56,7 +56,7 @@ android:key="mousespeed" android:summary="@string/mcl_setting_subtitle_mousespeed" android:title="@string/mcl_setting_title_mousespeed" - app2:icon="@drawable/mouse_pointer_spd" + app2:icon="@drawable/ic_setting_mouse_pointer_spd" app2:selectable="false" app2:seekBarIncrement="5" app2:showSeekBarValue="true" /> diff --git a/app_pojavlauncher/src/main/res/xml/pref_java.xml b/app_pojavlauncher/src/main/res/xml/pref_java.xml index a45405076..64d9a5164 100644 --- a/app_pojavlauncher/src/main/res/xml/pref_java.xml +++ b/app_pojavlauncher/src/main/res/xml/pref_java.xml @@ -11,7 +11,7 @@ + app2:icon="@drawable/ic_setting_hide_sidebar" /> diff --git a/app_pojavlauncher/src/main/res/xml/pref_video.xml b/app_pojavlauncher/src/main/res/xml/pref_video.xml index 8832a5838..255609284 100644 --- a/app_pojavlauncher/src/main/res/xml/pref_video.xml +++ b/app_pojavlauncher/src/main/res/xml/pref_video.xml @@ -18,7 +18,7 @@ android:key="ignoreNotch" android:summary="@string/mcl_setting_subtitle_ignore_notch" android:title="@string/mcl_setting_title_ignore_notch" - app2:icon="@drawable/ignore_notch" /> + app2:icon="@drawable/ic_setting_ignore_notch" /> + app2:icon="@drawable/ic_setting_resolution_scaler"/> \ No newline at end of file