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

TripDetailsActivity: Always show schedule action button, because resolveActivity() doesn't work any more.

Browse source
This commit is contained in:
Andreas Schildbach 2021-02-08 12:29:58 +01:00
parent ec77317912
commit 79a74cd485
3 changed files with 11 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -254,6 +254,7 @@
<!-- directions trip details options --> <!-- directions trip details options -->
<string name="directions_trip_details_action_calendar_title">Zum Kalender hinzufügen</string> <string name="directions_trip_details_action_calendar_title">Zum Kalender hinzufügen</string>
<string name="directions_trip_details_action_calendar_notfound">Es ist keine Kalender-App installiert</string>
<string name="directions_trip_details_action_track_title">Ortung</string> <string name="directions_trip_details_action_track_title">Ortung</string>
<string name="directions_trip_details_action_share_title">Weiterleiten…</string> <string name="directions_trip_details_action_share_title">Weiterleiten…</string>
<string name="directions_trip_details_action_share_short_title">Kurznachricht weiterleiten…</string> <string name="directions_trip_details_action_share_short_title">Kurznachricht weiterleiten…</string>

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

@ -255,6 +255,7 @@
<!-- directions trip details options --> <!-- directions trip details options -->
<string name="directions_trip_details_action_calendar_title">Add to calendar</string> <string name="directions_trip_details_action_calendar_title">Add to calendar</string>
<string name="directions_trip_details_action_calendar_notfound">There is no calendar app installed</string>
<string name="directions_trip_details_action_track_title">Location tracking</string> <string name="directions_trip_details_action_track_title">Location tracking</string>
<string name="directions_trip_details_action_share_title">Share…</string> <string name="directions_trip_details_action_share_title">Share…</string>
<string name="directions_trip_details_action_share_short_title">Share short message…</string> <string name="directions_trip_details_action_share_short_title">Share short message…</string>

13
oeffi/src/de/schildbach/oeffi/directions/TripDetailsActivity.java
View file

@ -18,6 +18,7 @@
package de.schildbach.oeffi.directions; package de.schildbach.oeffi.directions;
import android.Manifest; import android.Manifest;
import android.content.ActivityNotFoundException;
import android.content.BroadcastReceiver; import android.content.BroadcastReceiver;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
@ -257,10 +258,14 @@ public class TripDetailsActivity extends OeffiActivity implements LocationListen
}); });
popupMenu.show(); popupMenu.show();
}); });
if (getPackageManager().resolveActivity(scheduleTripIntent, 0) != null) { actionBar.addButton(R.drawable.ic_today_white_24dp, R.string.directions_trip_details_action_calendar_title)
actionBar.addButton(R.drawable.ic_today_white_24dp, R.string.directions_trip_details_action_calendar_title) .setOnClickListener(v -> {
.setOnClickListener(v -> startActivity(scheduleTripIntent)); try {
} startActivity(scheduleTripIntent);
} catch (final ActivityNotFoundException x) {
new Toast(this).longToast(R.string.directions_trip_details_action_calendar_notfound);
}
});
legsGroup = findViewById(R.id.directions_trip_details_legs_group); legsGroup = findViewById(R.id.directions_trip_details_legs_group);