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

dimens.xml: Rename list entry paddings to text paddings.

Browse source
This commit is contained in:
Andreas Schildbach 2021-02-03 17:17:57 +01:00
parent 0ca9281f05
commit c897772be5
44 changed files with 302 additions and 302 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -37,8 +37,8 @@
android:gravity="center_vertical" android:gravity="center_vertical"
android:minHeight="@dimen/action_bar_height" android:minHeight="@dimen/action_bar_height"
android:orientation="vertical" android:orientation="vertical"
android:paddingLeft="@dimen/list_entry_padding_horizontal_lax" android:paddingLeft="@dimen/text_padding_horizontal_lax"
android:paddingRight="@dimen/list_entry_padding_horizontal_cram"> android:paddingRight="@dimen/text_padding_horizontal_cram">
<TextView <TextView
android:id="@+id/action_bar_primary_title" android:id="@+id/action_bar_primary_title"

8
oeffi/res/layout/create_launcher_shortcut_dialog.xml
View file

@ -3,10 +3,10 @@
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingBottom="@dimen/list_entry_padding_vertical_lax" android:paddingBottom="@dimen/text_padding_vertical_lax"
android:paddingLeft="@dimen/list_entry_padding_horizontal_lax" android:paddingLeft="@dimen/text_padding_horizontal_lax"
android:paddingRight="@dimen/list_entry_padding_horizontal_lax" android:paddingRight="@dimen/text_padding_horizontal_lax"
android:paddingTop="@dimen/list_entry_padding_vertical_lax"> android:paddingTop="@dimen/text_padding_vertical_lax">
<EditText <EditText
android:id="@+id/create_launcher_shortcut_dialog_name" android:id="@+id/create_launcher_shortcut_dialog_name"

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

@ -27,10 +27,10 @@
android:background="@color/bg_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/text_padding_vertical"
android:paddingLeft="@dimen/list_entry_padding_horizontal_lax" android:paddingLeft="@dimen/text_padding_horizontal_lax"
android:paddingRight="@dimen/list_entry_padding_horizontal_verylax" android:paddingRight="@dimen/text_padding_horizontal_verylax"
android:paddingTop="@dimen/list_entry_padding_vertical" android:paddingTop="@dimen/text_padding_vertical"
android:text="@string/directions_connectivity_warning" android:text="@string/directions_connectivity_warning"
android:visibility="gone" /> android:visibility="gone" />
@ -115,8 +115,8 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="bottom|left" android:layout_gravity="bottom|left"
android:layout_marginBottom="@dimen/list_entry_padding_vertical" android:layout_marginBottom="@dimen/text_padding_vertical"
android:layout_marginLeft="@dimen/list_entry_padding_horizontal_verylax" android:layout_marginLeft="@dimen/text_padding_horizontal_verylax"
android:textSize="@dimen/font_size_disclaimer" android:textSize="@dimen/font_size_disclaimer"
android:textColor="@color/fg_significant_on_light" /> android:textColor="@color/fg_significant_on_light" />

28
oeffi/res/layout/directions_form_include.xml
View file

@ -44,8 +44,8 @@
<LinearLayout <LinearLayout
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/text_padding_horizontal"
android:paddingRight="@dimen/list_entry_padding_horizontal" android:paddingRight="@dimen/text_padding_horizontal"
android:minHeight="@dimen/action_bar_button_width" android:minHeight="@dimen/action_bar_button_width"
android:orientation="horizontal"> android:orientation="horizontal">
@ -136,10 +136,10 @@
android:id="@+id/directions_option_bike" android:id="@+id/directions_option_bike"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/list_entry_padding_vertical_lax" android:layout_marginBottom="@dimen/text_padding_vertical_lax"
android:layout_marginLeft="@dimen/list_entry_padding_horizontal_lax" android:layout_marginLeft="@dimen/text_padding_horizontal_lax"
android:layout_marginRight="@dimen/list_entry_padding_horizontal_lax" android:layout_marginRight="@dimen/text_padding_horizontal_lax"
android:layout_marginTop="@dimen/list_entry_padding_vertical_lax" android:layout_marginTop="@dimen/text_padding_vertical_lax"
android:text="@string/directions_option_bike" android:text="@string/directions_option_bike"
android:visibility="gone" /> android:visibility="gone" />
@ -162,24 +162,24 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:contentDescription="@string/directions_time_arr_dep_description" android:contentDescription="@string/directions_time_arr_dep_description"
android:paddingLeft="@dimen/list_entry_padding_horizontal_lax" android:paddingLeft="@dimen/text_padding_horizontal_lax"
android:paddingRight="@dimen/list_entry_padding_horizontal_lax" android:paddingRight="@dimen/text_padding_horizontal_lax"
android:singleLine="true" /> android:singleLine="true" />
<Button <Button
android:id="@+id/directions_time_1" android:id="@+id/directions_time_1"
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_lax" android:paddingLeft="@dimen/text_padding_horizontal_lax"
android:paddingRight="@dimen/list_entry_padding_horizontal_lax" android:paddingRight="@dimen/text_padding_horizontal_lax"
android:singleLine="true" /> android:singleLine="true" />
<Button <Button
android:id="@+id/directions_time_2" android:id="@+id/directions_time_2"
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_lax" android:paddingLeft="@dimen/text_padding_horizontal_lax"
android:paddingRight="@dimen/list_entry_padding_horizontal_lax" android:paddingRight="@dimen/text_padding_horizontal_lax"
android:singleLine="true" /> android:singleLine="true" />
<!-- stretch dummy --> <!-- stretch dummy -->
@ -196,8 +196,8 @@
android:layout_gravity="right" android:layout_gravity="right"
android:ellipsize="none" android:ellipsize="none"
android:minWidth="96dp" android:minWidth="96dp"
android:paddingLeft="@dimen/list_entry_padding_horizontal_lax" android:paddingLeft="@dimen/text_padding_horizontal_lax"
android:paddingRight="@dimen/list_entry_padding_horizontal_lax" android:paddingRight="@dimen/text_padding_horizontal_lax"
android:singleLine="true" android:singleLine="true"
android:text="@string/directions_go" android:text="@string/directions_go"
android:textStyle="bold" /> android:textStyle="bold" />

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

@ -5,9 +5,9 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@color/bg_level0" android:background="@color/bg_level0"
android:drawablePadding="@dimen/list_entry_padding_horizontal_lax" android:drawablePadding="@dimen/text_padding_horizontal_lax"
android:drawableTint="@color/fg_less_significant" android:drawableTint="@color/fg_less_significant"
android:minHeight="52dp" android:minHeight="52dp"
android:paddingLeft="@dimen/list_entry_padding_horizontal_verylax" android:paddingLeft="@dimen/text_padding_horizontal_verylax"
android:paddingRight="@dimen/list_entry_padding_horizontal" android:paddingRight="@dimen/text_padding_horizontal"
android:textSize="@dimen/font_size_large" /> android:textSize="@dimen/font_size_large" />

14
oeffi/res/layout/directions_map_pin.xml
View file

@ -15,9 +15,9 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_horizontal" android:layout_gravity="center_horizontal"
android:gravity="left" android:gravity="left"
android:paddingBottom="@dimen/list_entry_padding_vertical" android:paddingBottom="@dimen/text_padding_vertical"
android:paddingLeft="@dimen/list_entry_padding_horizontal" android:paddingLeft="@dimen/text_padding_horizontal"
android:paddingRight="@dimen/list_entry_padding_horizontal" android:paddingRight="@dimen/text_padding_horizontal"
android:textColor="@color/fg_significant_on_light" /> android:textColor="@color/fg_significant_on_light" />
<LinearLayout <LinearLayout
@ -33,8 +33,8 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" android:layout_weight="1"
android:minHeight="42dp" android:minHeight="42dp"
android:paddingLeft="@dimen/list_entry_padding_horizontal_cram" android:paddingLeft="@dimen/text_padding_horizontal_cram"
android:paddingRight="@dimen/list_entry_padding_horizontal_cram" android:paddingRight="@dimen/text_padding_horizontal_cram"
android:singleLine="true" android:singleLine="true"
android:text="@string/directions_map_pin_button_from" android:text="@string/directions_map_pin_button_from"
android:textColor="@color/fg_significant_on_light" /> android:textColor="@color/fg_significant_on_light" />
@ -45,8 +45,8 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" android:layout_weight="1"
android:minHeight="42dp" android:minHeight="42dp"
android:paddingLeft="@dimen/list_entry_padding_horizontal_cram" android:paddingLeft="@dimen/text_padding_horizontal_cram"
android:paddingRight="@dimen/list_entry_padding_horizontal_cram" android:paddingRight="@dimen/text_padding_horizontal_cram"
android:singleLine="true" android:singleLine="true"
android:text="@string/directions_map_pin_button_to" android:text="@string/directions_map_pin_button_to"
android:textColor="@color/fg_significant_on_light" /> android:textColor="@color/fg_significant_on_light" />

22
oeffi/res/layout/directions_query_history_entry.xml
View file

@ -25,23 +25,23 @@
android:id="@+id/directions_query_history_entry_from" android:id="@+id/directions_query_history_entry_from"
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_lax" android:drawablePadding="@dimen/text_padding_horizontal_lax"
android:drawableTint="@color/fg_less_significant" android:drawableTint="@color/fg_less_significant"
android:gravity="center_vertical" android:gravity="center_vertical"
android:paddingLeft="@dimen/list_entry_padding_horizontal_verylax" android:paddingLeft="@dimen/text_padding_horizontal_verylax"
android:paddingRight="@dimen/list_entry_padding_horizontal_cram" android:paddingRight="@dimen/text_padding_horizontal_cram"
android:paddingTop="@dimen/list_entry_padding_vertical_verylax" /> android:paddingTop="@dimen/text_padding_vertical_verylax" />
<de.schildbach.oeffi.directions.LocationTextView <de.schildbach.oeffi.directions.LocationTextView
android:id="@+id/directions_query_history_entry_to" android:id="@+id/directions_query_history_entry_to"
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_lax" android:drawablePadding="@dimen/text_padding_horizontal_lax"
android:drawableTint="@color/fg_less_significant" android:drawableTint="@color/fg_less_significant"
android:gravity="center_vertical" android:gravity="center_vertical"
android:paddingBottom="@dimen/list_entry_padding_vertical_verylax" android:paddingBottom="@dimen/text_padding_vertical_verylax"
android:paddingLeft="@dimen/list_entry_padding_horizontal_verylax" android:paddingLeft="@dimen/text_padding_horizontal_verylax"
android:paddingRight="@dimen/list_entry_padding_horizontal_cram" /> android:paddingRight="@dimen/text_padding_horizontal_cram" />
</LinearLayout> </LinearLayout>
<Button <Button
@ -51,11 +51,11 @@
android:layout_gravity="center" android:layout_gravity="center"
android:layout_weight="2" android:layout_weight="2"
android:drawableLeft="@drawable/ic_beenhere_grey600_24dp" android:drawableLeft="@drawable/ic_beenhere_grey600_24dp"
android:drawablePadding="@dimen/list_entry_padding_horizontal_lax" android:drawablePadding="@dimen/text_padding_horizontal_lax"
android:drawableTint="@color/fg_less_significant" android:drawableTint="@color/fg_less_significant"
android:gravity="left|center_vertical" android:gravity="left|center_vertical"
android:paddingLeft="@dimen/list_entry_padding_horizontal_lax" android:paddingLeft="@dimen/text_padding_horizontal_lax"
android:paddingRight="@dimen/list_entry_padding_horizontal_cram" /> android:paddingRight="@dimen/text_padding_horizontal_cram" />
</LinearLayout> </LinearLayout>
<TextView <TextView

