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

colors.xml: Use more modern color naming scheme.

Browse source
This commit is contained in:
Andreas Schildbach 2021-01-12 22:23:41 +01:00
parent 8fa458f6bc
commit 1eadbab5ce
29 changed files with 98 additions and 94 deletions
Download patch file Download diff file Expand all files Collapse all files

2
oeffi/res/layout/directions_content.xml
View file

@ -26,7 +26,7 @@
android:id="@+id/directions_connectivity_warning_box" android:id="@+id/directions_connectivity_warning_box"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" 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:drawableLeft="@drawable/ic_portable_wifi_off_grey600_24dp"
android:gravity="center" android:gravity="center"
android:paddingBottom="@dimen/list_entry_padding_vertical" android:paddingBottom="@dimen/list_entry_padding_vertical"

6
oeffi/res/layout/directions_trip_details_public_entry.xml
View file

@ -42,7 +42,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:drawablePadding="@dimen/list_entry_padding_horizontal" android:drawablePadding="@dimen/list_entry_padding_horizontal"
android:textColor="@color/text" android:textColor="@color/fg_significant"
android:textSize="@dimen/font_size_large" /> android:textSize="@dimen/font_size_large" />
<TextView <TextView
@ -52,7 +52,7 @@
android:drawableLeft="@drawable/ic_accessible_grey600_18dp" android:drawableLeft="@drawable/ic_accessible_grey600_18dp"
android:drawablePadding="@dimen/list_entry_padding_horizontal" android:drawablePadding="@dimen/list_entry_padding_horizontal"
android:text="@string/directions_trip_details_public_entry_accessibility" android:text="@string/directions_trip_details_public_entry_accessibility"
android:textColor="@color/text_ghosted" android:textColor="@color/fg_insignificant"
android:visibility="gone" /> android:visibility="gone" />
<TextView <TextView
@ -62,7 +62,7 @@
android:drawableLeft="@drawable/ic_directions_bike_grey600_18dp" android:drawableLeft="@drawable/ic_directions_bike_grey600_18dp"
android:drawablePadding="@dimen/list_entry_padding_horizontal" android:drawablePadding="@dimen/list_entry_padding_horizontal"
android:text="@string/directions_trip_details_public_entry_bicycle_carriage" android:text="@string/directions_trip_details_public_entry_bicycle_carriage"
android:textColor="@color/text_ghosted" android:textColor="@color/fg_insignificant"
android:visibility="gone" /> android:visibility="gone" />
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>

2
oeffi/res/layout/directions_trip_details_public_entry_collapsed.xml
View file

@ -19,7 +19,7 @@
<TextView <TextView
android:id="@+id/directions_trip_details_public_entry_collapsed_message" android:id="@+id/directions_trip_details_public_entry_collapsed_message"
android:layout_marginLeft="@dimen/list_entry_padding_horizontal_lax" android:layout_marginLeft="@dimen/list_entry_padding_horizontal_lax"
android:textColor="@color/text" android:textColor="@color/fg_significant"
android:textSize="@dimen/font_size_large" /> android:textSize="@dimen/font_size_large" />
</TableRow> </TableRow>

10
oeffi/res/layout/directions_trip_details_public_entry_stop.xml
View file

@ -12,19 +12,19 @@
android:layout_marginLeft="@dimen/list_entry_padding_horizontal_cram" android:layout_marginLeft="@dimen/list_entry_padding_horizontal_cram"
android:layout_marginRight="@dimen/list_entry_padding_horizontal_cram" android:layout_marginRight="@dimen/list_entry_padding_horizontal_cram"
android:maxWidth="128dp" android:maxWidth="128dp"
android:textColor="@color/text" android:textColor="@color/fg_significant"
android:textSize="@dimen/font_size_large" /> android:textSize="@dimen/font_size_large" />
<TextView <TextView
android:id="@+id/directions_trip_details_public_entry_stop_time" android:id="@+id/directions_trip_details_public_entry_stop_time"
android:layout_marginLeft="@dimen/list_entry_padding_horizontal_cram" android:layout_marginLeft="@dimen/list_entry_padding_horizontal_cram"
android:textColor="@color/text" android:textColor="@color/fg_significant"
android:textSize="@dimen/font_size_large" /> android:textSize="@dimen/font_size_large" />
<TextView <TextView
android:id="@+id/directions_trip_details_public_entry_stop_delay" android:id="@+id/directions_trip_details_public_entry_stop_delay"
android:layout_marginLeft="@dimen/list_entry_padding_horizontal" android:layout_marginLeft="@dimen/list_entry_padding_horizontal"
android:textColor="@color/text" android:textColor="@color/fg_significant"
android:textSize="@dimen/font_size_large" /> android:textSize="@dimen/font_size_large" />
<TextView <TextView
@ -35,14 +35,14 @@
android:includeFontPadding="false" android:includeFontPadding="false"
android:maxWidth="@dimen/position_max_width" android:maxWidth="@dimen/position_max_width"
android:singleLine="true" android:singleLine="true"
android:textColor="@color/text" android:textColor="@color/fg_significant"
android:textSize="@dimen/font_size_large" /> android:textSize="@dimen/font_size_large" />
<TextView <TextView
android:id="@+id/directions_trip_details_public_entry_stop_name" android:id="@+id/directions_trip_details_public_entry_stop_name"
android:layout_marginLeft="@dimen/list_entry_padding_horizontal_lax" android:layout_marginLeft="@dimen/list_entry_padding_horizontal_lax"
android:background="?android:attr/selectableItemBackground" android:background="?android:attr/selectableItemBackground"
android:textColor="@color/text" android:textColor="@color/fg_significant"
android:textSize="@dimen/font_size_large" /> android:textSize="@dimen/font_size_large" />
</TableRow> </TableRow>

