y0zhyck/vtosters
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactoring

Browse Source
This commit is contained in:
gdlbo
2023-02-06 02:51:32 +03:00
parent bc43b788d8
commit 84e0601b76
2 changed files with 7 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/ru/vtosters/lite/ui/components/IconManager.java
+4 -13
View File
@@ -46,27 +46,18 @@ public class IconManager {
return Preferences.hasVerification() && Preferences.isValidSignature() ? sIconsPlus : sIcons; // delete later sdk check
}
public static void switchComponent(String icon, String appName, String oldIcon, String oldAppName) {
public static void switchComponent(String icon, String appName) {
// def value for standard icon
var iconIndex = 1;
// def value for standard label
var labelIndex = 1;
var oldIconIndex = -1;
var oldLabelIndex = -1;
Log.d("IconManager", "iconSwitcher: icon = " + icon + ", appname = " + appName);
List<String> iconsList = (Preferences.hasVerification() && Preferences.isValidSignature()) ? sIconsPlus : sIcons;
List<String> labelsList = sLabels;
if (oldIcon != null && oldAppName != null) {
oldIconIndex = iconsList.indexOf(oldIcon);
oldLabelIndex = labelsList.indexOf(oldAppName);
}
// check if icon is exist
if (iconsList.contains(icon))
// get icon index
@@ -81,14 +72,14 @@ public class IconManager {
main: for (int i = 0; i < iconsList.size(); i++) {
for (int o = 0; o < labelsList.size(); o++) {
if (isComponentEnabled("id" + i + "" + o)) {
currentState = i + "" + o;
if (isComponentEnabled("id" + i + o)) {
currentState = i + String.valueOf(o);
break main;
}
}
}
String newState = iconIndex + "" + labelIndex;
String newState = iconIndex + String.valueOf(labelIndex);
// check if current component is equal to custom value or if custom value is not exist
if (currentState.equals(newState))
app/src/main/java/ru/vtosters/lite/ui/fragments/IconsFragment.java
+3 -3
View File
@@ -63,17 +63,17 @@ public class IconsFragment extends MaterialPreferenceToolbarFragment {
AndroidUtils.edit().putString("appname", "vt").commit();
AndroidUtils.edit().putString("selectedicon", appicon).commit();
IconManager.switchComponent(appicon, "vt", deficon, defname);
IconManager.switchComponent(appicon, "vt");
} else if (rgVK.isChecked()) {
AndroidUtils.edit().putString("appname", "standard").commit();
AndroidUtils.edit().putString("selectedicon", appicon).commit();
IconManager.switchComponent(appicon, "standard", deficon, defname);
IconManager.switchComponent(appicon, "standard");
} else if (rgVKontakte.isChecked()) {
AndroidUtils.edit().putString("appname", "vkontakte").commit();
AndroidUtils.edit().putString("selectedicon", appicon).commit();
IconManager.switchComponent(appicon, "vkontakte", deficon, defname);
IconManager.switchComponent(appicon, "vkontakte");
}
}))
.setNegativeButton(R.string.cancel,