44
oeffi/res/layout/directions_trip_details_content.xml
View file

@ -39,24 +39,24 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@color/bg_divider" android:background="@color/bg_divider"
android:orientation="horizontal" android:orientation="horizontal"
android:paddingBottom="@dimen/list_entry_padding_vertical_lax" android:paddingBottom="@dimen/text_padding_vertical_lax"
android:paddingLeft="@dimen/list_entry_padding_horizontal_lax" android:paddingLeft="@dimen/text_padding_horizontal_lax"
android:paddingRight="@dimen/list_entry_padding_horizontal_lax" android:paddingRight="@dimen/text_padding_horizontal_lax"
android:paddingTop="@dimen/list_entry_padding_vertical_lax"> android:paddingTop="@dimen/text_padding_vertical_lax">
<de.schildbach.oeffi.directions.LocationTextView <de.schildbach.oeffi.directions.LocationTextView
android:id="@+id/directions_trip_details_location_from" android:id="@+id/directions_trip_details_location_from"
android:layout_width="0px" android:layout_width="0px"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="50" android:layout_weight="50"
android:drawablePadding="@dimen/list_entry_padding_horizontal_lax" /> android:drawablePadding="@dimen/text_padding_horizontal_lax" />
<de.schildbach.oeffi.directions.LocationTextView <de.schildbach.oeffi.directions.LocationTextView
android:id="@+id/directions_trip_details_location_to" android:id="@+id/directions_trip_details_location_to"
android:layout_width="0px" android:layout_width="0px"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="50" android:layout_weight="50"
android:drawablePadding="@dimen/list_entry_padding_horizontal_lax" /> android:drawablePadding="@dimen/text_padding_horizontal_lax" />
</LinearLayout> </LinearLayout>
<TableLayout <TableLayout
@ -65,10 +65,10 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@color/bg_divider" android:background="@color/bg_divider"
android:baselineAligned="true" android:baselineAligned="true"
android:paddingBottom="@dimen/list_entry_padding_vertical_lax" android:paddingBottom="@dimen/text_padding_vertical_lax"
android:paddingLeft="@dimen/list_entry_padding_horizontal_verylax" android:paddingLeft="@dimen/text_padding_horizontal_verylax"
android:paddingRight="@dimen/list_entry_padding_horizontal_verylax" android:paddingRight="@dimen/text_padding_horizontal_verylax"
android:paddingTop="@dimen/list_entry_padding_vertical_lax" android:paddingTop="@dimen/text_padding_vertical_lax"
android:stretchColumns="2" /> android:stretchColumns="2" />
<TextView <TextView
@ -76,13 +76,13 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:drawableLeft="@drawable/ic_settings_input_antenna_grey600_18dp" android:drawableLeft="@drawable/ic_settings_input_antenna_grey600_18dp"
android:drawablePadding="@dimen/list_entry_padding_horizontal_lax" android:drawablePadding="@dimen/text_padding_horizontal_lax"
android:drawableTint="@color/fg_less_significant" android:drawableTint="@color/fg_less_significant"
android:gravity="left|center_vertical" android:gravity="left|center_vertical"
android:paddingBottom="@dimen/list_entry_padding_vertical_lax" android:paddingBottom="@dimen/text_padding_vertical_lax"
android:paddingLeft="@dimen/list_entry_padding_horizontal_lax" android:paddingLeft="@dimen/text_padding_horizontal_lax"
android:paddingRight="@dimen/list_entry_padding_horizontal_lax" android:paddingRight="@dimen/text_padding_horizontal_lax"
android:paddingTop="@dimen/list_entry_padding_vertical_verylax" /> android:paddingTop="@dimen/text_padding_vertical_verylax" />
</LinearLayout> </LinearLayout>
</ScrollView> </ScrollView>
@ -91,10 +91,10 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="bottom" android:layout_gravity="bottom"
android:layout_marginLeft="@dimen/list_entry_padding_horizontal_verylax" android:layout_marginLeft="@dimen/text_padding_horizontal_verylax"
android:layout_marginRight="@dimen/list_entry_padding_horizontal_verylax" android:layout_marginRight="@dimen/text_padding_horizontal_verylax"
android:layout_marginTop="@dimen/list_entry_padding_vertical" android:layout_marginTop="@dimen/text_padding_vertical"
android:layout_marginBottom="@dimen/list_entry_padding_vertical" android:layout_marginBottom="@dimen/text_padding_vertical"
android:baselineAligned="false" android:baselineAligned="false"
android:orientation="horizontal"> android:orientation="horizontal">
@ -104,7 +104,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="bottom" android:layout_gravity="bottom"
android:layout_weight="1" android:layout_weight="1"
android:drawablePadding="@dimen/list_entry_padding_horizontal_lax" android:drawablePadding="@dimen/text_padding_horizontal_lax"
android:gravity="bottom|left" android:gravity="bottom|left"
android:maxLines="2" android:maxLines="2"
android:textSize="@dimen/font_size_disclaimer" /> android:textSize="@dimen/font_size_disclaimer" />
@ -137,8 +137,8 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="bottom|left" android:layout_gravity="bottom|left"
android:layout_marginBottom="@dimen/list_entry_padding_vertical" android:layout_marginBottom="@dimen/text_padding_vertical"
android:layout_marginLeft="@dimen/list_entry_padding_horizontal_verylax" android:layout_marginLeft="@dimen/text_padding_horizontal_verylax"
android:textSize="@dimen/font_size_disclaimer" android:textSize="@dimen/font_size_disclaimer"
android:textColor="@color/fg_significant_on_light" /> android:textColor="@color/fg_significant_on_light" />
</FrameLayout> </FrameLayout>

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

@ -9,19 +9,19 @@
<TextView <TextView
android:id="@+id/directions_trip_details_fare_entry_row_name" android:id="@+id/directions_trip_details_fare_entry_row_name"
android:paddingLeft="@dimen/list_entry_padding_horizontal_lax" android:paddingLeft="@dimen/text_padding_horizontal_lax"
android:textSize="@dimen/font_size_normal" /> android:textSize="@dimen/font_size_normal" />
<TextView <TextView
android:id="@+id/directions_trip_details_fare_entry_row_fare" android:id="@+id/directions_trip_details_fare_entry_row_fare"
android:gravity="right" android:gravity="right"
android:paddingLeft="@dimen/list_entry_padding_horizontal_lax" android:paddingLeft="@dimen/text_padding_horizontal_lax"
android:textSize="@dimen/font_size_normal" android:textSize="@dimen/font_size_normal"
android:textStyle="bold" /> android:textStyle="bold" />
<TextView <TextView
android:id="@+id/directions_trip_details_fare_entry_row_unit" android:id="@+id/directions_trip_details_fare_entry_row_unit"
android:paddingLeft="@dimen/list_entry_padding_horizontal_lax" android:paddingLeft="@dimen/text_padding_horizontal_lax"
android:textSize="@dimen/font_size_normal" /> android:textSize="@dimen/font_size_normal" />
</TableRow> </TableRow>

8
oeffi/res/layout/directions_trip_details_individual_entry.xml
View file

@ -5,16 +5,16 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="horizontal" android:orientation="horizontal"
android:paddingLeft="@dimen/list_entry_padding_horizontal_lax"> android:paddingLeft="@dimen/text_padding_horizontal_lax">
<TextView <TextView
android:id="@+id/directions_trip_details_individual_entry_text" android:id="@+id/directions_trip_details_individual_entry_text"
android:layout_width="0px" android:layout_width="0px"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/list_entry_padding_vertical_lax" android:layout_marginBottom="@dimen/text_padding_vertical_lax"
android:layout_marginTop="@dimen/list_entry_padding_vertical_lax" android:layout_marginTop="@dimen/text_padding_vertical_lax"
android:layout_weight="1" android:layout_weight="1"
android:drawablePadding="@dimen/list_entry_padding_horizontal_cram" android:drawablePadding="@dimen/text_padding_horizontal_cram"
android:textSize="@dimen/font_size_large" /> android:textSize="@dimen/font_size_large" />
<ImageButton <ImageButton

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

