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

TripsGalleryAdapter: Fix contrast border around lines.

Browse source
This commit is contained in:
Andreas Schildbach 2021-02-05 17:01:36 +01:00
parent 084dc9a12a
commit 6677572cb3
1 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

10
oeffi/src/de/schildbach/oeffi/directions/TripsGalleryAdapter.java
View file

@ -18,6 +18,7 @@
package de.schildbach.oeffi.directions;
import android.content.Context;
import android.content.res.Configuration;
import android.content.res.Resources;
import android.content.res.TypedArray;
import android.graphics.Canvas;
@ -63,6 +64,7 @@ public final class TripsGalleryAdapter extends BaseAdapter {
private long minTime = 0, maxTime = 0;
private final Context context;
private final boolean darkMode;
private static final int VIEW_TYPE_TRIP = 0;
private static final int VIEW_TYPE_CANNOT_SCROLL_EARLIER = 1;
@ -76,6 +78,7 @@ public final class TripsGalleryAdapter extends BaseAdapter {
private final Paint individualTimePaint = new Paint();
private final Paint publicTimePaint = new Paint();
private final Paint cannotScrollPaint = new Paint();
private final int colorSignificantInverse;
private final int colorDelayed;
private static final float ROUNDED_CORNER_RADIUS = 8f;
@ -85,11 +88,13 @@ public final class TripsGalleryAdapter extends BaseAdapter {
public TripsGalleryAdapter(final Context context) {
this.context = context;
final Resources res = context.getResources();
this.darkMode = (res.getConfiguration().uiMode & Configuration.UI_MODE_NIGHT_MASK) == Configuration.UI_MODE_NIGHT_YES;
final float strokeWidth = res.getDimension(R.dimen.trips_overview_entry_box_stroke_width);
final int colorSignificant = res.getColor(R.color.fg_significant);
final int colorLessSignificant = res.getColor(R.color.fg_less_significant);
final int colorIndividual = res.getColor(R.color.bg_individual);
colorSignificantInverse = res.getColor(R.color.fg_significant_inverse);
colorDelayed = res.getColor(R.color.bg_delayed);
tripWidth = res.getDimensionPixelSize(R.dimen.trips_overview_entry_width);
@ -496,8 +501,9 @@ public final class TripsGalleryAdapter extends BaseAdapter {
if (style != null && style.hasBorder()) {
publicStrokePaint.setColor(style.borderColor);
canvas.drawRoundRect(legBox, radius, radius, publicStrokePaint);
} else if (Style.perceivedBrightness(fillColor) < 0.13f) {
publicStrokePaint.setColor(Color.DKGRAY);
} else if (darkMode && Style.perceivedBrightness(fillColor) < 0.15f ||
!darkMode && Style.perceivedBrightness(fillColor) > 0.85f) {
publicStrokePaint.setColor(colorSignificantInverse);
canvas.drawRoundRect(legBox, radius, radius, publicStrokePaint);
}