Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/canary' into canary
Browse files Browse the repository at this point in the history
  • Loading branch information
@siavash79
siavash79 committed Jun 5, 2024
2 parents 028a416 + 9b99511 commit 1e2ccc1
Show file tree
Hide file tree
Showing 5 changed files with 120 additions and 89 deletions.
150 changes: 72 additions & 78 deletions app/src/main/java/sh/siava/pixelxpert/ui/activities/SettingsActivity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,14 +40,13 @@
import com.google.android.material.dialog.MaterialAlertDialogBuilder;
import com.topjohnwu.superuser.Shell;

import java.util.ArrayList;
import java.util.List;
import java.util.Locale;
import java.util.Objects;

import sh.siava.pixelxpert.BuildConfig;
import sh.siava.pixelxpert.R;
import sh.siava.pixelxpert.databinding.SettingsActivityBinding;
import sh.siava.pixelxpert.ui.models.SearchPreferenceItem;
import sh.siava.pixelxpert.utils.BitmapSubjectSegmenter;
import sh.siava.pixelxpert.ui.fragments.HooksFragment;
import sh.siava.pixelxpert.ui.fragments.UpdateFragment;
Expand All @@ -72,11 +71,9 @@ public class SettingsActivity extends BaseActivity implements PreferenceFragment
private static final String mData = "mDataKey";
private Integer selectedFragment = null;

String TAG = getClass().getSimpleName();

private static FragmentManager fragmentManager;
private HeaderFragment headerFragment;
private static final List<Object[]> prefsList = new ArrayList<>();
private static SearchPreferenceItem[] searchItems = null;

private static ActionBar actionBar;

Expand Down Expand Up @@ -112,27 +109,7 @@ protected void onCreate(Bundle savedInstanceState) {
fragmentManager = getSupportFragmentManager();
setSupportActionBar(binding.header.toolbar);
actionBar = getSupportActionBar();

prefsList.add(new Object[]{R.xml.header_preferences, R.string.app_name, new HeaderFragment()});
prefsList.add(new Object[]{R.xml.dialer_prefs, R.string.dialer_header, new DialerFragment()});
prefsList.add(new Object[]{R.xml.gesture_nav_prefs, R.string.gesturenav_header, new GestureNavFragment()});
prefsList.add(new Object[]{R.xml.hotspot_prefs, R.string.hotspot_header, new HotSpotFragment()});
prefsList.add(new Object[]{R.xml.lock_screen_prefs, R.string.lockscreen_header_title, new LockScreenFragment()});
prefsList.add(new Object[]{R.xml.lsqs_custom_text, R.string.netstat_header, new NetworkStatFragment()});
prefsList.add(new Object[]{R.xml.misc_prefs, R.string.misc_header, new MiscFragment()});
prefsList.add(new Object[]{R.xml.nav_prefs, R.string.nav_header, new NavFragment()});
prefsList.add(new Object[]{R.xml.own_prefs_header, R.string.own_prefs_header, new OwnPrefsFragment()});
prefsList.add(new Object[]{R.xml.packagemanger_prefs, R.string.pm_header, new PackageManagerFragment()});
prefsList.add(new Object[]{R.xml.qs_tile_qty_prefs, R.string.qs_tile_qty_title, new QSTileQtyFragment()});
prefsList.add(new Object[]{R.xml.quicksettings_prefs, R.string.qs_panel_category_title, new QuickSettingsFragment()});
prefsList.add(new Object[]{R.xml.sbqs_network_prefs, R.string.ntsb_category_title, new NetworkFragment()});
prefsList.add(new Object[]{R.xml.statusbar_batterybar_prefs, R.string.sbbb_header, new SBBBFragment()});
prefsList.add(new Object[]{R.xml.statusbar_batteryicon_prefs, R.string.sbbIcon_header, new SBBIconFragment()});
prefsList.add(new Object[]{R.xml.statusbar_clock_prefs, R.string.sbc_header, new SBCFragment()});
prefsList.add(new Object[]{R.xml.statusbar_settings, R.string.statusbar_header, new StatusbarFragment()});
prefsList.add(new Object[]{R.xml.theming_prefs, R.string.theme_customization_category, new ThemingFragment()});
prefsList.add(new Object[]{R.xml.three_button_prefs, R.string.threebutton_header_title, new ThreeButtonNavFragment()});
prefsList.add(new Object[]{R.xml.physical_buttons_prefs, R.string.remap_physical_buttons_title, new PhysicalButtonRemapFragment()});
initSearchableItems();

PreferenceHelper.init(ExtendedSharedPreferences.from(getDefaultSharedPreferences(createDeviceProtectedStorageContext())));

Expand Down Expand Up @@ -175,6 +152,31 @@ protected void onCreate(Bundle savedInstanceState) {
}
}