@ -10,7 +10,7 @@
style="?android:attr/buttonBarStyle" style="?android:attr/buttonBarStyle"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/list_entry_padding_horizontal_lax" android:layout_marginLeft="@dimen/text_padding_horizontal_lax"
android:orientation="horizontal"> android:orientation="horizontal">
<LinearLayout <LinearLayout
@ -19,7 +19,7 @@
android:layout_weight="1" android:layout_weight="1"
android:baselineAligned="true" android:baselineAligned="true"
android:orientation="horizontal" android:orientation="horizontal"
android:paddingBottom="@dimen/list_entry_padding_vertical_lax" android:paddingBottom="@dimen/text_padding_vertical_lax"
android:paddingTop="6dp"> android:paddingTop="6dp">
<de.schildbach.oeffi.stations.LineView <de.schildbach.oeffi.stations.LineView
@ -35,13 +35,13 @@
android:layout_weight="1" android:layout_weight="1"
android:orientation="vertical" android:orientation="vertical"
android:paddingBottom="4dp" android:paddingBottom="4dp"
android:paddingLeft="@dimen/list_entry_padding_horizontal_lax"> android:paddingLeft="@dimen/text_padding_horizontal_lax">
<TextView <TextView
android:id="@+id/directions_trip_details_public_entry_destination" android:id="@+id/directions_trip_details_public_entry_destination"
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/text_padding_horizontal"
android:textColor="@color/fg_significant" android:textColor="@color/fg_significant"
android:textSize="@dimen/font_size_large" /> android:textSize="@dimen/font_size_large" />
@ -50,7 +50,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:drawableLeft="@drawable/ic_accessible_grey600_18dp" android:drawableLeft="@drawable/ic_accessible_grey600_18dp"
android:drawablePadding="@dimen/list_entry_padding_horizontal" android:drawablePadding="@dimen/text_padding_horizontal"
android:text="@string/directions_trip_details_public_entry_accessibility" android:text="@string/directions_trip_details_public_entry_accessibility"
android:textColor="@color/fg_insignificant" android:textColor="@color/fg_insignificant"
android:visibility="gone" /> android:visibility="gone" />
@ -60,7 +60,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
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/text_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/fg_insignificant" android:textColor="@color/fg_insignificant"
android:visibility="gone" /> android:visibility="gone" />
@ -80,8 +80,8 @@
android:id="@+id/directions_trip_details_public_entry_stops" android:id="@+id/directions_trip_details_public_entry_stops"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/list_entry_padding_horizontal_lax" android:layout_marginLeft="@dimen/text_padding_horizontal_lax"
android:layout_marginRight="@dimen/list_entry_padding_horizontal_lax" android:layout_marginRight="@dimen/text_padding_horizontal_lax"
android:baselineAligned="true" android:baselineAligned="true"
android:shrinkColumns="5" android:shrinkColumns="5"
android:stretchColumns="5" /> android:stretchColumns="5" />
@ -90,9 +90,9 @@
android:id="@+id/directions_trip_details_public_entry_message" android:id="@+id/directions_trip_details_public_entry_message"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/list_entry_padding_horizontal_lax" android:layout_marginLeft="@dimen/text_padding_horizontal_lax"
android:layout_marginRight="@dimen/list_entry_padding_horizontal_lax" android:layout_marginRight="@dimen/text_padding_horizontal_lax"
android:layout_marginTop="@dimen/list_entry_padding_vertical_lax" android:layout_marginTop="@dimen/text_padding_vertical_lax"
android:textSize="@dimen/font_size_tiny" android:textSize="@dimen/font_size_tiny"
android:visibility="gone" /> android:visibility="gone" />

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/text_padding_horizontal_lax"
android:textColor="@color/fg_significant" android:textColor="@color/fg_significant"
android:textSize="@dimen/font_size_large" /> android:textSize="@dimen/font_size_large" />

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

@ -10,27 +10,27 @@
<TextView <TextView
android:id="@+id/directions_trip_details_public_entry_stop_date" android:id="@+id/directions_trip_details_public_entry_stop_date"
android:layout_marginLeft="@dimen/list_entry_padding_horizontal_cram" android:layout_marginLeft="@dimen/text_padding_horizontal_cram"
android:layout_marginRight="@dimen/list_entry_padding_horizontal_cram" android:layout_marginRight="@dimen/text_padding_horizontal_cram"
android:maxWidth="128dp" android:maxWidth="128dp"
android:textColor="@color/fg_significant" 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/text_padding_horizontal_cram"
android:textColor="@color/fg_significant" 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/text_padding_horizontal"
android:textColor="@color/fg_significant" 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_position" android:id="@+id/directions_trip_details_public_entry_stop_position"
android:layout_marginLeft="@dimen/list_entry_padding_horizontal_lax" android:layout_marginLeft="@dimen/text_padding_horizontal_lax"
android:ellipsize="none" android:ellipsize="none"
android:gravity="center_horizontal" android:gravity="center_horizontal"
android:includeFontPadding="false" android:includeFontPadding="false"
@ -41,7 +41,7 @@
<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/text_padding_horizontal_lax"
android:background="?android:attr/selectableItemBackground" android:background="?android:attr/selectableItemBackground"
android:textColor="@color/fg_significant" android:textColor="@color/fg_significant"
android:textSize="@dimen/font_size_large" /> android:textSize="@dimen/font_size_large" />

8
oeffi/res/layout/directions_trip_overview_content.xml
View file

@ -23,10 +23,10 @@
android:id="@+id/directions_trip_overview_disclaimer_group" android:id="@+id/directions_trip_overview_disclaimer_group"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_marginLeft="@dimen/list_entry_padding_horizontal_verylax" android:layout_marginLeft="@dimen/text_padding_horizontal_verylax"
android:layout_marginRight="@dimen/list_entry_padding_horizontal_verylax" android:layout_marginRight="@dimen/text_padding_horizontal_verylax"
android:layout_marginTop="@dimen/list_entry_padding_vertical" android:layout_marginTop="@dimen/text_padding_vertical"
android:layout_marginBottom="@dimen/list_entry_padding_vertical"> android:layout_marginBottom="@dimen/text_padding_vertical">
<TextView <TextView
android:id="@+id/trips_server_product" android:id="@+id/trips_server_product"

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

@ -22,8 +22,8 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center" android:layout_gravity="center"
android:layout_marginLeft="@dimen/list_entry_padding_horizontal_verylax" android:layout_marginLeft="@dimen/text_padding_horizontal_verylax"
android:layout_marginRight="@dimen/list_entry_padding_horizontal_verylax" android:layout_marginRight="@dimen/text_padding_horizontal_verylax"
android:gravity="center" android:gravity="center"
android:text="@string/stations_favorite_stations_no_content_message" android:text="@string/stations_favorite_stations_no_content_message"
android:textSize="@dimen/font_size_large" /> android:textSize="@dimen/font_size_large" />

12
oeffi/res/layout/favorites_list_entry.xml
View file

@ -13,10 +13,10 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:orientation="vertical" android:orientation="vertical"
android:paddingBottom="@dimen/list_entry_padding_vertical_verylax" android:paddingBottom="@dimen/text_padding_vertical_verylax"
android:paddingLeft="@dimen/list_entry_padding_horizontal_verylax" android:paddingLeft="@dimen/text_padding_horizontal_verylax"
android:paddingRight="@dimen/list_entry_padding_horizontal_verylax" android:paddingRight="@dimen/text_padding_horizontal_verylax"
android:paddingTop="@dimen/list_entry_padding_vertical_verylax"> android:paddingTop="@dimen/text_padding_vertical_verylax">
<TextView <TextView
android:id="@+id/favorites_list_entry_network" android:id="@+id/favorites_list_entry_network"
@ -27,13 +27,13 @@
android:id="@+id/favorites_list_entry_place" android:id="@+id/favorites_list_entry_place"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/list_entry_padding_vertical_cram" /> android:layout_marginTop="@dimen/text_padding_vertical_cram" />
<TextView <TextView
android:id="@+id/favorites_list_entry_name" android:id="@+id/favorites_list_entry_name"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/list_entry_padding_vertical_cram" android:layout_marginTop="@dimen/text_padding_vertical_cram"
android:textStyle="bold" /> android:textStyle="bold" />
</LinearLayout> </LinearLayout>

8
oeffi/res/layout/hint_dialog.xml
View file

@ -3,10 +3,10 @@
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingBottom="@dimen/list_entry_padding_vertical_lax" android:paddingBottom="@dimen/text_padding_vertical_lax"
android:paddingLeft="@dimen/list_entry_padding_horizontal_lax" android:paddingLeft="@dimen/text_padding_horizontal_lax"
android:paddingRight="@dimen/list_entry_padding_horizontal_lax" android:paddingRight="@dimen/text_padding_horizontal_lax"
android:paddingTop="@dimen/list_entry_padding_vertical_lax"> android:paddingTop="@dimen/text_padding_vertical_lax">
<WebView <WebView
android:id="@+id/hint_dialog_webview" android:id="@+id/hint_dialog_webview"

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

@ -17,8 +17,8 @@
android:id="@+id/navigation_drawer_footer" android:id="@+id/navigation_drawer_footer"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/list_entry_padding_vertical_verylax" android:layout_marginBottom="@dimen/text_padding_vertical_verylax"
android:layout_marginTop="@dimen/list_entry_padding_vertical_verylax" android:layout_marginTop="@dimen/text_padding_vertical_verylax"
android:gravity="center_vertical" android:gravity="center_vertical"
android:orientation="horizontal"> android:orientation="horizontal">
@ -26,14 +26,14 @@
android:id="@+id/navigation_drawer_footer_heart" android:id="@+id/navigation_drawer_footer_heart"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/list_entry_padding_horizontal_verylax" android:layout_marginLeft="@dimen/text_padding_horizontal_verylax"
android:src="@drawable/ic_favorite_border_grey600_24dp" /> android:src="@drawable/ic_favorite_border_grey600_24dp" />
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/list_entry_padding_horizontal_verylax" android:layout_marginLeft="@dimen/text_padding_horizontal_verylax"
android:layout_marginRight="@dimen/list_entry_padding_horizontal_verylax" android:layout_marginRight="@dimen/text_padding_horizontal_verylax"
android:text="@string/navigation_drawer_message" android:text="@string/navigation_drawer_message"
android:textColor="#888" android:textColor="#888"
android:textSize="@dimen/font_size_small" /> android:textSize="@dimen/font_size_small" />

8
oeffi/res/layout/navigation_drawer_entry.xml
View file

@ -11,17 +11,17 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="horizontal" android:orientation="horizontal"
android:paddingBottom="@dimen/list_entry_padding_vertical_verylax" android:paddingBottom="@dimen/text_padding_vertical_verylax"
android:paddingLeft="@dimen/list_entry_padding_horizontal_verylax" android:paddingLeft="@dimen/text_padding_horizontal_verylax"
android:paddingRight="0px" android:paddingRight="0px"
android:paddingTop="@dimen/list_entry_padding_vertical_verylax"> android:paddingTop="@dimen/text_padding_vertical_verylax">
<ImageView <ImageView
android:id="@+id/navigation_drawer_entry_icon" android:id="@+id/navigation_drawer_entry_icon"
android:layout_width="36dp" android:layout_width="36dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:layout_marginRight="@dimen/list_entry_padding_horizontal_lax" android:layout_marginRight="@dimen/text_padding_horizontal_lax"
android:scaleType="fitCenter" /> android:scaleType="fitCenter" />
<LinearLayout <LinearLayout

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