4
oeffi/res/layout/network_picker_content.xml
View file

@ -27,10 +27,10 @@
android:id="@+id/network_picker_firsttime_message" android:id="@+id/network_picker_firsttime_message"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" 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:padding="@dimen/list_entry_padding_horizontal_lax"
android:text="@string/network_picker_firsttime_message" android:text="@string/network_picker_firsttime_message"
android:textColor="@color/text" android:textColor="@color/fg_significant"
android:textSize="@dimen/font_size_large" android:textSize="@dimen/font_size_large"
android:textStyle="normal" /> android:textStyle="normal" />

6
oeffi/res/layout/plans_content.xml
View file

@ -23,7 +23,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingTop="8dp" android:paddingTop="8dp"
android:text="@string/plan_progress_loading" android:text="@string/plan_progress_loading"
android:textColor="@color/text.dark" android:textColor="@color/fg_significant_on_dark"
android:textStyle="bold" /> android:textStyle="bold" />
</LinearLayout> </LinearLayout>
@ -54,7 +54,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:maxWidth="196dp" android:maxWidth="196dp"
android:textColor="@color/text" android:textColor="@color/fg_significant"
android:textStyle="bold" /> android:textStyle="bold" />
<de.schildbach.oeffi.stations.LineView <de.schildbach.oeffi.stations.LineView
@ -85,7 +85,7 @@
android:shadowColor="#000" android:shadowColor="#000"
android:shadowRadius="2" android:shadowRadius="2"
android:text="@string/disclaimer_responsibility_2line" android:text="@string/disclaimer_responsibility_2line"
android:textColor="@color/text.dark" android:textColor="@color/fg_significant_on_dark"
android:textSize="@dimen/font_size_disclaimer" android:textSize="@dimen/font_size_disclaimer"
android:textStyle="bold" /> android:textStyle="bold" />
</FrameLayout> </FrameLayout>

4
oeffi/res/layout/plans_picker_content.xml
View file

@ -21,7 +21,7 @@
android:id="@+id/plans_picker_connectivity_warning_box" android:id="@+id/plans_picker_connectivity_warning_box"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" 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:drawableLeft="@drawable/ic_portable_wifi_off_grey600_24dp"
android:gravity="center" android:gravity="center"
android:paddingBottom="@dimen/list_entry_padding_vertical" android:paddingBottom="@dimen/list_entry_padding_vertical"
@ -35,7 +35,7 @@
android:id="@+id/plans_picker_filter_box" android:id="@+id/plans_picker_filter_box"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@color/action_bar_appendix" android:background="@color/bg_action_bar_appendix"
android:gravity="center_vertical" android:gravity="center_vertical"
android:orientation="horizontal" android:orientation="horizontal"
android:visibility="gone" > android:visibility="gone" >

6
oeffi/res/layout/stations_content.xml
View file

@ -35,7 +35,7 @@
android:id="@+id/stations_connectivity_warning_box" android:id="@+id/stations_connectivity_warning_box"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" 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:drawableLeft="@drawable/ic_portable_wifi_off_grey600_24dp"
android:gravity="center" android:gravity="center"
android:paddingBottom="@dimen/list_entry_padding_vertical" android:paddingBottom="@dimen/list_entry_padding_vertical"
@ -49,7 +49,7 @@
android:id="@+id/stations_search_box" android:id="@+id/stations_search_box"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@color/action_bar_appendix" android:background="@color/bg_action_bar_appendix"
android:gravity="center_vertical" android:gravity="center_vertical"
android:orientation="horizontal" android:orientation="horizontal"
android:visibility="gone" > android:visibility="gone" >
@ -81,7 +81,7 @@
android:id="@+id/stations_location_box" android:id="@+id/stations_location_box"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@color/action_bar_appendix" android:background="@color/bg_action_bar_appendix"
android:gravity="center_vertical" android:gravity="center_vertical"
android:orientation="horizontal" android:orientation="horizontal"
android:visibility="gone" > android:visibility="gone" >

18
oeffi/res/layout/stations_filter_popup_content.xml
View file

