diff --git a/app/build.gradle b/app/build.gradle index cc7fee4f0..6a93af8ee 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -7,8 +7,8 @@ android { applicationId "fr.gouv.etalab.mastodon" minSdkVersion 15 targetSdkVersion 25 - versionCode 26 - versionName "1.2.9" + versionCode 27 + versionName "1.3.0" } buildTypes { release { diff --git a/app/mastodon-etalab-v1.3.0.apk b/app/mastodon-etalab-v1.3.0.apk new file mode 100644 index 000000000..b0f59bacb Binary files /dev/null and b/app/mastodon-etalab-v1.3.0.apk differ diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/fragments/SettingsNotificationsFragment.java b/app/src/main/java/fr/gouv/etalab/mastodon/fragments/SettingsNotificationsFragment.java index b7f21c46b..3f5583193 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/fragments/SettingsNotificationsFragment.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/fragments/SettingsNotificationsFragment.java @@ -95,7 +95,7 @@ public class SettingsNotificationsFragment extends Fragment { @Override public void onClick(View v) { String[] datetime = time_from.split(":"); - new TimePickerDialog(context, new TimePickerDialog.OnTimeSetListener() { + TimePickerDialog timePickerDialog = new TimePickerDialog(context, new TimePickerDialog.OnTimeSetListener() { @Override public void onTimeSet(TimePicker view, int hourOfDay, int minute) { SharedPreferences.Editor editor = sharedpreferences.edit(); @@ -111,7 +111,9 @@ public class SettingsNotificationsFragment extends Fragment { Toast.makeText(context, context.getString(R.string.settings_time_lower, ateRef), Toast.LENGTH_LONG).show(); } } - }, Integer.valueOf(datetime[0]), Integer.valueOf(datetime[1]), true).show(); + }, Integer.valueOf(datetime[0]), Integer.valueOf(datetime[1]), true); + timePickerDialog.setTitle(context.getString(R.string.settings_hour_init)); + timePickerDialog.show(); } }); @@ -119,23 +121,25 @@ public class SettingsNotificationsFragment extends Fragment { @Override public void onClick(View v) { String[] datetime = time_to.split(":"); - new TimePickerDialog(context, new TimePickerDialog.OnTimeSetListener() { + TimePickerDialog timePickerDialog = new TimePickerDialog(context, new TimePickerDialog.OnTimeSetListener() { @Override public void onTimeSet(TimePicker view, int hourOfDay, int minute) { SharedPreferences.Editor editor = sharedpreferences.edit(); - String hours = (String.valueOf(hourOfDay).length() ==1) ? "0"+String.valueOf(hourOfDay):String.valueOf(hourOfDay); - String minutes = (String.valueOf(minute).length() ==1) ? "0"+String.valueOf(minute):String.valueOf(minute); + String hours = (String.valueOf(hourOfDay).length() == 1) ? "0" + String.valueOf(hourOfDay) : String.valueOf(hourOfDay); + String minutes = (String.valueOf(minute).length() == 1) ? "0" + String.valueOf(minute) : String.valueOf(minute); String newDate = hours + ":" + minutes; - if( compareDate(context, newDate, true) ) { + if (compareDate(context, newDate, true)) { editor.putString(Helper.SET_TIME_TO, newDate); editor.apply(); settings_time_to.setText(newDate); - }else { + } else { String ateRef = sharedpreferences.getString(Helper.SET_TIME_FROM, "07:00"); Toast.makeText(context, context.getString(R.string.settings_time_greater, ateRef), Toast.LENGTH_LONG).show(); } } - }, Integer.valueOf(datetime[0]), Integer.valueOf(datetime[1]), true).show(); + }, Integer.valueOf(datetime[0]), Integer.valueOf(datetime[1]), true); + timePickerDialog.setTitle(context.getString(R.string.settings_hour_end)); + timePickerDialog.show(); } }); diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/jobs/HomeTimelineSyncJob.java b/app/src/main/java/fr/gouv/etalab/mastodon/jobs/HomeTimelineSyncJob.java index 113d2163e..a78b77ba4 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/jobs/HomeTimelineSyncJob.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/jobs/HomeTimelineSyncJob.java @@ -188,12 +188,9 @@ public class HomeTimelineSyncJob extends Job implements OnRetrieveHomeTimelineSe R.drawable.mastodonlogo), finalTitle, finalMessage); }}); - } } } - - } diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 2668ea615..2601bdbd5 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -248,6 +248,8 @@ Vous avez atteint les 160 caractères autorisés ! Vous avez atteint les 30 caractères autorisés ! Plage horaire pour les notifications : + Heure de début + Heure de fin Entre et L\'horaire doit être plus grand que %1$s diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index ce56c73c9..1b34884aa 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -256,6 +256,8 @@ and The time must be greater than %1$s The time must be lower than %1$s + Start time + End time Use the built-in browser Enable Javascript Allow third-party cookies