Merge remote-tracking branch 'server/ubilabs--rcapp--develop' into ubilabs--rcapp--develop

2026-10-08 13:20:57 +00:00 · 2016-03-31 21:51:09 +02:00
commit 7916b4af6e
@@ -6,7 +6,7 @@ buildscript {
    }

    dependencies {
-        classpath 'com.android.tools.build:gradle:2.1.0-alpha1'
+        classpath 'com.android.tools.build:gradle:2.1.0-alpha4'
    }
 }

@@ -35,13 +35,13 @@ public class EventsResource extends AbstractSailingServerResource {

    @GET
    @Produces("application/json;charset=UTF-8")
-    public Response getEvents() {
-        // TODO bug2589, bug3504: the following will require EVENT:READ permission; it requires cross-server links to be authentication aware...
+    public Response getEvents(@QueryParam("showNonPublic") String showNonPublic) {
+     // TODO bug2589, bug3504: the following will require EVENT:READ permission; it requires cross-server links to be authentication aware...
        // SecurityUtils.getSubject().checkPermission(Permission.EVENT.getStringPermission(Permission.Mode.READ));
        JsonSerializer<EventBase> eventSerializer = new EventBaseJsonSerializer(new VenueJsonSerializer(new CourseAreaJsonSerializer()), new LeaderboardGroupBaseJsonSerializer());
        JSONArray result = new JSONArray();
        for (EventBase event : getService().getAllEvents()) {
-            if (event.isPublic()) {
+            if ((showNonPublic != null && Boolean.valueOf(showNonPublic)) || event.isPublic()) {
                result.add(eventSerializer.serialize(event));
            }
        }
@@ -9,6 +9,7 @@ import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.SharedPreferences;
+import android.content.res.Resources;
 import android.net.Uri;
 import android.support.annotation.StyleRes;
 import android.support.v7.app.AlertDialog;
@@ -16,6 +17,8 @@ import android.text.SpannableString;
 import android.text.Spanned;
 import android.text.method.LinkMovementMethod;
 import android.text.style.ClickableSpan;
+import android.text.style.ForegroundColorSpan;
+import android.util.TypedValue;
 import android.view.View;
 import android.widget.TextView;

@@ -53,7 +56,7 @@ public class EulaHelper {
        }

        builder.setTitle(R.string.eula_title);
-        builder.setMessage(getSpannableMessage());
+        builder.setMessage(getSpannableMessage(builder.getContext().getTheme()));
        builder.setCancelable(false);
        builder.setPositiveButton(R.string.eula_confirm, new DialogInterface.OnClickListener() {
            @Override
@@ -83,7 +86,7 @@ public class EulaHelper {
        mContext.startActivity(browserIntent);
    }

-    private SpannableString getSpannableMessage() {
+    private SpannableString getSpannableMessage(Resources.Theme theme) {
        String message = mContext.getString(R.string.eula_message);
        String clickableText = mContext.getString(R.string.linked_eula_message_part);

@@ -95,7 +98,10 @@ public class EulaHelper {
            }
        };

-        spannableString.setSpan(clickableSpan, message.indexOf(clickableText), message.indexOf(clickableText) + clickableText.length(), Spanned.SPAN_INCLUSIVE_INCLUSIVE);
+        spannableString.setSpan(clickableSpan, message.indexOf(clickableText), message.indexOf(clickableText) + clickableText.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
+        TypedValue typedValue = new TypedValue();
+        theme.resolveAttribute(R.attr.colorAccent, typedValue, true);
+        spannableString.setSpan(new ForegroundColorSpan(typedValue.data), message.indexOf(clickableText), message.indexOf(clickableText) + clickableText.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);

        return spannableString;
    }
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:color="#80ffffff" android:state_enabled="false"/>
+    <item android:color="#c0ffffff"/>
+
+</selector>
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:color="#80000000" android:state_enabled="false"/>
+    <item android:color="#c0000000"/>
+
+</selector>
@@ -6,7 +6,7 @@
        android:top="0dp">
        <bitmap
            android:gravity="center"
-            android:src="@drawable/flag_first_blue_32dp"/>
+            android:src="@drawable/flag_blue_first_32dp"/>
    </item>

 </layer-list>
@@ -6,7 +6,7 @@
        android:top="0dp">
        <bitmap
            android:gravity="center"
-            android:src="@drawable/flag_first_blue_32dp"/>
+            android:src="@drawable/flag_blue_first_32dp"/>
    </item>

    <item
@@ -6,7 +6,7 @@
        android:top="0dp">
        <bitmap
            android:gravity="center"
-            android:src="@drawable/flag_first_blue_64dp"/>
+            android:src="@drawable/flag_blue_first_48dp"/>
    </item>

 </layer-list>
@@ -6,7 +6,7 @@
        android:top="0dp">
        <bitmap
            android:gravity="center"
-            android:src="@drawable/flag_first_blue_48dp"/>
+            android:src="@drawable/flag_blue_first_48dp"/>
    </item>

    <item
@@ -6,7 +6,7 @@
        android:top="0dp">
        <bitmap
            android:gravity="center"
-            android:src="@drawable/flag_first_blue_48dp"/>
+            android:src="@drawable/flag_blue_first_64dp"/>
    </item>

 </layer-list>
@@ -6,7 +6,7 @@
        android:top="0dp">
        <bitmap
            android:gravity="center"
-            android:src="@drawable/flag_first_blue_64dp"/>
+            android:src="@drawable/flag_blue_first_64dp"/>
    </item>

    <item
@@ -6,7 +6,7 @@
        android:top="0dp">
        <bitmap
            android:gravity="center"
-            android:src="@drawable/flag_first_blue_96dp"/>
+            android:src="@drawable/flag_blue_first_96dp"/>
    </item>

 </layer-list>
@@ -6,7 +6,7 @@
        android:top="0dp">
        <bitmap
            android:gravity="center"
-            android:src="@drawable/flag_first_blue_96dp"/>
+            android:src="@drawable/flag_blue_first_96dp"/>
    </item>

    <item
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item
+        android:left="0dp"
+        android:top="0dp">
+        <bitmap
+            android:gravity="center"
+            android:src="@drawable/flag_blue_last_32dp"/>
+    </item>
+
+</layer-list>
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item
+        android:left="0dp"
+        android:top="0dp">
+        <bitmap
+            android:gravity="center"
+            android:src="@drawable/flag_blue_last_32dp"/>
+    </item>
+
+    <item
+        android:left="0dp"
+        android:top="0dp">
+        <bitmap
+            android:gravity="center"
+            android:src="@drawable/flag_shape_01_outline_32dp"/>
+    </item>
+
+</layer-list>
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item
+        android:left="0dp"
+        android:top="0dp">
+        <bitmap
+            android:gravity="center"
+            android:src="@drawable/flag_blue_last_48dp"/>
+    </item>
+
+</layer-list>
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item
+        android:left="0dp"
+        android:top="0dp">
+        <bitmap
+            android:gravity="center"
+            android:src="@drawable/flag_blue_last_48dp"/>
+    </item>
+
+    <item
+        android:left="0dp"
+        android:top="0dp">
+        <bitmap
+            android:gravity="center"
+            android:src="@drawable/flag_shape_01_outline_48dp"/>
+    </item>
+
+</layer-list>
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item
+        android:left="0dp"
+        android:top="0dp">
+        <bitmap
+            android:gravity="center"
+            android:src="@drawable/flag_blue_last_64dp"/>
+    </item>
+
+</layer-list>
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item
+        android:left="0dp"
+        android:top="0dp">
+        <bitmap
+            android:gravity="center"
+            android:src="@drawable/flag_blue_last_64dp"/>
+    </item>
+
+    <item
+        android:left="0dp"
+        android:top="0dp">
+        <bitmap
+            android:gravity="center"
+            android:src="@drawable/flag_shape_01_outline_64dp"/>
+    </item>
+
+</layer-list>
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item
+        android:left="0dp"
+        android:top="0dp">
+        <bitmap
+            android:gravity="center"
+            android:src="@drawable/flag_blue_last_96dp"/>
+    </item>
+
+</layer-list>
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item
+        android:left="0dp"
+        android:top="0dp">
+        <bitmap
+            android:gravity="center"
+            android:src="@drawable/flag_blue_last_96dp"/>
+    </item>
+
+    <item
+        android:left="0dp"
+        android:top="0dp">
+        <bitmap
+            android:gravity="center"
+            android:src="@drawable/flag_shape_01_outline_96dp"/>
+    </item>
+
+</layer-list>
@@ -4,6 +4,9 @@
    <!-- pressed -->
    <item android:drawable="@drawable/spinner_dark_pressed" android:state_pressed="true" />

+    <!-- disabled -->
+    <item android:drawable="@drawable/spinner_dark_disabled" android:state_enabled="false" />
+
    <!-- default -->
    <item android:drawable="@drawable/spinner_dark" />

@@ -4,6 +4,9 @@
    <!-- pressed -->
    <item android:drawable="@drawable/spinner_light_pressed" android:state_pressed="true" />

+    <!-- disabled -->
+    <item android:drawable="@drawable/spinner_light_disabled" android:state_enabled="false" />
+
    <!-- default -->
    <item android:drawable="@drawable/spinner_light" />

@@ -2,45 +2,14 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
    android:layout_width="match_parent"
    android:layout_height="match_parent"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
    android:orientation="vertical">

-    <RelativeLayout
+    <com.sap.sailing.racecommittee.app.ui.layouts.HeaderLayout
+        android:id="@+id/header"
        android:layout_width="match_parent"
-        android:layout_height="@dimen/selector_header_height"
-        android:background="?attr/sap_gray"
-        android:clickable="true">
-
-        <LinearLayout
-            android:id="@+id/header_layout"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerVertical="true"
-            android:layout_marginLeft="@dimen/side_padding"
-            android:orientation="horizontal">
-
-            <ImageView
-                android:id="@+id/header_back"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:src="?attr/chevron_left_24dp"
-                android:layout_gravity="center_vertical"/>
-
-            <TextView
-                android:id="@+id/header_text"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/not_available"
-                android:textAppearance="?attr/textHeader"
-                android:layout_gravity="center"/>
-        </LinearLayout>
-
-        <View
-            android:id="@+id/line_top"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/unscheduled_header_line"
-            android:layout_alignParentBottom="true"
-            android:background="?attr/black"/>
-    </RelativeLayout>
+        android:layout_height="wrap_content"
+        app:headerText="@string/not_available"/>

    <ListView
        android:id="@+id/listView"
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/header"
+    android:layout_width="match_parent"
+    android:layout_height="@dimen/selector_header_height"
+    android:background="?attr/sap_gray"
+    android:clickable="true">
+
+    <TextView
+        android:id="@+id/header_text"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_vertical"
+        android:layout_marginLeft="@dimen/side_padding"
+        android:drawableLeft="?attr/chevron_left_24dp"
+        android:gravity="center"
+        android:textAppearance="?attr/textHeader"
+        tools:text="Header Text" />
+
+    <View
+        android:id="@+id/line_top"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/header_line"
+        android:layout_gravity="bottom"
+        android:background="?attr/black" />
+</FrameLayout>
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <merge xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical"
-    tools:showIn="@layout/login_backdrop_normal">
+       xmlns:app="http://schemas.android.com/apk/res-auto"
+       xmlns:tools="http://schemas.android.com/tools"
+       android:layout_width="match_parent"
+       android:layout_height="match_parent"
+       android:orientation="vertical"
+       tools:showIn="@layout/login_backdrop_normal">

    <RelativeLayout
        android:layout_width="match_parent"
@@ -19,7 +19,7 @@
            android:layout_alignParentRight="true"
            android:layout_centerVertical="true"
            android:layout_marginLeft="@dimen/side_padding"
-            android:src="@drawable/ic_create_light" />
+            android:src="@drawable/ic_create_light"/>

        <TextView
            android:id="@+id/server_url_label"
@@ -27,8 +27,9 @@
            android:layout_height="wrap_content"
            android:layout_alignParentLeft="true"
            android:layout_toLeftOf="@id/change_server"
+            android:paddingLeft="@dimen/float_label_padding"
            android:text="@string/server_url"
-            android:textColor="@color/constant_black" />
+            android:textAppearance="?attr/floatLabel"/>

        <TextView
            android:id="@+id/server_url"
@@ -37,14 +38,15 @@
            android:layout_alignParentLeft="true"
            android:layout_below="@id/server_url_label"
            android:layout_toLeftOf="@id/change_server"
+            android:paddingLeft="@dimen/float_label_padding"
+            android:textAppearance="?attr/textSmall"
            android:textColor="@color/constant_black"
-            tools:text="https://dev.sapsailing.com" />
+            tools:text="https://dev.sapsailing.com"/>
    </RelativeLayout>

-    <com.sap.sailing.racecommittee.app.ui.views.FloatLabelLayout
+    <com.sap.sailing.racecommittee.app.ui.layouts.FloatLabelLayout
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/side_padding"
        app:floatLabelPaddingLeft="@dimen/float_label_padding"
        app:floatLabelTextAppearance="?attr/floatLabel">

@@ -54,14 +56,14 @@
            android:layout_height="wrap_content"
            android:hint="@string/username"
            android:inputType="text"
+            android:textAppearance="?attr/textSmall"
            android:textColor="@color/constant_black"
-            android:textColorHint="@color/dialog_color_text" />
-    </com.sap.sailing.racecommittee.app.ui.views.FloatLabelLayout>
+            android:textColorHint="@color/dialog_color_text"/>
+    </com.sap.sailing.racecommittee.app.ui.layouts.FloatLabelLayout>

-    <com.sap.sailing.racecommittee.app.ui.views.FloatLabelLayout
+    <com.sap.sailing.racecommittee.app.ui.layouts.FloatLabelLayout
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/side_padding"
        app:floatLabelPaddingLeft="@dimen/float_label_padding"
        app:floatLabelTextAppearance="?attr/floatLabel">

@@ -71,9 +73,10 @@
            android:layout_height="wrap_content"
            android:hint="@string/password"
            android:inputType="textPassword"
+            android:textAppearance="?attr/textSmall"
            android:textColor="@color/constant_black"
-            android:textColorHint="@color/dialog_color_text" />
-    </com.sap.sailing.racecommittee.app.ui.views.FloatLabelLayout>
+            android:textColorHint="@color/dialog_color_text"/>
+    </com.sap.sailing.racecommittee.app.ui.layouts.FloatLabelLayout>

    <Button
        android:id="@+id/login_request"
@@ -82,6 +85,6 @@
        android:layout_height="wrap_content"
        android:layout_marginTop="@dimen/side_padding"
        android:text="@string/login"
-        android:textSize="@dimen/textSize_18" />
+        android:textSize="@dimen/textSize_18"/>

 </merge>
@@ -7,7 +7,7 @@
              android:orientation="vertical"
              android:padding="@dimen/side_padding">

-    <com.sap.sailing.racecommittee.app.ui.views.FloatLabelLayout
+    <com.sap.sailing.racecommittee.app.ui.layouts.FloatLabelLayout
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
        android:layout_marginTop="@dimen/side_padding"
@@ -24,9 +24,9 @@
            android:textColor="@color/black"
            android:textColorHint="@color/dialog_color_text"
            tools:text="@string/preference_server_url_default"/>
-    </com.sap.sailing.racecommittee.app.ui.views.FloatLabelLayout>
+    </com.sap.sailing.racecommittee.app.ui.layouts.FloatLabelLayout>

-    <com.sap.sailing.racecommittee.app.ui.views.FloatLabelLayout
+    <com.sap.sailing.racecommittee.app.ui.layouts.FloatLabelLayout
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
        android:layout_marginTop="@dimen/side_padding"
@@ -45,5 +45,5 @@
            android:textColor="@color/black"
            android:textColorHint="@color/dialog_color_text"
            tools:text="N10"/>
-    </com.sap.sailing.racecommittee.app.ui.views.FloatLabelLayout>
+    </com.sap.sailing.racecommittee.app.ui.layouts.FloatLabelLayout>
 </LinearLayout>
@@ -6,7 +6,7 @@
    tools:showIn="@layout/race_panel_flags_ver">

    <RelativeLayout
-        android:id="@+id/more_flags_layer"
+        android:id="@+id/blue_first_flags_layer"
        android:layout_width="wrap_content"
        android:layout_height="match_parent"
        android:layout_centerInParent="true">
@@ -25,7 +25,7 @@
                <ImageView
                    android:layout_width="match_parent"
                    android:layout_height="@dimen/side_button_imageSize"
-                    android:src="?attr/flags_more" />
+                    android:src="?attr/flags_blue_first" />
            </RelativeLayout>

            <TextView
@@ -37,7 +37,7 @@
        </LinearLayout>

        <FrameLayout
-            android:id="@+id/more_flags_lock"
+            android:id="@+id/blue_first_flags_lock"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:layout_alignParentRight="true"
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="utf-8"?>
+<merge xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:showIn="@layout/race_panel_flags_ver">
+
+    <RelativeLayout
+        android:id="@+id/blue_last_flags_layer"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:layout_centerInParent="true">
+
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerInParent="true"
+            android:orientation="vertical">
+
+            <RelativeLayout
+                android:layout_width="@dimen/side_button_imageSize"
+                android:layout_height="@dimen/side_button_imageSize"
+                android:layout_gravity="center_horizontal">
+
+                <ImageView
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/side_button_imageSize"
+                    android:src="?attr/flags_blue_last" />
+            </RelativeLayout>
+
+            <TextView
+                android:id="@+id/blue_last_flags_text"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_horizontal"
+                android:textAppearance="?attr/textPanelCaption"
+                tools:text="00:12:34" />
+        </LinearLayout>
+
+        <FrameLayout
+            android:id="@+id/blue_last_flags_lock"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentRight="true"
+            android:layout_alignParentTop="true"
+            android:background="@color/lock_background"
+            android:padding="@dimen/panel_lock_padding"
+            android:visibility="gone"
+            tools:visibility="visible">
+
+            <ImageView
+                android:layout_width="@dimen/side_button_lockSize"
+                android:layout_height="@dimen/side_button_lockSize"
+                android:src="?attr/lock_outline" />
+        </FrameLayout>
+    </RelativeLayout>
+</merge>
@@ -1,55 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
    android:layout_width="match_parent"
    android:layout_height="match_parent"
    android:orientation="vertical">

-    <FrameLayout
-        android:id="@+id/photo_header"
+    <com.sap.sailing.racecommittee.app.ui.layouts.HeaderLayout
+        android:id="@+id/header"
        android:layout_width="match_parent"
-        android:layout_height="@dimen/selector_header_height"
-        android:background="?attr/sap_gray"
-        android:clickable="false">
-
-        <LinearLayout
-            android:id="@+id/header_text"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical"
-            android:layout_marginLeft="@dimen/side_padding"
-            android:orientation="horizontal">
-
-            <ImageView
-                android:id="@+id/header_back"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_vertical"
-                android:src="?attr/chevron_left_24dp"/>
-
-            <TextView
-                android:id="@+id/header_caption"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:text="@string/finished_list"
-                android:textAppearance="?attr/textHeader"/>
-        </LinearLayout>
-
-        <View
-            android:id="@+id/line_top"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/unscheduled_header_line"
-            android:layout_gravity="bottom"
-            android:background="?attr/black"/>
-    </FrameLayout>
+        android:layout_height="wrap_content"
+        app:headerText="@string/finished_list" />

    <android.support.v7.widget.RecyclerView
        android:id="@+id/photo_list"
        android:layout_width="match_parent"
        android:layout_height="0dp"
        android:layout_weight="4"
-        android:paddingTop="@dimen/side_padding"/>
+        android:paddingTop="@dimen/side_padding" />

    <LinearLayout
        android:layout_width="match_parent"
@@ -70,7 +37,7 @@
                android:layout_gravity="center"
                android:background="@drawable/round_button_outline"
                android:padding="@dimen/default_padding_half"
-                android:src="?attr/photo_camera"/>
+                android:src="?attr/photo_camera" />
        </FrameLayout>

        <FrameLayout
@@ -78,7 +45,7 @@
            android:layout_height="match_parent"
            android:layout_weight="1">

-            <include layout="@layout/photo_list_button"/>
+            <include layout="@layout/photo_list_button" />
        </FrameLayout>
    </LinearLayout>
 </LinearLayout>
@@ -7,7 +7,7 @@
    android:clickable="true">

    <RelativeLayout
-        android:id="@+id/tracking_header"
+        android:id="@+id/protest_header"
        android:layout_width="match_parent"
        android:layout_height="@dimen/selector_header_height"
        android:background="?attr/sap_gray"
@@ -41,7 +41,7 @@
        <View
            android:id="@+id/line_top"
            android:layout_width="match_parent"
-            android:layout_height="@dimen/unscheduled_header_line"
+            android:layout_height="@dimen/header_line"
            android:layout_alignParentBottom="true"
            android:background="?attr/black"/>
    </RelativeLayout>
@@ -78,7 +78,7 @@
        android:layout_width="match_parent"
        android:layout_height="match_parent"
        android:layout_above="@id/bottom_bar"
-        android:layout_below="@+id/tracking_header"
+        android:layout_below="@id/protest_header"
        android:background="?attr/sap_gray_black_30">

        <RelativeLayout
@@ -36,7 +36,7 @@
                android:layout_gravity="center"
                android:layout_marginLeft="@dimen/side_padding"
                android:layout_marginRight="@dimen/side_padding"
-                android:src="?attr/flag_first_blue" />
+                android:src="?attr/flag_blue_first" />

            <TextView
                android:id="@+id/header_headline"
@@ -5,21 +5,36 @@
    android:layout_height="@dimen/navigation_drawer_cell_height"
    android:background="?attr/sap_gray">

-    <ImageView
-        android:id="@+id/protest_image"
+    <LinearLayout
+        android:id="@+id/protest_layout"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:layout_alignParentRight="true"
        android:layout_centerVertical="true"
-        android:layout_marginLeft="@dimen/default_margin"
-        android:layout_marginRight="@dimen/default_margin"
-        tools:src="@drawable/flag_bravo_48dp" />
+        android:orientation="vertical">
+
+        <ImageView
+            android:id="@+id/protest_image"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="@dimen/default_margin"
+            android:layout_marginRight="@dimen/default_margin"
+            tools:src="@drawable/flag_bravo_48dp" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/protest_time"
+            android:layout_gravity="center_horizontal"
+            android:paddingTop="3dp"
+            android:textAppearance="?attr/textPanelCaption"/>
+    </LinearLayout>

    <ImageView
        android:id="@+id/delimiter_line"
        android:layout_width="@dimen/thin_line"
        android:layout_height="match_parent"
-        android:layout_toLeftOf="@id/protest_image"
+        android:layout_toLeftOf="@id/protest_layout"
        android:background="?attr/black" />

    <ImageView
@@ -79,19 +79,35 @@
        </RelativeLayout>

        <RelativeLayout
-            android:id="@+id/more_flags"
+            android:id="@+id/blue_first_flags"
            android:layout_width="0dp"
            android:layout_height="match_parent"
            android:layout_weight="1">

            <ImageView
-                android:id="@+id/more_flags_marker"
+                android:id="@+id/first_blue_flags_marker"
                android:layout_width="@dimen/thin_line"
                android:layout_height="match_parent"
                android:layout_alignParentRight="true"
                android:src="?attr/marker"/>

-            <include layout="@layout/panel_button_more"/>
+            <include layout="@layout/panel_button_blue_first"/>
+        </RelativeLayout>
+
+        <RelativeLayout
+            android:id="@+id/blue_last_flags"
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="1">
+
+            <ImageView
+                android:id="@+id/blue_down_flags_marker"
+                android:layout_width="@dimen/thin_line"
+                android:layout_height="match_parent"
+                android:layout_alignParentRight="true"
+                android:src="?attr/marker"/>
+
+            <include layout="@layout/panel_button_blue_last"/>
        </RelativeLayout>

        <RelativeLayout
@@ -80,19 +80,35 @@
        </RelativeLayout>

        <RelativeLayout
-            android:id="@+id/more_flags"
+            android:id="@+id/blue_first_flags"
            android:layout_width="match_parent"
            android:layout_height="0dp"
            android:layout_weight="1">

            <ImageView
-                android:id="@+id/more_flags_marker"
+                android:id="@+id/first_blue_flags_marker"
                android:layout_width="match_parent"
                android:layout_height="@dimen/thin_line"
                android:layout_alignParentBottom="true"
                android:src="?attr/marker"/>

-            <include layout="@layout/panel_button_more"/>
+            <include layout="@layout/panel_button_blue_first"/>
+        </RelativeLayout>
+
+        <RelativeLayout
+            android:id="@+id/blue_last_flags"
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="1">
+
+            <ImageView
+                android:id="@+id/blue_down_flags_marker"
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/thin_line"
+                android:layout_alignParentBottom="true"
+                android:src="?attr/marker"/>
+
+            <include layout="@layout/panel_button_blue_last"/>
        </RelativeLayout>

        <RelativeLayout
@@ -11,6 +11,8 @@
        android:id="@+id/timer_text"
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
+        android:layout_marginLeft="@dimen/side_padding"
+        android:layout_marginRight="@dimen/side_padding"
        android:layout_marginTop="@dimen/header_margin_top"
        android:gravity="center"
        android:singleLine="true"
@@ -30,8 +32,8 @@
        android:layout_height="wrap_content"
        android:layout_above="@id/time_marker"
        android:layout_centerHorizontal="true"
-        android:baselineAligned="false"
-        android:layout_marginBottom="@dimen/side_padding">
+        android:layout_marginBottom="@dimen/side_padding"
+        android:baselineAligned="false">


        <RelativeLayout
@@ -45,9 +47,9 @@
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                android:layout_centerVertical="true"
+                android:layout_toRightOf="@+id/linked_locked_area"
                android:textColor="?attr/white"
                android:textSize="@dimen/panel_button_caption_size"
-                android:layout_toRightOf="@+id/linked_locked_area"
                tools:text="@string/time_start"/>

            <LinearLayout
@@ -80,9 +82,9 @@
        <RelativeLayout
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
-            android:layout_toRightOf="@+id/start_time_container"
+            android:layout_centerVertical="true"
            android:layout_marginLeft="@dimen/side_padding"
-            android:layout_centerVertical="true">
+            android:layout_toRightOf="@+id/start_time_container">

            <TextView
                android:id="@+id/current_time"
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="@dimen/selector_header_height"
-    android:background="?attr/sap_gray"
-    android:clickable="true">
-
-    <LinearLayout
-        android:id="@+id/header_text"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_centerVertical="true"
-        android:layout_marginLeft="@dimen/side_padding"
-        android:orientation="horizontal">
-
-        <ImageView
-            android:id="@+id/header_back"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical"
-            android:src="?attr/chevron_left_24dp"/>
-
-        <TextView
-            android:id="@+id/header_caption"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:text="@string/course"
-            android:textAppearance="?attr/textHeader"/>
-    </LinearLayout>
-
-    <View
-        android:id="@+id/line_top"
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/unscheduled_header_line"
-        android:layout_alignParentBottom="true"
-        android:background="?attr/black"/>
-</RelativeLayout>
@@ -1,14 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
    android:layout_width="match_parent"
    android:layout_height="match_parent"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
    android:background="?attr/sap_gray_black_30"
    android:clickable="true"
    android:orientation="vertical">

-    <include
+    <com.sap.sailing.racecommittee.app.ui.layouts.HeaderLayout
        android:id="@+id/header"
-        layout="@layout/race_schedule_course_header"/>
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:headerText="@string/course"/>

 </LinearLayout>
@@ -2,11 +2,14 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
    android:layout_width="match_parent"
    android:layout_height="match_parent"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
    android:orientation="vertical">

-    <include
+    <com.sap.sailing.racecommittee.app.ui.layouts.HeaderLayout
        android:id="@+id/header"
-        layout="@layout/race_schedule_course_header" />
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:headerText="@string/course"/>

    <FrameLayout
        android:layout_width="match_parent"
@@ -59,9 +62,7 @@
                android:id="@+id/new_course"
                android:layout_width="match_parent"
                android:layout_height="match_parent"
-                android:layout_above="@id/bottom_bar"
-                android:layout_marginLeft="@dimen/side_padding"
-                android:layout_marginRight="@dimen/side_padding" />
+                android:layout_above="@id/bottom_bar" />
        </RelativeLayout>
    </FrameLayout>
 </RelativeLayout>
@@ -2,11 +2,14 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
    android:layout_width="match_parent"
    android:layout_height="match_parent"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
    android:orientation="vertical">

-    <include
+    <com.sap.sailing.racecommittee.app.ui.layouts.HeaderLayout
        android:id="@+id/header"
-        layout="@layout/race_schedule_course_header" />
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:headerText="@string/course"/>

    <RelativeLayout
        android:layout_width="match_parent"
@@ -1,12 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
    android:layout_width="match_parent"
    android:layout_height="match_parent">

-    <include
+    <com.sap.sailing.racecommittee.app.ui.layouts.HeaderLayout
        android:id="@+id/header"
-        layout="@layout/race_schedule_course_header"/>
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:headerText="@string/course" />

    <ListView
        android:id="@+id/listView"
@@ -15,5 +17,5 @@
        android:layout_below="@id/header"
        android:background="?attr/sap_gray_black_30"
        android:divider="@null"
-        android:dividerHeight="0dp"/>
+        android:dividerHeight="0dp" />
 </RelativeLayout>
@@ -1,44 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent">
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    xmlns:app="http://schemas.android.com/apk/res-auto">

-    <RelativeLayout
+    <com.sap.sailing.racecommittee.app.ui.layouts.HeaderLayout
        android:id="@+id/header"
        android:layout_width="match_parent"
-        android:layout_height="@dimen/selector_header_height"
-        android:background="?attr/sap_gray">
-
-        <LinearLayout
-            android:id="@+id/header_text"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerVertical="true"
-            android:layout_marginLeft="@dimen/side_padding"
-            android:orientation="horizontal">
-
-            <ImageView
-                android:id="@+id/header_back"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:src="?attr/chevron_left_24dp"/>
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/start_mode"
-                android:textAppearance="?attr/textHeader"
-                android:layout_gravity="center"/>
-        </LinearLayout>
-
-        <View
-            android:id="@+id/line_top"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/unscheduled_header_line"
-            android:layout_alignParentBottom="true"
-            android:background="?attr/black"/>
-    </RelativeLayout>
+        android:layout_height="wrap_content"
+        app:headerText="@string/start_mode"/>

    <ListView
        android:id="@+id/listView"
@@ -1,46 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
    android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    xmlns:app="http://schemas.android.com/apk/res-auto">

-    <RelativeLayout
+    <com.sap.sailing.racecommittee.app.ui.layouts.HeaderLayout
        android:id="@+id/header"
        android:layout_width="match_parent"
-        android:layout_height="@dimen/selector_header_height"
-        android:background="?attr/sap_gray"
-        android:clickable="true">
-
-        <LinearLayout
-            android:id="@+id/header_text"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerVertical="true"
-            android:layout_marginLeft="@dimen/side_padding"
-            android:orientation="horizontal">
-
-            <ImageView
-                android:id="@+id/header_back"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:src="?attr/chevron_left_24dp"/>
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:text="@string/start_procedure"
-                android:textAppearance="?attr/textHeader"/>
-        </LinearLayout>
-
-        <View
-            android:id="@+id/line_top"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/unscheduled_header_line"
-            android:layout_alignParentBottom="true"
-            android:background="?attr/black"/>
-    </RelativeLayout>
+        android:layout_height="wrap_content"
+        app:headerText="@string/start_procedure"/>

    <ListView
        android:id="@+id/listView"
@@ -5,43 +5,11 @@
    android:layout_height="match_parent"
    android:background="?attr/sap_gray_black_30">

-    <RelativeLayout
+    <com.sap.sailing.racecommittee.app.ui.layouts.HeaderLayout
        android:id="@+id/header"
        android:layout_width="match_parent"
-        android:layout_height="@dimen/selector_header_height"
-        android:background="?attr/sap_gray"
-        android:clickable="true">
-
-        <LinearLayout
-            android:id="@+id/header_text"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerVertical="true"
-            android:layout_marginLeft="@dimen/side_padding"
-            android:orientation="horizontal">
-
-            <ImageView
-                android:id="@+id/header_back"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:src="?attr/chevron_left_24dp" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:text="@string/gate_start_pathfinder"
-                android:textAppearance="?attr/textHeader" />
-        </LinearLayout>
-    </RelativeLayout>
-
-    <View
-        android:id="@+id/line_top"
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/unscheduled_header_line"
-        android:layout_below="@id/header"
-        android:background="?attr/black" />
+        android:layout_height="wrap_content"
+        app:headerText="@string/gate_start_pathfinder"/>

    <RelativeLayout
        android:id="@+id/path_finder"
@@ -66,7 +34,7 @@
        android:layout_width="match_parent"
        android:layout_height="match_parent"
        android:layout_above="@id/path_finder"
-        android:layout_below="@id/line_top">
+        android:layout_below="@id/header">

        <RelativeLayout
            android:layout_width="wrap_content"
@@ -80,7 +48,7 @@
                android:layout_below="@id/label_area"
                android:orientation="horizontal">

-                <com.sap.sailing.racecommittee.app.ui.views.FloatLabelLayout
+                <com.sap.sailing.racecommittee.app.ui.layouts.FloatLabelLayout
                    android:layout_width="0dp"
                    android:layout_height="wrap_content"
                    android:layout_weight="1"
@@ -97,9 +65,9 @@
                        android:inputType="textCapCharacters"
                        android:textAppearance="?attr/textNormal"
                        android:textColor="?attr/white" />
-                </com.sap.sailing.racecommittee.app.ui.views.FloatLabelLayout>
+                </com.sap.sailing.racecommittee.app.ui.layouts.FloatLabelLayout>

-                <com.sap.sailing.racecommittee.app.ui.views.FloatLabelLayout
+                <com.sap.sailing.racecommittee.app.ui.layouts.FloatLabelLayout
                    android:layout_width="0dp"
                    android:layout_height="wrap_content"
                    android:layout_weight="1"
@@ -116,7 +84,7 @@
                        android:inputType="number"
                        android:textAppearance="?attr/textNormal"
                        android:textColor="?attr/white" />
-                </com.sap.sailing.racecommittee.app.ui.views.FloatLabelLayout>
+                </com.sap.sailing.racecommittee.app.ui.layouts.FloatLabelLayout>
            </LinearLayout>
        </RelativeLayout>
    </RelativeLayout>
@@ -37,7 +37,7 @@
            android:layout_margin="@dimen/default_margin_twice"
            android:orientation="horizontal">

-            <com.sap.sailing.racecommittee.app.ui.views.FloatLabelLayout
+            <com.sap.sailing.racecommittee.app.ui.layouts.FloatLabelLayout
                android:layout_width="0dp"
                android:layout_height="wrap_content"
                android:layout_weight="1"
@@ -54,9 +54,9 @@
                    android:inputType="textCapCharacters"
                    android:textAppearance="?attr/textNormal"
                    android:textColor="?attr/white" />
-            </com.sap.sailing.racecommittee.app.ui.views.FloatLabelLayout>
+            </com.sap.sailing.racecommittee.app.ui.layouts.FloatLabelLayout>

-            <com.sap.sailing.racecommittee.app.ui.views.FloatLabelLayout
+            <com.sap.sailing.racecommittee.app.ui.layouts.FloatLabelLayout
                android:layout_width="0dp"
                android:layout_height="wrap_content"
                android:layout_weight="1"
@@ -73,7 +73,7 @@
                    android:inputType="number"
                    android:textAppearance="?attr/textNormal"
                    android:textColor="?attr/white" />
-            </com.sap.sailing.racecommittee.app.ui.views.FloatLabelLayout>
+            </com.sap.sailing.racecommittee.app.ui.layouts.FloatLabelLayout>
        </LinearLayout>
    </RelativeLayout>
 </RelativeLayout>
@@ -2,46 +2,14 @@
 <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="match_parent">
+    android:layout_height="match_parent"
+    xmlns:app="http://schemas.android.com/apk/res-auto">

-    <RelativeLayout
+    <com.sap.sailing.racecommittee.app.ui.layouts.HeaderLayout
        android:id="@+id/header"
        android:layout_width="match_parent"
-        android:layout_height="@dimen/selector_header_height"
-        android:background="?attr/sap_gray"
-        android:clickable="true">
-
-        <LinearLayout
-            android:id="@+id/header_text"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerVertical="true"
-            android:layout_marginLeft="@dimen/side_padding"
-            android:orientation="horizontal">
-
-            <ImageView
-                android:id="@+id/header_back"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:src="?attr/chevron_left_24dp" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:text="@string/gate_start_timing"
-                android:textAppearance="?attr/textHeader" />
-        </LinearLayout>
-    </RelativeLayout>
-
-    <View
-        android:id="@+id/line_top"
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/unscheduled_header_line"
-        android:layout_below="@id/header"
-        android:background="?attr/black" />
-
+        android:layout_height="wrap_content"
+        app:headerText="@string/gate_start_timing"/>

    <RelativeLayout
        android:id="@+id/gate_button_layout"
@@ -66,7 +34,7 @@
        android:layout_width="match_parent"
        android:layout_height="match_parent"
        android:layout_above="@id/gate_button_layout"
-        android:layout_below="@id/line_top"
+        android:layout_below="@id/header"
        android:background="?attr/sap_gray_black_30">

        <LinearLayout
@@ -2,7 +2,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="match_parent">
+    android:layout_height="match_parent"
+    xmlns:app="http://schemas.android.com/apk/res-auto">

    <RelativeLayout
        android:id="@+id/gate_button_layout"
@@ -1,45 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
    android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    xmlns:app="http://schemas.android.com/apk/res-auto">

-    <RelativeLayout
+    <com.sap.sailing.racecommittee.app.ui.layouts.HeaderLayout
        android:id="@+id/header"
        android:layout_width="match_parent"
-        android:layout_height="@dimen/selector_header_height"
-        android:background="?attr/sap_gray">
-
-        <LinearLayout
-            android:id="@+id/header_text"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerVertical="true"
-            android:layout_marginLeft="@dimen/side_padding"
-            android:orientation="horizontal">
-
-            <ImageView
-                android:id="@+id/header_back"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:src="?attr/chevron_left_24dp"/>
-
-            <TextView
-                android:id="@+id/header_headline"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:text="@string/set_time"
-                android:textAppearance="?attr/textHeader"/>
-        </LinearLayout>
-
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/thin_line"
-            android:layout_alignParentBottom="true"
-            android:background="?attr/black"/>
-    </RelativeLayout>
+        android:layout_height="wrap_content"
+        app:headerText="@string/set_time"/>

    <include
        layout="@layout/race_time_picker"
@@ -0,0 +1,163 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:layout_width="match_parent"
+              android:layout_height="wrap_content"
+              android:orientation="vertical"
+              android:paddingLeft="24dp"
+              android:paddingRight="24dp">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal">
+
+        <TextView
+            android:id="@+id/competitor_position_label"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:layout_weight="1"
+            android:text="@string/position"
+            android:textColor="@color/dialog_color_text"/>
+
+        <Spinner
+            android:id="@+id/competitor_position"
+            android:layout_width="@dimen/competitor_edit_width"
+            android:layout_height="wrap_content"
+            android:background="@drawable/spinner_background_light"
+            android:spinnerMode="dropdown"/>
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal">
+
+        <TextView
+            android:id="@+id/competitor_penalty_label"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:layout_weight="1"
+            android:text="@string/penalty"
+            android:textColor="@color/dialog_color_text"/>
+
+        <Spinner
+            android:id="@+id/competitor_penalty"
+            android:layout_width="@dimen/competitor_edit_width"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="@dimen/side_padding"
+            android:layout_marginTop="@dimen/side_padding"
+            android:background="@drawable/spinner_background_light"
+            android:spinnerMode="dropdown"/>
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal">
+
+        <TextView
+            android:id="@+id/competitor_score_label"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:layout_weight="1"
+            android:text="@string/score"
+            android:textColor="@color/dialog_color_text"/>
+
+        <EditText
+            android:id="@+id/competitor_score"
+            android:layout_width="@dimen/competitor_edit_width"
+            android:layout_height="wrap_content"
+            android:inputType="numberDecimal"/>
+    </LinearLayout>
+
+    <LinearLayout
+        android:id="@+id/competitor_finish_date_layout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal">
+
+        <TextView
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:layout_weight="1"
+            android:text="@string/finishing_date"
+            android:textColor="@color/dialog_color_text"/>
+
+        <Spinner
+            android:id="@+id/competitor_finish_date"
+            android:layout_width="@dimen/competitor_edit_width"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="@dimen/side_padding"
+            android:layout_marginTop="@dimen/side_padding"
+            android:background="@drawable/spinner_background_light"
+            android:spinnerMode="dropdown"/>
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal">
+
+        <TextView
+            android:id="@+id/competitor_finish_time_label"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:layout_weight="1"
+            android:maxLines="2"
+            android:text="@string/finishing_time"
+            android:textColor="@color/dialog_color_text"/>
+
+        <LinearLayout
+            android:layout_width="@dimen/competitor_edit_width"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal">
+
+            <NumberPicker
+                android:id="@+id/competitor_finish_time_hours"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"/>
+
+            <NumberPicker
+                android:id="@+id/competitor_finish_time_minutes"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="8dp"
+                android:layout_marginRight="8dp"
+                android:layout_weight="1"/>
+
+            <NumberPicker
+                android:id="@+id/competitor_finish_time_seconds"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"/>
+        </LinearLayout>
+
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal">
+
+        <TextView
+            android:id="@+id/competitor_comment_label"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:layout_weight="1"
+            android:text="@string/comment"
+            android:textColor="@color/dialog_color_text"/>
+
+        <EditText
+            android:id="@+id/competitor_comment"
+            android:layout_width="@dimen/competitor_edit_width"
+            android:layout_height="wrap_content"
+            android:inputType="text"/>
+    </LinearLayout>
+</LinearLayout>