@ -15,7 +15,7 @@
android:padding="@dimen/dialog_padding" android:padding="@dimen/dialog_padding"
android:tag="I" android:tag="I"
android:text="@string/product_i" android:text="@string/product_i"
android:textColor="@color/text" android:textColor="@color/fg_significant"
android:textSize="@dimen/font_size_large" /> android:textSize="@dimen/font_size_large" />
<CheckBox <CheckBox
@ -27,7 +27,7 @@
android:padding="@dimen/dialog_padding" android:padding="@dimen/dialog_padding"
android:tag="B" android:tag="B"
android:text="@string/product_b" android:text="@string/product_b"
android:textColor="@color/text" android:textColor="@color/fg_significant"
android:textSize="@dimen/font_size_large" /> android:textSize="@dimen/font_size_large" />
</TableRow> </TableRow>
@ -42,7 +42,7 @@
android:padding="@dimen/dialog_padding" android:padding="@dimen/dialog_padding"
android:tag="R" android:tag="R"
android:text="@string/product_r" android:text="@string/product_r"
android:textColor="@color/text" android:textColor="@color/fg_significant"
android:textSize="@dimen/font_size_large" /> android:textSize="@dimen/font_size_large" />
<CheckBox <CheckBox
@ -54,7 +54,7 @@
android:padding="@dimen/dialog_padding" android:padding="@dimen/dialog_padding"
android:tag="P" android:tag="P"
android:text="@string/product_p" android:text="@string/product_p"
android:textColor="@color/text" android:textColor="@color/fg_significant"
android:textSize="@dimen/font_size_large" /> android:textSize="@dimen/font_size_large" />
</TableRow> </TableRow>
@ -69,7 +69,7 @@
android:padding="@dimen/dialog_padding" android:padding="@dimen/dialog_padding"
android:tag="S" android:tag="S"
android:text="@string/product_s" android:text="@string/product_s"
android:textColor="@color/text" android:textColor="@color/fg_significant"
android:textSize="@dimen/font_size_large" /> android:textSize="@dimen/font_size_large" />
<CheckBox <CheckBox
@ -81,7 +81,7 @@
android:padding="@dimen/dialog_padding" android:padding="@dimen/dialog_padding"
android:tag="F" android:tag="F"
android:text="@string/product_f" android:text="@string/product_f"
android:textColor="@color/text" android:textColor="@color/fg_significant"
android:textSize="@dimen/font_size_large" /> android:textSize="@dimen/font_size_large" />
</TableRow> </TableRow>
@ -96,7 +96,7 @@
android:padding="@dimen/dialog_padding" android:padding="@dimen/dialog_padding"
android:tag="U" android:tag="U"
android:text="@string/product_u" android:text="@string/product_u"
android:textColor="@color/text" android:textColor="@color/fg_significant"
android:textSize="@dimen/font_size_large" /> android:textSize="@dimen/font_size_large" />
<CheckBox <CheckBox
@ -108,7 +108,7 @@
android:padding="@dimen/dialog_padding" android:padding="@dimen/dialog_padding"
android:tag="C" android:tag="C"
android:text="@string/product_c" android:text="@string/product_c"
android:textColor="@color/text" android:textColor="@color/fg_significant"
android:textSize="@dimen/font_size_large" /> android:textSize="@dimen/font_size_large" />
</TableRow> </TableRow>
@ -123,7 +123,7 @@
android:padding="@dimen/dialog_padding" android:padding="@dimen/dialog_padding"
android:tag="T" android:tag="T"
android:text="@string/product_t" android:text="@string/product_t"
android:textColor="@color/text" android:textColor="@color/fg_significant"
android:textSize="@dimen/font_size_large" /> android:textSize="@dimen/font_size_large" />
</TableRow> </TableRow>

2
oeffi/res/layout/stations_station_details_header.xml
View file

@ -35,7 +35,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingLeft="@dimen/list_entry_padding_horizontal" android:paddingLeft="@dimen/list_entry_padding_horizontal"
android:textColor="@color/text_less_significant" /> android:textColor="@color/fg_less_significant" />
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>

2
oeffi/res/layout/stations_station_details_header_line.xml
View file

@ -20,7 +20,7 @@
android:layout_weight="1" android:layout_weight="1"
android:ellipsize="middle" android:ellipsize="middle"
android:singleLine="true" android:singleLine="true"
android:textColor="@color/text" android:textColor="@color/fg_significant"
android:textSize="@dimen/font_size_small" /> android:textSize="@dimen/font_size_small" />
</LinearLayout> </LinearLayout>

2
oeffi/res/layout/stations_station_entry.xml
View file

@ -99,7 +99,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingBottom="@dimen/list_entry_padding_vertical_cram" android:paddingBottom="@dimen/list_entry_padding_vertical_cram"
android:paddingTop="@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" /> android:textStyle="bold" />
<de.schildbach.oeffi.stations.LineView <de.schildbach.oeffi.stations.LineView

2
oeffi/res/layout/stations_station_entry_departure.xml
View file

@ -29,7 +29,7 @@
android:paddingLeft="3dp" android:paddingLeft="3dp"
android:paddingRight="3dp" android:paddingRight="3dp"
android:singleLine="true" android:singleLine="true"
android:textColor="@color/text.dark" android:textColor="@color/fg_significant_on_dark"
android:textStyle="bold" /> android:textStyle="bold" />
<TextView <TextView

8
oeffi/res/values-v21/styles.xml
View file