@ -26,10 +26,10 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@color/bg_action_bar_appendix" android:background="@color/bg_action_bar_appendix"
android:paddingLeft="@dimen/list_entry_padding_horizontal_verylax" android:paddingLeft="@dimen/text_padding_horizontal_verylax"
android:paddingRight="@dimen/list_entry_padding_horizontal_verylax" android:paddingRight="@dimen/text_padding_horizontal_verylax"
android:paddingTop="@dimen/list_entry_padding_vertical_verylax" android:paddingTop="@dimen/text_padding_vertical_verylax"
android:paddingBottom="@dimen/list_entry_padding_vertical_verylax" android:paddingBottom="@dimen/text_padding_vertical_verylax"
android:text="@string/network_picker_firsttime_message" android:text="@string/network_picker_firsttime_message"
android:textColor="@color/fg_significant" android:textColor="@color/fg_significant"
android:textSize="@dimen/font_size_large" android:textSize="@dimen/font_size_large"
@ -61,8 +61,8 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="bottom|left" android:layout_gravity="bottom|left"
android:layout_marginBottom="@dimen/list_entry_padding_vertical" android:layout_marginBottom="@dimen/text_padding_vertical"
android:layout_marginLeft="@dimen/list_entry_padding_horizontal_verylax" android:layout_marginLeft="@dimen/text_padding_horizontal_verylax"
android:textSize="@dimen/font_size_disclaimer" android:textSize="@dimen/font_size_disclaimer"
android:textColor="@color/fg_significant_on_light" /> android:textColor="@color/fg_significant_on_light" />
</FrameLayout> </FrameLayout>

14
oeffi/res/layout/network_picker_entry.xml
View file

@ -11,16 +11,16 @@
<RelativeLayout <RelativeLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingBottom="@dimen/list_entry_padding_vertical_verylax" android:paddingBottom="@dimen/text_padding_vertical_verylax"
android:paddingLeft="@dimen/list_entry_padding_horizontal_verylax" android:paddingLeft="@dimen/text_padding_horizontal_verylax"
android:paddingRight="@dimen/list_entry_padding_horizontal_verylax" android:paddingRight="@dimen/text_padding_horizontal_verylax"
android:paddingTop="@dimen/list_entry_padding_vertical_verylax"> android:paddingTop="@dimen/text_padding_vertical_verylax">
<ImageView <ImageView
android:id="@+id/network_picker_entry_icon" android:id="@+id/network_picker_entry_icon"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginRight="@dimen/list_entry_padding_horizontal_lax" android:layout_marginRight="@dimen/text_padding_horizontal_lax"
android:scaleType="center" /> android:scaleType="center" />
<Space <Space
@ -58,9 +58,9 @@
android:layout_alignParentBottom="true" android:layout_alignParentBottom="true"
android:layout_alignParentRight="true" android:layout_alignParentRight="true"
android:layout_below="@id/network_picker_entry_label" android:layout_below="@id/network_picker_entry_label"
android:layout_marginLeft="@dimen/list_entry_padding_horizontal_lax" android:layout_marginLeft="@dimen/text_padding_horizontal_lax"
android:drawableLeft="@drawable/ic_beenhere_grey600_24dp" android:drawableLeft="@drawable/ic_beenhere_grey600_24dp"
android:drawablePadding="@dimen/list_entry_padding_horizontal" android:drawablePadding="@dimen/text_padding_horizontal"
android:gravity="left" /> android:gravity="left" />
<TextView <TextView

8
oeffi/res/layout/network_picker_separator.xml
View file

@ -6,9 +6,9 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@color/bg_divider" android:background="@color/bg_divider"
android:focusable="false" android:focusable="false"
android:paddingBottom="@dimen/list_entry_padding_vertical_cram" android:paddingBottom="@dimen/text_padding_vertical_cram"
android:paddingLeft="@dimen/list_entry_padding_horizontal_verylax" android:paddingLeft="@dimen/text_padding_horizontal_verylax"
android:paddingRight="@dimen/list_entry_padding_horizontal_lax" android:paddingRight="@dimen/text_padding_horizontal_lax"
android:paddingTop="@dimen/list_entry_padding_vertical_cram" android:paddingTop="@dimen/text_padding_vertical_cram"
android:textColor="@color/fg_less_significant" android:textColor="@color/fg_less_significant"
android:textStyle="bold" /> android:textStyle="bold" />

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

@ -70,10 +70,10 @@
<FrameLayout <FrameLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_marginLeft="@dimen/list_entry_padding_horizontal_verylax" android:layout_marginLeft="@dimen/text_padding_horizontal_verylax"
android:layout_marginRight="@dimen/list_entry_padding_horizontal_verylax" android:layout_marginRight="@dimen/text_padding_horizontal_verylax"
android:layout_marginTop="@dimen/list_entry_padding_vertical_lax" android:layout_marginTop="@dimen/text_padding_vertical_lax"
android:layout_marginBottom="@dimen/list_entry_padding_vertical_lax" android:layout_marginBottom="@dimen/text_padding_vertical_lax"
android:fitsSystemWindows="true"> android:fitsSystemWindows="true">
<de.schildbach.oeffi.util.ZoomControls <de.schildbach.oeffi.util.ZoomControls

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

@ -25,10 +25,10 @@
android:background="@color/bg_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/text_padding_vertical"
android:paddingLeft="@dimen/list_entry_padding_horizontal_lax" android:paddingLeft="@dimen/text_padding_horizontal_lax"
android:paddingRight="@dimen/list_entry_padding_horizontal_verylax" android:paddingRight="@dimen/text_padding_horizontal_verylax"
android:paddingTop="@dimen/list_entry_padding_vertical" android:paddingTop="@dimen/text_padding_vertical"
android:text="@string/plans_picker_connectivity_warning" android:text="@string/plans_picker_connectivity_warning"
android:visibility="gone" /> android:visibility="gone" />
@ -48,11 +48,11 @@
android:layout_weight="1" android:layout_weight="1"
android:drawableLeft="@drawable/ic_search_grey600_24dp" android:drawableLeft="@drawable/ic_search_grey600_24dp"
android:drawableTint="@color/fg_significant" android:drawableTint="@color/fg_significant"
android:drawablePadding="@dimen/list_entry_padding_horizontal" android:drawablePadding="@dimen/text_padding_horizontal"
android:gravity="left|center_vertical" android:gravity="left|center_vertical"
android:paddingBottom="@dimen/list_entry_padding_vertical" android:paddingBottom="@dimen/text_padding_vertical"
android:paddingLeft="@dimen/list_entry_padding_horizontal_lax" android:paddingLeft="@dimen/text_padding_horizontal_lax"
android:paddingTop="@dimen/list_entry_padding_vertical" android:paddingTop="@dimen/text_padding_vertical"
android:singleLine="true" android:singleLine="true"
android:textSize="@dimen/font_size_large" android:textSize="@dimen/font_size_large"
android:textStyle="bold" /> android:textStyle="bold" />

28
oeffi/res/layout/plans_picker_entry.xml
View file

@ -11,10 +11,10 @@
<RelativeLayout <RelativeLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingBottom="@dimen/list_entry_padding_vertical_verylax" android:paddingBottom="@dimen/text_padding_vertical_verylax"
android:paddingLeft="@dimen/list_entry_padding_horizontal_verylax" android:paddingLeft="@dimen/text_padding_horizontal_verylax"
android:paddingRight="@dimen/list_entry_padding_horizontal_verylax" android:paddingRight="@dimen/text_padding_horizontal_verylax"
android:paddingTop="@dimen/list_entry_padding_vertical_verylax"> android:paddingTop="@dimen/text_padding_vertical_verylax">
<FrameLayout <FrameLayout
android:id="@+id/plans_picker_entry_image" android:id="@+id/plans_picker_entry_image"
@ -22,7 +22,7 @@
android:layout_height="86dp" android:layout_height="86dp"
android:layout_alignParentLeft="true" android:layout_alignParentLeft="true"
android:layout_alignParentTop="true" android:layout_alignParentTop="true"
android:layout_marginRight="@dimen/list_entry_padding_horizontal_lax" android:layout_marginRight="@dimen/text_padding_horizontal_lax"
android:padding="2dp"> android:padding="2dp">
<ImageView <ImageView
@ -53,8 +53,8 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentTop="true" android:layout_alignParentTop="true"
android:layout_marginLeft="@dimen/list_entry_padding_horizontal_lax" android:layout_marginLeft="@dimen/text_padding_horizontal_lax"
android:layout_marginTop="@dimen/list_entry_padding_vertical_lax" android:layout_marginTop="@dimen/text_padding_vertical_lax"
android:layout_toLeftOf="@id/plans_picker_entry_context_button_space" android:layout_toLeftOf="@id/plans_picker_entry_context_button_space"
android:src="@drawable/ic_offline_pin_grey600_24dp" android:src="@drawable/ic_offline_pin_grey600_24dp"
android:tint="@color/fg_less_significant" /> android:tint="@color/fg_less_significant" />
@ -66,7 +66,7 @@
android:layout_alignParentTop="true" android:layout_alignParentTop="true"
android:layout_toLeftOf="@id/plans_picker_entry_loaded" android:layout_toLeftOf="@id/plans_picker_entry_loaded"
android:layout_toRightOf="@id/plans_picker_entry_image" android:layout_toRightOf="@id/plans_picker_entry_image"
android:paddingTop="@dimen/list_entry_padding_vertical_lax" android:paddingTop="@dimen/text_padding_vertical_lax"
android:textSize="@dimen/font_size_large" android:textSize="@dimen/font_size_large"
android:textStyle="bold" /> android:textStyle="bold" />
@ -79,8 +79,8 @@
android:layout_below="@id/plans_picker_entry_name" android:layout_below="@id/plans_picker_entry_name"
android:layout_marginLeft="6dp" android:layout_marginLeft="6dp"
android:gravity="right" android:gravity="right"
android:paddingBottom="@dimen/list_entry_padding_vertical_lax" android:paddingBottom="@dimen/text_padding_vertical_lax"
android:paddingTop="@dimen/list_entry_padding_vertical_lax" android:paddingTop="@dimen/text_padding_vertical_lax"
android:textColor="@color/fg_less_significant" /> android:textColor="@color/fg_less_significant" />
<ImageView <ImageView
@ -89,8 +89,8 @@
android:layout_height="26dp" android:layout_height="26dp"
android:layout_alignParentBottom="true" android:layout_alignParentBottom="true"
android:layout_toRightOf="@id/plans_picker_entry_image" android:layout_toRightOf="@id/plans_picker_entry_image"
android:paddingBottom="@dimen/list_entry_padding_vertical_lax" android:paddingBottom="@dimen/text_padding_vertical_lax"
android:paddingRight="@dimen/list_entry_padding_horizontal" /> android:paddingRight="@dimen/text_padding_horizontal" />
<TextView <TextView
android:id="@+id/plans_picker_entry_disclaimer" android:id="@+id/plans_picker_entry_disclaimer"
@ -101,8 +101,8 @@
android:layout_toLeftOf="@id/plans_picker_entry_valid_from" android:layout_toLeftOf="@id/plans_picker_entry_valid_from"
android:layout_toRightOf="@id/plans_picker_entry_network_logo" android:layout_toRightOf="@id/plans_picker_entry_network_logo"
android:maxLines="2" android:maxLines="2"
android:paddingBottom="@dimen/list_entry_padding_vertical_lax" android:paddingBottom="@dimen/text_padding_vertical_lax"
android:paddingTop="@dimen/list_entry_padding_vertical_lax" android:paddingTop="@dimen/text_padding_vertical_lax"
android:textColor="@color/fg_less_significant" /> android:textColor="@color/fg_less_significant" />
</RelativeLayout> </RelativeLayout>

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

