Fix manager crash
This commit is contained in:
parent
dc788d852c
commit
aca1038700
|
|
@ -27,7 +27,6 @@ public class AboutActivity extends BaseActivity {
|
||||||
if (bar != null) {
|
if (bar != null) {
|
||||||
bar.setDisplayHomeAsUpEnabled(true);
|
bar.setDisplayHomeAsUpEnabled(true);
|
||||||
}
|
}
|
||||||
setupWindowInsets(binding.snackbar, null);
|
|
||||||
|
|
||||||
binding.appVersion.setText(BuildConfig.VERSION_NAME);
|
binding.appVersion.setText(BuildConfig.VERSION_NAME);
|
||||||
|
|
||||||
|
|
@ -44,7 +43,7 @@ public class AboutActivity extends BaseActivity {
|
||||||
v.setOnClickListener(v1 -> NavUtil.startURL(this, getString(url)));
|
v.setOnClickListener(v1 -> NavUtil.startURL(this, getString(url)));
|
||||||
}
|
}
|
||||||
|
|
||||||
public void openLink(View view) {
|
//public void openLink(View view) {
|
||||||
NavUtil.startURL(this, view.getTag().toString());
|
// NavUtil.startURL(this, view.getTag().toString());
|
||||||
}
|
//}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -47,6 +47,10 @@ public class BaseActivity extends AppCompatActivity {
|
||||||
protected static SharedPreferences preferences;
|
protected static SharedPreferences preferences;
|
||||||
private String theme;
|
private String theme;
|
||||||
|
|
||||||
|
static {
|
||||||
|
preferences = App.getPreferences();
|
||||||
|
}
|
||||||
|
|
||||||
public static boolean isBlackNightTheme() {
|
public static boolean isBlackNightTheme() {
|
||||||
return preferences.getBoolean("black_dark_theme", false) || preferences.getBoolean("md2", false);
|
return preferences.getBoolean("black_dark_theme", false) || preferences.getBoolean("md2", false);
|
||||||
}
|
}
|
||||||
|
|
@ -110,14 +114,9 @@ public class BaseActivity extends AppCompatActivity {
|
||||||
return getResources().getIdentifier(customThemeName, "style", getPackageName());
|
return getResources().getIdentifier(customThemeName, "style", getPackageName());
|
||||||
}
|
}
|
||||||
|
|
||||||
protected void setupWindowInsets(View rootView, View secondView) {
|
|
||||||
// TODO:
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onCreate(@Nullable Bundle savedInstanceState) {
|
public void onCreate(@Nullable Bundle savedInstanceState) {
|
||||||
super.onCreate(savedInstanceState);
|
super.onCreate(savedInstanceState);
|
||||||
preferences = App.getPreferences();
|
|
||||||
AppCompatDelegate.setDefaultNightMode(preferences.getInt("theme", -1));
|
AppCompatDelegate.setDefaultNightMode(preferences.getInt("theme", -1));
|
||||||
theme = getTheme(this) + getCustomTheme() + preferences.getBoolean("md2", false);
|
theme = getTheme(this) + getCustomTheme() + preferences.getBoolean("md2", false);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -48,7 +48,6 @@ public class BlackListActivity extends BaseActivity implements AppAdapter.Callba
|
||||||
if (bar != null) {
|
if (bar != null) {
|
||||||
bar.setDisplayHomeAsUpEnabled(true);
|
bar.setDisplayHomeAsUpEnabled(true);
|
||||||
}
|
}
|
||||||
setupWindowInsets(binding.snackbar, binding.recyclerView);
|
|
||||||
final boolean isWhiteListMode = isWhiteListMode();
|
final boolean isWhiteListMode = isWhiteListMode();
|
||||||
appAdapter = new BlackListAdapter(this, isWhiteListMode);
|
appAdapter = new BlackListAdapter(this, isWhiteListMode);
|
||||||
appAdapter.setHasStableIds(true);
|
appAdapter.setHasStableIds(true);
|
||||||
|
|
|
||||||
|
|
@ -67,7 +67,6 @@ public class LogsActivity extends BaseActivity {
|
||||||
if (bar != null) {
|
if (bar != null) {
|
||||||
bar.setDisplayHomeAsUpEnabled(true);
|
bar.setDisplayHomeAsUpEnabled(true);
|
||||||
}
|
}
|
||||||
setupWindowInsets(binding.snackbar, binding.recyclerView);
|
|
||||||
|
|
||||||
if (!preferences.getBoolean("hide_logcat_warning", false)) {
|
if (!preferences.getBoolean("hide_logcat_warning", false)) {
|
||||||
DialogInstallWarningBinding binding = DialogInstallWarningBinding.inflate(getLayoutInflater());
|
DialogInstallWarningBinding binding = DialogInstallWarningBinding.inflate(getLayoutInflater());
|
||||||
|
|
|
||||||
|
|
@ -34,7 +34,6 @@ public class MainActivity extends BaseActivity implements ModuleUtil.ModuleListe
|
||||||
binding.modules.setElevation(12);
|
binding.modules.setElevation(12);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
setupWindowInsets(binding.snackbar, null);
|
|
||||||
ModuleUtil.getInstance().addListener(this);
|
ModuleUtil.getInstance().addListener(this);
|
||||||
binding.modules.setOnClickListener(v -> {
|
binding.modules.setOnClickListener(v -> {
|
||||||
Intent intent = new Intent();
|
Intent intent = new Intent();
|
||||||
|
|
|
||||||
|
|
@ -51,7 +51,6 @@ public class ModuleScopeActivity extends BaseActivity implements AppAdapter.Call
|
||||||
bar.setDisplayHomeAsUpEnabled(true);
|
bar.setDisplayHomeAsUpEnabled(true);
|
||||||
bar.setSubtitle(moduleName);
|
bar.setSubtitle(moduleName);
|
||||||
}
|
}
|
||||||
setupWindowInsets(binding.snackbar, binding.recyclerView);
|
|
||||||
appAdapter = new ScopeAdapter(this, modulePackageName, binding.masterSwitch);
|
appAdapter = new ScopeAdapter(this, modulePackageName, binding.masterSwitch);
|
||||||
appAdapter.setHasStableIds(true);
|
appAdapter.setHasStableIds(true);
|
||||||
binding.recyclerView.setAdapter(appAdapter);
|
binding.recyclerView.setAdapter(appAdapter);
|
||||||
|
|
|
||||||
|
|
@ -177,7 +177,6 @@ public class ModulesActivity extends BaseActivity implements ModuleUtil.ModuleLi
|
||||||
if (bar != null) {
|
if (bar != null) {
|
||||||
bar.setDisplayHomeAsUpEnabled(true);
|
bar.setDisplayHomeAsUpEnabled(true);
|
||||||
}
|
}
|
||||||
setupWindowInsets(binding.snackbar, binding.recyclerView);
|
|
||||||
filter = new ApplicationFilter();
|
filter = new ApplicationFilter();
|
||||||
moduleUtil = ModuleUtil.getInstance();
|
moduleUtil = ModuleUtil.getInstance();
|
||||||
pm = getPackageManager();
|
pm = getPackageManager();
|
||||||
|
|
@ -507,27 +506,7 @@ public class ModulesActivity extends BaseActivity implements ModuleUtil.ModuleLi
|
||||||
return false;
|
return false;
|
||||||
});
|
});
|
||||||
|
|
||||||
holder.itemView.setOnCreateContextMenuListener((menu, v, menuInfo) -> {
|
holder.itemView.setOnCreateContextMenuListener((menu, v, menuInfo) -> getMenuInflater().inflate(R.menu.context_menu_modules, menu));
|
||||||
getMenuInflater().inflate(R.menu.context_menu_modules, menu);
|
|
||||||
/*ModuleUtil.InstalledModule installedModule = ModuleUtil.getInstance().getModule(item.packageName);
|
|
||||||
if (installedModule == null) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
try {
|
|
||||||
String support = RepoDb.getModuleSupport(installedModule.packageName);
|
|
||||||
if (NavUtil.parseURL(support) == null) {
|
|
||||||
menu.removeItem(R.id.menu_support);
|
|
||||||
}
|
|
||||||
} catch (RepoDb.RowNotFoundException e) {
|
|
||||||
menu.removeItem(R.id.menu_download_updates);
|
|
||||||
menu.removeItem(R.id.menu_support);
|
|
||||||
}
|
|
||||||
if (installedModule.packageName.equals(BuildConfig.APPLICATION_ID)) {
|
|
||||||
menu.removeItem(R.id.menu_launch);
|
|
||||||
menu.removeItem(R.id.menu_scope);
|
|
||||||
menu.removeItem(R.id.menu_uninstall);
|
|
||||||
}*/
|
|
||||||
});
|
|
||||||
holder.appName.setText(item.getAppName());
|
holder.appName.setText(item.getAppName());
|
||||||
|
|
||||||
TextView version = holder.appVersion;
|
TextView version = holder.appVersion;
|
||||||
|
|
|
||||||
|
|
@ -58,7 +58,6 @@ public class SettingsActivity extends BaseActivity {
|
||||||
if (bar != null) {
|
if (bar != null) {
|
||||||
bar.setDisplayHomeAsUpEnabled(true);
|
bar.setDisplayHomeAsUpEnabled(true);
|
||||||
}
|
}
|
||||||
setupWindowInsets(binding.snackbar, null);
|
|
||||||
if (savedInstanceState == null) {
|
if (savedInstanceState == null) {
|
||||||
getSupportFragmentManager().beginTransaction()
|
getSupportFragmentManager().beginTransaction()
|
||||||
.add(R.id.container, new SettingsFragment()).commit();
|
.add(R.id.container, new SettingsFragment()).commit();
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue