luckyimnotanigger/Aegis
1
0
Fork 0
mirror of https://github.com/beemdevelopment/Aegis.git synced 2025-05-14 14:02:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Pass current values to Dialog functions instead of reading from prefs

Browse source
This commit is contained in:
Alexander Bakker 2022-04-10 17:48:26 +02:00
parent 927ea50c33
commit 86b86fef10
3 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

8
app/src/main/java/com/beemdevelopment/aegis/ui/dialogs/Dialogs.java
View file

@ -293,12 +293,12 @@ public class Dialogs {
showSecureDialog(dialog); showSecureDialog(dialog);
} }
public static void showNumberPickerDialog(Activity activity, NumberInputListener listener) { public static void showTapToRevealTimeoutPickerDialog(Activity activity, int currentValue, NumberInputListener listener) {
View view = activity.getLayoutInflater().inflate(R.layout.dialog_number_picker, null); View view = activity.getLayoutInflater().inflate(R.layout.dialog_number_picker, null);
NumberPicker numberPicker = view.findViewById(R.id.numberPicker); NumberPicker numberPicker = view.findViewById(R.id.numberPicker);
numberPicker.setMinValue(1); numberPicker.setMinValue(1);
numberPicker.setMaxValue(60); numberPicker.setMaxValue(60);
numberPicker.setValue(new Preferences(activity.getApplicationContext()).getTapToRevealTime()); numberPicker.setValue(currentValue);
numberPicker.setWrapSelectorWheel(true); numberPicker.setWrapSelectorWheel(true);
AlertDialog dialog = new AlertDialog.Builder(activity) AlertDialog dialog = new AlertDialog.Builder(activity)
@ -311,7 +311,7 @@ public class Dialogs {
showSecureDialog(dialog); showSecureDialog(dialog);
} }
public static void showBackupVersionsPickerDialog(Activity activity, NumberInputListener listener) { public static void showBackupVersionsPickerDialog(Activity activity, int currentVersionCount, NumberInputListener listener) {
final int max = 30; final int max = 30;
String[] numbers = new String[max / 5]; String[] numbers = new String[max / 5];
for (int i = 0; i < numbers.length; i++) { for (int i = 0; i < numbers.length; i++) {
@ -323,7 +323,7 @@ public class Dialogs {
numberPicker.setDisplayedValues(numbers); numberPicker.setDisplayedValues(numbers);
numberPicker.setMaxValue(numbers.length - 1); numberPicker.setMaxValue(numbers.length - 1);
numberPicker.setMinValue(0); numberPicker.setMinValue(0);
numberPicker.setValue(new Preferences(activity.getApplicationContext()).getBackupsVersionCount() / 5 - 1); numberPicker.setValue(currentVersionCount / 5 - 1);
numberPicker.setWrapSelectorWheel(false); numberPicker.setWrapSelectorWheel(false);
AlertDialog dialog = new AlertDialog.Builder(activity) AlertDialog dialog = new AlertDialog.Builder(activity)

3
app/src/main/java/com/beemdevelopment/aegis/ui/fragments/preferences/BackupsPreferencesFragment.java
View file

@ -9,6 +9,7 @@ import android.widget.Toast;
import androidx.preference.Preference; import androidx.preference.Preference;
import androidx.preference.SwitchPreferenceCompat; import androidx.preference.SwitchPreferenceCompat;
import com.beemdevelopment.aegis.Preferences;
import com.beemdevelopment.aegis.R; import com.beemdevelopment.aegis.R;
import com.beemdevelopment.aegis.ui.dialogs.Dialogs; import com.beemdevelopment.aegis.ui.dialogs.Dialogs;
import com.beemdevelopment.aegis.vault.VaultRepositoryException; import com.beemdevelopment.aegis.vault.VaultRepositoryException;
@ -72,7 +73,7 @@ public class BackupsPreferencesFragment extends PreferencesFragment {
_backupsVersionsPreference = findPreference("pref_backups_versions"); _backupsVersionsPreference = findPreference("pref_backups_versions");
_backupsVersionsPreference.setSummary(getResources().getQuantityString(R.plurals.pref_backups_versions_summary, _prefs.getBackupsVersionCount(), _prefs.getBackupsVersionCount())); _backupsVersionsPreference.setSummary(getResources().getQuantityString(R.plurals.pref_backups_versions_summary, _prefs.getBackupsVersionCount(), _prefs.getBackupsVersionCount()));
_backupsVersionsPreference.setOnPreferenceClickListener(preference -> { _backupsVersionsPreference.setOnPreferenceClickListener(preference -> {
Dialogs.showBackupVersionsPickerDialog(getActivity(), number -> { Dialogs.showBackupVersionsPickerDialog(getActivity(), _prefs.getBackupsVersionCount(), number -> {
number = number * 5 + 5; number = number * 5 + 5;
_prefs.setBackupsVersionCount(number); _prefs.setBackupsVersionCount(number);
_backupsVersionsPreference.setSummary(getResources().getQuantityString(R.plurals.pref_backups_versions_summary, _prefs.getBackupsVersionCount(), _prefs.getBackupsVersionCount())); _backupsVersionsPreference.setSummary(getResources().getQuantityString(R.plurals.pref_backups_versions_summary, _prefs.getBackupsVersionCount(), _prefs.getBackupsVersionCount()));

2
app/src/main/java/com/beemdevelopment/aegis/ui/fragments/preferences/SecurityPreferencesFragment.java
View file

@ -76,7 +76,7 @@ public class SecurityPreferencesFragment extends PreferencesFragment {
Preference tapToRevealTimePreference = findPreference("pref_tap_to_reveal_time"); Preference tapToRevealTimePreference = findPreference("pref_tap_to_reveal_time");
tapToRevealTimePreference.setSummary(_prefs.getTapToRevealTime() + " seconds"); tapToRevealTimePreference.setSummary(_prefs.getTapToRevealTime() + " seconds");
tapToRevealTimePreference.setOnPreferenceClickListener(preference -> { tapToRevealTimePreference.setOnPreferenceClickListener(preference -> {
Dialogs.showNumberPickerDialog(getActivity(), number -> { Dialogs.showTapToRevealTimeoutPickerDialog(getActivity(), _prefs.getTapToRevealTime(), number -> {
_prefs.setTapToRevealTime(number); _prefs.setTapToRevealTime(number);
tapToRevealTimePreference.setSummary(number + " seconds"); tapToRevealTimePreference.setSummary(number + " seconds");
getResult().putExtra("needsRefresh", true); getResult().putExtra("needsRefresh", true);