mirror of
https://github.com/kiwix/kiwix-android.git
synced 2025-08-03 18:56:44 -04:00
Fix indentations in KiwixSettingsActivity.java
This commit is contained in:
parent
4287c8011a
commit
0dcce78b3e
@ -91,7 +91,6 @@ public class KiwixSettingsActivity extends BaseActivity {
|
|||||||
setUpToolbar();
|
setUpToolbar();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onBackPressed() {
|
public void onBackPressed() {
|
||||||
getWindow().setWindowAnimations(0);
|
getWindow().setWindowAnimations(0);
|
||||||
@ -143,7 +142,8 @@ public class KiwixSettingsActivity extends BaseActivity {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (BuildConfig.IS_CUSTOM_APP) {
|
if (BuildConfig.IS_CUSTOM_APP) {
|
||||||
PreferenceCategory notificationsCategory = (PreferenceCategory) findPreference("pref_extras");
|
PreferenceCategory notificationsCategory =
|
||||||
|
(PreferenceCategory) findPreference("pref_extras");
|
||||||
notificationsCategory.removePreference(findPreference("pref_wifi_only"));
|
notificationsCategory.removePreference(findPreference("pref_wifi_only"));
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -151,7 +151,8 @@ public class KiwixSettingsActivity extends BaseActivity {
|
|||||||
setSliderState();
|
setSliderState();
|
||||||
setStorage();
|
setStorage();
|
||||||
setUpSettings();
|
setUpSettings();
|
||||||
new LanguageUtils(getActivity()).changeFont(getActivity().getLayoutInflater(), sharedPreferenceUtil);
|
new LanguageUtils(getActivity()).changeFont(getActivity().getLayoutInflater(),
|
||||||
|
sharedPreferenceUtil);
|
||||||
}
|
}
|
||||||
|
|
||||||
private void setStorage() {
|
private void setStorage() {
|
||||||
@ -159,11 +160,14 @@ public class KiwixSettingsActivity extends BaseActivity {
|
|||||||
getPreferenceScreen().removePreference(findPreference("pref_storage"));
|
getPreferenceScreen().removePreference(findPreference("pref_storage"));
|
||||||
} else {
|
} else {
|
||||||
if (Environment.isExternalStorageEmulated()) {
|
if (Environment.isExternalStorageEmulated()) {
|
||||||
findPreference(PREF_STORAGE).setTitle(sharedPreferenceUtil.getPrefStorageTitle("Internal"));
|
findPreference(PREF_STORAGE).setTitle(
|
||||||
|
sharedPreferenceUtil.getPrefStorageTitle("Internal"));
|
||||||
} else {
|
} else {
|
||||||
findPreference(PREF_STORAGE).setTitle(sharedPreferenceUtil.getPrefStorageTitle("External"));
|
findPreference(PREF_STORAGE).setTitle(
|
||||||
|
sharedPreferenceUtil.getPrefStorageTitle("External"));
|
||||||
}
|
}
|
||||||
findPreference(PREF_STORAGE).setSummary(LibraryUtils.bytesToHuman(new File(sharedPreferenceUtil.getPrefStorage()).getFreeSpace()));
|
findPreference(PREF_STORAGE).setSummary(LibraryUtils.bytesToHuman(
|
||||||
|
new File(sharedPreferenceUtil.getPrefStorage()).getFreeSpace()));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -204,7 +208,8 @@ public class KiwixSettingsActivity extends BaseActivity {
|
|||||||
String[] entries = new String[code.length];
|
String[] entries = new String[code.length];
|
||||||
for (int index = 0; index < code.length; index++) {
|
for (int index = 0; index < code.length; index++) {
|
||||||
Locale locale = new Locale(code[index]);
|
Locale locale = new Locale(code[index]);
|
||||||
entries[index] = locale.getDisplayLanguage() + " (" + locale.getDisplayLanguage(locale) + ") ";
|
entries[index] =
|
||||||
|
locale.getDisplayLanguage() + " (" + locale.getDisplayLanguage(locale) + ") ";
|
||||||
}
|
}
|
||||||
languagePref.setEntries(entries);
|
languagePref.setEntries(entries);
|
||||||
languagePref.setEntryValues(code);
|
languagePref.setEntryValues(code);
|
||||||
@ -250,7 +255,7 @@ public class KiwixSettingsActivity extends BaseActivity {
|
|||||||
MainActivity.nightMode = sharedPreferenceUtil.nightMode();
|
MainActivity.nightMode = sharedPreferenceUtil.nightMode();
|
||||||
getActivity().finish();
|
getActivity().finish();
|
||||||
startActivity(new Intent(getActivity(), KiwixSettingsActivity.class));
|
startActivity(new Intent(getActivity(), KiwixSettingsActivity.class));
|
||||||
getActivity().overridePendingTransition(R.anim.fade_in,R.anim.fade_out);
|
getActivity().overridePendingTransition(R.anim.fade_in, R.anim.fade_out);
|
||||||
}
|
}
|
||||||
if (key.equals(PREF_WIFI_ONLY)) {
|
if (key.equals(PREF_WIFI_ONLY)) {
|
||||||
MainActivity.wifiOnly = sharedPreferences.getBoolean(PREF_WIFI_ONLY, true);
|
MainActivity.wifiOnly = sharedPreferences.getBoolean(PREF_WIFI_ONLY, true);
|
||||||
@ -260,7 +265,7 @@ public class KiwixSettingsActivity extends BaseActivity {
|
|||||||
MainActivity.nightMode = sharedPreferenceUtil.nightMode();
|
MainActivity.nightMode = sharedPreferenceUtil.nightMode();
|
||||||
getActivity().finish();
|
getActivity().finish();
|
||||||
startActivity(new Intent(getActivity(), KiwixSettingsActivity.class));
|
startActivity(new Intent(getActivity(), KiwixSettingsActivity.class));
|
||||||
getActivity().overridePendingTransition(R.anim.fade_in,R.anim.fade_out);
|
getActivity().overridePendingTransition(R.anim.fade_in, R.anim.fade_out);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -277,7 +282,9 @@ public class KiwixSettingsActivity extends BaseActivity {
|
|||||||
.setPositiveButton(android.R.string.yes, (dialog, which) -> {
|
.setPositiveButton(android.R.string.yes, (dialog, which) -> {
|
||||||
presenter.clearHistory();
|
presenter.clearHistory();
|
||||||
allHistoryCleared = true;
|
allHistoryCleared = true;
|
||||||
Toast.makeText(getActivity(), getResources().getString(R.string.all_history_cleared_toast), Toast.LENGTH_SHORT).show();
|
Toast.makeText(getActivity(),
|
||||||
|
getResources().getString(R.string.all_history_cleared_toast), Toast.LENGTH_SHORT)
|
||||||
|
.show();
|
||||||
})
|
})
|
||||||
.setNegativeButton(android.R.string.no, (dialog, which) -> {
|
.setNegativeButton(android.R.string.no, (dialog, which) -> {
|
||||||
// do nothing
|
// do nothing
|
||||||
@ -287,7 +294,8 @@ public class KiwixSettingsActivity extends BaseActivity {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public void openCredits() {
|
public void openCredits() {
|
||||||
WebView view = (WebView) LayoutInflater.from(getActivity()).inflate(R.layout.credits_webview, null);
|
WebView view =
|
||||||
|
(WebView) LayoutInflater.from(getActivity()).inflate(R.layout.credits_webview, null);
|
||||||
view.loadUrl("file:///android_asset/credits.html");
|
view.loadUrl("file:///android_asset/credits.html");
|
||||||
if (sharedPreferenceUtil.nightMode()) {
|
if (sharedPreferenceUtil.nightMode()) {
|
||||||
view.getSettings().setJavaScriptEnabled(true);
|
view.getSettings().setJavaScriptEnabled(true);
|
||||||
@ -302,14 +310,17 @@ public class KiwixSettingsActivity extends BaseActivity {
|
|||||||
@Override
|
@Override
|
||||||
public boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen,
|
public boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen,
|
||||||
Preference preference) {
|
Preference preference) {
|
||||||
if (preference.getKey().equalsIgnoreCase(PREF_CLEAR_ALL_HISTORY))
|
if (preference.getKey().equalsIgnoreCase(PREF_CLEAR_ALL_HISTORY)) {
|
||||||
clearAllHistoryDialog();
|
clearAllHistoryDialog();
|
||||||
|
}
|
||||||
|
|
||||||
if (preference.getKey().equalsIgnoreCase(PREF_CREDITS))
|
if (preference.getKey().equalsIgnoreCase(PREF_CREDITS)) {
|
||||||
openCredits();
|
openCredits();
|
||||||
|
}
|
||||||
|
|
||||||
if (preference.getKey().equalsIgnoreCase(PREF_STORAGE))
|
if (preference.getKey().equalsIgnoreCase(PREF_STORAGE)) {
|
||||||
openFolderSelect();
|
openFolderSelect();
|
||||||
|
}
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
@ -318,8 +329,10 @@ public class KiwixSettingsActivity extends BaseActivity {
|
|||||||
FragmentManager fm = getFragmentManager();
|
FragmentManager fm = getFragmentManager();
|
||||||
StorageSelectDialog dialogFragment = new StorageSelectDialog();
|
StorageSelectDialog dialogFragment = new StorageSelectDialog();
|
||||||
Bundle b = new Bundle();
|
Bundle b = new Bundle();
|
||||||
b.putString(StorageSelectDialog.STORAGE_DIALOG_INTERNAL, getResources().getString(R.string.internal_storage));
|
b.putString(StorageSelectDialog.STORAGE_DIALOG_INTERNAL,
|
||||||
b.putString(StorageSelectDialog.STORAGE_DIALOG_EXTERNAL, getResources().getString(R.string.external_storage));
|
getResources().getString(R.string.internal_storage));
|
||||||
|
b.putString(StorageSelectDialog.STORAGE_DIALOG_EXTERNAL,
|
||||||
|
getResources().getString(R.string.external_storage));
|
||||||
b.putInt(StorageSelectDialog.STORAGE_DIALOG_THEME, StyleUtils.dialogStyle());
|
b.putInt(StorageSelectDialog.STORAGE_DIALOG_THEME, StyleUtils.dialogStyle());
|
||||||
dialogFragment.setArguments(b);
|
dialogFragment.setArguments(b);
|
||||||
dialogFragment.setOnSelectListener(this);
|
dialogFragment.setOnSelectListener(this);
|
||||||
@ -332,10 +345,12 @@ public class KiwixSettingsActivity extends BaseActivity {
|
|||||||
sharedPreferenceUtil.putPrefStorage(storageDevice.getName());
|
sharedPreferenceUtil.putPrefStorage(storageDevice.getName());
|
||||||
if (storageDevice.isInternal()) {
|
if (storageDevice.isInternal()) {
|
||||||
findPreference(PREF_STORAGE).setTitle(getResources().getString(R.string.internal_storage));
|
findPreference(PREF_STORAGE).setTitle(getResources().getString(R.string.internal_storage));
|
||||||
sharedPreferenceUtil.putPrefStorageTitle(getResources().getString(R.string.internal_storage));
|
sharedPreferenceUtil.putPrefStorageTitle(
|
||||||
|
getResources().getString(R.string.internal_storage));
|
||||||
} else {
|
} else {
|
||||||
findPreference(PREF_STORAGE).setTitle(getResources().getString(R.string.external_storage));
|
findPreference(PREF_STORAGE).setTitle(getResources().getString(R.string.external_storage));
|
||||||
sharedPreferenceUtil.putPrefStorageTitle(getResources().getString(R.string.external_storage));
|
sharedPreferenceUtil.putPrefStorageTitle(
|
||||||
|
getResources().getString(R.string.external_storage));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user