show "running" races instead of dependent races in race selection and abort the correct races

This commit is contained in:
Peter Siegmund committed 2016-04-06 14:45:07 +02:00
1 parent cb2f69afcb
commit f77ed4e89e
9 files changed
+312 -68

No files matched your search

@@ -0,0 +1,38 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical">
<TextView
android:id="@+id/abort_hint"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentTop="true"
android:layout_marginBottom="8dp"
android:layout_marginTop="16dp"
android:paddingLeft="24dp"
android:paddingRight="24dp"
android:text="@string/abort_hint"
android:textAppearance="?attr/textSmall" />
<TextView
android:id="@+id/abort_summary"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:paddingLeft="24dp"
android:paddingRight="24dp"
tools:text="Lorem ipsum dolor sit amet, consetetur sadipscing elitr..." />
<android.support.v7.widget.RecyclerView
android:id="@+id/abort_list"
android:layout_width="wrap_content"
android:layout_height="100dp"
android:layout_above="@id/abort_summary"
android:layout_below="@id/abort_hint"
android:scrollbars="vertical"
android:textAppearance="?attr/textSmall" />
</RelativeLayout>
@@ -0,0 +1,28 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="?android:attr/listPreferredItemHeightSmall"
android:orientation="horizontal"
android:paddingLeft="24dp"
android:paddingRight="24dp">
<CheckBox
android:id="@+id/abort_checkbox"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_centerVertical="true" />
<TextView
android:id="@+id/abort_text"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_toLeftOf="@id/abort_checkbox"
android:ellipsize="end"
android:gravity="center_vertical"
android:maxLines="1"
android:textAppearance="?textSmall"
tools:text="Lorem ipsum..." />
</RelativeLayout>
@@ -498,4 +498,8 @@
<string name="preference_non_public_events_header">Zeige nicht öffentliche Events</string>
<string name="preference_non_public_events_summary">Lade alle Events, auch die nicht öffentlichen.</string>
<string name="abort_title">Rennen abbrechen</string>
<string name="abort_hint">Welche laufenden Rennen möchten Sie abbrechen?</string>
<string name="abort_dismiss">Verwerfen</string>
</resources>
@@ -78,6 +78,8 @@
<dimen name="competitor_edit_width">200dp</dimen>
<dimen name="dialog_top_padding">24dp</dimen>
<dimen name="abort_dialog_height">215dp</dimen>
<!-- custom dimens (float, integer) -->
<item name="picker_scale" format="float" type="integer">1</item>
<item name="flag_size" format="integer" type="integer">32</item>
@@ -525,4 +525,9 @@
<string name="preference_non_public_events_header">Show Non Public Events</string>
<string name="preference_non_public_events_summary">Load all events including the no public one.</string>
<string name="abort_title">Abort Races</string>
<string name="abort_hint">Which running races do you want to abort?</string>
<string name="abort_dismiss">Dismiss</string>
</resources>