Mastodon
/
fedilab-Android-App
mirror of https://codeberg.org/tom79/Fedilab
1
0
Fork 0
Code Issues Releases Wiki Activity

Prepares release 1.3.0

This commit is contained in:
tom79 2017-07-10 19:20:27 +02:00
parent 76c832ede9
commit 5f9ecbadfb
6 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/build.gradle
View File

@ -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 {

BIN
app/mastodon-etalab-v1.3.0.apk Normal file
View File

Binary file not shown.

20
app/src/main/java/fr/gouv/etalab/mastodon/fragments/SettingsNotificationsFragment.java
View File

@ -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();
}
});

3
app/src/main/java/fr/gouv/etalab/mastodon/jobs/HomeTimelineSyncJob.java
View File

@ -188,12 +188,9 @@ public class HomeTimelineSyncJob extends Job implements OnRetrieveHomeTimelineSe
R.drawable.mastodonlogo), finalTitle, finalMessage);
}});
}
}
}
}

2
app/src/main/res/values-fr/strings.xml
View File

@ -248,6 +248,8 @@
<string name="note_no_space">Vous avez atteint les 160 caractères autorisés !</string>
<string name="username_no_space">Vous avez atteint les 30 caractères autorisés !</string>
<string name="settings_title_hour">Plage horaire pour les notifications :</string>
<string name="settings_hour_init">Heure de début</string>
<string name="settings_hour_end">Heure de fin</string>
<string name="settings_time_from">Entre</string>
<string name="settings_time_to">et</string>
<string name="settings_time_greater">L\'horaire doit être plus grand que %1$s</string>

2
app/src/main/res/values/strings.xml
View File

@ -256,6 +256,8 @@
<string name="settings_time_to">and</string>
<string name="settings_time_greater">The time must be greater than %1$s</string>
<string name="settings_time_lower">The time must be lower than %1$s</string>
<string name="settings_hour_init">Start time</string>
<string name="settings_hour_end">End time</string>
<string name="embedded_browser">Use the built-in browser</string>
<string name="use_javascript">Enable Javascript</string>
<string name="use_cookies">Allow third-party cookies</string>