private void initSearchableItems() {
searchItems = new SearchPreferenceItem[]{
new SearchPreferenceItem(R.xml.header_preferences, R.string.app_name, new HeaderFragment()),
new SearchPreferenceItem(R.xml.dialer_prefs, R.string.dialer_header, new DialerFragment()),
new SearchPreferenceItem(R.xml.gesture_nav_prefs, R.string.gesturenav_header, new GestureNavFragment()),
new SearchPreferenceItem(R.xml.hotspot_prefs, R.string.hotspot_header, new HotSpotFragment()),
new SearchPreferenceItem(R.xml.lock_screen_prefs, R.string.lockscreen_header_title, new LockScreenFragment()),
new SearchPreferenceItem(R.xml.lsqs_custom_text, R.string.netstat_header, new NetworkStatFragment()),
new SearchPreferenceItem(R.xml.misc_prefs, R.string.misc_header, new MiscFragment()),
new SearchPreferenceItem(R.xml.nav_prefs, R.string.nav_header, new NavFragment()),
new SearchPreferenceItem(R.xml.own_prefs_header, R.string.own_prefs_header, new OwnPrefsFragment()),
new SearchPreferenceItem(R.xml.packagemanger_prefs, R.string.pm_header, new PackageManagerFragment()),
new SearchPreferenceItem(R.xml.qs_tile_qty_prefs, R.string.qs_tile_qty_title, new QSTileQtyFragment()),
new SearchPreferenceItem(R.xml.quicksettings_prefs, R.string.qs_panel_category_title, new QuickSettingsFragment()),
new SearchPreferenceItem(R.xml.sbqs_network_prefs, R.string.ntsb_category_title, new NetworkFragment()),
new SearchPreferenceItem(R.xml.statusbar_batterybar_prefs, R.string.sbbb_header, new SBBBFragment()),
new SearchPreferenceItem(R.xml.statusbar_batteryicon_prefs, R.string.sbbIcon_header, new SBBIconFragment()),
new SearchPreferenceItem(R.xml.statusbar_clock_prefs, R.string.sbc_header, new SBCFragment()),
new SearchPreferenceItem(R.xml.statusbar_settings, R.string.statusbar_header, new StatusbarFragment()),
new SearchPreferenceItem(R.xml.theming_prefs, R.string.theme_customization_category, new ThemingFragment()),
new SearchPreferenceItem(R.xml.three_button_prefs, R.string.threebutton_header_title, new ThreeButtonNavFragment()),
new SearchPreferenceItem(R.xml.physical_buttons_prefs, R.string.remap_physical_buttons_title, new PhysicalButtonRemapFragment()),
};
}