@ -12,8 +12,8 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="horizontal" android:orientation="horizontal"
android:paddingLeft="@dimen/list_entry_padding_horizontal_lax" android:paddingLeft="@dimen/text_padding_horizontal_lax"
android:paddingRight="@dimen/list_entry_padding_horizontal_lax"> android:paddingRight="@dimen/text_padding_horizontal_lax">
<TextView <TextView
android:id="@+id/station_widget_distance" android:id="@+id/station_widget_distance"
@ -52,7 +52,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="0px" android:layout_height="0px"
android:layout_weight="1" android:layout_weight="1"
android:paddingBottom="@dimen/list_entry_padding_vertical"> android:paddingBottom="@dimen/text_padding_vertical">
<ListView <ListView
android:id="@+id/station_widget_departures" android:id="@+id/station_widget_departures"

16
oeffi/res/layout/station_widget_entry.xml
View file

@ -7,8 +7,8 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:baselineAligned="true" android:baselineAligned="true"
android:orientation="horizontal" android:orientation="horizontal"
android:paddingLeft="@dimen/list_entry_padding_horizontal_lax" android:paddingLeft="@dimen/text_padding_horizontal_lax"
android:paddingRight="@dimen/list_entry_padding_horizontal_lax"> android:paddingRight="@dimen/text_padding_horizontal_lax">
<TextView <TextView
android:id="@+id/station_widget_entry_line" android:id="@+id/station_widget_entry_line"
@ -16,8 +16,8 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_margin="2dp" android:layout_margin="2dp"
android:background="@color/bg_divider" android:background="@color/bg_divider"
android:paddingLeft="@dimen/list_entry_padding_horizontal" android:paddingLeft="@dimen/text_padding_horizontal"
android:paddingRight="@dimen/list_entry_padding_horizontal" android:paddingRight="@dimen/text_padding_horizontal"
android:textColor="@color/fg_significant_darkdefault" android:textColor="@color/fg_significant_darkdefault"
android:textStyle="bold" /> android:textStyle="bold" />
@ -37,8 +37,8 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_margin="2dp" android:layout_margin="2dp"
android:background="@color/bg_highlighted_darkdefault" android:background="@color/bg_highlighted_darkdefault"
android:paddingLeft="@dimen/list_entry_padding_horizontal" android:paddingLeft="@dimen/text_padding_horizontal"
android:paddingRight="@dimen/list_entry_padding_horizontal" android:paddingRight="@dimen/text_padding_horizontal"
android:singleLine="true" android:singleLine="true"
android:text="!" android:text="!"
android:textColor="@color/fg_significant_darkdefault" android:textColor="@color/fg_significant_darkdefault"
@ -52,8 +52,8 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_margin="2dp" android:layout_margin="2dp"
android:background="@color/bg_position_darkdefault" android:background="@color/bg_position_darkdefault"
android:paddingLeft="@dimen/list_entry_padding_horizontal" android:paddingLeft="@dimen/text_padding_horizontal"
android:paddingRight="@dimen/list_entry_padding_horizontal" android:paddingRight="@dimen/text_padding_horizontal"
android:singleLine="true" android:singleLine="true"
android:textColor="@color/bg_level0_darkdefault" android:textColor="@color/bg_level0_darkdefault"
android:textStyle="bold" android:textStyle="bold"

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

