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

StationViewHolder: Rewrite some hardcoded colors.

Browse source
This commit is contained in:
Andreas Schildbach 2021-01-12 22:13:22 +01:00
parent 1eadbab5ce
commit 22f7ba44a6
1 changed files with 14 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

24
oeffi/src/de/schildbach/oeffi/stations/list/StationViewHolder.java
View file

@ -83,7 +83,7 @@ public class StationViewHolder extends RecyclerView.ViewHolder {
private final LayoutInflater inflater; private final LayoutInflater inflater;
private final Display display; private final Display display;
private final int colorArrow; private final int colorArrow;
private final int colorSignificant, colorLessSignificant, colorInsignificant; private final int colorSignificant, colorLessSignificant, colorInsignificant, colorHighlighted;
private final int listEntryVerticalPadding; private final int listEntryVerticalPadding;
private static final int CONDENSE_LINES_THRESHOLD = 5; private static final int CONDENSE_LINES_THRESHOLD = 5;
@ -116,6 +116,7 @@ public class StationViewHolder extends RecyclerView.ViewHolder {
this.colorSignificant = res.getColor(R.color.fg_significant); this.colorSignificant = res.getColor(R.color.fg_significant);
this.colorLessSignificant = res.getColor(R.color.fg_less_significant); this.colorLessSignificant = res.getColor(R.color.fg_less_significant);
this.colorInsignificant = res.getColor(R.color.fg_insignificant); this.colorInsignificant = res.getColor(R.color.fg_insignificant);
this.colorHighlighted = res.getColor(R.color.fg_highlighted);
this.listEntryVerticalPadding = res.getDimensionPixelOffset(R.dimen.list_entry_padding_vertical); this.listEntryVerticalPadding = res.getDimensionPixelOffset(R.dimen.list_entry_padding_vertical);
} }
@ -130,7 +131,9 @@ public class StationViewHolder extends RecyclerView.ViewHolder {
final boolean isIgnored = favState != null && favState == FavoriteStationsProvider.TYPE_IGNORE; final boolean isIgnored = favState != null && favState == FavoriteStationsProvider.TYPE_IGNORE;
final boolean isGhosted = isIgnored || queryNotOk; final boolean isGhosted = isIgnored || queryNotOk;
final int color = !isGhosted ? colorSignificant : colorInsignificant; final int colorSignificant = !isGhosted ? this.colorSignificant : colorInsignificant;
final int colorLessSignificant = !isGhosted ? this.colorLessSignificant : colorInsignificant;
final int colorHighlighted = !isGhosted ? this.colorHighlighted : colorInsignificant;
// favorite // favorite
favoriteView.setVisibility(isFavorite ? View.VISIBLE : View.GONE); favoriteView.setVisibility(isFavorite ? View.VISIBLE : View.GONE);
@ -139,10 +142,10 @@ public class StationViewHolder extends RecyclerView.ViewHolder {
final boolean showPlace = forceShowPlace || itemView.isActivated(); final boolean showPlace = forceShowPlace || itemView.isActivated();
nameView.setText(showPlace ? station.location.place : station.location.uniqueShortName()); nameView.setText(showPlace ? station.location.place : station.location.uniqueShortName());
nameView.setTypeface(showPlace ? Typeface.DEFAULT : Typeface.DEFAULT_BOLD); nameView.setTypeface(showPlace ? Typeface.DEFAULT : Typeface.DEFAULT_BOLD);
nameView.setTextColor(color); nameView.setTextColor(colorSignificant);
name2View.setVisibility(showPlace ? View.VISIBLE : View.GONE); name2View.setVisibility(showPlace ? View.VISIBLE : View.GONE);
name2View.setText(station.location.name); name2View.setText(station.location.name);
name2View.setTextColor(color); name2View.setTextColor(colorSignificant);
// lines // lines
final Set<Line> lines = new TreeSet<>(); final Set<Line> lines = new TreeSet<>();
@ -165,7 +168,7 @@ public class StationViewHolder extends RecyclerView.ViewHolder {
// distance // distance
distanceView.setText(station.hasDistanceAndBearing ? Formats.formatDistance(station.distance) : null); distanceView.setText(station.hasDistanceAndBearing ? Formats.formatDistance(station.distance) : null);
distanceView.setVisibility(station.hasDistanceAndBearing ? View.VISIBLE : View.GONE); distanceView.setVisibility(station.hasDistanceAndBearing ? View.VISIBLE : View.GONE);
distanceView.setTextColor(color); distanceView.setTextColor(colorSignificant);
// bearing // bearing
if (deviceLocation != null && station.hasDistanceAndBearing) { if (deviceLocation != null && station.hasDistanceAndBearing) {
@ -271,7 +274,7 @@ public class StationViewHolder extends RecyclerView.ViewHolder {
} else { } else {
destinationView.setText(null); destinationView.setText(null);
} }
destinationView.setTextColor(color); destinationView.setTextColor(colorSignificant);
} else if (iDeparture == 1 && interval > 0) { } else if (iDeparture == 1 && interval > 0) {
lineView.setVisibility(View.INVISIBLE); lineView.setVisibility(View.INVISIBLE);
lineView.setLine(lineDestination.line); // Padding only lineView.setLine(lineDestination.line); // Padding only
@ -307,7 +310,7 @@ public class StationViewHolder extends RecyclerView.ViewHolder {
} }
messageIndexView.setText(indexText); messageIndexView.setText(indexText);
messageIndexView.setBackgroundColor(isGhosted ? color : MESSAGE_INDEX_COLOR); messageIndexView.setBackgroundColor(isGhosted ? colorSignificant : MESSAGE_INDEX_COLOR);
} else { } else {
messageIndexView.setVisibility(View.GONE); messageIndexView.setVisibility(View.GONE);
} }
@ -330,7 +333,7 @@ public class StationViewHolder extends RecyclerView.ViewHolder {
final Date updatedAt = station.updatedAt; final Date updatedAt = station.updatedAt;
final boolean isStale = updatedAt != null final boolean isStale = updatedAt != null
&& System.currentTimeMillis() - updatedAt.getTime() > Constants.STALE_UPDATE_MS; && System.currentTimeMillis() - updatedAt.getTime() > Constants.STALE_UPDATE_MS;
timeView.setTextColor(isStale ? Color.LTGRAY : color); timeView.setTextColor(isStale ? colorLessSignificant : colorSignificant);
// delay // delay
final TextView delayView = departureViewHolder.delay; final TextView delayView = departureViewHolder.delay;
@ -339,7 +342,8 @@ public class StationViewHolder extends RecyclerView.ViewHolder {
final long delayMins = delay / DateUtils.MINUTE_IN_MILLIS; final long delayMins = delay / DateUtils.MINUTE_IN_MILLIS;
delayView.setText(delayMins != 0 ? String.format("(%+d)", delayMins) + ' ' : ""); delayView.setText(delayMins != 0 ? String.format("(%+d)", delayMins) + ' ' : "");
delayView.setTypeface(Typeface.DEFAULT, isPredicted ? Typeface.ITALIC : Typeface.NORMAL); delayView.setTypeface(Typeface.DEFAULT, isPredicted ? Typeface.ITALIC : Typeface.NORMAL);
delayView.setTextColor(isStale ? Color.LTGRAY : (isGhosted ? color : Color.RED)); delayView.setTextColor(isStale ? colorLessSignificant : (isGhosted ? colorSignificant :
colorHighlighted));
if (++iDeparture == maxDeparturesPerGroup) if (++iDeparture == maxDeparturesPerGroup)
break; break;
@ -376,7 +380,7 @@ public class StationViewHolder extends RecyclerView.ViewHolder {
final TextView messageView = (TextView) inflater.inflate(R.layout.stations_station_entry_message, final TextView messageView = (TextView) inflater.inflate(R.layout.stations_station_entry_message,
messagesViewGroup, false); messagesViewGroup, false);
messageView.setText(index + ". " + message); messageView.setText(index + ". " + message);
messageView.setTextColor(color); messageView.setTextColor(colorSignificant);
messagesViewGroup.addView(messageView); messagesViewGroup.addView(messageView);
} }
} else { } else {