@ -32,7 +32,7 @@
</style> </style>
<style name="My.Widget.AutoCompleteTextView" parent="@android:style/Widget.Material.Light.AutoCompleteTextView"> <style name="My.Widget.AutoCompleteTextView" parent="@android:style/Widget.Material.Light.AutoCompleteTextView">
<item name="android:textColor">@color/text</item> <item name="android:textColor">@color/fg_significant</item>
<item name="android:background">@null</item> <item name="android:background">@null</item>
<item name="android:popupBackground">@android:color/white</item> <item name="android:popupBackground">@android:color/white</item>
<item name="android:dropDownVerticalOffset">0px</item> <item name="android:dropDownVerticalOffset">0px</item>
@ -40,13 +40,13 @@
<style name="My.Widget.Button" parent="@android:style/Widget.Material.Light.Button"> <style name="My.Widget.Button" parent="@android:style/Widget.Material.Light.Button">
<item name="android:background">?android:attr/selectableItemBackground</item> <item name="android:background">?android:attr/selectableItemBackground</item>
<item name="android:textColor">@color/text</item> <item name="android:textColor">@color/fg_significant</item>
<item name="android:textSize">@dimen/font_size_normal</item> <item name="android:textSize">@dimen/font_size_normal</item>
<item name="android:textAllCaps">false</item> <item name="android:textAllCaps">false</item>
</style> </style>
<style name="My.Widget.Button.Border" parent="@android:style/Widget.Material.Light.Button"> <style name="My.Widget.Button.Border" parent="@android:style/Widget.Material.Light.Button">
<item name="android:textColor">@color/text</item> <item name="android:textColor">@color/fg_significant</item>
<item name="android:textSize">@dimen/font_size_normal</item> <item name="android:textSize">@dimen/font_size_normal</item>
</style> </style>
@ -61,7 +61,7 @@
<style name="My.Widget.PopupMenu" parent="@android:style/Widget.Material.Light.PopupMenu" /> <style name="My.Widget.PopupMenu" parent="@android:style/Widget.Material.Light.PopupMenu" />
<style name="My.Widget.ActionBar" parent="@android:style/Widget.Material.ActionBar.Solid"> <style name="My.Widget.ActionBar" parent="@android:style/Widget.Material.ActionBar.Solid">
<item name="android:background">@color/action_bar_background</item> <item name="android:background">@color/bg_action_bar</item>
<item name="android:titleTextStyle">@style/My.TextAppearance.Widget.ActionBar.Title</item> <item name="android:titleTextStyle">@style/My.TextAppearance.Widget.ActionBar.Title</item>
<item name="android:displayOptions">homeAsUp|showTitle</item> <item name="android:displayOptions">homeAsUp|showTitle</item>
</style> </style>

26
oeffi/res/values/colors.xml
View file

@ -1,17 +1,21 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<color name="text">#000000</color>
<color name="text.dark">#ffffff</color>
<color name="text_less_significant">#999999</color>
<color name="text_ghosted">#bbbbbb</color>
<color name="text_highlight">#dd9055</color>
<color name="grey600">#757575</color> <color name="grey600">#757575</color>
<color name="arrow">#aa0000</color>
<color name="action_bar_background">#555555</color> <!-- foreground -->
<color name="action_bar_background_stations">#777700</color> <color name="fg_significant">#000000</color>
<color name="action_bar_background_directions">#227722</color> <color name="fg_less_significant">#999999</color>
<color name="action_bar_background_directions_dark">#114411</color> <color name="fg_insignificant">#bbbbbb</color>
<color name="action_bar_appendix">#cccccc</color> <color name="fg_highlighted">#dd9055</color>
<color name="fg_arrow">#aa0000</color>
<color name="fg_significant_on_dark">#ffffff</color>
<!-- background -->
<color name="bg_action_bar">#555555</color>
<color name="bg_action_bar_stations">#777700</color>
<color name="bg_action_bar_directions">#227722</color>
<color name="bg_action_bar_directions_dark">#114411</color>
<color name="bg_action_bar_appendix">#cccccc</color>
</resources> </resources>

10
oeffi/res/values/styles.xml
View file

@ -36,12 +36,12 @@
</style> </style>
<style name="My.Widget.TextView" parent="@android:style/Widget.TextView"> <style name="My.Widget.TextView" parent="@android:style/Widget.TextView">
<item name="android:textColor">@color/text</item> <item name="android:textColor">@color/fg_significant</item>
<item name="android:textSize">@dimen/font_size_normal</item> <item name="android:textSize">@dimen/font_size_normal</item>
</style> </style>
<style name="My.Widget.AutoCompleteTextView" parent="@android:style/Widget.Holo.Light.AutoCompleteTextView"> <style name="My.Widget.AutoCompleteTextView" parent="@android:style/Widget.Holo.Light.AutoCompleteTextView">
<item name="android:textColor">@color/text</item> <item name="android:textColor">@color/fg_significant</item>
<item name="android:background">@null</item> <item name="android:background">@null</item>
<item name="android:popupBackground">@android:color/white</item> <item name="android:popupBackground">@android:color/white</item>
<item name="android:dropDownVerticalOffset">0px</item> <item name="android:dropDownVerticalOffset">0px</item>
@ -49,12 +49,12 @@
<style name="My.Widget.Button" parent="@android:style/Widget.Holo.Light.Button"> <style name="My.Widget.Button" parent="@android:style/Widget.Holo.Light.Button">
<item name="android:background">?android:attr/selectableItemBackground</item> <item name="android:background">?android:attr/selectableItemBackground</item>
<item name="android:textColor">@color/text</item> <item name="android:textColor">@color/fg_significant</item>
<item name="android:textSize">@dimen/font_size_normal</item> <item name="android:textSize">@dimen/font_size_normal</item>
</style> </style>
<style name="My.Widget.Button.Border" parent="@android:style/Widget.Holo.Light.Button"> <style name="My.Widget.Button.Border" parent="@android:style/Widget.Holo.Light.Button">
<item name="android:textColor">@color/text</item> <item name="android:textColor">@color/fg_significant</item>
<item name="android:textSize">@dimen/font_size_normal</item> <item name="android:textSize">@dimen/font_size_normal</item>
</style> </style>
@ -79,7 +79,7 @@
<style name="My.Widget.PopupMenu" parent="@android:style/Widget.Holo.Light.PopupMenu" /> <style name="My.Widget.PopupMenu" parent="@android:style/Widget.Holo.Light.PopupMenu" />
<style name="My.Widget.ActionBar" parent="@android:style/Widget.Holo.ActionBar.Solid"> <style name="My.Widget.ActionBar" parent="@android:style/Widget.Holo.ActionBar.Solid">
<item name="android:background">@color/action_bar_background</item> <item name="android:background">@color/bg_action_bar</item>
<item name="android:titleTextStyle">@style/My.TextAppearance.Widget.ActionBar.Title</item> <item name="android:titleTextStyle">@style/My.TextAppearance.Widget.ActionBar.Title</item>
<item name="android:displayOptions">homeAsUp|showTitle</item> <item name="android:displayOptions">homeAsUp|showTitle</item>
</style> </style>