@ -36,10 +36,10 @@
android:background="@color/bg_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/text_padding_vertical"
android:paddingLeft="@dimen/list_entry_padding_horizontal_lax" android:paddingLeft="@dimen/text_padding_horizontal_lax"
android:paddingRight="@dimen/list_entry_padding_horizontal_verylax" android:paddingRight="@dimen/text_padding_horizontal_verylax"
android:paddingTop="@dimen/list_entry_padding_vertical" android:paddingTop="@dimen/text_padding_vertical"
android:text="@string/stations_connectivity_warning" android:text="@string/stations_connectivity_warning"
android:visibility="gone" /> android:visibility="gone" />
@ -59,11 +59,11 @@
android:layout_weight="1" android:layout_weight="1"
android:drawableLeft="@drawable/ic_search_grey600_24dp" android:drawableLeft="@drawable/ic_search_grey600_24dp"
android:drawableTint="@color/fg_significant" android:drawableTint="@color/fg_significant"
android:drawablePadding="@dimen/list_entry_padding_horizontal" android:drawablePadding="@dimen/text_padding_horizontal"
android:gravity="left|center_vertical" android:gravity="left|center_vertical"
android:paddingBottom="@dimen/list_entry_padding_vertical" android:paddingBottom="@dimen/text_padding_vertical"
android:paddingLeft="@dimen/list_entry_padding_horizontal_lax" android:paddingLeft="@dimen/text_padding_horizontal_lax"
android:paddingTop="@dimen/list_entry_padding_vertical" android:paddingTop="@dimen/text_padding_vertical"
android:singleLine="true" android:singleLine="true"
android:textSize="@dimen/font_size_large" android:textSize="@dimen/font_size_large"
android:textStyle="bold" /> android:textStyle="bold" />
@ -92,11 +92,11 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" android:layout_weight="1"
android:drawableLeft="@drawable/ic_location_searching_grey600_24dp" android:drawableLeft="@drawable/ic_location_searching_grey600_24dp"
android:drawablePadding="@dimen/list_entry_padding_horizontal" android:drawablePadding="@dimen/text_padding_horizontal"
android:gravity="left|center_vertical" android:gravity="left|center_vertical"
android:paddingBottom="@dimen/list_entry_padding_vertical" android:paddingBottom="@dimen/text_padding_vertical"
android:paddingLeft="@dimen/list_entry_padding_horizontal_lax" android:paddingLeft="@dimen/text_padding_horizontal_lax"
android:paddingTop="@dimen/list_entry_padding_vertical" android:paddingTop="@dimen/text_padding_vertical"
android:singleLine="true" android:singleLine="true"
android:textSize="@dimen/font_size_large" android:textSize="@dimen/font_size_large"
android:textStyle="bold" /> android:textStyle="bold" />
@ -128,8 +128,8 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center" android:layout_gravity="center"
android:layout_marginLeft="@dimen/list_entry_padding_horizontal_verylax" android:layout_marginLeft="@dimen/text_padding_horizontal_verylax"
android:layout_marginRight="@dimen/list_entry_padding_horizontal_verylax" android:layout_marginRight="@dimen/text_padding_horizontal_verylax"
android:gravity="center_horizontal" android:gravity="center_horizontal"
android:orientation="vertical"> android:orientation="vertical">
@ -147,7 +147,7 @@
style="@style/My.Widget.Button.Border" style="@style/My.Widget.Button.Border"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/list_entry_padding_vertical_verylax" android:layout_marginTop="@dimen/text_padding_vertical_verylax"
android:text="@string/stations_list_network_settings" /> android:text="@string/stations_list_network_settings" />
</LinearLayout> </LinearLayout>
@ -157,8 +157,8 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center" android:layout_gravity="center"
android:layout_marginLeft="@dimen/list_entry_padding_horizontal_verylax" android:layout_marginLeft="@dimen/text_padding_horizontal_verylax"
android:layout_marginRight="@dimen/list_entry_padding_horizontal_verylax" android:layout_marginRight="@dimen/text_padding_horizontal_verylax"
android:gravity="center_horizontal" android:gravity="center_horizontal"
android:orientation="vertical"> android:orientation="vertical">
@ -175,7 +175,7 @@
style="@style/My.Widget.Button.Border" style="@style/My.Widget.Button.Border"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/list_entry_padding_vertical_verylax" android:layout_marginTop="@dimen/text_padding_vertical_verylax"
android:text="@string/stations_location_permission_request" /> android:text="@string/stations_location_permission_request" />
</LinearLayout> </LinearLayout>
@ -185,8 +185,8 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center" android:layout_gravity="center"
android:layout_marginLeft="@dimen/list_entry_padding_horizontal_verylax" android:layout_marginLeft="@dimen/text_padding_horizontal_verylax"
android:layout_marginRight="@dimen/list_entry_padding_horizontal_verylax" android:layout_marginRight="@dimen/text_padding_horizontal_verylax"
android:gravity="center_horizontal" android:gravity="center_horizontal"
android:orientation="vertical"> android:orientation="vertical">
@ -201,7 +201,7 @@
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/list_entry_padding_vertical_lax" android:layout_marginTop="@dimen/text_padding_vertical_lax"
android:gravity="center" android:gravity="center"
android:maxWidth="256dp" android:maxWidth="256dp"
android:text="@string/stations_list_cannot_acquire_location_hint" /> android:text="@string/stations_list_cannot_acquire_location_hint" />
@ -211,7 +211,7 @@
style="@style/My.Widget.Button.Border" style="@style/My.Widget.Button.Border"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/list_entry_padding_vertical_verylax" android:layout_marginTop="@dimen/text_padding_vertical_verylax"
android:text="@string/stations_list_location_settings" /> android:text="@string/stations_list_location_settings" />
</LinearLayout> </LinearLayout>
@ -221,8 +221,8 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center" android:layout_gravity="center"
android:layout_marginLeft="@dimen/list_entry_padding_horizontal_verylax" android:layout_marginLeft="@dimen/text_padding_horizontal_verylax"
android:layout_marginRight="@dimen/list_entry_padding_horizontal_verylax" android:layout_marginRight="@dimen/text_padding_horizontal_verylax"
android:gravity="center_horizontal" android:gravity="center_horizontal"
android:orientation="vertical"> android:orientation="vertical">
@ -234,7 +234,7 @@
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/list_entry_padding_vertical_verylax" android:layout_marginTop="@dimen/text_padding_vertical_verylax"
android:gravity="center" android:gravity="center"
android:maxWidth="256dp" android:maxWidth="256dp"
android:text="@string/stations_list_acquiring_location" android:text="@string/stations_list_acquiring_location"
@ -244,7 +244,7 @@
android:id="@+id/stations_list_location_providers" android:id="@+id/stations_list_location_providers"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/list_entry_padding_vertical_verylax" /> android:layout_marginTop="@dimen/text_padding_vertical_verylax" />
</LinearLayout> </LinearLayout>
<!-- Querying nearby stations --> <!-- Querying nearby stations -->
@ -253,8 +253,8 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center" android:layout_gravity="center"
android:layout_marginLeft="@dimen/list_entry_padding_horizontal_verylax" android:layout_marginLeft="@dimen/text_padding_horizontal_verylax"
android:layout_marginRight="@dimen/list_entry_padding_horizontal_verylax" android:layout_marginRight="@dimen/text_padding_horizontal_verylax"
android:gravity="center_horizontal" android:gravity="center_horizontal"
android:orientation="vertical"> android:orientation="vertical">
@ -266,7 +266,7 @@
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/list_entry_padding_vertical_verylax" android:layout_marginTop="@dimen/text_padding_vertical_verylax"
android:gravity="center" android:gravity="center"
android:maxWidth="256dp" android:maxWidth="256dp"
android:text="@string/stations_list_querying_nearby" android:text="@string/stations_list_querying_nearby"
@ -279,8 +279,8 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center" android:layout_gravity="center"
android:layout_marginLeft="@dimen/list_entry_padding_horizontal_verylax" android:layout_marginLeft="@dimen/text_padding_horizontal_verylax"
android:layout_marginRight="@dimen/list_entry_padding_horizontal_verylax" android:layout_marginRight="@dimen/text_padding_horizontal_verylax"
android:gravity="center_horizontal" android:gravity="center_horizontal"
android:orientation="vertical"> android:orientation="vertical">
@ -292,7 +292,7 @@
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/list_entry_padding_vertical_verylax" android:layout_marginTop="@dimen/text_padding_vertical_verylax"
android:gravity="center" android:gravity="center"
android:maxWidth="256dp" android:maxWidth="256dp"
android:text="@string/stations_list_matching" android:text="@string/stations_list_matching"
@ -305,8 +305,8 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center" android:layout_gravity="center"
android:layout_marginLeft="@dimen/list_entry_padding_horizontal_verylax" android:layout_marginLeft="@dimen/text_padding_horizontal_verylax"
android:layout_marginRight="@dimen/list_entry_padding_horizontal_verylax" android:layout_marginRight="@dimen/text_padding_horizontal_verylax"
android:gravity="center_horizontal" android:gravity="center_horizontal"
android:orientation="vertical"> android:orientation="vertical">
@ -321,7 +321,7 @@
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/list_entry_padding_vertical_lax" android:layout_marginTop="@dimen/text_padding_vertical_lax"
android:gravity="center" android:gravity="center"
android:maxWidth="256dp" android:maxWidth="256dp"
android:text="@string/stations_list_empty_nearby_hint" /> android:text="@string/stations_list_empty_nearby_hint" />
@ -331,7 +331,7 @@
style="@style/My.Widget.Button.Border" style="@style/My.Widget.Button.Border"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/list_entry_padding_vertical_verylax" android:layout_marginTop="@dimen/text_padding_vertical_verylax"
android:text="@string/stations_list_network_settings" /> android:text="@string/stations_list_network_settings" />
</LinearLayout> </LinearLayout>
@ -341,8 +341,8 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center" android:layout_gravity="center"
android:layout_marginLeft="@dimen/list_entry_padding_horizontal_verylax" android:layout_marginLeft="@dimen/text_padding_horizontal_verylax"
android:layout_marginRight="@dimen/list_entry_padding_horizontal_verylax" android:layout_marginRight="@dimen/text_padding_horizontal_verylax"
android:gravity="center_horizontal" android:gravity="center_horizontal"
android:orientation="vertical"> android:orientation="vertical">
@ -357,7 +357,7 @@
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/list_entry_padding_vertical_lax" android:layout_marginTop="@dimen/text_padding_vertical_lax"
android:gravity="center" android:gravity="center"
android:maxWidth="256dp" android:maxWidth="256dp"
android:text="@string/stations_list_empty_query_hint" /> android:text="@string/stations_list_empty_query_hint" />
@ -370,10 +370,10 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="bottom" android:layout_gravity="bottom"
android:layout_marginLeft="@dimen/list_entry_padding_horizontal_verylax" android:layout_marginLeft="@dimen/text_padding_horizontal_verylax"
android:layout_marginRight="@dimen/list_entry_padding_horizontal_verylax" android:layout_marginRight="@dimen/text_padding_horizontal_verylax"
android:layout_marginTop="@dimen/list_entry_padding_vertical" android:layout_marginTop="@dimen/text_padding_vertical"
android:layout_marginBottom="@dimen/list_entry_padding_vertical" android:layout_marginBottom="@dimen/text_padding_vertical"
android:baselineAligned="false" android:baselineAligned="false"
android:orientation="horizontal"> android:orientation="horizontal">
@ -383,7 +383,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="bottom" android:layout_gravity="bottom"
android:layout_weight="1" android:layout_weight="1"
android:drawablePadding="@dimen/list_entry_padding_horizontal_lax" android:drawablePadding="@dimen/text_padding_horizontal_lax"
android:gravity="bottom|left" android:gravity="bottom|left"
android:maxLines="2" android:maxLines="2"
android:textSize="@dimen/font_size_disclaimer" /> android:textSize="@dimen/font_size_disclaimer" />
@ -419,8 +419,8 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="bottom|left" android:layout_gravity="bottom|left"
android:layout_marginBottom="@dimen/list_entry_padding_vertical" android:layout_marginBottom="@dimen/text_padding_vertical"
android:layout_marginLeft="@dimen/list_entry_padding_horizontal_verylax" android:layout_marginLeft="@dimen/text_padding_horizontal_verylax"
android:textSize="@dimen/font_size_disclaimer" android:textSize="@dimen/font_size_disclaimer"
android:textColor="@color/fg_significant_on_light" /> android:textColor="@color/fg_significant_on_light" />

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

@ -12,7 +12,7 @@
android:button="@null" android:button="@null"
android:checked="true" android:checked="true"
android:drawableLeft="@drawable/ic_menu_product_highspeed" android:drawableLeft="@drawable/ic_menu_product_highspeed"
android:drawablePadding="@dimen/list_entry_padding_horizontal_lax" android:drawablePadding="@dimen/text_padding_horizontal_lax"
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"
@ -24,7 +24,7 @@
android:button="@null" android:button="@null"
android:checked="true" android:checked="true"
android:drawableLeft="@drawable/ic_menu_product_bus" android:drawableLeft="@drawable/ic_menu_product_bus"
android:drawablePadding="@dimen/list_entry_padding_horizontal_lax" android:drawablePadding="@dimen/text_padding_horizontal_lax"
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"
@ -39,7 +39,7 @@
android:button="@null" android:button="@null"
android:checked="true" android:checked="true"
android:drawableLeft="@drawable/ic_menu_product_train" android:drawableLeft="@drawable/ic_menu_product_train"
android:drawablePadding="@dimen/list_entry_padding_horizontal_lax" android:drawablePadding="@dimen/text_padding_horizontal_lax"
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"
@ -51,7 +51,7 @@
android:button="@null" android:button="@null"
android:checked="true" android:checked="true"
android:drawableLeft="@drawable/ic_menu_product_call" android:drawableLeft="@drawable/ic_menu_product_call"
android:drawablePadding="@dimen/list_entry_padding_horizontal_lax" android:drawablePadding="@dimen/text_padding_horizontal_lax"
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"
@ -66,7 +66,7 @@
android:button="@null" android:button="@null"
android:checked="true" android:checked="true"
android:drawableLeft="@drawable/ic_menu_product_suburban" android:drawableLeft="@drawable/ic_menu_product_suburban"
android:drawablePadding="@dimen/list_entry_padding_horizontal_lax" android:drawablePadding="@dimen/text_padding_horizontal_lax"
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"
@ -78,7 +78,7 @@
android:button="@null" android:button="@null"
android:checked="true" android:checked="true"
android:drawableLeft="@drawable/ic_menu_product_ferry" android:drawableLeft="@drawable/ic_menu_product_ferry"
android:drawablePadding="@dimen/list_entry_padding_horizontal_lax" android:drawablePadding="@dimen/text_padding_horizontal_lax"
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"
@ -93,7 +93,7 @@
android:button="@null" android:button="@null"
android:checked="true" android:checked="true"
android:drawableLeft="@drawable/ic_menu_product_subway" android:drawableLeft="@drawable/ic_menu_product_subway"
android:drawablePadding="@dimen/list_entry_padding_horizontal_lax" android:drawablePadding="@dimen/text_padding_horizontal_lax"
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"
@ -105,7 +105,7 @@
android:button="@null" android:button="@null"
android:checked="true" android:checked="true"
android:drawableLeft="@drawable/ic_menu_product_cablecar" android:drawableLeft="@drawable/ic_menu_product_cablecar"
android:drawablePadding="@dimen/list_entry_padding_horizontal_lax" android:drawablePadding="@dimen/text_padding_horizontal_lax"
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"
@ -120,7 +120,7 @@
android:button="@null" android:button="@null"
android:checked="true" android:checked="true"
android:drawableLeft="@drawable/ic_menu_product_tram" android:drawableLeft="@drawable/ic_menu_product_tram"
android:drawablePadding="@dimen/list_entry_padding_horizontal_lax" android:drawablePadding="@dimen/text_padding_horizontal_lax"
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"

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

