From 3e569248a38058ee9e558021f7855b8ce0a60857 Mon Sep 17 00:00:00 2001 From: tom79 Date: Sun, 10 Sep 2017 09:48:05 +0200 Subject: [PATCH] divides confirmations between boosts and favourites - default false for favourites --- .../mastodon/drawers/NotificationsListAdapter.java | 2 +- .../etalab/mastodon/drawers/StatusListAdapter.java | 2 +- .../etalab/mastodon/fragments/SettingsFragment.java | 12 ++++++++++++ .../java/fr/gouv/etalab/mastodon/helper/Helper.java | 1 + .../main/res/layout-sw600dp/fragment_settings.xml | 6 ++++++ app/src/main/res/layout/fragment_settings.xml | 6 ++++++ app/src/main/res/values-de/strings.xml | 1 + app/src/main/res/values-fr/strings.xml | 1 + app/src/main/res/values/strings.xml | 1 + 9 files changed, 30 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/drawers/NotificationsListAdapter.java b/app/src/main/java/fr/gouv/etalab/mastodon/drawers/NotificationsListAdapter.java index b2711436e..7c41982b2 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/drawers/NotificationsListAdapter.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/drawers/NotificationsListAdapter.java @@ -440,7 +440,7 @@ public class NotificationsListAdapter extends BaseAdapter implements OnPostActio @Override public void onClick(View v) { - boolean confirmation = sharedpreferences.getBoolean(Helper.SET_NOTIF_VALIDATION, true); + boolean confirmation = sharedpreferences.getBoolean(Helper.SET_NOTIF_VALIDATION_FAV, false); if( confirmation ) displayConfirmationDialog(FAVOURITE,status); else diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/drawers/StatusListAdapter.java b/app/src/main/java/fr/gouv/etalab/mastodon/drawers/StatusListAdapter.java index 366b02871..b26017dcb 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/drawers/StatusListAdapter.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/drawers/StatusListAdapter.java @@ -759,7 +759,7 @@ public class StatusListAdapter extends BaseAdapter implements OnPostActionInterf @Override public void onClick(View v) { - boolean confirmation = sharedpreferences.getBoolean(Helper.SET_NOTIF_VALIDATION, true); + boolean confirmation = sharedpreferences.getBoolean(Helper.SET_NOTIF_VALIDATION_FAV, false); if( confirmation ) displayConfirmationDialog(FAVOURITE,status); else diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/fragments/SettingsFragment.java b/app/src/main/java/fr/gouv/etalab/mastodon/fragments/SettingsFragment.java index 3f89852e5..95f2e93a5 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/fragments/SettingsFragment.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/fragments/SettingsFragment.java @@ -169,6 +169,18 @@ public class SettingsFragment extends Fragment { } }); + boolean notif_validation_fav = sharedpreferences.getBoolean(Helper.SET_NOTIF_VALIDATION_FAV, false); + final CheckBox set_share_validation_fav = (CheckBox) rootView.findViewById(R.id.set_share_validation_fav); + set_share_validation_fav.setChecked(notif_validation_fav); + + set_share_validation_fav.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + SharedPreferences.Editor editor = sharedpreferences.edit(); + editor.putBoolean(Helper.SET_NOTIF_VALIDATION_FAV, set_share_validation_fav.isChecked()); + editor.apply(); + } + }); boolean display_local = sharedpreferences.getBoolean(Helper.SET_DISPLAY_LOCAL, true); final CheckBox set_display_local = (CheckBox) rootView.findViewById(R.id.set_display_local); diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/helper/Helper.java b/app/src/main/java/fr/gouv/etalab/mastodon/helper/Helper.java index d0ad99410..7f684d329 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/helper/Helper.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/helper/Helper.java @@ -233,6 +233,7 @@ public class Helper { public static final String SET_NOTIF_MENTION = "set_notif_follow_mention"; public static final String SET_NOTIF_SHARE = "set_notif_follow_share"; public static final String SET_NOTIF_VALIDATION = "set_share_validation"; + public static final String SET_NOTIF_VALIDATION_FAV = "set_share_validation_fav"; public static final String SET_WIFI_ONLY = "set_wifi_only"; public static final String SET_NOTIF_HOMETIMELINE = "set_notif_hometimeline"; public static final String SET_NOTIF_SILENT = "set_notif_silent"; diff --git a/app/src/main/res/layout-sw600dp/fragment_settings.xml b/app/src/main/res/layout-sw600dp/fragment_settings.xml index 9fd2b931e..f40c5afca 100644 --- a/app/src/main/res/layout-sw600dp/fragment_settings.xml +++ b/app/src/main/res/layout-sw600dp/fragment_settings.xml @@ -40,6 +40,12 @@ android:text="@string/set_share_validation" android:layout_height="wrap_content" /> + + + + ich erwähnt werde Füge die URL bei Anhängen in toots hinzu Zeige Bestätigungsdialog vor dem Teilen + Zeige Bestätigungsdialog vor dem zu favoriten hinzufügen Erweiterte Einstellungen Nur bei WLAN benachrichtigen Leise Benachrichtigungen diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index a67ff776b..e2c1fc2e4 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -297,6 +297,7 @@ Notifier lorsque quelqu’un ajoute mes pouets à ses favoris Notifier lorsque quelqu’un me mentionne Confirmer avant de partager + Confirmer avant d\'ajouter aux favoris Options avancées Notifier en WIFI seulement Utiliser le vibreur diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 40b9661e1..ede1b727d 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -301,6 +301,7 @@ Notify when someone favourites your status Notify when someone mentions you Show confirmation dialog before boosting + Show confirmation dialog before adding to favourites Advanced settings Notify in WIFI only Silent Notifications