@SuppressLint("NonConstantResourceId")
private void setupBottomNavigationView() {
getSupportFragmentManager().addOnBackStackChangedListener(() -> {
Expand Down Expand Up @@ -276,7 +278,7 @@ private void tryMigratePrefs() {
String migrateFileName = "PX_migrate.tmp";
@SuppressLint("SdCardPath")
String migrateFilePath = "/sdcard/" + migrateFileName;
if (Shell.cmd(String.format("stat %s", migrateFilePath)).exec().getOut().size() > 0) {
if (!Shell.cmd(String.format("stat %s", migrateFilePath)).exec().getOut().isEmpty()) {
String PXPrefsPath = "/data/user_de/0/sh.siava.pixelxpert/shared_prefs/sh.siava.pixelxpert_preferences.xml";
Shell.cmd(String.format("mv %s %s", migrateFilePath, PXPrefsPath)).exec();
Shell.cmd(String.format("chmod 777 %s", PXPrefsPath)).exec(); //system will correct the permissions upon next launch. let's just give it access to do so
Expand Down Expand Up @@ -431,28 +433,31 @@ public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
super.onCreatePreferences(savedInstanceState, rootKey);

searchPreference = findPreference("searchPreference");
SearchConfiguration config = searchPreference.getSearchConfiguration();
config.setActivity((AppCompatActivity) getActivity());
config.setFragmentContainerViewId(R.id.settings);

for (Object[] obj : prefsList) {
config.index((Integer) obj[0]).addBreadcrumb(this.getResources().getString((Integer) obj[1]));
}
if (searchPreference != null && getActivity() != null) {
SearchConfiguration config = searchPreference.getSearchConfiguration();
config.setActivity((AppCompatActivity) getActivity());
config.setFragmentContainerViewId(R.id.settings);

for (SearchPreferenceItem searchItem : searchItems) {
config.index(searchItem.getXml()).addBreadcrumb(this.getResources().getString(searchItem.getTitle()));
}

config.setBreadcrumbsEnabled(true);
config.setHistoryEnabled(true);
config.setFuzzySearchEnabled(false);
config.setBreadcrumbsEnabled(true);
config.setHistoryEnabled(true);
config.setFuzzySearchEnabled(false);
}
}

private void onSearchResultClicked(SearchPreferenceResult result) {
if (result.getResourceFile() == R.xml.header_preferences) {
searchPreference.setVisible(false);
SearchPreferenceResult.highlight(new HeaderFragment(), result.getKey());
} else {
for (Object[] obj : prefsList) {
if ((Integer) obj[0] == result.getResourceFile()) {
replaceFragment((PreferenceFragmentCompat) obj[2]);
SearchPreferenceResult.highlight((PreferenceFragmentCompat) obj[2], result.getKey());
for (SearchPreferenceItem searchItem : searchItems) {
if (searchItem.getXml() == result.getResourceFile()) {
replaceFragment(searchItem.getFragment());
SearchPreferenceResult.highlight(searchItem.getFragment(), result.getKey());
break;
}
}
Expand Down Expand Up @@ -517,11 +522,12 @@ public void onCreatePreferences(Bundle savedInstanceState, String rootKey)

new BitmapSubjectSegmenter(getActivity()).checkModelAvailability(moduleAvailabilityResponse ->
findPreference("DWallpaperEnabled")
.setSummary(
moduleAvailabilityResponse.areModulesAvailable()
? R.string.depth_wallpaper_model_ready
: R.string.depth_wallpaper_model_not_available));
.setSummary(
moduleAvailabilityResponse.areModulesAvailable()
? R.string.depth_wallpaper_model_ready
: R.string.depth_wallpaper_model_not_available));
}

@Override
public String getTitle() {
return getString(R.string.lockscreen_header_title);
Expand All @@ -538,22 +544,20 @@ public void updateScreen(String key) {

if (key == null) return;

switch (key) {
case "DWallpaperEnabled":
try {
boolean DepthEffectEnabled = mPreferences.getBoolean("DWallpaperEnabled", false);

if (DepthEffectEnabled) {
new MaterialAlertDialogBuilder(getContext(), R.style.MaterialComponents_MaterialAlertDialog)
.setTitle(R.string.depth_effect_alert_title)
.setMessage(getString(R.string.depth_effect_alert_body, getString(R.string.sysui_restart_needed)))
.setPositiveButton(R.string.depth_effect_ok_btn, (dialog, which) -> AppUtils.Restart("systemui"))
.setCancelable(false)
.show();
}
} catch (Exception ignored) {
if (key.equals("DWallpaperEnabled")) {
try {
boolean DepthEffectEnabled = mPreferences.getBoolean("DWallpaperEnabled", false);

if (DepthEffectEnabled && getContext() != null) {
new MaterialAlertDialogBuilder(getContext(), R.style.MaterialComponents_MaterialAlertDialog)
.setTitle(R.string.depth_effect_alert_title)
.setMessage(getString(R.string.depth_effect_alert_body, getString(R.string.sysui_restart_needed)))
.setPositiveButton(R.string.depth_effect_ok_btn, (dialog, which) -> AppUtils.Restart("systemui"))
.setCancelable(false)
.show();
}
break;
} catch (Exception ignored) {
}
}
}
}
Expand All @@ -570,7 +574,6 @@ public int getLayoutResource() {
}
}


public static class NetworkFragment extends ControlledPreferenceFragmentCompat {
@Override
public String getTitle() {
Expand All @@ -583,8 +586,6 @@ public int getLayoutResource() {
}
}



public static class SBBIconFragment extends ControlledPreferenceFragmentCompat {
@Override
public String getTitle() {
Expand Down Expand Up @@ -669,8 +670,6 @@ public int getLayoutResource() {
}
}



public static class SBCFragment extends ControlledPreferenceFragmentCompat {
@Override
public String getTitle() {
Expand All @@ -683,7 +682,6 @@ public int getLayoutResource() {
}
}


public static class ThreeButtonNavFragment extends ControlledPreferenceFragmentCompat {
@Override
public String getTitle() {
Expand All @@ -709,7 +707,6 @@ public int getLayoutResource() {
}
}


public static class StatusbarFragment extends ControlledPreferenceFragmentCompat {
@Override
public String getTitle() {
Expand All @@ -734,7 +731,6 @@ public int getLayoutResource() {
}
}


public static class QuickSettingsFragment extends ControlledPreferenceFragmentCompat {
private FrameLayout pullDownIndicator;

Expand Down Expand Up @@ -770,7 +766,7 @@ public void updateScreen(String key) {

pullDownIndicator.setVisibility(PreferenceHelper.isVisible("QSPulldownPercent") ? View.VISIBLE : View.GONE);
FrameLayout.LayoutParams lp = (FrameLayout.LayoutParams) pullDownIndicator.getLayoutParams();
lp.width = Math.round(mPreferences.getSliderInt( "QSPulldownPercent", 25) * displayWidth / 100f);
lp.width = Math.round(mPreferences.getSliderInt("QSPulldownPercent", 25) * displayWidth / 100f);
lp.gravity = Gravity.TOP | (Integer.parseInt(mPreferences.getString("QSPulldownSide", "1")) == 1 ? Gravity.RIGHT : Gravity.LEFT);
pullDownIndicator.setLayoutParams(lp);
} catch (Exception ignored) {
Expand All @@ -791,7 +787,6 @@ private void createPullDownIndicator() {
}
}


public static class GestureNavFragment extends ControlledPreferenceFragmentCompat {

FrameLayout leftBackGestureIndicator, rightBackGestureIndicator;
Expand Down Expand Up @@ -826,9 +821,9 @@ public void updateScreen(String key) {
int displayHeight = getActivity().getWindowManager().getCurrentWindowMetrics().getBounds().height();
int displayWidth = getActivity().getWindowManager().getCurrentWindowMetrics().getBounds().width();

float leftSwipeUpPercentage = mPreferences.getSliderFloat( "leftSwipeUpPercentage", 25);
float leftSwipeUpPercentage = mPreferences.getSliderFloat("leftSwipeUpPercentage", 25);

float rightSwipeUpPercentage = mPreferences.getSliderFloat( "rightSwipeUpPercentage", 25);
float rightSwipeUpPercentage = mPreferences.getSliderFloat("rightSwipeUpPercentage", 25);

int edgeWidth = Math.round(displayWidth * leftSwipeUpPercentage / 100f);
ViewGroup.LayoutParams lp = leftSwipeGestureIndicator.getLayoutParams();
Expand All @@ -846,12 +841,12 @@ public void updateScreen(String key) {
setVisibility(rightBackGestureIndicator, PreferenceHelper.isVisible("BackRightHeight"), 400);
setVisibility(leftBackGestureIndicator, PreferenceHelper.isVisible("BackLeftHeight"), 400);

int edgeHeight = Math.round(displayHeight * mPreferences.getSliderInt( "BackRightHeight", 100) / 100f);
int edgeHeight = Math.round(displayHeight * mPreferences.getSliderInt("BackRightHeight", 100) / 100f);
lp = rightBackGestureIndicator.getLayoutParams();
lp.height = edgeHeight;
rightBackGestureIndicator.setLayoutParams(lp);

edgeHeight = Math.round(displayHeight * mPreferences.getSliderInt( "BackLeftHeight", 100) / 100f);
edgeHeight = Math.round(displayHeight * mPreferences.getSliderInt("BackLeftHeight", 100) / 100f);
lp = leftBackGestureIndicator.getLayoutParams();
lp.height = edgeHeight;
leftBackGestureIndicator.setLayoutParams(lp);
Expand Down Expand Up @@ -945,7 +940,6 @@ public void onDestroy() {
}
}


public static class NetworkStatFragment extends ControlledPreferenceFragmentCompat {
@Override
public String getTitle() {
Expand All @@ -958,7 +952,6 @@ public int getLayoutResource() {
}
}


public static class DialerFragment extends ControlledPreferenceFragmentCompat {
@Override
public String getTitle() {
Expand All @@ -971,7 +964,6 @@ public int getLayoutResource() {
}
}


public static class OwnPrefsFragment extends ControlledPreferenceFragmentCompat {
@Override
public String getTitle() {
Expand Down Expand Up @@ -1052,7 +1044,9 @@ public void updateScreen(String key) {
switch (key) {
case "appLanguage":
try {
getActivity().recreate();
if (getActivity() != null) {
getActivity().recreate();
}
} catch (Exception ignored) {
}
break;
Expand Down Expand Up @@ -1098,7 +1092,7 @@ private void setAlternativeAppIcon(boolean alternativeThemedAppIconEnabled) {
}

@Override
protected void onNewIntent(Intent intent) {
protected void onNewIntent(@NonNull Intent intent) {
super.onNewIntent(intent);
setIntent(intent);
}
Expand Down
31 changes: 31 additions & 0 deletions app/src/main/java/sh/siava/pixelxpert/ui/models/SearchPreferenceItem.java
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
package sh.siava.pixelxpert.ui.models;

import androidx.annotation.StringRes;
import androidx.annotation.XmlRes;

import sh.siava.pixelxpert.utils.ControlledPreferenceFragmentCompat;

public class SearchPreferenceItem {

private final @XmlRes int xml;
private final @StringRes int title;
private final ControlledPreferenceFragmentCompat fragment;

public SearchPreferenceItem(int xml, int title, ControlledPreferenceFragmentCompat fragment) {
this.xml = xml;
this.title = title;
this.fragment = fragment;
}

public int getXml() {
return xml;
}

public int getTitle() {
return title;
}

public ControlledPreferenceFragmentCompat getFragment() {
return fragment;
}
}
6 changes: 6 additions & 0 deletions app/src/main/res/drawable/preference_category_background.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="?attr/colorPrimaryContainer" />
<corners android:radius="@dimen/ui_container_radius" />
</shape>
Loading

0 comments on commit 1e2ccc1

Please sign in to comment.