@ -36,8 +36,8 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center" android:layout_gravity="center"
android:layout_marginLeft="@dimen/list_entry_padding_horizontal_verylax" android:layout_marginLeft="@dimen/text_padding_horizontal_verylax"
android:layout_marginRight="@dimen/list_entry_padding_horizontal_verylax" android:layout_marginRight="@dimen/text_padding_horizontal_verylax"
android:gravity="center" android:gravity="center"
android:textSize="@dimen/font_size_large" /> android:textSize="@dimen/font_size_large" />
</ViewAnimator> </ViewAnimator>
@ -47,10 +47,10 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="bottom" android:layout_gravity="bottom"
android:layout_marginLeft="@dimen/list_entry_padding_horizontal_verylax" android:layout_marginLeft="@dimen/text_padding_horizontal_verylax"
android:layout_marginRight="@dimen/list_entry_padding_horizontal_verylax" android:layout_marginRight="@dimen/text_padding_horizontal_verylax"
android:layout_marginTop="@dimen/list_entry_padding_vertical" android:layout_marginTop="@dimen/text_padding_vertical"
android:layout_marginBottom="@dimen/list_entry_padding_vertical" android:layout_marginBottom="@dimen/text_padding_vertical"
android:baselineAligned="false" android:baselineAligned="false"
android:orientation="horizontal"> android:orientation="horizontal">
@ -60,7 +60,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="bottom" android:layout_gravity="bottom"
android:layout_weight="1" android:layout_weight="1"
android:drawablePadding="@dimen/list_entry_padding_horizontal_lax" android:drawablePadding="@dimen/text_padding_horizontal_lax"
android:gravity="bottom|left" android:gravity="bottom|left"
android:maxLines="2" android:maxLines="2"
android:textSize="@dimen/font_size_disclaimer" /> android:textSize="@dimen/font_size_disclaimer" />
@ -93,8 +93,8 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="bottom|left" android:layout_gravity="bottom|left"
android:layout_marginBottom="@dimen/list_entry_padding_vertical" android:layout_marginBottom="@dimen/text_padding_vertical"
android:layout_marginLeft="@dimen/list_entry_padding_horizontal_verylax" android:layout_marginLeft="@dimen/text_padding_horizontal_verylax"
android:textSize="@dimen/font_size_disclaimer" android:textSize="@dimen/font_size_disclaimer"
android:textColor="@color/fg_significant_on_light" /> android:textColor="@color/fg_significant_on_light" />
</FrameLayout> </FrameLayout>

14
oeffi/res/layout/stations_station_details_entry.xml
View file

@ -7,10 +7,10 @@
android:clipToPadding="false" android:clipToPadding="false"
android:focusable="true" android:focusable="true"
android:foreground="?android:attr/selectableItemBackground" android:foreground="?android:attr/selectableItemBackground"
android:paddingBottom="@dimen/list_entry_padding_vertical_verylax" android:paddingBottom="@dimen/text_padding_vertical_verylax"
android:paddingLeft="@dimen/list_entry_padding_horizontal_verylax" android:paddingLeft="@dimen/text_padding_horizontal_verylax"
android:paddingRight="@dimen/list_entry_padding_horizontal_verylax" android:paddingRight="@dimen/text_padding_horizontal_verylax"
android:paddingTop="@dimen/list_entry_padding_vertical_verylax"> android:paddingTop="@dimen/text_padding_vertical_verylax">
<!-- first row --> <!-- first row -->
@ -43,8 +43,8 @@
android:layout_toLeftOf="@id/stations_station_entry_delay" android:layout_toLeftOf="@id/stations_station_entry_delay"
android:layout_toRightOf="@id/stations_station_entry_line" android:layout_toRightOf="@id/stations_station_entry_line"
android:ellipsize="middle" android:ellipsize="middle"
android:paddingLeft="@dimen/list_entry_padding_horizontal" android:paddingLeft="@dimen/text_padding_horizontal"
android:paddingRight="@dimen/list_entry_padding_horizontal" android:paddingRight="@dimen/text_padding_horizontal"
android:singleLine="true" /> android:singleLine="true" />
<!-- second row --> <!-- second row -->
@ -62,7 +62,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignBaseline="@id/stations_station_entry_time_abs" android:layout_alignBaseline="@id/stations_station_entry_time_abs"
android:layout_toRightOf="@id/stations_station_entry_line" android:layout_toRightOf="@id/stations_station_entry_line"
android:paddingLeft="@dimen/list_entry_padding_horizontal" /> android:paddingLeft="@dimen/text_padding_horizontal" />
<TextView <TextView
android:id="@+id/stations_station_entry_capacity_2nd_class" android:id="@+id/stations_station_entry_capacity_2nd_class"

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

@ -5,22 +5,22 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@color/bg_divider" android:background="@color/bg_divider"
android:orientation="vertical" android:orientation="vertical"
android:paddingBottom="@dimen/list_entry_padding_vertical_lax" android:paddingBottom="@dimen/text_padding_vertical_lax"
android:paddingLeft="@dimen/list_entry_padding_horizontal_verylax" android:paddingLeft="@dimen/text_padding_horizontal_verylax"
android:paddingRight="@dimen/list_entry_padding_horizontal_verylax" android:paddingRight="@dimen/text_padding_horizontal_verylax"
android:paddingTop="@dimen/list_entry_padding_vertical_lax"> android:paddingTop="@dimen/text_padding_vertical_lax">
<LinearLayout <LinearLayout
android:id="@+id/stations_station_details_header_lines" android:id="@+id/stations_station_details_header_lines"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/list_entry_padding_vertical_lax" android:layout_marginTop="@dimen/text_padding_vertical_lax"
android:orientation="vertical" /> android:orientation="vertical" />
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/list_entry_padding_vertical_lax" android:layout_marginTop="@dimen/text_padding_vertical_lax"
android:baselineAligned="true" android:baselineAligned="true"
android:orientation="horizontal"> android:orientation="horizontal">
@ -35,7 +35,7 @@
android:id="@+id/stations_station_details_header_id" android:id="@+id/stations_station_details_header_id"
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/text_padding_horizontal"
android:textColor="@color/fg_less_significant" /> android:textColor="@color/fg_less_significant" />
</LinearLayout> </LinearLayout>

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

@ -5,7 +5,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:baselineAligned="true" android:baselineAligned="true"
android:orientation="horizontal" android:orientation="horizontal"
android:paddingTop="@dimen/list_entry_padding_vertical_cram"> android:paddingTop="@dimen/text_padding_vertical_cram">
<de.schildbach.oeffi.stations.LineView <de.schildbach.oeffi.stations.LineView
android:id="@+id/stations_station_details_header_line_line" android:id="@+id/stations_station_details_header_line_line"
@ -17,7 +17,7 @@
android:id="@+id/stations_station_details_header_line_destination" android:id="@+id/stations_station_details_header_line_destination"
android:layout_width="0px" android:layout_width="0px"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/list_entry_padding_horizontal_lax" android:layout_marginLeft="@dimen/text_padding_horizontal_lax"
android:layout_weight="1" android:layout_weight="1"
android:ellipsize="middle" android:ellipsize="middle"
android:singleLine="true" android:singleLine="true"

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

@ -12,10 +12,10 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical" android:orientation="vertical"
android:paddingBottom="@dimen/list_entry_padding_vertical_verylax" android:paddingBottom="@dimen/text_padding_vertical_verylax"
android:paddingLeft="@dimen/list_entry_padding_horizontal_verylax" android:paddingLeft="@dimen/text_padding_horizontal_verylax"
android:paddingRight="@dimen/list_entry_padding_horizontal_verylax" android:paddingRight="@dimen/text_padding_horizontal_verylax"
android:paddingTop="@dimen/list_entry_padding_vertical_verylax"> android:paddingTop="@dimen/text_padding_vertical_verylax">
<!-- first row --> <!-- first row -->
@ -47,15 +47,15 @@
android:id="@+id/station_entry_lines" android:id="@+id/station_entry_lines"
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/text_padding_horizontal"
android:textSize="@dimen/font_size_tiny" /> android:textSize="@dimen/font_size_tiny" />
<TextView <TextView
android:id="@+id/station_entry_distance" android:id="@+id/station_entry_distance"
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/text_padding_horizontal"
android:paddingRight="@dimen/list_entry_padding_horizontal_cram" android:paddingRight="@dimen/text_padding_horizontal_cram"
android:textSize="@dimen/font_size_small" /> android:textSize="@dimen/font_size_small" />
<de.schildbach.oeffi.stations.CompassNeedleView <de.schildbach.oeffi.stations.CompassNeedleView
@ -86,7 +86,7 @@
<FrameLayout <FrameLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/list_entry_padding_vertical_cram"> android:layout_marginTop="@dimen/text_padding_vertical_cram">
<LinearLayout <LinearLayout
android:id="@+id/station_entry_departures" android:id="@+id/station_entry_departures"
@ -98,16 +98,16 @@
android:id="@+id/station_entry_status" android:id="@+id/station_entry_status"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingBottom="@dimen/list_entry_padding_vertical_cram" android:paddingBottom="@dimen/text_padding_vertical_cram"
android:paddingTop="@dimen/list_entry_padding_vertical_cram" android:paddingTop="@dimen/text_padding_vertical_cram"
android:textColor="@color/fg_insignificant" android:textColor="@color/fg_insignificant"
android:textStyle="bold" /> android:textStyle="bold" />
<de.schildbach.oeffi.stations.LineView <de.schildbach.oeffi.stations.LineView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingBottom="@dimen/list_entry_padding_vertical_cram" android:paddingBottom="@dimen/text_padding_vertical_cram"
android:paddingTop="@dimen/list_entry_padding_vertical_cram" android:paddingTop="@dimen/text_padding_vertical_cram"
android:visibility="invisible" /> android:visibility="invisible" />
</FrameLayout> </FrameLayout>
@ -117,7 +117,7 @@
android:id="@+id/station_entry_messages" android:id="@+id/station_entry_messages"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/list_entry_padding_vertical_cram" android:layout_marginTop="@dimen/text_padding_vertical_cram"
android:orientation="vertical" /> android:orientation="vertical" />
</LinearLayout> </LinearLayout>

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

@ -16,8 +16,8 @@
android:id="@+id/departure_entry_destination" android:id="@+id/departure_entry_destination"
android:layout_width="0px" android:layout_width="0px"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/list_entry_padding_horizontal" android:layout_marginLeft="@dimen/text_padding_horizontal"
android:layout_marginRight="@dimen/list_entry_padding_horizontal_lax" android:layout_marginRight="@dimen/text_padding_horizontal_lax"
android:layout_weight="1" android:layout_weight="1"
android:ellipsize="middle" android:ellipsize="middle"
android:singleLine="true" /> android:singleLine="true" />
@ -26,7 +26,7 @@
android:id="@+id/departure_entry_message_index" android:id="@+id/departure_entry_message_index"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginRight="@dimen/list_entry_padding_horizontal_cram" android:layout_marginRight="@dimen/text_padding_horizontal_cram"
android:paddingLeft="3dp" android:paddingLeft="3dp"
android:paddingRight="3dp" android:paddingRight="3dp"
android:singleLine="true" android:singleLine="true"

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