2
oeffi/src/de/schildbach/oeffi/directions/DirectionsActivity.java
View file

@ -269,7 +269,7 @@ public class DirectionsActivity extends OeffiMainActivity implements ActivityCom
setContentView(R.layout.directions_content); setContentView(R.layout.directions_content);
final MyActionBar actionBar = getMyActionBar(); 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.setPrimaryTitle(R.string.directions_activity_title);
actionBar.setTitlesOnClickListener(v -> NetworkPickerActivity.start(DirectionsActivity.this)); actionBar.setTitlesOnClickListener(v -> NetworkPickerActivity.start(DirectionsActivity.this));
buttonExpand = actionBar.addToggleButton(R.drawable.ic_expand_white_24dp, buttonExpand = actionBar.addToggleButton(R.drawable.ic_expand_white_24dp,

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

@ -112,9 +112,9 @@ public class TripDetailsActivity extends OeffiActivity implements LocationListen
private LayoutInflater inflater; private LayoutInflater inflater;
private Resources res; private Resources res;
private int colorText; private int colorSignificant;
private int colorTextGhosted; private int colorInsignificant;
private int colorTextHighlight; private int colorHighlighted;
private int colorGrey600; private int colorGrey600;
private DisplayMetrics displayMetrics; private DisplayMetrics displayMetrics;
private LocationManager locationManager; private LocationManager locationManager;
@ -144,9 +144,9 @@ public class TripDetailsActivity extends OeffiActivity implements LocationListen
inflater = getLayoutInflater(); inflater = getLayoutInflater();
res = getResources(); res = getResources();
colorText = res.getColor(R.color.text); colorSignificant = res.getColor(R.color.fg_significant);
colorTextGhosted = res.getColor(R.color.text_ghosted); colorInsignificant = res.getColor(R.color.fg_insignificant);
colorTextHighlight = res.getColor(R.color.text_highlight); colorHighlighted = res.getColor(R.color.fg_highlighted);
colorGrey600 = res.getColor(R.color.grey600); colorGrey600 = res.getColor(R.color.grey600);
displayMetrics = res.getDisplayMetrics(); displayMetrics = res.getDisplayMetrics();
locationManager = (LocationManager) getSystemService(Context.LOCATION_SERVICE); locationManager = (LocationManager) getSystemService(Context.LOCATION_SERVICE);
@ -193,7 +193,7 @@ public class TripDetailsActivity extends OeffiActivity implements LocationListen
setContentView(R.layout.directions_trip_details_content); setContentView(R.layout.directions_trip_details_content);
final MyActionBar actionBar = getMyActionBar(); final MyActionBar actionBar = getMyActionBar();
setPrimaryColor(R.color.action_bar_background_directions); setPrimaryColor(R.color.bg_action_bar_directions);
actionBar.setPrimaryTitle(getTitle()); actionBar.setPrimaryTitle(getTitle());
actionBar.setBack(v -> finish()); actionBar.setBack(v -> finish());
@ -749,16 +749,16 @@ public class TripDetailsActivity extends OeffiActivity implements LocationListen
stopNameView.setText(stop.location.uniqueShortName()); stopNameView.setText(stop.location.uniqueShortName());
setStrikeThru(stopNameView, isCancelled); setStrikeThru(stopNameView, isCancelled);
if (highlightLocation) { if (highlightLocation) {
stopNameView.setTextColor(colorTextHighlight); stopNameView.setTextColor(colorHighlighted);
stopNameView.setTypeface(null, Typeface.BOLD); stopNameView.setTypeface(null, Typeface.BOLD);
} else if (pearlType == PearlView.Type.DEPARTURE || pearlType == PearlView.Type.ARRIVAL) { } else if (pearlType == PearlView.Type.DEPARTURE || pearlType == PearlView.Type.ARRIVAL) {
stopNameView.setTextColor(colorText); stopNameView.setTextColor(colorSignificant);
stopNameView.setTypeface(null, Typeface.BOLD); stopNameView.setTypeface(null, Typeface.BOLD);
} else if (pearlType == PearlView.Type.PASSING) { } else if (pearlType == PearlView.Type.PASSING) {
stopNameView.setTextColor(colorTextGhosted); stopNameView.setTextColor(colorInsignificant);
stopNameView.setTypeface(null, Typeface.NORMAL); stopNameView.setTypeface(null, Typeface.NORMAL);
} else { } else {
stopNameView.setTextColor(colorText); stopNameView.setTextColor(colorSignificant);
stopNameView.setTypeface(null, Typeface.NORMAL); stopNameView.setTypeface(null, Typeface.NORMAL);
} }
if (stop.location.hasId()) if (stop.location.hasId())
@ -788,7 +788,7 @@ public class TripDetailsActivity extends OeffiActivity implements LocationListen
setStrikeThru(stopTimeView, isCancelled); setStrikeThru(stopTimeView, isCancelled);
highlightTime = time.equals(highlightedTime); highlightTime = time.equals(highlightedTime);
} }
final int stopTimeColor = highlightTime ? colorTextHighlight : colorText; final int stopTimeColor = highlightTime ? colorHighlighted : colorSignificant;
stopDateView.setTextColor(stopTimeColor); stopDateView.setTextColor(stopTimeColor);
stopTimeView.setTextColor(stopTimeColor); stopTimeView.setTextColor(stopTimeColor);
stopDateView.setTypeface(null, (highlightTime ? Typeface.BOLD : 0) + (isTimePredicted ? Typeface.ITALIC : 0)); stopDateView.setTypeface(null, (highlightTime ? Typeface.BOLD : 0) + (isTimePredicted ? Typeface.ITALIC : 0));
@ -839,7 +839,7 @@ public class TripDetailsActivity extends OeffiActivity implements LocationListen
stopNameView.setText( stopNameView.setText(
res.getQuantityString(R.plurals.directions_trip_details_public_entry_collapsed_intermediate_stops, res.getQuantityString(R.plurals.directions_trip_details_public_entry_collapsed_intermediate_stops,
numIntermediateStops, numIntermediateStops)); numIntermediateStops, numIntermediateStops));
stopNameView.setTextColor(colorTextGhosted); stopNameView.setTextColor(colorInsignificant);
// pearl // pearl
final PearlView pearlView = (PearlView) row final PearlView pearlView = (PearlView) row

