diff --git a/oeffi/res/layout/directions_content.xml b/oeffi/res/layout/directions_content.xml
index 73741ed..c50aaa1 100644
--- a/oeffi/res/layout/directions_content.xml
+++ b/oeffi/res/layout/directions_content.xml
@@ -26,7 +26,7 @@
android:id="@+id/directions_connectivity_warning_box"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:background="@color/action_bar_appendix"
+ android:background="@color/bg_action_bar_appendix"
android:drawableLeft="@drawable/ic_portable_wifi_off_grey600_24dp"
android:gravity="center"
android:paddingBottom="@dimen/list_entry_padding_vertical"
diff --git a/oeffi/res/layout/directions_trip_details_public_entry.xml b/oeffi/res/layout/directions_trip_details_public_entry.xml
index e7ce35f..2f24f57 100644
--- a/oeffi/res/layout/directions_trip_details_public_entry.xml
+++ b/oeffi/res/layout/directions_trip_details_public_entry.xml
@@ -42,7 +42,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:drawablePadding="@dimen/list_entry_padding_horizontal"
- android:textColor="@color/text"
+ android:textColor="@color/fg_significant"
android:textSize="@dimen/font_size_large" />
diff --git a/oeffi/res/layout/directions_trip_details_public_entry_collapsed.xml b/oeffi/res/layout/directions_trip_details_public_entry_collapsed.xml
index 3f8f717..5f02169 100644
--- a/oeffi/res/layout/directions_trip_details_public_entry_collapsed.xml
+++ b/oeffi/res/layout/directions_trip_details_public_entry_collapsed.xml
@@ -19,7 +19,7 @@
diff --git a/oeffi/res/layout/directions_trip_details_public_entry_stop.xml b/oeffi/res/layout/directions_trip_details_public_entry_stop.xml
index 48471e8..b8ca61f 100644
--- a/oeffi/res/layout/directions_trip_details_public_entry_stop.xml
+++ b/oeffi/res/layout/directions_trip_details_public_entry_stop.xml
@@ -12,19 +12,19 @@
android:layout_marginLeft="@dimen/list_entry_padding_horizontal_cram"
android:layout_marginRight="@dimen/list_entry_padding_horizontal_cram"
android:maxWidth="128dp"
- android:textColor="@color/text"
+ android:textColor="@color/fg_significant"
android:textSize="@dimen/font_size_large" />
diff --git a/oeffi/res/layout/network_picker_content.xml b/oeffi/res/layout/network_picker_content.xml
index 39d4d56..da55438 100644
--- a/oeffi/res/layout/network_picker_content.xml
+++ b/oeffi/res/layout/network_picker_content.xml
@@ -27,10 +27,10 @@
android:id="@+id/network_picker_firsttime_message"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:background="@color/action_bar_appendix"
+ android:background="@color/bg_action_bar_appendix"
android:padding="@dimen/list_entry_padding_horizontal_lax"
android:text="@string/network_picker_firsttime_message"
- android:textColor="@color/text"
+ android:textColor="@color/fg_significant"
android:textSize="@dimen/font_size_large"
android:textStyle="normal" />
diff --git a/oeffi/res/layout/plans_content.xml b/oeffi/res/layout/plans_content.xml
index d6a114b..d60850f 100644
--- a/oeffi/res/layout/plans_content.xml
+++ b/oeffi/res/layout/plans_content.xml
@@ -23,7 +23,7 @@
android:layout_height="wrap_content"
android:paddingTop="8dp"
android:text="@string/plan_progress_loading"
- android:textColor="@color/text.dark"
+ android:textColor="@color/fg_significant_on_dark"
android:textStyle="bold" />
@@ -54,7 +54,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:maxWidth="196dp"
- android:textColor="@color/text"
+ android:textColor="@color/fg_significant"
android:textStyle="bold" />
diff --git a/oeffi/res/layout/plans_picker_content.xml b/oeffi/res/layout/plans_picker_content.xml
index 9aaba7f..d463421 100644
--- a/oeffi/res/layout/plans_picker_content.xml
+++ b/oeffi/res/layout/plans_picker_content.xml
@@ -21,7 +21,7 @@
android:id="@+id/plans_picker_connectivity_warning_box"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:background="@color/action_bar_appendix"
+ android:background="@color/bg_action_bar_appendix"
android:drawableLeft="@drawable/ic_portable_wifi_off_grey600_24dp"
android:gravity="center"
android:paddingBottom="@dimen/list_entry_padding_vertical"
@@ -35,7 +35,7 @@
android:id="@+id/plans_picker_filter_box"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:background="@color/action_bar_appendix"
+ android:background="@color/bg_action_bar_appendix"
android:gravity="center_vertical"
android:orientation="horizontal"
android:visibility="gone" >
diff --git a/oeffi/res/layout/stations_content.xml b/oeffi/res/layout/stations_content.xml
index d463666..5db50af 100644
--- a/oeffi/res/layout/stations_content.xml
+++ b/oeffi/res/layout/stations_content.xml
@@ -35,7 +35,7 @@
android:id="@+id/stations_connectivity_warning_box"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:background="@color/action_bar_appendix"
+ android:background="@color/bg_action_bar_appendix"
android:drawableLeft="@drawable/ic_portable_wifi_off_grey600_24dp"
android:gravity="center"
android:paddingBottom="@dimen/list_entry_padding_vertical"
@@ -49,7 +49,7 @@
android:id="@+id/stations_search_box"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:background="@color/action_bar_appendix"
+ android:background="@color/bg_action_bar_appendix"
android:gravity="center_vertical"
android:orientation="horizontal"
android:visibility="gone" >
@@ -81,7 +81,7 @@
android:id="@+id/stations_location_box"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:background="@color/action_bar_appendix"
+ android:background="@color/bg_action_bar_appendix"
android:gravity="center_vertical"
android:orientation="horizontal"
android:visibility="gone" >
diff --git a/oeffi/res/layout/stations_filter_popup_content.xml b/oeffi/res/layout/stations_filter_popup_content.xml
index 906eb83..0e668ac 100644
--- a/oeffi/res/layout/stations_filter_popup_content.xml
+++ b/oeffi/res/layout/stations_filter_popup_content.xml
@@ -15,7 +15,7 @@
android:padding="@dimen/dialog_padding"
android:tag="I"
android:text="@string/product_i"
- android:textColor="@color/text"
+ android:textColor="@color/fg_significant"
android:textSize="@dimen/font_size_large" />
@@ -42,7 +42,7 @@
android:padding="@dimen/dialog_padding"
android:tag="R"
android:text="@string/product_r"
- android:textColor="@color/text"
+ android:textColor="@color/fg_significant"
android:textSize="@dimen/font_size_large" />
@@ -69,7 +69,7 @@
android:padding="@dimen/dialog_padding"
android:tag="S"
android:text="@string/product_s"
- android:textColor="@color/text"
+ android:textColor="@color/fg_significant"
android:textSize="@dimen/font_size_large" />
@@ -96,7 +96,7 @@
android:padding="@dimen/dialog_padding"
android:tag="U"
android:text="@string/product_u"
- android:textColor="@color/text"
+ android:textColor="@color/fg_significant"
android:textSize="@dimen/font_size_large" />
@@ -123,7 +123,7 @@
android:padding="@dimen/dialog_padding"
android:tag="T"
android:text="@string/product_t"
- android:textColor="@color/text"
+ android:textColor="@color/fg_significant"
android:textSize="@dimen/font_size_large" />
diff --git a/oeffi/res/layout/stations_station_details_header.xml b/oeffi/res/layout/stations_station_details_header.xml
index 0d97e9f..e50e53b 100644
--- a/oeffi/res/layout/stations_station_details_header.xml
+++ b/oeffi/res/layout/stations_station_details_header.xml
@@ -35,7 +35,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingLeft="@dimen/list_entry_padding_horizontal"
- android:textColor="@color/text_less_significant" />
+ android:textColor="@color/fg_less_significant" />
diff --git a/oeffi/res/layout/stations_station_details_header_line.xml b/oeffi/res/layout/stations_station_details_header_line.xml
index d09a5d7..dea9ca7 100644
--- a/oeffi/res/layout/stations_station_details_header_line.xml
+++ b/oeffi/res/layout/stations_station_details_header_line.xml
@@ -20,7 +20,7 @@
android:layout_weight="1"
android:ellipsize="middle"
android:singleLine="true"
- android:textColor="@color/text"
+ android:textColor="@color/fg_significant"
android:textSize="@dimen/font_size_small" />
diff --git a/oeffi/res/layout/stations_station_entry.xml b/oeffi/res/layout/stations_station_entry.xml
index cd7c10c..e69736c 100644
--- a/oeffi/res/layout/stations_station_entry.xml
+++ b/oeffi/res/layout/stations_station_entry.xml
@@ -99,7 +99,7 @@
android:layout_height="wrap_content"
android:paddingBottom="@dimen/list_entry_padding_vertical_cram"
android:paddingTop="@dimen/list_entry_padding_vertical_cram"
- android:textColor="@color/text_ghosted"
+ android:textColor="@color/fg_insignificant"
android:textStyle="bold" />
@@ -61,7 +61,7 @@
diff --git a/oeffi/res/values/colors.xml b/oeffi/res/values/colors.xml
index 7772a4d..ffe4bf5 100644
--- a/oeffi/res/values/colors.xml
+++ b/oeffi/res/values/colors.xml
@@ -1,17 +1,21 @@
- #000000
- #ffffff
- #999999
- #bbbbbb
- #dd9055
#757575
- #aa0000
- #555555
- #777700
- #227722
- #114411
- #cccccc
+
+
+ #000000
+ #999999
+ #bbbbbb
+ #dd9055
+ #aa0000
+ #ffffff
+
+
+ #555555
+ #777700
+ #227722
+ #114411
+ #cccccc
diff --git a/oeffi/res/values/styles.xml b/oeffi/res/values/styles.xml
index c3b20e7..b180a26 100644
--- a/oeffi/res/values/styles.xml
+++ b/oeffi/res/values/styles.xml
@@ -36,12 +36,12 @@
@@ -79,7 +79,7 @@
diff --git a/oeffi/src/de/schildbach/oeffi/directions/DirectionsActivity.java b/oeffi/src/de/schildbach/oeffi/directions/DirectionsActivity.java
index 3248d1c..8b2cb50 100644
--- a/oeffi/src/de/schildbach/oeffi/directions/DirectionsActivity.java
+++ b/oeffi/src/de/schildbach/oeffi/directions/DirectionsActivity.java
@@ -269,7 +269,7 @@ public class DirectionsActivity extends OeffiMainActivity implements ActivityCom
setContentView(R.layout.directions_content);
final MyActionBar actionBar = getMyActionBar();
- setPrimaryColor(R.color.action_bar_background_directions);
+ setPrimaryColor(R.color.bg_action_bar_directions);
actionBar.setPrimaryTitle(R.string.directions_activity_title);
actionBar.setTitlesOnClickListener(v -> NetworkPickerActivity.start(DirectionsActivity.this));
buttonExpand = actionBar.addToggleButton(R.drawable.ic_expand_white_24dp,
diff --git a/oeffi/src/de/schildbach/oeffi/directions/TripDetailsActivity.java b/oeffi/src/de/schildbach/oeffi/directions/TripDetailsActivity.java
index cb4f69a..fc39c6c 100644
--- a/oeffi/src/de/schildbach/oeffi/directions/TripDetailsActivity.java
+++ b/oeffi/src/de/schildbach/oeffi/directions/TripDetailsActivity.java
@@ -112,9 +112,9 @@ public class TripDetailsActivity extends OeffiActivity implements LocationListen
private LayoutInflater inflater;
private Resources res;
- private int colorText;
- private int colorTextGhosted;
- private int colorTextHighlight;
+ private int colorSignificant;
+ private int colorInsignificant;
+ private int colorHighlighted;
private int colorGrey600;
private DisplayMetrics displayMetrics;
private LocationManager locationManager;
@@ -144,9 +144,9 @@ public class TripDetailsActivity extends OeffiActivity implements LocationListen
inflater = getLayoutInflater();
res = getResources();
- colorText = res.getColor(R.color.text);
- colorTextGhosted = res.getColor(R.color.text_ghosted);
- colorTextHighlight = res.getColor(R.color.text_highlight);
+ colorSignificant = res.getColor(R.color.fg_significant);
+ colorInsignificant = res.getColor(R.color.fg_insignificant);
+ colorHighlighted = res.getColor(R.color.fg_highlighted);
colorGrey600 = res.getColor(R.color.grey600);
displayMetrics = res.getDisplayMetrics();
locationManager = (LocationManager) getSystemService(Context.LOCATION_SERVICE);
@@ -193,7 +193,7 @@ public class TripDetailsActivity extends OeffiActivity implements LocationListen
setContentView(R.layout.directions_trip_details_content);
final MyActionBar actionBar = getMyActionBar();
- setPrimaryColor(R.color.action_bar_background_directions);
+ setPrimaryColor(R.color.bg_action_bar_directions);
actionBar.setPrimaryTitle(getTitle());
actionBar.setBack(v -> finish());
@@ -749,16 +749,16 @@ public class TripDetailsActivity extends OeffiActivity implements LocationListen
stopNameView.setText(stop.location.uniqueShortName());
setStrikeThru(stopNameView, isCancelled);
if (highlightLocation) {
- stopNameView.setTextColor(colorTextHighlight);
+ stopNameView.setTextColor(colorHighlighted);
stopNameView.setTypeface(null, Typeface.BOLD);
} else if (pearlType == PearlView.Type.DEPARTURE || pearlType == PearlView.Type.ARRIVAL) {
- stopNameView.setTextColor(colorText);
+ stopNameView.setTextColor(colorSignificant);
stopNameView.setTypeface(null, Typeface.BOLD);
} else if (pearlType == PearlView.Type.PASSING) {
- stopNameView.setTextColor(colorTextGhosted);
+ stopNameView.setTextColor(colorInsignificant);
stopNameView.setTypeface(null, Typeface.NORMAL);
} else {
- stopNameView.setTextColor(colorText);
+ stopNameView.setTextColor(colorSignificant);
stopNameView.setTypeface(null, Typeface.NORMAL);
}
if (stop.location.hasId())
@@ -788,7 +788,7 @@ public class TripDetailsActivity extends OeffiActivity implements LocationListen
setStrikeThru(stopTimeView, isCancelled);
highlightTime = time.equals(highlightedTime);
}
- final int stopTimeColor = highlightTime ? colorTextHighlight : colorText;
+ final int stopTimeColor = highlightTime ? colorHighlighted : colorSignificant;
stopDateView.setTextColor(stopTimeColor);
stopTimeView.setTextColor(stopTimeColor);
stopDateView.setTypeface(null, (highlightTime ? Typeface.BOLD : 0) + (isTimePredicted ? Typeface.ITALIC : 0));
@@ -839,7 +839,7 @@ public class TripDetailsActivity extends OeffiActivity implements LocationListen
stopNameView.setText(
res.getQuantityString(R.plurals.directions_trip_details_public_entry_collapsed_intermediate_stops,
numIntermediateStops, numIntermediateStops));
- stopNameView.setTextColor(colorTextGhosted);
+ stopNameView.setTextColor(colorInsignificant);
// pearl
final PearlView pearlView = (PearlView) row
diff --git a/oeffi/src/de/schildbach/oeffi/directions/TripsGallery.java b/oeffi/src/de/schildbach/oeffi/directions/TripsGallery.java
index 5ab02a6..d693bec 100644
--- a/oeffi/src/de/schildbach/oeffi/directions/TripsGallery.java
+++ b/oeffi/src/de/schildbach/oeffi/directions/TripsGallery.java
@@ -78,7 +78,7 @@ public class TripsGallery extends Gallery {
final Resources res = getResources();
density = res.getDisplayMetrics().density;
final float strokeWidth = res.getDimension(R.dimen.trips_overview_stroke_width);
- final int textColor = res.getColor(R.color.text_dark);
+ final int colorSignificant = res.getColor(R.color.fg_significant_on_dark);
gridPaint.setColor(Color.GRAY);
gridPaint.setStyle(Paint.Style.STROKE);
@@ -86,7 +86,7 @@ public class TripsGallery extends Gallery {
gridPaint.setPathEffect(new DashPathEffect(new float[] { 4f * density, 4f * density }, 0));
gridPaint.setAntiAlias(false);
- gridLabelPaint.setColor(textColor);
+ gridLabelPaint.setColor(colorSignificant);
gridLabelPaint.setAntiAlias(true);
gridLabelPaint.setTextSize(res.getDimension(R.dimen.font_size_normal));
gridLabelPaint.setTextAlign(Align.CENTER);
diff --git a/oeffi/src/de/schildbach/oeffi/directions/TripsGalleryAdapter.java b/oeffi/src/de/schildbach/oeffi/directions/TripsGalleryAdapter.java
index 104df5c..5fbb146 100644
--- a/oeffi/src/de/schildbach/oeffi/directions/TripsGalleryAdapter.java
+++ b/oeffi/src/de/schildbach/oeffi/directions/TripsGalleryAdapter.java
@@ -88,7 +88,7 @@ public final class TripsGalleryAdapter extends BaseAdapter {
final Resources res = context.getResources();
final float strokeWidth = res.getDimension(R.dimen.trips_overview_entry_box_stroke_width);
- final int textColor = res.getColor(R.color.text_dark);
+ final int colorSignificant = res.getColor(R.color.fg_significant_on_dark);
tripWidth = res.getDimensionPixelSize(R.dimen.trips_overview_entry_width);
@@ -118,7 +118,7 @@ public final class TripsGalleryAdapter extends BaseAdapter {
individualTimePaint.setAntiAlias(true);
individualTimePaint.setTextAlign(Align.CENTER);
- publicTimePaint.setColor(textColor);
+ publicTimePaint.setColor(colorSignificant);
publicTimePaint.setTypeface(Typeface.DEFAULT_BOLD);
publicTimePaint.setTextSize(res.getDimension(R.dimen.font_size_normal));
publicTimePaint.setShadowLayer(1, 0, 0, Color.BLACK);
diff --git a/oeffi/src/de/schildbach/oeffi/directions/TripsOverviewActivity.java b/oeffi/src/de/schildbach/oeffi/directions/TripsOverviewActivity.java
index 82df19e..c462fa6 100644
--- a/oeffi/src/de/schildbach/oeffi/directions/TripsOverviewActivity.java
+++ b/oeffi/src/de/schildbach/oeffi/directions/TripsOverviewActivity.java
@@ -139,7 +139,7 @@ public class TripsOverviewActivity extends OeffiActivity {
setContentView(R.layout.directions_trip_overview_content);
final MyActionBar actionBar = getMyActionBar();
- setPrimaryColor(R.color.action_bar_background_directions_dark);
+ setPrimaryColor(R.color.bg_action_bar_directions_dark);
actionBar.setBack(v -> finish());
actionBar.setCustomTitles(R.layout.directions_trip_overview_custom_title);
actionBar.addProgressButton().setOnClickListener(v -> handler.post(checkMoreRunnable));
diff --git a/oeffi/src/de/schildbach/oeffi/network/NetworkPickerActivity.java b/oeffi/src/de/schildbach/oeffi/network/NetworkPickerActivity.java
index 14bbfae..c90b448 100644
--- a/oeffi/src/de/schildbach/oeffi/network/NetworkPickerActivity.java
+++ b/oeffi/src/de/schildbach/oeffi/network/NetworkPickerActivity.java
@@ -123,7 +123,7 @@ public class NetworkPickerActivity extends Activity implements ActivityCompat.On
setContentView(R.layout.network_picker_content);
actionBar = (MyActionBar) findViewById(R.id.action_bar);
- setPrimaryColor(R.color.action_bar_background);
+ setPrimaryColor(R.color.bg_action_bar);
actionBar.setPrimaryTitle(getTitle());
listView = (RecyclerView) findViewById(android.R.id.list);
diff --git a/oeffi/src/de/schildbach/oeffi/network/list/NetworkViewHolder.java b/oeffi/src/de/schildbach/oeffi/network/list/NetworkViewHolder.java
index 80df5a4..dc4de4b 100644
--- a/oeffi/src/de/schildbach/oeffi/network/list/NetworkViewHolder.java
+++ b/oeffi/src/de/schildbach/oeffi/network/list/NetworkViewHolder.java
@@ -34,8 +34,8 @@ import androidx.recyclerview.widget.RecyclerView;
public class NetworkViewHolder extends RecyclerView.ViewHolder {
private final Context context;
private final Resources res;
- private final int textColor;
- private final int grey600;
+ private final int colorSignificant;
+ private final int colorGrey600;
private final ImageView iconView;
private final TextView labelView;
@@ -51,8 +51,8 @@ public class NetworkViewHolder extends RecyclerView.ViewHolder {
super(itemView);
this.context = context;
this.res = context.getResources();
- this.textColor = res.getColor(R.color.text);
- this.grey600 = res.getColor(R.color.grey600);
+ this.colorSignificant = res.getColor(R.color.fg_significant);
+ this.colorGrey600 = res.getColor(R.color.grey600);
iconView = (ImageView) itemView.findViewById(R.id.network_picker_entry_icon);
labelView = (TextView) itemView.findViewById(R.id.network_picker_entry_label);
@@ -83,7 +83,7 @@ public class NetworkViewHolder extends RecyclerView.ViewHolder {
}
labelView.setText(networkRes.label);
- labelView.setTextColor(isEnabled ? textColor : grey600);
+ labelView.setTextColor(isEnabled ? colorSignificant : colorGrey600);
if (entry.state != null && isEnabled)
stateView.setText(
@@ -92,7 +92,7 @@ public class NetworkViewHolder extends RecyclerView.ViewHolder {
stateView.setText(null);
commentView.setText(networkRes.comment);
- commentView.setTextColor(isEnabled ? textColor : grey600);
+ commentView.setTextColor(isEnabled ? colorSignificant : colorGrey600);
if (dbFileLength > 0) {
usageView.setVisibility(View.VISIBLE);
diff --git a/oeffi/src/de/schildbach/oeffi/plans/PlansPickerActivity.java b/oeffi/src/de/schildbach/oeffi/plans/PlansPickerActivity.java
index cd0b624..8cfb2b7 100644
--- a/oeffi/src/de/schildbach/oeffi/plans/PlansPickerActivity.java
+++ b/oeffi/src/de/schildbach/oeffi/plans/PlansPickerActivity.java
@@ -110,7 +110,7 @@ public class PlansPickerActivity extends OeffiMainActivity implements ActivityCo
setContentView(R.layout.plans_picker_content);
actionBar = getMyActionBar();
- setPrimaryColor(R.color.action_bar_background);
+ setPrimaryColor(R.color.bg_action_bar);
actionBar.setPrimaryTitle(R.string.plans_activity_title);
actionBar.addButton(R.drawable.ic_search_white_24dp, R.string.plans_picker_action_search_title)
.setOnClickListener(v -> onSearchRequested());
diff --git a/oeffi/src/de/schildbach/oeffi/stations/FavoriteStationsActivity.java b/oeffi/src/de/schildbach/oeffi/stations/FavoriteStationsActivity.java
index 7dd66b4..9b17bde 100644
--- a/oeffi/src/de/schildbach/oeffi/stations/FavoriteStationsActivity.java
+++ b/oeffi/src/de/schildbach/oeffi/stations/FavoriteStationsActivity.java
@@ -75,7 +75,7 @@ public class FavoriteStationsActivity extends OeffiActivity
setContentView(R.layout.favorites_content);
final MyActionBar actionBar = getMyActionBar();
- setPrimaryColor(R.color.action_bar_background_stations);
+ setPrimaryColor(R.color.bg_action_bar_stations);
actionBar.setPrimaryTitle(getTitle());
actionBar.setBack(v -> finish());
diff --git a/oeffi/src/de/schildbach/oeffi/stations/LineView.java b/oeffi/src/de/schildbach/oeffi/stations/LineView.java
index 9c29466..cfe5542 100644
--- a/oeffi/src/de/schildbach/oeffi/stations/LineView.java
+++ b/oeffi/src/de/schildbach/oeffi/stations/LineView.java
@@ -63,7 +63,7 @@ public class LineView extends TextView {
private int condenseThreshold = 0;
private final float strokeWidth;
- private final int colorTextGhosted;
+ private final int colorInsignificant;
private static final Style DEFAULT_STYLE = new Style(Shape.ROUNDED, Color.BLACK, Color.WHITE, Color.BLACK);
@@ -84,7 +84,7 @@ public class LineView extends TextView {
final Resources res = getResources();
strokeWidth = res.getDimension(R.dimen.line_style_border_stroke);
- colorTextGhosted = res.getColor(R.color.text_ghosted);
+ colorInsignificant = res.getColor(R.color.fg_insignificant);
}
public void setLine(final Line line) {
@@ -149,7 +149,7 @@ public class LineView extends TextView {
final Style lineStyle = line.style;
final Style style;
if (ghosted)
- style = new Style(lineStyle != null ? lineStyle.shape : DEFAULT_STYLE.shape, colorTextGhosted,
+ style = new Style(lineStyle != null ? lineStyle.shape : DEFAULT_STYLE.shape, colorInsignificant,
DEFAULT_STYLE.foregroundColor, DEFAULT_STYLE.borderColor);
else if (lineStyle != null)
style = lineStyle;
diff --git a/oeffi/src/de/schildbach/oeffi/stations/StationDetailsActivity.java b/oeffi/src/de/schildbach/oeffi/stations/StationDetailsActivity.java
index 01ec76b..a6de8f0 100644
--- a/oeffi/src/de/schildbach/oeffi/stations/StationDetailsActivity.java
+++ b/oeffi/src/de/schildbach/oeffi/stations/StationDetailsActivity.java
@@ -144,7 +144,7 @@ public class StationDetailsActivity extends OeffiActivity implements StationsAwa
setContentView(R.layout.stations_station_details_content);
actionBar = getMyActionBar();
- setPrimaryColor(R.color.action_bar_background_stations);
+ setPrimaryColor(R.color.bg_action_bar_stations);
actionBar.setBack(v -> finish());
actionBar.swapTitles();
actionBar.addProgressButton().setOnClickListener(v -> load());
diff --git a/oeffi/src/de/schildbach/oeffi/stations/StationsActivity.java b/oeffi/src/de/schildbach/oeffi/stations/StationsActivity.java
index 390563f..2fbe36c 100644
--- a/oeffi/src/de/schildbach/oeffi/stations/StationsActivity.java
+++ b/oeffi/src/de/schildbach/oeffi/stations/StationsActivity.java
@@ -187,7 +187,7 @@ public class StationsActivity extends OeffiMainActivity implements StationsAware
setContentView(R.layout.stations_content);
actionBar = getMyActionBar();
- setPrimaryColor(R.color.action_bar_background_stations);
+ setPrimaryColor(R.color.bg_action_bar_stations);
actionBar.setPrimaryTitle(R.string.stations_activity_title);
actionBar.setTitlesOnClickListener(v -> NetworkPickerActivity.start(StationsActivity.this));
actionBar.addProgressButton().setOnClickListener(v -> {
diff --git a/oeffi/src/de/schildbach/oeffi/stations/list/StationViewHolder.java b/oeffi/src/de/schildbach/oeffi/stations/list/StationViewHolder.java
index ba76238..f8105cb 100644
--- a/oeffi/src/de/schildbach/oeffi/stations/list/StationViewHolder.java
+++ b/oeffi/src/de/schildbach/oeffi/stations/list/StationViewHolder.java
@@ -83,7 +83,7 @@ public class StationViewHolder extends RecyclerView.ViewHolder {
private final LayoutInflater inflater;
private final Display display;
private final int colorArrow;
- private final int colorText, colorTextLessSignificant, colorTextGhosted;
+ private final int colorSignificant, colorLessSignificant, colorInsignificant;
private final int listEntryVerticalPadding;
private static final int CONDENSE_LINES_THRESHOLD = 5;
@@ -112,10 +112,10 @@ public class StationViewHolder extends RecyclerView.ViewHolder {
this.inflater = LayoutInflater.from(context);
this.display = ((WindowManager) context.getSystemService(Context.WINDOW_SERVICE)).getDefaultDisplay();
- this.colorArrow = res.getColor(R.color.arrow);
- this.colorText = res.getColor(R.color.text);
- this.colorTextLessSignificant = res.getColor(R.color.text_less_significant);
- this.colorTextGhosted = res.getColor(R.color.text_ghosted);
+ this.colorArrow = res.getColor(R.color.fg_arrow);
+ this.colorSignificant = res.getColor(R.color.fg_significant);
+ this.colorLessSignificant = res.getColor(R.color.fg_less_significant);
+ this.colorInsignificant = res.getColor(R.color.fg_insignificant);
this.listEntryVerticalPadding = res.getDimensionPixelOffset(R.dimen.list_entry_padding_vertical);
}
@@ -130,7 +130,7 @@ public class StationViewHolder extends RecyclerView.ViewHolder {
final boolean isIgnored = favState != null && favState == FavoriteStationsProvider.TYPE_IGNORE;
final boolean isGhosted = isIgnored || queryNotOk;
- final int color = !isGhosted ? colorText : colorTextGhosted;
+ final int color = !isGhosted ? colorSignificant : colorInsignificant;
// favorite
favoriteView.setVisibility(isFavorite ? View.VISIBLE : View.GONE);
@@ -176,7 +176,7 @@ public class StationViewHolder extends RecyclerView.ViewHolder {
bearingView.setStationBearing(null);
bearingView.setCallback(compassCallback);
bearingView.setDisplayRotation(display.getRotation());
- bearingView.setArrowColor(!isGhosted ? colorArrow : colorTextGhosted);
+ bearingView.setArrowColor(!isGhosted ? colorArrow : colorInsignificant);
bearingView.setVisibility(View.VISIBLE);
} else {
bearingView.setVisibility(View.GONE);
@@ -278,7 +278,7 @@ public class StationViewHolder extends RecyclerView.ViewHolder {
destinationView.setVisibility(View.VISIBLE);
destinationView.setText(Constants.DESTINATION_ARROW_INVISIBLE_PREFIX
+ res.getString(R.string.stations_list_entry_interval, interval));
- destinationView.setTextColor(colorTextLessSignificant);
+ destinationView.setTextColor(colorLessSignificant);
} else {
lineView.setVisibility(View.INVISIBLE);
lineView.setLine(lineDestination.line); // Padding only