mirrors/oeffi
1
0
Fork 0
mirror of https://gitlab.com/oeffi/oeffi.git synced 2025-07-07 18:38:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

DirectionsActivity: Change wording 'forget history' to 'clear history'.

Browse source
This commit is contained in:
Andreas Schildbach 2018-12-03 23:01:24 +01:00
parent a0b22d5c25
commit 097c8361b9
4 changed files with 17 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

4
oeffi/res/menu/directions_options.xml
View file

@ -2,7 +2,7 @@
<menu xmlns:android="http://schemas.android.com/apk/res/android" >
<item
android:id="@+id/directions_options_remove_history"
android:title="@string/directions_options_remove_history_title"/>
android:id="@+id/directions_options_clear_history"
android:title="@string/directions_options_clear_history_title"/>
</menu>

8
oeffi/res/values-de/strings.xml
View file

@ -169,7 +169,7 @@
<string name="directions_intentfilter_title">Hinfahrt mit öffentlichen Verkehrsmitteln</string>
<!-- directions options -->
<string name="directions_options_remove_history_title">Alle gespeicherten Anfragen vergessen</string>
<string name="directions_options_clear_history_title">Alle gespeicherten Anfragen löschen</string>
<!-- directions query -->
<string name="directions_location_view_coordinate">Koordinate</string>
@ -218,9 +218,9 @@
<!-- query history -->
<string name="directions_query_history_empty">Noch keine gespeicherten Anfragen</string>
<string name="directions_query_history_invalid_blob">Kann diese Fahrt nicht anzeigen, weil sie mit einer früheren Version von Öffi erstellt wurde.</string>
<string name="directions_query_history_forget_confirm_message">Bist du dir sicher, daß du alle gespeicherten Anfragen löschen möchtest?</string>
<string name="directions_query_history_forget_confirm_button_forget">Vergessen</string>
<string name="directions_query_history_forget_confirm_button_dismiss">Schließen</string>
<string name="directions_query_history_clear_confirm_message">Bist du dir sicher, daß du alle gespeicherten Anfragen löschen möchtest?</string>
<string name="directions_query_history_clear_confirm_button_clear">Löschen</string>
<string name="directions_query_history_clear_confirm_button_dismiss">Schließen</string>
<!-- query history context menu -->
<string name="directions_query_history_context_show_trip">Gespeicherte Fahrt anzeigen</string>

8
oeffi/res/values/strings.xml
View file

@ -170,7 +170,7 @@
<string name="directions_intentfilter_title">Journey on Public Transport</string>
<!-- directions options -->
<string name="directions_options_remove_history_title">Remove all saved queries</string>
<string name="directions_options_clear_history_title">Clear all saved queries</string>
<!-- directions query -->
<string name="directions_location_view_coordinate">Coordinate</string>
@ -219,9 +219,9 @@
<!-- query history -->
<string name="directions_query_history_empty">No saved queries yet</string>
<string name="directions_query_history_invalid_blob">Cannot display this trip, as it was created by a previous Offi version.</string>
<string name="directions_query_history_forget_confirm_message">Are you sure you want to forget your saved queries?</string>
<string name="directions_query_history_forget_confirm_button_forget">Forget</string>
<string name="directions_query_history_forget_confirm_button_dismiss">Dismiss</string>
<string name="directions_query_history_clear_confirm_message">Are you sure you want to remove all of your saved queries?</string>
<string name="directions_query_history_clear_confirm_button_clear">Clear</string>
<string name="directions_query_history_clear_confirm_button_dismiss">Dismiss</string>
<!-- query history context menu -->
<string name="directions_query_history_context_show_trip">Show saved trip</string>

14
oeffi/src/de/schildbach/oeffi/directions/DirectionsActivity.java
View file

@ -168,7 +168,7 @@ public class DirectionsActivity extends OeffiMainActivity implements ActivityCom
private BroadcastReceiver connectivityReceiver;
private BroadcastReceiver tickReceiver;
private static final int DIALOG_FORGET_HISTORY = 1;
private static final int DIALOG_CLEAR_HISTORY = 1;
private static final int REQUEST_CODE_LOCATION_PERMISSION_FROM = 1;
private static final int REQUEST_CODE_LOCATION_PERMISSION_VIA = 2;
@ -287,9 +287,9 @@ public class DirectionsActivity extends OeffiMainActivity implements ActivityCom
});
actionBar.overflow(R.menu.directions_options, new PopupMenu.OnMenuItemClickListener() {
public boolean onMenuItemClick(final MenuItem item) {
if (item.getItemId() == R.id.directions_options_remove_history) {
if (item.getItemId() == R.id.directions_options_clear_history) {
if (network != null)
showDialog(DIALOG_FORGET_HISTORY);
showDialog(DIALOG_CLEAR_HISTORY);
return true;
} else {
return false;
@ -1135,16 +1135,16 @@ public class DirectionsActivity extends OeffiMainActivity implements ActivityCom
@Override
protected Dialog onCreateDialog(final int id) {
switch (id) {
case DIALOG_FORGET_HISTORY:
case DIALOG_CLEAR_HISTORY:
final DialogBuilder builder = DialogBuilder.get(this);
builder.setMessage(R.string.directions_query_history_forget_confirm_message);
builder.setPositiveButton(R.string.directions_query_history_forget_confirm_button_forget,
builder.setMessage(R.string.directions_query_history_clear_confirm_message);
builder.setPositiveButton(R.string.directions_query_history_clear_confirm_button_clear,
new Dialog.OnClickListener() {
public void onClick(final DialogInterface dialog, final int which) {
queryHistoryListAdapter.removeAllEntries();
}
});
builder.setNegativeButton(R.string.directions_query_history_forget_confirm_button_dismiss, null);
builder.setNegativeButton(R.string.directions_query_history_clear_confirm_button_dismiss, null);
return builder.create();
}