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

NearestFavoriteStationWidgetService: Rather than a mysterious app-widget number reveal the station distance.

Browse source
This commit is contained in:
Andreas Schildbach 2020-11-20 23:49:39 +01:00
parent a8cfbbe047
commit fd0d18d599
2 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

3
oeffi/res/layout/station_widget_content.xml
View file

@ -15,7 +15,7 @@
android:paddingRight="@dimen/list_entry_padding_horizontal" > android:paddingRight="@dimen/list_entry_padding_horizontal" >
<TextView <TextView
android:id="@+id/station_widget_number" android:id="@+id/station_widget_distance"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentLeft="true" android:layout_alignParentLeft="true"
@ -30,6 +30,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_margin="2dp" android:layout_margin="2dp"
android:layout_weight="1" android:layout_weight="1"
android:gravity="center_horizontal"
android:ellipsize="middle" android:ellipsize="middle"
android:singleLine="true" android:singleLine="true"
android:textColor="#fff" android:textColor="#fff"

12
oeffi/src/de/schildbach/oeffi/stations/NearestFavoriteStationWidgetService.java
View file

@ -38,6 +38,7 @@ import com.google.common.util.concurrent.SettableFuture;
import de.schildbach.oeffi.Constants; import de.schildbach.oeffi.Constants;
import de.schildbach.oeffi.R; import de.schildbach.oeffi.R;
import de.schildbach.oeffi.network.NetworkProviderFactory; import de.schildbach.oeffi.network.NetworkProviderFactory;
import de.schildbach.oeffi.util.Formats;
import de.schildbach.oeffi.util.Objects; import de.schildbach.oeffi.util.Objects;
import de.schildbach.pte.NetworkId; import de.schildbach.pte.NetworkId;
import de.schildbach.pte.NetworkProvider; import de.schildbach.pte.NetworkProvider;
@ -265,16 +266,15 @@ public class NearestFavoriteStationWidgetService extends JobIntentService {
views.setViewVisibility(R.id.station_widget_message, View.GONE); views.setViewVisibility(R.id.station_widget_message, View.GONE);
if (numFavorites > 0) { if (numFavorites > 0) {
views.setTextViewText(R.id.station_widget_number, (i + 1) + "/" + appWidgetIds.length); final Favorite favorite = favorites.get(i % numFavorites);
views.setViewVisibility(R.id.station_widget_number, log.debug("Favorite: {}", favorite);
appWidgetIds.length != 1 ? View.VISIBLE : View.GONE);
views.setTextViewText(R.id.station_widget_distance, Formats.formatDistance(favorite.distance));
views.setViewVisibility(R.id.station_widget_distance, View.VISIBLE);
setHeader(appWidgetId, getString(R.string.nearest_favorite_station_widget_loading)); setHeader(appWidgetId, getString(R.string.nearest_favorite_station_widget_loading));
appWidgetManager.updateAppWidget(appWidgetId, views); appWidgetManager.updateAppWidget(appWidgetId, views);
final Favorite favorite = favorites.get(i % numFavorites);
log.debug("Favorite: {}", favorite);
final NetworkProvider networkProvider = NetworkProviderFactory.provider(favorite.networkId); final NetworkProvider networkProvider = NetworkProviderFactory.provider(favorite.networkId);
final String stationId = favorite.id; final String stationId = favorite.id;