4
oeffi/src/de/schildbach/oeffi/directions/TripsGallery.java
View file

@ -78,7 +78,7 @@ public class TripsGallery extends Gallery {
final Resources res = getResources(); final Resources res = getResources();
density = res.getDisplayMetrics().density; density = res.getDisplayMetrics().density;
final float strokeWidth = res.getDimension(R.dimen.trips_overview_stroke_width); 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.setColor(Color.GRAY);
gridPaint.setStyle(Paint.Style.STROKE); 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.setPathEffect(new DashPathEffect(new float[] { 4f * density, 4f * density }, 0));
gridPaint.setAntiAlias(false); gridPaint.setAntiAlias(false);
gridLabelPaint.setColor(textColor); gridLabelPaint.setColor(colorSignificant);
gridLabelPaint.setAntiAlias(true); gridLabelPaint.setAntiAlias(true);
gridLabelPaint.setTextSize(res.getDimension(R.dimen.font_size_normal)); gridLabelPaint.setTextSize(res.getDimension(R.dimen.font_size_normal));
gridLabelPaint.setTextAlign(Align.CENTER); gridLabelPaint.setTextAlign(Align.CENTER);

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

@ -88,7 +88,7 @@ public final class TripsGalleryAdapter extends BaseAdapter {
final Resources res = context.getResources(); final Resources res = context.getResources();
final float strokeWidth = res.getDimension(R.dimen.trips_overview_entry_box_stroke_width); 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); tripWidth = res.getDimensionPixelSize(R.dimen.trips_overview_entry_width);
@ -118,7 +118,7 @@ public final class TripsGalleryAdapter extends BaseAdapter {
individualTimePaint.setAntiAlias(true); individualTimePaint.setAntiAlias(true);
individualTimePaint.setTextAlign(Align.CENTER); individualTimePaint.setTextAlign(Align.CENTER);
publicTimePaint.setColor(textColor); publicTimePaint.setColor(colorSignificant);
publicTimePaint.setTypeface(Typeface.DEFAULT_BOLD); publicTimePaint.setTypeface(Typeface.DEFAULT_BOLD);
publicTimePaint.setTextSize(res.getDimension(R.dimen.font_size_normal)); publicTimePaint.setTextSize(res.getDimension(R.dimen.font_size_normal));
publicTimePaint.setShadowLayer(1, 0, 0, Color.BLACK); publicTimePaint.setShadowLayer(1, 0, 0, Color.BLACK);

2
oeffi/src/de/schildbach/oeffi/directions/TripsOverviewActivity.java
View file

@ -139,7 +139,7 @@ public class TripsOverviewActivity extends OeffiActivity {
setContentView(R.layout.directions_trip_overview_content); setContentView(R.layout.directions_trip_overview_content);
final MyActionBar actionBar = getMyActionBar(); 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.setBack(v -> finish());
actionBar.setCustomTitles(R.layout.directions_trip_overview_custom_title); actionBar.setCustomTitles(R.layout.directions_trip_overview_custom_title);
actionBar.addProgressButton().setOnClickListener(v -> handler.post(checkMoreRunnable)); actionBar.addProgressButton().setOnClickListener(v -> handler.post(checkMoreRunnable));

2
oeffi/src/de/schildbach/oeffi/network/NetworkPickerActivity.java
View file

@ -123,7 +123,7 @@ public class NetworkPickerActivity extends Activity implements ActivityCompat.On
setContentView(R.layout.network_picker_content); setContentView(R.layout.network_picker_content);
actionBar = (MyActionBar) findViewById(R.id.action_bar); actionBar = (MyActionBar) findViewById(R.id.action_bar);
setPrimaryColor(R.color.action_bar_background); setPrimaryColor(R.color.bg_action_bar);
actionBar.setPrimaryTitle(getTitle()); actionBar.setPrimaryTitle(getTitle());
listView = (RecyclerView) findViewById(android.R.id.list); listView = (RecyclerView) findViewById(android.R.id.list);

12
oeffi/src/de/schildbach/oeffi/network/list/NetworkViewHolder.java
View file

@ -34,8 +34,8 @@ import androidx.recyclerview.widget.RecyclerView;
public class NetworkViewHolder extends RecyclerView.ViewHolder { public class NetworkViewHolder extends RecyclerView.ViewHolder {
private final Context context; private final Context context;
private final Resources res; private final Resources res;
private final int textColor; private final int colorSignificant;
private final int grey600; private final int colorGrey600;
private final ImageView iconView; private final ImageView iconView;
private final TextView labelView; private final TextView labelView;
@ -51,8 +51,8 @@ public class NetworkViewHolder extends RecyclerView.ViewHolder {
super(itemView); super(itemView);
this.context = context; this.context = context;
this.res = context.getResources(); this.res = context.getResources();
this.textColor = res.getColor(R.color.text); this.colorSignificant = res.getColor(R.color.fg_significant);
this.grey600 = res.getColor(R.color.grey600); this.colorGrey600 = res.getColor(R.color.grey600);
iconView = (ImageView) itemView.findViewById(R.id.network_picker_entry_icon); iconView = (ImageView) itemView.findViewById(R.id.network_picker_entry_icon);
labelView = (TextView) itemView.findViewById(R.id.network_picker_entry_label); 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.setText(networkRes.label);
labelView.setTextColor(isEnabled ? textColor : grey600); labelView.setTextColor(isEnabled ? colorSignificant : colorGrey600);
if (entry.state != null && isEnabled) if (entry.state != null && isEnabled)
stateView.setText( stateView.setText(
@ -92,7 +92,7 @@ public class NetworkViewHolder extends RecyclerView.ViewHolder {
stateView.setText(null); stateView.setText(null);
commentView.setText(networkRes.comment); commentView.setText(networkRes.comment);
commentView.setTextColor(isEnabled ? textColor : grey600); commentView.setTextColor(isEnabled ? colorSignificant : colorGrey600);
if (dbFileLength > 0) { if (dbFileLength > 0) {
usageView.setVisibility(View.VISIBLE); usageView.setVisibility(View.VISIBLE);

2
oeffi/src/de/schildbach/oeffi/plans/PlansPickerActivity.java
View file

@ -110,7 +110,7 @@ public class PlansPickerActivity extends OeffiMainActivity implements ActivityCo
setContentView(R.layout.plans_picker_content); setContentView(R.layout.plans_picker_content);
actionBar = getMyActionBar(); actionBar = getMyActionBar();
setPrimaryColor(R.color.action_bar_background); setPrimaryColor(R.color.bg_action_bar);
actionBar.setPrimaryTitle(R.string.plans_activity_title); actionBar.setPrimaryTitle(R.string.plans_activity_title);
actionBar.addButton(R.drawable.ic_search_white_24dp, R.string.plans_picker_action_search_title) actionBar.addButton(R.drawable.ic_search_white_24dp, R.string.plans_picker_action_search_title)
.setOnClickListener(v -> onSearchRequested()); .setOnClickListener(v -> onSearchRequested());

2
oeffi/src/de/schildbach/oeffi/stations/FavoriteStationsActivity.java
View file

@ -75,7 +75,7 @@ public class FavoriteStationsActivity extends OeffiActivity
setContentView(R.layout.favorites_content); setContentView(R.layout.favorites_content);
final MyActionBar actionBar = getMyActionBar(); final MyActionBar actionBar = getMyActionBar();
setPrimaryColor(R.color.action_bar_background_stations); setPrimaryColor(R.color.bg_action_bar_stations);
actionBar.setPrimaryTitle(getTitle()); actionBar.setPrimaryTitle(getTitle());
actionBar.setBack(v -> finish()); actionBar.setBack(v -> finish());

6
oeffi/src/de/schildbach/oeffi/stations/LineView.java
View file

@ -63,7 +63,7 @@ public class LineView extends TextView {
private int condenseThreshold = 0; private int condenseThreshold = 0;
private final float strokeWidth; 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); 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(); final Resources res = getResources();
strokeWidth = res.getDimension(R.dimen.line_style_border_stroke); 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) { public void setLine(final Line line) {
@ -149,7 +149,7 @@ public class LineView extends TextView {
final Style lineStyle = line.style; final Style lineStyle = line.style;
final Style style; final Style style;
if (ghosted) 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); DEFAULT_STYLE.foregroundColor, DEFAULT_STYLE.borderColor);
else if (lineStyle != null) else if (lineStyle != null)
style = lineStyle; style = lineStyle;

2
oeffi/src/de/schildbach/oeffi/stations/StationDetailsActivity.java
View file

@ -144,7 +144,7 @@ public class StationDetailsActivity extends OeffiActivity implements StationsAwa
setContentView(R.layout.stations_station_details_content); setContentView(R.layout.stations_station_details_content);
actionBar = getMyActionBar(); actionBar = getMyActionBar();
setPrimaryColor(R.color.action_bar_background_stations); setPrimaryColor(R.color.bg_action_bar_stations);
actionBar.setBack(v -> finish()); actionBar.setBack(v -> finish());
actionBar.swapTitles(); actionBar.swapTitles();
actionBar.addProgressButton().setOnClickListener(v -> load()); actionBar.addProgressButton().setOnClickListener(v -> load());

2
oeffi/src/de/schildbach/oeffi/stations/StationsActivity.java
View file

@ -187,7 +187,7 @@ public class StationsActivity extends OeffiMainActivity implements StationsAware
setContentView(R.layout.stations_content); setContentView(R.layout.stations_content);
actionBar = getMyActionBar(); actionBar = getMyActionBar();
setPrimaryColor(R.color.action_bar_background_stations); setPrimaryColor(R.color.bg_action_bar_stations);
actionBar.setPrimaryTitle(R.string.stations_activity_title); actionBar.setPrimaryTitle(R.string.stations_activity_title);
actionBar.setTitlesOnClickListener(v -> NetworkPickerActivity.start(StationsActivity.this)); actionBar.setTitlesOnClickListener(v -> NetworkPickerActivity.start(StationsActivity.this));
actionBar.addProgressButton().setOnClickListener(v -> { actionBar.addProgressButton().setOnClickListener(v -> {

16
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 colorText, colorTextLessSignificant, colorTextGhosted; private final int colorSignificant, colorLessSignificant, colorInsignificant;
private final int listEntryVerticalPadding; private final int listEntryVerticalPadding;
private static final int CONDENSE_LINES_THRESHOLD = 5; private static final int CONDENSE_LINES_THRESHOLD = 5;
@ -112,10 +112,10 @@ public class StationViewHolder extends RecyclerView.ViewHolder {
this.inflater = LayoutInflater.from(context); this.inflater = LayoutInflater.from(context);
this.display = ((WindowManager) context.getSystemService(Context.WINDOW_SERVICE)).getDefaultDisplay(); this.display = ((WindowManager) context.getSystemService(Context.WINDOW_SERVICE)).getDefaultDisplay();
this.colorArrow = res.getColor(R.color.arrow); this.colorArrow = res.getColor(R.color.fg_arrow);
this.colorText = res.getColor(R.color.text); this.colorSignificant = res.getColor(R.color.fg_significant);
this.colorTextLessSignificant = res.getColor(R.color.text_less_significant); this.colorLessSignificant = res.getColor(R.color.fg_less_significant);
this.colorTextGhosted = res.getColor(R.color.text_ghosted); this.colorInsignificant = res.getColor(R.color.fg_insignificant);
this.listEntryVerticalPadding = res.getDimensionPixelOffset(R.dimen.list_entry_padding_vertical); 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 isIgnored = favState != null && favState == FavoriteStationsProvider.TYPE_IGNORE;
final boolean isGhosted = isIgnored || queryNotOk; final boolean isGhosted = isIgnored || queryNotOk;
final int color = !isGhosted ? colorText : colorTextGhosted; final int color = !isGhosted ? colorSignificant : colorInsignificant;
// favorite // favorite
favoriteView.setVisibility(isFavorite ? View.VISIBLE : View.GONE); favoriteView.setVisibility(isFavorite ? View.VISIBLE : View.GONE);
@ -176,7 +176,7 @@ public class StationViewHolder extends RecyclerView.ViewHolder {
bearingView.setStationBearing(null); bearingView.setStationBearing(null);
bearingView.setCallback(compassCallback); bearingView.setCallback(compassCallback);
bearingView.setDisplayRotation(display.getRotation()); bearingView.setDisplayRotation(display.getRotation());
bearingView.setArrowColor(!isGhosted ? colorArrow : colorTextGhosted); bearingView.setArrowColor(!isGhosted ? colorArrow : colorInsignificant);
bearingView.setVisibility(View.VISIBLE); bearingView.setVisibility(View.VISIBLE);
} else { } else {
bearingView.setVisibility(View.GONE); bearingView.setVisibility(View.GONE);
@ -278,7 +278,7 @@ public class StationViewHolder extends RecyclerView.ViewHolder {
destinationView.setVisibility(View.VISIBLE); destinationView.setVisibility(View.VISIBLE);
destinationView.setText(Constants.DESTINATION_ARROW_INVISIBLE_PREFIX destinationView.setText(Constants.DESTINATION_ARROW_INVISIBLE_PREFIX
+ res.getString(R.string.stations_list_entry_interval, interval)); + res.getString(R.string.stations_list_entry_interval, interval));
destinationView.setTextColor(colorTextLessSignificant); destinationView.setTextColor(colorLessSignificant);
} else { } else {
lineView.setVisibility(View.INVISIBLE); lineView.setVisibility(View.INVISIBLE);
lineView.setLine(lineDestination.line); // Padding only lineView.setLine(lineDestination.line); // Padding only