@ -4,6 +4,6 @@
android:id="@+id/stations_station_entry_message" android:id="@+id/stations_station_entry_message"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingBottom="@dimen/list_entry_padding_vertical_cram" android:paddingBottom="@dimen/text_padding_vertical_cram"
android:paddingTop="@dimen/list_entry_padding_vertical_cram" android:paddingTop="@dimen/text_padding_vertical_cram"
android:textSize="@dimen/font_size_tiny" /> android:textSize="@dimen/font_size_tiny" />

16
oeffi/res/values-large/dimens.xml
View file

@ -10,14 +10,14 @@
<dimen name="action_bar_height">55dp</dimen> <dimen name="action_bar_height">55dp</dimen>
<dimen name="action_bar_button_width">55dp</dimen> <dimen name="action_bar_button_width">55dp</dimen>
<dimen name="action_bar_padding">6dp</dimen> <dimen name="action_bar_padding">6dp</dimen>
<dimen name="list_entry_padding_vertical_cram">2dp</dimen> <dimen name="text_padding_vertical_cram">2dp</dimen>
<dimen name="list_entry_padding_vertical">5dp</dimen> <dimen name="text_padding_vertical">5dp</dimen>
<dimen name="list_entry_padding_vertical_lax">6dp</dimen> <dimen name="text_padding_vertical_lax">6dp</dimen>
<dimen name="list_entry_padding_vertical_verylax">8dp</dimen> <dimen name="text_padding_vertical_verylax">8dp</dimen>
<dimen name="list_entry_padding_horizontal_cram">3dp</dimen> <dimen name="text_padding_horizontal_cram">3dp</dimen>
<dimen name="list_entry_padding_horizontal">6dp</dimen> <dimen name="text_padding_horizontal">6dp</dimen>
<dimen name="list_entry_padding_horizontal_lax">11dp</dimen> <dimen name="text_padding_horizontal_lax">11dp</dimen>
<dimen name="list_entry_padding_horizontal_verylax">16dp</dimen> <dimen name="text_padding_horizontal_verylax">16dp</dimen>
<dimen name="station_widget_divider_width">2dp</dimen> <dimen name="station_widget_divider_width">2dp</dimen>
<dimen name="directions_form_location_min_height">52dp</dimen> <dimen name="directions_form_location_min_height">52dp</dimen>
<dimen name="directions_form_location_divider_padding">36dp</dimen> <dimen name="directions_form_location_divider_padding">36dp</dimen>

16
oeffi/res/values-xlarge/dimens.xml
View file

@ -11,14 +11,14 @@
<dimen name="action_bar_button_width">50dp</dimen> <dimen name="action_bar_button_width">50dp</dimen>
<dimen name="action_bar_padding">8dp</dimen> <dimen name="action_bar_padding">8dp</dimen>
<dimen name="dialog_padding">16dp</dimen> <dimen name="dialog_padding">16dp</dimen>
<dimen name="list_entry_padding_vertical_cram">3dp</dimen> <dimen name="text_padding_vertical_cram">3dp</dimen>
<dimen name="list_entry_padding_vertical">6dp</dimen> <dimen name="text_padding_vertical">6dp</dimen>
<dimen name="list_entry_padding_vertical_lax">8dp</dimen> <dimen name="text_padding_vertical_lax">8dp</dimen>
<dimen name="list_entry_padding_vertical_verylax">12dp</dimen> <dimen name="text_padding_vertical_verylax">12dp</dimen>
<dimen name="list_entry_padding_horizontal_cram">4dp</dimen> <dimen name="text_padding_horizontal_cram">4dp</dimen>
<dimen name="list_entry_padding_horizontal">9dp</dimen> <dimen name="text_padding_horizontal">9dp</dimen>
<dimen name="list_entry_padding_horizontal_lax">14dp</dimen> <dimen name="text_padding_horizontal_lax">14dp</dimen>
<dimen name="list_entry_padding_horizontal_verylax">20dp</dimen> <dimen name="text_padding_horizontal_verylax">20dp</dimen>
<dimen name="station_widget_divider_width">4dp</dimen> <dimen name="station_widget_divider_width">4dp</dimen>
<dimen name="directions_form_location_min_height">60dp</dimen> <dimen name="directions_form_location_min_height">60dp</dimen>
<dimen name="directions_form_location_divider_padding">42dp</dimen> <dimen name="directions_form_location_divider_padding">42dp</dimen>

16
oeffi/res/values/dimens.xml
View file

@ -15,14 +15,14 @@
<dimen name="line_max_width">128dp</dimen> <dimen name="line_max_width">128dp</dimen>
<dimen name="line_style_border_stroke">2dp</dimen> <dimen name="line_style_border_stroke">2dp</dimen>
<dimen name="position_max_width">96dp</dimen> <dimen name="position_max_width">96dp</dimen>
<dimen name="list_entry_padding_vertical_cram">2dp</dimen> <dimen name="text_padding_vertical_cram">2dp</dimen>
<dimen name="list_entry_padding_vertical">3dp</dimen> <dimen name="text_padding_vertical">3dp</dimen>
<dimen name="list_entry_padding_vertical_lax">4dp</dimen> <dimen name="text_padding_vertical_lax">4dp</dimen>
<dimen name="list_entry_padding_vertical_verylax">6dp</dimen> <dimen name="text_padding_vertical_verylax">6dp</dimen>
<dimen name="list_entry_padding_horizontal_cram">2dp</dimen> <dimen name="text_padding_horizontal_cram">2dp</dimen>
<dimen name="list_entry_padding_horizontal">4dp</dimen> <dimen name="text_padding_horizontal">4dp</dimen>
<dimen name="list_entry_padding_horizontal_lax">8dp</dimen> <dimen name="text_padding_horizontal_lax">8dp</dimen>
<dimen name="list_entry_padding_horizontal_verylax">12dp</dimen> <dimen name="text_padding_horizontal_verylax">12dp</dimen>
<dimen name="station_widget_divider_width">0px</dimen> <dimen name="station_widget_divider_width">0px</dimen>
<dimen name="directions_form_location_min_height">48dp</dimen> <dimen name="directions_form_location_min_height">48dp</dimen>
<dimen name="directions_form_location_divider_padding">32dp</dimen> <dimen name="directions_form_location_divider_padding">32dp</dimen>

6
oeffi/src/de/schildbach/oeffi/directions/LocationView.java
View file

@ -152,9 +152,9 @@ public class LocationView extends FrameLayout implements LocationHelper.Callback
textView.setSelectAllOnFocus(true); textView.setSelectAllOnFocus(true);
textView.setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_FLAG_NO_SUGGESTIONS); textView.setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_FLAG_NO_SUGGESTIONS);
textView.setThreshold(0); textView.setThreshold(0);
textView.setCompoundDrawablePadding(res.getDimensionPixelSize(R.dimen.list_entry_padding_horizontal_lax)); textView.setCompoundDrawablePadding(res.getDimensionPixelSize(R.dimen.text_padding_horizontal_lax));
final int paddingCram = res.getDimensionPixelSize(R.dimen.list_entry_padding_horizontal_cram); final int paddingCram = res.getDimensionPixelSize(R.dimen.text_padding_horizontal_cram);
final int paddingLax = res.getDimensionPixelSize(R.dimen.list_entry_padding_horizontal_verylax); final int paddingLax = res.getDimensionPixelSize(R.dimen.text_padding_horizontal_verylax);
textView.setPadding(paddingLax, paddingCram, paddingLax, paddingCram); textView.setPadding(paddingLax, paddingCram, paddingLax, paddingCram);
textView.setOnItemClickListener((parent, view, position, id) -> { textView.setOnItemClickListener((parent, view, position, id) -> {
// workaround for NPE // workaround for NPE

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

@ -75,7 +75,7 @@ public class TripsGallery extends Gallery {
this.context = context; this.context = context;
final Resources res = getResources(); final Resources res = getResources();
paddingHorizontal = res.getDimensionPixelSize(R.dimen.list_entry_padding_horizontal); paddingHorizontal = res.getDimensionPixelSize(R.dimen.text_padding_horizontal);
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 colorSignificant = res.getColor(R.color.fg_significant); final int colorSignificant = res.getColor(R.color.fg_significant);

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

@ -571,7 +571,7 @@ public class StationDetailsActivity extends OeffiActivity implements StationsAwa
inflater = LayoutInflater.from(context); inflater = LayoutInflater.from(context);
final Resources res = context.getResources(); final Resources res = context.getResources();
LINES_LAYOUT_PARAMS.setMargins(0, res.getDimensionPixelSize(R.dimen.list_entry_padding_vertical_cram), 0, LINES_LAYOUT_PARAMS.setMargins(0, res.getDimensionPixelSize(R.dimen.text_padding_vertical_cram), 0,
0); 0);
} }

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

@ -294,7 +294,7 @@ public class StationsActivity extends OeffiMainActivity implements StationsAware
private final Drawable drawableClear = getResources().getDrawable(R.drawable.ic_clear_black_24dp); private final Drawable drawableClear = getResources().getDrawable(R.drawable.ic_clear_black_24dp);
private final Drawable drawableBlock = getResources().getDrawable(R.drawable.ic_block_black_24dp); private final Drawable drawableBlock = getResources().getDrawable(R.drawable.ic_block_black_24dp);
private final int starMargin = getResources() private final int starMargin = getResources()
.getDimensionPixelOffset(R.dimen.list_entry_padding_horizontal_lax); .getDimensionPixelOffset(R.dimen.text_padding_horizontal_lax);
private final int actionTriggerThreshold = Ints.max(drawableStar.getIntrinsicWidth(), private final int actionTriggerThreshold = Ints.max(drawableStar.getIntrinsicWidth(),
drawableClear.getIntrinsicWidth(), drawableBlock.getIntrinsicWidth()) + starMargin * 2; drawableClear.getIntrinsicWidth(), drawableBlock.getIntrinsicWidth()) + starMargin * 2;

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

@ -113,7 +113,7 @@ public class StationViewHolder extends RecyclerView.ViewHolder {
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.colorHighlighted = res.getColor(R.color.fg_highlighted);
this.listEntryVerticalPadding = res.getDimensionPixelOffset(R.dimen.list_entry_padding_vertical); this.listEntryVerticalPadding = res.getDimensionPixelOffset(R.dimen.text_padding_vertical);
} }
public void bind(final Station station, final Set<Product> productsFilter, final boolean forceShowPlace, public void bind(final Station station, final Set<Product> productsFilter, final boolean forceShowPlace,