From f06663b702df40bc71fabc49034a1d4811fbfdc3 Mon Sep 17 00:00:00 2001
From: Bennet Brunsen <brunsen@ubilabs.net>
Date: Tue, 19 Apr 2016 17:40:47 +0200
Subject: [PATCH 01/92] Basic fiori design in home fragment

---
 .../res/drawable/main_background.xml          | 14 ++++
 ...ded_btn_white.xml => normal_btn_white.xml} |  8 +--
 .../res/layout-land/fragment_home.xml         |  2 +-
 .../res/layout/fragment_container.xml         | 53 ++++++++++++++
 .../res/layout/fragment_home.xml              | 72 +++++++++++++++++++
 .../res/layout/ragatta_listview_row.xml       |  7 +-
 .../res/layout/regatta_listview_header.xml    | 15 +---
 .../res/values/colors.xml                     |  5 +-
 8 files changed, 151 insertions(+), 25 deletions(-)
 create mode 100644 mobile/com.sap.sailing.android.tracking.app/res/drawable/main_background.xml
 rename mobile/com.sap.sailing.android.tracking.app/res/drawable/{rounded_btn_white.xml => normal_btn_white.xml} (50%)
 create mode 100644 mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_container.xml
 create mode 100644 mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_home.xml

diff --git a/mobile/com.sap.sailing.android.tracking.app/res/drawable/main_background.xml b/mobile/com.sap.sailing.android.tracking.app/res/drawable/main_background.xml
new file mode 100644
index 00000000000..a5a3509dda3
--- /dev/null
+++ b/mobile/com.sap.sailing.android.tracking.app/res/drawable/main_background.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+       android:shape="rectangle">
+
+    <gradient
+        android:angle="90"
+        android:endColor="#b5b6d2"
+        android:startColor="#dce3eb"
+        android:type="linear"/>
+
+    <corners
+        android:radius="0dp"/>
+
+</shape>
\ No newline at end of file
diff --git a/mobile/com.sap.sailing.android.tracking.app/res/drawable/rounded_btn_white.xml b/mobile/com.sap.sailing.android.tracking.app/res/drawable/normal_btn_white.xml
similarity index 50%
rename from mobile/com.sap.sailing.android.tracking.app/res/drawable/rounded_btn_white.xml
rename to mobile/com.sap.sailing.android.tracking.app/res/drawable/normal_btn_white.xml
index 4ca5d0ad3b4..52039ca3c53 100644
--- a/mobile/com.sap.sailing.android.tracking.app/res/drawable/rounded_btn_white.xml
+++ b/mobile/com.sap.sailing.android.tracking.app/res/drawable/normal_btn_white.xml
@@ -5,12 +5,6 @@
 
     <stroke
         android:width="1dp"
-        android:color="@color/white" />
-
-    <corners
-        android:bottomLeftRadius="5dip"
-        android:bottomRightRadius="5dip"
-        android:topLeftRadius="5dip"
-        android:topRightRadius="5dip" />
+        android:color="@color/separator_color" />
 
 </shape>
\ No newline at end of file
diff --git a/mobile/com.sap.sailing.android.tracking.app/res/layout-land/fragment_home.xml b/mobile/com.sap.sailing.android.tracking.app/res/layout-land/fragment_home.xml
index 5394e8ce950..44bc52912c0 100644
--- a/mobile/com.sap.sailing.android.tracking.app/res/layout-land/fragment_home.xml
+++ b/mobile/com.sap.sailing.android.tracking.app/res/layout-land/fragment_home.xml
@@ -64,7 +64,7 @@
             android:layout_marginRight="10dp"
             android:paddingLeft="@dimen/activity_horizontal_margin"
             android:paddingRight="@dimen/activity_horizontal_margin"
-            android:background="@drawable/rounded_btn_white"
+            android:background="@drawable/normal_btn_white"
             android:textColor="@color/black"
             android:text="@string/no_qr_code"/>
 
diff --git a/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_container.xml b/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_container.xml
new file mode 100644
index 00000000000..ffdacf44b96
--- /dev/null
+++ b/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_container.xml
@@ -0,0 +1,53 @@
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <com.sap.sailing.android.shared.ui.customviews.OpenSansToolbar
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@+id/toolbar"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:theme="@style/ThemeOverlay.AppCompat.ActionBar">
+
+        <LinearLayout
+            android:orientation="vertical"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:padding="10dp">
+
+            <com.sap.sailing.android.shared.ui.customviews.OpenSansTextView
+                android:id="@+id/toolbar_title"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:lines="1"
+                android:singleLine="true"
+                android:textSize="16sp"/>
+
+            <com.sap.sailing.android.shared.ui.customviews.OpenSansTextView
+                android:id="@+id/toolbar_subtitle"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:lines="1"
+                android:singleLine="true"
+                android:textSize="12sp"/>
+
+
+        </LinearLayout>
+
+    </com.sap.sailing.android.shared.ui.customviews.OpenSansToolbar>
+
+    <View
+        android:id="@+id/top_bar"
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        android:background="@color/separator_color" />
+
+    <FrameLayout
+        android:id="@+id/content_frame"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"/>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_home.xml b/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_home.xml
new file mode 100644
index 00000000000..955c75e2897
--- /dev/null
+++ b/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_home.xml
@@ -0,0 +1,72 @@
+<?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:background="@drawable/main_background">
+
+    <ImageView
+        android:id="@+id/homeBackground"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_above="@+id/scanQr"
+        android:contentDescription="@string/empty"
+        android:scaleType="centerCrop"
+        android:src="@drawable/working_title"/>
+
+    <RelativeLayout
+        android:id="@+id/bottomLayout"
+        android:layout_width="match_parent"
+        android:layout_height="50dp"
+        android:layout_alignParentBottom="true"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentStart="true">
+
+        <com.sap.sailing.android.shared.ui.customviews.OpenSansTextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerHorizontal="true"
+            android:layout_centerVertical="true"
+            android:gravity="center"
+            android:text="@string/scan_hint"
+            android:textColor="@color/black"/>
+    </RelativeLayout>
+
+    <Button
+        android:id="@+id/scanQr"
+        android:layout_width="fill_parent"
+        android:layout_height="80dp"
+        android:layout_above="@+id/noQrCode"
+        android:layout_marginBottom="10dp"
+        android:layout_marginLeft="16dp"
+        android:layout_marginRight="16dp"
+        android:layout_marginTop="20dp"
+        android:background="#009de0"
+        android:text="@string/scan_qr"
+        android:textAllCaps="true"
+        android:textSize="18sp"/>
+
+    <Button
+        android:id="@+id/noQrCode"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:layout_above="@+id/bottomLayout"
+        android:layout_marginLeft="16dp"
+        android:layout_marginRight="16dp"
+        android:background="@drawable/normal_btn_white"
+        android:paddingLeft="@dimen/activity_horizontal_margin"
+        android:paddingRight="@dimen/activity_horizontal_margin"
+        android:text="@string/no_qr_code"
+        android:textAllCaps="true"
+        android:textColor="@color/black"
+        android:textSize="18sp"/>
+
+    <ListView
+        android:id="@+id/listRegatta"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_above="@id/scanQr"
+        android:layout_alignParentTop="true"
+        android:divider="@color/separator_color"
+        android:dividerHeight="1dp"/>
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/mobile/com.sap.sailing.android.tracking.app/res/layout/ragatta_listview_row.xml b/mobile/com.sap.sailing.android.tracking.app/res/layout/ragatta_listview_row.xml
index 3dc8c672884..d446ad0e248 100644
--- a/mobile/com.sap.sailing.android.tracking.app/res/layout/ragatta_listview_row.xml
+++ b/mobile/com.sap.sailing.android.tracking.app/res/layout/ragatta_listview_row.xml
@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="50dp"
-    android:background="@color/colorPrimary"
+    android:background="@color/list_item_background_color"
     tools:ignore="Overdraw" >
 
     <ImageView
@@ -19,8 +19,7 @@
         android:layout_marginTop="13dp"
         android:layout_marginBottom="10dp"
         android:layout_marginRight="10dp"
-        android:layout_marginEnd="10dp"
-        android:textColor="@color/white" />
+        android:layout_marginEnd="10dp" />
 
     <com.sap.sailing.android.tracking.app.customviews.OpenSansTextView
         android:id="@+id/regattaName"
@@ -34,6 +33,6 @@
         android:paddingLeft="15dp"
         android:paddingRight="15dp"
         android:singleLine="true"
-        android:textColor="@color/white" />
+        android:textColor="@color/black" />
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/mobile/com.sap.sailing.android.tracking.app/res/layout/regatta_listview_header.xml b/mobile/com.sap.sailing.android.tracking.app/res/layout/regatta_listview_header.xml
index 5c1c6d8c02c..c8147acbd01 100644
--- a/mobile/com.sap.sailing.android.tracking.app/res/layout/regatta_listview_header.xml
+++ b/mobile/com.sap.sailing.android.tracking.app/res/layout/regatta_listview_header.xml
@@ -3,24 +3,15 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent" 
-    android:background="@color/colorPrimary"
+    android:background="@color/list_header_background_color"
     tools:ignore="Overdraw">
-    
-    <View
-            android:id="@+id/top_bar"
-            android:layout_width="fill_parent"
-            android:layout_height="4dp"
-            android:layout_alignParentTop="true"
-            android:background="@color/sap_yellow" />
 
-    <com.sap.sailing.android.tracking.app.customviews.OpenSansTextView
+    <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_below="@id/top_bar"
         android:padding="14dp"
         android:textSize="18sp"
-        android:background="@color/colorPrimary"
-        android:textColor="@color/white"
+        android:textColor="@color/black"
         android:text="@string/your_regattas" />
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/mobile/com.sap.sailing.android.tracking.app/res/values/colors.xml b/mobile/com.sap.sailing.android.tracking.app/res/values/colors.xml
index 5bb74510c02..24fe6df0c08 100644
--- a/mobile/com.sap.sailing.android.tracking.app/res/values/colors.xml
+++ b/mobile/com.sap.sailing.android.tracking.app/res/values/colors.xml
@@ -2,7 +2,10 @@
 
     <color name="white">#FFFFFF</color>
     <color name="white_transparent">#55FFFFFF</color>
-    <color name="white_less_transparent">#CCFFFFFF</color>
+    <color name="white_less_transparent">#f3f3f3</color>
+    <color name="separator_color">#d1d3d4</color>
+    <color name="list_header_background_color">#def1f1</color>
+    <color name="list_item_background_color">#f6fbfb</color>
     <color name="green">#00FF00</color>
     <color name="gray">#333333</color>
     <color name="darker_gray">#242424</color>

From f3f3830d3bcaea812a31b492ffcfd320aa4c4788 Mon Sep 17 00:00:00 2001
From: Bennet Brunsen <brunsen@ubilabs.net>
Date: Thu, 21 Apr 2016 11:53:30 +0200
Subject: [PATCH 02/92] Adjust toolbar to fiori design

---
 .../res/layout/pref_with_actionbar.xml        |  2 +-
 .../res/layout/regatta_listview_header.xml    |  4 +-
 .../res/values/colors.xml                     |  2 +
 .../ui/customviews/OpenSansToolbar.java       |  2 +-
 .../res/layout-land/fragment_regatta.xml      |  4 +-
 .../res/layout/activity_tracking.xml          | 29 +++++----
 .../res/layout/fragment_about.xml             |  4 +-
 .../res/layout/fragment_container.xml         | 20 ++++---
 .../res/layout/fragment_regatta.xml           | 60 ++++++++-----------
 .../res/layout/pref_with_actionbar.xml        | 19 +++---
 .../res/values/colors.xml                     |  3 +
 .../res/values/dimens.xml                     |  1 +
 .../res/values/theme.xml                      |  6 ++
 .../LeaderboardWebViewActivity.java           |  4 +-
 .../app/ui/activities/RegattaActivity.java    |  4 +-
 .../app/ui/activities/SettingsActivity.java   |  3 +
 .../app/ui/activities/StartActivity.java      |  3 +
 .../app/ui/activities/TrackingActivity.java   |  4 +-
 18 files changed, 101 insertions(+), 73 deletions(-)

diff --git a/mobile/com.sap.sailing.android.shared/res/layout/pref_with_actionbar.xml b/mobile/com.sap.sailing.android.shared/res/layout/pref_with_actionbar.xml
index d1860418685..212662de1f1 100644
--- a/mobile/com.sap.sailing.android.shared/res/layout/pref_with_actionbar.xml
+++ b/mobile/com.sap.sailing.android.shared/res/layout/pref_with_actionbar.xml
@@ -41,7 +41,7 @@
     </com.sap.sailing.android.shared.ui.customviews.OpenSansToolbar>
 
     <View
-        android:id="@+id/top_bar"
+        android:id="@+id/toolbar_separator"
         android:layout_width="fill_parent"
         android:layout_height="4dp"
         android:background="@color/sap_yellow"/>
diff --git a/mobile/com.sap.sailing.android.shared/res/layout/regatta_listview_header.xml b/mobile/com.sap.sailing.android.shared/res/layout/regatta_listview_header.xml
index 8aae68d4a70..f2da7d8f512 100644
--- a/mobile/com.sap.sailing.android.shared/res/layout/regatta_listview_header.xml
+++ b/mobile/com.sap.sailing.android.shared/res/layout/regatta_listview_header.xml
@@ -7,7 +7,7 @@
                 tools:ignore="Overdraw">
 
     <View
-        android:id="@+id/top_bar"
+        android:id="@+id/toolbar_separator"
         android:layout_width="fill_parent"
         android:layout_height="4dp"
         android:layout_alignParentTop="true"
@@ -16,7 +16,7 @@
     <com.sap.sailing.android.shared.ui.customviews.OpenSansTextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_below="@id/top_bar"
+        android:layout_below="@id/toolbar_separator"
         android:padding="16dp"
         android:textSize="16sp"
         android:background="@color/colorPrimary"
diff --git a/mobile/com.sap.sailing.android.shared/res/values/colors.xml b/mobile/com.sap.sailing.android.shared/res/values/colors.xml
index 6f16c91497b..84cd56c6b9e 100644
--- a/mobile/com.sap.sailing.android.shared/res/values/colors.xml
+++ b/mobile/com.sap.sailing.android.shared/res/values/colors.xml
@@ -47,4 +47,6 @@
     <color name="gray">#333333</color>
     <color name="colorPrimary">@color/gray</color>
     <color name="yellow_button_pressed">#D6B363</color>
+
+    <color name="toolbar_text_color">@color/white</color>
 </resources>
diff --git a/mobile/com.sap.sailing.android.shared/src/com/sap/sailing/android/shared/ui/customviews/OpenSansToolbar.java b/mobile/com.sap.sailing.android.shared/src/com/sap/sailing/android/shared/ui/customviews/OpenSansToolbar.java
index 8eff6f98c16..ca07afd84db 100644
--- a/mobile/com.sap.sailing.android.shared/src/com/sap/sailing/android/shared/ui/customviews/OpenSansToolbar.java
+++ b/mobile/com.sap.sailing.android.shared/src/com/sap/sailing/android/shared/ui/customviews/OpenSansToolbar.java
@@ -57,6 +57,6 @@ public class OpenSansToolbar extends Toolbar {
     public void setTitleSize(float size) {
         TextView titleTextView = (TextView) findViewById(R.id.toolbar_title);
         titleTextView.setTextSize(TypedValue.COMPLEX_UNIT_SP, size);
-        titleTextView.setTextColor(getResources().getColor(R.color.white));
+        titleTextView.setTextColor(getResources().getColor(R.color.toolbar_text_color));
     }
 }
diff --git a/mobile/com.sap.sailing.android.tracking.app/res/layout-land/fragment_regatta.xml b/mobile/com.sap.sailing.android.tracking.app/res/layout-land/fragment_regatta.xml
index 82902c7cfaf..ddc70627386 100644
--- a/mobile/com.sap.sailing.android.tracking.app/res/layout-land/fragment_regatta.xml
+++ b/mobile/com.sap.sailing.android.tracking.app/res/layout-land/fragment_regatta.xml
@@ -5,7 +5,7 @@
                 android:layout_height="match_parent">
 
     <View
-        android:id="@+id/top_bar"
+        android:id="@+id/toolbar_separator"
         android:layout_width="fill_parent"
         android:layout_height="4dp"
         android:layout_alignParentLeft="true"
@@ -18,7 +18,7 @@
         android:layout_width="fill_parent"
         android:layout_height="fill_parent"
         android:layout_above="@id/start_tracking_box"
-        android:layout_below="@id/top_bar"
+        android:layout_below="@id/toolbar_separator"
         android:baselineAligned="false"
         android:orientation="horizontal">
 
diff --git a/mobile/com.sap.sailing.android.tracking.app/res/layout/activity_tracking.xml b/mobile/com.sap.sailing.android.tracking.app/res/layout/activity_tracking.xml
index 6fa3211f563..81218a2f2d4 100644
--- a/mobile/com.sap.sailing.android.tracking.app/res/layout/activity_tracking.xml
+++ b/mobile/com.sap.sailing.android.tracking.app/res/layout/activity_tracking.xml
@@ -1,12 +1,12 @@
 <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">
 
     <com.sap.sailing.android.shared.ui.customviews.OpenSansToolbar
         android:id="@+id/toolbar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:theme="@style/ThemeOverlay.AppCompat.ActionBar">
+        android:theme="@style/AppTheme.Toolbar">
 
         <LinearLayout
             android:layout_width="match_parent"
@@ -21,7 +21,8 @@
                 android:layout_gravity="center"
                 android:lines="1"
                 android:singleLine="true"
-                android:textSize="16sp" />
+                android:textColor="@color/toolbar_text_color"
+                android:textSize="16sp"/>
 
             <com.sap.sailing.android.shared.ui.customviews.OpenSansTextView
                 android:id="@+id/toolbar_subtitle"
@@ -30,15 +31,23 @@
                 android:layout_gravity="center"
                 android:lines="1"
                 android:singleLine="true"
-                android:textSize="12sp" />
+                android:textColor="@color/toolbar_text_color"
+                android:textSize="12sp"/>
         </LinearLayout>
     </com.sap.sailing.android.shared.ui.customviews.OpenSansToolbar>
 
+    <View
+        android:id="@+id/toolbar_separator"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/toolbar_separator_height"
+        android:layout_below="@id/toolbar"
+        android:background="@color/separator_color"/>
+
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_above="@+id/stop_tracking"
-        android:layout_below="@id/toolbar"
+        android:layout_below="@id/toolbar_separator"
         android:orientation="vertical">
 
         <RelativeLayout
@@ -46,13 +55,13 @@
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
             android:layout_weight="1"
-            android:padding="0dp" />
+            android:padding="0dp"/>
 
         <android.support.v4.view.ViewPager
             android:id="@+id/pager"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:layout_weight="1" />
+            android:layout_weight="1"/>
     </LinearLayout>
 
     <com.sap.sailing.android.shared.ui.customviews.OpenSansButton
@@ -68,7 +77,7 @@
         android:padding="0dp"
         android:text="@string/stop_tracking"
         android:textAllCaps="true"
-        android:textStyle="bold" />
+        android:textStyle="bold"/>
 
     <com.viewpagerindicator.CirclePageIndicator
         android:id="@+id/title_page_indicator"
@@ -77,6 +86,6 @@
         android:layout_alignParentBottom="true"
         android:background="@color/black"
         android:paddingBottom="10dp"
-        android:paddingTop="10dp" />
+        android:paddingTop="10dp"/>
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_about.xml b/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_about.xml
index 62b96832385..86fc79a9110 100644
--- a/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_about.xml
+++ b/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_about.xml
@@ -4,7 +4,7 @@
                 android:layout_height="match_parent">
 
     <View
-        android:id="@+id/top_bar"
+        android:id="@+id/toolbar_separator"
         android:layout_width="match_parent"
         android:layout_height="4dp"
         android:layout_alignParentTop="true"
@@ -66,7 +66,7 @@
         android:layout_above="@+id/linearLayout"
         android:layout_alignParentLeft="true"
         android:layout_alignParentStart="true"
-        android:layout_below="@+id/top_bar"
+        android:layout_below="@+id/toolbar_separator"
         android:layout_marginTop="@dimen/about_header_margin_top"
         android:fillViewport="false">
 
diff --git a/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_container.xml b/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_container.xml
index ffdacf44b96..fcf94a20073 100644
--- a/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_container.xml
+++ b/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_container.xml
@@ -1,19 +1,19 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-    android:orientation="vertical">
+              android:layout_width="match_parent"
+              android:layout_height="match_parent"
+              android:orientation="vertical">
 
     <com.sap.sailing.android.shared.ui.customviews.OpenSansToolbar
-        xmlns:android="http://schemas.android.com/apk/res/android"
         android:id="@+id/toolbar"
+        xmlns:android="http://schemas.android.com/apk/res/android"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:theme="@style/ThemeOverlay.AppCompat.ActionBar">
+        android:theme="@style/AppTheme.Toolbar">
 
         <LinearLayout
-            android:orientation="vertical"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
+            android:orientation="vertical"
             android:padding="10dp">
 
             <com.sap.sailing.android.shared.ui.customviews.OpenSansTextView
@@ -23,6 +23,7 @@
                 android:layout_gravity="center"
                 android:lines="1"
                 android:singleLine="true"
+                android:textColor="@color/toolbar_text_color"
                 android:textSize="16sp"/>
 
             <com.sap.sailing.android.shared.ui.customviews.OpenSansTextView
@@ -32,6 +33,7 @@
                 android:layout_gravity="center"
                 android:lines="1"
                 android:singleLine="true"
+                android:textColor="@color/toolbar_text_color"
                 android:textSize="12sp"/>
 
 
@@ -40,10 +42,10 @@
     </com.sap.sailing.android.shared.ui.customviews.OpenSansToolbar>
 
     <View
-        android:id="@+id/top_bar"
+        android:id="@+id/toolbar_separator"
         android:layout_width="match_parent"
-        android:layout_height="1dp"
-        android:background="@color/separator_color" />
+        android:layout_height="@dimen/toolbar_separator_height"
+        android:background="@color/separator_color"/>
 
     <FrameLayout
         android:id="@+id/content_frame"
diff --git a/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_regatta.xml b/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_regatta.xml
index 0802d4440a4..012b706fb87 100644
--- a/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_regatta.xml
+++ b/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_regatta.xml
@@ -43,8 +43,8 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
-                android:paddingRight="@dimen/activity_horizontal_margin"
                 android:paddingLeft="@dimen/activity_horizontal_margin"
+                android:paddingRight="@dimen/activity_horizontal_margin"
                 android:text="@string/add_team_photo"
                 android:textColor="@color/white"/>
         </LinearLayout>
@@ -61,9 +61,9 @@
             tools:visibility="gone">
 
             <ProgressBar
+                style="?android:attr/progressBarStyle"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                style="?android:attr/progressBarStyle"
                 android:indeterminate="true"
                 android:paddingLeft="@dimen/activity_horizontal_margin"
                 android:paddingRight="@dimen/activity_horizontal_margin"/>
@@ -73,8 +73,8 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
-                android:paddingRight="@dimen/activity_horizontal_margin"
                 android:paddingLeft="@dimen/activity_horizontal_margin"
+                android:paddingRight="@dimen/activity_horizontal_margin"
                 android:text="@string/upload_in_progress"
                 android:textColor="@color/white"/>
         </LinearLayout>
@@ -86,10 +86,10 @@
             android:layout_centerHorizontal="true"
             android:layout_centerVertical="true"
             android:background="@color/white_transparent"
-            android:orientation="horizontal"
-            android:visibility="gone"
             android:clickable="true"
             android:onClick="retryUpload"
+            android:orientation="horizontal"
+            android:visibility="gone"
             tools:visibility="visible">
 
             <com.sap.sailing.android.shared.ui.customviews.OpenSansTextView
@@ -99,10 +99,10 @@
                 android:layout_gravity="center"
                 android:drawableLeft="@drawable/ic_action_navigation_refresh"
                 android:drawablePadding="8dp"
-                android:paddingRight="8dp"
-                android:paddingTop="8dp"
                 android:paddingBottom="8dp"
                 android:paddingLeft="8dp"
+                android:paddingRight="8dp"
+                android:paddingTop="8dp"
                 android:text="@string/upload_retry"
                 android:textColor="@color/white"/>
         </LinearLayout>
@@ -126,8 +126,8 @@
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
                 android:gravity="start|center_vertical"
-                android:paddingRight="@dimen/activity_horizontal_margin"
                 android:paddingLeft="@dimen/activity_horizontal_margin"
+                android:paddingRight="@dimen/activity_horizontal_margin"
                 android:text="@string/empty"
                 android:textColor="@color/white"/>
 
@@ -136,19 +136,19 @@
                 android:layout_height="fill_parent"
                 android:layout_weight="0.53"
                 android:cropToPadding="true"
-                android:paddingTop="3dp"
-                android:paddingBottom="3dp"
                 android:gravity="end"
+                android:paddingBottom="3dp"
                 android:paddingLeft="5dp"
-                android:paddingRight="5dp">
+                android:paddingRight="5dp"
+                android:paddingTop="3dp">
 
                 <ImageView
                     android:id="@+id/flag_image"
                     android:layout_width="20dp"
                     android:layout_height="fill_parent"
-                    android:scaleType="fitXY"
-                    android:contentDescription="@string/content_description_flag_icon"
                     android:adjustViewBounds="true"
+                    android:contentDescription="@string/content_description_flag_icon"
+                    android:scaleType="fitXY"
                     android:textColor="@color/white"/>
             </RelativeLayout>
 
@@ -167,11 +167,11 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_above="@id/competitor_info_layout"
-            android:layout_alignParentRight="true"
             android:layout_alignParentEnd="true"
+            android:layout_alignParentRight="true"
             android:layout_marginBottom="15dp"
-            android:layout_marginRight="15dp"
             android:layout_marginEnd="15dp"
+            android:layout_marginRight="15dp"
             android:background="@drawable/background_transparent_box"
             android:orientation="horizontal"
             android:padding="0dp">
@@ -192,14 +192,6 @@
             android:layout_alignParentStart="true"
             android:background="@color/sap_yellow"/>
 
-        <View
-            android:id="@+id/top_bar"
-            android:layout_width="fill_parent"
-            android:layout_height="4dp"
-            android:layout_alignParentLeft="true"
-            android:layout_alignParentStart="true"
-            android:layout_alignParentTop="true"
-            android:background="@color/sap_yellow"/>
     </RelativeLayout>
 
     <ScrollView
@@ -294,10 +286,10 @@
                             android:id="@+id/starts_in_days_label"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:padding="0dp"
-                            android:text="@string/days"
-                            android:singleLine="true"
                             android:layout_marginBottom="5dp"
+                            android:padding="0dp"
+                            android:singleLine="true"
+                            android:text="@string/days"
                             android:textColor="@color/white"/>
                     </LinearLayout>
 
@@ -325,10 +317,10 @@
                             android:id="@+id/starts_in_hours_label"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:padding="0dp"
-                            android:text="@string/hours"
-                            android:singleLine="true"
                             android:layout_marginBottom="5dp"
+                            android:padding="0dp"
+                            android:singleLine="true"
+                            android:text="@string/hours"
                             android:textColor="@color/white"/>
                     </LinearLayout>
 
@@ -356,10 +348,10 @@
                             android:id="@+id/starts_in_minutes_label"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:padding="0dp"
-                            android:text="@string/minutes"
-                            android:singleLine="true"
                             android:layout_marginBottom="5dp"
+                            android:padding="0dp"
+                            android:singleLine="true"
+                            android:text="@string/minutes"
                             android:textColor="@color/white"/>
                     </LinearLayout>
                 </LinearLayout>
@@ -399,10 +391,10 @@
                 android:layout_margin="@dimen/regatta_button_margin"
                 android:layout_marginLeft="@dimen/regatta_button_side_margin"
                 android:layout_marginRight="@dimen/regatta_button_side_margin"
-                android:padding="@dimen/regatta_button_padding"
                 android:layout_weight="1"
-                android:text="@string/show_event"
                 android:background="@drawable/rounded_btn_blue"
+                android:padding="@dimen/regatta_button_padding"
+                android:text="@string/show_event"
                 android:textAllCaps="true"
                 android:textStyle="bold"
                 tools:text="Show Event"/>
diff --git a/mobile/com.sap.sailing.android.tracking.app/res/layout/pref_with_actionbar.xml b/mobile/com.sap.sailing.android.tracking.app/res/layout/pref_with_actionbar.xml
index d1860418685..7b035454a68 100644
--- a/mobile/com.sap.sailing.android.tracking.app/res/layout/pref_with_actionbar.xml
+++ b/mobile/com.sap.sailing.android.tracking.app/res/layout/pref_with_actionbar.xml
@@ -1,21 +1,20 @@
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:orientation="vertical"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:orientation="vertical">
 
     <com.sap.sailing.android.shared.ui.customviews.OpenSansToolbar
-        xmlns:android="http://schemas.android.com/apk/res/android"
         android:id="@+id/toolbar"
+        xmlns:android="http://schemas.android.com/apk/res/android"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:theme="@style/ThemeOverlay.AppCompat.ActionBar">
 
         <LinearLayout
-            android:orientation="vertical"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
+            android:orientation="vertical"
             android:padding="10dp">
 
             <com.sap.sailing.android.shared.ui.customviews.OpenSansTextView
@@ -25,6 +24,7 @@
                 android:layout_gravity="center"
                 android:lines="1"
                 android:singleLine="true"
+                android:textColor="@color/toolbar_text_color"
                 android:textSize="16sp"/>
 
             <com.sap.sailing.android.shared.ui.customviews.OpenSansTextView
@@ -34,6 +34,7 @@
                 android:layout_gravity="center"
                 android:lines="1"
                 android:singleLine="true"
+                android:textColor="@color/toolbar_text_color"
                 android:textSize="12sp"/>
 
         </LinearLayout>
@@ -41,10 +42,10 @@
     </com.sap.sailing.android.shared.ui.customviews.OpenSansToolbar>
 
     <View
-        android:id="@+id/top_bar"
-        android:layout_width="fill_parent"
-        android:layout_height="4dp"
-        android:background="@color/sap_yellow"/>
+        android:id="@+id/toolbar_separator"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/toolbar_separator_height"
+        android:background="@color/separator_color"/>
 
     <FrameLayout
         android:id="@+id/content_frame"
diff --git a/mobile/com.sap.sailing.android.tracking.app/res/values/colors.xml b/mobile/com.sap.sailing.android.tracking.app/res/values/colors.xml
index 24fe6df0c08..43f81f0c76b 100644
--- a/mobile/com.sap.sailing.android.tracking.app/res/values/colors.xml
+++ b/mobile/com.sap.sailing.android.tracking.app/res/values/colors.xml
@@ -14,4 +14,7 @@
     <color name="colorPrimaryDark">@color/colorPrimary</color>
     <color name="colorAccent">@color/sap_yellow</color>
 
+    <color name="toolbar_text_color">@color/black</color>
+    <color name="toolbar_background">@color/white</color>
+
 </resources>
\ No newline at end of file
diff --git a/mobile/com.sap.sailing.android.tracking.app/res/values/dimens.xml b/mobile/com.sap.sailing.android.tracking.app/res/values/dimens.xml
index db6d6dd12d2..d771be4fc8c 100644
--- a/mobile/com.sap.sailing.android.tracking.app/res/values/dimens.xml
+++ b/mobile/com.sap.sailing.android.tracking.app/res/values/dimens.xml
@@ -9,5 +9,6 @@
     <dimen name="regatta_button_side_margin">4dp</dimen>
     <dimen name="regatta_button_margin">10dp</dimen>
     <dimen name="regatta_button_padding">10dp</dimen>
+    <dimen name="toolbar_separator_height">1dp</dimen>
 
 </resources>
diff --git a/mobile/com.sap.sailing.android.tracking.app/res/values/theme.xml b/mobile/com.sap.sailing.android.tracking.app/res/values/theme.xml
index fd18c73706a..2944f19e80d 100644
--- a/mobile/com.sap.sailing.android.tracking.app/res/values/theme.xml
+++ b/mobile/com.sap.sailing.android.tracking.app/res/values/theme.xml
@@ -20,6 +20,12 @@
         <!-- You can also set colorControlNormal, colorControlActivated colorControlHighlight & colorSwitchThumbNormal. -->
 
         <item name="windowActionBar">false</item>
+        <item name="windowNoTitle">true</item>
+    </style>
+
+    <style name="AppTheme.Toolbar" parent="ThemeOverlay.AppCompat.ActionBar">
+        <item name="android:textColorPrimary">@color/toolbar_text_color</item>
+        <item name="popupTheme">@style/ThemeOverlay.AppCompat.Dark</item>
     </style>
 
     <style name="launchScreenTheme" parent="Theme.AppCompat.NoActionBar">
diff --git a/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/activities/LeaderboardWebViewActivity.java b/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/activities/LeaderboardWebViewActivity.java
index 7adfcd0e5c5..96e80f48cd0 100644
--- a/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/activities/LeaderboardWebViewActivity.java
+++ b/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/activities/LeaderboardWebViewActivity.java
@@ -1,6 +1,7 @@
 package com.sap.sailing.android.tracking.app.ui.activities;
 
 import android.content.Intent;
+import android.graphics.drawable.ColorDrawable;
 import android.os.Bundle;
 import android.support.v7.widget.Toolbar;
 
@@ -30,7 +31,6 @@ public class LeaderboardWebViewActivity extends BaseActivity {
         Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
         if (toolbar != null) {
             setSupportActionBar(toolbar);
-            toolbar.setBackgroundColor(getResources().getColor(R.color.colorPrimary));
         }
         if (getSupportActionBar() != null) {
             getSupportActionBar().setDisplayHomeAsUpEnabled(true);
@@ -38,6 +38,8 @@ public class LeaderboardWebViewActivity extends BaseActivity {
             toolbar.setNavigationIcon(R.drawable.sap_logo_64dp);
             toolbar.setPadding(20, 0, 0, 0);
             getSupportActionBar().setTitle(getString(R.string.title_activity_leaderboard));
+            ColorDrawable backgroundDrawable = new ColorDrawable(getResources().getColor(R.color.toolbar_background));
+            getSupportActionBar().setBackgroundDrawable(backgroundDrawable);
         }
 
         replaceFragment(R.id.content_frame, new LeaderboardFragment());
diff --git a/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/activities/RegattaActivity.java b/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/activities/RegattaActivity.java
index bb711c3d562..d1032ca195b 100755
--- a/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/activities/RegattaActivity.java
+++ b/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/activities/RegattaActivity.java
@@ -17,6 +17,7 @@ import android.app.ProgressDialog;
 import android.content.Intent;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
+import android.graphics.drawable.ColorDrawable;
 import android.net.Uri;
 import android.os.AsyncTask;
 import android.os.Bundle;
@@ -102,7 +103,6 @@ public class RegattaActivity extends AbstractRegattaActivity
         Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
         if (toolbar != null) {
             setSupportActionBar(toolbar);
-            toolbar.setBackgroundColor(getResources().getColor(R.color.colorPrimary));
         }
         if (getSupportActionBar() != null) {
             getSupportActionBar().setDisplayHomeAsUpEnabled(true);
@@ -111,6 +111,8 @@ public class RegattaActivity extends AbstractRegattaActivity
             toolbar.setPadding(20, 0, 0, 0);
             getSupportActionBar().setTitle(leaderboard.name);
             getSupportActionBar().setSubtitle(event.name);
+            ColorDrawable backgroundDrawable = new ColorDrawable(getResources().getColor(R.color.toolbar_background));
+            getSupportActionBar().setBackgroundDrawable(backgroundDrawable);
         }
         RegattaFragment regattaFragment = new RegattaFragment();
         regattaFragment.setFragmentWatcher(this);
diff --git a/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/activities/SettingsActivity.java b/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/activities/SettingsActivity.java
index 3b0228ee13c..f1fd131d139 100644
--- a/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/activities/SettingsActivity.java
+++ b/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/activities/SettingsActivity.java
@@ -1,5 +1,6 @@
 package com.sap.sailing.android.tracking.app.ui.activities;
 
+import android.graphics.drawable.ColorDrawable;
 import android.os.Bundle;
 import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.Toolbar;
@@ -31,6 +32,8 @@ public class SettingsActivity extends AppCompatActivity {
             getSupportActionBar().setDisplayHomeAsUpEnabled(true);
             getSupportActionBar().setHomeButtonEnabled(true);
             getSupportActionBar().setTitle(R.string.preferences);
+            ColorDrawable backgroundDrawable = new ColorDrawable(getResources().getColor(R.color.toolbar_background));
+            getSupportActionBar().setBackgroundDrawable(backgroundDrawable);
             toolbar.setNavigationIcon(R.drawable.sap_logo_64dp);
             toolbar.setPadding(20, 0, 0, 0);
         }
diff --git a/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/activities/StartActivity.java b/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/activities/StartActivity.java
index 0cf7914938e..bfb43246258 100644
--- a/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/activities/StartActivity.java
+++ b/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/activities/StartActivity.java
@@ -3,6 +3,7 @@ package com.sap.sailing.android.tracking.app.ui.activities;
 import java.util.List;
 
 import android.content.Intent;
+import android.graphics.drawable.ColorDrawable;
 import android.os.Bundle;
 import android.view.Menu;
 import android.view.MenuInflater;
@@ -34,6 +35,8 @@ public class StartActivity extends AbstractStartActivity {
         if (getSupportActionBar() != null) {
             getSupportActionBar().setTitle(getString(R.string.title_activity_start));
             getSupportActionBar().setHomeButtonEnabled(false);
+            ColorDrawable backgroundDrawable = new ColorDrawable(getResources().getColor(R.color.toolbar_background));
+            getSupportActionBar().setBackgroundDrawable(backgroundDrawable);
         }
         replaceFragment(R.id.content_frame, new HomeFragment());
         refreshDatabase();
diff --git a/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/activities/TrackingActivity.java b/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/activities/TrackingActivity.java
index 21821894fdf..504b8c6f2a6 100644
--- a/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/activities/TrackingActivity.java
+++ b/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/activities/TrackingActivity.java
@@ -6,6 +6,7 @@ import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.ServiceConnection;
+import android.graphics.drawable.ColorDrawable;
 import android.location.LocationManager;
 import android.os.Bundle;
 import android.os.IBinder;
@@ -99,10 +100,11 @@ public class TrackingActivity extends BaseActivity implements GPSQualityListener
             getSupportActionBar().setHomeButtonEnabled(true);
             getSupportActionBar().setTitle(eventInfo.leaderboardName);
             getSupportActionBar().setSubtitle(getString(R.string.tracking_colon) + " " + eventInfo.name);
+            ColorDrawable backgroundDrawable = new ColorDrawable(getResources().getColor(R.color.toolbar_background));
+            getSupportActionBar().setBackgroundDrawable(backgroundDrawable);
             if (toolbar != null) {
                 toolbar.setNavigationIcon(R.drawable.sap_logo_64dp);
                 toolbar.setPadding(20, 0, 0, 0);
-                toolbar.setBackgroundColor(getResources().getColor(R.color.colorPrimary));
             }
         }
 

From 3bc4a3d93dda563f3ef066750cf41c3870d351bc Mon Sep 17 00:00:00 2001
From: Bennet Brunsen <brunsen@ubilabs.net>
Date: Thu, 21 Apr 2016 12:38:08 +0200
Subject: [PATCH 03/92] Changed icon in regatta list

---
 .../res/drawable-hdpi/white_arrow_right.png      | Bin 0 -> 639 bytes
 .../res/drawable-mdpi/white_arrow_right.png      | Bin 0 -> 457 bytes
 .../res/drawable-xhdpi/white_arrow_right.png     | Bin 0 -> 744 bytes
 .../res/drawable-xxhdpi/white_arrow_right.png    | Bin 0 -> 1131 bytes
 .../res/drawable/yellow_arrow_right.png          | Bin 2670 -> 0 bytes
 .../res/layout/ragatta_listview_row.xml          |   6 +++---
 6 files changed, 3 insertions(+), 3 deletions(-)
 create mode 100755 mobile/com.sap.sailing.android.tracking.app/res/drawable-hdpi/white_arrow_right.png
 create mode 100755 mobile/com.sap.sailing.android.tracking.app/res/drawable-mdpi/white_arrow_right.png
 create mode 100755 mobile/com.sap.sailing.android.tracking.app/res/drawable-xhdpi/white_arrow_right.png
 create mode 100755 mobile/com.sap.sailing.android.tracking.app/res/drawable-xxhdpi/white_arrow_right.png
 delete mode 100644 mobile/com.sap.sailing.android.tracking.app/res/drawable/yellow_arrow_right.png

diff --git a/mobile/com.sap.sailing.android.tracking.app/res/drawable-hdpi/white_arrow_right.png b/mobile/com.sap.sailing.android.tracking.app/res/drawable-hdpi/white_arrow_right.png
new file mode 100755
index 0000000000000000000000000000000000000000..d0312802043e3824af31eea99b8737d4bbb5530b
GIT binary patch
literal 639
zcmV-_0)YLAP)<h;3K|Lk000e1NJLTq002k;002k`1^@s6RqeA!0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!AxT6*RCwC#+C6T<Fcb%H+wH)}5psk`
zTmZI?=?!3EE;r~AI<t_T02n)=Ze1cWc5JtfbnDn>=~Y4q2au}wf!|+3ASIIFr(nMq
z$2p6|VzF2(7K_Dld2T2MnNFt<gTdgZX__x>K!IqSKD;&nRT|J~q{@K0k(PioHlXe-
zv>*k>u~i^Z0ks`Si|m(qSl-`Zng4{3$0q0!jumjuS|X6A91NHF4NlgFsps?gBx|5E
zkXG=T0Mss9pfix-d^M7S<hce0q&^~*l94>;;2MxP>mY|eev~K!BHEU_fAdaAupT;A
zIPUODYO@BCiWDRPVI5R=+zA+7WhH%K)xCzw`Wrsp9USV#t1DLIa88>o5F)*Gv?diL
zl1Ly#Y9%0v1=>S;MWo&lq&}SUlFce6vB^~d#EGN^2$2eSTP9kQSRTy&yERb-#L>U0
z1ENL>8iDY~KPL_s3An7TAhMp#8_spDV&vVvmO}B=q<jxJA6eEx+_z<eaGb(1-?R3D
zaYSqld4)KnJFr0@&d>?ko({rr#!lGYeGrC|dKBh~>%oQ~1n02>CqB$D<N9u108Xkp
z{==y`zn?c8fk0RtN1Q6rS4EtagulOM!bw%fto!inK-zFfS23)Px0-Osfc9F4qNA@8
zhZA#4G*0CdJdY@?P!x~D38Vst3#itDLpcYrcH~;FAayvD1!8Fm7K_DVu~;mYtIDqc
Z0|22;8yNMbN0k5o002ovPDHLkV1l!c6m<Xq

literal 0
HcmV?d00001

diff --git a/mobile/com.sap.sailing.android.tracking.app/res/drawable-mdpi/white_arrow_right.png b/mobile/com.sap.sailing.android.tracking.app/res/drawable-mdpi/white_arrow_right.png
new file mode 100755
index 0000000000000000000000000000000000000000..3687cd7143e3a9824eb3818dcfb2379652767465
GIT binary patch
literal 457
zcmV;)0XF`LP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUzYe_^wRCwC#m%$B#FbqY3b^u0T1SA$H
z8_*5Pg*y|pBlOG#M(74ifMA4n14gJL1u2SvL$RGi&6gsoR0{veHg<x*%gf8lc~w;v
zn|gPIbj}D6smlNftlk7fgm_kL0wO{_Z-KbD22id*+&BPE7>5kQFlAZxfuDu4U5GvL
zpY;GHAwq(lAd0w`skG?XG)?UUzz#$Q5Tz3UoDd;pfyog=K&ZW;gH;2_Y(2mZgedA9
z1A-iY8Y1EVkS24PK8sS>@M7yDphcsFhuWpzu&w|(IRUT%G0SwCtW2SmloFrP8e@_*
z0-zM}tU<T|ASYG5$(0b9&V?ct=39Ln|HV8z0GNNk<Bn0h>;RZw9uu9I#5~t9*J_uX
zLye1boF*OOs4p}u=1Ka1?4~1!d2|5f7M3X6FDmn>Da3gXMvuV8Xh3dW=!|rZJ{qu?
zryAyJF7ucXI6Rcu5CL}c*dwx+mzUQc>MOtiGpekHDUVUE00000NkvXXu0mjf^3S;y

literal 0
HcmV?d00001

diff --git a/mobile/com.sap.sailing.android.tracking.app/res/drawable-xhdpi/white_arrow_right.png b/mobile/com.sap.sailing.android.tracking.app/res/drawable-xhdpi/white_arrow_right.png
new file mode 100755
index 0000000000000000000000000000000000000000..c6e5d551020327aa12a029fea11ad1f7f2d5d734
GIT binary patch
literal 744
zcmV<E0vG*>P)<h;3K|Lk000e1NJLTq003YB003YJ1^@s6;+S_h0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!ib+I4RCwC#oXv5<Fc3y1O$u-cNe83@
z=)iPfE}WANk_vL?0v&`7pae>w1eXx)%pSO4*)y@VKi`|-#zA}!S>Cm*5C8xG00000
z000000KVAo_bZRTI|&-gB}-@_pdL;B{ALLq1k~l|NkS4jE;kaA;IWZ}BLvi?vo0Yi
z7^7(kk_7Yx33P|lK)`%#3KCkb6--Hp0;}N**96bFk*vev&|?PtGda{7&xHHH*H)Hh
zLX<ct4)?-g53Ly+mIeWkU`&7)2~oo!xen+G5_Va_83O7_2rS_Q0gzx*081bNM=KK4
z378<^lqKvS01|8pn9#ZqEkU(_2@=k{F7yykPlCuMUa}y7tKfGI`57XccqV4R#MXtV
znP5u51PNmLN6DH1{%6xOg`q;M;mgqqGoWtkqWVlomId(r|CpJuhJbk`e2$RN;SyB8
zb+LF8&y4`75|SqY9PBm>??0kFsXv$j^;;K<H1U#00esteEqtxbqF(17%ZtN*f5YoQ
zJEA_g;}W!dn_|&kQAGIl!gsR<JS@86x}?!j_(OL*v><P5w5TJ(ulvk684kY-3Le-;
z!{MvgvXY#J|1D*!inV9L)Wi8Gd`;B0#b_vel^b^>!iRvltJ|LM@vjnpLv#?n=+~Db
z!iRu4s#`TL?nQ&)t9p|@DGGlb3?5^Ul!V^}qi0AYCE=G^3)i6Z01xSJ%2QjRv_(Y4
z%XsPpjI3@|hc8xum+-|27`bJHpmy?CFhCR*eyO@8)SU;R<u1rw_|gQp3!l)iHBods
z*}4D|=fY{Ngw2O9S%8c1r3#?X-#mmbQGlsaakU9>7rrPgo{SCv00000000000Kg-E
a0t^5xB~~Hoya`1B0000<MNUMnLSTY$#5)`S

literal 0
HcmV?d00001

diff --git a/mobile/com.sap.sailing.android.tracking.app/res/drawable-xxhdpi/white_arrow_right.png b/mobile/com.sap.sailing.android.tracking.app/res/drawable-xxhdpi/white_arrow_right.png
new file mode 100755
index 0000000000000000000000000000000000000000..6360aff464939f5e8a2f3bcde8dce3685b554aab
GIT binary patch
literal 1131
zcmV-x1eE)UP)<h;3K|Lk000e1NJLTq0058x0058(1^@s6=SJeV0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU$4M{{nRCwC#-9J(rF&Ky81yZE+5jcVw
znv|wX2{$kebvQweKx#L*O$9jtlxdhaCrG#f>Cz<<S?3QB5^2|FclEq8J9wB;VedPi
zwEC^2ssaE2000000000000000004A?qobp#Utzs$4($7!28mv|tpsYqNs#E&ttC(s
zrX(T|iF&}szy{IZ9{BfVxDIBs*^S$+0_89X*F}(P<aQG%mobS5)RsisZaaaRNc15{
zG<NF=l*_2DL?j{*i3rp#iwudTG$7EDy$p#?NtDmV(7sUpsD4oom{T~M&1Q2-q_H)$
zFLZTv^>uf5_igz2B3vnt?E9hJm(cz_EeftccdAj$!cx1Zd8kB()F`w9-Kj?JLRHyL
z?9RrqO>9e#!Ug(GqEX$Ykw_Po-JQj*EcNw{%Sw_@poS8~X@NZwJxozE(e-0`93ZF2
zAjwyO?p2~&DXJe6i7AyRc4wbyQ@B74B)X})vjueu7l=dzYD=P==z~Nh4x;}uu)dX{
zlH{vEPf&>>MTf8ix-U{repakRTa@{e%=|1S`PZTCf<R~@QE~YhfgYFWI*O6dthf-C
zK#xnbAdx|I8w2Y&s7?)G&+EbU4S^6PnuI@RReF9l=p>&&X%gjzu!EI|KqP9!CMD9S
z^RJyME&7PkeH!9QSQRM05(!}mL?T_-({^XeB!8aJY?<Wm58*dZf!eD^MTW3uqFbWW
z5SBpgOBAd6q!ft=)V@TQ8TnanlY9cLMxtUuSOTq9qL1O@%Wyp(szjc`R{wOC6Mgh1
z$tO^ECF(_fW+HJ7)U(d1ONV-~CSL_wZzal!J~~~A2-FXWI-8&A!q(rNMH!A0n?>nf
z8v|iEpgv1%7B~JpAP{+`8Bb%K-Zj=3Xua~JuI%XimcuGgcjbB0hyAKmpw-KB68@x~
zW#60kgb1`+c?SQI8G*<{ppJ=?J5d<rIq%!|B~Uly>Fp{F0+EM69gwHk?Sjn%J&ioK
z%cF;|xKIUZCeNfQe9IRVC|{mwWtR>WsDV6=jUrH%JTaCyNo+RQb65$KCXYjW2}B+O
ztyi2;J>E&(jwQa1aXj?jhd}?9#{nz^BG0NY5A?7+WAdm#P31|=wR-tF27$UEPqD{e
z>cW1>GbN7-)I^@tXu`p}Do~?bYsab0&W+Dmax?f7cnI`=^5jGl<RK7w2$U~Q?(Fj5
zLs0^ehd|^ZP#5LNnO!Ciff~tETqv5$=78mykcU9I@=VD?peFL<<XYq@eGHVj<VGl}
z0{w(M1X>&9Ay768^0dRVg5?p4szBr+5P1mH1Lov02FjL4D5?UHhd|`fh4lxymI_23
xteHBA2LJ#7000000000000000P!8V(7yx1jDd5VcRs{e6002ovPDHLkV1mI(_pAT_

literal 0
HcmV?d00001

diff --git a/mobile/com.sap.sailing.android.tracking.app/res/drawable/yellow_arrow_right.png b/mobile/com.sap.sailing.android.tracking.app/res/drawable/yellow_arrow_right.png
deleted file mode 100644
index 174bb8d7fcd91cc9fe9dcff89b6a8810f6e92793..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2670
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

diff --git a/mobile/com.sap.sailing.android.tracking.app/res/layout/ragatta_listview_row.xml b/mobile/com.sap.sailing.android.tracking.app/res/layout/ragatta_listview_row.xml
index d446ad0e248..60fde669d35 100644
--- a/mobile/com.sap.sailing.android.tracking.app/res/layout/ragatta_listview_row.xml
+++ b/mobile/com.sap.sailing.android.tracking.app/res/layout/ragatta_listview_row.xml
@@ -9,13 +9,13 @@
 
     <ImageView
         android:id="@+id/nextPage"
-        android:layout_width="22dp"
-        android:layout_height="22dp"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
         android:layout_alignParentRight="true"
         android:layout_alignParentEnd="true"
         android:layout_alignParentTop="true"
         android:contentDescription="@string/empty"
-        android:src="@drawable/yellow_arrow_right"
+        android:src="@drawable/white_arrow_right"
         android:layout_marginTop="13dp"
         android:layout_marginBottom="10dp"
         android:layout_marginRight="10dp"

From d3a6bac0187de54cd0ae300915e725e581d3b89d Mon Sep 17 00:00:00 2001
From: Bennet Brunsen <brunsen@ubilabs.net>
Date: Thu, 21 Apr 2016 12:57:21 +0200
Subject: [PATCH 04/92] Remove shadow around buttons for android api 21 and
 higher

---
 .../res/values-v21/theme.xml                                | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/mobile/com.sap.sailing.android.tracking.app/res/values-v21/theme.xml b/mobile/com.sap.sailing.android.tracking.app/res/values-v21/theme.xml
index 778bacdfcec..211ed8ef094 100644
--- a/mobile/com.sap.sailing.android.tracking.app/res/values-v21/theme.xml
+++ b/mobile/com.sap.sailing.android.tracking.app/res/values-v21/theme.xml
@@ -3,6 +3,12 @@
 
     <style name="AppTheme" parent="AppTheme.Base">
         <!-- Customize your theme using Material Design here. -->
+        <item name="android:buttonStyle">@style/shadowLessButtonStyle</item>
+    </style>
+    
+    <style name="shadowLessButtonStyle" parent="@android:style/Widget.Material.Button.Borderless">
+        <item name="android:elevation">0dp</item>
+        <item name="android:stateListAnimator">@null</item>
     </style>
 
 </resources>

From c3ed7f2e8117ef64d0b3259c88781455e1c9dff5 Mon Sep 17 00:00:00 2001
From: Bennet Brunsen <brunsen@ubilabs.net>
Date: Thu, 21 Apr 2016 14:19:29 +0200
Subject: [PATCH 05/92] Light theme for settings

---
 .../res/values/theme.xml                      |  2 +-
 .../app/customviews/OpenSansToolbar.java      | 47 -------------------
 .../app/ui/activities/SettingsActivity.java   |  5 +-
 3 files changed, 4 insertions(+), 50 deletions(-)
 delete mode 100644 mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/customviews/OpenSansToolbar.java

diff --git a/mobile/com.sap.sailing.android.tracking.app/res/values/theme.xml b/mobile/com.sap.sailing.android.tracking.app/res/values/theme.xml
index 2944f19e80d..7ee8939d28f 100644
--- a/mobile/com.sap.sailing.android.tracking.app/res/values/theme.xml
+++ b/mobile/com.sap.sailing.android.tracking.app/res/values/theme.xml
@@ -4,7 +4,7 @@
     <!-- Base application theme. -->
     <style name="AppTheme" parent="AppTheme.Base"/>
 
-    <style name="AppTheme.Base" parent="Theme.AppCompat.NoActionBar">
+    <style name="AppTheme.Base" parent="Theme.AppCompat.Light.NoActionBar">
 
         <!-- Customize your theme here. -->
 
diff --git a/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/customviews/OpenSansToolbar.java b/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/customviews/OpenSansToolbar.java
deleted file mode 100644
index 6ab900bd4d3..00000000000
--- a/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/customviews/OpenSansToolbar.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.sap.sailing.android.tracking.app.customviews;
-
-import android.content.Context;
-import android.support.v7.widget.Toolbar;
-import android.util.AttributeSet;
-import android.widget.TextView;
-
-import com.sap.sailing.android.tracking.app.R;
-
-public class OpenSansToolbar extends Toolbar {
-
-	public OpenSansToolbar(Context context) {
-		super(context);
-	}
-
-	public OpenSansToolbar(Context context, AttributeSet attrs) {
-		super(context, attrs);
-	}
-
-	public OpenSansToolbar(Context context, AttributeSet attrs, int defStyleAttr) {
-		super(context, attrs, defStyleAttr);
-	}
-	
-	@Override
-	public void setTitle(int resId) {
-		TextView titleTextView = (TextView)findViewById(R.id.toolbar_title);
-		titleTextView.setText(resId);
-	}
-	
-	@Override
-	public void setSubtitle(int resId) {
-		TextView subtitleTextView = (TextView)findViewById(R.id.toolbar_subtitle);
-		subtitleTextView.setText(resId);
-	}
-	
-	@Override
-	public void setTitle(CharSequence arg0) {
-		TextView titleTextView = (TextView)findViewById(R.id.toolbar_title);
-		titleTextView.setText(arg0);
-	}
-	
-	@Override
-	public void setSubtitle(CharSequence arg0) {
-		TextView subtitleTextView = (TextView)findViewById(R.id.toolbar_subtitle);
-		subtitleTextView.setText(arg0);
-	}
-}
diff --git a/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/activities/SettingsActivity.java b/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/activities/SettingsActivity.java
index f1fd131d139..730922331b4 100644
--- a/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/activities/SettingsActivity.java
+++ b/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/activities/SettingsActivity.java
@@ -3,9 +3,9 @@ package com.sap.sailing.android.tracking.app.ui.activities;
 import android.graphics.drawable.ColorDrawable;
 import android.os.Bundle;
 import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.Toolbar;
 import android.view.View;
 
+import com.sap.sailing.android.shared.ui.customviews.OpenSansToolbar;
 import com.sap.sailing.android.tracking.app.R;
 import com.sap.sailing.android.tracking.app.ui.fragments.preference.GeneralPreferenceFragment;
 
@@ -16,9 +16,10 @@ public class SettingsActivity extends AppCompatActivity {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.pref_with_actionbar);
 
-        Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
+        OpenSansToolbar toolbar = (OpenSansToolbar) findViewById(R.id.toolbar);
         if (toolbar != null) {
             setSupportActionBar(toolbar);
+            toolbar.hideSubtitle();
             toolbar.setBackgroundColor(getResources().getColor(R.color.colorPrimary));
             toolbar.setNavigationOnClickListener(new View.OnClickListener() {
                 @Override

From 49490f81e23bc84bbfa740658ae656a47f094bd1 Mon Sep 17 00:00:00 2001
From: Bennet Brunsen <brunsen@ubilabs.net>
Date: Thu, 21 Apr 2016 14:30:27 +0200
Subject: [PATCH 06/92] Fixes v21 button text color issues

---
 .../res/values-v21/theme.xml                                     | 1 +
 1 file changed, 1 insertion(+)

diff --git a/mobile/com.sap.sailing.android.tracking.app/res/values-v21/theme.xml b/mobile/com.sap.sailing.android.tracking.app/res/values-v21/theme.xml
index 211ed8ef094..da8409c40e9 100644
--- a/mobile/com.sap.sailing.android.tracking.app/res/values-v21/theme.xml
+++ b/mobile/com.sap.sailing.android.tracking.app/res/values-v21/theme.xml
@@ -7,6 +7,7 @@
     </style>
     
     <style name="shadowLessButtonStyle" parent="@android:style/Widget.Material.Button.Borderless">
+        <item name="android:textColor">@color/white</item>
         <item name="android:elevation">0dp</item>
         <item name="android:stateListAnimator">@null</item>
     </style>

From af0376f2e4b497a20caa973f0346ea7bd84e76e2 Mon Sep 17 00:00:00 2001
From: Bennet Brunsen <brunsen@ubilabs.net>
Date: Thu, 21 Apr 2016 14:50:27 +0200
Subject: [PATCH 07/92] Accent color reflects fiori main color

---
 .../res/layout/fragment_home.xml                            | 2 +-
 .../res/values/colors.xml                                   | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_home.xml b/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_home.xml
index 955c75e2897..b83cf88206f 100644
--- a/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_home.xml
+++ b/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_home.xml
@@ -40,7 +40,7 @@
         android:layout_marginLeft="16dp"
         android:layout_marginRight="16dp"
         android:layout_marginTop="20dp"
-        android:background="#009de0"
+        android:background="@color/qr_code_background_color"
         android:text="@string/scan_qr"
         android:textAllCaps="true"
         android:textSize="18sp"/>
diff --git a/mobile/com.sap.sailing.android.tracking.app/res/values/colors.xml b/mobile/com.sap.sailing.android.tracking.app/res/values/colors.xml
index 43f81f0c76b..898f061cda0 100644
--- a/mobile/com.sap.sailing.android.tracking.app/res/values/colors.xml
+++ b/mobile/com.sap.sailing.android.tracking.app/res/values/colors.xml
@@ -12,9 +12,13 @@
 
     <color name="colorPrimary">@color/gray</color>
     <color name="colorPrimaryDark">@color/colorPrimary</color>
-    <color name="colorAccent">@color/sap_yellow</color>
+    <color name="colorAccent">@color/fiori_primary_color</color>
 
     <color name="toolbar_text_color">@color/black</color>
     <color name="toolbar_background">@color/white</color>
 
+    <color name="fiori_primary_color">#009de0</color>
+
+    <color name="qr_code_background_color">@color/fiori_primary_color</color>
+
 </resources>
\ No newline at end of file

From 40237e23368c1970921fd5da66fc43e8977f79e6 Mon Sep 17 00:00:00 2001
From: Bennet Brunsen <brunsen@ubilabs.net>
Date: Thu, 21 Apr 2016 14:52:38 +0200
Subject: [PATCH 08/92] Fixes font color in speedfragment

---
 .../res/layout/fragment_speed.xml                                | 1 -
 1 file changed, 1 deletion(-)

diff --git a/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_speed.xml b/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_speed.xml
index 3f25a6505c6..35558acd956 100644
--- a/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_speed.xml
+++ b/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_speed.xml
@@ -29,7 +29,6 @@
             android:layout_height="wrap_content"
             android:layout_centerInParent="true"
             android:gravity="center"
-            android:textColor="@color/white"
             android:singleLine="true"
             android:textSize="124sp"
             android:textStyle="bold"

From 2a3a6d047194599bcaab9977f574f7e22c8d795a Mon Sep 17 00:00:00 2001
From: Bennet Brunsen <brunsen@ubilabs.net>
Date: Thu, 21 Apr 2016 15:12:55 +0200
Subject: [PATCH 09/92] Color statusbar for v21+ devices

---
 .../res/values-v21/theme.xml                                     | 1 +
 1 file changed, 1 insertion(+)

diff --git a/mobile/com.sap.sailing.android.tracking.app/res/values-v21/theme.xml b/mobile/com.sap.sailing.android.tracking.app/res/values-v21/theme.xml
index da8409c40e9..e6519bb1435 100644
--- a/mobile/com.sap.sailing.android.tracking.app/res/values-v21/theme.xml
+++ b/mobile/com.sap.sailing.android.tracking.app/res/values-v21/theme.xml
@@ -4,6 +4,7 @@
     <style name="AppTheme" parent="AppTheme.Base">
         <!-- Customize your theme using Material Design here. -->
         <item name="android:buttonStyle">@style/shadowLessButtonStyle</item>
+        <item name="android:colorPrimaryDark">@color/fiori_primary_color</item>
     </style>
     
     <style name="shadowLessButtonStyle" parent="@android:style/Widget.Material.Button.Borderless">

From 4cfd4b533487892966d6f0fcda0207225f86cea5 Mon Sep 17 00:00:00 2001
From: Bennet Brunsen <brunsen@ubilabs.net>
Date: Tue, 26 Apr 2016 09:55:07 +0200
Subject: [PATCH 10/92] Adjust regatta list row layout

---
 .../res/layout/ragatta_listview_row.xml                | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/mobile/com.sap.sailing.android.tracking.app/res/layout/ragatta_listview_row.xml b/mobile/com.sap.sailing.android.tracking.app/res/layout/ragatta_listview_row.xml
index 60fde669d35..851ef2c0179 100644
--- a/mobile/com.sap.sailing.android.tracking.app/res/layout/ragatta_listview_row.xml
+++ b/mobile/com.sap.sailing.android.tracking.app/res/layout/ragatta_listview_row.xml
@@ -3,7 +3,7 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="50dp"
+    android:layout_height="80dp"
     android:background="@color/list_item_background_color"
     tools:ignore="Overdraw" >
 
@@ -13,11 +13,10 @@
         android:layout_height="wrap_content"
         android:layout_alignParentRight="true"
         android:layout_alignParentEnd="true"
-        android:layout_alignParentTop="true"
+        android:baselineAlignBottom="@+id/regattaName"
         android:contentDescription="@string/empty"
         android:src="@drawable/white_arrow_right"
-        android:layout_marginTop="13dp"
-        android:layout_marginBottom="10dp"
+        android:paddingTop="15dp"
         android:layout_marginRight="10dp"
         android:layout_marginEnd="10dp" />
 
@@ -28,8 +27,7 @@
         android:layout_alignParentLeft="true"
         android:layout_alignParentStart="true"
         android:layout_centerVertical="true"
-        android:layout_toLeftOf="@+id/nextPage"
-        android:layout_toStartOf="@+id/nextPage"
+        android:textSize="18sp"
         android:paddingLeft="15dp"
         android:paddingRight="15dp"
         android:singleLine="true"

From 2b3f050bac379bfbc68d1d82409a138bd0031ada Mon Sep 17 00:00:00 2001
From: Bennet Brunsen <brunsen@ubilabs.net>
Date: Tue, 26 Apr 2016 12:14:52 +0200
Subject: [PATCH 11/92] Pressed state for scan qr code button

---
 .../res/drawable/normal_btn_blue.xml                 | 12 ++++++++++++
 .../res/drawable/normal_btn_white.xml                |  3 +++
 .../res/drawable/pressed_btn_blue.xml                | 12 ++++++++++++
 .../res/drawable/scan_qr_button.xml                  |  7 +++++++
 .../res/layout/fragment_home.xml                     |  9 ++++-----
 .../res/values-v21/theme.xml                         |  2 ++
 .../res/values/colors.xml                            | 12 +++++++++++-
 .../res/values/dimens.xml                            | 10 ++++++++--
 .../res/values/theme.xml                             |  7 +++++++
 9 files changed, 66 insertions(+), 8 deletions(-)
 create mode 100644 mobile/com.sap.sailing.android.tracking.app/res/drawable/normal_btn_blue.xml
 create mode 100644 mobile/com.sap.sailing.android.tracking.app/res/drawable/pressed_btn_blue.xml
 create mode 100644 mobile/com.sap.sailing.android.tracking.app/res/drawable/scan_qr_button.xml

diff --git a/mobile/com.sap.sailing.android.tracking.app/res/drawable/normal_btn_blue.xml b/mobile/com.sap.sailing.android.tracking.app/res/drawable/normal_btn_blue.xml
new file mode 100644
index 00000000000..75e1fe96c07
--- /dev/null
+++ b/mobile/com.sap.sailing.android.tracking.app/res/drawable/normal_btn_blue.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <corners
+        android:radius="@dimen/button_radius"/>
+
+    <solid android:color="@color/qr_code_button_normal"/>
+
+    <stroke
+        android:width="1dp"
+        android:color="@color/separator_color" />
+</shape>
\ No newline at end of file
diff --git a/mobile/com.sap.sailing.android.tracking.app/res/drawable/normal_btn_white.xml b/mobile/com.sap.sailing.android.tracking.app/res/drawable/normal_btn_white.xml
index 52039ca3c53..6cdff1f091f 100644
--- a/mobile/com.sap.sailing.android.tracking.app/res/drawable/normal_btn_white.xml
+++ b/mobile/com.sap.sailing.android.tracking.app/res/drawable/normal_btn_white.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android" >
 
+    <corners
+        android:radius="@dimen/button_radius"/>
+
     <solid android:color="@color/white_less_transparent" />
 
     <stroke
diff --git a/mobile/com.sap.sailing.android.tracking.app/res/drawable/pressed_btn_blue.xml b/mobile/com.sap.sailing.android.tracking.app/res/drawable/pressed_btn_blue.xml
new file mode 100644
index 00000000000..3780ce613ed
--- /dev/null
+++ b/mobile/com.sap.sailing.android.tracking.app/res/drawable/pressed_btn_blue.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <corners
+        android:radius="@dimen/button_radius"/>
+
+    <solid android:color="@color/qr_code_button_pressed"/>
+
+    <stroke
+        android:width="1dp"
+        android:color="@color/separator_color" />
+</shape>
\ No newline at end of file
diff --git a/mobile/com.sap.sailing.android.tracking.app/res/drawable/scan_qr_button.xml b/mobile/com.sap.sailing.android.tracking.app/res/drawable/scan_qr_button.xml
new file mode 100644
index 00000000000..44aebc9d21e
--- /dev/null
+++ b/mobile/com.sap.sailing.android.tracking.app/res/drawable/scan_qr_button.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <!-- pressed -->
+    <item android:drawable="@drawable/pressed_btn_blue" android:state_pressed="true" />
+    <!-- default -->
+    <item android:drawable="@drawable/normal_btn_blue" />
+</selector>
\ No newline at end of file
diff --git a/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_home.xml b/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_home.xml
index b83cf88206f..0b15e937392 100644
--- a/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_home.xml
+++ b/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_home.xml
@@ -28,6 +28,7 @@
             android:layout_centerVertical="true"
             android:gravity="center"
             android:text="@string/scan_hint"
+            android:textSize="@dimen/default_text_size"
             android:textColor="@color/black"/>
     </RelativeLayout>
 
@@ -40,10 +41,9 @@
         android:layout_marginLeft="16dp"
         android:layout_marginRight="16dp"
         android:layout_marginTop="20dp"
-        android:background="@color/qr_code_background_color"
+        android:background="@drawable/scan_qr_button"
         android:text="@string/scan_qr"
-        android:textAllCaps="true"
-        android:textSize="18sp"/>
+        android:textSize="@dimen/highlight_text_size"/>
 
     <Button
         android:id="@+id/noQrCode"
@@ -56,9 +56,8 @@
         android:paddingLeft="@dimen/activity_horizontal_margin"
         android:paddingRight="@dimen/activity_horizontal_margin"
         android:text="@string/no_qr_code"
-        android:textAllCaps="true"
         android:textColor="@color/black"
-        android:textSize="18sp"/>
+        android:textSize="@dimen/default_text_size"/>
 
     <ListView
         android:id="@+id/listRegatta"
diff --git a/mobile/com.sap.sailing.android.tracking.app/res/values-v21/theme.xml b/mobile/com.sap.sailing.android.tracking.app/res/values-v21/theme.xml
index e6519bb1435..66247ba33ec 100644
--- a/mobile/com.sap.sailing.android.tracking.app/res/values-v21/theme.xml
+++ b/mobile/com.sap.sailing.android.tracking.app/res/values-v21/theme.xml
@@ -8,6 +8,8 @@
     </style>
     
     <style name="shadowLessButtonStyle" parent="@android:style/Widget.Material.Button.Borderless">
+        <item name="android:textAppearance">@style/Base.TextAppearance.AppCompat.Button</item>
+        <item name="android:textAllCaps">false</item>
         <item name="android:textColor">@color/white</item>
         <item name="android:elevation">0dp</item>
         <item name="android:stateListAnimator">@null</item>
diff --git a/mobile/com.sap.sailing.android.tracking.app/res/values/colors.xml b/mobile/com.sap.sailing.android.tracking.app/res/values/colors.xml
index 898f061cda0..232043a76eb 100644
--- a/mobile/com.sap.sailing.android.tracking.app/res/values/colors.xml
+++ b/mobile/com.sap.sailing.android.tracking.app/res/values/colors.xml
@@ -9,6 +9,7 @@
     <color name="green">#00FF00</color>
     <color name="gray">#333333</color>
     <color name="darker_gray">#242424</color>
+    <color name="black_transparent">#55000000</color>
 
     <color name="colorPrimary">@color/gray</color>
     <color name="colorPrimaryDark">@color/colorPrimary</color>
@@ -19,6 +20,15 @@
 
     <color name="fiori_primary_color">#009de0</color>
 
-    <color name="qr_code_background_color">@color/fiori_primary_color</color>
+    <color name="start_tracking_button_normal">#0e7733</color>
+    <color name="start_tracking_button_pressed">#08451e</color>
+
+    <color name="stop_tracking_button_normal">#cd201b</color>
+    <color name="stop_tracking_button_pressed">#991814</color>
+
+    <color name="qr_code_button_normal">@color/fiori_primary_color</color>
+    <color name="qr_code_button_pressed">#007aad</color>
+
+    <color name="competitor_background_color">#B3f3f3f3</color>
 
 </resources>
\ No newline at end of file
diff --git a/mobile/com.sap.sailing.android.tracking.app/res/values/dimens.xml b/mobile/com.sap.sailing.android.tracking.app/res/values/dimens.xml
index d771be4fc8c..428c9063448 100644
--- a/mobile/com.sap.sailing.android.tracking.app/res/values/dimens.xml
+++ b/mobile/com.sap.sailing.android.tracking.app/res/values/dimens.xml
@@ -5,10 +5,16 @@
     <!-- <dimen name="activity_vertical_margin">16dp</dimen> -->
 
     <!-- Values for regatta buttons-->
-    <dimen name="regatta_button_height">90dp</dimen>
-    <dimen name="regatta_button_side_margin">4dp</dimen>
+    <dimen name="regatta_button_height">80dp</dimen>
+    <dimen name="regatta_button_side_margin">20dp</dimen>
     <dimen name="regatta_button_margin">10dp</dimen>
     <dimen name="regatta_button_padding">10dp</dimen>
+    <dimen name="tracking_button_height">120dp</dimen>
     <dimen name="toolbar_separator_height">1dp</dimen>
+    <dimen name="button_text_size">@dimen/default_text_size</dimen>
+    <dimen name="default_text_size">16sp</dimen>
+    <dimen name="highlight_text_size">21sp</dimen>
+    <dimen name="tracking_button_text_size">@dimen/highlight_text_size</dimen>
+    <dimen name="button_radius">3dp</dimen>
 
 </resources>
diff --git a/mobile/com.sap.sailing.android.tracking.app/res/values/theme.xml b/mobile/com.sap.sailing.android.tracking.app/res/values/theme.xml
index 7ee8939d28f..85c0dc67c48 100644
--- a/mobile/com.sap.sailing.android.tracking.app/res/values/theme.xml
+++ b/mobile/com.sap.sailing.android.tracking.app/res/values/theme.xml
@@ -21,6 +21,8 @@
 
         <item name="windowActionBar">false</item>
         <item name="windowNoTitle">true</item>
+
+        <item name="android:button">@style/buttonStyle</item>
     </style>
 
     <style name="AppTheme.Toolbar" parent="ThemeOverlay.AppCompat.ActionBar">
@@ -32,4 +34,9 @@
         <item name="android:windowBackground">@drawable/launch_screen</item>
     </style>
 
+    <style name="buttonStyle" parent="Base.Widget.AppCompat.Button">
+        <item name="android:textAllCaps">false</item>
+        <item name="android:textColor">@color/white</item>
+    </style>
+
 </resources>
\ No newline at end of file

From 8ecd702e8e5e8faaf667b14862f13b2639562269 Mon Sep 17 00:00:00 2001
From: Bennet Brunsen <brunsen@ubilabs.net>
Date: Tue, 26 Apr 2016 12:24:41 +0200
Subject: [PATCH 12/92] Adjusted buttons in regatta fragment

---
 .../res/drawable/normal_btn_green.xml         | 12 +++
 .../res/drawable/normal_btn_white.xml         |  2 +-
 .../res/drawable/normal_button.xml            |  7 ++
 .../res/drawable/pressed_btn_green.xml        | 12 +++
 .../res/drawable/pressed_btn_white.xml        | 12 +++
 .../res/drawable/rounded_btn_green.xml        | 11 ---
 .../res/drawable/start_tracking_button.xml    |  7 ++
 .../res/layout-land/fragment_regatta.xml      |  2 +-
 .../res/layout/fragment_regatta.xml           | 84 +++++++++----------
 .../res/values/colors.xml                     |  3 +
 10 files changed, 93 insertions(+), 59 deletions(-)
 create mode 100644 mobile/com.sap.sailing.android.tracking.app/res/drawable/normal_btn_green.xml
 create mode 100644 mobile/com.sap.sailing.android.tracking.app/res/drawable/normal_button.xml
 create mode 100644 mobile/com.sap.sailing.android.tracking.app/res/drawable/pressed_btn_green.xml
 create mode 100644 mobile/com.sap.sailing.android.tracking.app/res/drawable/pressed_btn_white.xml
 delete mode 100644 mobile/com.sap.sailing.android.tracking.app/res/drawable/rounded_btn_green.xml
 create mode 100644 mobile/com.sap.sailing.android.tracking.app/res/drawable/start_tracking_button.xml

diff --git a/mobile/com.sap.sailing.android.tracking.app/res/drawable/normal_btn_green.xml b/mobile/com.sap.sailing.android.tracking.app/res/drawable/normal_btn_green.xml
new file mode 100644
index 00000000000..c73d8d4042c
--- /dev/null
+++ b/mobile/com.sap.sailing.android.tracking.app/res/drawable/normal_btn_green.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <corners
+        android:radius="@dimen/button_radius"/>
+
+    <solid android:color="@color/start_tracking_button_normal"/>
+
+    <stroke
+        android:width="1dp"
+        android:color="@color/separator_color" />
+</shape>
\ No newline at end of file
diff --git a/mobile/com.sap.sailing.android.tracking.app/res/drawable/normal_btn_white.xml b/mobile/com.sap.sailing.android.tracking.app/res/drawable/normal_btn_white.xml
index 6cdff1f091f..e4977ef4436 100644
--- a/mobile/com.sap.sailing.android.tracking.app/res/drawable/normal_btn_white.xml
+++ b/mobile/com.sap.sailing.android.tracking.app/res/drawable/normal_btn_white.xml
@@ -4,7 +4,7 @@
     <corners
         android:radius="@dimen/button_radius"/>
 
-    <solid android:color="@color/white_less_transparent" />
+    <solid android:color="@color/normal_button" />
 
     <stroke
         android:width="1dp"
diff --git a/mobile/com.sap.sailing.android.tracking.app/res/drawable/normal_button.xml b/mobile/com.sap.sailing.android.tracking.app/res/drawable/normal_button.xml
new file mode 100644
index 00000000000..1a294b29d77
--- /dev/null
+++ b/mobile/com.sap.sailing.android.tracking.app/res/drawable/normal_button.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <!-- pressed -->
+    <item android:drawable="@drawable/pressed_btn_white" android:state_pressed="true" />
+    <!-- default -->
+    <item android:drawable="@drawable/normal_btn_white" />
+</selector>
\ No newline at end of file
diff --git a/mobile/com.sap.sailing.android.tracking.app/res/drawable/pressed_btn_green.xml b/mobile/com.sap.sailing.android.tracking.app/res/drawable/pressed_btn_green.xml
new file mode 100644
index 00000000000..a938919f997
--- /dev/null
+++ b/mobile/com.sap.sailing.android.tracking.app/res/drawable/pressed_btn_green.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <corners
+        android:radius="@dimen/button_radius"/>
+
+    <solid android:color="@color/start_tracking_button_pressed"/>
+
+    <stroke
+        android:width="1dp"
+        android:color="@color/separator_color" />
+</shape>
\ No newline at end of file
diff --git a/mobile/com.sap.sailing.android.tracking.app/res/drawable/pressed_btn_white.xml b/mobile/com.sap.sailing.android.tracking.app/res/drawable/pressed_btn_white.xml
new file mode 100644
index 00000000000..f7feec47003
--- /dev/null
+++ b/mobile/com.sap.sailing.android.tracking.app/res/drawable/pressed_btn_white.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <corners
+        android:radius="@dimen/button_radius"/>
+
+    <solid android:color="@color/normal_button_pressed"/>
+
+    <stroke
+        android:width="1dp"
+        android:color="@color/separator_color" />
+</shape>
\ No newline at end of file
diff --git a/mobile/com.sap.sailing.android.tracking.app/res/drawable/rounded_btn_green.xml b/mobile/com.sap.sailing.android.tracking.app/res/drawable/rounded_btn_green.xml
deleted file mode 100644
index c68db18282c..00000000000
--- a/mobile/com.sap.sailing.android.tracking.app/res/drawable/rounded_btn_green.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <solid android:color="@color/sap_green"/>
-
-    <corners
-        android:bottomLeftRadius="5dip"
-        android:bottomRightRadius="5dip"
-        android:topLeftRadius="5dip"
-        android:topRightRadius="5dip"/>
-</shape>
\ No newline at end of file
diff --git a/mobile/com.sap.sailing.android.tracking.app/res/drawable/start_tracking_button.xml b/mobile/com.sap.sailing.android.tracking.app/res/drawable/start_tracking_button.xml
new file mode 100644
index 00000000000..88a50506fc3
--- /dev/null
+++ b/mobile/com.sap.sailing.android.tracking.app/res/drawable/start_tracking_button.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <!-- pressed -->
+    <item android:drawable="@drawable/pressed_btn_green" android:state_pressed="true" />
+    <!-- default -->
+    <item android:drawable="@drawable/normal_btn_green" />
+</selector>
\ No newline at end of file
diff --git a/mobile/com.sap.sailing.android.tracking.app/res/layout-land/fragment_regatta.xml b/mobile/com.sap.sailing.android.tracking.app/res/layout-land/fragment_regatta.xml
index ddc70627386..aeca4b9ed7d 100644
--- a/mobile/com.sap.sailing.android.tracking.app/res/layout-land/fragment_regatta.xml
+++ b/mobile/com.sap.sailing.android.tracking.app/res/layout-land/fragment_regatta.xml
@@ -446,7 +446,7 @@
                 android:layout_marginLeft="@dimen/regatta_button_side_margin"
                 android:layout_marginRight="@dimen/regatta_button_side_margin"
                 android:layout_weight="0.50"
-                android:background="@drawable/rounded_btn_green"
+                android:background="@drawable/normal_btn_green"
                 android:padding="@dimen/regatta_button_padding"
                 android:text="@string/start_tracking"
                 android:textAllCaps="true"
diff --git a/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_regatta.xml b/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_regatta.xml
index 012b706fb87..83b665a023e 100644
--- a/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_regatta.xml
+++ b/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_regatta.xml
@@ -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"
+                android:background="@drawable/main_background">
 
     <RelativeLayout
         android:id="@+id/image"
@@ -114,7 +115,7 @@
             android:layout_alignParentBottom="true"
             android:layout_alignParentLeft="true"
             android:layout_alignParentStart="true"
-            android:background="@color/black_transparent"
+            android:background="@color/competitor_background_color"
             android:baselineAligned="false"
             android:measureWithLargestChild="false"
             android:orientation="horizontal"
@@ -129,7 +130,7 @@
                 android:paddingLeft="@dimen/activity_horizontal_margin"
                 android:paddingRight="@dimen/activity_horizontal_margin"
                 android:text="@string/empty"
-                android:textColor="@color/white"/>
+                android:textColor="@color/black"/>
 
             <RelativeLayout
                 android:layout_width="10dp"
@@ -159,7 +160,7 @@
                 android:gravity="end|center_vertical"
                 android:padding="0dp"
                 android:text="@string/empty"
-                android:textColor="@color/white"/>
+                android:textColor="@color/black"/>
         </LinearLayout>
 
         <LinearLayout
@@ -185,12 +186,12 @@
 
         <View
             android:id="@+id/bottom_bar"
-            android:layout_width="fill_parent"
-            android:layout_height="4dp"
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/toolbar_separator_height"
             android:layout_alignBottom="@+id/competitor_info_layout"
             android:layout_alignParentLeft="true"
             android:layout_alignParentStart="true"
-            android:background="@color/sap_yellow"/>
+            android:background="@color/separator_color"/>
 
     </RelativeLayout>
 
@@ -365,12 +366,11 @@
         android:id="@+id/start_tracking_box"
         android:layout_width="fill_parent"
         android:layout_height="200dp"
-        android:layout_above="@id/bottomLayout"
-        android:background="@color/black">
+        android:layout_above="@+id/bottom_announcement">
 
         <View
             android:id="@+id/white_bar"
-            android:layout_width="fill_parent"
+            android:layout_width="match_parent"
             android:layout_height="1dp"
             android:layout_alignParentLeft="true"
             android:layout_alignParentStart="true"
@@ -384,77 +384,69 @@
             android:layout_below="@id/white_bar"
             android:orientation="horizontal">
 
-            <com.sap.sailing.android.tracking.app.customviews.OpenSansButton
+            <Button
                 android:id="@+id/show_event_button"
                 android:layout_width="0dp"
                 android:layout_height="match_parent"
-                android:layout_margin="@dimen/regatta_button_margin"
+                android:layout_marginBottom="@dimen/regatta_button_margin"
                 android:layout_marginLeft="@dimen/regatta_button_side_margin"
-                android:layout_marginRight="@dimen/regatta_button_side_margin"
+                android:layout_marginTop="@dimen/regatta_button_margin"
                 android:layout_weight="1"
-                android:background="@drawable/rounded_btn_blue"
+                android:background="@drawable/normal_button"
                 android:padding="@dimen/regatta_button_padding"
                 android:text="@string/show_event"
-                android:textAllCaps="true"
-                android:textStyle="bold"
+                android:textColor="@color/black"
+                android:textSize="@dimen/button_text_size"
                 tools:text="Show Event"/>
 
-            <com.sap.sailing.android.shared.ui.customviews.OpenSansButton
+            <Button
                 android:id="@+id/show_leaderboards_button"
                 android:layout_width="0dp"
                 android:layout_height="match_parent"
-                android:layout_margin="@dimen/regatta_button_margin"
+                android:layout_marginBottom="@dimen/regatta_button_margin"
                 android:layout_marginLeft="@dimen/regatta_button_side_margin"
                 android:layout_marginRight="@dimen/regatta_button_side_margin"
+                android:layout_marginTop="@dimen/regatta_button_margin"
                 android:layout_weight="1"
-                android:background="@drawable/rounded_btn_yellow"
+                android:background="@drawable/normal_button"
                 android:padding="@dimen/regatta_button_padding"
                 android:text="@string/show_leaderboard"
-                android:textAllCaps="true"
-                android:textStyle="bold"/>
+                android:textColor="@color/black"
+                android:textSize="@dimen/button_text_size"/>
 
         </LinearLayout>
 
         <RelativeLayout
             android:layout_width="match_parent"
-            android:layout_height="@dimen/regatta_button_height"
+            android:layout_height="@dimen/tracking_button_height"
             android:layout_below="@+id/event_buttons">
 
-            <com.sap.sailing.android.shared.ui.customviews.OpenSansButton
+            <Button
                 android:id="@+id/start_tracking"
-                android:layout_width="fill_parent"
+                android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:layout_margin="@dimen/regatta_button_margin"
                 android:layout_marginLeft="@dimen/regatta_button_side_margin"
                 android:layout_marginRight="@dimen/regatta_button_side_margin"
-                android:background="@drawable/rounded_btn_green"
+                android:layout_marginTop="@dimen/regatta_button_margin"
+                android:background="@drawable/start_tracking_button"
                 android:padding="@dimen/regatta_button_padding"
                 android:text="@string/start_tracking"
-                android:textAllCaps="true"
-                android:textStyle="bold"/>
+                android:textSize="@dimen/tracking_button_text_size"/>
 
         </RelativeLayout>
 
     </RelativeLayout>
 
-    <RelativeLayout
-        android:id="@+id/bottomLayout"
-        android:layout_width="match_parent"
-        android:layout_height="40dp"
+    <com.sap.sailing.android.shared.ui.customviews.OpenSansTextView
+        android:id="@+id/bottom_announcement"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
         android:layout_alignParentBottom="true"
-        android:layout_alignParentLeft="true"
-        android:layout_alignParentStart="true"
-        android:background="@color/darker_gray">
-
-        <com.sap.sailing.android.shared.ui.customviews.OpenSansTextView
-            android:id="@+id/bottom_announcement"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerHorizontal="true"
-            android:layout_centerVertical="true"
-            android:gravity="center"
-            android:text="@string/please_listen_to_announcements"
-            android:textColor="@color/white"/>
-    </RelativeLayout>
+        android:layout_centerHorizontal="true"
+        android:layout_marginBottom="20dp"
+        android:layout_marginTop="20dp"
+        android:textSize="@dimen/default_text_size"
+        android:text="@string/please_listen_to_announcements"
+        android:textColor="@color/black"/>
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/mobile/com.sap.sailing.android.tracking.app/res/values/colors.xml b/mobile/com.sap.sailing.android.tracking.app/res/values/colors.xml
index 232043a76eb..931c597b9ed 100644
--- a/mobile/com.sap.sailing.android.tracking.app/res/values/colors.xml
+++ b/mobile/com.sap.sailing.android.tracking.app/res/values/colors.xml
@@ -29,6 +29,9 @@
     <color name="qr_code_button_normal">@color/fiori_primary_color</color>
     <color name="qr_code_button_pressed">#007aad</color>
 
+    <color name="normal_button">#f3f3f3</color>
+    <color name="normal_button_pressed">#bfbfbf</color>
+
     <color name="competitor_background_color">#B3f3f3f3</color>
 
 </resources>
\ No newline at end of file

From ae1f6586576b989289245ec9500d076c0c6c9c58 Mon Sep 17 00:00:00 2001
From: Bennet Brunsen <brunsen@ubilabs.net>
Date: Tue, 26 Apr 2016 12:27:51 +0200
Subject: [PATCH 13/92] Changed stop tracking button background

---
 .../res/drawable/normal_btn_red.xml                  | 12 ++++++++++++
 .../res/drawable/pressed_btn_red.xml                 | 12 ++++++++++++
 .../res/drawable/stop_tracking_button.xml            |  7 +++++++
 .../res/layout/activity_tracking.xml                 |  5 ++---
 4 files changed, 33 insertions(+), 3 deletions(-)
 create mode 100644 mobile/com.sap.sailing.android.tracking.app/res/drawable/normal_btn_red.xml
 create mode 100644 mobile/com.sap.sailing.android.tracking.app/res/drawable/pressed_btn_red.xml
 create mode 100644 mobile/com.sap.sailing.android.tracking.app/res/drawable/stop_tracking_button.xml

diff --git a/mobile/com.sap.sailing.android.tracking.app/res/drawable/normal_btn_red.xml b/mobile/com.sap.sailing.android.tracking.app/res/drawable/normal_btn_red.xml
new file mode 100644
index 00000000000..71ee8398c19
--- /dev/null
+++ b/mobile/com.sap.sailing.android.tracking.app/res/drawable/normal_btn_red.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <corners
+        android:radius="@dimen/button_radius"/>
+
+    <solid android:color="@color/stop_tracking_button_normal"/>
+
+    <stroke
+        android:width="1dp"
+        android:color="@color/separator_color" />
+</shape>
\ No newline at end of file
diff --git a/mobile/com.sap.sailing.android.tracking.app/res/drawable/pressed_btn_red.xml b/mobile/com.sap.sailing.android.tracking.app/res/drawable/pressed_btn_red.xml
new file mode 100644
index 00000000000..05d02ac1838
--- /dev/null
+++ b/mobile/com.sap.sailing.android.tracking.app/res/drawable/pressed_btn_red.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <corners
+        android:radius="@dimen/button_radius"/>
+
+    <solid android:color="@color/stop_tracking_button_pressed"/>
+
+    <stroke
+        android:width="1dp"
+        android:color="@color/separator_color" />
+</shape>
\ No newline at end of file
diff --git a/mobile/com.sap.sailing.android.tracking.app/res/drawable/stop_tracking_button.xml b/mobile/com.sap.sailing.android.tracking.app/res/drawable/stop_tracking_button.xml
new file mode 100644
index 00000000000..c9ab42c40b8
--- /dev/null
+++ b/mobile/com.sap.sailing.android.tracking.app/res/drawable/stop_tracking_button.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <!-- pressed -->
+    <item android:drawable="@drawable/pressed_btn_red" android:state_pressed="true" />
+    <!-- default -->
+    <item android:drawable="@drawable/normal_btn_red" />
+</selector>
\ No newline at end of file
diff --git a/mobile/com.sap.sailing.android.tracking.app/res/layout/activity_tracking.xml b/mobile/com.sap.sailing.android.tracking.app/res/layout/activity_tracking.xml
index 81218a2f2d4..d9af3c5ab19 100644
--- a/mobile/com.sap.sailing.android.tracking.app/res/layout/activity_tracking.xml
+++ b/mobile/com.sap.sailing.android.tracking.app/res/layout/activity_tracking.xml
@@ -64,7 +64,7 @@
             android:layout_weight="1"/>
     </LinearLayout>
 
-    <com.sap.sailing.android.shared.ui.customviews.OpenSansButton
+    <Button
         android:id="@+id/stop_tracking"
         android:layout_width="match_parent"
         android:layout_height="100dp"
@@ -73,10 +73,9 @@
         android:layout_marginLeft="10dp"
         android:layout_marginRight="10dp"
         android:layout_marginTop="0dp"
-        android:background="@drawable/rounded_btn_red"
+        android:background="@drawable/stop_tracking_button"
         android:padding="0dp"
         android:text="@string/stop_tracking"
-        android:textAllCaps="true"
         android:textStyle="bold"/>
 
     <com.viewpagerindicator.CirclePageIndicator

From 5387d18246ed336a39216b0586504faf5ebf4c17 Mon Sep 17 00:00:00 2001
From: Bennet Brunsen <brunsen@ubilabs.net>
Date: Tue, 26 Apr 2016 14:43:33 +0200
Subject: [PATCH 14/92] Adjust regatta countdown layout

---
 .../res/layout/fragment_regatta.xml           | 124 +++++++++---------
 .../res/values/dimens.xml                     |   3 +
 2 files changed, 65 insertions(+), 62 deletions(-)

diff --git a/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_regatta.xml b/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_regatta.xml
index 83b665a023e..8155552b3c8 100644
--- a/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_regatta.xml
+++ b/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_regatta.xml
@@ -47,7 +47,7 @@
                 android:paddingLeft="@dimen/activity_horizontal_margin"
                 android:paddingRight="@dimen/activity_horizontal_margin"
                 android:text="@string/add_team_photo"
-                android:textColor="@color/white"/>
+                android:textColor="@color/black"/>
         </LinearLayout>
 
         <LinearLayout
@@ -77,7 +77,7 @@
                 android:paddingLeft="@dimen/activity_horizontal_margin"
                 android:paddingRight="@dimen/activity_horizontal_margin"
                 android:text="@string/upload_in_progress"
-                android:textColor="@color/white"/>
+                android:textColor="@color/black"/>
         </LinearLayout>
 
         <LinearLayout
@@ -105,7 +105,7 @@
                 android:paddingRight="8dp"
                 android:paddingTop="8dp"
                 android:text="@string/upload_retry"
-                android:textColor="@color/white"/>
+                android:textColor="@color/black"/>
         </LinearLayout>
 
         <LinearLayout
@@ -150,7 +150,7 @@
                     android:adjustViewBounds="true"
                     android:contentDescription="@string/content_description_flag_icon"
                     android:scaleType="fitXY"
-                    android:textColor="@color/white"/>
+                    android:textColor="@color/black"/>
             </RelativeLayout>
 
             <com.sap.sailing.android.shared.ui.customviews.OpenSansTextView
@@ -197,12 +197,11 @@
 
     <ScrollView
         android:id="@+id/scroll_view"
-        android:layout_width="fill_parent"
-        android:layout_height="100dp"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
         android:layout_above="@+id/start_tracking_box"
         android:layout_below="@id/image"
         android:layout_gravity="center"
-        android:background="@color/black"
         android:isScrollContainer="true"
         android:orientation="vertical"
         android:scrollbars="vertical">
@@ -211,6 +210,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content">
 
+            <!-- deprecated layout -->
             <RelativeLayout
                 android:id="@+id/thank_you_layout"
                 android:layout_width="match_parent"
@@ -218,8 +218,8 @@
                 android:baselineAligned="false"
                 android:measureWithLargestChild="false"
                 android:orientation="horizontal"
-                android:padding="10dp"
-                android:visibility="invisible">
+                android:paddingTop="10dp"
+                android:visibility="gone">
 
                 <com.sap.sailing.android.shared.ui.customviews.OpenSansTextView
                     android:id="@+id/thank_you_note"
@@ -228,160 +228,162 @@
                     android:gravity="start"
                     android:padding="0dp"
                     android:text="@string/thank_you_you_successfully_participated"
-                    android:textColor="@color/white"
+                    android:textColor="@color/black"
                     android:textStyle="bold"/>
             </RelativeLayout>
 
             <RelativeLayout
                 android:id="@+id/start_date_layout"
                 android:layout_width="match_parent"
-                android:layout_height="fill_parent"
+                android:layout_height="wrap_content"
                 android:measureWithLargestChild="false"
-                android:orientation="horizontal"
-                android:padding="10dp">
+                android:orientation="horizontal">
 
-                <com.sap.sailing.android.shared.ui.customviews.OpenSansTextView
+                <TextView
                     android:id="@+id/regatta_starts_in"
-                    android:layout_width="fill_parent"
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:gravity="center"
                     android:paddingLeft="10dp"
                     android:paddingRight="10dp"
                     android:paddingTop="10dp"
+                    android:layout_marginBottom="10dp"
                     android:text="@string/regatta_starts_in"
-                    android:textColor="@color/white"
+                    android:textColor="@color/black"
+                    android:textSize="@dimen/default_text_size"
                     android:textStyle="bold"/>
 
                 <LinearLayout
                     android:id="@+id/three_boxes_regatta_starts"
                     android:layout_width="match_parent"
-                    android:layout_height="fill_parent"
+                    android:layout_height="match_parent"
                     android:layout_below="@id/regatta_starts_in"
                     android:baselineAligned="false"
                     android:gravity="center"
                     android:measureWithLargestChild="false"
-                    android:orientation="horizontal"
-                    android:padding="10dp">
+                    android:orientation="horizontal">
 
                     <LinearLayout
                         android:id="@+id/three_boxes_days_box"
-                        android:layout_width="80dp"
+                        android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_margin="5dp"
-                        android:background="@drawable/background_box"
+                        android:layout_marginLeft="@dimen/regatta_start_date_side_margin"
+                        android:layout_marginRight="@dimen/regatta_start_date_side_margin"
                         android:baselineAligned="false"
                         android:gravity="center"
                         android:measureWithLargestChild="false"
                         android:orientation="vertical"
                         android:padding="0dp">
 
-                        <com.sap.sailing.android.shared.ui.customviews.OpenSansTextView
+                        <TextView
                             android:id="@+id/starts_in_days"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:padding="0dp"
-                            android:textColor="@color/white"
-                            android:textSize="40sp"/>
+                            android:textColor="@color/black"
+                            android:textSize="@dimen/highlight_text_size"/>
 
-                        <com.sap.sailing.android.shared.ui.customviews.OpenSansTextView
+                        <TextView
                             android:id="@+id/starts_in_days_label"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:layout_marginBottom="5dp"
                             android:padding="0dp"
                             android:singleLine="true"
                             android:text="@string/days"
-                            android:textColor="@color/white"/>
+                            android:textColor="@color/black"
+                            android:textSize="@dimen/default_text_size"/>
+
                     </LinearLayout>
 
+                    <View
+                        android:layout_width="@dimen/countdown_separator_width"
+                        android:layout_height="@dimen/countdown_separator_height"
+                        android:background="@color/separator_color"
+                        android:layout_gravity="center_vertical"/>
+
                     <LinearLayout
                         android:id="@+id/three_boxes_hours_box"
-                        android:layout_width="80dp"
+                        android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_margin="5dp"
-                        android:background="@drawable/background_box"
+                        android:layout_marginLeft="@dimen/regatta_start_date_side_margin"
+                        android:layout_marginRight="@dimen/regatta_start_date_side_margin"
                         android:baselineAligned="false"
                         android:gravity="center"
                         android:measureWithLargestChild="false"
                         android:orientation="vertical"
                         android:padding="0dp">
 
-                        <com.sap.sailing.android.shared.ui.customviews.OpenSansTextView
+                        <TextView
                             android:id="@+id/starts_in_hours"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:padding="0dp"
-                            android:textColor="@color/white"
-                            android:textSize="40sp"/>
+                            android:textColor="@color/black"
+                            android:textSize="@dimen/highlight_text_size"/>
 
-                        <com.sap.sailing.android.shared.ui.customviews.OpenSansTextView
+                        <TextView
                             android:id="@+id/starts_in_hours_label"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:layout_marginBottom="5dp"
                             android:padding="0dp"
                             android:singleLine="true"
                             android:text="@string/hours"
-                            android:textColor="@color/white"/>
+                            android:textColor="@color/black"
+                            android:textSize="@dimen/default_text_size"/>
                     </LinearLayout>
 
+                    <View
+                        android:layout_width="@dimen/countdown_separator_width"
+                        android:layout_height="@dimen/countdown_separator_height"
+                        android:background="@color/separator_color"
+                        android:layout_gravity="center_vertical"/>
+
                     <LinearLayout
                         android:id="@+id/three_boxes_minutes_box"
-                        android:layout_width="80dp"
+                        android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_margin="5dp"
-                        android:background="@drawable/background_box"
+                        android:layout_marginLeft="@dimen/regatta_start_date_side_margin"
+                        android:layout_marginRight="@dimen/regatta_start_date_side_margin"
                         android:baselineAligned="false"
                         android:gravity="center"
                         android:measureWithLargestChild="false"
                         android:orientation="vertical"
                         android:padding="0dp">
 
-                        <com.sap.sailing.android.shared.ui.customviews.OpenSansTextView
+                        <TextView
                             android:id="@+id/starts_in_minutes"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:padding="0dp"
-                            android:textColor="@color/white"
-                            android:textSize="40sp"/>
+                            android:textColor="@color/black"
+                            android:textSize="@dimen/highlight_text_size"/>
 
-                        <com.sap.sailing.android.shared.ui.customviews.OpenSansTextView
+                        <TextView
                             android:id="@+id/starts_in_minutes_label"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:layout_marginBottom="5dp"
                             android:padding="0dp"
                             android:singleLine="true"
                             android:text="@string/minutes"
-                            android:textColor="@color/white"/>
+                            android:textColor="@color/black"
+                            android:textSize="@dimen/default_text_size"/>
                     </LinearLayout>
                 </LinearLayout>
             </RelativeLayout>
 
-
         </RelativeLayout>
     </ScrollView>
 
     <RelativeLayout
         android:id="@+id/start_tracking_box"
-        android:layout_width="fill_parent"
+        android:layout_width="match_parent"
         android:layout_height="200dp"
         android:layout_above="@+id/bottom_announcement">
 
-        <View
-            android:id="@+id/white_bar"
-            android:layout_width="match_parent"
-            android:layout_height="1dp"
-            android:layout_alignParentLeft="true"
-            android:layout_alignParentStart="true"
-            android:layout_alignParentTop="true"
-            android:background="@color/white_transparent"/>
-
         <LinearLayout
             android:id="@+id/event_buttons"
             android:layout_width="match_parent"
             android:layout_height="@dimen/regatta_button_height"
-            android:layout_below="@id/white_bar"
             android:orientation="horizontal">
 
             <Button
@@ -390,7 +392,6 @@
                 android:layout_height="match_parent"
                 android:layout_marginBottom="@dimen/regatta_button_margin"
                 android:layout_marginLeft="@dimen/regatta_button_side_margin"
-                android:layout_marginTop="@dimen/regatta_button_margin"
                 android:layout_weight="1"
                 android:background="@drawable/normal_button"
                 android:padding="@dimen/regatta_button_padding"
@@ -406,7 +407,6 @@
                 android:layout_marginBottom="@dimen/regatta_button_margin"
                 android:layout_marginLeft="@dimen/regatta_button_side_margin"
                 android:layout_marginRight="@dimen/regatta_button_side_margin"
-                android:layout_marginTop="@dimen/regatta_button_margin"
                 android:layout_weight="1"
                 android:background="@drawable/normal_button"
                 android:padding="@dimen/regatta_button_padding"
@@ -445,8 +445,8 @@
         android:layout_centerHorizontal="true"
         android:layout_marginBottom="20dp"
         android:layout_marginTop="20dp"
-        android:textSize="@dimen/default_text_size"
         android:text="@string/please_listen_to_announcements"
-        android:textColor="@color/black"/>
+        android:textColor="@color/black"
+        android:textSize="@dimen/default_text_size"/>
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/mobile/com.sap.sailing.android.tracking.app/res/values/dimens.xml b/mobile/com.sap.sailing.android.tracking.app/res/values/dimens.xml
index 428c9063448..bd3c2bae583 100644
--- a/mobile/com.sap.sailing.android.tracking.app/res/values/dimens.xml
+++ b/mobile/com.sap.sailing.android.tracking.app/res/values/dimens.xml
@@ -16,5 +16,8 @@
     <dimen name="highlight_text_size">21sp</dimen>
     <dimen name="tracking_button_text_size">@dimen/highlight_text_size</dimen>
     <dimen name="button_radius">3dp</dimen>
+    <dimen name="regatta_start_date_side_margin">22dp</dimen>
+    <dimen name="countdown_separator_height">35dp</dimen>
+    <dimen name="countdown_separator_width">2dp</dimen>
 
 </resources>

From e387bc2e90d9736fe92f0b09ddd4169694c5ec00 Mon Sep 17 00:00:00 2001
From: Bennet Brunsen <brunsen@ubilabs.net>
Date: Tue, 26 Apr 2016 14:56:52 +0200
Subject: [PATCH 15/92] Fixes toolbar background in about fragment

---
 .../res/layout/fragment_about.xml                          | 7 -------
 .../android/tracking/app/ui/activities/AboutActivity.java  | 5 +++--
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_about.xml b/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_about.xml
index 86fc79a9110..2bd96fddb13 100644
--- a/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_about.xml
+++ b/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_about.xml
@@ -3,13 +3,6 @@
                 android:layout_width="match_parent"
                 android:layout_height="match_parent">
 
-    <View
-        android:id="@+id/toolbar_separator"
-        android:layout_width="match_parent"
-        android:layout_height="4dp"
-        android:layout_alignParentTop="true"
-        android:background="@color/sap_yellow"/>
-
     <LinearLayout
         android:id="@+id/linearLayout"
         android:layout_width="match_parent"
diff --git a/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/activities/AboutActivity.java b/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/activities/AboutActivity.java
index 54598595a68..47fd6fe5681 100644
--- a/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/activities/AboutActivity.java
+++ b/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/activities/AboutActivity.java
@@ -1,5 +1,6 @@
 package com.sap.sailing.android.tracking.app.ui.activities;
 
+import android.graphics.drawable.ColorDrawable;
 import android.os.Bundle;
 import android.view.Menu;
 
@@ -19,14 +20,14 @@ public class AboutActivity extends BaseActivity {
             toolbar.hideSubtitle();
             toolbar.setTitleSize(20);
             setSupportActionBar(toolbar);
-            toolbar.setBackgroundColor(getResources().getColor(R.color.colorPrimary));
         }
         if (getSupportActionBar() != null) {
             getSupportActionBar().setDisplayHomeAsUpEnabled(true);
             getSupportActionBar().setHomeButtonEnabled(true);
             toolbar.setNavigationIcon(R.drawable.sap_logo_64dp);
             toolbar.setPadding(20, 0, 0, 0);
-            toolbar.setBackgroundColor(getResources().getColor(R.color.colorPrimary));
+            ColorDrawable backgroundDrawable = new ColorDrawable(getResources().getColor(R.color.toolbar_background));
+            getSupportActionBar().setBackgroundDrawable(backgroundDrawable);
             getSupportActionBar().setTitle(R.string.about_this_app);
         }
         replaceFragment(R.id.content_frame, AboutFragment.newInstance());

From 6ed95271f4fcc61c427527134b8dd95da828d4ba Mon Sep 17 00:00:00 2001
From: Bennet Brunsen <brunsen@ubilabs.net>
Date: Tue, 26 Apr 2016 15:36:29 +0200
Subject: [PATCH 16/92] Fixes app crash when opening preferences

---
 .../res/values-v21/theme.xml                                | 2 +-
 .../res/values/theme.xml                                    | 2 +-
 .../ui/fragments/preference/GeneralPreferenceFragment.java  | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/mobile/com.sap.sailing.android.tracking.app/res/values-v21/theme.xml b/mobile/com.sap.sailing.android.tracking.app/res/values-v21/theme.xml
index 66247ba33ec..8a970c5fc95 100644
--- a/mobile/com.sap.sailing.android.tracking.app/res/values-v21/theme.xml
+++ b/mobile/com.sap.sailing.android.tracking.app/res/values-v21/theme.xml
@@ -3,7 +3,7 @@
 
     <style name="AppTheme" parent="AppTheme.Base">
         <!-- Customize your theme using Material Design here. -->
-        <item name="android:buttonStyle">@style/shadowLessButtonStyle</item>
+        <item name="buttonStyle">@style/shadowLessButtonStyle</item>
         <item name="android:colorPrimaryDark">@color/fiori_primary_color</item>
     </style>
     
diff --git a/mobile/com.sap.sailing.android.tracking.app/res/values/theme.xml b/mobile/com.sap.sailing.android.tracking.app/res/values/theme.xml
index 85c0dc67c48..5cb4bab6aa6 100644
--- a/mobile/com.sap.sailing.android.tracking.app/res/values/theme.xml
+++ b/mobile/com.sap.sailing.android.tracking.app/res/values/theme.xml
@@ -22,7 +22,7 @@
         <item name="windowActionBar">false</item>
         <item name="windowNoTitle">true</item>
 
-        <item name="android:button">@style/buttonStyle</item>
+        <item name="buttonStyle">@style/buttonStyle</item>
     </style>
 
     <style name="AppTheme.Toolbar" parent="ThemeOverlay.AppCompat.ActionBar">
diff --git a/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/fragments/preference/GeneralPreferenceFragment.java b/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/fragments/preference/GeneralPreferenceFragment.java
index fd6338a7357..9131438e7ae 100644
--- a/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/fragments/preference/GeneralPreferenceFragment.java
+++ b/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/fragments/preference/GeneralPreferenceFragment.java
@@ -19,7 +19,7 @@ public class GeneralPreferenceFragment extends BasePreferenceFragment {
         AppPreferences prefs = new AppPreferences(getActivity());
         String currentDeviceId = prefs.getDeviceIdentifier();
 
-        Preference deviceIdPreference = (Preference) findPreference(getString(R.string.preference_device_identifier_key));
+        Preference deviceIdPreference = findPreference(getString(R.string.preference_device_identifier_key));
 
         if (currentDeviceId != null && currentDeviceId.length() > 0) {
             deviceIdPreference.setSummary(currentDeviceId);
@@ -35,8 +35,8 @@ public class GeneralPreferenceFragment extends BasePreferenceFragment {
     public void onPause() {
         super.onPause();
 
-        SwitchPreference prefEnergy = (SwitchPreference) findPreference(R.string.preference_energy_saving_enabled_key);
-        SwitchPreference prefDeclination = (SwitchPreference) findPreference(R.string.preference_heading_with_declination_subtracted_key);
+        SwitchPreference prefEnergy = findPreference(R.string.preference_energy_saving_enabled_key);
+        SwitchPreference prefDeclination = findPreference(R.string.preference_heading_with_declination_subtracted_key);
 
         AppPreferences prefs = new AppPreferences(getActivity());
 

From 88e75df5a3f5a543ddbb4c9177c19574c141f653 Mon Sep 17 00:00:00 2001
From: Bennet Brunsen <brunsen@ubilabs.net>
Date: Tue, 26 Apr 2016 15:46:56 +0200
Subject: [PATCH 17/92] Fiori for tracking fragment

---
 .../res/layout/activity_tracking.xml          |  5 +-
 .../res/layout/fragment_compass.xml           | 12 ++--
 .../res/layout/fragment_speed.xml             | 11 ++-
 .../res/layout/fragment_time.xml              | 22 +++---
 .../res/layout/fragment_tracking.xml          | 67 ++++++++++---------
 .../res/values/colors.xml                     |  2 +
 6 files changed, 62 insertions(+), 57 deletions(-)

diff --git a/mobile/com.sap.sailing.android.tracking.app/res/layout/activity_tracking.xml b/mobile/com.sap.sailing.android.tracking.app/res/layout/activity_tracking.xml
index d9af3c5ab19..ac5eca182f2 100644
--- a/mobile/com.sap.sailing.android.tracking.app/res/layout/activity_tracking.xml
+++ b/mobile/com.sap.sailing.android.tracking.app/res/layout/activity_tracking.xml
@@ -1,6 +1,7 @@
 <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"
+                android:background="@drawable/main_background">
 
     <com.sap.sailing.android.shared.ui.customviews.OpenSansToolbar
         android:id="@+id/toolbar"
@@ -52,7 +53,7 @@
 
         <RelativeLayout
             android:id="@+id/tracking_linear_layout"
-            android:layout_width="fill_parent"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:padding="0dp"/>
diff --git a/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_compass.xml b/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_compass.xml
index 52b9ffc4da1..d9d5fafcab8 100644
--- a/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_compass.xml
+++ b/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_compass.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                xmlns:custom="http://schemas.android.com/apk/res-auto"
-                xmlns:tools="http://schemas.android.com/tools"
-                xmlns:app="http://schemas.android.com/apk/res-auto"
                 android:layout_width="fill_parent"
                 android:layout_height="fill_parent">
 
@@ -10,22 +7,21 @@
         android:id="@+id/compass_bearing_header_text_view"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
+        android:layout_alignParentTop="true"
         android:paddingLeft="10dp"
         android:paddingRight="10dp"
-        android:layout_alignParentTop="true"
-        android:text="@string/course_over_ground"
-        android:textColor="@android:color/darker_gray"
-        android:textSize="15sp"
         android:paddingTop="15dp"
+        android:text="@string/course_over_ground"
+        android:textSize="@dimen/default_text_size"
         />
 
     <com.sap.sailing.android.shared.ui.customviews.AutoResizeLightTextView
         android:id="@+id/compass_bearing_text_view"
         android:layout_width="fill_parent"
         android:layout_height="fill_parent"
+        android:layout_centerInParent="true"
         android:gravity="center"
         android:text="@string/initial_hyphen_degrees"
-        android:layout_centerInParent="true"
         android:textSize="124sp"/>
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_speed.xml b/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_speed.xml
index 35558acd956..30f3d8a4201 100644
--- a/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_speed.xml
+++ b/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_speed.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                xmlns:custom="http://schemas.android.com/apk/res-auto"
                 xmlns:tools="http://schemas.android.com/tools"
-                xmlns:app="http://schemas.android.com/apk/res-auto"
                 android:layout_width="fill_parent"
                 android:layout_height="fill_parent">
 
@@ -10,12 +8,11 @@
         android:id="@+id/speed_header_text_view"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
-        android:text="@string/speed_over_ground"
-        android:textColor="@android:color/darker_gray"
-        android:textSize="14sp"
         android:paddingLeft="10dp"
         android:paddingRight="10dp"
-        android:paddingTop="15dp"/>
+        android:paddingTop="15dp"
+        android:text="@string/speed_over_ground"
+        android:textSize="@dimen/default_text_size"/>
 
     <RelativeLayout
         android:layout_width="fill_parent"
@@ -33,6 +30,6 @@
             android:textSize="124sp"
             android:textStyle="bold"
             tools:text="13.556Kn"/>
-        </RelativeLayout>
+    </RelativeLayout>
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_time.xml b/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_time.xml
index 787379cdb5e..b60e99fe369 100644
--- a/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_time.xml
+++ b/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_time.xml
@@ -1,21 +1,22 @@
 <?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="wrap_content"
-    android:baselineAligned="false"
-    android:paddingTop="15dp">
+                xmlns:tools="http://schemas.android.com/tools"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:baselineAligned="false"
+                android:paddingTop="15dp">
 
-    <com.sap.sailing.android.shared.ui.customviews.OpenSansTextView
+    <TextView
         android:id="@+id/tracking_time"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignParentTop="true"
         android:paddingLeft="10dp"
         android:paddingRight="10dp"
-        android:text="@string/tracking_time" />
+        android:text="@string/tracking_time"
+        android:textSize="@dimen/default_text_size"/>
 
-    <com.sap.sailing.android.shared.ui.customviews.OpenSansTextView
+    <TextView
         android:id="@+id/wait_for_gps"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -24,7 +25,8 @@
         android:layout_toRightOf="@+id/tracking_time"
         android:paddingLeft="10dp"
         android:paddingRight="10dp"
-        android:text="@string/waiting_for_gps" />
+        android:text="@string/waiting_for_gps"
+        android:textSize="@dimen/default_text_size"/>
 
     <com.sap.sailing.android.shared.ui.customviews.AutoResizeLightTextView
         android:id="@+id/tracking_time_label"
@@ -37,6 +39,6 @@
         android:paddingRight="10dp"
         android:text="@string/initial_timer_text_zerozero"
         android:textSize="100sp"
-        tools:ignore="InconsistentLayout" />
+        tools:ignore="InconsistentLayout"/>
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_tracking.xml b/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_tracking.xml
index 70ed9276306..4f1ab4ce617 100644
--- a/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_tracking.xml
+++ b/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_tracking.xml
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ScrollView
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/scroll_view"
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="fill_parent"
     android:layout_height="402dp"
     android:layout_gravity="center"
@@ -14,9 +13,9 @@
     <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@color/black">
+        android:background="@color/tracking_status_row_color">
 
-        <com.sap.sailing.android.shared.ui.customviews.OpenSansTextView
+        <TextView
             android:id="@+id/mode_label"
             android:layout_width="wrap_content"
             android:layout_height="50dp"
@@ -26,44 +25,48 @@
             android:gravity="center_vertical"
             android:paddingLeft="10dp"
             android:paddingRight="10dp"
-            android:text="@string/tracking_mode"/>
+            android:text="@string/tracking_mode"
+            android:textSize="@dimen/default_text_size"/>
 
-        <com.sap.sailing.android.shared.ui.customviews.OpenSansTextView
+        <TextView
             android:id="@+id/mode"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_alignBaseline="@id/mode_label"
             android:layout_alignBottom="@id/mode_label"
-            android:layout_alignParentRight="true"
             android:layout_alignParentEnd="true"
-            android:paddingRight="10dp"
+            android:layout_alignParentRight="true"
             android:paddingLeft="10dp"
+            android:paddingRight="10dp"
             android:text="@string/tracking_mode_caching"
-            android:textColor="@color/sap_green"/>
+            android:textColor="@color/sap_green"
+            android:textSize="@dimen/default_text_size"/>
 
-        <com.sap.sailing.android.shared.ui.customviews.OpenSansTextView
+        <TextView
             android:id="@+id/tracking_unsent_fixes_label"
             android:layout_width="wrap_content"
             android:layout_height="50dp"
             android:layout_below="@+id/mode_label"
             android:gravity="center_vertical"
-            android:paddingRight="10dp"
             android:paddingLeft="10dp"
-            android:text="@string/tracking_unsent_fixes"/>
+            android:paddingRight="10dp"
+            android:text="@string/tracking_unsent_fixes"
+            android:textSize="@dimen/default_text_size"/>
 
-        <com.sap.sailing.android.shared.ui.customviews.OpenSansTextView
+        <TextView
             android:id="@+id/tracking_unsent_fixes"
             android:layout_width="wrap_content"
             android:layout_height="50dp"
             android:layout_alignBaseline="@id/tracking_unsent_fixes_label"
             android:layout_alignBottom="@id/tracking_unsent_fixes_label"
-            android:layout_alignParentRight="true"
             android:layout_alignParentEnd="true"
-            android:paddingRight="10dp"
+            android:layout_alignParentRight="true"
             android:paddingLeft="10dp"
-            android:text="@string/none"/>
+            android:paddingRight="10dp"
+            android:text="@string/none"
+            android:textSize="@dimen/default_text_size"/>
 
-        <com.sap.sailing.android.shared.ui.customviews.OpenSansTextView
+        <TextView
             android:id="@+id/tracking_status_label"
             android:layout_width="wrap_content"
             android:layout_height="50dp"
@@ -71,37 +74,40 @@
             android:gravity="center_vertical"
             android:paddingLeft="10dp"
             android:paddingRight="10dp"
-            android:text="@string/tracking_status"/>
+            android:text="@string/tracking_status"
+            android:textSize="@dimen/default_text_size"/>
 
-        <com.sap.sailing.android.shared.ui.customviews.OpenSansTextView
+        <TextView
             android:id="@+id/tracking_status"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_alignBaseline="@id/tracking_status_label"
             android:layout_alignBottom="@id/tracking_status_label"
-            android:layout_alignParentRight="true"
             android:layout_alignParentEnd="true"
-            android:paddingRight="10dp"
+            android:layout_alignParentRight="true"
             android:paddingLeft="10dp"
+            android:paddingRight="10dp"
             android:text="@string/tracking_status_tracking"
-            android:textColor="@color/sap_green"/>
+            android:textColor="@color/sap_green"
+            android:textSize="@dimen/default_text_size"/>
 
         <LinearLayout
             android:id="@+id/gps_quality_info_layout"
             android:layout_width="wrap_content"
             android:layout_height="50dp"
-            android:layout_alignParentRight="true"
             android:layout_alignParentEnd="true"
+            android:layout_alignParentRight="true"
             android:gravity="center_vertical"
             android:orientation="horizontal">
 
-            <com.sap.sailing.android.shared.ui.customviews.OpenSansTextView
+            <TextView
                 android:id="@+id/gps_accuracy_label"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:paddingRight="9dp"
                 android:paddingLeft="9dp"
-                android:text=""/>
+                android:paddingRight="9dp"
+                android:text=""
+                android:textSize="@dimen/default_text_size"/>
 
             <com.sap.sailing.android.shared.ui.customviews.SignalQualityIndicatorView
                 android:id="@+id/gps_quality_indicator"
@@ -109,12 +115,12 @@
                 android:layout_height="wrap_content"
                 android:contentDescription="@string/signal_accuracy_indicator_view_description"
                 android:focusable="true"
-                android:paddingRight="10dp"
                 android:paddingLeft="10dp"
+                android:paddingRight="10dp"
                 app:signalQuality="none"/>
         </LinearLayout>
 
-        <com.sap.sailing.android.shared.ui.customviews.OpenSansTextView
+        <TextView
             android:id="@+id/gps_quality"
             android:layout_width="wrap_content"
             android:layout_height="50dp"
@@ -122,7 +128,8 @@
             android:gravity="center_vertical"
             android:paddingLeft="10dp"
             android:paddingRight="10dp"
-            android:text="@string/tracking_gps_accuracy"/>
+            android:text="@string/tracking_gps_accuracy"
+            android:textSize="@dimen/default_text_size"/>
 
         <!-- Separators -->
 
diff --git a/mobile/com.sap.sailing.android.tracking.app/res/values/colors.xml b/mobile/com.sap.sailing.android.tracking.app/res/values/colors.xml
index 931c597b9ed..8c12467d9da 100644
--- a/mobile/com.sap.sailing.android.tracking.app/res/values/colors.xml
+++ b/mobile/com.sap.sailing.android.tracking.app/res/values/colors.xml
@@ -33,5 +33,7 @@
     <color name="normal_button_pressed">#bfbfbf</color>
 
     <color name="competitor_background_color">#B3f3f3f3</color>
+    
+    <color name="tracking_status_row_color">#f6fbfb</color>
 
 </resources>
\ No newline at end of file

From 3da3d3a862cb71e2cc487893ffc71107af2d99d5 Mon Sep 17 00:00:00 2001
From: Bennet Brunsen <brunsen@ubilabs.net>
Date: Tue, 26 Apr 2016 15:58:50 +0200
Subject: [PATCH 18/92] Fixes gradient

---
 .../res/drawable/main_background.xml                            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mobile/com.sap.sailing.android.tracking.app/res/drawable/main_background.xml b/mobile/com.sap.sailing.android.tracking.app/res/drawable/main_background.xml
index a5a3509dda3..62df1bf05c1 100644
--- a/mobile/com.sap.sailing.android.tracking.app/res/drawable/main_background.xml
+++ b/mobile/com.sap.sailing.android.tracking.app/res/drawable/main_background.xml
@@ -4,7 +4,7 @@
 
     <gradient
         android:angle="90"
-        android:endColor="#b5b6d2"
+        android:endColor="#def1f1"
         android:startColor="#dce3eb"
         android:type="linear"/>
 

From 78aa0ff76bd7a394811a269a15219cb8c0220d05 Mon Sep 17 00:00:00 2001
From: Bennet Brunsen <brunsen@ubilabs.net>
Date: Tue, 26 Apr 2016 16:46:18 +0200
Subject: [PATCH 19/92] Fixes backgrounds color issues in regatta activity

---
 .../res/layout/fragment_regatta.xml                       | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_regatta.xml b/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_regatta.xml
index 8155552b3c8..202e4ebf827 100644
--- a/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_regatta.xml
+++ b/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_regatta.xml
@@ -56,7 +56,7 @@
             android:layout_height="wrap_content"
             android:layout_centerHorizontal="true"
             android:layout_centerVertical="true"
-            android:background="@color/white_transparent"
+            android:background="@color/white_less_transparent"
             android:orientation="horizontal"
             android:visibility="gone"
             tools:visibility="gone">
@@ -69,7 +69,7 @@
                 android:paddingLeft="@dimen/activity_horizontal_margin"
                 android:paddingRight="@dimen/activity_horizontal_margin"/>
 
-            <com.sap.sailing.android.shared.ui.customviews.OpenSansTextView
+            <TextView
                 android:id="@+id/upload_progress_text"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -77,6 +77,7 @@
                 android:paddingLeft="@dimen/activity_horizontal_margin"
                 android:paddingRight="@dimen/activity_horizontal_margin"
                 android:text="@string/upload_in_progress"
+                android:textSize="@dimen/default_text_size"
                 android:textColor="@color/black"/>
         </LinearLayout>
 
@@ -86,7 +87,7 @@
             android:layout_height="wrap_content"
             android:layout_centerHorizontal="true"
             android:layout_centerVertical="true"
-            android:background="@color/white_transparent"
+            android:background="@color/white_less_transparent"
             android:clickable="true"
             android:onClick="retryUpload"
             android:orientation="horizontal"
@@ -104,6 +105,7 @@
                 android:paddingLeft="8dp"
                 android:paddingRight="8dp"
                 android:paddingTop="8dp"
+                android:textSize="@dimen/default_text_size"
                 android:text="@string/upload_retry"
                 android:textColor="@color/black"/>
         </LinearLayout>

From 6069ececa45244b47ae8e50f2011d3048345a261 Mon Sep 17 00:00:00 2001
From: Bennet Brunsen <brunsen@ubilabs.net>
Date: Tue, 26 Apr 2016 16:50:47 +0200
Subject: [PATCH 20/92] Set blue buttons in about fragment

---
 .../{scan_qr_button.xml => blue_button.xml}        |  0
 .../res/layout/fragment_about.xml                  | 14 ++++++--------
 .../res/layout/fragment_home.xml                   |  2 +-
 3 files changed, 7 insertions(+), 9 deletions(-)
 rename mobile/com.sap.sailing.android.tracking.app/res/drawable/{scan_qr_button.xml => blue_button.xml} (100%)

diff --git a/mobile/com.sap.sailing.android.tracking.app/res/drawable/scan_qr_button.xml b/mobile/com.sap.sailing.android.tracking.app/res/drawable/blue_button.xml
similarity index 100%
rename from mobile/com.sap.sailing.android.tracking.app/res/drawable/scan_qr_button.xml
rename to mobile/com.sap.sailing.android.tracking.app/res/drawable/blue_button.xml
diff --git a/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_about.xml b/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_about.xml
index 2bd96fddb13..12e0197e315 100644
--- a/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_about.xml
+++ b/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_about.xml
@@ -10,7 +10,7 @@
         android:layout_alignParentBottom="true"
         android:orientation="vertical">
 
-        <com.sap.sailing.android.shared.ui.customviews.OpenSansButton
+        <Button
             android:id="@+id/license_button"
             android:layout_width="match_parent"
             android:layout_height="@dimen/about_button_height"
@@ -18,13 +18,12 @@
             android:layout_marginLeft="@dimen/about_button_side_margin"
             android:layout_marginRight="@dimen/about_button_side_margin"
             android:layout_marginTop="@dimen/about_button_top_bottom_margin"
-            android:background="@drawable/rounded_btn_yellow"
+            android:background="@drawable/blue_button"
             android:text="@string/license_information"
-            android:textAllCaps="false"
             android:textSize="@dimen/about_button_text_size"
             android:textStyle="bold"/>
 
-        <com.sap.sailing.android.shared.ui.customviews.OpenSansButton
+        <Button
             android:id="@+id/eula_button"
             android:layout_width="match_parent"
             android:layout_height="@dimen/about_button_height"
@@ -32,20 +31,19 @@
             android:layout_marginLeft="@dimen/about_button_side_margin"
             android:layout_marginRight="@dimen/about_button_side_margin"
             android:layout_marginTop="@dimen/about_button_top_bottom_margin"
-            android:background="@drawable/rounded_btn_yellow"
+            android:background="@drawable/blue_button"
             android:text="@string/eula"
-            android:textAllCaps="false"
             android:textSize="@dimen/about_button_text_size"
             android:textStyle="bold"/>
 
-        <com.sap.sailing.android.shared.ui.customviews.OpenSansTextView
+        <TextView
             android:id="@+id/system_information_application_version_header"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginLeft="@dimen/about_button_side_margin"
             android:text="@string/application_version"/>
 
-        <com.sap.sailing.android.shared.ui.customviews.OpenSansTextView
+        <TextView
             android:id="@+id/system_information_application_version"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
diff --git a/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_home.xml b/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_home.xml
index 0b15e937392..f5bf2f5886e 100644
--- a/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_home.xml
+++ b/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_home.xml
@@ -41,7 +41,7 @@
         android:layout_marginLeft="16dp"
         android:layout_marginRight="16dp"
         android:layout_marginTop="20dp"
-        android:background="@drawable/scan_qr_button"
+        android:background="@drawable/blue_button"
         android:text="@string/scan_qr"
         android:textSize="@dimen/highlight_text_size"/>
 

From 8507330ac6dbda7b89cc4efc4031362ff4e5c1be Mon Sep 17 00:00:00 2001
From: Bennet Brunsen <brunsen@ubilabs.net>
Date: Tue, 26 Apr 2016 17:03:38 +0200
Subject: [PATCH 21/92] Changed button to edit picture

---
 .../res/drawable-hdpi/edit_pencil.png         | Bin 0 -> 478 bytes
 .../res/drawable-mdpi/edit_pencil.png         | Bin 0 -> 377 bytes
 .../res/drawable-xhdpi/edit_pencil.png        | Bin 0 -> 568 bytes
 .../res/drawable-xxhdpi/edit_pencil.png       | Bin 0 -> 706 bytes
 .../res/drawable/stift.png                    | Bin 11389 -> 0 bytes
 .../res/layout-land/fragment_regatta.xml      |   2 +-
 .../res/layout/fragment_regatta.xml           |  38 +++++++++---------
 7 files changed, 21 insertions(+), 19 deletions(-)
 create mode 100755 mobile/com.sap.sailing.android.tracking.app/res/drawable-hdpi/edit_pencil.png
 create mode 100755 mobile/com.sap.sailing.android.tracking.app/res/drawable-mdpi/edit_pencil.png
 create mode 100755 mobile/com.sap.sailing.android.tracking.app/res/drawable-xhdpi/edit_pencil.png
 create mode 100755 mobile/com.sap.sailing.android.tracking.app/res/drawable-xxhdpi/edit_pencil.png
 delete mode 100644 mobile/com.sap.sailing.android.tracking.app/res/drawable/stift.png

diff --git a/mobile/com.sap.sailing.android.tracking.app/res/drawable-hdpi/edit_pencil.png b/mobile/com.sap.sailing.android.tracking.app/res/drawable-hdpi/edit_pencil.png
new file mode 100755
index 0000000000000000000000000000000000000000..cf1b2d864c7d2846c153c289ebcfdfb85f6fcc55
GIT binary patch
literal 478
zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY1|&n@ZgvM!k|nMYCBgY=CFO}lsSJ)O`AMk?
zp1FzXsX?iUDV2pMQ*9U+7#loY978H@y}4=Vci2FrA#u5ZL7GbRPR3KbHzam47Bt^u
zDQr4);u!A^#}m97!PokF_9!$fX{Wr}d_VYq{3fBLp{wgQ#hUUqb|8RQ_U&!cHeRcn
zKQ&y&a?i<%>7TvNeqSZ?_|Ks?sWGLo*X3<5@c3PD`?T%Ivw~xF4@|zP<U90p_rHDQ
zW0j#UH!bwCN%~=fnv*Y{{t4E*uj2puv5>VzK&q^|-f9EZ39rkGZe%^4G0*X2TaDi1
zsI>FmMw742vPet6aA<qzdfp_t494XgmrhCgebY*}IKK19nnyDjHuVI{oUrl>RN%Kb
z+OX$=2;--g$+9P;{lXObEp9gKd6dHVsb})*?Gdv1-a8JTWKxl@F=uM|d3)iq!jQ(4
z%-lzF_Y3^b^_Y0(amM)t(UQ08C&WBhk$dUm`|15BmsTIFm}Rr=d&6SREfWtr7yaZv
z8LWNu>D0Vqr3Dd7ckFSSk}kRa<Loo3%emHDzS9+-7l;U_4zDk|2N=GuKE3;1S@bVp
PgfV!!`njxgN@xNAx^vt}

literal 0
HcmV?d00001

diff --git a/mobile/com.sap.sailing.android.tracking.app/res/drawable-mdpi/edit_pencil.png b/mobile/com.sap.sailing.android.tracking.app/res/drawable-mdpi/edit_pencil.png
new file mode 100755
index 0000000000000000000000000000000000000000..7fd501c447e7b9f2079ea07e8be15683f117a56f
GIT binary patch
literal 377
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpTC$r9IylHmNblJdl&R0hYC{G?O`
z&)mfH)S%SFl*+=BsWuD@jMAPijv*Dd-b_Ep+vFhN>Zo}@+x#uVN(ZY8d`pbBFuirq
zKA`L9FSC?+uBTWshj{sPNuPh-W*kS({@&fp7svv%hJm4hyK<g>?eiJhr{2FT@Vxxx
zqDgPzT=lRi>-XtREsd4`r^IkFzv3x--dc?#f3N>cJM@Wr(w<Al|7A_r`}8Q)`LU<+
z=I5fl({-0;TsrTt{#mpX>)IU;i#Ays-DP0r&k=9R-uHE`eb|KWzpe^$D=6AWF=+k_
zWb!!0&aa>=Z_?0Kvw<P%lOxlFKhyZsd4C4%75G0{innsT>;`@1J)c_l9+6E`(|o_1
zIa>S9)?+d$>L9kcbc3PFzH2Xvg!@08%y}!HIcMvwFGoIBuYD~o0`?Ju{5>WfhFpV^
U37<px9)pBDUHx3vIVCg!08-7BBLDyZ

literal 0
HcmV?d00001

diff --git a/mobile/com.sap.sailing.android.tracking.app/res/drawable-xhdpi/edit_pencil.png b/mobile/com.sap.sailing.android.tracking.app/res/drawable-xhdpi/edit_pencil.png
new file mode 100755
index 0000000000000000000000000000000000000000..fc142007f82e39f392a1dea857873f95f55ffca2
GIT binary patch
literal 568
zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7OGok|nMYCBgY=CFO}lsSJ)O`AMk?
zp1FzXsX?iUDV2pMQ*9U+7;kyHIEGZ*dUM;??@)k9+e5LKhTt?FS+TMMd?l<WP8|_l
zpq=odr-c2{ir{GvcAhkCbm9tpIA`8xyOX}0ih}#se^*~7#tO6y8T`w#nj2>HZtMQz
z3RypjB9||Wb&|CBGyg%h<mR(!n-@3SZjaBH9w4+Yk5l#G>uCb1!t3-n>?NNU8Xx9(
zY3>``@3vUK^5>0@8)NtV&hA_IfAbreJ12$S1nF^mKioZ+vGVNy3A_I}zWevx*w|6G
zW;*K@vpZf)^5s(&NbTDl9B@1{T~kp%YJRQXa=Eh~VnquM27X?_!rkV0NZ(J_U2KZu
zq5Jm>)QyC<h3)&V5b?v<`{DO0wm(LHZryqxC}hXl!n?nmwSs$pIBNyZesk6e-u>dN
z6@2$=81Ef6k9BDIa8^t}wPrG_3)lS^#*2r{LmiHMI4dGx`sc{0`HRB^4{r}S5X@&D
z@}u?^b4=TMD`u4sSO0DPX?f>n=gbFYHCvfJ-JLh@bmV-^gQY)a87ItJAL`B-{r=(V
zw~RtR(hGlxY<g9{vSk)y<xk1&_v~hIiWK~Py4)i0koOj*cOrFZza{@}xwijg#n*lJ
yR*P@g{-=d6wwP^+X`PU533Bi=Ff?fY6iZ<E6U$v6qr9~RB<Jbs=d#Wzp$P!X7Vx(K

literal 0
HcmV?d00001

diff --git a/mobile/com.sap.sailing.android.tracking.app/res/drawable-xxhdpi/edit_pencil.png b/mobile/com.sap.sailing.android.tracking.app/res/drawable-xxhdpi/edit_pencil.png
new file mode 100755
index 0000000000000000000000000000000000000000..ac3f510d436d99a075a0ef80b73349f628188425
GIT binary patch
literal 706
zcmeAS@N?(olHy`uVBq!ia0vp^6F``Q4M;wBd$a>cNtU=qlmzFem6RtIr7}3C<R_&n
zc;+Uirv{}arc@T5OtoQPU`p|HaSW-r_2!Ok(PamThQyD>4BKDTu=HztSuj3fd&qKt
zcL!tm30{v?Qv!l2W0vtuePLk!;BpUF8$;i;&?i^z&Y$VC`L^T28|&SZi~}zNZN&x(
z?v(A0JzBB5rMNQ5O5SdsMNL=Xy=`xIz22qGXlOR??1yX1zI3pd#M_(|QWCnb=c9=H
z#D-`6%U^V`lt_IPk)GJ#r#??fS?Gd`QqyY-8}C0=@)!F%UYuSz|9Nt-?aXpRzRvr1
zkMGcUs3Je}x##wcXE*e&bvyPsY5Q$imLoShy1LvQD)nbvH~jeff5(a)6)aP}=VjZn
zOb`m3_>n{7|Jq-Qii?sS3kKY)nAOtJ)#vW;^RcAx#de8w)#J(wG9T>>ckxyP(ks=J
z7=6Y4MFlxCZdHiMPu$<?EARilOd?F-V^7$hwYwUQC@XyA@UUSL>aSo?kz?$1cX%W?
zq2g8F@>fVwKqg!YsOn>g+yuDlg>4N-jOQ=?6Mv)l<C$bZ|ID|$-Yv_$z5e5;sX#|d
zU9?kF0y@}I>EjitfEbhg{Q-P}XSN^dI1>ER^~>yk>#{2@U6&O+<|-4{?e0(?Rr_md
zs%g(g!Or7cSN8mQ`gKOf5#z>3bsjwt`^?MdZ>@Q=aN6HhUn6a%vYWJg_^2-*{xQHi
zI%413*X953oD&GREc3tC-G#}j>ibk>6Qjyq6W*@g|8Hkcq3Cso>B~YLzDI_-C@;8p
rdwK@TlqLMneN3>$J5WsWk4OT8YUwn6*OYs6L25i*{an^LB{Ts5h2tuq

literal 0
HcmV?d00001

diff --git a/mobile/com.sap.sailing.android.tracking.app/res/drawable/stift.png b/mobile/com.sap.sailing.android.tracking.app/res/drawable/stift.png
deleted file mode 100644
index f3f5138726b61ff270dc672f0bd75b0d1cb3e78a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 11389
zcmeHtc{tST`~MqRlF~Vp>{8jvnk8cyGB}ZCEGf$%#@ZNR7`u`sYh{fr&75IKlr?)%
zsjOvCge271iLv`W<9yEfp6hdc&hPsCet-YEbn(95_kBP2^1AP5c|W&Jjr9+*^RYt^
zbnwD&2r~#`G^PJ%V*wQHuhzQY7q6f0Wj}MQi(i1F4;s>T#$H8>T);TGqRr5b&Vkq8
zqSYaYNz~oqvfpK+i!diFM#hoOBZJ3y18E3ShvU5+ojlQgB3IF_?p_+A^YzW5BJR!_
zqE<>qaz@@dXgBxYf_%{CLB<wNL7q;k&Z2Nl5p_HaD8Qio97XV$YhJ!EyoTtWUKseB
zPL>rF*<<nZ)DZo{sLMvCB05+fw1|?-S!pLZd3h0KWf^%zC1qv#Ga?Fd@(QwY;73_n
zUJ<6G3{y}M`PV;DFq)6E3(O3m_ph<QlZL39pPx5ORyH6YKqla<4A#e0R$f(Am99fU
zK^kyK`v!XXIpU?gd{6wT0fF{)@^Sa}bH{p#&^0<<#p3)lM1iG$xPbBgORbmhzrq9p
zCX09UmX(*0qr3Dcqmj}7nH7Wii`&=F4E?|M{zt{W7J=SqSu?aR7U$yx66bP)K9o01
z#|Q1`hxM_*Vz2!fMN>DdAJ*3m>n);Vt}G&9<?iK-4e*uR<2N#bUGVbtbM$gTUqEPx
z0u3_m?#?i6x%1lEh_gB>+K6-V^16!W5$6?kRL-4KIIp89rz)rXrz`^Ngu|e{{Qi`6
z{$E+dKg!affbj++BhWtX{%B`CA1p>>&t;hVKii`HkNW;4>-^8Qoc~8zSzwGTJ+XgF
z^q(Yv9{Qhu!4^FH1$?v@K)Vlsb=mc*0tk{=ynxWQzz@z0?|*g@9Vokibw0+{4wWC+
z$IQqkdNbBRk#J_5??|K90CS`Kdos_fBl2<2#*WfX{n{WSPwhK77e~1I`Ijp<*+lcN
z#YOOHJ!iP_cGFs^OD^|puc2iCjy6wIpZ9ghET%47(p1BXM>d+6+cRWkA?WAap=b!w
zieQ8e=R?pw2`FNJwRb7p_KAb`2{rqskia>&>y!c{zb@uj6<Krcd@Co!@gu#?E2-`{
zb%X3lD2-R|eUswjtKmI>kG&oF&GNA{u{wUx+LRG`{Y!~x$`-5%C4{rQRWy|KdHrUs
zS)Yhi{#7_{s(-?us)xqZLFjud8p)$;C%`+E&Y)nt%uw89RHH+&GsFcSg7V{+lt*ik
z8LPg*WsA^}As3V0CKB~JBb2$%kk}R5;M@9!$>Lf-;aYjX`|*9y#oUIpfJ@G~_DN^7
zUMYwFV(+iA3O&E2ChODPZOv)ANTVgls_|kW2Lsz<pQgmO_mP{#J|qavNU1YG<}Onk
zbJpEKhfHzZy<V@6L7C_42d)&>LY8n$P0dqgsNmxWZjx71t8ZC-!h$)snh7en;*t|O
zJ#*GJf;}A7vAhrJi0)8V<2aH}ow#z*3W7TB)%WwdJ%KEXt7gx1GlFMb919h$rMvWQ
zx4J@pALP<wj5|t|)ryiP_MZ)do^x0?cbyMqCC?@bLUOIu^QX1?lIJn#&rk$!bzg`%
zUq=A5$94I6E=X?ZX#aik6oeiThav(M-iI)FoET?@<O0O9WVJAE4G=Whg;-{mNO1+D
zrre%9V9NJ~0h)Y^VC06hbQsuy5F5R#b3+jjGbEzL0R8Lnza!Cw{!Q>7NOaYIQ~#&X
ze<0Bf_zyPy2NJOQ|C{;u2>d@s^J08dG~^(5O{fY-5kvBqEKRBCZ!3GaQ_6_xyi%Ya
zxV+EPojp=zLa|3+nyuZeQ#j0;W9#Io;<#bA-?SqbGyC(VHuVMhaLHsG%ja$v+^qTT
zCI&gBmveL_hkTktDYe{TeQCmXd;R#z?hB{~Gp(<2hWZPsPGg|@0Kqs3MtY|3>e`y!
zb}mmoRG@`&48l`(;|B2@ZQUb9SVX8Y)vPe`$^lcaF@}q|c7$B6s@`MvtpxHZ+_nfc
z1v#ar)WOcc?%;DqqVI9t34@w~hqVEApTt)llH+rvKrgFvXe9F>1bfB?p4n403~`>a
zkrcDSM0d2PQN&!kP~m`|y87cgR&Rxltu&Ea+rOAF-GrE*Kd+7rvZHu$t=27T|9*ln
zB2@LLHx|&z*KA@61;y8b*OtjDx*9}_n&Th_`AUI(lZnWoi!W&RYF2#SMb)HH_n!yB
zbF*EAO{5hX70hf7mReX5g=}J^GB4-0Fnv#NLudrXG3hC%!6m6)NbK#peo5C~YZ;k)
za&{kTNKqxx%B5Z3f<otG2V0BuBN!bH2R@psLb7&#q%~gI4uyBvKn&~=Vc)p?15Zzv
zp554<l5T8H3_?-rMh=03De1gH@+cm8XS(IM)H#qrE#?Nqt=lu#gRWBEBd7V3;O~m~
zNBF8L9)h;-V9AdV<XXY&$QP=mQw=DZ(TqTMWoXex&Z-KxXR6f%>K9zNj<(f(R(1zP
z1;xgE3(uEN{Xf};SqK&wD+mD96{j|Hmi&jgI9_Qv(PqqsrPuF`0nM2Q;|*~~(Dpj=
zsjj-)GE{Dz8xXVH@Y3z_3_Xma1mE3d#PBg(@x%NBig%e5WnKHjA{QuY^N)CV%mo0X
zFXmjsharnx`cZA(ieAW~+^%{e-QdhayqUSEGf6|$4~n+j7}BoWJPBD}s@>VT^A%|m
zp*@l1HG~*e^(Z9U5$4Q_3w*K`e~>wkvFM2iJDdw#fm0BNdKyOc?W_lCF0C(Ph^ujR
zHWUq_va$tJurq}h_u>u6gIqygGqPTHSdAL?>SjyiGZ<Bs6a?cORG2y<!N8uc=165g
zvaYWWWytC^cFO@{JE}wO$(H>#VZjz4FW{Nh{4!S<clV(~D#JT-JTzQ>hWZGppH98I
zefHp6zKOp2W_gZ;EHR&mIaoz$NZkB|SNG(W-xh3z#zp(+y*VNgF;_1_{b<%1{*$X!
zUOZmugcgHbp|3$z(@3_#%09l+v#8<~RscN*W7QhUS)!&8E`Dr{7{kxFPa<OR-6<Xa
zl4k$wpYCK6cd9HpC#O{H!o3|REYUZRJ%~dKg+9gwA&g#q_ggab?1XR^DBXlE*}jY8
z<LPB%r$||=U*3|kSR5}+Ty3RE`l|aJV&vAU_qm-$oVI`cXt1QT{_&FQKq^(THe_SE
zl02I9LutzPx4d|m29=o<<bl03Y!h*n`{M8WpL}2<=Gw5-qXRrCpOB-ap0@4r-*%5p
zrLrbV^$A?4m@FW-4NNg*Ie;)Iy?N!HH}XYxalRk!*Dcgb^Gzo6=t<|k@Lea6^MVX}
zT_Qdp4t3Nq<Gh1{A~$WzET#t=m8r9&x^g9I`t61)yagrdEZ#U^xw-(u$Sv2tbjeQh
z)#{t0$#<teX~<GvlJzs-vyVM`(?}k2yBi5P18TvZAgGlm%6@HZu&|2JJI>#e$A>#l
zu}_x!ZNiTg8^57dl-23_Vs&H$0KBukDZio7zgu2FEs`=y(U#gY((n7e{ewI{t)(<u
zy>JxNsM}74C(G^YvYU6csk?fOB#ZVt2`w~2((O90cioFFBa?JJ>&s@3PYjT3)Ky)3
z`3?IPG~(>H*8QwCa{^v*=S|@ZR9usRs?6U8^cq#DXOZyvkDh80R68VV@|VlJxu{EZ
z@+m<!{WSkVqsbeLE}sO6tI2g(3W}u0Ws-Y|wegX)W|tVUOtLR4ym#^`vc2Jzd&F%;
zhW=j*cBDKmQ2YhgALf_~hma=5zkRK5OIxJfQj!dRs?lP@2byT*YC@1((a{3IfJdz~
z;>eXjJ6G)Bc?;#Y@V7&m%1o(35)p8maS>m=Z{3Y>*>Rfz8NtIVNn{Ocb-l3gve-H|
zgRW6CtmB{<sD^nenNx2&kDQ$5U&i?O?If}+9@bDfP?&a{nug>tc@emoRwKj6{d{fM
zl$Fe3CM-Q(E1Cu`OP1*Sa0a8{m~JAuqjP^t@{r6*x^4vH_oR^GX)a_q|H>z_P1^!r
zx$JZ&a;Um;*V6!}Hb1yu(}V~ANK}i#&qP^r*OzkEP^q3qp175-8o7>=o`sibH5Ol-
zQ-t7)N9oE+?e!a*EE;t(64yTRr%~V5>evj1qh1B-P%vEn#^o{7)>tD@M{{Z?sI^F8
zDWY9TK+eW9lQXl58M_kHP%eL&u<x^AI*?N>7p9IHRB0_F>xay=4QLl9u8cMbtdRD@
zI7b&RAwVA0n-gGSR1H#A1lGcb@f(qNwCc$`mw}SXrGW|cOFTgb6xdxvS;g#1$5(%n
zrwyz8ZTn9ln<d7xYuuwA6LRf~?|14?%#a7tCkw6L;Fdwl){PlGu*<!|EWDr3MUuxs
zs?|I?>eccV?SbiH1I)rX?*sPr0^hR1F43^Bu(B&QDKM<4K-3L}7_PD~TDEHlzH7pv
z`PjnOpWcZb@L7ha`|sRYoA_6je`y}EBcP7q3iop&lWzwZu#R$m3ST`gd;o;PrL~vp
zQ%WrB!>z=k0=h(UjV5V=?-zZfZa%pB@U6}L^-BA$UvSBX8ikjr=A}0HoMaZzG=j(6
zE!TAxI?PtOww~<Jsx=xcLT!l8NCU6a$eo0dBURV+N4WA5He!=mh#aP1T69rW-yRD;
zNnE`h6j+pXNBGj9ji*;scN+C}?XJ*^%vtN=mDzqz?>s}p6=xLBHyx(kQT<3HSAN8m
zLne=g3M{5S=UgsE<tay6DA&Mcsh@vI7|z8x*nIq=X>xl*n{|X|KDq8~8xw%KIxsEJ
zlPY<F&8*gYULJSMeF$tTnmv48FFly1zLsy2Z5p_HI0nRMdCa|3B(3IAdgafv%jx9s
zGsGWbsuI+qgL7DSUi*2Z@r6YhVNMVuuc$)HiIexblY)ZX=YLdOyVdn7cnD=UzX0P<
zK9vzz>-KW$1poG^?Q1wv3Is=dxY?=s<k=oUtKu+1r_IN30D<xkJL7BJ34`?yLx(RF
zPi`VNyzeKF(3w{Y<RLL_P33SJIaqg=r%Ia@Wv)5+fJ<faNM=Ey=9{<5zNMtcHX+-!
zKRc16EY3&!d8If7UOWpYJ;Swqhfjl6AvRJ+%JLT}GZr-6-8?tZ>o=cJR~gllX;trk
zZL!K;V1;02gitM+op$J*%t^GpCoay?_^K`9I;%v@Ld1pTO|m(0gd2w_5^`#GPAGGw
zk!#XCd^*JPyxUo3Gg3W7JF1<}ZEi-d;;t0A;IM|uiOonn;q*QUhkNL7$`qIfir<Rr
zE2XSam!v+PHNfGVD_CgR=KH=Wvbxr+4RXf8N*;!W7F%c_jp~)CYh=&HiC^-etdxg8
zO2}6F8if|iQp3v819yF;CuSSA`9HfF{~Bo9eq2hNbNJzn?X6;q#08`F^=DyJOcKQ0
zlRKmPE-)?k$jXYs#%VLviSsfCQsRe{tNQJt$q%|7J{}5;C!kET?iX#1@`YhWW%?}j
zz-moTq%7JQYu44Y-6}7zTSi3LXJyZcV5cSs&oP~~mFARPF9-PgMi*v5psCk}7oh0p
z(uInKssKOU?OVy89CrFQJk5_&KYsX3VR{s7L6JE)GZlYu=7jLkH@9`er=$}Anlx1x
zuXY8erf8zzE#qF+#ix-m%9YKwaM|p>Avbc@=zjh5F|0;d;SKqnDfxXUVAbTE#0h(e
zzKfsj`NyuGz4I;QrhckR0ql*9O<Q`gO0m0Y)eD`N&-%tn3$w?ocP|x*Nic);iH=WE
zs_lSG**9B_mhnlLpKPLa*^N-UV=L(&j8nF_46AlV<(gE#_-F8hnt*93$6v2V?B3Q_
zw&eTmInE~iuMf^lZ<4Hy3*2ihx>903x0x8=>YoY+>Plk+WS09uXLI@FPqO~%q#a}L
zv{N2tUzF=@10y)Om<Jkj)ao*AZqUq(26`%IKJgViR4+@&>7P=bml@Bo6at8t@t5wC
zE}$VoMX5NXN$em|Q3Y<6(siaUm9;SOJ6?_A^Z^n3PQEFBY#`$y?Sjr6G4IETC8;lx
zn#vd1<M%URq6!~q1V;w$1fy2g%gi($r%ewI_mJ}9NgjkSYu?WDuRblOgd$rtEo&@`
z#17kiUYJ(%i1kjdk%SMnj;b{aF-?DduX~h>MenPO=YA9SZ8PbBr7d!Dsz*`*lYvU<
z#fe?Zu%?|T%{Z3jhR*e@sst<9QqcU<;9jv9-^VS6!E0*R!?~G?jNCoHhwR(w3yr>E
zt9g?Dk^Rw?T>~Zl)uV!IsIW_{4Hf!|UTx`Pd0p)VYXuo*wE=>0thf>D7HT%Jbm=`<
zy@7r=5rk>|eE!`9@#Q#uW5QYsIj3z)V**okO=h=)Eh#N=LSJRUR~36dXK2AQ_~YTB
zosfgOv*Wn$potyM<=go5(~4xxGVzf-{Ccf%m=AZgsK2kiYQkyOrdan*OlV`^>9V({
zOy`8F-bW1WT+M~Us}7lh#cGSW;lr;+xI2Tmgi%-HBX_v4BOjNprz136-h?{CDf<sL
z73d;41-yr9`)Au<uV2I4&y7by%xosJ??lqJ6=dTEgD#HFhxfH%>s_ZLNz?=UdYVdp
z9+71~7?`|h**=>ri~Q5HjzmpOHq(d&MHuaLUxU7W>f*(kdnRe<@ct-iVR8PC^9tWI
zM}{3t--cDrvV4>&Q?RRe2cMdK)gBUZ81(eY;mnp^c2#)q81BwSySxD0^$fhAa`P6-
zc;$|Xn3v+WY4xWs2K+`DYHZ}&`dAIaQ#`@m?P4OvPzn3~>!F79P9n;zc!!J}?QcJ=
zRwmUsB4%S3W}<p`Le6mP!Dok_dRoK~T4(bDa(9gGU55ug$WG9<?&Ky|`xNuO)UTZz
z=_FbA&cSWeUxy)+g|2QkVA4Iel@|9oj=Uc7j+pHt+cVJ}q{s)hPtSv{b}iM4SgsAr
zlh|~LZ+oNk!(aI7=FHHBEmPTv)*mRQYqYl?cDN7I6VQ8ji6;b=2*clMYXH;nrO?N(
z^7>>;biU^Mbdfyy@zV91=fGLXMJv4Z@yOSAao;~WAlf?U%PrZe%3a$tYq7_xyK^6h
zW4_>KW==4GC2uI0(p0kpyF@gL_n))+$zOGZAY{f;A64CAWuSC>LT+xxiO$yiSPblV
zpBPd22}0^$597=XH@i=JMvlB|*Ze)1BXG;;op;Tz0GkE<M@b&9M?wsm@^A)KuWh4~
zbx*J(=cQ*A(_Np0E*%~Um!%Sp+qb4`ih>3b&X>FNu2<Q7tr6|CzKCOUw^>C@%(e=H
z)y{)b$C%?S!%yPZyuLbt1j+G_xkuR<R6Tejkt^12;}W>}<OkY*$(43C`r{5O`WcFR
zFvNm>@*qy%n42ygo!Hj%E<q#PbnQMZgw6kgdmb?~X-PKWygp+SVoPT{4Hz3uW#fWo
z*pjL$4<Xz6M&^4B`bL#vv8gYnqBa_nIT*P`)H_jlYs;>s&~I#ELI4<Vm9tZOFA6Ar
zsjlVdv||0dswd13x>Gtvc^nvcO(y&bB?!PYFJcqXx*1~2yCp@*FvO{q3A+wB9tMnJ
zXyKmgExp3C!nkYh&Dt<mCV0h*?TPjJ-H0L7rzua>`mpY2Q85sj&B3MBTp2m<CgJ7U
zZD!>A#2sMcv}Wzvg3`gc<+7NMtErl;y+$KqB3d^VUQ*`-R$iN}L|2_^?X@x3t?8bu
zFy{@ij-FpR9Cu6naK0A)*W7-O?4SpO59F3g$lc1%nqv+=v(x0o*DdU$yQws0e1Z*G
zD>IBfI6JM0<UjaqmXj_BjTK3%qROOZmC~my7(a3Ly?opdg=9VSY&MzxI$~((GM>+1
zm1kSW9UB*UfS@_h)5H?WCo4|bs-<f-eS2EGj5{|v-DIlqcMi?b4})8Vl)i&Au4OPe
z&aVPv`}axYvzx5Pdt2$ekKLx9)Z|Bnx}KnI@_#gGst)FOHoM-!#bzp^zTX7%hPPdK
z^g~m#eX;m*bX9l6(DrY5aOiMLe5^>?Bo_8NDKzgeZs^YDN8jhOVW-u>TD64>6XajC
zk(ib4*^#6EP1EPbSYnRoo>!jb_qRw$o0=!{$!Q)zk&d5VNdjG$>)~9vdNO584FsW0
zv28Kx0i8J~)<Ra0xlW%jLdF3Tr@Pt{fuwcuWlg*2diJU+b0$XaCzA`QR@$oy+)gPK
z;qdaYP?<!Sd+e-=uQfP#xK&uHMu=KoxUaCr6*#SSYOj$FOh`9?ovN32o|RtcKo0;o
zn@R5(Y_`%c=gO5<c6vsP>TTyH91qUTH~4Joh6S&97J_Yhe)(_sEH-@vX7tNW(}$^1
zxDqwe7<3aY$pb{x8FiyuI78fNY)<qlt&?oC!DiA%Tcj~CuouA8CrSo3`QvWi_4N@P
z>1irWh8fXgcR1JO#kgUWj2%}~Rr+qORS`;@9yd0V6dCNqcBszg#u#4<GP<xP{l!!Q
z82@nY_tZw>-01VLbln`uKUgci#+n(y<x9@~ffx5n*HBsR5^!_6{>;r~{O=2jX+n0<
z_Frh_<WY7L;D62T8O>(JURfR5x0B>#ejnj>qA_>wUaYQ^pY&)yPFuv$k)egpI;DDc
z-HBtbUn0T}B@Mom1O1K7<flyVLm{tYbP@55lt$A72kAkWKZ?*W$7i_*9+-z(!AWP2
zJwE8p!^}WK4hH($u^%s@Z+g=R_XX&x3G=j<p?_&s+(*v~*Y>9hi(Wn;Dx&_Lh$F7b
zaRBmZ4NE+MwVt05;5}{Zhj*(Mr@uU%-x42G>6ovt#tYuiE9`ssBy#!~3;p5d$V4lP
z&7Xhg2v$+(hPQD26v|DCulr;Q9xA>)ZQ;_1F3jd&W;2yD6yjPr*&0EwnVw*LP@JO!
zG{pvjbz@;)qZ*vr_eT|I11F9kRruKHV=(>^qw{!>m}C7qQR276wIXhgXq=<Yb1=1V
ziD=QeuSDNquod~E7=F%uC0p(Pm(rNR41GIK2@t}u{d7U_Yi$4Fe22@N+_{Hy!9ihA
zfGOo}Gy|QOPh0r8MP`n^sc9$rr>Z!zQ`BB(xjE9>+fFD|=H4@wKJJZ$TMPSuPbEx$
z+B7S?a`g}W`6}7EjdC7>I>0eD)1GV+5}W~iFztyMMKqexJ#qOIi0n?<aHdE{M+&u=
zqXIY59zuXTY=jgpilht>y_8O}nLN)wdIo%DDuu&OQoA`g&1aI3oHBjq!I8wFTjCBv
z&GE1+5jXoZnUKMV;X(_OX$<DKTjIc}jS5Q&3LMeRa^t4Ry3x8|M6#u{qKvoNdgaIf
zb)$9HIhA_U9(8|E*&~H)L_Dhh*gobF&T6PF5w|wj;>~XI-0#<XhtBkYhf>osn$??+
z%sSz^0d_pNl7)R7E#~;1q<K9%&tovbTyTW*(G)<*PrplL1>Gv54kpr`yp*{0g1vBW
z+-r{rX_sR&0Z{lkWlr)y=+oW*o^ViYXG7-pMs@E=x`f|_ovR%`82!I5cy8e-7~{Un
z-yYbO{hAw5aGy2qLbV-bm>S+>Pf;aNRX4&Y9}YEkfqgDwMCU>I-Iziv#C8YWgpx|<
zv~ZMZOi_uet{t-YwrqEDU5Q1_hcLC*0~_yQ-!L<kiHhnuSP2lJOYbJk520GaM+-`I
ztkx?yOjW0UDv|2W<LtJT#2XrFcSynJMU&pv$FbXr@<+6VHgA!M4`6%Hv7NKqXwIrw
zgoYY4slf*uC(RA2UbcrB=Pm5JsBHA@Vlivt_j5E)d^lEinA-hoE<LR;tC0c1@1Guu
zwf_8NXUTsoJHGbe9*%#pQD||Rz|86Jjkqe;<b6?87TX*^ouJ30M72ji{i~BE!NO?T
zXd{HelhdWw(t8~VSLO!6TyD4V$WB<x%ubsuJ5QqNZx@=w{O}vHI-m(WapC0ay)JyD
z%D8p2<I~&GqqyQ;@D-1dyAqw+IsT|!l_WIS66V`gG#-B%xmQAl=?Uv=CK9usHNiS6
z8ENkm7e%i!u|#5E2##M*qlgqbHQPYb3(e2`3QBUHgxhaj>P;6|QEiUM;Hqc4Ci;za
z7R!83&14FF8}=ZdcS<l&u-0wyE|R|zpU_Ll<-y(P-Dz9+xe;UwBJv%n>^(pHZ~y@H
zthMIrBS_h#jf91tF$>===z@VYComPvg26_gl2;<qlkav;i0cV*;YbUhA8D8Q%#n0p
z8-uxmRqbp^DTdAJ;?x6Zf4+`AlaD(uuN4S}V&Vx&GDLSTu<tNI%1ZT)@}Hsyfa8a@
zV0fsFUZaA?_Ai36JRPChlzL(*7d=Ur?FO>irc!DamkcN^;3alEhkGRenJ3k^^;@q<
zb6L$Eh+BVLU0w?Tr!YIQaB~$z=raqGeJ=TRm=>@kAvVooI6+5vCZm$vJrzc(YpnKu
z*=A>5Y!lQS2dlNHc_AjRp7V8&=K<g;lSVZ9aU7T0mZAzG!)=PiSH;HqbN9lR-zv6N
zHBVnY1ynC7)fQWr%xDnD$M=dwQNnd&#I>b4re44CxJSHvQ?v}6Bu;lvai&K>wR7CF
z+^Hy6YAEz#n|(8JTy*cvnd~;sY{I;2g;}TP&%=eQ$s>CKQJhBMzGqgOu62-!@7y*C
zb>|+x2qrdBG2l~4Psu6stwural~sj0o1o@t2mHppnsXon73F~;qmsKqHAyf{sylMJ
z(=-;qoPph1LArCiF=S52vRE~H5LN7QpPn%J#)8Lz4Ln1703y@hF~c9^OZSSRU_enh
znMQq1rlop(Z8zc@p<(IGEA9vGV?y}uw4R1K^%l7>V^Zu(1K3e@-)`ZO>paTG2oq^-
z(Ky&D{Owyta!D(NX1MZZmzR_k;&V77aV&Vvo8tPw03gV}(_k47FBhMYoql)f3OIR`
zWty4#Du1icL^bqzrSE}cnFdx)B@WNZa~{bIHQP~pmWHmL9=G!jFynwdT1!NNbr9$(
zz3AJ=zrU3;e7<!V4`#qjp}+}ucxz9J5m=mpm7P|^)gU*adD&~F@GsSc887m_+N31!
zr?)#|_`JK&eD@(HuMCsL?aHx%B`huiXmGftm`uYC9IxI+wT}JJF=iFfdhs1_j@ki@
z*`)hJ_!h1R=vC(Dr*1;RFGtV|xlebKV1|2x+h(<~rW`mpijJL)xsq*6ryV157{~BN
z-<XBJtcJ(df!PHZsb1^0kRI*mz{>Fy)8(=w9O|`vWzW_v#bi#`Lh>xwPdq{z25;2|
zw$CGU4uLG8KB<Svw#rpT0xKrT$+Tm+BUXd=Be>|*C_vR1h~3N>%UWpu759`Ls`sH;
zZP_Ur&H?;aH*JU`8YWtMIfWsX@fFc_EK?2Sl)Yqn^{S7QY^Hml$c`Z*R3EwxglxrR
z6|5ugPWtz9GN_<EFTUqSHV#-XeqnjN!h;lNqX&MN5ZIt$gBWg;1E0Px<^>}#m}Azy
z&yItu7@3-!3i}=pp7Ox9f)D8O8p@|zrNa!dLTENn#|3T2!TKb+f0n;0+mX&3lGUa^
zy&rtb^#ky+CIp5k`dt5l)eU`NN>{AeIX+uQu&9X16IiinWdQ2d6_aaDh}Ul+i%OMq
zP#44Y1Dd7J<n_++&RQApt;#-WqiSr=3J?R|Fba=h-}ukqJ<-NFp{hj3W0#eqc3q3S
zdhOiK(Yt@-<l+l(4ri6!gi?$GOSq0yBf=p$4vluP1>yb|KN1L%0suy000W&>XteoS
zS~L@Q_D3&28w&9BM*%ZJ3*FdR!3xDqD6iWHIa(6gt4rs(X<57B7u;N;(>p-$k`tiM
zfyT@DiE6U>^cTNN@3}!<U+{GVE#sA=@+^uA79KSU(i>g&mE6Fs&t^vW^<lD2!x2FG
z-ZxB`Q`8xqFDIK5nz&bd3x$Dp?KAi9&M%k46oE~N#%ci5k=6pZJjtD%a>*@LQk_wN
zKNuqd(q$4lN1A^~B6+ay8vH?t1TA9FYc$8aSdtAeUn)EXD!Tx^yykDd5bA8crb7MV
z_q3NC$YzUeQ+r7`w|5J_O9}v{ej|@%{7Cv{nBaphe?A5PaMA@&q3(i(2dC8eTX%<k
z&|@PYHnD1lLce=t6xesc{2XxHslxS#|MJ>Ap$WxWXqY1doT|%zWR)i)*>@|WkaC<I
z5MYku<mQ>4>9<2Zs;=fTPnVnuS;2@hL0XhLLA+qIq@@nN->i_CPUEM|)?Z`a4WSh2
z?&;?e$!-fc)_UFdUi&rn?jgUd7GPSY1hHx3XS|ulg#d%1bQ=aBcw3=(a`A}K*t+7d
z35OamETv?2a`937yMhHz4i)g+oBwzyz%`BPVXhoC>XJ#<ax^&ACA+Oca?6uM#nydZ
zU<80mJml#H=SibpsKXvL8lwaC=|SS0+RN1%L})#LQrFoBfY@>KnvlKXbAKzKuh)uL
zs+2${-V4iW%h1ocQvApWe&!EDwd?g~Kemq6H<bXV(j4hAOxJLe-qpx%@wKbN>JB?U
zqazx(tdzXF$5Z6U2oR8V2`kiG4rH3U7C@!F$a^=rc#R!Sv^X1;cWGCRUVJgL)Gt2=
z!F2{!Fm#C>*i|yLLeO%3<Z%dS+`BXdriQ=nQ2lo#a619y3;Mg@Kahaxf9LwoB(V1X
z%ZR_Jrj!3WoBjjWKiKp)^?wukzc;h)SiYCMA_V!miUObVA40f_MR2=IjjNL<-%Acf
ze?eGhq^!I?06ENERJ4z%dyQv+I&$b&ng)&}euJK0t0#3K8kxz=2acXembKzjfgGak
zuDB9L7%gTM##x|_CxI0`S&S4*qzbPZ<iH~RsKPXy!Q;hE=9*U-2NH!Lxk#B}I;q(I
zx_prsBxmDQde)Rzf__VDZh1N31SF@^_4sU$17NryFUt+d@hdFb)>SuG_JgZoO#wlB
zv|)wm2b!Z4=1^ub3^4(dbLF*y9O7~;U307IbjpGg1a}mgwkRJNA@lDIu<4)Q4sFk<
z`iF#t)V?{!1eu>KJhOJi{=OUisthwp$%}hvOE=`xFrEqGnro<vDpalbAi_{Q@+s$Q
z`v~$tq6Q@ASnjx0g7O+t;>)KBdL6T0O&p{ILXa53*wQ<w?BIAJD><leJtH8t&XXcK
zwGaAEe&D$EnQRz*zc{}Ss(RP8d}$;JsiyyUN`L_pyl!69Piw?u&L$+QYd!Y46H<<C
zC(jb9WrBW(BHp*>|C}bb6HBdoTb}2znLZMf3#fc%p<%|ai|(cnU>5r?L0VkelBcoV
zXp`O*a6PZCG;hc+kq(i`09GC7-!Fj4sqN@TFhD%l;U`rjFY(YX1YgiKMwFg+xcNWr
C4aRZ+

diff --git a/mobile/com.sap.sailing.android.tracking.app/res/layout-land/fragment_regatta.xml b/mobile/com.sap.sailing.android.tracking.app/res/layout-land/fragment_regatta.xml
index aeca4b9ed7d..1a524cd6952 100644
--- a/mobile/com.sap.sailing.android.tracking.app/res/layout-land/fragment_regatta.xml
+++ b/mobile/com.sap.sailing.android.tracking.app/res/layout-land/fragment_regatta.xml
@@ -201,7 +201,7 @@
                     android:id="@+id/change_photo_button"
                     android:layout_width="35dp"
                     android:layout_height="35dp"
-                    android:background="@drawable/stift"/>
+                    android:background="@drawable/edit_pencil"/>
             </LinearLayout>
         </RelativeLayout>
 
diff --git a/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_regatta.xml b/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_regatta.xml
index 202e4ebf827..0ee0cfe01a7 100644
--- a/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_regatta.xml
+++ b/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_regatta.xml
@@ -77,8 +77,8 @@
                 android:paddingLeft="@dimen/activity_horizontal_margin"
                 android:paddingRight="@dimen/activity_horizontal_margin"
                 android:text="@string/upload_in_progress"
-                android:textSize="@dimen/default_text_size"
-                android:textColor="@color/black"/>
+                android:textColor="@color/black"
+                android:textSize="@dimen/default_text_size"/>
         </LinearLayout>
 
         <LinearLayout
@@ -94,7 +94,7 @@
             android:visibility="gone"
             tools:visibility="visible">
 
-            <com.sap.sailing.android.shared.ui.customviews.OpenSansTextView
+            <TextView
                 android:id="@+id/retry_upload_text"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -105,9 +105,9 @@
                 android:paddingLeft="8dp"
                 android:paddingRight="8dp"
                 android:paddingTop="8dp"
-                android:textSize="@dimen/default_text_size"
                 android:text="@string/upload_retry"
-                android:textColor="@color/black"/>
+                android:textColor="@color/black"
+                android:textSize="@dimen/default_text_size"/>
         </LinearLayout>
 
         <LinearLayout
@@ -123,7 +123,7 @@
             android:orientation="horizontal"
             android:padding="10dp">
 
-            <com.sap.sailing.android.shared.ui.customviews.OpenSansTextView
+            <TextView
                 android:id="@+id/competitor_name"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -132,7 +132,8 @@
                 android:paddingLeft="@dimen/activity_horizontal_margin"
                 android:paddingRight="@dimen/activity_horizontal_margin"
                 android:text="@string/empty"
-                android:textColor="@color/black"/>
+                android:textColor="@color/black"
+                android:textSize="@dimen/default_text_size"/>
 
             <RelativeLayout
                 android:layout_width="10dp"
@@ -155,14 +156,15 @@
                     android:textColor="@color/black"/>
             </RelativeLayout>
 
-            <com.sap.sailing.android.shared.ui.customviews.OpenSansTextView
+            <TextView
                 android:id="@+id/sail_id"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:gravity="end|center_vertical"
                 android:padding="0dp"
                 android:text="@string/empty"
-                android:textColor="@color/black"/>
+                android:textColor="@color/black"
+                android:textSize="@dimen/default_text_size"/>
         </LinearLayout>
 
         <LinearLayout
@@ -175,15 +177,15 @@
             android:layout_marginBottom="15dp"
             android:layout_marginEnd="15dp"
             android:layout_marginRight="15dp"
-            android:background="@drawable/background_transparent_box"
+            android:background="@color/white_less_transparent"
             android:orientation="horizontal"
             android:padding="0dp">
 
             <Button
                 android:id="@+id/change_photo_button"
-                android:layout_width="35dp"
-                android:layout_height="35dp"
-                android:background="@drawable/stift"/>
+                android:layout_width="50dp"
+                android:layout_height="50dp"
+                android:background="@drawable/edit_pencil"/>
         </LinearLayout>
 
         <View
@@ -245,11 +247,11 @@
                     android:id="@+id/regatta_starts_in"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
+                    android:layout_marginBottom="10dp"
                     android:gravity="center"
                     android:paddingLeft="10dp"
                     android:paddingRight="10dp"
                     android:paddingTop="10dp"
-                    android:layout_marginBottom="10dp"
                     android:text="@string/regatta_starts_in"
                     android:textColor="@color/black"
                     android:textSize="@dimen/default_text_size"
@@ -300,8 +302,8 @@
                     <View
                         android:layout_width="@dimen/countdown_separator_width"
                         android:layout_height="@dimen/countdown_separator_height"
-                        android:background="@color/separator_color"
-                        android:layout_gravity="center_vertical"/>
+                        android:layout_gravity="center_vertical"
+                        android:background="@color/separator_color"/>
 
                     <LinearLayout
                         android:id="@+id/three_boxes_hours_box"
@@ -337,8 +339,8 @@
                     <View
                         android:layout_width="@dimen/countdown_separator_width"
                         android:layout_height="@dimen/countdown_separator_height"
-                        android:background="@color/separator_color"
-                        android:layout_gravity="center_vertical"/>
+                        android:layout_gravity="center_vertical"
+                        android:background="@color/separator_color"/>
 
                     <LinearLayout
                         android:id="@+id/three_boxes_minutes_box"

From ce11e23af460483d09d4dcd866cbaf656b33bbe2 Mon Sep 17 00:00:00 2001
From: Bennet Brunsen <brunsen@ubilabs.net>
Date: Tue, 26 Apr 2016 17:12:40 +0200
Subject: [PATCH 22/92] Changed regatta row arrow image

---
 .../res/drawable-hdpi/white_arrow_right.png    | Bin 639 -> 502 bytes
 .../res/drawable-mdpi/white_arrow_right.png    | Bin 457 -> 360 bytes
 .../res/drawable-xhdpi/white_arrow_right.png   | Bin 744 -> 634 bytes
 .../res/drawable-xxhdpi/white_arrow_right.png  | Bin 1131 -> 834 bytes
 4 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/mobile/com.sap.sailing.android.tracking.app/res/drawable-hdpi/white_arrow_right.png b/mobile/com.sap.sailing.android.tracking.app/res/drawable-hdpi/white_arrow_right.png
index d0312802043e3824af31eea99b8737d4bbb5530b..c331f4cd6fe58d6440c5cfd154717cdb05435399 100755
GIT binary patch
delta 440
zcmV;p0Z0D-1oi`vNPhvCNkl<Zc-rikF>ZrE5C8$EaLE(=1SCFS|G;HR)6n||`9XRb
z{Dah~oODTn%oCg+@PzC|8|8vRlr-F)n2}DPqc}9$-MhUc0RR9100000001yYUDsO~
zd2Iik&A8T9#yK`g+05$|GA<&iK+rTBjidrW-x<93JQhi-xqlYwy6&Yc%Z;X)V=d!W
z=3eF7l?W1=rm5sn{SZlq#Yd1ANxekPo4oG5>AjnC-xe<@Hc6{c3#+7Om9+LG<?`*(
zilEfM3ELIzv(}?ePFk-JWL;8fC6q;yI|4j-$AAw>GL9l@SiB&WlxrmUl3dZ=g_2}S
zkVQ$EH9;z2r+?|?H@QJ>0?b9wD4JS%97d5;iNqd3(~<^Fw|<c+_6M${*jKS`NA1Y$
z#X2=C$HY#?HXl<B@>-7ZX_|wg)qad-)q0BQbt~5$zsPAv)9$2vvXc5Katx-J$hnU}
zPLK$i=&g<x<;*T9bmM6{#YE0sY;r<w^HInNC8&=@jxpmVkenfjggGPVDK<F(00000
i000000RQ7%fB^s*Wxe@w6mPBo0000<MNUMnLSTYu&db99

delta 578
zcmV-I0=@nA1OEh&NPhw$Nkl<Zc-rjRJ#NA<6bEqI?ZC(pa)d}+0Je_l4Pap|H|P;M
zvyh$u7(1bET_Q4eY`2bd>)2=MRYC{{kgE5A-(Nx?C6eK%V80i~Ig7<&u~;k?i^Xzz
zZYTzsPNxrp!QiK9nlEiYfoPmQyfy$;8qjH^%7D6&mVh)ipnvWxv>*k>u~i^Z0ks`S
zi|m(qSl-`Zng4{3$0q0!jumjuS|X6A91NHF4NlgFsps?gBx|5EkXG=T0Mss9pfix-
zd^M7S<hce0q&^~*l94>;;2MxP>mY|eev~K!BHEU_fAdaAupT;AIPUODYO@BCiWDRP
zVI5R=+zA+7Wq&1oVb#5c%K95V-W?q3#j7h;<Zw=#Ef6BTb+jfGC6Y)WL~11<i3Qq2
zdPSt(5u`qx^ODUfCb7v?0mO-<1_+S~cv~h~lUN?i{<}3%1;o+6sRN=$3L1g%$3G_y
z7YVqmt{}3W%^S{jtzzWezLrAq)TDe5I3HQoLEN`xgMV<G!ZF{o_JVOlYz=vZIHWtU
zK_Jf13EG|x!f?h;*xr2*hLd^}=85aUh9Cszu>&VQ%rN8nZe9RRsyhC|sX4!&HynXL
zSRF^4D$!R(oRx&Xzh}ZpRmZIR@a#a^a7b4%td6&uaL9o6T8E;euM&q7b4xT%<rF-R
zD6LQwk2}K&qymQvsMdl*IR~+J<XWyEbvTp-VrdE%i^XEGSS*&S%C7(e0HIDB81<${
Ql>h($07*qoM6N<$f~G<TG5`Po

diff --git a/mobile/com.sap.sailing.android.tracking.app/res/drawable-mdpi/white_arrow_right.png b/mobile/com.sap.sailing.android.tracking.app/res/drawable-mdpi/white_arrow_right.png
index 3687cd7143e3a9824eb3818dcfb2379652767465..27624e124150ab5797ef45b59f8a534d8c5c808f 100755
GIT binary patch
delta 296
zcmV+@0oVS?1Ly*fNq-7SL_t(|+U%D-4uU`sMi=w|l$IQUgcEoJy#Y4V-b8B}Xsy%}
zcmg6vv9xr?42dDJFwQKQ<a^0xfnu4L+1Z~E000000Ki|=bzN|q<KL;$I2pAYNo>3d
zj1p&(s5}Y`(wH`;M50&+?`cGBtc6|EG@ToPFA^O|>?{Qqnty}!eg7=W@<fj-ktpar
zr|(x68JJ|FrLMBhL}HoViNr<f;^9U>B=*!DK31!>ri8hGNN^Tf3yCNKmJ(@j4yMqL
zE0M1vj<FXcMuBItbo$%KVxNan<KU0hhdIsTbj}wVm&a)d{w}w&Xu)evp?r?uwQGRa
u_HE4InWbXzydgmi0RR91002beCBOi#PH(b}6BASb0000<MNUMnLSTaY41^c}

delta 394
zcmV;50d@Z90?7lANq=ieL_t(|+U%FX4TCTYMS*qzMqmUa7APCg4a$W(6SO1r%mqg1
z226lpgmwc)s3Qd_ihx70okY!-BC1ph|H(FXg22nm%gcFHRTZ0hcZ77#2oR~u012$#
z1Vn^*R%`+yLOySSxVQ#Tu0Y&408SW(48t&GS@waSg|c0UJ%90^^#CRzLV}(kiny1l
zwCLG1P3;804nzkKr4s<05FurO$q_?9sJ)?sRRhRuJ-`lxDC!&of*gPvBH{p$CUcoS
zi&EL}V(TNIMWcm>+NIyHt^heX0k8ov%XFHoOre#O5}(o<W0ExjpcL_}LAU`RCsn=4
zl@OWEg(4Q_TYr5V|HV8z0GNNk<Bn0h>;RZw9uu9I#5~t9*J_uXLye1boF*OOs4p}u
z=1Ka1?4~1!d2|5f7M3X6FDmn>Da3gXMvuV8Xh3dW=!|rZJ{qu?ryAyJF7ucXI6Rcu
o5CL}c*dwx+mzUQc>MOtiGpekHDUVUE00000NkvXXt^-0~g7GA)XaE2J

diff --git a/mobile/com.sap.sailing.android.tracking.app/res/drawable-xhdpi/white_arrow_right.png b/mobile/com.sap.sailing.android.tracking.app/res/drawable-xhdpi/white_arrow_right.png
index c6e5d551020327aa12a029fea11ad1f7f2d5d734..902278fdf8c44a98702a11d157c5b568d85a8c3f 100755
GIT binary patch
delta 572
zcmaFC`io_PXT6N4i(^Q|tv9m`gP0rzT+7Ay9WqV`Zm?*a`LK%F<HX*^c@D`!p1oIu
z9Xy;ix?hk^NXziQ>Jn`&@iwpgeRXKC>qeHt|1aBKJ{usyfB|GT#jSsy{QKO}O+Q1D
z4r#OToG$WFo8t9c)YszVjHCkvNB-6)Jipr#^z+Z1*$d7#@Jl}L;nef@aC{k9qP}?N
ztHp-fXP;emjKSx_UUrqn{1lVcc~#!-S>}m`54G2Q>*4&^u}g*Z>*T&=nzCEh{+cSW
zb!*N6m)|V?#~;5>+E_7p`gL8kkWX)-?Sh3F|GGHm1a4V6kG-=+Txr4Yj2}}(?Xx>u
zcGv%?tLbC>JL7|}Yra^HnD2}To@l|J0>$-rnAgk};5xiyaYpp(D*eZC-&&2?O7fki
z`ecNiEnPM1yo5o_Yp1=OOWB!&UMq#2-Rbv=hxwQB!aT!=OSaaFaHYp&#IAU=WS8-Q
zS)8ei5*H43zHs4sWMQSpyyhCyQsIx&HQxqw@T%0+uakGtPEz=|UFpxML**Q8N6-JY
zN^`5(%vK?Ie-7iyL$&8R{;NE)kBas=IOE5=b<0_fJeT-2|HtM-ACInC5c9`-ddcJb
zebui^eGIhr&6d8jH0a~%B$exzP5(J6hu{6g-a9YsU-fBa;cy?DB@2GeII_Kfr&M=e
z8S}S$NBd(m=T6^gx@^{R4vF3$QQi6&vBz-v52pb`@cJ)u4Vr%WAZbrmKbLh*2~7az
Cp8&)F

delta 683
zcmV;c0#yC_1n32jNq>q-L_t(|+U%Uoal$YVMkP%Oa0y8Vqyy-{bYL!=lMa#!a_0ga
zgbtttN}vRn5bew!xM0~cv9&+no8iVmd=FXPwX6^T00000000000002K*zfl%kH0$!
z8p|b1Xd$2;P5%652^|E~<>*O55;`t75|ZGtk%S`z)TOg7A%7_tqiG3}1oQ<7bcfVH
zz<g{95?ZbmOi73WtKkdR1kbpUti$2ZV+Q;)In*1^g!{nPR+eT$lsG63_rhThtr;7Z
z1_6*@On?^&QNtj)4(JLJc3Hw10_sT!Ea3zJkYG~)OCSM9D-zTRm>}VlCF~#o5^M^X
z(7F&ULA8Jh5`WITF7yykPlCuMUa}y7tKfGI`57XccqV4R#MXtVnP5u51PNmLN6DH1
z{%6xOg`q;M;mgqqGoWtkqWVlomId(r|CpJuhJbk`e2$RN;SyB8b+LF8&y4`75|SqY
z9PBm>??0kFsXv$j^;;K<H1U#00esteEqtxbqF(17%YTc*e}BX4Ks%y7xZ@JEe4Ap?
zUQtB&^}=_v20Sdf;<}{KQTRi5JhUKhYqY2%!ms<xI2jJV3kn|CN5kQ(*s_wGhW{;P
ztBSQ}!qmh0D11%Sw#8^De3ct_Bf^J(xvSfr@A0n^e?xQ-zUbGNBEpA&IjUPVFYZNy
z;j4O+K7T0+e;o`SV~~`D-vy&*NF*iUms$(gp!5I_>2JzYTcNZ?M8(T^>I96eZdHdb
zR)ClA#R(X>WrU!1@>eiG6c&D|x+T<|2chLI$X)o-1h@;I(6BX8bUWF)02AlJX|06K
zhc8)xi}0lipwQnugfCHmsZ(*a32+y_C@h|g4kQ2o0000000000z$1SG3;-=9Rw3%V
R2}J+^002ovPDHLkV1k==E)oC$

diff --git a/mobile/com.sap.sailing.android.tracking.app/res/drawable-xxhdpi/white_arrow_right.png b/mobile/com.sap.sailing.android.tracking.app/res/drawable-xxhdpi/white_arrow_right.png
index 6360aff464939f5e8a2f3bcde8dce3685b554aab..3ed1a96c355b00ab02325cadd47148a8f7a11d16 100755
GIT binary patch
delta 774
zcmaFOafoe#M?KRMPZ!6Kid%2)82a4~kU5YjZdGzdaED`XYGTV;<-Lv(i~0&Cm7Ei*
zVoFFkbxSp?iWvx-_l586y>Wi4tmco}`6-Pp(^c$kkH41>3T40o4t$K%5&QmdMwJ@h
z`;;a9*+PB29V{wJjIypS;&Js^j9+^*-aQoykk1z6^l)La>gt#lSH)=hbKcM2z8x8F
zpT2)z(!-y%`|i86%{SkFcpZ8;^K!wtNQ>`*Y<Krce{S}EUtXkrHr669eD&3C8I~>j
zi*`)h;ko^DY1zXaA`=^2R1^eva$7qoc1avxF5>xC`gOq{6Z_3frfXd$ZxJ$et^YJB
zY|&g7pnIloIH;fg|B=V`52Zez);g>WTfD>H<ouj6*+si2pUz&s)Sj_W-Rhl3x?XyC
zVY>CZ0&h2mQo+BR`|HFeHtcfyviRs99XAus=XRCHK#nkTzESKP!T40^*Hpc9`7A%<
zljY*m_F88f|LQ1DbM^nkdc}UxqUY)A^+qeFmo3y^{pU~4<g)E+9p1!t-s-XIis@uA
z$#FUV@JG<4KRyos<u6(l&yK$$5aw{#>D1ZtU7a2dO0SN(CAnwTiRouPH(h?j_r&_-
z`SUqf#Jl+GK2KlV>*4TM`PNjKiM>Y>YjnOgRtvv9yQSfX@`CMRetUlJ;y>>Ca{EW7
zS7QD36Wbd2#QX!DLm9XBA5U*)QJJ^!CcBi{y!KTW{8ghGXFcxR{^Dl71^2_4>Az$+
zJ#3h)9Bj-V9uKl%dL`sPTR*zv|EbSsH>)nt`}kuSALCxG^htV=j|2mjR}}3&4Wyq}
z)Le~ip4{|!X4i49E9Ub$D_BZ8D(0;|^zU$p!`nxl_3}0G;cbhUUJ0DvbE;qMh_b@R
z9o*7p^HRGj<c=h>-V*npeX(WX3ZT;!K34FTxSTVp-!FRJ;GX!88N9A*9UcizsE9dq
ukHa}odqM?^iX3AnJC+p4ATf786A!}*j_MmG?Qg?CDm-2NT-G@yGywoWL|AJ8

delta 1074
zcmV-21kL-x2I~lrNPh$kNkl<Zc-rjUKT;bp7>D5nQl#_|ID#3Pl%`7wH!ux#I6;m;
zYB#t|1vvqfX_z=CNVoy%(j^jE=MNAPY1d|V^}I7Xc$iUP?>nEg`mLm@0ssI200000
z00000000000Ca+*qob)`VZCe)?E9PsiC(#_1Zu)bkm%H{C4W#8rX(T|iF&}szy{IZ
z9{BfVxDIBs*^S$+0_89X*F}(P<aQG%mobS5)RsisZaaaRNc15{G<NF=l*_2DL?j{*
zi3rp#iwudTG$7EDy$p#?NtDmV(7sUpsD4oom{T~M&1Q2-q_H)$FLZTv^>uf5_igz2
zB3vnt?E9hJmw(XyJuM2ZKzFK9%)(N;r+KJEhtw#v0^O-b??P4CPVCOcu}y4CkHQ7|
zO`=iVrIAP%mffAjt}ONSj>}4tPoRbp#c6>(5<N^&Gtu>9dK@69$RNpAf$mkJTPdm^
z6NxF6D0XL`X;ZjB4J5j$yR!v#3Kxh(1Zqp7oalo@C4Ua0|1z+?m7$X4t3Xdsi6TXZ
zumrj<QciwWtVCOs`IF52EGGHaq3wb|Xd+Q@`5A#8m*_f*k<hHT5SBoXOSB-7L3A4f
z>o}-R4Pnpg!SxM+5G9&~KW9~Xem3YNpFn96<%Y0>m54wjYQ!cb(x~&VohmK*h|+x;
z;!0Q*D1W~a31JCDB3;<ic4x~Zf1c26ndI*e;Wto$+N(xIhOlO$TcXqumO$-G6s!8A
z6p0AbzC@Q9`B`t1d;+aTqGCc=0<Bh}kKyCXa6KQYM4rM{|8$lUee@>DCs21K>P3EL
zB5@7Wv(BkYhkCIlUj<rkCCZ6DI$enf)DMX|n}46_!q(rNMH!A0n?>nf8v|iEpgv1%
z7B~JpAP{+`8Bb%K-Zj=3Xua~JuI%XimcuGgcjbB0hyAKmpw-KB68@x~W#60kgb1`+
zc?SQI8G*<{ppJ=?J5d<rIq%!|B~Uly>Fp{F0+EM69gwHk?Sjn%J&ioK%cF;|xKIUZ
zCV$VQDtyZq6)0bxX=RrV6{vwcj*TKvmOL?*I7w_a*mGD3lqQcud<jGz0<Bk^Q9a&C
z-Hs)`j&VHn--kf|md61s1R~F>Fc0*wJY({xKuzUI&9!>@ItGEdAy2W#U+Ths$ulL7
z3e-fN)M&!NyDCtlTx-Xv&CZR_S#mS@6MuLJ^ndc?L=)s85P1lcFHY|4^58>J0+EM6
z<RMTO<;j^{CJ%uc$x~b?n#<;Z<(ZI&K)Lcv$wQzf^5o=N<SBg&l)2<aD5?VegggXV
z8{{ESHVg8!!?S|r5sIon<RK7w2-E}S<S_=ymPaV60+EM6<k5xo2f3CCL>{b}IxC3>
s0000000000000000000`4&MbB0AdI!;L4^}1poj507*qoM6N<$g1vp}`2YX_


From f6b60b959e2b5d49a0ba5605231b907347c6b0d4 Mon Sep 17 00:00:00 2001
From: Bennet Brunsen <brunsen@ubilabs.net>
Date: Thu, 28 Apr 2016 10:08:43 +0200
Subject: [PATCH 23/92] Changed background color in splash screen

---
 .../res/drawable/launch_screen.xml                              | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mobile/com.sap.sailing.android.tracking.app/res/drawable/launch_screen.xml b/mobile/com.sap.sailing.android.tracking.app/res/drawable/launch_screen.xml
index cd9ce74fe55..70ee46ce8e5 100644
--- a/mobile/com.sap.sailing.android.tracking.app/res/drawable/launch_screen.xml
+++ b/mobile/com.sap.sailing.android.tracking.app/res/drawable/launch_screen.xml
@@ -1,7 +1,7 @@
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
 
     <item
-        android:drawable="@color/background_material_dark"/>
+        android:drawable="@drawable/main_background"/>
 
     <item>
         <bitmap

From 3c24a33c8767f18842d463a1d3ff5648808d64fa Mon Sep 17 00:00:00 2001
From: Bennet Brunsen <brunsen@ubilabs.net>
Date: Thu, 28 Apr 2016 10:37:51 +0200
Subject: [PATCH 24/92] Change text size for stop tracking button

---
 .../res/layout/activity_tracking.xml                             | 1 +
 1 file changed, 1 insertion(+)

diff --git a/mobile/com.sap.sailing.android.tracking.app/res/layout/activity_tracking.xml b/mobile/com.sap.sailing.android.tracking.app/res/layout/activity_tracking.xml
index ac5eca182f2..1f27ab94af3 100644
--- a/mobile/com.sap.sailing.android.tracking.app/res/layout/activity_tracking.xml
+++ b/mobile/com.sap.sailing.android.tracking.app/res/layout/activity_tracking.xml
@@ -77,6 +77,7 @@
         android:background="@drawable/stop_tracking_button"
         android:padding="0dp"
         android:text="@string/stop_tracking"
+        android:textSize="@dimen/highlight_text_size"
         android:textStyle="bold"/>
 
     <com.viewpagerindicator.CirclePageIndicator

From b965ff6103466df2d3039c3cf60672b05b87c82a Mon Sep 17 00:00:00 2001
From: Bennet Brunsen <brunsen@ubilabs.net>
Date: Thu, 28 Apr 2016 10:42:01 +0200
Subject: [PATCH 25/92] Fixes class cast exception

---
 .../android/tracking/app/ui/fragments/AboutFragment.java       | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/fragments/AboutFragment.java b/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/fragments/AboutFragment.java
index e4d95177fbd..10ff09a28db 100644
--- a/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/fragments/AboutFragment.java
+++ b/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/fragments/AboutFragment.java
@@ -13,7 +13,6 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
 
-import com.sap.sailing.android.shared.ui.customviews.OpenSansTextView;
 import com.sap.sailing.android.shared.util.AppUtils;
 import com.sap.sailing.android.shared.util.EulaHelper;
 import com.sap.sailing.android.shared.util.LicenseHelper;
@@ -48,7 +47,7 @@ public class AboutFragment extends com.sap.sailing.android.ui.fragments.BaseFrag
                 EulaHelper.with(getActivity()).openEulaPage();
             }
         });
-        OpenSansTextView versionTextView = (OpenSansTextView) view.findViewById(R.id.system_information_application_version);
+        TextView versionTextView = (TextView) view.findViewById(R.id.system_information_application_version);
         versionTextView.setText(AppUtils.with(getActivity()).getBuildInfo());
         return view;
     }

From 97aec0fb14c050d4732ffa983615a61aef417d0e Mon Sep 17 00:00:00 2001
From: Bennet Brunsen <brunsen@ubilabs.net>
Date: Thu, 28 Apr 2016 10:56:28 +0200
Subject: [PATCH 26/92] Adjust circle page indicator to fiori color scheme

---
 .../res/layout/activity_tracking.xml                      | 3 +--
 .../res/values/vpi__defaults.xml                          | 8 ++++----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/mobile/com.sap.sailing.android.tracking.app/res/layout/activity_tracking.xml b/mobile/com.sap.sailing.android.tracking.app/res/layout/activity_tracking.xml
index 1f27ab94af3..be622126350 100644
--- a/mobile/com.sap.sailing.android.tracking.app/res/layout/activity_tracking.xml
+++ b/mobile/com.sap.sailing.android.tracking.app/res/layout/activity_tracking.xml
@@ -85,8 +85,7 @@
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
         android:layout_alignParentBottom="true"
-        android:background="@color/black"
-        android:paddingBottom="10dp"
+        android:layout_marginBottom="20dp"
         android:paddingTop="10dp"/>
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/mobile/com.sap.sailing.android.tracking.app/res/values/vpi__defaults.xml b/mobile/com.sap.sailing.android.tracking.app/res/values/vpi__defaults.xml
index e4d44cbffb3..fff6af0a215 100644
--- a/mobile/com.sap.sailing.android.tracking.app/res/values/vpi__defaults.xml
+++ b/mobile/com.sap.sailing.android.tracking.app/res/values/vpi__defaults.xml
@@ -16,18 +16,18 @@
 
 <resources>
     <bool name="default_circle_indicator_centered">true</bool>
-    <color name="default_circle_indicator_fill_color">#FFFFFFFF</color>
-    <color name="default_circle_indicator_page_color">#00000000</color>
+    <color name="default_circle_indicator_fill_color">@color/fiori_primary_color</color>
+    <color name="default_circle_indicator_page_color">#999999</color>
     <integer name="default_circle_indicator_orientation">0</integer>
     <dimen name="default_circle_indicator_radius">3dp</dimen>
     <bool name="default_circle_indicator_snap">false</bool>
     <color name="default_circle_indicator_stroke_color">#FFDDDDDD</color>
-    <dimen name="default_circle_indicator_stroke_width">1dp</dimen>
+    <dimen name="default_circle_indicator_stroke_width">0dp</dimen>
 
     <dimen name="default_line_indicator_line_width">12dp</dimen>
     <dimen name="default_line_indicator_gap_width">4dp</dimen>
     <dimen name="default_line_indicator_stroke_width">1dp</dimen>
-    <color name="default_line_indicator_selected_color">#FF33B5E5</color>
+    <color name="default_line_indicator_selected_color">@color/fiori_primary_color</color>
     <color name="default_line_indicator_unselected_color">#FFBBBBBB</color>
     <bool name="default_line_indicator_centered">true</bool>
 

From 550c572d72c1c330e1fef29789a87936626569b3 Mon Sep 17 00:00:00 2001
From: Bennet Brunsen <brunsen@ubilabs.net>
Date: Thu, 28 Apr 2016 11:30:04 +0200
Subject: [PATCH 27/92] Adjust text color to match fiori color scheme

---
 .../res/layout/fragment_compass.xml           |  1 +
 .../res/layout/fragment_home.xml              |  4 +--
 .../res/layout/fragment_regatta.xml           | 34 +++++++++----------
 .../res/layout/fragment_speed.xml             |  1 +
 .../res/layout/fragment_time.xml              |  2 ++
 .../res/layout/fragment_tracking.xml          |  6 ++++
 .../res/layout/ragatta_listview_row.xml       |  2 +-
 .../res/layout/regatta_listview_header.xml    |  2 +-
 .../res/values/colors.xml                     |  1 +
 9 files changed, 32 insertions(+), 21 deletions(-)

diff --git a/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_compass.xml b/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_compass.xml
index d9d5fafcab8..53b45abff14 100644
--- a/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_compass.xml
+++ b/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_compass.xml
@@ -12,6 +12,7 @@
         android:paddingRight="10dp"
         android:paddingTop="15dp"
         android:text="@string/course_over_ground"
+        android:textColor="@color/fiori_text_color"
         android:textSize="@dimen/default_text_size"
         />
 
diff --git a/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_home.xml b/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_home.xml
index f5bf2f5886e..414842d7b22 100644
--- a/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_home.xml
+++ b/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_home.xml
@@ -29,7 +29,7 @@
             android:gravity="center"
             android:text="@string/scan_hint"
             android:textSize="@dimen/default_text_size"
-            android:textColor="@color/black"/>
+            android:textColor="@color/fiori_text_color"/>
     </RelativeLayout>
 
     <Button
@@ -56,7 +56,7 @@
         android:paddingLeft="@dimen/activity_horizontal_margin"
         android:paddingRight="@dimen/activity_horizontal_margin"
         android:text="@string/no_qr_code"
-        android:textColor="@color/black"
+        android:textColor="@color/fiori_text_color"
         android:textSize="@dimen/default_text_size"/>
 
     <ListView
diff --git a/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_regatta.xml b/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_regatta.xml
index 0ee0cfe01a7..47f1b7bfd19 100644
--- a/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_regatta.xml
+++ b/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_regatta.xml
@@ -47,7 +47,7 @@
                 android:paddingLeft="@dimen/activity_horizontal_margin"
                 android:paddingRight="@dimen/activity_horizontal_margin"
                 android:text="@string/add_team_photo"
-                android:textColor="@color/black"/>
+                android:textColor="@color/fiori_text_color"/>
         </LinearLayout>
 
         <LinearLayout
@@ -77,7 +77,7 @@
                 android:paddingLeft="@dimen/activity_horizontal_margin"
                 android:paddingRight="@dimen/activity_horizontal_margin"
                 android:text="@string/upload_in_progress"
-                android:textColor="@color/black"
+                android:textColor="@color/fiori_text_color"
                 android:textSize="@dimen/default_text_size"/>
         </LinearLayout>
 
@@ -106,7 +106,7 @@
                 android:paddingRight="8dp"
                 android:paddingTop="8dp"
                 android:text="@string/upload_retry"
-                android:textColor="@color/black"
+                android:textColor="@color/fiori_text_color"
                 android:textSize="@dimen/default_text_size"/>
         </LinearLayout>
 
@@ -132,7 +132,7 @@
                 android:paddingLeft="@dimen/activity_horizontal_margin"
                 android:paddingRight="@dimen/activity_horizontal_margin"
                 android:text="@string/empty"
-                android:textColor="@color/black"
+                android:textColor="@color/fiori_text_color"
                 android:textSize="@dimen/default_text_size"/>
 
             <RelativeLayout
@@ -153,7 +153,7 @@
                     android:adjustViewBounds="true"
                     android:contentDescription="@string/content_description_flag_icon"
                     android:scaleType="fitXY"
-                    android:textColor="@color/black"/>
+                    android:textColor="@color/fiori_text_color"/>
             </RelativeLayout>
 
             <TextView
@@ -163,7 +163,7 @@
                 android:gravity="end|center_vertical"
                 android:padding="0dp"
                 android:text="@string/empty"
-                android:textColor="@color/black"
+                android:textColor="@color/fiori_text_color"
                 android:textSize="@dimen/default_text_size"/>
         </LinearLayout>
 
@@ -232,7 +232,7 @@
                     android:gravity="start"
                     android:padding="0dp"
                     android:text="@string/thank_you_you_successfully_participated"
-                    android:textColor="@color/black"
+                    android:textColor="@color/fiori_text_color"
                     android:textStyle="bold"/>
             </RelativeLayout>
 
@@ -253,7 +253,7 @@
                     android:paddingRight="10dp"
                     android:paddingTop="10dp"
                     android:text="@string/regatta_starts_in"
-                    android:textColor="@color/black"
+                    android:textColor="@color/fiori_text_color"
                     android:textSize="@dimen/default_text_size"
                     android:textStyle="bold"/>
 
@@ -284,7 +284,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:padding="0dp"
-                            android:textColor="@color/black"
+                            android:textColor="@color/fiori_text_color"
                             android:textSize="@dimen/highlight_text_size"/>
 
                         <TextView
@@ -294,7 +294,7 @@
                             android:padding="0dp"
                             android:singleLine="true"
                             android:text="@string/days"
-                            android:textColor="@color/black"
+                            android:textColor="@color/fiori_text_color"
                             android:textSize="@dimen/default_text_size"/>
 
                     </LinearLayout>
@@ -322,7 +322,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:padding="0dp"
-                            android:textColor="@color/black"
+                            android:textColor="@color/fiori_text_color"
                             android:textSize="@dimen/highlight_text_size"/>
 
                         <TextView
@@ -332,7 +332,7 @@
                             android:padding="0dp"
                             android:singleLine="true"
                             android:text="@string/hours"
-                            android:textColor="@color/black"
+                            android:textColor="@color/fiori_text_color"
                             android:textSize="@dimen/default_text_size"/>
                     </LinearLayout>
 
@@ -359,7 +359,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:padding="0dp"
-                            android:textColor="@color/black"
+                            android:textColor="@color/fiori_text_color"
                             android:textSize="@dimen/highlight_text_size"/>
 
                         <TextView
@@ -369,7 +369,7 @@
                             android:padding="0dp"
                             android:singleLine="true"
                             android:text="@string/minutes"
-                            android:textColor="@color/black"
+                            android:textColor="@color/fiori_text_color"
                             android:textSize="@dimen/default_text_size"/>
                     </LinearLayout>
                 </LinearLayout>
@@ -400,7 +400,7 @@
                 android:background="@drawable/normal_button"
                 android:padding="@dimen/regatta_button_padding"
                 android:text="@string/show_event"
-                android:textColor="@color/black"
+                android:textColor="@color/fiori_text_color"
                 android:textSize="@dimen/button_text_size"
                 tools:text="Show Event"/>
 
@@ -415,7 +415,7 @@
                 android:background="@drawable/normal_button"
                 android:padding="@dimen/regatta_button_padding"
                 android:text="@string/show_leaderboard"
-                android:textColor="@color/black"
+                android:textColor="@color/fiori_text_color"
                 android:textSize="@dimen/button_text_size"/>
 
         </LinearLayout>
@@ -450,7 +450,7 @@
         android:layout_marginBottom="20dp"
         android:layout_marginTop="20dp"
         android:text="@string/please_listen_to_announcements"
-        android:textColor="@color/black"
+        android:textColor="@color/fiori_text_color"
         android:textSize="@dimen/default_text_size"/>
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_speed.xml b/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_speed.xml
index 30f3d8a4201..f948570ed0c 100644
--- a/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_speed.xml
+++ b/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_speed.xml
@@ -12,6 +12,7 @@
         android:paddingRight="10dp"
         android:paddingTop="15dp"
         android:text="@string/speed_over_ground"
+        android:textColor="@color/fiori_text_color"
         android:textSize="@dimen/default_text_size"/>
 
     <RelativeLayout
diff --git a/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_time.xml b/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_time.xml
index b60e99fe369..3bfe61df228 100644
--- a/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_time.xml
+++ b/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_time.xml
@@ -14,6 +14,7 @@
         android:paddingLeft="10dp"
         android:paddingRight="10dp"
         android:text="@string/tracking_time"
+        android:textColor="@color/fiori_text_color"
         android:textSize="@dimen/default_text_size"/>
 
     <TextView
@@ -26,6 +27,7 @@
         android:paddingLeft="10dp"
         android:paddingRight="10dp"
         android:text="@string/waiting_for_gps"
+        android:textColor="@color/fiori_text_color"
         android:textSize="@dimen/default_text_size"/>
 
     <com.sap.sailing.android.shared.ui.customviews.AutoResizeLightTextView
diff --git a/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_tracking.xml b/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_tracking.xml
index 4f1ab4ce617..5c71ae31412 100644
--- a/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_tracking.xml
+++ b/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_tracking.xml
@@ -26,6 +26,7 @@
             android:paddingLeft="10dp"
             android:paddingRight="10dp"
             android:text="@string/tracking_mode"
+            android:textColor="@color/fiori_text_color"
             android:textSize="@dimen/default_text_size"/>
 
         <TextView
@@ -51,6 +52,7 @@
             android:paddingLeft="10dp"
             android:paddingRight="10dp"
             android:text="@string/tracking_unsent_fixes"
+            android:textColor="@color/fiori_text_color"
             android:textSize="@dimen/default_text_size"/>
 
         <TextView
@@ -64,6 +66,7 @@
             android:paddingLeft="10dp"
             android:paddingRight="10dp"
             android:text="@string/none"
+            android:textColor="@color/fiori_text_color"
             android:textSize="@dimen/default_text_size"/>
 
         <TextView
@@ -75,6 +78,7 @@
             android:paddingLeft="10dp"
             android:paddingRight="10dp"
             android:text="@string/tracking_status"
+            android:textColor="@color/fiori_text_color"
             android:textSize="@dimen/default_text_size"/>
 
         <TextView
@@ -107,6 +111,7 @@
                 android:paddingLeft="9dp"
                 android:paddingRight="9dp"
                 android:text=""
+                android:textColor="@color/fiori_text_color"
                 android:textSize="@dimen/default_text_size"/>
 
             <com.sap.sailing.android.shared.ui.customviews.SignalQualityIndicatorView
@@ -129,6 +134,7 @@
             android:paddingLeft="10dp"
             android:paddingRight="10dp"
             android:text="@string/tracking_gps_accuracy"
+            android:textColor="@color/fiori_text_color"
             android:textSize="@dimen/default_text_size"/>
 
         <!-- Separators -->
diff --git a/mobile/com.sap.sailing.android.tracking.app/res/layout/ragatta_listview_row.xml b/mobile/com.sap.sailing.android.tracking.app/res/layout/ragatta_listview_row.xml
index 851ef2c0179..56c19ac7cb6 100644
--- a/mobile/com.sap.sailing.android.tracking.app/res/layout/ragatta_listview_row.xml
+++ b/mobile/com.sap.sailing.android.tracking.app/res/layout/ragatta_listview_row.xml
@@ -31,6 +31,6 @@
         android:paddingLeft="15dp"
         android:paddingRight="15dp"
         android:singleLine="true"
-        android:textColor="@color/black" />
+        android:textColor="@color/fiori_text_color" />
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/mobile/com.sap.sailing.android.tracking.app/res/layout/regatta_listview_header.xml b/mobile/com.sap.sailing.android.tracking.app/res/layout/regatta_listview_header.xml
index c8147acbd01..600123adda8 100644
--- a/mobile/com.sap.sailing.android.tracking.app/res/layout/regatta_listview_header.xml
+++ b/mobile/com.sap.sailing.android.tracking.app/res/layout/regatta_listview_header.xml
@@ -11,7 +11,7 @@
         android:layout_height="wrap_content"
         android:padding="14dp"
         android:textSize="18sp"
-        android:textColor="@color/black"
+        android:textColor="@color/fiori_text_color"
         android:text="@string/your_regattas" />
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/mobile/com.sap.sailing.android.tracking.app/res/values/colors.xml b/mobile/com.sap.sailing.android.tracking.app/res/values/colors.xml
index 8c12467d9da..382a5d10c19 100644
--- a/mobile/com.sap.sailing.android.tracking.app/res/values/colors.xml
+++ b/mobile/com.sap.sailing.android.tracking.app/res/values/colors.xml
@@ -19,6 +19,7 @@
     <color name="toolbar_background">@color/white</color>
 
     <color name="fiori_primary_color">#009de0</color>
+    <color name="fiori_text_color">#323232</color>
 
     <color name="start_tracking_button_normal">#0e7733</color>
     <color name="start_tracking_button_pressed">#08451e</color>

From 8d4de3c1a358021e7f6c19dc917d5f168be087a8 Mon Sep 17 00:00:00 2001
From: Bennet Brunsen <brunsen@ubilabs.net>
Date: Thu, 28 Apr 2016 12:34:43 +0200
Subject: [PATCH 28/92] Remove bold text style from stop tracking button

---
 .../res/layout/activity_tracking.xml                           | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/mobile/com.sap.sailing.android.tracking.app/res/layout/activity_tracking.xml b/mobile/com.sap.sailing.android.tracking.app/res/layout/activity_tracking.xml
index be622126350..ee2f82adc9f 100644
--- a/mobile/com.sap.sailing.android.tracking.app/res/layout/activity_tracking.xml
+++ b/mobile/com.sap.sailing.android.tracking.app/res/layout/activity_tracking.xml
@@ -77,8 +77,7 @@
         android:background="@drawable/stop_tracking_button"
         android:padding="0dp"
         android:text="@string/stop_tracking"
-        android:textSize="@dimen/highlight_text_size"
-        android:textStyle="bold"/>
+        android:textSize="@dimen/highlight_text_size"/>
 
     <com.viewpagerindicator.CirclePageIndicator
         android:id="@+id/title_page_indicator"

From e90f3615c7ec03991fdfba7c70ee2a1fa66a1137 Mon Sep 17 00:00:00 2001
From: Bennet Brunsen <brunsen@ubilabs.net>
Date: Thu, 28 Apr 2016 14:52:06 +0200
Subject: [PATCH 29/92] Applied branding in launch screen

---
 .../res/drawable-hdpi/launch_screen_text.png     | Bin 0 -> 2705 bytes
 .../res/drawable-mdpi/launch_screen_text.png     | Bin 0 -> 1888 bytes
 .../res/drawable-xhdpi/launch_screen_text.png    | Bin 0 -> 3641 bytes
 .../res/drawable-xxhdpi/launch_screen_text.png   | Bin 0 -> 5534 bytes
 .../res/drawable-xxxhdpi/launch_screen_text.png  | Bin 0 -> 7392 bytes
 .../res/drawable/launch_screen.xml               |   8 +++++++-
 6 files changed, 7 insertions(+), 1 deletion(-)
 create mode 100755 mobile/com.sap.sailing.android.tracking.app/res/drawable-hdpi/launch_screen_text.png
 create mode 100755 mobile/com.sap.sailing.android.tracking.app/res/drawable-mdpi/launch_screen_text.png
 create mode 100755 mobile/com.sap.sailing.android.tracking.app/res/drawable-xhdpi/launch_screen_text.png
 create mode 100755 mobile/com.sap.sailing.android.tracking.app/res/drawable-xxhdpi/launch_screen_text.png
 create mode 100755 mobile/com.sap.sailing.android.tracking.app/res/drawable-xxxhdpi/launch_screen_text.png

diff --git a/mobile/com.sap.sailing.android.tracking.app/res/drawable-hdpi/launch_screen_text.png b/mobile/com.sap.sailing.android.tracking.app/res/drawable-hdpi/launch_screen_text.png
new file mode 100755
index 0000000000000000000000000000000000000000..410fe9c48a996c1ba8f6f3a3133361e27acb97cc
GIT binary patch
literal 2705
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

literal 0
HcmV?d00001

diff --git a/mobile/com.sap.sailing.android.tracking.app/res/drawable-mdpi/launch_screen_text.png b/mobile/com.sap.sailing.android.tracking.app/res/drawable-mdpi/launch_screen_text.png
new file mode 100755
index 0000000000000000000000000000000000000000..40e234dd2a67196611f2c103fb8b4065bda7c70c
GIT binary patch
literal 1888
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
Yn5vSD<*}NDhsgvu*jzz2So<ga7x9sj9RL6T

literal 0
HcmV?d00001

diff --git a/mobile/com.sap.sailing.android.tracking.app/res/drawable-xhdpi/launch_screen_text.png b/mobile/com.sap.sailing.android.tracking.app/res/drawable-xhdpi/launch_screen_text.png
new file mode 100755
index 0000000000000000000000000000000000000000..43dc0e278019da5d3cd92157729608011272c35b
GIT binary patch
literal 3641
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
K`enM#G5-Psi0u#n

literal 0
HcmV?d00001

diff --git a/mobile/com.sap.sailing.android.tracking.app/res/drawable-xxhdpi/launch_screen_text.png b/mobile/com.sap.sailing.android.tracking.app/res/drawable-xxhdpi/launch_screen_text.png
new file mode 100755
index 0000000000000000000000000000000000000000..f8369232f76fd4f3ed885f887e54ac30461d3d84
GIT binary patch
literal 5534
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
Om_l@nwXu(!U;htTDNcO=

literal 0
HcmV?d00001

diff --git a/mobile/com.sap.sailing.android.tracking.app/res/drawable-xxxhdpi/launch_screen_text.png b/mobile/com.sap.sailing.android.tracking.app/res/drawable-xxxhdpi/launch_screen_text.png
new file mode 100755
index 0000000000000000000000000000000000000000..76c31d877744d196c98fe919ba97040e40be2696
GIT binary patch
literal 7392
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
VGSp{Ewg1roYUw|(d}jOc{{UHYpj`j}

literal 0
HcmV?d00001

diff --git a/mobile/com.sap.sailing.android.tracking.app/res/drawable/launch_screen.xml b/mobile/com.sap.sailing.android.tracking.app/res/drawable/launch_screen.xml
index 70ee46ce8e5..7c25e22c1dc 100644
--- a/mobile/com.sap.sailing.android.tracking.app/res/drawable/launch_screen.xml
+++ b/mobile/com.sap.sailing.android.tracking.app/res/drawable/launch_screen.xml
@@ -3,10 +3,16 @@
     <item
         android:drawable="@drawable/main_background"/>
 
-    <item>
+    <item android:bottom="60dp">
         <bitmap
             android:gravity="center"
             android:src="@drawable/launch_screen_icon"/>
     </item>
 
+    <item android:top="80dp">
+        <bitmap
+            android:src="@drawable/launch_screen_text"
+            android:gravity="center|clip_horizontal|clip_vertical"/>
+    </item>
+
 </layer-list>
\ No newline at end of file

From 742ce724d589ced9ac16e0116f5e431fb28cad2d Mon Sep 17 00:00:00 2001
From: Bennet Brunsen <brunsen@ubilabs.net>
Date: Thu, 28 Apr 2016 15:52:26 +0200
Subject: [PATCH 30/92] Adjust margins in regatta fragment layout

---
 .../res/layout/fragment_regatta.xml           | 23 +++++++++++++------
 .../app/ui/fragments/RegattaFragment.java     | 14 -----------
 2 files changed, 16 insertions(+), 21 deletions(-)

diff --git a/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_regatta.xml b/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_regatta.xml
index 47f1b7bfd19..10e21506318 100644
--- a/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_regatta.xml
+++ b/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_regatta.xml
@@ -81,12 +81,19 @@
                 android:textSize="@dimen/default_text_size"/>
         </LinearLayout>
 
+        <View
+            android:id="@+id/image_bottom"
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            android:layout_alignParentBottom="true"/>
+
         <LinearLayout
             android:id="@+id/retry_upload"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_centerHorizontal="true"
-            android:layout_centerVertical="true"
+            android:layout_above="@id/image_bottom"
+            android:layout_marginBottom="107dp"
             android:background="@color/white_less_transparent"
             android:clickable="true"
             android:onClick="retryUpload"
@@ -121,18 +128,19 @@
             android:baselineAligned="false"
             android:measureWithLargestChild="false"
             android:orientation="horizontal"
-            android:padding="10dp">
+            android:paddingTop="10dp"
+            android:paddingBottom="10dp">
 
             <TextView
                 android:id="@+id/competitor_name"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
-                android:gravity="start|center_vertical"
-                android:paddingLeft="@dimen/activity_horizontal_margin"
-                android:paddingRight="@dimen/activity_horizontal_margin"
+                android:gravity="start"
+                android:layout_marginLeft="@dimen/regatta_button_side_margin"
                 android:text="@string/empty"
                 android:textColor="@color/fiori_text_color"
+                android:textStyle="bold"
                 android:textSize="@dimen/default_text_size"/>
 
             <RelativeLayout
@@ -163,7 +171,9 @@
                 android:gravity="end|center_vertical"
                 android:padding="0dp"
                 android:text="@string/empty"
+                android:layout_marginRight="@dimen/regatta_button_side_margin"
                 android:textColor="@color/fiori_text_color"
+                android:textStyle="bold"
                 android:textSize="@dimen/default_text_size"/>
         </LinearLayout>
 
@@ -254,8 +264,7 @@
                     android:paddingTop="10dp"
                     android:text="@string/regatta_starts_in"
                     android:textColor="@color/fiori_text_color"
-                    android:textSize="@dimen/default_text_size"
-                    android:textStyle="bold"/>
+                    android:textSize="@dimen/default_text_size"/>
 
                 <LinearLayout
                     android:id="@+id/three_boxes_regatta_starts"
diff --git a/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/fragments/RegattaFragment.java b/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/fragments/RegattaFragment.java
index 1e9f4c7e442..d030f1cf152 100755
--- a/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/fragments/RegattaFragment.java
+++ b/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/fragments/RegattaFragment.java
@@ -11,7 +11,6 @@ import android.app.Activity;
 import android.app.AlertDialog;
 import android.content.DialogInterface;
 import android.content.Intent;
-import android.content.res.Configuration;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.net.Uri;
@@ -77,8 +76,6 @@ public class RegattaFragment extends BaseFragment implements OnClickListener {
         TextView addPhotoText = (TextView) view.findViewById(R.id.add_photo_text);
         addPhotoText.setOnClickListener(this);
 
-        setLeaderboardImageHeight(view);
-
         return view;
     }
 
@@ -93,17 +90,6 @@ public class RegattaFragment extends BaseFragment implements OnClickListener {
         }
     }
 
-    private void setLeaderboardImageHeight(View view){
-        if (getResources().getConfiguration().orientation == Configuration.ORIENTATION_PORTRAIT) {
-            RelativeLayout imageLayout = (RelativeLayout) view.findViewById(R.id.image);
-            ViewGroup.LayoutParams layoutParams = imageLayout.getLayoutParams();
-            int displayHeight = getResources().getDisplayMetrics().heightPixels;
-            // calculate 1/3 of display height
-            layoutParams.height = displayHeight / 3;
-            imageLayout.setLayoutParams(layoutParams);
-        }
-    }
-
     /**
      * If the regatta started, don't display the countdown any more.
      */

From 0f7891370f2451c1ebe312eead836525105a30de Mon Sep 17 00:00:00 2001
From: Bennet Brunsen <brunsen@ubilabs.net>
Date: Thu, 28 Apr 2016 16:05:17 +0200
Subject: [PATCH 31/92] Adjust margin of accuracy signal indicator

---
 .../res/layout/fragment_tracking.xml                           | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_tracking.xml b/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_tracking.xml
index 5c71ae31412..15c5f7765f6 100644
--- a/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_tracking.xml
+++ b/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_tracking.xml
@@ -120,8 +120,7 @@
                 android:layout_height="wrap_content"
                 android:contentDescription="@string/signal_accuracy_indicator_view_description"
                 android:focusable="true"
-                android:paddingLeft="10dp"
-                android:paddingRight="10dp"
+                android:layout_marginRight="10dp"
                 app:signalQuality="none"/>
         </LinearLayout>
 

From b17daf077368c9d10b61144fd6ac661ee9a56dbc Mon Sep 17 00:00:00 2001
From: Bennet Brunsen <brunsen@ubilabs.net>
Date: Thu, 28 Apr 2016 16:48:04 +0200
Subject: [PATCH 32/92] Reordered tracking fragment status information

---
 .../res/layout/fragment_tracking.xml          | 20 ++++++++-----------
 1 file changed, 8 insertions(+), 12 deletions(-)

diff --git a/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_tracking.xml b/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_tracking.xml
index 15c5f7765f6..1a995726400 100644
--- a/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_tracking.xml
+++ b/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_tracking.xml
@@ -21,7 +21,7 @@
             android:layout_height="50dp"
             android:layout_alignParentLeft="true"
             android:layout_alignParentStart="true"
-            android:layout_below="@+id/gps_quality"
+            android:layout_below="@+id/tracking_status_label"
             android:gravity="center_vertical"
             android:paddingLeft="10dp"
             android:paddingRight="10dp"
@@ -73,8 +73,8 @@
             android:id="@+id/tracking_status_label"
             android:layout_width="wrap_content"
             android:layout_height="50dp"
-            android:layout_below="@+id/tracking_unsent_fixes_label"
             android:gravity="center_vertical"
+            android:layout_alignParentTop="true"
             android:paddingLeft="10dp"
             android:paddingRight="10dp"
             android:text="@string/tracking_status"
@@ -99,6 +99,7 @@
             android:id="@+id/gps_quality_info_layout"
             android:layout_width="wrap_content"
             android:layout_height="50dp"
+            android:layout_alignBottom="@+id/gps_quality"
             android:layout_alignParentEnd="true"
             android:layout_alignParentRight="true"
             android:gravity="center_vertical"
@@ -128,7 +129,7 @@
             android:id="@+id/gps_quality"
             android:layout_width="wrap_content"
             android:layout_height="50dp"
-            android:layout_alignParentTop="true"
+            android:layout_below="@+id/tracking_unsent_fixes_label"
             android:gravity="center_vertical"
             android:paddingLeft="10dp"
             android:paddingRight="10dp"
@@ -139,33 +140,28 @@
         <!-- Separators -->
 
         <View
-            android:layout_width="fill_parent"
+            android:layout_width="match_parent"
             android:layout_height="1dp"
             android:layout_below="@id/mode_label"
             android:background="@android:color/darker_gray"/>
 
         <View
-            android:layout_width="fill_parent"
+            android:layout_width="match_parent"
             android:layout_height="1dp"
             android:layout_below="@id/tracking_status_label"
             android:background="@android:color/darker_gray"/>
 
         <View
-            android:layout_width="fill_parent"
+            android:layout_width="match_parent"
             android:layout_height="1dp"
             android:layout_below="@id/tracking_unsent_fixes_label"
             android:background="@android:color/darker_gray"/>
 
         <View
-            android:layout_width="fill_parent"
+            android:layout_width="match_parent"
             android:layout_height="1dp"
             android:layout_below="@id/gps_quality"
             android:background="@android:color/darker_gray"/>
 
-        <View
-            android:layout_width="fill_parent"
-            android:layout_height="1dp"
-            android:layout_below="@id/tracking_status_label"
-            android:background="@android:color/darker_gray"/>
     </RelativeLayout>
 </ScrollView>
\ No newline at end of file

From f4dd87f1aa3b49087fbbbb23e403d3d66877f69f Mon Sep 17 00:00:00 2001
From: Bennet Brunsen <brunsen@ubilabs.net>
Date: Thu, 28 Apr 2016 16:50:23 +0200
Subject: [PATCH 33/92] Adjusted text color for more contrast

---
 .../com.sap.sailing.android.tracking.app/res/values/colors.xml  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mobile/com.sap.sailing.android.tracking.app/res/values/colors.xml b/mobile/com.sap.sailing.android.tracking.app/res/values/colors.xml
index 382a5d10c19..53a6fc0ae64 100644
--- a/mobile/com.sap.sailing.android.tracking.app/res/values/colors.xml
+++ b/mobile/com.sap.sailing.android.tracking.app/res/values/colors.xml
@@ -19,7 +19,7 @@
     <color name="toolbar_background">@color/white</color>
 
     <color name="fiori_primary_color">#009de0</color>
-    <color name="fiori_text_color">#323232</color>
+    <color name="fiori_text_color">@color/black</color>
 
     <color name="start_tracking_button_normal">#0e7733</color>
     <color name="start_tracking_button_pressed">#08451e</color>

From b8c6f59c80d860805b2259875ccd4612c5a39e59 Mon Sep 17 00:00:00 2001
From: Bennet Brunsen <brunsen@ubilabs.net>
Date: Fri, 29 Apr 2016 11:32:39 +0200
Subject: [PATCH 34/92] Adjust side margins in tracking fragment

---
 .../res/layout-land/fragment_regatta.xml      | 12 +++++------
 .../res/layout/activity_tracking.xml          |  8 ++++----
 .../res/layout/fragment_compass.xml           |  4 +++-
 .../res/layout/fragment_regatta.xml           | 14 ++++++-------
 .../res/layout/fragment_speed.xml             |  4 +++-
 .../res/layout/fragment_time.xml              |  6 +++---
 .../res/layout/fragment_tracking.xml          | 20 +++++++++----------
 .../res/values/dimens.xml                     |  2 +-
 .../res/values/dimens_fragment.xml            |  9 ---------
 9 files changed, 37 insertions(+), 42 deletions(-)
 delete mode 100644 mobile/com.sap.sailing.android.tracking.app/res/values/dimens_fragment.xml

diff --git a/mobile/com.sap.sailing.android.tracking.app/res/layout-land/fragment_regatta.xml b/mobile/com.sap.sailing.android.tracking.app/res/layout-land/fragment_regatta.xml
index 1a524cd6952..50e25da203f 100644
--- a/mobile/com.sap.sailing.android.tracking.app/res/layout-land/fragment_regatta.xml
+++ b/mobile/com.sap.sailing.android.tracking.app/res/layout-land/fragment_regatta.xml
@@ -381,8 +381,8 @@
                         android:layout_width="match_parent"
                         android:layout_height="match_parent"
                         android:layout_margin="@dimen/regatta_button_margin"
-                        android:layout_marginLeft="@dimen/regatta_button_side_margin"
-                        android:layout_marginRight="@dimen/regatta_button_side_margin"
+                        android:layout_marginLeft="@dimen/fragment_side_margin"
+                        android:layout_marginRight="@dimen/fragment_side_margin"
                         android:padding="@dimen/regatta_button_padding"
                         android:text="@string/show_event"
                         android:background="@drawable/rounded_btn_blue"
@@ -429,8 +429,8 @@
                 android:layout_width="fill_parent"
                 android:layout_height="fill_parent"
                 android:layout_margin="@dimen/regatta_button_margin"
-                android:layout_marginLeft="@dimen/regatta_button_side_margin"
-                android:layout_marginRight="@dimen/regatta_button_side_margin"
+                android:layout_marginLeft="@dimen/fragment_side_margin"
+                android:layout_marginRight="@dimen/fragment_side_margin"
                 android:layout_weight="0.50"
                 android:background="@drawable/rounded_btn_yellow"
                 android:padding="@dimen/regatta_button_padding"
@@ -443,8 +443,8 @@
                 android:layout_width="fill_parent"
                 android:layout_height="fill_parent"
                 android:layout_margin="@dimen/regatta_button_margin"
-                android:layout_marginLeft="@dimen/regatta_button_side_margin"
-                android:layout_marginRight="@dimen/regatta_button_side_margin"
+                android:layout_marginLeft="@dimen/fragment_side_margin"
+                android:layout_marginRight="@dimen/fragment_side_margin"
                 android:layout_weight="0.50"
                 android:background="@drawable/normal_btn_green"
                 android:padding="@dimen/regatta_button_padding"
diff --git a/mobile/com.sap.sailing.android.tracking.app/res/layout/activity_tracking.xml b/mobile/com.sap.sailing.android.tracking.app/res/layout/activity_tracking.xml
index ee2f82adc9f..6d91c21c9e1 100644
--- a/mobile/com.sap.sailing.android.tracking.app/res/layout/activity_tracking.xml
+++ b/mobile/com.sap.sailing.android.tracking.app/res/layout/activity_tracking.xml
@@ -68,11 +68,11 @@
     <Button
         android:id="@+id/stop_tracking"
         android:layout_width="match_parent"
-        android:layout_height="100dp"
+        android:layout_height="@dimen/tracking_button_height"
         android:layout_above="@+id/title_page_indicator"
         android:layout_marginBottom="10dp"
-        android:layout_marginLeft="10dp"
-        android:layout_marginRight="10dp"
+        android:layout_marginLeft="@dimen/fragment_side_margin"
+        android:layout_marginRight="@dimen/fragment_side_margin"
         android:layout_marginTop="0dp"
         android:background="@drawable/stop_tracking_button"
         android:padding="0dp"
@@ -81,7 +81,7 @@
 
     <com.viewpagerindicator.CirclePageIndicator
         android:id="@+id/title_page_indicator"
-        android:layout_width="fill_parent"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_alignParentBottom="true"
         android:layout_marginBottom="20dp"
diff --git a/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_compass.xml b/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_compass.xml
index 53b45abff14..8dbef24653a 100644
--- a/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_compass.xml
+++ b/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_compass.xml
@@ -8,7 +8,7 @@
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
         android:layout_alignParentTop="true"
-        android:paddingLeft="10dp"
+        android:paddingLeft="@dimen/fragment_side_margin"
         android:paddingRight="10dp"
         android:paddingTop="15dp"
         android:text="@string/course_over_ground"
@@ -22,6 +22,8 @@
         android:layout_height="fill_parent"
         android:layout_centerInParent="true"
         android:gravity="center"
+        android:paddingLeft="@dimen/fragment_side_margin"
+        android:paddingRight="@dimen/fragment_side_margin"
         android:text="@string/initial_hyphen_degrees"
         android:textSize="124sp"/>
 
diff --git a/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_regatta.xml b/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_regatta.xml
index 10e21506318..1b5440b6930 100644
--- a/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_regatta.xml
+++ b/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_regatta.xml
@@ -137,7 +137,7 @@
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
                 android:gravity="start"
-                android:layout_marginLeft="@dimen/regatta_button_side_margin"
+                android:layout_marginLeft="@dimen/fragment_side_margin"
                 android:text="@string/empty"
                 android:textColor="@color/fiori_text_color"
                 android:textStyle="bold"
@@ -171,7 +171,7 @@
                 android:gravity="end|center_vertical"
                 android:padding="0dp"
                 android:text="@string/empty"
-                android:layout_marginRight="@dimen/regatta_button_side_margin"
+                android:layout_marginRight="@dimen/fragment_side_margin"
                 android:textColor="@color/fiori_text_color"
                 android:textStyle="bold"
                 android:textSize="@dimen/default_text_size"/>
@@ -404,7 +404,7 @@
                 android:layout_width="0dp"
                 android:layout_height="match_parent"
                 android:layout_marginBottom="@dimen/regatta_button_margin"
-                android:layout_marginLeft="@dimen/regatta_button_side_margin"
+                android:layout_marginLeft="@dimen/fragment_side_margin"
                 android:layout_weight="1"
                 android:background="@drawable/normal_button"
                 android:padding="@dimen/regatta_button_padding"
@@ -418,8 +418,8 @@
                 android:layout_width="0dp"
                 android:layout_height="match_parent"
                 android:layout_marginBottom="@dimen/regatta_button_margin"
-                android:layout_marginLeft="@dimen/regatta_button_side_margin"
-                android:layout_marginRight="@dimen/regatta_button_side_margin"
+                android:layout_marginLeft="@dimen/fragment_side_margin"
+                android:layout_marginRight="@dimen/fragment_side_margin"
                 android:layout_weight="1"
                 android:background="@drawable/normal_button"
                 android:padding="@dimen/regatta_button_padding"
@@ -438,8 +438,8 @@
                 android:id="@+id/start_tracking"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:layout_marginLeft="@dimen/regatta_button_side_margin"
-                android:layout_marginRight="@dimen/regatta_button_side_margin"
+                android:layout_marginLeft="@dimen/fragment_side_margin"
+                android:layout_marginRight="@dimen/fragment_side_margin"
                 android:layout_marginTop="@dimen/regatta_button_margin"
                 android:background="@drawable/start_tracking_button"
                 android:padding="@dimen/regatta_button_padding"
diff --git a/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_speed.xml b/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_speed.xml
index f948570ed0c..9b4fafe7e15 100644
--- a/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_speed.xml
+++ b/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_speed.xml
@@ -8,7 +8,7 @@
         android:id="@+id/speed_header_text_view"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
-        android:paddingLeft="10dp"
+        android:paddingLeft="@dimen/fragment_side_margin"
         android:paddingRight="10dp"
         android:paddingTop="15dp"
         android:text="@string/speed_over_ground"
@@ -27,6 +27,8 @@
             android:layout_height="wrap_content"
             android:layout_centerInParent="true"
             android:gravity="center"
+            android:paddingLeft="@dimen/fragment_side_margin"
+            android:paddingRight="@dimen/fragment_side_margin"
             android:singleLine="true"
             android:textSize="124sp"
             android:textStyle="bold"
diff --git a/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_time.xml b/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_time.xml
index 3bfe61df228..b32edfc5319 100644
--- a/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_time.xml
+++ b/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_time.xml
@@ -11,7 +11,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignParentTop="true"
-        android:paddingLeft="10dp"
+        android:paddingLeft="@dimen/fragment_side_margin"
         android:paddingRight="10dp"
         android:text="@string/tracking_time"
         android:textColor="@color/fiori_text_color"
@@ -37,8 +37,8 @@
         android:layout_marginBottom="0dp"
         android:gravity="center"
         android:paddingBottom="0dp"
-        android:paddingLeft="10dp"
-        android:paddingRight="10dp"
+        android:paddingLeft="@dimen/fragment_side_margin"
+        android:paddingRight="@dimen/fragment_side_margin"
         android:text="@string/initial_timer_text_zerozero"
         android:textSize="100sp"
         tools:ignore="InconsistentLayout"/>
diff --git a/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_tracking.xml b/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_tracking.xml
index 1a995726400..0a1809ca9e5 100644
--- a/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_tracking.xml
+++ b/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_tracking.xml
@@ -23,7 +23,7 @@
             android:layout_alignParentStart="true"
             android:layout_below="@+id/tracking_status_label"
             android:gravity="center_vertical"
-            android:paddingLeft="10dp"
+            android:paddingLeft="@dimen/fragment_side_margin"
             android:paddingRight="10dp"
             android:text="@string/tracking_mode"
             android:textColor="@color/fiori_text_color"
@@ -38,7 +38,7 @@
             android:layout_alignParentEnd="true"
             android:layout_alignParentRight="true"
             android:paddingLeft="10dp"
-            android:paddingRight="10dp"
+            android:paddingRight="@dimen/fragment_side_margin"
             android:text="@string/tracking_mode_caching"
             android:textColor="@color/sap_green"
             android:textSize="@dimen/default_text_size"/>
@@ -49,7 +49,7 @@
             android:layout_height="50dp"
             android:layout_below="@+id/mode_label"
             android:gravity="center_vertical"
-            android:paddingLeft="10dp"
+            android:paddingLeft="@dimen/fragment_side_margin"
             android:paddingRight="10dp"
             android:text="@string/tracking_unsent_fixes"
             android:textColor="@color/fiori_text_color"
@@ -64,7 +64,7 @@
             android:layout_alignParentEnd="true"
             android:layout_alignParentRight="true"
             android:paddingLeft="10dp"
-            android:paddingRight="10dp"
+            android:paddingRight="@dimen/fragment_side_margin"
             android:text="@string/none"
             android:textColor="@color/fiori_text_color"
             android:textSize="@dimen/default_text_size"/>
@@ -73,9 +73,9 @@
             android:id="@+id/tracking_status_label"
             android:layout_width="wrap_content"
             android:layout_height="50dp"
-            android:gravity="center_vertical"
             android:layout_alignParentTop="true"
-            android:paddingLeft="10dp"
+            android:gravity="center_vertical"
+            android:paddingLeft="@dimen/fragment_side_margin"
             android:paddingRight="10dp"
             android:text="@string/tracking_status"
             android:textColor="@color/fiori_text_color"
@@ -90,7 +90,7 @@
             android:layout_alignParentEnd="true"
             android:layout_alignParentRight="true"
             android:paddingLeft="10dp"
-            android:paddingRight="10dp"
+            android:paddingRight="@dimen/fragment_side_margin"
             android:text="@string/tracking_status_tracking"
             android:textColor="@color/sap_green"
             android:textSize="@dimen/default_text_size"/>
@@ -109,7 +109,7 @@
                 android:id="@+id/gps_accuracy_label"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:paddingLeft="9dp"
+                android:paddingLeft="@dimen/fragment_side_margin"
                 android:paddingRight="9dp"
                 android:text=""
                 android:textColor="@color/fiori_text_color"
@@ -119,9 +119,9 @@
                 android:id="@+id/gps_quality_indicator"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_marginRight="@dimen/fragment_side_margin"
                 android:contentDescription="@string/signal_accuracy_indicator_view_description"
                 android:focusable="true"
-                android:layout_marginRight="10dp"
                 app:signalQuality="none"/>
         </LinearLayout>
 
@@ -131,7 +131,7 @@
             android:layout_height="50dp"
             android:layout_below="@+id/tracking_unsent_fixes_label"
             android:gravity="center_vertical"
-            android:paddingLeft="10dp"
+            android:paddingLeft="@dimen/fragment_side_margin"
             android:paddingRight="10dp"
             android:text="@string/tracking_gps_accuracy"
             android:textColor="@color/fiori_text_color"
diff --git a/mobile/com.sap.sailing.android.tracking.app/res/values/dimens.xml b/mobile/com.sap.sailing.android.tracking.app/res/values/dimens.xml
index bd3c2bae583..ad488106eaa 100644
--- a/mobile/com.sap.sailing.android.tracking.app/res/values/dimens.xml
+++ b/mobile/com.sap.sailing.android.tracking.app/res/values/dimens.xml
@@ -6,7 +6,7 @@
 
     <!-- Values for regatta buttons-->
     <dimen name="regatta_button_height">80dp</dimen>
-    <dimen name="regatta_button_side_margin">20dp</dimen>
+    <dimen name="fragment_side_margin">20dp</dimen>
     <dimen name="regatta_button_margin">10dp</dimen>
     <dimen name="regatta_button_padding">10dp</dimen>
     <dimen name="tracking_button_height">120dp</dimen>
diff --git a/mobile/com.sap.sailing.android.tracking.app/res/values/dimens_fragment.xml b/mobile/com.sap.sailing.android.tracking.app/res/values/dimens_fragment.xml
deleted file mode 100644
index 89954c708d5..00000000000
--- a/mobile/com.sap.sailing.android.tracking.app/res/values/dimens_fragment.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:tools="http://schemas.android.com/tools">
-
-    <!-- <dimen name="fragment_padding">10dp</dimen>
-    <dimen name="list_view_height">100dp</dimen>
-    <dimen name="team_picture_height">150dp</dimen>
-    <dimen name="team_picture_negative_margin">-25dp</dimen> -->
-
-</resources>
\ No newline at end of file

From 6a00219c96ec3318f7bc70d016f7801b58397e62 Mon Sep 17 00:00:00 2001
From: Bennet Brunsen <brunsen@ubilabs.net>
Date: Fri, 29 Apr 2016 11:45:02 +0200
Subject: [PATCH 35/92] Adjust toolbar icon padding

---
 .../android/shared/ui/activities/AbstractStartActivity.java    | 3 ++-
 .../com.sap.sailing.android.tracking.app/res/values/dimens.xml | 1 +
 .../android/tracking/app/ui/activities/AboutActivity.java      | 3 ++-
 .../tracking/app/ui/activities/LeaderboardWebViewActivity.java | 3 ++-
 .../android/tracking/app/ui/activities/RegattaActivity.java    | 3 ++-
 .../android/tracking/app/ui/activities/SettingsActivity.java   | 3 ++-
 .../android/tracking/app/ui/activities/StartActivity.java      | 2 ++
 .../android/tracking/app/ui/activities/TrackingActivity.java   | 3 ++-
 8 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/mobile/com.sap.sailing.android.shared/src/com/sap/sailing/android/shared/ui/activities/AbstractStartActivity.java b/mobile/com.sap.sailing.android.shared/src/com/sap/sailing/android/shared/ui/activities/AbstractStartActivity.java
index f45be118535..89018a460ba 100755
--- a/mobile/com.sap.sailing.android.shared/src/com/sap/sailing/android/shared/ui/activities/AbstractStartActivity.java
+++ b/mobile/com.sap.sailing.android.shared/src/com/sap/sailing/android/shared/ui/activities/AbstractStartActivity.java
@@ -16,12 +16,13 @@ import com.sap.sailing.android.ui.fragments.AbstractHomeFragment;
 public abstract class AbstractStartActivity extends CheckinDataActivity {
 
     private final static String TAG = AbstractStartActivity.class.getName();
+    protected OpenSansToolbar toolbar;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.fragment_container);
-        OpenSansToolbar toolbar = (OpenSansToolbar) findViewById(R.id.toolbar);
+        toolbar = (OpenSansToolbar) findViewById(R.id.toolbar);
         if (toolbar != null) {
             setSupportActionBar(toolbar);
             toolbar.hideSubtitle();
diff --git a/mobile/com.sap.sailing.android.tracking.app/res/values/dimens.xml b/mobile/com.sap.sailing.android.tracking.app/res/values/dimens.xml
index ad488106eaa..9e5217badd6 100644
--- a/mobile/com.sap.sailing.android.tracking.app/res/values/dimens.xml
+++ b/mobile/com.sap.sailing.android.tracking.app/res/values/dimens.xml
@@ -7,6 +7,7 @@
     <!-- Values for regatta buttons-->
     <dimen name="regatta_button_height">80dp</dimen>
     <dimen name="fragment_side_margin">20dp</dimen>
+    <dimen name="toolbar_left_padding">@dimen/fragment_side_margin</dimen>
     <dimen name="regatta_button_margin">10dp</dimen>
     <dimen name="regatta_button_padding">10dp</dimen>
     <dimen name="tracking_button_height">120dp</dimen>
diff --git a/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/activities/AboutActivity.java b/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/activities/AboutActivity.java
index 47fd6fe5681..c5d6710cd66 100644
--- a/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/activities/AboutActivity.java
+++ b/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/activities/AboutActivity.java
@@ -25,7 +25,8 @@ public class AboutActivity extends BaseActivity {
             getSupportActionBar().setDisplayHomeAsUpEnabled(true);
             getSupportActionBar().setHomeButtonEnabled(true);
             toolbar.setNavigationIcon(R.drawable.sap_logo_64dp);
-            toolbar.setPadding(20, 0, 0, 0);
+            int sidePadding = (int) getResources().getDimension(R.dimen.toolbar_left_padding);
+            toolbar.setPadding(sidePadding, 0, 0, 0);
             ColorDrawable backgroundDrawable = new ColorDrawable(getResources().getColor(R.color.toolbar_background));
             getSupportActionBar().setBackgroundDrawable(backgroundDrawable);
             getSupportActionBar().setTitle(R.string.about_this_app);
diff --git a/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/activities/LeaderboardWebViewActivity.java b/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/activities/LeaderboardWebViewActivity.java
index 96e80f48cd0..26fcc50eb88 100644
--- a/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/activities/LeaderboardWebViewActivity.java
+++ b/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/activities/LeaderboardWebViewActivity.java
@@ -36,7 +36,8 @@ public class LeaderboardWebViewActivity extends BaseActivity {
             getSupportActionBar().setDisplayHomeAsUpEnabled(true);
             getSupportActionBar().setHomeButtonEnabled(true);
             toolbar.setNavigationIcon(R.drawable.sap_logo_64dp);
-            toolbar.setPadding(20, 0, 0, 0);
+            int sidePadding = (int) getResources().getDimension(R.dimen.toolbar_left_padding);
+            toolbar.setPadding(sidePadding, 0, 0, 0);
             getSupportActionBar().setTitle(getString(R.string.title_activity_leaderboard));
             ColorDrawable backgroundDrawable = new ColorDrawable(getResources().getColor(R.color.toolbar_background));
             getSupportActionBar().setBackgroundDrawable(backgroundDrawable);
diff --git a/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/activities/RegattaActivity.java b/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/activities/RegattaActivity.java
index d1032ca195b..eaed0edc1e0 100755
--- a/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/activities/RegattaActivity.java
+++ b/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/activities/RegattaActivity.java
@@ -108,7 +108,8 @@ public class RegattaActivity extends AbstractRegattaActivity
             getSupportActionBar().setDisplayHomeAsUpEnabled(true);
             getSupportActionBar().setHomeButtonEnabled(true);
             toolbar.setNavigationIcon(R.drawable.sap_logo_64dp);
-            toolbar.setPadding(20, 0, 0, 0);
+            int sidePadding = (int) getResources().getDimension(R.dimen.toolbar_left_padding);
+            toolbar.setPadding(sidePadding, 0, 0, 0);
             getSupportActionBar().setTitle(leaderboard.name);
             getSupportActionBar().setSubtitle(event.name);
             ColorDrawable backgroundDrawable = new ColorDrawable(getResources().getColor(R.color.toolbar_background));
diff --git a/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/activities/SettingsActivity.java b/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/activities/SettingsActivity.java
index 730922331b4..53507f7ea5b 100644
--- a/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/activities/SettingsActivity.java
+++ b/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/activities/SettingsActivity.java
@@ -36,7 +36,8 @@ public class SettingsActivity extends AppCompatActivity {
             ColorDrawable backgroundDrawable = new ColorDrawable(getResources().getColor(R.color.toolbar_background));
             getSupportActionBar().setBackgroundDrawable(backgroundDrawable);
             toolbar.setNavigationIcon(R.drawable.sap_logo_64dp);
-            toolbar.setPadding(20, 0, 0, 0);
+            int sidePadding = (int) getResources().getDimension(R.dimen.toolbar_left_padding);
+            toolbar.setPadding(sidePadding, 0, 0, 0);
         }
 
         getFragmentManager().beginTransaction().replace(R.id.content_frame, new GeneralPreferenceFragment()).commit();
diff --git a/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/activities/StartActivity.java b/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/activities/StartActivity.java
index bfb43246258..4d2646fab1d 100644
--- a/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/activities/StartActivity.java
+++ b/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/activities/StartActivity.java
@@ -37,6 +37,8 @@ public class StartActivity extends AbstractStartActivity {
             getSupportActionBar().setHomeButtonEnabled(false);
             ColorDrawable backgroundDrawable = new ColorDrawable(getResources().getColor(R.color.toolbar_background));
             getSupportActionBar().setBackgroundDrawable(backgroundDrawable);
+            int sidePadding = (int) getResources().getDimension(R.dimen.toolbar_left_padding);
+            toolbar.setPadding(sidePadding, 0, 0, 0);
         }
         replaceFragment(R.id.content_frame, new HomeFragment());
         refreshDatabase();
diff --git a/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/activities/TrackingActivity.java b/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/activities/TrackingActivity.java
index 504b8c6f2a6..cfcf5c0c043 100644
--- a/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/activities/TrackingActivity.java
+++ b/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/activities/TrackingActivity.java
@@ -104,7 +104,8 @@ public class TrackingActivity extends BaseActivity implements GPSQualityListener
             getSupportActionBar().setBackgroundDrawable(backgroundDrawable);
             if (toolbar != null) {
                 toolbar.setNavigationIcon(R.drawable.sap_logo_64dp);
-                toolbar.setPadding(20, 0, 0, 0);
+                int sidePadding = (int) getResources().getDimension(R.dimen.toolbar_left_padding);
+                toolbar.setPadding(sidePadding, 0, 0, 0);
             }
         }
 

From a64a6178243fef1e8333056d764dfea9994cdcd0 Mon Sep 17 00:00:00 2001
From: Bennet Brunsen <brunsen@ubilabs.net>
Date: Fri, 29 Apr 2016 11:49:14 +0200
Subject: [PATCH 36/92] Adjust side margins in home fragment

---
 .../res/layout/fragment_home.xml                          | 8 ++++----
 .../res/layout/ragatta_listview_row.xml                   | 2 +-
 .../res/layout/regatta_listview_header.xml                | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_home.xml b/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_home.xml
index 414842d7b22..0b4961414bf 100644
--- a/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_home.xml
+++ b/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_home.xml
@@ -38,8 +38,8 @@
         android:layout_height="80dp"
         android:layout_above="@+id/noQrCode"
         android:layout_marginBottom="10dp"
-        android:layout_marginLeft="16dp"
-        android:layout_marginRight="16dp"
+        android:layout_marginLeft="@dimen/fragment_side_margin"
+        android:layout_marginRight="@dimen/fragment_side_margin"
         android:layout_marginTop="20dp"
         android:background="@drawable/blue_button"
         android:text="@string/scan_qr"
@@ -50,8 +50,8 @@
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
         android:layout_above="@+id/bottomLayout"
-        android:layout_marginLeft="16dp"
-        android:layout_marginRight="16dp"
+        android:layout_marginLeft="@dimen/fragment_side_margin"
+        android:layout_marginRight="@dimen/fragment_side_margin"
         android:background="@drawable/normal_btn_white"
         android:paddingLeft="@dimen/activity_horizontal_margin"
         android:paddingRight="@dimen/activity_horizontal_margin"
diff --git a/mobile/com.sap.sailing.android.tracking.app/res/layout/ragatta_listview_row.xml b/mobile/com.sap.sailing.android.tracking.app/res/layout/ragatta_listview_row.xml
index 56c19ac7cb6..9a68a7497af 100644
--- a/mobile/com.sap.sailing.android.tracking.app/res/layout/ragatta_listview_row.xml
+++ b/mobile/com.sap.sailing.android.tracking.app/res/layout/ragatta_listview_row.xml
@@ -28,7 +28,7 @@
         android:layout_alignParentStart="true"
         android:layout_centerVertical="true"
         android:textSize="18sp"
-        android:paddingLeft="15dp"
+        android:paddingLeft="@dimen/fragment_side_margin"
         android:paddingRight="15dp"
         android:singleLine="true"
         android:textColor="@color/fiori_text_color" />
diff --git a/mobile/com.sap.sailing.android.tracking.app/res/layout/regatta_listview_header.xml b/mobile/com.sap.sailing.android.tracking.app/res/layout/regatta_listview_header.xml
index 600123adda8..0da21f8e295 100644
--- a/mobile/com.sap.sailing.android.tracking.app/res/layout/regatta_listview_header.xml
+++ b/mobile/com.sap.sailing.android.tracking.app/res/layout/regatta_listview_header.xml
@@ -9,7 +9,7 @@
     <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:padding="14dp"
+        android:padding="@dimen/fragment_side_margin"
         android:textSize="18sp"
         android:textColor="@color/fiori_text_color"
         android:text="@string/your_regattas" />

From 17f3c865f99788cac9d8d88cb75de29bcd6808ac Mon Sep 17 00:00:00 2001
From: Bennet Brunsen <brunsen@ubilabs.net>
Date: Fri, 29 Apr 2016 15:12:20 +0200
Subject: [PATCH 37/92] Restructured regatta fragment layout

---
 .../res/layout/fragment_regatta.xml                   | 11 ++++++-----
 .../res/values/dimens.xml                             |  1 +
 .../tracking/app/ui/fragments/RegattaFragment.java    |  2 +-
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_regatta.xml b/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_regatta.xml
index 1b5440b6930..38bccab1d79 100644
--- a/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_regatta.xml
+++ b/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_regatta.xml
@@ -213,9 +213,8 @@
         android:id="@+id/scroll_view"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_above="@+id/start_tracking_box"
         android:layout_below="@id/image"
-        android:layout_gravity="center"
+        android:layout_above="@+id/start_tracking_box"
         android:isScrollContainer="true"
         android:orientation="vertical"
         android:scrollbars="vertical">
@@ -269,7 +268,7 @@
                 <LinearLayout
                     android:id="@+id/three_boxes_regatta_starts"
                     android:layout_width="match_parent"
-                    android:layout_height="match_parent"
+                    android:layout_height="wrap_content"
                     android:layout_below="@id/regatta_starts_in"
                     android:baselineAligned="false"
                     android:gravity="center"
@@ -390,13 +389,14 @@
     <RelativeLayout
         android:id="@+id/start_tracking_box"
         android:layout_width="match_parent"
-        android:layout_height="200dp"
+        android:layout_height="@dimen/regatta_button_layout_height"
         android:layout_above="@+id/bottom_announcement">
 
         <LinearLayout
             android:id="@+id/event_buttons"
             android:layout_width="match_parent"
             android:layout_height="@dimen/regatta_button_height"
+            android:layout_above="@+id/layout_start_tracking"
             android:orientation="horizontal">
 
             <Button
@@ -430,9 +430,10 @@
         </LinearLayout>
 
         <RelativeLayout
+            android:id="@+id/layout_start_tracking"
             android:layout_width="match_parent"
             android:layout_height="@dimen/tracking_button_height"
-            android:layout_below="@+id/event_buttons">
+            android:layout_alignParentBottom="true">
 
             <Button
                 android:id="@+id/start_tracking"
diff --git a/mobile/com.sap.sailing.android.tracking.app/res/values/dimens.xml b/mobile/com.sap.sailing.android.tracking.app/res/values/dimens.xml
index 9e5217badd6..7db2c6feff2 100644
--- a/mobile/com.sap.sailing.android.tracking.app/res/values/dimens.xml
+++ b/mobile/com.sap.sailing.android.tracking.app/res/values/dimens.xml
@@ -5,6 +5,7 @@
     <!-- <dimen name="activity_vertical_margin">16dp</dimen> -->
 
     <!-- Values for regatta buttons-->
+    <dimen name="regatta_button_layout_height">200dp</dimen>
     <dimen name="regatta_button_height">80dp</dimen>
     <dimen name="fragment_side_margin">20dp</dimen>
     <dimen name="toolbar_left_padding">@dimen/fragment_side_margin</dimen>
diff --git a/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/fragments/RegattaFragment.java b/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/fragments/RegattaFragment.java
index d030f1cf152..5c98b15dfb9 100755
--- a/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/fragments/RegattaFragment.java
+++ b/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/fragments/RegattaFragment.java
@@ -103,7 +103,7 @@ public class RegattaFragment extends BaseFragment implements OnClickListener {
 
         if (System.currentTimeMillis() > regattaStart) {
             textView.setText(getString(R.string.regatta_in_progress));
-            threeBoxesLayout.setVisibility(View.INVISIBLE);
+            threeBoxesLayout.setVisibility(View.GONE);
         } else {
             textView.setText(getString(R.string.regatta_starts_in));
             threeBoxesLayout.setVisibility(View.VISIBLE);

From f257ee2d07705fa83ac91e05d3a2604481ee5e50 Mon Sep 17 00:00:00 2001
From: Bennet Brunsen <brunsen@ubilabs.net>
Date: Fri, 29 Apr 2016 15:42:33 +0200
Subject: [PATCH 38/92] Remove border on certain buttons

---
 .../res/drawable/normal_btn_blue.xml                          | 4 ----
 .../res/drawable/normal_btn_green.xml                         | 4 ----
 .../res/drawable/normal_btn_red.xml                           | 4 ----
 .../res/drawable/pressed_btn_blue.xml                         | 4 ----
 .../res/drawable/pressed_btn_green.xml                        | 4 ----
 .../res/drawable/pressed_btn_red.xml                          | 4 ----
 6 files changed, 24 deletions(-)

diff --git a/mobile/com.sap.sailing.android.tracking.app/res/drawable/normal_btn_blue.xml b/mobile/com.sap.sailing.android.tracking.app/res/drawable/normal_btn_blue.xml
index 75e1fe96c07..0b6f06c380f 100644
--- a/mobile/com.sap.sailing.android.tracking.app/res/drawable/normal_btn_blue.xml
+++ b/mobile/com.sap.sailing.android.tracking.app/res/drawable/normal_btn_blue.xml
@@ -5,8 +5,4 @@
         android:radius="@dimen/button_radius"/>
 
     <solid android:color="@color/qr_code_button_normal"/>
-
-    <stroke
-        android:width="1dp"
-        android:color="@color/separator_color" />
 </shape>
\ No newline at end of file
diff --git a/mobile/com.sap.sailing.android.tracking.app/res/drawable/normal_btn_green.xml b/mobile/com.sap.sailing.android.tracking.app/res/drawable/normal_btn_green.xml
index c73d8d4042c..e1addd2f76f 100644
--- a/mobile/com.sap.sailing.android.tracking.app/res/drawable/normal_btn_green.xml
+++ b/mobile/com.sap.sailing.android.tracking.app/res/drawable/normal_btn_green.xml
@@ -5,8 +5,4 @@
         android:radius="@dimen/button_radius"/>
 
     <solid android:color="@color/start_tracking_button_normal"/>
-
-    <stroke
-        android:width="1dp"
-        android:color="@color/separator_color" />
 </shape>
\ No newline at end of file
diff --git a/mobile/com.sap.sailing.android.tracking.app/res/drawable/normal_btn_red.xml b/mobile/com.sap.sailing.android.tracking.app/res/drawable/normal_btn_red.xml
index 71ee8398c19..333db8be982 100644
--- a/mobile/com.sap.sailing.android.tracking.app/res/drawable/normal_btn_red.xml
+++ b/mobile/com.sap.sailing.android.tracking.app/res/drawable/normal_btn_red.xml
@@ -5,8 +5,4 @@
         android:radius="@dimen/button_radius"/>
 
     <solid android:color="@color/stop_tracking_button_normal"/>
-
-    <stroke
-        android:width="1dp"
-        android:color="@color/separator_color" />
 </shape>
\ No newline at end of file
diff --git a/mobile/com.sap.sailing.android.tracking.app/res/drawable/pressed_btn_blue.xml b/mobile/com.sap.sailing.android.tracking.app/res/drawable/pressed_btn_blue.xml
index 3780ce613ed..e2098c90458 100644
--- a/mobile/com.sap.sailing.android.tracking.app/res/drawable/pressed_btn_blue.xml
+++ b/mobile/com.sap.sailing.android.tracking.app/res/drawable/pressed_btn_blue.xml
@@ -5,8 +5,4 @@
         android:radius="@dimen/button_radius"/>
 
     <solid android:color="@color/qr_code_button_pressed"/>
-
-    <stroke
-        android:width="1dp"
-        android:color="@color/separator_color" />
 </shape>
\ No newline at end of file
diff --git a/mobile/com.sap.sailing.android.tracking.app/res/drawable/pressed_btn_green.xml b/mobile/com.sap.sailing.android.tracking.app/res/drawable/pressed_btn_green.xml
index a938919f997..86ee4bd8589 100644
--- a/mobile/com.sap.sailing.android.tracking.app/res/drawable/pressed_btn_green.xml
+++ b/mobile/com.sap.sailing.android.tracking.app/res/drawable/pressed_btn_green.xml
@@ -5,8 +5,4 @@
         android:radius="@dimen/button_radius"/>
 
     <solid android:color="@color/start_tracking_button_pressed"/>
-
-    <stroke
-        android:width="1dp"
-        android:color="@color/separator_color" />
 </shape>
\ No newline at end of file
diff --git a/mobile/com.sap.sailing.android.tracking.app/res/drawable/pressed_btn_red.xml b/mobile/com.sap.sailing.android.tracking.app/res/drawable/pressed_btn_red.xml
index 05d02ac1838..40e09030152 100644
--- a/mobile/com.sap.sailing.android.tracking.app/res/drawable/pressed_btn_red.xml
+++ b/mobile/com.sap.sailing.android.tracking.app/res/drawable/pressed_btn_red.xml
@@ -5,8 +5,4 @@
         android:radius="@dimen/button_radius"/>
 
     <solid android:color="@color/stop_tracking_button_pressed"/>
-
-    <stroke
-        android:width="1dp"
-        android:color="@color/separator_color" />
 </shape>
\ No newline at end of file

From 144f010aaed029e6b8d0482852ffe3bf91a57fa5 Mon Sep 17 00:00:00 2001
From: Bennet Brunsen <brunsen@ubilabs.net>
Date: Tue, 3 May 2016 10:57:06 +0200
Subject: [PATCH 39/92] Layout adjustments for smaller screens

---
 .../res/layout/fragment_home.xml                          | 6 +++---
 .../res/layout/fragment_regatta.xml                       | 7 +++----
 .../res/values-h600dp/dimens.xml                          | 8 ++++++++
 .../res/values/dimens.xml                                 | 7 ++++---
 4 files changed, 18 insertions(+), 10 deletions(-)
 create mode 100644 mobile/com.sap.sailing.android.tracking.app/res/values-h600dp/dimens.xml

diff --git a/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_home.xml b/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_home.xml
index 0b4961414bf..1786e8f6cb1 100644
--- a/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_home.xml
+++ b/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_home.xml
@@ -47,8 +47,8 @@
 
     <Button
         android:id="@+id/noQrCode"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/no_qr_code_button_height"
         android:layout_above="@+id/bottomLayout"
         android:layout_marginLeft="@dimen/fragment_side_margin"
         android:layout_marginRight="@dimen/fragment_side_margin"
@@ -57,7 +57,7 @@
         android:paddingRight="@dimen/activity_horizontal_margin"
         android:text="@string/no_qr_code"
         android:textColor="@color/fiori_text_color"
-        android:textSize="@dimen/default_text_size"/>
+        android:textSize="@dimen/button_text_size"/>
 
     <ListView
         android:id="@+id/listRegatta"
diff --git a/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_regatta.xml b/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_regatta.xml
index 38bccab1d79..35de88b6eaa 100644
--- a/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_regatta.xml
+++ b/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_regatta.xml
@@ -396,6 +396,7 @@
             android:id="@+id/event_buttons"
             android:layout_width="match_parent"
             android:layout_height="@dimen/regatta_button_height"
+            android:layout_marginBottom="@dimen/regatta_button_margin"
             android:layout_above="@+id/layout_start_tracking"
             android:orientation="horizontal">
 
@@ -403,7 +404,6 @@
                 android:id="@+id/show_event_button"
                 android:layout_width="0dp"
                 android:layout_height="match_parent"
-                android:layout_marginBottom="@dimen/regatta_button_margin"
                 android:layout_marginLeft="@dimen/fragment_side_margin"
                 android:layout_weight="1"
                 android:background="@drawable/normal_button"
@@ -417,7 +417,6 @@
                 android:id="@+id/show_leaderboards_button"
                 android:layout_width="0dp"
                 android:layout_height="match_parent"
-                android:layout_marginBottom="@dimen/regatta_button_margin"
                 android:layout_marginLeft="@dimen/fragment_side_margin"
                 android:layout_marginRight="@dimen/fragment_side_margin"
                 android:layout_weight="1"
@@ -457,8 +456,8 @@
         android:layout_height="wrap_content"
         android:layout_alignParentBottom="true"
         android:layout_centerHorizontal="true"
-        android:layout_marginBottom="20dp"
-        android:layout_marginTop="20dp"
+        android:layout_marginBottom="@dimen/regatta_button_margin"
+        android:layout_marginTop="@dimen/regatta_button_margin"
         android:text="@string/please_listen_to_announcements"
         android:textColor="@color/fiori_text_color"
         android:textSize="@dimen/default_text_size"/>
diff --git a/mobile/com.sap.sailing.android.tracking.app/res/values-h600dp/dimens.xml b/mobile/com.sap.sailing.android.tracking.app/res/values-h600dp/dimens.xml
new file mode 100644
index 00000000000..9cd4a5bd9f0
--- /dev/null
+++ b/mobile/com.sap.sailing.android.tracking.app/res/values-h600dp/dimens.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Values for regatta buttons-->
+    <dimen name="regatta_button_layout_height">190dp</dimen>
+    <dimen name="regatta_button_margin">10dp</dimen>
+    <dimen name="regatta_button_padding">10dp</dimen>
+    <dimen name="tracking_button_height">120dp</dimen>
+</resources>
\ No newline at end of file
diff --git a/mobile/com.sap.sailing.android.tracking.app/res/values/dimens.xml b/mobile/com.sap.sailing.android.tracking.app/res/values/dimens.xml
index 7db2c6feff2..71c74c26997 100644
--- a/mobile/com.sap.sailing.android.tracking.app/res/values/dimens.xml
+++ b/mobile/com.sap.sailing.android.tracking.app/res/values/dimens.xml
@@ -5,13 +5,13 @@
     <!-- <dimen name="activity_vertical_margin">16dp</dimen> -->
 
     <!-- Values for regatta buttons-->
-    <dimen name="regatta_button_layout_height">200dp</dimen>
-    <dimen name="regatta_button_height">80dp</dimen>
+    <dimen name="regatta_button_layout_height">140dp</dimen>
+    <dimen name="regatta_button_height">@dimen/no_qr_code_button_height</dimen>
     <dimen name="fragment_side_margin">20dp</dimen>
     <dimen name="toolbar_left_padding">@dimen/fragment_side_margin</dimen>
     <dimen name="regatta_button_margin">10dp</dimen>
     <dimen name="regatta_button_padding">10dp</dimen>
-    <dimen name="tracking_button_height">120dp</dimen>
+    <dimen name="tracking_button_height">80dp</dimen>
     <dimen name="toolbar_separator_height">1dp</dimen>
     <dimen name="button_text_size">@dimen/default_text_size</dimen>
     <dimen name="default_text_size">16sp</dimen>
@@ -21,5 +21,6 @@
     <dimen name="regatta_start_date_side_margin">22dp</dimen>
     <dimen name="countdown_separator_height">35dp</dimen>
     <dimen name="countdown_separator_width">2dp</dimen>
+    <dimen name="no_qr_code_button_height">50dp</dimen>
 
 </resources>

From d773c8715eeeedfb9e2bdb86c28881337fe0a650 Mon Sep 17 00:00:00 2001
From: Bennet Brunsen <brunsen@ubilabs.net>
Date: Tue, 3 May 2016 11:17:17 +0200
Subject: [PATCH 40/92] Hide no gps label if gps is available

---
 .../app/ui/fragments/TrackingTimeFragment.java        | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/fragments/TrackingTimeFragment.java b/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/fragments/TrackingTimeFragment.java
index e21e2d93809..86db635153a 100644
--- a/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/fragments/TrackingTimeFragment.java
+++ b/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/fragments/TrackingTimeFragment.java
@@ -6,21 +6,32 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
 
+import com.sap.sailing.android.shared.util.LocationHelper;
 import com.sap.sailing.android.tracking.app.R;
 
 public class TrackingTimeFragment extends BaseFragment {
 
     private final static String SIS_TRACKING_TIMER = "savedInstanceTrackingTimer";
     private TextView timerView;
+    private TextView noGPSView;
 
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
         super.onCreateView(inflater, container, savedInstanceState);
         ViewGroup view = (ViewGroup) inflater.inflate(R.layout.fragment_time, container, false);
         timerView = (TextView) view.findViewById(R.id.tracking_time_label);
+        noGPSView = (TextView) view.findViewById(R.id.wait_for_gps);
         return view;
     }
 
+    @Override
+    public void onResume() {
+        super.onResume();
+        if (LocationHelper.isGPSEnabled(getActivity())) {
+            noGPSView.setVisibility(View.GONE);
+        }
+    }
+
     @Override
     public void onSaveInstanceState(Bundle outState) {
         super.onSaveInstanceState(outState);

From 468512e9442259cebce00c33530922a0b4d3c4ae Mon Sep 17 00:00:00 2001
From: Bennet Brunsen <brunsen@ubilabs.net>
Date: Tue, 3 May 2016 11:26:59 +0200
Subject: [PATCH 41/92] Further layout adjustments

---
 .../res/layout/activity_tracking.xml          |  3 +-
 .../res/layout/fragment_home.xml              | 10 ++++---
 .../res/layout/fragment_regatta.xml           | 28 +++++++++----------
 .../res/layout/regatta_listview_header.xml    | 11 ++++++--
 4 files changed, 30 insertions(+), 22 deletions(-)

diff --git a/mobile/com.sap.sailing.android.tracking.app/res/layout/activity_tracking.xml b/mobile/com.sap.sailing.android.tracking.app/res/layout/activity_tracking.xml
index 6d91c21c9e1..121f28e3987 100644
--- a/mobile/com.sap.sailing.android.tracking.app/res/layout/activity_tracking.xml
+++ b/mobile/com.sap.sailing.android.tracking.app/res/layout/activity_tracking.xml
@@ -84,7 +84,6 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_alignParentBottom="true"
-        android:layout_marginBottom="20dp"
-        android:paddingTop="10dp"/>
+        android:layout_marginBottom="10dp"/>
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_home.xml b/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_home.xml
index 1786e8f6cb1..533cdecc83b 100644
--- a/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_home.xml
+++ b/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_home.xml
@@ -19,17 +19,19 @@
         android:layout_height="50dp"
         android:layout_alignParentBottom="true"
         android:layout_alignParentLeft="true"
-        android:layout_alignParentStart="true">
+        android:layout_alignParentStart="true"
+        android:layout_marginLeft="@dimen/fragment_side_margin"
+        android:layout_marginRight="@dimen/fragment_side_margin">
 
-        <com.sap.sailing.android.shared.ui.customviews.OpenSansTextView
+        <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_centerHorizontal="true"
             android:layout_centerVertical="true"
             android:gravity="center"
             android:text="@string/scan_hint"
-            android:textSize="@dimen/default_text_size"
-            android:textColor="@color/fiori_text_color"/>
+            android:textColor="@color/fiori_text_color"
+            android:textSize="@dimen/default_text_size"/>
     </RelativeLayout>
 
     <Button
diff --git a/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_regatta.xml b/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_regatta.xml
index 35de88b6eaa..e851e3103ca 100644
--- a/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_regatta.xml
+++ b/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_regatta.xml
@@ -91,8 +91,8 @@
             android:id="@+id/retry_upload"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_centerHorizontal="true"
             android:layout_above="@id/image_bottom"
+            android:layout_centerHorizontal="true"
             android:layout_marginBottom="107dp"
             android:background="@color/white_less_transparent"
             android:clickable="true"
@@ -128,20 +128,20 @@
             android:baselineAligned="false"
             android:measureWithLargestChild="false"
             android:orientation="horizontal"
-            android:paddingTop="10dp"
-            android:paddingBottom="10dp">
+            android:paddingBottom="10dp"
+            android:paddingTop="10dp">
 
             <TextView
                 android:id="@+id/competitor_name"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_marginLeft="@dimen/fragment_side_margin"
                 android:layout_weight="1"
                 android:gravity="start"
-                android:layout_marginLeft="@dimen/fragment_side_margin"
                 android:text="@string/empty"
                 android:textColor="@color/fiori_text_color"
-                android:textStyle="bold"
-                android:textSize="@dimen/default_text_size"/>
+                android:textSize="@dimen/default_text_size"
+                android:textStyle="bold"/>
 
             <RelativeLayout
                 android:layout_width="10dp"
@@ -168,13 +168,13 @@
                 android:id="@+id/sail_id"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_marginRight="@dimen/fragment_side_margin"
                 android:gravity="end|center_vertical"
                 android:padding="0dp"
                 android:text="@string/empty"
-                android:layout_marginRight="@dimen/fragment_side_margin"
                 android:textColor="@color/fiori_text_color"
-                android:textStyle="bold"
-                android:textSize="@dimen/default_text_size"/>
+                android:textSize="@dimen/default_text_size"
+                android:textStyle="bold"/>
         </LinearLayout>
 
         <LinearLayout
@@ -213,8 +213,8 @@
         android:id="@+id/scroll_view"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_below="@id/image"
         android:layout_above="@+id/start_tracking_box"
+        android:layout_below="@id/image"
         android:isScrollContainer="true"
         android:orientation="vertical"
         android:scrollbars="vertical">
@@ -396,8 +396,8 @@
             android:id="@+id/event_buttons"
             android:layout_width="match_parent"
             android:layout_height="@dimen/regatta_button_height"
-            android:layout_marginBottom="@dimen/regatta_button_margin"
             android:layout_above="@+id/layout_start_tracking"
+            android:layout_marginBottom="@dimen/regatta_button_margin"
             android:orientation="horizontal">
 
             <Button
@@ -432,7 +432,8 @@
             android:id="@+id/layout_start_tracking"
             android:layout_width="match_parent"
             android:layout_height="@dimen/tracking_button_height"
-            android:layout_alignParentBottom="true">
+            android:layout_alignParentBottom="true"
+            android:layout_marginTop="@dimen/regatta_button_margin">
 
             <Button
                 android:id="@+id/start_tracking"
@@ -440,7 +441,6 @@
                 android:layout_height="match_parent"
                 android:layout_marginLeft="@dimen/fragment_side_margin"
                 android:layout_marginRight="@dimen/fragment_side_margin"
-                android:layout_marginTop="@dimen/regatta_button_margin"
                 android:background="@drawable/start_tracking_button"
                 android:padding="@dimen/regatta_button_padding"
                 android:text="@string/start_tracking"
@@ -450,7 +450,7 @@
 
     </RelativeLayout>
 
-    <com.sap.sailing.android.shared.ui.customviews.OpenSansTextView
+    <TextView
         android:id="@+id/bottom_announcement"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
diff --git a/mobile/com.sap.sailing.android.tracking.app/res/layout/regatta_listview_header.xml b/mobile/com.sap.sailing.android.tracking.app/res/layout/regatta_listview_header.xml
index 0da21f8e295..12e49a87334 100644
--- a/mobile/com.sap.sailing.android.tracking.app/res/layout/regatta_listview_header.xml
+++ b/mobile/com.sap.sailing.android.tracking.app/res/layout/regatta_listview_header.xml
@@ -2,16 +2,23 @@
 <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="wrap_content"
     android:background="@color/list_header_background_color"
     tools:ignore="Overdraw">
 
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="50dp">
+
     <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:padding="@dimen/fragment_side_margin"
+        android:paddingLeft="@dimen/fragment_side_margin"
+        android:layout_gravity="center_vertical"
         android:textSize="18sp"
         android:textColor="@color/fiori_text_color"
         android:text="@string/your_regattas" />
 
+    </LinearLayout>
+    
 </RelativeLayout>
\ No newline at end of file

From fdf06baec9139c6e10c3ad501a710b69cfe3461b Mon Sep 17 00:00:00 2001
From: Bennet Brunsen <brunsen@ubilabs.net>
Date: Tue, 3 May 2016 11:31:49 +0200
Subject: [PATCH 42/92] Add more contrast to text in tracking fragment

---
 .../res/layout/fragment_tracking.xml                   |  4 ++--
 .../tracking/app/ui/fragments/TrackingFragment.java    | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_tracking.xml b/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_tracking.xml
index 0a1809ca9e5..a8fe31aea31 100644
--- a/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_tracking.xml
+++ b/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_tracking.xml
@@ -40,7 +40,7 @@
             android:paddingLeft="10dp"
             android:paddingRight="@dimen/fragment_side_margin"
             android:text="@string/tracking_mode_caching"
-            android:textColor="@color/sap_green"
+            android:textColor="@color/fiori_text_color"
             android:textSize="@dimen/default_text_size"/>
 
         <TextView
@@ -92,7 +92,7 @@
             android:paddingLeft="10dp"
             android:paddingRight="@dimen/fragment_side_margin"
             android:text="@string/tracking_status_tracking"
-            android:textColor="@color/sap_green"
+            android:textColor="@color/fiori_text_color"
             android:textSize="@dimen/default_text_size"/>
 
         <LinearLayout
diff --git a/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/fragments/TrackingFragment.java b/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/fragments/TrackingFragment.java
index b7fcab8fe3a..c832b8825d6 100644
--- a/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/fragments/TrackingFragment.java
+++ b/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/fragments/TrackingFragment.java
@@ -117,7 +117,7 @@ public class TrackingFragment extends BaseFragment {
                 textView.setTextColor(getResources().getColor(R.color.sap_red));
             } else {
                 textView.setText(getString(R.string.tracking_status_tracking));
-                textView.setTextColor(getResources().getColor(R.color.sap_green));
+                textView.setTextColor(getResources().getColor(R.color.fiori_text_color));
             }
         }
     }
@@ -137,21 +137,21 @@ public class TrackingFragment extends BaseFragment {
                     if (apiConnectivity == APIConnectivity.transmissionSuccess) {
                         if (prefs.getEnergySavingEnabledByUser()) {
                             textView.setText(getString(R.string.tracking_mode_battery_saving));
-                            textView.setTextColor(getResources().getColor(R.color.sap_yellow));
+                            textView.setTextColor(getResources().getColor(R.color.fiori_text_color));
                         } else {
                             textView.setText(getString(R.string.tracking_mode_live));
-                            textView.setTextColor(getResources().getColor(R.color.sap_green));
+                            textView.setTextColor(getResources().getColor(R.color.fiori_text_color));
                         }
 
                     } else if (apiConnectivity == APIConnectivity.noAttempt) {
                         textView.setText(getString(R.string.tracking_mode_offline));
-                        textView.setTextColor(getResources().getColor(R.color.sap_green));
+                        textView.setTextColor(getResources().getColor(R.color.fiori_text_color));
                     } else if (apiConnectivity == APIConnectivity.transmissionError) {
                         textView.setText(getString(R.string.tracking_mode_api_error));
                         textView.setTextColor(getResources().getColor(R.color.sap_red));
                     } else {
                         textView.setText(getString(R.string.tracking_mode_caching));
-                        textView.setTextColor(getResources().getColor(R.color.sap_green));
+                        textView.setTextColor(getResources().getColor(R.color.fiori_text_color));
                     }
                 }
             });

From ab3e0ed6dd4df82ded695841d23eafe54cf4b588 Mon Sep 17 00:00:00 2001
From: Bennet Brunsen <brunsen@ubilabs.net>
Date: Tue, 3 May 2016 12:58:50 +0200
Subject: [PATCH 43/92] Center regatta start text if regatta is in progress

---
 .../res/layout/fragment_regatta.xml               | 15 +++++++++------
 .../app/ui/fragments/RegattaFragment.java         |  8 ++++++++
 2 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_regatta.xml b/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_regatta.xml
index e851e3103ca..84bcfe73fd5 100644
--- a/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_regatta.xml
+++ b/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_regatta.xml
@@ -3,6 +3,7 @@
                 xmlns:tools="http://schemas.android.com/tools"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
+                xmlns:Tools="http://schemas.android.com/apk/res-auto"
                 android:background="@drawable/main_background">
 
     <RelativeLayout
@@ -39,7 +40,7 @@
                 android:paddingRight="@dimen/activity_horizontal_margin"
                 android:src="@drawable/ic_menu_camera"/>
 
-            <com.sap.sailing.android.shared.ui.customviews.OpenSansTextView
+            <TextView
                 android:id="@+id/add_photo_text"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -212,7 +213,8 @@
     <ScrollView
         android:id="@+id/scroll_view"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        android:layout_height="match_parent"
+        android:fillViewport="true"
         android:layout_above="@+id/start_tracking_box"
         android:layout_below="@id/image"
         android:isScrollContainer="true"
@@ -234,7 +236,7 @@
                 android:paddingTop="10dp"
                 android:visibility="gone">
 
-                <com.sap.sailing.android.shared.ui.customviews.OpenSansTextView
+                <TextView
                     android:id="@+id/thank_you_note"
                     android:layout_width="fill_parent"
                     android:layout_height="wrap_content"
@@ -248,7 +250,7 @@
             <RelativeLayout
                 android:id="@+id/start_date_layout"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
+                android:layout_height="match_parent"
                 android:measureWithLargestChild="false"
                 android:orientation="horizontal">
 
@@ -271,9 +273,10 @@
                     android:layout_height="wrap_content"
                     android:layout_below="@id/regatta_starts_in"
                     android:baselineAligned="false"
-                    android:gravity="center"
+                    android:gravity="center_horizontal"
                     android:measureWithLargestChild="false"
-                    android:orientation="horizontal">
+                    android:orientation="horizontal"
+                    tools:visibility="gone">
 
                     <LinearLayout
                         android:id="@+id/three_boxes_days_box"
diff --git a/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/fragments/RegattaFragment.java b/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/fragments/RegattaFragment.java
index 5c98b15dfb9..b716a263265 100755
--- a/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/fragments/RegattaFragment.java
+++ b/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/fragments/RegattaFragment.java
@@ -104,12 +104,20 @@ public class RegattaFragment extends BaseFragment implements OnClickListener {
         if (System.currentTimeMillis() > regattaStart) {
             textView.setText(getString(R.string.regatta_in_progress));
             threeBoxesLayout.setVisibility(View.GONE);
+            centerViewInParent(textView);
         } else {
             textView.setText(getString(R.string.regatta_starts_in));
             threeBoxesLayout.setVisibility(View.VISIBLE);
         }
     }
 
+    private void centerViewInParent(View view) {
+        RelativeLayout.LayoutParams layoutParams =
+            (RelativeLayout.LayoutParams) view.getLayoutParams();
+        layoutParams.addRule(RelativeLayout.CENTER_IN_PARENT, RelativeLayout.TRUE);
+        view.setLayoutParams(layoutParams);
+    }
+
     public boolean isShowingBigCheckoutButton() {
         return showingThankYouNote;
     }

From 15b2a87b28fc8c65363973ede32832cec1ce187c Mon Sep 17 00:00:00 2001
From: Bennet Brunsen <brunsen@ubilabs.net>
Date: Tue, 10 May 2016 11:22:16 +0200
Subject: [PATCH 44/92] Adjust competitor container for higher fonts

---
 .../res/layout/fragment_regatta.xml                            | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_regatta.xml b/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_regatta.xml
index 84bcfe73fd5..cb76ff29222 100644
--- a/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_regatta.xml
+++ b/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_regatta.xml
@@ -121,7 +121,8 @@
         <LinearLayout
             android:id="@+id/competitor_info_layout"
             android:layout_width="match_parent"
-            android:layout_height="40dp"
+            android:layout_height="wrap_content"
+            android:minHeight="40dp"
             android:layout_alignParentBottom="true"
             android:layout_alignParentLeft="true"
             android:layout_alignParentStart="true"

From 2502c097336f27acd2aed90a10fd0bb0e1435ed5 Mon Sep 17 00:00:00 2001
From: Bennet Brunsen <brunsen@ubilabs.net>
Date: Tue, 10 May 2016 12:57:24 +0200
Subject: [PATCH 45/92] Changed color of event and leaderboard button

---
 .../res/layout/fragment_regatta.xml                         | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_regatta.xml b/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_regatta.xml
index cb76ff29222..93206840f23 100644
--- a/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_regatta.xml
+++ b/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_regatta.xml
@@ -410,10 +410,9 @@
                 android:layout_height="match_parent"
                 android:layout_marginLeft="@dimen/fragment_side_margin"
                 android:layout_weight="1"
-                android:background="@drawable/normal_button"
+                android:background="@drawable/blue_button"
                 android:padding="@dimen/regatta_button_padding"
                 android:text="@string/show_event"
-                android:textColor="@color/fiori_text_color"
                 android:textSize="@dimen/button_text_size"
                 tools:text="Show Event"/>
 
@@ -424,10 +423,9 @@
                 android:layout_marginLeft="@dimen/fragment_side_margin"
                 android:layout_marginRight="@dimen/fragment_side_margin"
                 android:layout_weight="1"
-                android:background="@drawable/normal_button"
+                android:background="@drawable/blue_button"
                 android:padding="@dimen/regatta_button_padding"
                 android:text="@string/show_leaderboard"
-                android:textColor="@color/fiori_text_color"
                 android:textSize="@dimen/button_text_size"/>
 
         </LinearLayout>

From 49feb4765159d6da353d299184d70ebccf09c2a9 Mon Sep 17 00:00:00 2001
From: Axel Uhl <axel.uhl@sap.com>
Date: Wed, 18 May 2016 13:29:20 +0200
Subject: [PATCH 46/92] position_send_button_disabled.xml was not introduced on
 the Fiori branch; removing it again

Change-Id: I65879b8d1bf6a9b6d675b4c508d37ff6a46c4f81
---
 .../res/drawable/position_send_button_disabled.xml     | 10 ----------
 1 file changed, 10 deletions(-)
 delete mode 100644 mobile/com.sap.sailing.buoy.positioning/res/drawable/position_send_button_disabled.xml

diff --git a/mobile/com.sap.sailing.buoy.positioning/res/drawable/position_send_button_disabled.xml b/mobile/com.sap.sailing.buoy.positioning/res/drawable/position_send_button_disabled.xml
deleted file mode 100644
index ee41d6642d4..00000000000
--- a/mobile/com.sap.sailing.buoy.positioning/res/drawable/position_send_button_disabled.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="@color/yellow_button_disabled"/>
-
-    <corners
-        android:bottomLeftRadius="5dip"
-        android:bottomRightRadius="5dip"
-        android:topLeftRadius="5dip"
-        android:topRightRadius="5dip"/>
-</shape>
\ No newline at end of file

From e5e0ea13556f5d18ca06c1b5984eca852a407fcb Mon Sep 17 00:00:00 2001
From: Axel Uhl <axel.uhl@sap.com>
Date: Wed, 18 May 2016 13:30:53 +0200
Subject: [PATCH 47/92] adjusting position_send_button.xml again after merge
 conflicts around button disabling

Change-Id: I843245f039f5f85b266df1ecceb3c402533267cb
---
 .../res/drawable/position_send_button.xml                       | 2 --
 1 file changed, 2 deletions(-)

diff --git a/mobile/com.sap.sailing.buoy.positioning/res/drawable/position_send_button.xml b/mobile/com.sap.sailing.buoy.positioning/res/drawable/position_send_button.xml
index dded0f8fa3f..028c839d38e 100644
--- a/mobile/com.sap.sailing.buoy.positioning/res/drawable/position_send_button.xml
+++ b/mobile/com.sap.sailing.buoy.positioning/res/drawable/position_send_button.xml
@@ -2,8 +2,6 @@
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <!-- pressed -->
     <item android:drawable="@drawable/position_send_button_pressed" android:state_pressed="true" />
-    <!-- disabled -->
-    <item android:drawable="@drawable/position_send_button_disabled" android:state_enabled="false" />
     <!-- default -->
     <item android:drawable="@drawable/rounded_btn_yellow" />
 </selector>
\ No newline at end of file

From d6e2edaf1dc3006f731d2c44b44cb3d375540e8a Mon Sep 17 00:00:00 2001
From: Bennet Brunsen <brunsen@ubilabs.net>
Date: Thu, 2 Jun 2016 10:17:45 +0200
Subject: [PATCH 48/92] Adjust about fragment for land scape

---
 .../res/layout/fragment_about.xml             | 20 ++++++++++---------
 .../res/layout/fragment_about.xml             |  1 -
 .../app/ui/fragments/AboutFragment.java       |  4 ++--
 3 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/mobile/com.sap.sailing.android.shared/res/layout/fragment_about.xml b/mobile/com.sap.sailing.android.shared/res/layout/fragment_about.xml
index 103aecf424b..2ee93d3d29a 100644
--- a/mobile/com.sap.sailing.android.shared/res/layout/fragment_about.xml
+++ b/mobile/com.sap.sailing.android.shared/res/layout/fragment_about.xml
@@ -2,6 +2,7 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent">
+
     <View
         android:layout_width="match_parent"
         android:layout_height="@dimen/toolbar_separator_height"
@@ -14,7 +15,7 @@
         android:layout_centerInParent="true"
         />
 
-    <com.sap.sailing.android.shared.ui.customviews.OpenSansButton
+    <Button
         android:id="@+id/license_button"
         android:layout_width="match_parent"
         android:layout_height="@dimen/about_button_height"
@@ -30,7 +31,7 @@
         android:textSize="@dimen/about_button_text_size"
         android:textStyle="bold"/>
 
-    <com.sap.sailing.android.shared.ui.customviews.OpenSansButton
+    <Button
         android:id="@+id/eula_button"
         android:layout_width="match_parent"
         android:layout_height="@dimen/about_button_height"
@@ -46,23 +47,24 @@
         android:textSize="@dimen/about_button_text_size"
         android:textStyle="bold"/>
 
-    <com.sap.sailing.android.shared.ui.customviews.OpenSansTextView
+    <TextView
         android:id="@+id/system_information_application_version_header"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="@string/application_version"
-        android:layout_marginLeft="@dimen/about_button_side_margin"
+        android:layout_above="@+id/system_information_application_version"
         android:layout_alignParentLeft="true"
         android:layout_alignParentStart="true"
-        android:layout_below="@id/eula_button"/>
+        android:layout_marginLeft="@dimen/about_button_side_margin"
+        android:text="@string/application_version"/>
 
-    <com.sap.sailing.android.shared.ui.customviews.OpenSansTextView
+    <TextView
         android:id="@+id/system_information_application_version"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginLeft="@dimen/about_button_side_margin"
+        android:layout_alignParentBottom="true"
         android:layout_alignParentLeft="true"
         android:layout_alignParentStart="true"
-        android:layout_below="@id/system_information_application_version_header"/>
+        android:layout_marginBottom="@dimen/about_button_top_bottom_margin"
+        android:layout_marginLeft="@dimen/about_button_side_margin"/>
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_about.xml b/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_about.xml
index 12e0197e315..05b89421203 100644
--- a/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_about.xml
+++ b/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_about.xml
@@ -57,7 +57,6 @@
         android:layout_above="@+id/linearLayout"
         android:layout_alignParentLeft="true"
         android:layout_alignParentStart="true"
-        android:layout_below="@+id/toolbar_separator"
         android:layout_marginTop="@dimen/about_header_margin_top"
         android:fillViewport="false">
 
diff --git a/mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/ui/fragments/AboutFragment.java b/mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/ui/fragments/AboutFragment.java
index 25cc30fc0f0..993e7592434 100644
--- a/mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/ui/fragments/AboutFragment.java
+++ b/mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/ui/fragments/AboutFragment.java
@@ -5,9 +5,9 @@ import android.support.annotation.Nullable;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.TextView;
 
 import com.sap.sailing.android.buoy.positioning.app.R;
-import com.sap.sailing.android.shared.ui.customviews.OpenSansTextView;
 import com.sap.sailing.android.shared.util.AppUtils;
 import com.sap.sailing.android.shared.util.EulaHelper;
 import com.sap.sailing.android.shared.util.LicenseHelper;
@@ -41,7 +41,7 @@ public class AboutFragment extends BaseFragment {
                 EulaHelper.with(getActivity()).openEulaPage();
             }
         });
-        OpenSansTextView versionTextView = (OpenSansTextView) view.findViewById(R.id.system_information_application_version);
+        TextView versionTextView = (TextView) view.findViewById(R.id.system_information_application_version);
         versionTextView.setText(AppUtils.with(getActivity()).getBuildInfo());
         return view;
     }

From 68d95ce26d969b22c4549ee5b7cbbd9d3d214f46 Mon Sep 17 00:00:00 2001
From: Bennet Brunsen <brunsen@ubilabs.net>
Date: Thu, 2 Jun 2016 12:01:08 +0200
Subject: [PATCH 49/92] First fiori draft for buoy home fragment

---
 .../res/drawable-hdpi/white_arrow_right.png   | Bin
 .../res/drawable-mdpi/white_arrow_right.png   | Bin
 .../res/drawable-xhdpi/white_arrow_right.png  | Bin
 .../res/drawable-xxhdpi/white_arrow_right.png | Bin
 .../res/drawable/blue_button.xml              |   0
 .../res/drawable/fiori_main_background.xml}   |   0
 .../res/drawable/normal_btn_blue.xml          |   2 +-
 .../res/drawable/normal_btn_white.xml         |   0
 .../res/drawable/pressed_btn_blue.xml         |   2 +-
 .../res/drawable/pressed_btn_white.xml        |   0
 .../res/drawable/white_button.xml}            |   0
 .../res/drawable/yellow_arrow_right.png       | Bin 2670 -> 0 bytes
 .../res/layout/fragment_container.xml         |  31 +++++---
 .../res/layout/fragment_home.xml              |  63 +++++++--------
 .../res/layout/ragatta_listview_row.xml       |  35 ++++-----
 .../res/layout/regatta_listview_header.xml    |  33 ++++----
 .../res/values-land/dimens.xml                |   5 ++
 .../res/values/colors.xml                     |  13 ++++
 .../res/values/dimens.xml                     |  18 ++++-
 .../res/values/styles.xml                     |   5 ++
 .../res/drawable/launch_screen.xml            |   2 +-
 .../res/layout/activity_tracking.xml          |   2 +-
 .../res/layout/fragment_container.xml         |  55 -------------
 .../res/layout/fragment_home.xml              |  73 ------------------
 .../res/layout/fragment_regatta.xml           |   2 +-
 .../res/layout/ragatta_listview_row.xml       |  36 ---------
 .../res/layout/regatta_listview_header.xml    |  23 ------
 .../res/values/colors.xml                     |  12 ---
 .../res/values/dimens.xml                     |   8 --
 .../res/values/theme.xml                      |   5 --
 .../res/layout/mark_listview_row.xml          |   2 +-
 .../res/values-v21/theme.xml                  |  11 +++
 .../app/adapter/RegattaAdapter.java           |   5 +-
 33 files changed, 136 insertions(+), 307 deletions(-)
 rename mobile/{com.sap.sailing.android.tracking.app => com.sap.sailing.android.shared}/res/drawable-hdpi/white_arrow_right.png (100%)
 rename mobile/{com.sap.sailing.android.tracking.app => com.sap.sailing.android.shared}/res/drawable-mdpi/white_arrow_right.png (100%)
 rename mobile/{com.sap.sailing.android.tracking.app => com.sap.sailing.android.shared}/res/drawable-xhdpi/white_arrow_right.png (100%)
 rename mobile/{com.sap.sailing.android.tracking.app => com.sap.sailing.android.shared}/res/drawable-xxhdpi/white_arrow_right.png (100%)
 rename mobile/{com.sap.sailing.android.tracking.app => com.sap.sailing.android.shared}/res/drawable/blue_button.xml (100%)
 rename mobile/{com.sap.sailing.android.tracking.app/res/drawable/main_background.xml => com.sap.sailing.android.shared/res/drawable/fiori_main_background.xml} (100%)
 rename mobile/{com.sap.sailing.android.tracking.app => com.sap.sailing.android.shared}/res/drawable/normal_btn_blue.xml (75%)
 rename mobile/{com.sap.sailing.android.tracking.app => com.sap.sailing.android.shared}/res/drawable/normal_btn_white.xml (100%)
 rename mobile/{com.sap.sailing.android.tracking.app => com.sap.sailing.android.shared}/res/drawable/pressed_btn_blue.xml (75%)
 rename mobile/{com.sap.sailing.android.tracking.app => com.sap.sailing.android.shared}/res/drawable/pressed_btn_white.xml (100%)
 rename mobile/{com.sap.sailing.android.tracking.app/res/drawable/normal_button.xml => com.sap.sailing.android.shared/res/drawable/white_button.xml} (100%)
 delete mode 100644 mobile/com.sap.sailing.android.shared/res/drawable/yellow_arrow_right.png
 create mode 100644 mobile/com.sap.sailing.android.shared/res/values-land/dimens.xml
 delete mode 100644 mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_container.xml
 delete mode 100644 mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_home.xml
 delete mode 100644 mobile/com.sap.sailing.android.tracking.app/res/layout/ragatta_listview_row.xml
 delete mode 100644 mobile/com.sap.sailing.android.tracking.app/res/layout/regatta_listview_header.xml

diff --git a/mobile/com.sap.sailing.android.tracking.app/res/drawable-hdpi/white_arrow_right.png b/mobile/com.sap.sailing.android.shared/res/drawable-hdpi/white_arrow_right.png
similarity index 100%
rename from mobile/com.sap.sailing.android.tracking.app/res/drawable-hdpi/white_arrow_right.png
rename to mobile/com.sap.sailing.android.shared/res/drawable-hdpi/white_arrow_right.png
diff --git a/mobile/com.sap.sailing.android.tracking.app/res/drawable-mdpi/white_arrow_right.png b/mobile/com.sap.sailing.android.shared/res/drawable-mdpi/white_arrow_right.png
similarity index 100%
rename from mobile/com.sap.sailing.android.tracking.app/res/drawable-mdpi/white_arrow_right.png
rename to mobile/com.sap.sailing.android.shared/res/drawable-mdpi/white_arrow_right.png
diff --git a/mobile/com.sap.sailing.android.tracking.app/res/drawable-xhdpi/white_arrow_right.png b/mobile/com.sap.sailing.android.shared/res/drawable-xhdpi/white_arrow_right.png
similarity index 100%
rename from mobile/com.sap.sailing.android.tracking.app/res/drawable-xhdpi/white_arrow_right.png
rename to mobile/com.sap.sailing.android.shared/res/drawable-xhdpi/white_arrow_right.png
diff --git a/mobile/com.sap.sailing.android.tracking.app/res/drawable-xxhdpi/white_arrow_right.png b/mobile/com.sap.sailing.android.shared/res/drawable-xxhdpi/white_arrow_right.png
similarity index 100%
rename from mobile/com.sap.sailing.android.tracking.app/res/drawable-xxhdpi/white_arrow_right.png
rename to mobile/com.sap.sailing.android.shared/res/drawable-xxhdpi/white_arrow_right.png
diff --git a/mobile/com.sap.sailing.android.tracking.app/res/drawable/blue_button.xml b/mobile/com.sap.sailing.android.shared/res/drawable/blue_button.xml
similarity index 100%
rename from mobile/com.sap.sailing.android.tracking.app/res/drawable/blue_button.xml
rename to mobile/com.sap.sailing.android.shared/res/drawable/blue_button.xml
diff --git a/mobile/com.sap.sailing.android.tracking.app/res/drawable/main_background.xml b/mobile/com.sap.sailing.android.shared/res/drawable/fiori_main_background.xml
similarity index 100%
rename from mobile/com.sap.sailing.android.tracking.app/res/drawable/main_background.xml
rename to mobile/com.sap.sailing.android.shared/res/drawable/fiori_main_background.xml
diff --git a/mobile/com.sap.sailing.android.tracking.app/res/drawable/normal_btn_blue.xml b/mobile/com.sap.sailing.android.shared/res/drawable/normal_btn_blue.xml
similarity index 75%
rename from mobile/com.sap.sailing.android.tracking.app/res/drawable/normal_btn_blue.xml
rename to mobile/com.sap.sailing.android.shared/res/drawable/normal_btn_blue.xml
index 0b6f06c380f..123d392f145 100644
--- a/mobile/com.sap.sailing.android.tracking.app/res/drawable/normal_btn_blue.xml
+++ b/mobile/com.sap.sailing.android.shared/res/drawable/normal_btn_blue.xml
@@ -4,5 +4,5 @@
     <corners
         android:radius="@dimen/button_radius"/>
 
-    <solid android:color="@color/qr_code_button_normal"/>
+    <solid android:color="@color/blue_button_normal"/>
 </shape>
\ No newline at end of file
diff --git a/mobile/com.sap.sailing.android.tracking.app/res/drawable/normal_btn_white.xml b/mobile/com.sap.sailing.android.shared/res/drawable/normal_btn_white.xml
similarity index 100%
rename from mobile/com.sap.sailing.android.tracking.app/res/drawable/normal_btn_white.xml
rename to mobile/com.sap.sailing.android.shared/res/drawable/normal_btn_white.xml
diff --git a/mobile/com.sap.sailing.android.tracking.app/res/drawable/pressed_btn_blue.xml b/mobile/com.sap.sailing.android.shared/res/drawable/pressed_btn_blue.xml
similarity index 75%
rename from mobile/com.sap.sailing.android.tracking.app/res/drawable/pressed_btn_blue.xml
rename to mobile/com.sap.sailing.android.shared/res/drawable/pressed_btn_blue.xml
index e2098c90458..0ca776f1a61 100644
--- a/mobile/com.sap.sailing.android.tracking.app/res/drawable/pressed_btn_blue.xml
+++ b/mobile/com.sap.sailing.android.shared/res/drawable/pressed_btn_blue.xml
@@ -4,5 +4,5 @@
     <corners
         android:radius="@dimen/button_radius"/>
 
-    <solid android:color="@color/qr_code_button_pressed"/>
+    <solid android:color="@color/blue_button_pressed"/>
 </shape>
\ No newline at end of file
diff --git a/mobile/com.sap.sailing.android.tracking.app/res/drawable/pressed_btn_white.xml b/mobile/com.sap.sailing.android.shared/res/drawable/pressed_btn_white.xml
similarity index 100%
rename from mobile/com.sap.sailing.android.tracking.app/res/drawable/pressed_btn_white.xml
rename to mobile/com.sap.sailing.android.shared/res/drawable/pressed_btn_white.xml
diff --git a/mobile/com.sap.sailing.android.tracking.app/res/drawable/normal_button.xml b/mobile/com.sap.sailing.android.shared/res/drawable/white_button.xml
similarity index 100%
rename from mobile/com.sap.sailing.android.tracking.app/res/drawable/normal_button.xml
rename to mobile/com.sap.sailing.android.shared/res/drawable/white_button.xml
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/yellow_arrow_right.png b/mobile/com.sap.sailing.android.shared/res/drawable/yellow_arrow_right.png
deleted file mode 100644
index 174bb8d7fcd91cc9fe9dcff89b6a8810f6e92793..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2670
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

diff --git a/mobile/com.sap.sailing.android.shared/res/layout/fragment_container.xml b/mobile/com.sap.sailing.android.shared/res/layout/fragment_container.xml
index 0a01deb6ed3..30271b73897 100644
--- a/mobile/com.sap.sailing.android.shared/res/layout/fragment_container.xml
+++ b/mobile/com.sap.sailing.android.shared/res/layout/fragment_container.xml
@@ -1,46 +1,55 @@
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent">
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:layout_width="match_parent"
+              android:layout_height="match_parent"
+              android:orientation="vertical">
 
     <com.sap.sailing.android.shared.ui.customviews.OpenSansToolbar
-        xmlns:android="http://schemas.android.com/apk/res/android"
         android:id="@+id/toolbar"
+        xmlns:android="http://schemas.android.com/apk/res/android"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:theme="@style/ThemeOverlay.AppCompat.ActionBar">
+        android:theme="@style/AppTheme.Toolbar">
 
         <LinearLayout
-            android:orientation="vertical"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
+            android:orientation="vertical"
             android:padding="10dp">
 
-            <com.sap.sailing.android.shared.ui.customviews.OpenSansTextView
+            <TextView
                 android:id="@+id/toolbar_title"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
                 android:lines="1"
                 android:singleLine="true"
+                android:textColor="@color/toolbar_text_color"
                 android:textSize="16sp"/>
 
-            <com.sap.sailing.android.shared.ui.customviews.OpenSansTextView
+            <TextView
                 android:id="@+id/toolbar_subtitle"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
                 android:lines="1"
                 android:singleLine="true"
+                android:textColor="@color/toolbar_text_color"
                 android:textSize="12sp"/>
 
+
         </LinearLayout>
 
     </com.sap.sailing.android.shared.ui.customviews.OpenSansToolbar>
 
+    <View
+        android:id="@+id/toolbar_separator"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/toolbar_separator_height"
+        android:background="@color/separator_color"/>
+
     <FrameLayout
         android:id="@+id/content_frame"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_below="@id/toolbar"/>
+        android:layout_height="match_parent"/>
 
-</RelativeLayout>
\ No newline at end of file
+</LinearLayout>
\ No newline at end of file
diff --git a/mobile/com.sap.sailing.android.shared/res/layout/fragment_home.xml b/mobile/com.sap.sailing.android.shared/res/layout/fragment_home.xml
index ab50020f89d..2369c05d749 100644
--- a/mobile/com.sap.sailing.android.shared/res/layout/fragment_home.xml
+++ b/mobile/com.sap.sailing.android.shared/res/layout/fragment_home.xml
@@ -1,21 +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">
-
-    <View
-        android:id="@+id/toolbar_separator"
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/toolbar_separator_height"
-        android:layout_alignParentTop="true"
-        android:background="@color/sap_yellow"/>
+                android:layout_height="match_parent"
+                android:background="@drawable/fiori_main_background">
 
     <ImageView
         android:id="@+id/homeBackground"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_alignParentBottom="true"
-        android:layout_below="@id/toolbar_separator"
+        android:layout_above="@+id/scanQr"
         android:contentDescription="@string/empty"
         android:scaleType="centerCrop"
         android:src="@drawable/working_title"/>
@@ -23,60 +16,58 @@
     <RelativeLayout
         android:id="@+id/bottomLayout"
         android:layout_width="match_parent"
-        android:layout_height="@dimen/qr_code_label_height"
+        android:layout_height="50dp"
         android:layout_alignParentBottom="true"
         android:layout_alignParentLeft="true"
         android:layout_alignParentStart="true"
-        android:background="@color/black_transparent">
+        android:layout_marginLeft="@dimen/fragment_side_margin"
+        android:layout_marginRight="@dimen/fragment_side_margin">
 
-        <com.sap.sailing.android.shared.ui.customviews.OpenSansTextView
+        <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_centerHorizontal="true"
             android:layout_centerVertical="true"
             android:gravity="center"
             android:text="@string/scan_hint"
-            android:textColor="@color/white"/>
+            android:textColor="@color/fiori_text_color"
+            android:textSize="@dimen/default_text_size"/>
     </RelativeLayout>
 
-    <com.sap.sailing.android.shared.ui.customviews.OpenSansButton
+    <Button
         android:id="@+id/scanQr"
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/home_button_height"
+        android:layout_width="fill_parent"
+        android:layout_height="80dp"
         android:layout_above="@+id/noQrCode"
         android:layout_marginBottom="10dp"
-        android:layout_marginLeft="16dp"
-        android:layout_marginRight="16dp"
-        android:layout_marginTop="10dp"
-        android:background="@drawable/qr_button"
+        android:layout_marginLeft="@dimen/fragment_side_margin"
+        android:layout_marginRight="@dimen/fragment_side_margin"
+        android:layout_marginTop="20dp"
+        android:background="@drawable/blue_button"
         android:text="@string/scan_qr"
-        android:textAllCaps="true"
-        android:textSize="18sp"
-        android:textStyle="bold"/>
+        android:textSize="@dimen/highlight_text_size"/>
 
-    <com.sap.sailing.android.shared.ui.customviews.OpenSansButton
+    <Button
         android:id="@+id/noQrCode"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        android:layout_height="@dimen/no_qr_code_button_height"
         android:layout_above="@+id/bottomLayout"
-        android:layout_marginBottom="10dp"
-        android:layout_marginLeft="16dp"
-        android:layout_marginRight="16dp"
-        android:background="@drawable/rounded_btn_white"
+        android:layout_marginLeft="@dimen/fragment_side_margin"
+        android:layout_marginRight="@dimen/fragment_side_margin"
+        android:background="@drawable/white_button"
         android:paddingLeft="@dimen/activity_horizontal_margin"
         android:paddingRight="@dimen/activity_horizontal_margin"
         android:text="@string/no_qr_code"
-        android:textAllCaps="true"
-        android:textColor="@color/black"
-        android:textSize="18sp"/>
+        android:textColor="@color/fiori_text_color"
+        android:textSize="@dimen/button_text_size"/>
 
     <ListView
         android:id="@+id/listRegatta"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
+        android:layout_height="wrap_content"
         android:layout_above="@id/scanQr"
-        android:layout_below="@id/toolbar_separator"
-        android:divider="@android:color/white"
+        android:layout_alignParentTop="true"
+        android:divider="@color/separator_color"
         android:dividerHeight="1dp"/>
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/mobile/com.sap.sailing.android.shared/res/layout/ragatta_listview_row.xml b/mobile/com.sap.sailing.android.shared/res/layout/ragatta_listview_row.xml
index d1c52135bfb..8c89549c1e2 100644
--- a/mobile/com.sap.sailing.android.shared/res/layout/ragatta_listview_row.xml
+++ b/mobile/com.sap.sailing.android.shared/res/layout/ragatta_listview_row.xml
@@ -1,39 +1,36 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout
+<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="50dp"
-    android:background="@color/colorPrimary"
-    tools:ignore="Overdraw">
+    android:layout_height="80dp"
+    android:background="@color/list_item_background_color"
+    tools:ignore="Overdraw" >
 
     <ImageView
         android:id="@+id/nextPage"
-        android:layout_width="22dp"
-        android:layout_height="22dp"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
         android:layout_alignParentRight="true"
         android:layout_alignParentEnd="true"
-        android:layout_alignParentTop="true"
+        android:baselineAlignBottom="@+id/regattaName"
         android:contentDescription="@string/empty"
-        android:src="@drawable/yellow_arrow_right"
-        android:layout_marginTop="13dp"
-        android:layout_marginBottom="10dp"
-        android:layout_marginRight="14dp"
-        android:layout_marginEnd="14dp"
-        android:textColor="@color/white"/>
+        android:src="@drawable/white_arrow_right"
+        android:paddingTop="15dp"
+        android:layout_marginRight="10dp"
+        android:layout_marginEnd="10dp" />
 
-    <com.sap.sailing.android.shared.ui.customviews.OpenSansTextView
+    <TextView
         android:id="@+id/regattaName"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignParentLeft="true"
         android:layout_alignParentStart="true"
         android:layout_centerVertical="true"
-        android:layout_toLeftOf="@+id/nextPage"
-        android:layout_toStartOf="@+id/nextPage"
-        android:paddingLeft="16dp"
-        android:paddingRight="16dp"
+        android:textSize="18sp"
+        android:paddingLeft="@dimen/fragment_side_margin"
+        android:paddingRight="15dp"
         android:singleLine="true"
-        android:textColor="@color/white"/>
+        android:textColor="@color/fiori_text_color" />
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/mobile/com.sap.sailing.android.shared/res/layout/regatta_listview_header.xml b/mobile/com.sap.sailing.android.shared/res/layout/regatta_listview_header.xml
index f2da7d8f512..79aaa0c582b 100644
--- a/mobile/com.sap.sailing.android.shared/res/layout/regatta_listview_header.xml
+++ b/mobile/com.sap.sailing.android.shared/res/layout/regatta_listview_header.xml
@@ -1,26 +1,23 @@
 <?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="match_parent"
-                android:background="@color/colorPrimary"
-                tools:ignore="Overdraw">
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="@color/list_header_background_color">
 
-    <View
-        android:id="@+id/toolbar_separator"
-        android:layout_width="fill_parent"
-        android:layout_height="4dp"
-        android:layout_alignParentTop="true"
-        android:background="@color/sap_yellow"/>
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="50dp">
 
-    <com.sap.sailing.android.shared.ui.customviews.OpenSansTextView
+    <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_below="@id/toolbar_separator"
-        android:padding="16dp"
-        android:textSize="16sp"
-        android:background="@color/colorPrimary"
-        android:textColor="@color/white"
-        android:text="@string/your_regattas"/>
+        android:paddingLeft="@dimen/fragment_side_margin"
+        android:layout_gravity="center_vertical"
+        android:textSize="18sp"
+        android:textColor="@color/fiori_text_color"
+        android:text="@string/your_regattas" />
 
+    </LinearLayout>
+    
 </RelativeLayout>
\ No newline at end of file
diff --git a/mobile/com.sap.sailing.android.shared/res/values-land/dimens.xml b/mobile/com.sap.sailing.android.shared/res/values-land/dimens.xml
new file mode 100644
index 00000000000..c470737ab3e
--- /dev/null
+++ b/mobile/com.sap.sailing.android.shared/res/values-land/dimens.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="home_button_height">80dp</dimen>
+    <dimen name="qr_code_label_height">50dp</dimen>
+</resources>
\ No newline at end of file
diff --git a/mobile/com.sap.sailing.android.shared/res/values/colors.xml b/mobile/com.sap.sailing.android.shared/res/values/colors.xml
index 84cd56c6b9e..71d3f6408d5 100644
--- a/mobile/com.sap.sailing.android.shared/res/values/colors.xml
+++ b/mobile/com.sap.sailing.android.shared/res/values/colors.xml
@@ -49,4 +49,17 @@
     <color name="yellow_button_pressed">#D6B363</color>
 
     <color name="toolbar_text_color">@color/white</color>
+
+    <color name="separator_color">#d1d3d4</color>
+    <color name="list_header_background_color">#def1f1</color>
+    <color name="list_item_background_color">#f6fbfb</color>
+
+    <color name="fiori_primary_color">#009de0</color>
+    <color name="fiori_text_color">@color/black</color>
+
+    <color name="blue_button_normal">@color/fiori_primary_color</color>
+    <color name="blue_button_pressed">#007aad</color>
+
+    <color name="normal_button">#f3f3f3</color>
+    <color name="normal_button_pressed">#bfbfbf</color>
 </resources>
diff --git a/mobile/com.sap.sailing.android.shared/res/values/dimens.xml b/mobile/com.sap.sailing.android.shared/res/values/dimens.xml
index bd4cc6a9626..b0e21039240 100644
--- a/mobile/com.sap.sailing.android.shared/res/values/dimens.xml
+++ b/mobile/com.sap.sailing.android.shared/res/values/dimens.xml
@@ -21,16 +21,28 @@
     <dimen name="tab_space_plus1">3dp</dimen>
     <dimen name="tab_space_bottom_line">36sp</dimen>
     <dimen name="tab_space_unselected_top">6sp</dimen>
+
     <!-- Default screen margins, per the Android Design guidelines. -->
     <dimen name="activity_horizontal_margin">16dp</dimen>
-    <dimen name="toolbar_separator_height">4dp</dimen>
+
+    <!-- Fragment -->
+    <dimen name="fragment_side_margin">20dp</dimen>
+
+    <!-- Toolbar -->
+    <dimen name="toolbar_separator_height">1dp</dimen>
+    <dimen name="toolbar_left_padding">@dimen/fragment_side_margin</dimen>
 
     <!-- Values for buttons -->
     <dimen name="about_button_top_bottom_margin">10dp</dimen>
     <dimen name="about_button_side_margin">16dp</dimen>
     <dimen name="about_button_height">80dp</dimen>
     <dimen name="about_button_text_size">18sp</dimen>
-    <dimen name="home_button_height">80dp</dimen>
-    <dimen name="qr_code_label_height">50dp</dimen>
+    <dimen name="no_qr_code_button_height">50dp</dimen>
+    <dimen name="button_radius">3dp</dimen>
+    <dimen name="button_text_size">@dimen/default_text_size</dimen>
+
+    <!-- Values for text -->
+    <dimen name="default_text_size">16sp</dimen>
+    <dimen name="highlight_text_size">21sp</dimen>
 
 </resources>
\ No newline at end of file
diff --git a/mobile/com.sap.sailing.android.shared/res/values/styles.xml b/mobile/com.sap.sailing.android.shared/res/values/styles.xml
index 61e159eff19..c8b8bb8ae82 100644
--- a/mobile/com.sap.sailing.android.shared/res/values/styles.xml
+++ b/mobile/com.sap.sailing.android.shared/res/values/styles.xml
@@ -343,4 +343,9 @@
         <item name="android:textColor">@color/welter_light_gray</item>
     </style>
 
+    <style name="AppTheme.Toolbar" parent="ThemeOverlay.AppCompat.ActionBar">
+        <item name="android:textColorPrimary">@color/toolbar_text_color</item>
+        <item name="popupTheme">@style/ThemeOverlay.AppCompat.Dark</item>
+    </style>
+
 </resources>
\ No newline at end of file
diff --git a/mobile/com.sap.sailing.android.tracking.app/res/drawable/launch_screen.xml b/mobile/com.sap.sailing.android.tracking.app/res/drawable/launch_screen.xml
index 7c25e22c1dc..4ee35bc6b21 100644
--- a/mobile/com.sap.sailing.android.tracking.app/res/drawable/launch_screen.xml
+++ b/mobile/com.sap.sailing.android.tracking.app/res/drawable/launch_screen.xml
@@ -1,7 +1,7 @@
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
 
     <item
-        android:drawable="@drawable/main_background"/>
+        android:drawable="@drawable/fiori_main_background"/>
 
     <item android:bottom="60dp">
         <bitmap
diff --git a/mobile/com.sap.sailing.android.tracking.app/res/layout/activity_tracking.xml b/mobile/com.sap.sailing.android.tracking.app/res/layout/activity_tracking.xml
index 121f28e3987..d87bf0fba8c 100644
--- a/mobile/com.sap.sailing.android.tracking.app/res/layout/activity_tracking.xml
+++ b/mobile/com.sap.sailing.android.tracking.app/res/layout/activity_tracking.xml
@@ -1,7 +1,7 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:background="@drawable/main_background">
+                android:background="@drawable/fiori_main_background">
 
     <com.sap.sailing.android.shared.ui.customviews.OpenSansToolbar
         android:id="@+id/toolbar"
diff --git a/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_container.xml b/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_container.xml
deleted file mode 100644
index fcf94a20073..00000000000
--- a/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_container.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              android:layout_width="match_parent"
-              android:layout_height="match_parent"
-              android:orientation="vertical">
-
-    <com.sap.sailing.android.shared.ui.customviews.OpenSansToolbar
-        android:id="@+id/toolbar"
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:theme="@style/AppTheme.Toolbar">
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:orientation="vertical"
-            android:padding="10dp">
-
-            <com.sap.sailing.android.shared.ui.customviews.OpenSansTextView
-                android:id="@+id/toolbar_title"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:lines="1"
-                android:singleLine="true"
-                android:textColor="@color/toolbar_text_color"
-                android:textSize="16sp"/>
-
-            <com.sap.sailing.android.shared.ui.customviews.OpenSansTextView
-                android:id="@+id/toolbar_subtitle"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:lines="1"
-                android:singleLine="true"
-                android:textColor="@color/toolbar_text_color"
-                android:textSize="12sp"/>
-
-
-        </LinearLayout>
-
-    </com.sap.sailing.android.shared.ui.customviews.OpenSansToolbar>
-
-    <View
-        android:id="@+id/toolbar_separator"
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/toolbar_separator_height"
-        android:background="@color/separator_color"/>
-
-    <FrameLayout
-        android:id="@+id/content_frame"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"/>
-
-</LinearLayout>
\ No newline at end of file
diff --git a/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_home.xml b/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_home.xml
deleted file mode 100644
index 533cdecc83b..00000000000
--- a/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_home.xml
+++ /dev/null
@@ -1,73 +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="match_parent"
-                android:background="@drawable/main_background">
-
-    <ImageView
-        android:id="@+id/homeBackground"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_above="@+id/scanQr"
-        android:contentDescription="@string/empty"
-        android:scaleType="centerCrop"
-        android:src="@drawable/working_title"/>
-
-    <RelativeLayout
-        android:id="@+id/bottomLayout"
-        android:layout_width="match_parent"
-        android:layout_height="50dp"
-        android:layout_alignParentBottom="true"
-        android:layout_alignParentLeft="true"
-        android:layout_alignParentStart="true"
-        android:layout_marginLeft="@dimen/fragment_side_margin"
-        android:layout_marginRight="@dimen/fragment_side_margin">
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerHorizontal="true"
-            android:layout_centerVertical="true"
-            android:gravity="center"
-            android:text="@string/scan_hint"
-            android:textColor="@color/fiori_text_color"
-            android:textSize="@dimen/default_text_size"/>
-    </RelativeLayout>
-
-    <Button
-        android:id="@+id/scanQr"
-        android:layout_width="fill_parent"
-        android:layout_height="80dp"
-        android:layout_above="@+id/noQrCode"
-        android:layout_marginBottom="10dp"
-        android:layout_marginLeft="@dimen/fragment_side_margin"
-        android:layout_marginRight="@dimen/fragment_side_margin"
-        android:layout_marginTop="20dp"
-        android:background="@drawable/blue_button"
-        android:text="@string/scan_qr"
-        android:textSize="@dimen/highlight_text_size"/>
-
-    <Button
-        android:id="@+id/noQrCode"
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/no_qr_code_button_height"
-        android:layout_above="@+id/bottomLayout"
-        android:layout_marginLeft="@dimen/fragment_side_margin"
-        android:layout_marginRight="@dimen/fragment_side_margin"
-        android:background="@drawable/normal_btn_white"
-        android:paddingLeft="@dimen/activity_horizontal_margin"
-        android:paddingRight="@dimen/activity_horizontal_margin"
-        android:text="@string/no_qr_code"
-        android:textColor="@color/fiori_text_color"
-        android:textSize="@dimen/button_text_size"/>
-
-    <ListView
-        android:id="@+id/listRegatta"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_above="@id/scanQr"
-        android:layout_alignParentTop="true"
-        android:divider="@color/separator_color"
-        android:dividerHeight="1dp"/>
-
-</RelativeLayout>
\ No newline at end of file
diff --git a/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_regatta.xml b/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_regatta.xml
index 93206840f23..bc6493076c8 100644
--- a/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_regatta.xml
+++ b/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_regatta.xml
@@ -4,7 +4,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 xmlns:Tools="http://schemas.android.com/apk/res-auto"
-                android:background="@drawable/main_background">
+                android:background="@drawable/fiori_main_background">
 
     <RelativeLayout
         android:id="@+id/image"
diff --git a/mobile/com.sap.sailing.android.tracking.app/res/layout/ragatta_listview_row.xml b/mobile/com.sap.sailing.android.tracking.app/res/layout/ragatta_listview_row.xml
deleted file mode 100644
index 9a68a7497af..00000000000
--- a/mobile/com.sap.sailing.android.tracking.app/res/layout/ragatta_listview_row.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?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="80dp"
-    android:background="@color/list_item_background_color"
-    tools:ignore="Overdraw" >
-
-    <ImageView
-        android:id="@+id/nextPage"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentRight="true"
-        android:layout_alignParentEnd="true"
-        android:baselineAlignBottom="@+id/regattaName"
-        android:contentDescription="@string/empty"
-        android:src="@drawable/white_arrow_right"
-        android:paddingTop="15dp"
-        android:layout_marginRight="10dp"
-        android:layout_marginEnd="10dp" />
-
-    <com.sap.sailing.android.tracking.app.customviews.OpenSansTextView
-        android:id="@+id/regattaName"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentLeft="true"
-        android:layout_alignParentStart="true"
-        android:layout_centerVertical="true"
-        android:textSize="18sp"
-        android:paddingLeft="@dimen/fragment_side_margin"
-        android:paddingRight="15dp"
-        android:singleLine="true"
-        android:textColor="@color/fiori_text_color" />
-
-</RelativeLayout>
\ No newline at end of file
diff --git a/mobile/com.sap.sailing.android.tracking.app/res/layout/regatta_listview_header.xml b/mobile/com.sap.sailing.android.tracking.app/res/layout/regatta_listview_header.xml
deleted file mode 100644
index 79aaa0c582b..00000000000
--- a/mobile/com.sap.sailing.android.tracking.app/res/layout/regatta_listview_header.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?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="wrap_content"
-    android:background="@color/list_header_background_color">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="50dp">
-
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:paddingLeft="@dimen/fragment_side_margin"
-        android:layout_gravity="center_vertical"
-        android:textSize="18sp"
-        android:textColor="@color/fiori_text_color"
-        android:text="@string/your_regattas" />
-
-    </LinearLayout>
-    
-</RelativeLayout>
\ No newline at end of file
diff --git a/mobile/com.sap.sailing.android.tracking.app/res/values/colors.xml b/mobile/com.sap.sailing.android.tracking.app/res/values/colors.xml
index 53a6fc0ae64..7ba22d1ba55 100644
--- a/mobile/com.sap.sailing.android.tracking.app/res/values/colors.xml
+++ b/mobile/com.sap.sailing.android.tracking.app/res/values/colors.xml
@@ -3,9 +3,6 @@
     <color name="white">#FFFFFF</color>
     <color name="white_transparent">#55FFFFFF</color>
     <color name="white_less_transparent">#f3f3f3</color>
-    <color name="separator_color">#d1d3d4</color>
-    <color name="list_header_background_color">#def1f1</color>
-    <color name="list_item_background_color">#f6fbfb</color>
     <color name="green">#00FF00</color>
     <color name="gray">#333333</color>
     <color name="darker_gray">#242424</color>
@@ -18,21 +15,12 @@
     <color name="toolbar_text_color">@color/black</color>
     <color name="toolbar_background">@color/white</color>
 
-    <color name="fiori_primary_color">#009de0</color>
-    <color name="fiori_text_color">@color/black</color>
-
     <color name="start_tracking_button_normal">#0e7733</color>
     <color name="start_tracking_button_pressed">#08451e</color>
 
     <color name="stop_tracking_button_normal">#cd201b</color>
     <color name="stop_tracking_button_pressed">#991814</color>
 
-    <color name="qr_code_button_normal">@color/fiori_primary_color</color>
-    <color name="qr_code_button_pressed">#007aad</color>
-
-    <color name="normal_button">#f3f3f3</color>
-    <color name="normal_button_pressed">#bfbfbf</color>
-
     <color name="competitor_background_color">#B3f3f3f3</color>
     
     <color name="tracking_status_row_color">#f6fbfb</color>
diff --git a/mobile/com.sap.sailing.android.tracking.app/res/values/dimens.xml b/mobile/com.sap.sailing.android.tracking.app/res/values/dimens.xml
index 71c74c26997..a5028938f55 100644
--- a/mobile/com.sap.sailing.android.tracking.app/res/values/dimens.xml
+++ b/mobile/com.sap.sailing.android.tracking.app/res/values/dimens.xml
@@ -7,20 +7,12 @@
     <!-- Values for regatta buttons-->
     <dimen name="regatta_button_layout_height">140dp</dimen>
     <dimen name="regatta_button_height">@dimen/no_qr_code_button_height</dimen>
-    <dimen name="fragment_side_margin">20dp</dimen>
-    <dimen name="toolbar_left_padding">@dimen/fragment_side_margin</dimen>
     <dimen name="regatta_button_margin">10dp</dimen>
     <dimen name="regatta_button_padding">10dp</dimen>
     <dimen name="tracking_button_height">80dp</dimen>
-    <dimen name="toolbar_separator_height">1dp</dimen>
-    <dimen name="button_text_size">@dimen/default_text_size</dimen>
-    <dimen name="default_text_size">16sp</dimen>
-    <dimen name="highlight_text_size">21sp</dimen>
     <dimen name="tracking_button_text_size">@dimen/highlight_text_size</dimen>
-    <dimen name="button_radius">3dp</dimen>
     <dimen name="regatta_start_date_side_margin">22dp</dimen>
     <dimen name="countdown_separator_height">35dp</dimen>
     <dimen name="countdown_separator_width">2dp</dimen>
-    <dimen name="no_qr_code_button_height">50dp</dimen>
 
 </resources>
diff --git a/mobile/com.sap.sailing.android.tracking.app/res/values/theme.xml b/mobile/com.sap.sailing.android.tracking.app/res/values/theme.xml
index 5cb4bab6aa6..6a50c136930 100644
--- a/mobile/com.sap.sailing.android.tracking.app/res/values/theme.xml
+++ b/mobile/com.sap.sailing.android.tracking.app/res/values/theme.xml
@@ -25,11 +25,6 @@
         <item name="buttonStyle">@style/buttonStyle</item>
     </style>
 
-    <style name="AppTheme.Toolbar" parent="ThemeOverlay.AppCompat.ActionBar">
-        <item name="android:textColorPrimary">@color/toolbar_text_color</item>
-        <item name="popupTheme">@style/ThemeOverlay.AppCompat.Dark</item>
-    </style>
-
     <style name="launchScreenTheme" parent="Theme.AppCompat.NoActionBar">
         <item name="android:windowBackground">@drawable/launch_screen</item>
     </style>
diff --git a/mobile/com.sap.sailing.buoy.positioning/res/layout/mark_listview_row.xml b/mobile/com.sap.sailing.buoy.positioning/res/layout/mark_listview_row.xml
index 04d4b1e1914..ae29a8c028a 100644
--- a/mobile/com.sap.sailing.buoy.positioning/res/layout/mark_listview_row.xml
+++ b/mobile/com.sap.sailing.buoy.positioning/res/layout/mark_listview_row.xml
@@ -13,7 +13,7 @@
         android:layout_marginRight="14dp"
         android:layout_centerVertical="true"
         android:contentDescription="@string/empty"
-        android:src="@drawable/yellow_arrow_right"
+        android:src="@drawable/white_arrow_right"
         android:textColor="@color/white"/>
 
     <com.sap.sailing.android.shared.ui.customviews.OpenSansTextView
diff --git a/mobile/com.sap.sailing.buoy.positioning/res/values-v21/theme.xml b/mobile/com.sap.sailing.buoy.positioning/res/values-v21/theme.xml
index 52ba22ea4de..0b6c9a2dd4d 100644
--- a/mobile/com.sap.sailing.buoy.positioning/res/values-v21/theme.xml
+++ b/mobile/com.sap.sailing.buoy.positioning/res/values-v21/theme.xml
@@ -3,6 +3,8 @@
 
     <style name="AppTheme" parent="AppTheme.Base">
         <!-- Customize your theme using Material Design here. -->
+        <item name="buttonStyle">@style/shadowLessButtonStyle</item>
+        <item name="android:colorPrimaryDark">@color/fiori_primary_color</item>
     </style>
 
     <style name="Divider">
@@ -10,4 +12,13 @@
         <item name="android:layout_height">1dp</item>
         <item name="android:background">?android:attr/listDivider</item>
     </style>
+
+    <style name="shadowLessButtonStyle" parent="@android:style/Widget.Material.Button.Borderless">
+        <item name="android:textAppearance">@style/Base.TextAppearance.AppCompat.Button</item>
+        <item name="android:textAllCaps">false</item>
+        <item name="android:textColor">@color/white</item>
+        <item name="android:elevation">0dp</item>
+        <item name="android:stateListAnimator">@null</item>
+    </style>
+
 </resources>
diff --git a/mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/adapter/RegattaAdapter.java b/mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/adapter/RegattaAdapter.java
index 14b85fcfdf8..0de525d2148 100644
--- a/mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/adapter/RegattaAdapter.java
+++ b/mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/adapter/RegattaAdapter.java
@@ -3,10 +3,11 @@ package com.sap.sailing.android.buoy.positioning.app.adapter;
 import android.content.Context;
 import android.database.Cursor;
 import android.view.View;
+import android.widget.TextView;
+
 import com.sap.sailing.android.buoy.positioning.app.R;
 import com.sap.sailing.android.buoy.positioning.app.provider.AnalyticsContract;
 import com.sap.sailing.android.shared.ui.adapters.AbstractRegattaAdapter;
-import com.sap.sailing.android.shared.ui.customviews.OpenSansTextView;
 
 public class RegattaAdapter extends AbstractRegattaAdapter {
 
@@ -16,7 +17,7 @@ public class RegattaAdapter extends AbstractRegattaAdapter {
 
     @Override
     public void bindView(View view, Context context, Cursor cursor) {
-        OpenSansTextView name = (OpenSansTextView) view.findViewById(R.id.regattaName);
+        TextView name = (TextView) view.findViewById(R.id.regattaName);
         if (name != null) {
             String text = cursor.getString(cursor.getColumnIndex(AnalyticsContract.Leaderboard.LEADERBOARD_NAME));
             name.setText(text);

From 5842388eeb26d1463a117ce7067ddd038bec291a Mon Sep 17 00:00:00 2001
From: Bennet Brunsen <brunsen@ubilabs.net>
Date: Thu, 2 Jun 2016 12:44:35 +0200
Subject: [PATCH 50/92] Fiori design adjustments for buoy home in landscape

---
 .../res/layout-land/fragment_home.xml         | 84 ++++++++-----------
 .../res/values-land/dimens.xml                |  1 +
 .../res/values/colors.xml                     |  3 +-
 .../res/values/colors.xml                     |  3 -
 .../app/ui/activities/StartActivity.java      |  5 ++
 5 files changed, 42 insertions(+), 54 deletions(-)

diff --git a/mobile/com.sap.sailing.android.shared/res/layout-land/fragment_home.xml b/mobile/com.sap.sailing.android.shared/res/layout-land/fragment_home.xml
index ab2790cff58..6d1436f151d 100644
--- a/mobile/com.sap.sailing.android.shared/res/layout-land/fragment_home.xml
+++ b/mobile/com.sap.sailing.android.shared/res/layout-land/fragment_home.xml
@@ -1,80 +1,64 @@
 <?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="match_parent">
-
-    <View
-        android:id="@+id/toolbar_separator"
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/toolbar_separator_height"
-        android:layout_alignParentTop="true"
-        android:background="@color/sap_yellow"/>
+                android:layout_height="match_parent"
+                android:background="@drawable/fiori_main_background">
 
     <ImageView
         android:id="@+id/homeBackground"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_alignParentBottom="true"
+        android:layout_above="@+id/two_buttons_layout"
+        android:layout_alignParentTop="true"
         android:contentDescription="@string/empty"
-        android:layout_below="@id/toolbar_separator"
         android:scaleType="centerCrop"
         android:src="@drawable/working_title"/>
 
-    <RelativeLayout
-        android:id="@+id/bottomLayout"
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/qr_code_label_height"
-        android:layout_alignParentBottom="true"
-        android:layout_alignParentLeft="true"
-        android:layout_alignParentStart="true"
-        android:background="@color/black_transparent"
-        >
 
-        <com.sap.sailing.android.shared.ui.customviews.OpenSansTextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerHorizontal="true"
-            android:layout_centerVertical="true"
-            android:gravity="center"
-            android:text="@string/scan_hint"
-            android:textColor="@color/white"/>
-    </RelativeLayout>
+    <TextView
+        android:id="@+id/scan_hint_text"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentBottom="true"
+        android:layout_centerHorizontal="true"
+        android:layout_marginBottom="@dimen/home_land_margin"
+        android:text="@string/scan_hint"
+        android:textColor="@color/fiori_text_color"/>
 
     <LinearLayout
         android:id="@+id/two_buttons_layout"
-        android:orientation="horizontal"
-        android:layout_above="@+id/bottomLayout"
-        android:layout_width="fill_parent"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginTop="10dp"
+        android:layout_above="@+id/scan_hint_text"
+        android:layout_marginBottom="@dimen/home_land_margin"
+        android:layout_marginTop="@dimen/home_land_margin"
+        android:orientation="horizontal"
         >
 
-        <com.sap.sailing.android.shared.ui.customviews.OpenSansButton
+        <Button
             android:id="@+id/noQrCode"
-            android:layout_weight="1"
             android:layout_width="0dp"
             android:layout_height="@dimen/home_button_height"
-            android:layout_marginLeft="10dp"
-            android:layout_marginRight="10dp"
+            android:layout_marginLeft="@dimen/home_land_margin"
+            android:layout_marginRight="@dimen/home_land_margin"
+            android:layout_weight="0.4"
+            android:background="@drawable/white_button"
             android:paddingLeft="@dimen/activity_horizontal_margin"
             android:paddingRight="@dimen/activity_horizontal_margin"
-            android:background="@drawable/rounded_btn_white"
-            android:textColor="@color/black"
-            android:text="@string/no_qr_code"/>
+            android:text="@string/no_qr_code"
+            android:textColor="@color/fiori_text_color"/>
 
-        <com.sap.sailing.android.shared.ui.customviews.OpenSansButton
+        <Button
             android:id="@+id/scanQr"
-            android:layout_weight="1"
             android:layout_width="0dp"
             android:layout_height="@dimen/home_button_height"
-            android:layout_marginLeft="10dp"
-            android:layout_marginRight="10dp"
-            android:layout_marginBottom="10dp"
-            android:background="@drawable/rounded_btn_yellow"
+            android:layout_marginLeft="@dimen/home_land_margin"
+            android:layout_marginRight="@dimen/home_land_margin"
+            android:layout_weight="0.6"
+            android:background="@drawable/blue_button"
+            android:text="@string/scan_qr"
             android:textAllCaps="true"
-            android:textStyle="bold"
-            android:text="@string/scan_qr"/>
+            android:textStyle="bold"/>
 
 
     </LinearLayout>
@@ -85,8 +69,8 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_above="@id/two_buttons_layout"
-        android:layout_below="@id/toolbar_separator"
-        android:divider="@android:color/white"
+        android:layout_alignParentTop="true"
+        android:divider="@color/separator_color"
         android:dividerHeight="1dp"
         >
     </ListView>
diff --git a/mobile/com.sap.sailing.android.shared/res/values-land/dimens.xml b/mobile/com.sap.sailing.android.shared/res/values-land/dimens.xml
index c470737ab3e..f26f249b4e6 100644
--- a/mobile/com.sap.sailing.android.shared/res/values-land/dimens.xml
+++ b/mobile/com.sap.sailing.android.shared/res/values-land/dimens.xml
@@ -2,4 +2,5 @@
 <resources>
     <dimen name="home_button_height">80dp</dimen>
     <dimen name="qr_code_label_height">50dp</dimen>
+    <dimen name="home_land_margin">10dp</dimen>
 </resources>
\ No newline at end of file
diff --git a/mobile/com.sap.sailing.android.shared/res/values/colors.xml b/mobile/com.sap.sailing.android.shared/res/values/colors.xml
index 71d3f6408d5..b8b85ffe5ec 100644
--- a/mobile/com.sap.sailing.android.shared/res/values/colors.xml
+++ b/mobile/com.sap.sailing.android.shared/res/values/colors.xml
@@ -48,7 +48,8 @@
     <color name="colorPrimary">@color/gray</color>
     <color name="yellow_button_pressed">#D6B363</color>
 
-    <color name="toolbar_text_color">@color/white</color>
+    <color name="toolbar_text_color">@color/black</color>
+    <color name="toolbar_background">@color/white</color>
 
     <color name="separator_color">#d1d3d4</color>
     <color name="list_header_background_color">#def1f1</color>
diff --git a/mobile/com.sap.sailing.android.tracking.app/res/values/colors.xml b/mobile/com.sap.sailing.android.tracking.app/res/values/colors.xml
index 7ba22d1ba55..6bbe18aa2e2 100644
--- a/mobile/com.sap.sailing.android.tracking.app/res/values/colors.xml
+++ b/mobile/com.sap.sailing.android.tracking.app/res/values/colors.xml
@@ -12,9 +12,6 @@
     <color name="colorPrimaryDark">@color/colorPrimary</color>
     <color name="colorAccent">@color/fiori_primary_color</color>
 
-    <color name="toolbar_text_color">@color/black</color>
-    <color name="toolbar_background">@color/white</color>
-
     <color name="start_tracking_button_normal">#0e7733</color>
     <color name="start_tracking_button_pressed">#08451e</color>
 
diff --git a/mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/ui/activities/StartActivity.java b/mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/ui/activities/StartActivity.java
index b66c8205299..c52c1512f15 100644
--- a/mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/ui/activities/StartActivity.java
+++ b/mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/ui/activities/StartActivity.java
@@ -1,6 +1,7 @@
 package com.sap.sailing.android.buoy.positioning.app.ui.activities;
 
 import android.content.Intent;
+import android.graphics.drawable.ColorDrawable;
 import android.os.Bundle;
 import android.view.Menu;
 import android.view.MenuInflater;
@@ -22,6 +23,10 @@ public class StartActivity extends AbstractStartActivity {
         if (getSupportActionBar() != null) {
             getSupportActionBar().setTitle(getString(R.string.title_activity_start));
             getSupportActionBar().setHomeButtonEnabled(false);
+            ColorDrawable backgroundDrawable = new ColorDrawable(getResources().getColor(R.color.toolbar_background));
+            getSupportActionBar().setBackgroundDrawable(backgroundDrawable);
+            int sidePadding = (int) getResources().getDimension(R.dimen.toolbar_left_padding);
+            toolbar.setPadding(sidePadding, 0, 0, 0);
         }
         replaceFragment(R.id.content_frame, new HomeFragment());
 

From 9ee2adc8edd7a63057ad0f310f4e2b8e23af25b9 Mon Sep 17 00:00:00 2001
From: Bennet Brunsen <brunsen@ubilabs.net>
Date: Thu, 2 Jun 2016 12:56:44 +0200
Subject: [PATCH 51/92] Adjust settings toolbar for fiori color scheme

---
 .../res/layout/pref_with_actionbar.xml                    | 7 +++----
 .../positioning/app/ui/activities/SettingActivity.java    | 8 +++++---
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/mobile/com.sap.sailing.android.shared/res/layout/pref_with_actionbar.xml b/mobile/com.sap.sailing.android.shared/res/layout/pref_with_actionbar.xml
index bd0c4e5e861..f941de48b4a 100644
--- a/mobile/com.sap.sailing.android.shared/res/layout/pref_with_actionbar.xml
+++ b/mobile/com.sap.sailing.android.shared/res/layout/pref_with_actionbar.xml
@@ -18,7 +18,7 @@
             android:layout_height="match_parent"
             android:padding="10dp">
 
-            <com.sap.sailing.android.shared.ui.customviews.OpenSansTextView
+            <TextView
                 android:id="@+id/toolbar_title"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -27,7 +27,7 @@
                 android:singleLine="true"
                 android:textSize="16sp"/>
 
-            <com.sap.sailing.android.shared.ui.customviews.OpenSansTextView
+            <TextView
                 android:id="@+id/toolbar_subtitle"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -39,12 +39,11 @@
         </LinearLayout>
 
     </com.sap.sailing.android.shared.ui.customviews.OpenSansToolbar>
-
     <View
         android:id="@+id/toolbar_separator"
         android:layout_width="fill_parent"
         android:layout_height="@dimen/toolbar_separator_height"
-        android:background="@color/sap_yellow"/>
+        android:background="@color/separator_color"/>
 
     <FrameLayout
         android:id="@+id/content_frame"
diff --git a/mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/ui/activities/SettingActivity.java b/mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/ui/activities/SettingActivity.java
index 0911e033128..f97360a1cc4 100644
--- a/mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/ui/activities/SettingActivity.java
+++ b/mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/ui/activities/SettingActivity.java
@@ -1,5 +1,6 @@
 package com.sap.sailing.android.buoy.positioning.app.ui.activities;
 
+import android.graphics.drawable.ColorDrawable;
 import android.os.Bundle;
 import android.support.v7.app.AppCompatActivity;
 import android.view.View;
@@ -25,7 +26,6 @@ public class SettingActivity extends AppCompatActivity {
         if (toolbar != null) {
             toolbar.hideSubtitle();
             toolbar.setTitleSize(20);
-            toolbar.setBackgroundColor(getResources().getColor(R.color.colorPrimary));
             toolbar.setNavigationOnClickListener(new View.OnClickListener() {
                 @Override
                 public void onClick(View v) {
@@ -33,13 +33,15 @@ public class SettingActivity extends AppCompatActivity {
                 }
             });
             setSupportActionBar(toolbar);
-            toolbar.setBackgroundColor(getResources().getColor(R.color.colorPrimary));
+            ColorDrawable backgroundDrawable = new ColorDrawable(getResources().getColor(R.color.toolbar_background));
+            getSupportActionBar().setBackgroundDrawable(backgroundDrawable);
+            int sidePadding = (int) getResources().getDimension(R.dimen.toolbar_left_padding);
+            toolbar.setPadding(sidePadding, 0, 0, 0);
         }
         if (getSupportActionBar() != null) {
             getSupportActionBar().setDisplayHomeAsUpEnabled(true);
             getSupportActionBar().setHomeButtonEnabled(true);
             toolbar.setNavigationIcon(R.drawable.sap_logo_64dp);
-            toolbar.setPadding(20, 0, 0, 0);
             getSupportActionBar().setTitle(getString(R.string.settings));
         }
     }

From caf617a7aeb582ec348bee2f175a8400c0f8bc5d Mon Sep 17 00:00:00 2001
From: Bennet Brunsen <brunsen@ubilabs.net>
Date: Thu, 2 Jun 2016 14:28:20 +0200
Subject: [PATCH 52/92] Adjust buoy regatta toolbar for fiori color scheme

---
 .../res/layout/fragment_buoy_postion_overview.xml         | 5 -----
 .../positioning/app/ui/activities/RegattaActivity.java    | 8 +++++---
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/mobile/com.sap.sailing.buoy.positioning/res/layout/fragment_buoy_postion_overview.xml b/mobile/com.sap.sailing.buoy.positioning/res/layout/fragment_buoy_postion_overview.xml
index 1463a397ced..54d60e65a3e 100644
--- a/mobile/com.sap.sailing.buoy.positioning/res/layout/fragment_buoy_postion_overview.xml
+++ b/mobile/com.sap.sailing.buoy.positioning/res/layout/fragment_buoy_postion_overview.xml
@@ -5,11 +5,6 @@
               android:background="@color/black_transparent"
               android:orientation="vertical">
 
-    <View
-        android:layout_width="fill_parent"
-        android:layout_height="@dimen/toolbar_separator_height"
-        android:background="@color/sap_yellow"/>
-
     <com.sap.sailing.android.shared.ui.customviews.OpenSansTextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
diff --git a/mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/ui/activities/RegattaActivity.java b/mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/ui/activities/RegattaActivity.java
index a8625ff08c4..0131b077f21 100644
--- a/mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/ui/activities/RegattaActivity.java
+++ b/mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/ui/activities/RegattaActivity.java
@@ -6,6 +6,7 @@ import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.ServiceConnection;
+import android.graphics.drawable.ColorDrawable;
 import android.os.Bundle;
 import android.os.IBinder;
 import android.view.Menu;
@@ -56,14 +57,15 @@ public class RegattaActivity extends AbstractRegattaActivity {
             toolbar.hideSubtitle();
             toolbar.setTitleSize(20);
             setSupportActionBar(toolbar);
-            toolbar.setBackgroundColor(getResources().getColor(R.color.colorPrimary));
+            ColorDrawable backgroundDrawable = new ColorDrawable(getResources().getColor(R.color.toolbar_background));
+            getSupportActionBar().setBackgroundDrawable(backgroundDrawable);
+            int sidePadding = (int) getResources().getDimension(R.dimen.toolbar_left_padding);
+            toolbar.setPadding(sidePadding, 0, 0, 0);
         }
         if (getSupportActionBar() != null) {
             getSupportActionBar().setDisplayHomeAsUpEnabled(true);
             getSupportActionBar().setHomeButtonEnabled(true);
             toolbar.setNavigationIcon(R.drawable.sap_logo_64dp);
-            toolbar.setPadding(20, 0, 0, 0);
-            toolbar.setBackgroundColor(getResources().getColor(R.color.colorPrimary));
             getSupportActionBar().setTitle(leaderboardName);
         }
         RegattaFragment regattaFragment = new RegattaFragment();

From df3607ae7d0838e1ba4a95b70730223a217ceec7 Mon Sep 17 00:00:00 2001
From: Bennet Brunsen <brunsen@ubilabs.net>
Date: Thu, 2 Jun 2016 14:37:47 +0200
Subject: [PATCH 53/92] Adjust buoy ping toolbar for fiori color scheme

---
 .../res/layout-land/fragment_buoy_postion_detail.xml       | 5 -----
 .../res/layout/fragment_buoy_postion_detail.xml            | 5 -----
 .../positioning/app/ui/activities/PositioningActivity.java | 7 +++++--
 3 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/mobile/com.sap.sailing.buoy.positioning/res/layout-land/fragment_buoy_postion_detail.xml b/mobile/com.sap.sailing.buoy.positioning/res/layout-land/fragment_buoy_postion_detail.xml
index 05a82c9ba03..1ed138e84c4 100644
--- a/mobile/com.sap.sailing.buoy.positioning/res/layout-land/fragment_buoy_postion_detail.xml
+++ b/mobile/com.sap.sailing.buoy.positioning/res/layout-land/fragment_buoy_postion_detail.xml
@@ -8,11 +8,6 @@
               android:paddingLeft="0dp"
               android:paddingRight="0dp">
 
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/toolbar_separator_height"
-        android:background="@color/sap_yellow"/>
-
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
diff --git a/mobile/com.sap.sailing.buoy.positioning/res/layout/fragment_buoy_postion_detail.xml b/mobile/com.sap.sailing.buoy.positioning/res/layout/fragment_buoy_postion_detail.xml
index bddaf4a76a9..58d9a111933 100644
--- a/mobile/com.sap.sailing.buoy.positioning/res/layout/fragment_buoy_postion_detail.xml
+++ b/mobile/com.sap.sailing.buoy.positioning/res/layout/fragment_buoy_postion_detail.xml
@@ -8,11 +8,6 @@
               android:paddingLeft="0dp"
               android:paddingRight="0dp">
 
-    <View
-        android:layout_width="fill_parent"
-        android:layout_height="@dimen/toolbar_separator_height"
-        android:background="@color/sap_yellow"/>
-
     <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="0dp"
diff --git a/mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/ui/activities/PositioningActivity.java b/mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/ui/activities/PositioningActivity.java
index 1fa2b99306e..260c05b5fcc 100644
--- a/mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/ui/activities/PositioningActivity.java
+++ b/mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/ui/activities/PositioningActivity.java
@@ -3,6 +3,7 @@ package com.sap.sailing.android.buoy.positioning.app.ui.activities;
 import java.util.List;
 
 import android.content.Intent;
+import android.graphics.drawable.ColorDrawable;
 import android.os.Bundle;
 import android.view.Menu;
 import android.view.MenuInflater;
@@ -41,13 +42,15 @@ public class PositioningActivity extends BaseActivity implements pingListener {
             toolbar.hideSubtitle();
             toolbar.setTitleSize(20);
             setSupportActionBar(toolbar);
-            toolbar.setBackgroundColor(getResources().getColor(R.color.colorPrimary));
+            int sidePadding = (int) getResources().getDimension(R.dimen.toolbar_left_padding);
+            toolbar.setPadding(sidePadding, 0, 0, 0);
         }
         if (getSupportActionBar() != null) {
             getSupportActionBar().setDisplayHomeAsUpEnabled(true);
             getSupportActionBar().setHomeButtonEnabled(true);
+            ColorDrawable backgroundDrawable = new ColorDrawable(getResources().getColor(R.color.toolbar_background));
+            getSupportActionBar().setBackgroundDrawable(backgroundDrawable);
             toolbar.setNavigationIcon(R.drawable.sap_logo_64dp);
-            toolbar.setPadding(20, 0, 0, 0);
             getSupportActionBar().setTitle(getString(R.string.set_position));
         }
         BuoyFragment fragment = new BuoyFragment();

From ea581a4afcf774ac35e54f654b97de7fc766b64d Mon Sep 17 00:00:00 2001
From: Bennet Brunsen <brunsen@ubilabs.net>
Date: Thu, 2 Jun 2016 14:38:12 +0200
Subject: [PATCH 54/92] Fix lint warnings

---
 .../buoy/positioning/app/ui/activities/AboutActivity.java | 8 +++++---
 .../positioning/app/ui/activities/RegattaActivity.java    | 4 ++--
 .../positioning/app/ui/activities/SettingActivity.java    | 4 ++--
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/ui/activities/AboutActivity.java b/mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/ui/activities/AboutActivity.java
index 4c361476d07..4ac4edbacb9 100644
--- a/mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/ui/activities/AboutActivity.java
+++ b/mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/ui/activities/AboutActivity.java
@@ -1,5 +1,6 @@
 package com.sap.sailing.android.buoy.positioning.app.ui.activities;
 
+import android.graphics.drawable.ColorDrawable;
 import android.os.Bundle;
 import android.view.Menu;
 
@@ -18,14 +19,15 @@ public class AboutActivity extends BaseActivity {
             toolbar.hideSubtitle();
             toolbar.setTitleSize(20);
             setSupportActionBar(toolbar);
-            toolbar.setBackgroundColor(getResources().getColor(R.color.colorPrimary));
+            int sidePadding = (int) getResources().getDimension(R.dimen.toolbar_left_padding);
+            toolbar.setPadding(sidePadding, 0, 0, 0);
         }
         if (getSupportActionBar() != null) {
             getSupportActionBar().setDisplayHomeAsUpEnabled(true);
             getSupportActionBar().setHomeButtonEnabled(true);
+            ColorDrawable backgroundDrawable = new ColorDrawable(getResources().getColor(R.color.toolbar_background));
+            getSupportActionBar().setBackgroundDrawable(backgroundDrawable);
             toolbar.setNavigationIcon(R.drawable.sap_logo_64dp);
-            toolbar.setPadding(20, 0, 0, 0);
-            toolbar.setBackgroundColor(getResources().getColor(R.color.colorPrimary));
             getSupportActionBar().setTitle(R.string.about_this_app);
         }
         replaceFragment(R.id.content_frame, AboutFragment.newInstance());
diff --git a/mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/ui/activities/RegattaActivity.java b/mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/ui/activities/RegattaActivity.java
index 0131b077f21..ae89446969d 100644
--- a/mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/ui/activities/RegattaActivity.java
+++ b/mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/ui/activities/RegattaActivity.java
@@ -57,14 +57,14 @@ public class RegattaActivity extends AbstractRegattaActivity {
             toolbar.hideSubtitle();
             toolbar.setTitleSize(20);
             setSupportActionBar(toolbar);
-            ColorDrawable backgroundDrawable = new ColorDrawable(getResources().getColor(R.color.toolbar_background));
-            getSupportActionBar().setBackgroundDrawable(backgroundDrawable);
             int sidePadding = (int) getResources().getDimension(R.dimen.toolbar_left_padding);
             toolbar.setPadding(sidePadding, 0, 0, 0);
         }
         if (getSupportActionBar() != null) {
             getSupportActionBar().setDisplayHomeAsUpEnabled(true);
             getSupportActionBar().setHomeButtonEnabled(true);
+            ColorDrawable backgroundDrawable = new ColorDrawable(getResources().getColor(R.color.toolbar_background));
+            getSupportActionBar().setBackgroundDrawable(backgroundDrawable);
             toolbar.setNavigationIcon(R.drawable.sap_logo_64dp);
             getSupportActionBar().setTitle(leaderboardName);
         }
diff --git a/mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/ui/activities/SettingActivity.java b/mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/ui/activities/SettingActivity.java
index f97360a1cc4..b5fcd86c88e 100644
--- a/mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/ui/activities/SettingActivity.java
+++ b/mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/ui/activities/SettingActivity.java
@@ -33,14 +33,14 @@ public class SettingActivity extends AppCompatActivity {
                 }
             });
             setSupportActionBar(toolbar);
-            ColorDrawable backgroundDrawable = new ColorDrawable(getResources().getColor(R.color.toolbar_background));
-            getSupportActionBar().setBackgroundDrawable(backgroundDrawable);
             int sidePadding = (int) getResources().getDimension(R.dimen.toolbar_left_padding);
             toolbar.setPadding(sidePadding, 0, 0, 0);
         }
         if (getSupportActionBar() != null) {
             getSupportActionBar().setDisplayHomeAsUpEnabled(true);
             getSupportActionBar().setHomeButtonEnabled(true);
+            ColorDrawable backgroundDrawable = new ColorDrawable(getResources().getColor(R.color.toolbar_background));
+            getSupportActionBar().setBackgroundDrawable(backgroundDrawable);
             toolbar.setNavigationIcon(R.drawable.sap_logo_64dp);
             getSupportActionBar().setTitle(getString(R.string.settings));
         }

From e2b1c4ae34ea8e2d873df21e4c06843312649b42 Mon Sep 17 00:00:00 2001
From: Bennet Brunsen <brunsen@ubilabs.net>
Date: Thu, 2 Jun 2016 14:38:44 +0200
Subject: [PATCH 55/92] Remove yellow separator in buoy about fragment

---
 .../res/layout/fragment_about.xml                            | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/mobile/com.sap.sailing.android.shared/res/layout/fragment_about.xml b/mobile/com.sap.sailing.android.shared/res/layout/fragment_about.xml
index 2ee93d3d29a..1702a4496af 100644
--- a/mobile/com.sap.sailing.android.shared/res/layout/fragment_about.xml
+++ b/mobile/com.sap.sailing.android.shared/res/layout/fragment_about.xml
@@ -3,11 +3,6 @@
                 android:layout_width="match_parent"
                 android:layout_height="match_parent">
 
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/toolbar_separator_height"
-        android:background="@color/sap_yellow"/>
-
     <View
         android:id="@+id/center_anchor"
         android:layout_width="match_parent"

From 49dfd79ebc77fd9030af7467284f962fc7107806 Mon Sep 17 00:00:00 2001
From: Bennet Brunsen <brunsen@ubilabs.net>
Date: Thu, 2 Jun 2016 17:52:52 +0200
Subject: [PATCH 56/92] Adjust regatta fragment to match fiori design

---
 .../res/layout/ragatta_listview_row.xml       |  6 +-
 .../res/layout/regatta_listview_header.xml    |  4 +-
 .../res/values/dimens.xml                     |  6 ++
 .../layout/fragment_buoy_postion_overview.xml | 32 +++++---
 .../res/layout/mark_listview_row.xml          | 82 ++++++++++---------
 .../res/values-v21/theme.xml                  |  2 +-
 .../res/values/theme.xml                      |  2 +-
 7 files changed, 77 insertions(+), 57 deletions(-)

diff --git a/mobile/com.sap.sailing.android.shared/res/layout/ragatta_listview_row.xml b/mobile/com.sap.sailing.android.shared/res/layout/ragatta_listview_row.xml
index 8c89549c1e2..4f5b4365599 100644
--- a/mobile/com.sap.sailing.android.shared/res/layout/ragatta_listview_row.xml
+++ b/mobile/com.sap.sailing.android.shared/res/layout/ragatta_listview_row.xml
@@ -3,7 +3,7 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="80dp"
+    android:layout_height="@dimen/list_row_height"
     android:background="@color/list_item_background_color"
     tools:ignore="Overdraw" >
 
@@ -17,8 +17,8 @@
         android:contentDescription="@string/empty"
         android:src="@drawable/white_arrow_right"
         android:paddingTop="15dp"
-        android:layout_marginRight="10dp"
-        android:layout_marginEnd="10dp" />
+        android:layout_marginRight="@dimen/list_arrow_right_margin"
+        android:layout_marginEnd="@dimen/list_arrow_right_margin" />
 
     <TextView
         android:id="@+id/regattaName"
diff --git a/mobile/com.sap.sailing.android.shared/res/layout/regatta_listview_header.xml b/mobile/com.sap.sailing.android.shared/res/layout/regatta_listview_header.xml
index 79aaa0c582b..94ddd2b6a71 100644
--- a/mobile/com.sap.sailing.android.shared/res/layout/regatta_listview_header.xml
+++ b/mobile/com.sap.sailing.android.shared/res/layout/regatta_listview_header.xml
@@ -7,14 +7,14 @@
 
     <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="50dp">
+        android:layout_height="@dimen/list_header_height">
 
     <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:paddingLeft="@dimen/fragment_side_margin"
         android:layout_gravity="center_vertical"
-        android:textSize="18sp"
+        android:textSize="@dimen/list_header_text_size"
         android:textColor="@color/fiori_text_color"
         android:text="@string/your_regattas" />
 
diff --git a/mobile/com.sap.sailing.android.shared/res/values/dimens.xml b/mobile/com.sap.sailing.android.shared/res/values/dimens.xml
index b0e21039240..698721126a1 100644
--- a/mobile/com.sap.sailing.android.shared/res/values/dimens.xml
+++ b/mobile/com.sap.sailing.android.shared/res/values/dimens.xml
@@ -32,6 +32,11 @@
     <dimen name="toolbar_separator_height">1dp</dimen>
     <dimen name="toolbar_left_padding">@dimen/fragment_side_margin</dimen>
 
+    <!-- List -->
+    <dimen name="list_header_height">50dp</dimen>
+    <dimen name="list_row_height">80dp</dimen>
+    <dimen name="list_arrow_right_margin">10dp</dimen>
+
     <!-- Values for buttons -->
     <dimen name="about_button_top_bottom_margin">10dp</dimen>
     <dimen name="about_button_side_margin">16dp</dimen>
@@ -44,5 +49,6 @@
     <!-- Values for text -->
     <dimen name="default_text_size">16sp</dimen>
     <dimen name="highlight_text_size">21sp</dimen>
+    <dimen name="list_header_text_size">18sp</dimen>
 
 </resources>
\ No newline at end of file
diff --git a/mobile/com.sap.sailing.buoy.positioning/res/layout/fragment_buoy_postion_overview.xml b/mobile/com.sap.sailing.buoy.positioning/res/layout/fragment_buoy_postion_overview.xml
index 54d60e65a3e..6244d2b18c0 100644
--- a/mobile/com.sap.sailing.buoy.positioning/res/layout/fragment_buoy_postion_overview.xml
+++ b/mobile/com.sap.sailing.buoy.positioning/res/layout/fragment_buoy_postion_overview.xml
@@ -2,31 +2,39 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
               android:layout_width="match_parent"
               android:layout_height="match_parent"
-              android:background="@color/black_transparent"
+              android:background="@drawable/fiori_main_background"
               android:orientation="vertical">
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/list_header_height"
+        android:background="@color/list_header_background_color">
 
-    <com.sap.sailing.android.shared.ui.customviews.OpenSansTextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="7dp"
-        android:layout_marginLeft="16dp"
-        android:layout_marginTop="18dp"
-        android:text="@string/marks"
-        android:textSize="@dimen/buoy_overview_text_size"/>
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="16dp"
+            android:layout_gravity="center_vertical"
+            android:text="@string/marks"
+            android:textSize="@dimen/list_header_text_size"
+            android:textColor="@color/fiori_text_color"/>
+    </LinearLayout>
 
     <View style="@style/Divider"/>
 
     <ListView
         android:id="@+id/listMarks"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"/>
+        android:layout_height="wrap_content"
+        android:divider="@color/separator_color"
+        android:dividerHeight="1dp"/>
 
-    <com.sap.sailing.android.shared.ui.customviews.OpenSansTextView
+    <TextView
         android:id="@+id/no_marks"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:gravity="center"
         android:text="@string/no_marks_message"
         android:visibility="gone"
-        android:textSize="@dimen/buoy_overview_text_size"/>
+        android:textSize="@dimen/buoy_overview_text_size"
+        android:textColor="@color/fiori_text_color"/>
 </LinearLayout>
diff --git a/mobile/com.sap.sailing.buoy.positioning/res/layout/mark_listview_row.xml b/mobile/com.sap.sailing.buoy.positioning/res/layout/mark_listview_row.xml
index ae29a8c028a..c7c2e979ad6 100644
--- a/mobile/com.sap.sailing.buoy.positioning/res/layout/mark_listview_row.xml
+++ b/mobile/com.sap.sailing.buoy.positioning/res/layout/mark_listview_row.xml
@@ -2,46 +2,52 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content">
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/list_row_height"
+        android:background="@color/list_item_background_color">
 
-    <ImageView
-        android:layout_width="22dp"
-        android:layout_height="22dp"
-        android:layout_alignParentEnd="true"
-        android:layout_alignParentRight="true"
-        android:layout_marginBottom="10dp"
-        android:layout_marginEnd="14dp"
-        android:layout_marginRight="14dp"
-        android:layout_centerVertical="true"
-        android:contentDescription="@string/empty"
-        android:src="@drawable/white_arrow_right"
-        android:textColor="@color/white"/>
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentEnd="true"
+            android:layout_alignParentRight="true"
+            android:layout_marginBottom="10dp"
+            android:layout_marginRight="@dimen/list_arrow_right_margin"
+            android:layout_marginEnd="@dimen/list_arrow_right_margin"
+            android:layout_centerVertical="true"
+            android:contentDescription="@string/empty"
+            android:src="@drawable/white_arrow_right"
+            android:textColor="@color/fiori_text_color"/>
 
-    <com.sap.sailing.android.shared.ui.customviews.OpenSansTextView
-        android:id="@+id/mark_name"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentLeft="true"
-        android:layout_alignParentStart="true"
-        android:layout_marginTop="15dp"
-        android:paddingLeft="16dp"
-        android:paddingRight="16dp"
-        android:textSize="20sp"
-        android:singleLine="true"
-        android:textColor="@color/white"/>
+        <TextView
+            android:id="@+id/mark_name"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentLeft="true"
+            android:layout_alignParentStart="true"
+            android:layout_marginTop="15dp"
+            android:layout_marginLeft="@dimen/fragment_side_margin"
+            android:paddingRight="16dp"
+            android:textSize="20sp"
+            android:singleLine="true"
+            android:textColor="@color/fiori_text_color"/>
 
-    <com.sap.sailing.android.shared.ui.customviews.OpenSansTextView
-        android:id="@+id/mark_set"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentLeft="true"
-        android:layout_alignParentStart="true"
-        android:layout_below="@+id/mark_name"
-        android:layout_marginTop="2dp"
-        android:layout_marginBottom="15dp"
-        android:paddingLeft="16dp"
-        android:paddingRight="16dp"
-        android:textSize="14sp"
-        android:singleLine="true"
-        android:textColor="@color/white"/>
+        <TextView
+            android:id="@+id/mark_set"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentLeft="true"
+            android:layout_alignParentStart="true"
+            android:layout_below="@+id/mark_name"
+            android:layout_marginTop="2dp"
+            android:layout_marginBottom="15dp"
+            android:layout_marginLeft="@dimen/fragment_side_margin"
+            android:paddingRight="16dp"
+            android:textSize="14sp"
+            android:singleLine="true"
+            android:textColor="@color/fiori_text_color"/>
+
+    </RelativeLayout>
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/mobile/com.sap.sailing.buoy.positioning/res/values-v21/theme.xml b/mobile/com.sap.sailing.buoy.positioning/res/values-v21/theme.xml
index 0b6c9a2dd4d..38a31588ec4 100644
--- a/mobile/com.sap.sailing.buoy.positioning/res/values-v21/theme.xml
+++ b/mobile/com.sap.sailing.buoy.positioning/res/values-v21/theme.xml
@@ -10,7 +10,7 @@
     <style name="Divider">
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">1dp</item>
-        <item name="android:background">?android:attr/listDivider</item>
+        <item name="android:background">@color/separator_color</item>
     </style>
 
     <style name="shadowLessButtonStyle" parent="@android:style/Widget.Material.Button.Borderless">
diff --git a/mobile/com.sap.sailing.buoy.positioning/res/values/theme.xml b/mobile/com.sap.sailing.buoy.positioning/res/values/theme.xml
index b179ee91383..db6c353e5d0 100644
--- a/mobile/com.sap.sailing.buoy.positioning/res/values/theme.xml
+++ b/mobile/com.sap.sailing.buoy.positioning/res/values/theme.xml
@@ -25,7 +25,7 @@
     <style name="Divider">
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">1dp</item>
-        <item name="android:background">?android:attr/listDivider</item>
+        <item name="android:background">@color/separator_color</item>
     </style>
 
 </resources>
\ No newline at end of file

From 39362c2092be059dc1124a1d5ab92db9d59a4ed8 Mon Sep 17 00:00:00 2001
From: Bennet Brunsen <brunsen@ubilabs.net>
Date: Fri, 3 Jun 2016 10:06:28 +0200
Subject: [PATCH 57/92] Adjust buoy about fragment to match fiori color scheme

---
 .../res/layout/fragment_about.xml                   | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/mobile/com.sap.sailing.android.shared/res/layout/fragment_about.xml b/mobile/com.sap.sailing.android.shared/res/layout/fragment_about.xml
index 1702a4496af..ed8ba99ce01 100644
--- a/mobile/com.sap.sailing.android.shared/res/layout/fragment_about.xml
+++ b/mobile/com.sap.sailing.android.shared/res/layout/fragment_about.xml
@@ -1,7 +1,8 @@
 <?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_height="match_parent"
+                android:background="@drawable/fiori_main_background">
 
     <View
         android:id="@+id/center_anchor"
@@ -20,7 +21,7 @@
         android:layout_marginLeft="@dimen/about_button_side_margin"
         android:layout_marginRight="@dimen/about_button_side_margin"
         android:layout_marginTop="@dimen/about_button_top_bottom_margin"
-        android:background="@drawable/rounded_btn_yellow"
+        android:background="@drawable/blue_button"
         android:text="@string/license_information"
         android:textAllCaps="false"
         android:textSize="@dimen/about_button_text_size"
@@ -36,7 +37,7 @@
         android:layout_marginLeft="@dimen/about_button_side_margin"
         android:layout_marginRight="@dimen/about_button_side_margin"
         android:layout_marginTop="@dimen/about_button_top_bottom_margin"
-        android:background="@drawable/rounded_btn_yellow"
+        android:background="@drawable/blue_button"
         android:text="@string/eula"
         android:textAllCaps="false"
         android:textSize="@dimen/about_button_text_size"
@@ -50,7 +51,8 @@
         android:layout_alignParentLeft="true"
         android:layout_alignParentStart="true"
         android:layout_marginLeft="@dimen/about_button_side_margin"
-        android:text="@string/application_version"/>
+        android:text="@string/application_version"
+        android:textColor="@color/fiori_text_color"/>
 
     <TextView
         android:id="@+id/system_information_application_version"
@@ -60,6 +62,7 @@
         android:layout_alignParentLeft="true"
         android:layout_alignParentStart="true"
         android:layout_marginBottom="@dimen/about_button_top_bottom_margin"
-        android:layout_marginLeft="@dimen/about_button_side_margin"/>
+        android:layout_marginLeft="@dimen/about_button_side_margin"
+        android:textColor="@color/fiori_text_color"/>
 
 </RelativeLayout>
\ No newline at end of file

From a5060743b742cb915f2137bbecd3d0580e232f0f Mon Sep 17 00:00:00 2001
From: Bennet Brunsen <brunsen@ubilabs.net>
Date: Fri, 3 Jun 2016 10:14:46 +0200
Subject: [PATCH 58/92] Adjust alert dialog in buoy pinger app

---
 mobile/com.sap.sailing.buoy.positioning/res/values/colors.xml | 2 +-
 mobile/com.sap.sailing.buoy.positioning/res/values/theme.xml  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/mobile/com.sap.sailing.buoy.positioning/res/values/colors.xml b/mobile/com.sap.sailing.buoy.positioning/res/values/colors.xml
index 2a42ac97af9..03806e6bb59 100644
--- a/mobile/com.sap.sailing.buoy.positioning/res/values/colors.xml
+++ b/mobile/com.sap.sailing.buoy.positioning/res/values/colors.xml
@@ -9,6 +9,6 @@
 
     <color name="colorPrimary">@color/gray</color>
     <color name="colorPrimaryDark">@color/colorPrimary</color>
-    <color name="colorAccent">@color/green</color>
+    <color name="colorAccent">@color/fiori_primary_color</color>
 
 </resources>
\ No newline at end of file
diff --git a/mobile/com.sap.sailing.buoy.positioning/res/values/theme.xml b/mobile/com.sap.sailing.buoy.positioning/res/values/theme.xml
index db6c353e5d0..b51d70c567c 100644
--- a/mobile/com.sap.sailing.buoy.positioning/res/values/theme.xml
+++ b/mobile/com.sap.sailing.buoy.positioning/res/values/theme.xml
@@ -4,7 +4,7 @@
     <!-- Base application theme. -->
     <style name="AppTheme" parent="AppTheme.Base"/>
 
-    <style name="AppTheme.Base" parent="Theme.AppCompat.NoActionBar">
+    <style name="AppTheme.Base" parent="Theme.AppCompat.Light.NoActionBar">
 
         <!-- Customize your theme here. -->
 

From 6284b4afdd5ce30056808e2b13e7ac5b57544030 Mon Sep 17 00:00:00 2001
From: Bennet Brunsen <brunsen@ubilabs.net>
Date: Fri, 3 Jun 2016 10:51:58 +0200
Subject: [PATCH 59/92] Display mark name in toolbar

---
 .../fragment_buoy_postion_detail.xml          | 30 ++----------------
 .../layout/fragment_buoy_postion_detail.xml   | 31 ++-----------------
 .../ui/activities/PositioningActivity.java    |  2 +-
 .../app/ui/fragments/BuoyFragment.java        |  4 ---
 4 files changed, 7 insertions(+), 60 deletions(-)

diff --git a/mobile/com.sap.sailing.buoy.positioning/res/layout-land/fragment_buoy_postion_detail.xml b/mobile/com.sap.sailing.buoy.positioning/res/layout-land/fragment_buoy_postion_detail.xml
index 1ed138e84c4..ddc5de1bbb9 100644
--- a/mobile/com.sap.sailing.buoy.positioning/res/layout-land/fragment_buoy_postion_detail.xml
+++ b/mobile/com.sap.sailing.buoy.positioning/res/layout-land/fragment_buoy_postion_detail.xml
@@ -14,36 +14,12 @@
         android:baselineAligned="false"
         android:orientation="horizontal">
 
-        <RelativeLayout
+        <FrameLayout
+            android:id="@+id/map"
             android:layout_width="0dp"
             android:layout_height="match_parent"
-            android:layout_marginBottom="@dimen/position_detail_bottom_margin"
             android:layout_weight="1"
-            android:background="@color/white">
-
-            <FrameLayout
-                android:id="@+id/map"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"/>
-
-            <com.sap.sailing.android.shared.ui.customviews.OpenSansTextView
-                android:id="@+id/mark_header"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_alignParentLeft="true"
-                android:layout_alignParentTop="true"
-                android:layout_centerHorizontal="true"
-                android:layout_centerVertical="true"
-                android:layout_gravity="start"
-                android:background="@color/black_slightly_transparent"
-                android:gravity="start"
-                android:paddingBottom="7dp"
-                android:paddingLeft="16dp"
-                android:paddingTop="7dp"
-                android:textColor="@color/white"
-                android:textSize="14sp"/>
-
-        </RelativeLayout>
+            android:layout_marginBottom="@dimen/position_detail_bottom_margin"/>
 
         <!-- Begin of detailed mark information -->
 
diff --git a/mobile/com.sap.sailing.buoy.positioning/res/layout/fragment_buoy_postion_detail.xml b/mobile/com.sap.sailing.buoy.positioning/res/layout/fragment_buoy_postion_detail.xml
index 58d9a111933..5d9ab0ab576 100644
--- a/mobile/com.sap.sailing.buoy.positioning/res/layout/fragment_buoy_postion_detail.xml
+++ b/mobile/com.sap.sailing.buoy.positioning/res/layout/fragment_buoy_postion_detail.xml
@@ -7,36 +7,11 @@
               android:orientation="vertical"
               android:paddingLeft="0dp"
               android:paddingRight="0dp">
-
-    <RelativeLayout
+    <FrameLayout
+        android:id="@+id/map"
         android:layout_width="match_parent"
         android:layout_height="0dp"
-        android:layout_weight="1"
-        android:background="@color/white">
-
-        <FrameLayout
-            android:id="@+id/map"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"/>
-
-        <com.sap.sailing.android.shared.ui.customviews.OpenSansTextView
-            android:id="@+id/mark_header"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_alignParentLeft="true"
-            android:layout_alignParentTop="true"
-            android:layout_centerHorizontal="true"
-            android:layout_centerVertical="true"
-            android:layout_gravity="left"
-            android:background="@color/black_slightly_transparent"
-            android:gravity="left"
-            android:paddingBottom="7dp"
-            android:paddingLeft="16dp"
-            android:paddingTop="7dp"
-            android:textColor="@color/white"
-            android:textSize="14sp"/>
-
-    </RelativeLayout>
+        android:layout_weight="1"/>
 
     <View
         android:layout_width="match_parent"
diff --git a/mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/ui/activities/PositioningActivity.java b/mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/ui/activities/PositioningActivity.java
index 260c05b5fcc..123d8d269be 100644
--- a/mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/ui/activities/PositioningActivity.java
+++ b/mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/ui/activities/PositioningActivity.java
@@ -51,7 +51,7 @@ public class PositioningActivity extends BaseActivity implements pingListener {
             ColorDrawable backgroundDrawable = new ColorDrawable(getResources().getColor(R.color.toolbar_background));
             getSupportActionBar().setBackgroundDrawable(backgroundDrawable);
             toolbar.setNavigationIcon(R.drawable.sap_logo_64dp);
-            getSupportActionBar().setTitle(getString(R.string.set_position));
+            getSupportActionBar().setTitle(markInfo.getName());
         }
         BuoyFragment fragment = new BuoyFragment();
         fragment.setPingListener(this);
diff --git a/mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/ui/fragments/BuoyFragment.java b/mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/ui/fragments/BuoyFragment.java
index 8c3b5911b1c..7c99ac5d08d 100644
--- a/mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/ui/fragments/BuoyFragment.java
+++ b/mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/ui/fragments/BuoyFragment.java
@@ -51,7 +51,6 @@ public class BuoyFragment extends BaseFragment implements LocationListener {
     private static final int GPS_MIN_DISTANCE = 1;
     private static final int GPS_MIN_TIME = 1000;
     private static final String N_A = "n/a";
-    private OpenSansTextView markHeaderTextView;
     private OpenSansTextView accuracyTextView;
     private OpenSansTextView distanceTextView;
     private OpenSansButton setPositionButton;
@@ -72,7 +71,6 @@ public class BuoyFragment extends BaseFragment implements LocationListener {
         super.onCreateView(inflater, container, savedInstanceState);
         View layout = inflater.inflate(R.layout.fragment_buoy_postion_detail, container, false);
 
-        markHeaderTextView = ViewHelper.get(layout, R.id.mark_header);
         accuracyTextView = ViewHelper.get(layout, R.id.marker_gps_accuracy);
         distanceTextView = ViewHelper.get(layout, R.id.marker_gps_distance);
         ClickListener clickListener = new ClickListener();
@@ -173,8 +171,6 @@ public class BuoyFragment extends BaseFragment implements LocationListener {
     }
 
     public void setUpTextUI(Location location) {
-        MarkInfo mark = positioningActivity.getMarkInfo();
-        markHeaderTextView.setText(mark.getName());
         String accuracyText = N_A;
         String distanceText = N_A;
         DecimalFormat accuracyFormatter = new DecimalFormat("#.##");

From 83310c033acf50adce6177ced6fcffc30a4d445e Mon Sep 17 00:00:00 2001
From: Bennet Brunsen <brunsen@ubilabs.net>
Date: Fri, 3 Jun 2016 12:06:24 +0200
Subject: [PATCH 60/92] Adjusted buoy pinging fragment to match fiori color
 scheme

---
 .../res/color/button_text_colors.xml          |   8 +
 .../res/drawable/disabled_btn_blue.xml        |   7 +
 .../res/drawable/position_send_button.xml     |   6 +-
 .../drawable/position_send_button_pressed.xml |  10 --
 .../fragment_buoy_postion_detail.xml          | 146 ++++++++++-------
 .../layout/fragment_buoy_postion_detail.xml   | 155 ++++++++++--------
 .../res/values-v21/theme.xml                  |   2 +-
 .../res/values/colors.xml                     |   2 +
 .../res/values/theme.xml                      |   7 +
 .../app/ui/fragments/BuoyFragment.java        |  10 +-
 10 files changed, 201 insertions(+), 152 deletions(-)
 create mode 100644 mobile/com.sap.sailing.buoy.positioning/res/color/button_text_colors.xml
 create mode 100644 mobile/com.sap.sailing.buoy.positioning/res/drawable/disabled_btn_blue.xml
 delete mode 100644 mobile/com.sap.sailing.buoy.positioning/res/drawable/position_send_button_pressed.xml

diff --git a/mobile/com.sap.sailing.buoy.positioning/res/color/button_text_colors.xml b/mobile/com.sap.sailing.buoy.positioning/res/color/button_text_colors.xml
new file mode 100644
index 00000000000..b431d7c5fef
--- /dev/null
+++ b/mobile/com.sap.sailing.buoy.positioning/res/color/button_text_colors.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <!-- disabled state -->
+    <item android:state_enabled="false" android:color="@color/white" />
+    <!-- default state -->
+    <item android:color="@color/white"/>
+
+</selector>
\ No newline at end of file
diff --git a/mobile/com.sap.sailing.buoy.positioning/res/drawable/disabled_btn_blue.xml b/mobile/com.sap.sailing.buoy.positioning/res/drawable/disabled_btn_blue.xml
new file mode 100644
index 00000000000..6b1874df8fe
--- /dev/null
+++ b/mobile/com.sap.sailing.buoy.positioning/res/drawable/disabled_btn_blue.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <corners
+        android:radius="@dimen/button_radius"/>
+
+    <solid android:color="@color/disabled_btn_blue"/>
+</shape>
\ No newline at end of file
diff --git a/mobile/com.sap.sailing.buoy.positioning/res/drawable/position_send_button.xml b/mobile/com.sap.sailing.buoy.positioning/res/drawable/position_send_button.xml
index 028c839d38e..fae430a2e59 100644
--- a/mobile/com.sap.sailing.buoy.positioning/res/drawable/position_send_button.xml
+++ b/mobile/com.sap.sailing.buoy.positioning/res/drawable/position_send_button.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <!-- disabled -->
+    <item android:drawable="@drawable/disabled_btn_blue" android:state_enabled="false"/>
     <!-- pressed -->
-    <item android:drawable="@drawable/position_send_button_pressed" android:state_pressed="true" />
+    <item android:drawable="@drawable/pressed_btn_blue" android:state_pressed="true" />
     <!-- default -->
-    <item android:drawable="@drawable/rounded_btn_yellow" />
+    <item android:drawable="@drawable/normal_btn_blue" />
 </selector>
\ No newline at end of file
diff --git a/mobile/com.sap.sailing.buoy.positioning/res/drawable/position_send_button_pressed.xml b/mobile/com.sap.sailing.buoy.positioning/res/drawable/position_send_button_pressed.xml
deleted file mode 100644
index 7e1809a06e4..00000000000
--- a/mobile/com.sap.sailing.buoy.positioning/res/drawable/position_send_button_pressed.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="@color/yellow_button_pressed"/>
-
-    <corners
-        android:bottomLeftRadius="5dip"
-        android:bottomRightRadius="5dip"
-        android:topLeftRadius="5dip"
-        android:topRightRadius="5dip"/>
-</shape>
\ No newline at end of file
diff --git a/mobile/com.sap.sailing.buoy.positioning/res/layout-land/fragment_buoy_postion_detail.xml b/mobile/com.sap.sailing.buoy.positioning/res/layout-land/fragment_buoy_postion_detail.xml
index ddc5de1bbb9..7fac4bd06e9 100644
--- a/mobile/com.sap.sailing.buoy.positioning/res/layout-land/fragment_buoy_postion_detail.xml
+++ b/mobile/com.sap.sailing.buoy.positioning/res/layout-land/fragment_buoy_postion_detail.xml
@@ -3,7 +3,7 @@
               xmlns:tools="http://schemas.android.com/tools"
               android:layout_width="match_parent"
               android:layout_height="match_parent"
-              android:background="@color/black"
+              android:background="@drawable/fiori_main_background"
               android:orientation="vertical"
               android:paddingLeft="0dp"
               android:paddingRight="0dp">
@@ -18,8 +18,8 @@
             android:id="@+id/map"
             android:layout_width="0dp"
             android:layout_height="match_parent"
-            android:layout_weight="1"
-            android:layout_marginBottom="@dimen/position_detail_bottom_margin"/>
+            android:layout_marginBottom="@dimen/position_detail_bottom_margin"
+            android:layout_weight="1"/>
 
         <!-- Begin of detailed mark information -->
 
@@ -29,87 +29,107 @@
             android:layout_height="match_parent"
             android:layout_weight="1"
             android:orientation="vertical">
+
             <!-- Accuracy -->
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:orientation="horizontal"
-                android:paddingLeft="16dp"
-                android:paddingRight="16dp"
-                android:paddingTop="12dp">
+                android:background="@color/list_item_background_color"
+                android:orientation="vertical">
 
-                <com.sap.sailing.android.shared.ui.customviews.OpenSansTextView
-                    android:layout_width="0dp"
+                <LinearLayout
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:text="@string/accuracy"
-                    android:textColor="@color/white"
-                    android:textSize="20sp"/>
+                    android:orientation="horizontal"
+                    android:paddingLeft="16dp"
+                    android:paddingRight="16dp"
+                    android:paddingTop="12dp">
 
-                <com.sap.sailing.android.shared.ui.customviews.OpenSansTextView
-                    android:id="@+id/marker_gps_accuracy"
-                    android:layout_width="wrap_content"
+                    <TextView
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:text="@string/accuracy"
+                        android:textColor="@color/fiori_text_color"
+                        android:textSize="20sp"/>
+
+                    <TextView
+                        android:id="@+id/marker_gps_accuracy"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="5dp"
+                        android:layout_marginRight="5dp"
+                        android:textColor="@color/fiori_text_color"
+                        android:textSize="20sp"
+                        android:textStyle="bold"
+                        tools:text="ca. 13m"/>
+
+                    <com.sap.sailing.android.shared.ui.customviews.SignalQualityIndicatorView
+                        android:id="@+id/signal_quality_indicator"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"/>
+                </LinearLayout>
+
+                <TextView
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginLeft="5dp"
-                    android:layout_marginRight="5dp"
-                    android:textColor="@color/white"
-                    android:textSize="20sp"
-                    android:textStyle="bold"
-                    tools:text="ca. 13m"/>
+                    android:paddingBottom="12dp"
+                    android:paddingLeft="16dp"
+                    android:paddingRight="16dp"
+                    android:text="@string/accuracy_detail"
+                    android:textColor="@color/fiori_text_color"/>
+
+                <View style="@style/Divider"/>
 
-                <com.sap.sailing.android.shared.ui.customviews.SignalQualityIndicatorView
-                    android:id="@+id/signal_quality_indicator"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"/>
             </LinearLayout>
 
-            <com.sap.sailing.android.shared.ui.customviews.OpenSansLightTextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:paddingBottom="12dp"
-                android:paddingLeft="16dp"
-                android:paddingRight="16dp"
-                android:text="@string/accuracy_detail"/>
-
-            <View style="@style/Divider"/>
 
             <!-- Distance to old buoy -->
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:orientation="horizontal"
-                android:paddingLeft="16dp"
-                android:paddingRight="16dp"
-                android:paddingTop="12dp">
+                android:background="@color/list_item_background_color"
+                android:orientation="vertical">
 
-                <com.sap.sailing.android.shared.ui.customviews.OpenSansTextView
-                    android:layout_width="0dp"
+                <LinearLayout
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:text="@string/distance"
-                    android:textColor="@color/white"
-                    android:textSize="20sp"/>
+                    android:orientation="horizontal"
+                    android:paddingLeft="16dp"
+                    android:paddingRight="16dp"
+                    android:paddingTop="12dp">
 
-                <com.sap.sailing.android.shared.ui.customviews.OpenSansTextView
-                    android:id="@+id/marker_gps_distance"
-                    android:layout_width="wrap_content"
+                    <TextView
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:text="@string/distance"
+                        android:textColor="@color/fiori_text_color"
+                        android:textSize="20sp"/>
+
+                    <TextView
+                        android:id="@+id/marker_gps_distance"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="5dp"
+                        android:textColor="@color/fiori_text_color"
+                        android:textSize="20sp"
+                        tools:text="11,4m"/>
+                </LinearLayout>
+
+                <TextView
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginLeft="5dp"
-                    android:textColor="@color/white"
-                    android:textSize="20sp"
-                    tools:text="11,4m"/>
+                    android:paddingBottom="12dp"
+                    android:paddingLeft="16dp"
+                    android:paddingRight="16dp"
+                    android:text="@string/distance_detail"
+                    android:textColor="@color/fiori_text_color"/>
+
+                <View style="@style/Divider"/>
+
             </LinearLayout>
 
-            <com.sap.sailing.android.shared.ui.customviews.OpenSansLightTextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:paddingBottom="12dp"
-                android:paddingLeft="16dp"
-                android:paddingRight="16dp"
-                android:text="@string/distance_detail"/>
-
-            <View style="@style/Divider"/>
-
             <View
                 android:layout_width="match_parent"
                 android:layout_height="0dp"
@@ -117,7 +137,7 @@
 
             <!-- Button -->
 
-            <com.sap.sailing.android.shared.ui.customviews.OpenSansButton
+            <Button
                 android:id="@+id/marker_set_position_button"
                 android:layout_width="match_parent"
                 android:layout_height="80dp"
diff --git a/mobile/com.sap.sailing.buoy.positioning/res/layout/fragment_buoy_postion_detail.xml b/mobile/com.sap.sailing.buoy.positioning/res/layout/fragment_buoy_postion_detail.xml
index 5d9ab0ab576..b5ede85da94 100644
--- a/mobile/com.sap.sailing.buoy.positioning/res/layout/fragment_buoy_postion_detail.xml
+++ b/mobile/com.sap.sailing.buoy.positioning/res/layout/fragment_buoy_postion_detail.xml
@@ -3,118 +3,131 @@
               xmlns:tools="http://schemas.android.com/tools"
               android:layout_width="match_parent"
               android:layout_height="match_parent"
-              android:background="@color/black"
+              android:background="@drawable/fiori_main_background"
               android:orientation="vertical"
               android:paddingLeft="0dp"
               android:paddingRight="0dp">
+
     <FrameLayout
         android:id="@+id/map"
         android:layout_width="match_parent"
         android:layout_height="0dp"
         android:layout_weight="1"/>
 
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="1dp"
-        android:background="@color/white"/>
-
-
     <!-- Begin of detailed mark information -->
 
     <!-- Accuracy -->
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:paddingLeft="16dp"
-        android:paddingRight="16dp"
-        android:paddingTop="12dp">
-
-        <com.sap.sailing.android.shared.ui.customviews.OpenSansTextView
-            android:layout_width="0dp"
+        android:orientation="vertical"
+        android:background="@color/list_item_background_color">
+        
+        <LinearLayout
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:text="@string/accuracy"
-            android:textColor="@color/white"
-            android:textSize="20sp"/>
+            android:orientation="horizontal"
+            android:paddingLeft="16dp"
+            android:paddingRight="16dp"
+            android:paddingTop="12dp">
 
-        <com.sap.sailing.android.shared.ui.customviews.OpenSansTextView
-            android:id="@+id/marker_gps_accuracy"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginRight="5dp"
-            android:layout_marginLeft="5dp"
-            android:textColor="@color/white"
-            android:textSize="20sp"
-            android:textStyle="bold"
-            tools:text="ca. 13m"/>
+            <TextView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:text="@string/accuracy"
+                android:textColor="@color/fiori_text_color"
+                android:textSize="20sp"/>
 
-        <com.sap.sailing.android.shared.ui.customviews.SignalQualityIndicatorView
-            android:layout_width="wrap_content"
+            <TextView
+                android:id="@+id/marker_gps_accuracy"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="5dp"
+                android:layout_marginRight="5dp"
+                android:textColor="@color/fiori_text_color"
+                android:textSize="20sp"
+                android:textStyle="bold"
+                tools:text="ca. 13m"/>
+
+            <com.sap.sailing.android.shared.ui.customviews.SignalQualityIndicatorView
+                android:id="@+id/signal_quality_indicator"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"/>
+        </LinearLayout>
+
+        <TextView
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:id="@+id/signal_quality_indicator"/>
+            android:paddingBottom="12dp"
+            android:paddingLeft="16dp"
+            android:paddingRight="16dp"
+            android:text="@string/accuracy_detail"
+            android:textColor="@color/fiori_text_color"/>
+
+        <View style="@style/Divider"/>
+
     </LinearLayout>
 
-    <com.sap.sailing.android.shared.ui.customviews.OpenSansLightTextView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:paddingBottom="12dp"
-        android:paddingLeft="16dp"
-        android:paddingRight="16dp"
-        android:text="@string/accuracy_detail"/>
-
-    <View style="@style/Divider"/>
-
     <!-- Distance to old buoy -->
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:paddingLeft="16dp"
-        android:paddingRight="16dp"
-        android:paddingTop="12dp">
+        android:orientation="vertical"
+        android:background="@color/list_item_background_color">
 
-        <com.sap.sailing.android.shared.ui.customviews.OpenSansTextView
-            android:layout_width="0dp"
+        <LinearLayout
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:text="@string/distance"
-            android:textColor="@color/white"
-            android:textSize="20sp"/>
+            android:orientation="horizontal"
+            android:paddingLeft="16dp"
+            android:paddingRight="16dp"
+            android:paddingTop="12dp">
 
-        <com.sap.sailing.android.shared.ui.customviews.OpenSansTextView
-            android:id="@+id/marker_gps_distance"
-            android:layout_width="wrap_content"
+            <TextView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:text="@string/distance"
+                android:textColor="@color/fiori_text_color"
+                android:textSize="20sp"/>
+
+            <TextView
+                android:id="@+id/marker_gps_distance"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="5dp"
+                android:textColor="@color/fiori_text_color"
+                android:textSize="20sp"
+                tools:text="11,4m"/>
+        </LinearLayout>
+
+        <TextView
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="5dp"
-            android:textColor="@color/white"
-            android:textSize="20sp"
-            tools:text="11,4m"/>
+            android:paddingBottom="12dp"
+            android:paddingLeft="16dp"
+            android:paddingRight="16dp"
+            android:text="@string/distance_detail"
+            android:textColor="@color/fiori_text_color"/>
+
+        <View style="@style/Divider"/>
+
     </LinearLayout>
 
-    <com.sap.sailing.android.shared.ui.customviews.OpenSansLightTextView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:paddingBottom="12dp"
-        android:paddingLeft="16dp"
-        android:paddingRight="16dp"
-        android:text="@string/distance_detail"/>
-
-    <View style="@style/Divider"/>
-
     <!-- Button -->
 
-    <com.sap.sailing.android.shared.ui.customviews.OpenSansButton
+    <Button
         android:id="@+id/marker_set_position_button"
         android:layout_width="match_parent"
         android:layout_height="80dp"
+        android:layout_marginBottom="15dp"
         android:layout_marginLeft="16dp"
         android:layout_marginRight="16dp"
         android:layout_marginTop="15dp"
-        android:layout_marginBottom="15dp"
         android:background="@drawable/position_send_button"
-        android:textSize="18sp"
         android:textAllCaps="false"
+        android:textSize="18sp"
         android:textStyle="bold"/>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/mobile/com.sap.sailing.buoy.positioning/res/values-v21/theme.xml b/mobile/com.sap.sailing.buoy.positioning/res/values-v21/theme.xml
index 38a31588ec4..50d828d91e9 100644
--- a/mobile/com.sap.sailing.buoy.positioning/res/values-v21/theme.xml
+++ b/mobile/com.sap.sailing.buoy.positioning/res/values-v21/theme.xml
@@ -16,7 +16,7 @@
     <style name="shadowLessButtonStyle" parent="@android:style/Widget.Material.Button.Borderless">
         <item name="android:textAppearance">@style/Base.TextAppearance.AppCompat.Button</item>
         <item name="android:textAllCaps">false</item>
-        <item name="android:textColor">@color/white</item>
+        <item name="android:textColor">@color/button_text_colors</item>
         <item name="android:elevation">0dp</item>
         <item name="android:stateListAnimator">@null</item>
     </style>
diff --git a/mobile/com.sap.sailing.buoy.positioning/res/values/colors.xml b/mobile/com.sap.sailing.buoy.positioning/res/values/colors.xml
index 03806e6bb59..70c1838cc4f 100644
--- a/mobile/com.sap.sailing.buoy.positioning/res/values/colors.xml
+++ b/mobile/com.sap.sailing.buoy.positioning/res/values/colors.xml
@@ -11,4 +11,6 @@
     <color name="colorPrimaryDark">@color/colorPrimary</color>
     <color name="colorAccent">@color/fiori_primary_color</color>
 
+    <color name="disabled_btn_blue">#83ceee</color>
+
 </resources>
\ No newline at end of file
diff --git a/mobile/com.sap.sailing.buoy.positioning/res/values/theme.xml b/mobile/com.sap.sailing.buoy.positioning/res/values/theme.xml
index b51d70c567c..abed22e2346 100644
--- a/mobile/com.sap.sailing.buoy.positioning/res/values/theme.xml
+++ b/mobile/com.sap.sailing.buoy.positioning/res/values/theme.xml
@@ -19,6 +19,8 @@
 
         <!-- You can also set colorControlNormal, colorControlActivated colorControlHighlight & colorSwitchThumbNormal. -->
 
+        <item name="android:buttonStyle">@style/buttonStyle</item>
+
         <item name="windowActionBar">false</item>
     </style>
 
@@ -28,4 +30,9 @@
         <item name="android:background">@color/separator_color</item>
     </style>
 
+    <style name="buttonStyle" parent="Base.Widget.AppCompat.Button">
+        <item name="android:textAllCaps">false</item>
+        <item name="android:textColor">@color/button_text_colors</item>
+    </style>
+
 </resources>
\ No newline at end of file
diff --git a/mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/ui/fragments/BuoyFragment.java b/mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/ui/fragments/BuoyFragment.java
index 7c99ac5d08d..035a39474b1 100644
--- a/mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/ui/fragments/BuoyFragment.java
+++ b/mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/ui/fragments/BuoyFragment.java
@@ -24,6 +24,8 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.view.ViewGroup;
+import android.widget.Button;
+import android.widget.TextView;
 import android.widget.Toast;
 
 import com.google.android.gms.maps.CameraUpdateFactory;
@@ -39,8 +41,6 @@ import com.sap.sailing.android.buoy.positioning.app.valueobjects.MarkInfo;
 import com.sap.sailing.android.buoy.positioning.app.valueobjects.MarkPingInfo;
 import com.sap.sailing.android.shared.data.LeaderboardInfo;
 import com.sap.sailing.android.shared.logging.ExLog;
-import com.sap.sailing.android.shared.ui.customviews.OpenSansButton;
-import com.sap.sailing.android.shared.ui.customviews.OpenSansTextView;
 import com.sap.sailing.android.shared.ui.customviews.SignalQualityIndicatorView;
 import com.sap.sailing.android.shared.util.LocationHelper;
 import com.sap.sailing.android.shared.util.ViewHelper;
@@ -51,9 +51,9 @@ public class BuoyFragment extends BaseFragment implements LocationListener {
     private static final int GPS_MIN_DISTANCE = 1;
     private static final int GPS_MIN_TIME = 1000;
     private static final String N_A = "n/a";
-    private OpenSansTextView accuracyTextView;
-    private OpenSansTextView distanceTextView;
-    private OpenSansButton setPositionButton;
+    private TextView accuracyTextView;
+    private TextView distanceTextView;
+    private Button setPositionButton;
     private MapFragment mapFragment;
     private Location lastKnownLocation;
     private LatLng savedPosition;

From a321e7990d4f443f72134747879d366336227f5c Mon Sep 17 00:00:00 2001
From: Bennet Brunsen <brunsen@ubilabs.net>
Date: Fri, 3 Jun 2016 14:43:29 +0200
Subject: [PATCH 61/92] Remove paddings from google map control

---
 .../android/buoy/positioning/app/ui/fragments/BuoyFragment.java  | 1 -
 1 file changed, 1 deletion(-)

diff --git a/mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/ui/fragments/BuoyFragment.java b/mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/ui/fragments/BuoyFragment.java
index 035a39474b1..5a085415516 100644
--- a/mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/ui/fragments/BuoyFragment.java
+++ b/mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/ui/fragments/BuoyFragment.java
@@ -223,7 +223,6 @@ public class BuoyFragment extends BaseFragment implements LocationListener {
 
     private void configureMap(GoogleMap map) {
         map.getUiSettings().setZoomControlsEnabled(true);
-        map.setPadding(0, 50, 0, 0);
     }
 
     @Override

From 6b350172f12ecfddef49269a742878895eeaa597 Mon Sep 17 00:00:00 2001
From: Bennet Brunsen <brunsen@ubilabs.net>
Date: Tue, 7 Jun 2016 11:34:23 +0200
Subject: [PATCH 62/92] Adjust buoy fragment to match fiori color scheme

---
 .../fragment_buoy_postion_detail.xml          | 107 ++++++++++--------
 .../layout/fragment_buoy_postion_detail.xml   |  43 ++-----
 .../res/values-de-land/strings.xml            |   7 ++
 .../res/values-de/strings.xml                 |   6 +-
 .../res/values-land/strings.xml               |   7 ++
 .../res/values/dimens.xml                     |   1 +
 .../res/values/strings.xml                    |   6 +-
 7 files changed, 90 insertions(+), 87 deletions(-)
 create mode 100644 mobile/com.sap.sailing.buoy.positioning/res/values-de-land/strings.xml
 create mode 100644 mobile/com.sap.sailing.buoy.positioning/res/values-land/strings.xml

diff --git a/mobile/com.sap.sailing.buoy.positioning/res/layout-land/fragment_buoy_postion_detail.xml b/mobile/com.sap.sailing.buoy.positioning/res/layout-land/fragment_buoy_postion_detail.xml
index 7fac4bd06e9..6431c6577a4 100644
--- a/mobile/com.sap.sailing.buoy.positioning/res/layout-land/fragment_buoy_postion_detail.xml
+++ b/mobile/com.sap.sailing.buoy.positioning/res/layout-land/fragment_buoy_postion_detail.xml
@@ -32,104 +32,115 @@
 
             <!-- Accuracy -->
             <LinearLayout
-                android:layout_width="match_parent"
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:background="@color/list_item_background_color"
-                android:orientation="vertical">
+                android:orientation="horizontal">
 
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:orientation="horizontal"
-                    android:paddingLeft="16dp"
-                    android:paddingRight="16dp"
+                    android:orientation="vertical"
+                    android:paddingLeft="@dimen/fragment_side_margin"
                     android:paddingTop="12dp">
 
                     <TextView
-                        android:layout_width="0dp"
+                        android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_weight="1"
                         android:text="@string/accuracy"
                         android:textColor="@color/fiori_text_color"
                         android:textSize="20sp"/>
 
                     <TextView
-                        android:id="@+id/marker_gps_accuracy"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_marginLeft="5dp"
-                        android:layout_marginRight="5dp"
-                        android:textColor="@color/fiori_text_color"
-                        android:textSize="20sp"
-                        android:textStyle="bold"
-                        tools:text="ca. 13m"/>
+                        android:paddingBottom="12dp"
+                        android:text="@string/accuracy_detail"
+                        android:textColor="@color/fiori_text_color"/>
 
-                    <com.sap.sailing.android.shared.ui.customviews.SignalQualityIndicatorView
-                        android:id="@+id/signal_quality_indicator"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"/>
                 </LinearLayout>
 
-                <TextView
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:paddingBottom="12dp"
-                    android:paddingLeft="16dp"
-                    android:paddingRight="16dp"
-                    android:text="@string/accuracy_detail"
-                    android:textColor="@color/fiori_text_color"/>
+                <View
+                    android:layout_width="0dp"
+                    android:layout_height="0dp"
+                    android:layout_weight="1"
+                    />
 
-                <View style="@style/Divider"/>
+                <TextView
+                    android:id="@+id/marker_gps_accuracy"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
+                    android:textColor="@color/fiori_text_color"
+                    android:textSize="20sp"
+                    android:textStyle="bold"
+                    tools:text="ca. 13m"/>
+
+                <com.sap.sailing.android.shared.ui.customviews.SignalQualityIndicatorView
+                    android:id="@+id/signal_quality_indicator"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
+                    android:layout_marginLeft="@dimen/signal_quality_indicator_left_margin"
+                    android:layout_marginStart="@dimen/signal_quality_indicator_left_margin"
+                    android:layout_marginEnd="@dimen/fragment_side_margin"
+                    android:layout_marginRight="@dimen/fragment_side_margin"/>
 
             </LinearLayout>
 
+            <View style="@style/Divider"/>
 
             <!-- Distance to old buoy -->
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:background="@color/list_item_background_color"
-                android:orientation="vertical">
+                android:orientation="horizontal">
 
                 <LinearLayout
-                    android:layout_width="match_parent"
+                    android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:orientation="horizontal"
-                    android:paddingLeft="16dp"
-                    android:paddingRight="16dp"
+                    android:orientation="vertical"
+                    android:paddingLeft="@dimen/fragment_side_margin"
                     android:paddingTop="12dp">
 
                     <TextView
-                        android:layout_width="0dp"
+                        android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_weight="1"
                         android:text="@string/distance"
                         android:textColor="@color/fiori_text_color"
                         android:textSize="20sp"/>
 
                     <TextView
-                        android:id="@+id/marker_gps_distance"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_marginLeft="5dp"
-                        android:textColor="@color/fiori_text_color"
-                        android:textSize="20sp"
-                        tools:text="11,4m"/>
+                        android:paddingBottom="12dp"
+                        android:text="@string/distance_detail"
+                        android:textColor="@color/fiori_text_color"/>
+
                 </LinearLayout>
 
-                <TextView
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:paddingBottom="12dp"
-                    android:paddingLeft="16dp"
-                    android:paddingRight="16dp"
-                    android:text="@string/distance_detail"
-                    android:textColor="@color/fiori_text_color"/>
+                <View
+                    android:layout_width="0dp"
+                    android:layout_height="0dp"
+                    android:layout_weight="1"
+                    />
 
-                <View style="@style/Divider"/>
+                <TextView
+                    android:id="@+id/marker_gps_distance"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
+                    android:layout_marginRight="@dimen/fragment_side_margin"
+                    android:layout_marginEnd="@dimen/fragment_side_margin"
+                    android:textColor="@color/fiori_text_color"
+                    android:textSize="20sp"
+                    tools:text="11,4m"/>
 
             </LinearLayout>
 
+            <View style="@style/Divider"/>
+
             <View
                 android:layout_width="match_parent"
                 android:layout_height="0dp"
diff --git a/mobile/com.sap.sailing.buoy.positioning/res/layout/fragment_buoy_postion_detail.xml b/mobile/com.sap.sailing.buoy.positioning/res/layout/fragment_buoy_postion_detail.xml
index b5ede85da94..6da4dc2b485 100644
--- a/mobile/com.sap.sailing.buoy.positioning/res/layout/fragment_buoy_postion_detail.xml
+++ b/mobile/com.sap.sailing.buoy.positioning/res/layout/fragment_buoy_postion_detail.xml
@@ -25,11 +25,11 @@
         
         <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
+            android:layout_height="@dimen/list_header_height"
+            android:paddingLeft="@dimen/fragment_side_margin"
+            android:paddingRight="@dimen/fragment_side_margin"
             android:orientation="horizontal"
-            android:paddingLeft="16dp"
-            android:paddingRight="16dp"
-            android:paddingTop="12dp">
+            android:gravity="center_vertical">
 
             <TextView
                 android:layout_width="0dp"
@@ -43,28 +43,18 @@
                 android:id="@+id/marker_gps_accuracy"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginLeft="5dp"
-                android:layout_marginRight="5dp"
                 android:textColor="@color/fiori_text_color"
                 android:textSize="20sp"
-                android:textStyle="bold"
                 tools:text="ca. 13m"/>
 
             <com.sap.sailing.android.shared.ui.customviews.SignalQualityIndicatorView
                 android:id="@+id/signal_quality_indicator"
                 android:layout_width="wrap_content"
-                android:layout_height="wrap_content"/>
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="@dimen/signal_quality_indicator_left_margin"
+                android:layout_marginStart="@dimen/signal_quality_indicator_left_margin"/>
         </LinearLayout>
 
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:paddingBottom="12dp"
-            android:paddingLeft="16dp"
-            android:paddingRight="16dp"
-            android:text="@string/accuracy_detail"
-            android:textColor="@color/fiori_text_color"/>
-
         <View style="@style/Divider"/>
 
     </LinearLayout>
@@ -72,17 +62,17 @@
     <!-- Distance to old buoy -->
     <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        android:layout_height="@dimen/list_header_height"
         android:orientation="vertical"
         android:background="@color/list_item_background_color">
 
         <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
+            android:layout_height="match_parent"
+            android:paddingLeft="@dimen/fragment_side_margin"
+            android:paddingRight="@dimen/fragment_side_margin"
             android:orientation="horizontal"
-            android:paddingLeft="16dp"
-            android:paddingRight="16dp"
-            android:paddingTop="12dp">
+            android:gravity="center_vertical">
 
             <TextView
                 android:layout_width="0dp"
@@ -102,15 +92,6 @@
                 tools:text="11,4m"/>
         </LinearLayout>
 
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:paddingBottom="12dp"
-            android:paddingLeft="16dp"
-            android:paddingRight="16dp"
-            android:text="@string/distance_detail"
-            android:textColor="@color/fiori_text_color"/>
-
         <View style="@style/Divider"/>
 
     </LinearLayout>
diff --git a/mobile/com.sap.sailing.buoy.positioning/res/values-de-land/strings.xml b/mobile/com.sap.sailing.buoy.positioning/res/values-de-land/strings.xml
new file mode 100644
index 00000000000..462ee311f19
--- /dev/null
+++ b/mobile/com.sap.sailing.buoy.positioning/res/values-de-land/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="accuracy">Genauigkeit</string>
+    <string name="distance">Entfernung</string>
+    <string name="accuracy_detail">der GPS-Position</string>
+    <string name="distance_detail">zur alten Boje</string>
+</resources>
\ No newline at end of file
diff --git a/mobile/com.sap.sailing.buoy.positioning/res/values-de/strings.xml b/mobile/com.sap.sailing.buoy.positioning/res/values-de/strings.xml
index 600aadff5b6..e9c61332614 100644
--- a/mobile/com.sap.sailing.buoy.positioning/res/values-de/strings.xml
+++ b/mobile/com.sap.sailing.buoy.positioning/res/values-de/strings.xml
@@ -11,10 +11,8 @@
     <string name="set">Gesetzt</string>
     <string name="not_set">Nicht gesetzt</string>
     <string name="mark_list_accuracy">(Genauigkeit ca. %1$sm)</string>
-    <string name="accuracy">Genauigkeit</string>
-    <string name="distance">Entfernung</string>
-    <string name="accuracy_detail">der GPS-Position</string>
-    <string name="distance_detail">zur alten Boje</string>
+    <string name="accuracy">GPS Genauigkeit</string>
+    <string name="distance">Entfernung zur alten Boje</string>
     <string name="position_set">Die Position wurde gesetzt</string>
     <string name="no_information">Keine Information</string>
     <string name="title_activity_settings">@string/settings</string>
diff --git a/mobile/com.sap.sailing.buoy.positioning/res/values-land/strings.xml b/mobile/com.sap.sailing.buoy.positioning/res/values-land/strings.xml
new file mode 100644
index 00000000000..4052bfcb5ea
--- /dev/null
+++ b/mobile/com.sap.sailing.buoy.positioning/res/values-land/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="accuracy">Accuracy</string>
+    <string name="distance">Distance</string>
+    <string name="accuracy_detail">of GPS position</string>
+    <string name="distance_detail">to old buoy</string>
+</resources>
\ No newline at end of file
diff --git a/mobile/com.sap.sailing.buoy.positioning/res/values/dimens.xml b/mobile/com.sap.sailing.buoy.positioning/res/values/dimens.xml
index 385dbaea5d1..692d12be7cb 100644
--- a/mobile/com.sap.sailing.buoy.positioning/res/values/dimens.xml
+++ b/mobile/com.sap.sailing.buoy.positioning/res/values/dimens.xml
@@ -2,4 +2,5 @@
 <resources>
     <dimen name="position_detail_bottom_margin">10dp</dimen>
     <dimen name="buoy_overview_text_size">20sp</dimen>
+    <dimen name="signal_quality_indicator_left_margin">10dp</dimen>
 </resources>
\ No newline at end of file
diff --git a/mobile/com.sap.sailing.buoy.positioning/res/values/strings.xml b/mobile/com.sap.sailing.buoy.positioning/res/values/strings.xml
index e1666a31d72..f1f2a66adc3 100644
--- a/mobile/com.sap.sailing.buoy.positioning/res/values/strings.xml
+++ b/mobile/com.sap.sailing.buoy.positioning/res/values/strings.xml
@@ -14,10 +14,8 @@
     <string name="mark_list_accuracy">(Accurary ca. %1$sm)</string>
     <string name="buoy_detail_accuracy_ca" translatable="false">ca. %1$sm</string>
     <string name="buoy_detail_distance" translatable="false">%1$sm</string>
-    <string name="accuracy">Accuracy</string>
-    <string name="distance">Distance</string>
-    <string name="accuracy_detail">of GPS position</string>
-    <string name="distance_detail">to old buoy</string>
+    <string name="accuracy">GPS Accuracy</string>
+    <string name="distance">Distance to old buoy</string>
     <string name="position_set">The position has been set</string>
     <string name="no_information">No information</string>
     <string name="title_activity_settings">@string/settings</string>

From 13f4bbb7ce1b5d5610b9559c17dface2922fcbfb Mon Sep 17 00:00:00 2001
From: Bennet Brunsen <brunsen@ubilabs.net>
Date: Tue, 7 Jun 2016 11:54:05 +0200
Subject: [PATCH 63/92] Fixes toolbar issue with orientation change

---
 .../res/layout/fragment_container.xml                         | 4 +++-
 mobile/com.sap.sailing.android.shared/res/values/dimens.xml   | 1 +
 .../android/shared/ui/customviews/OpenSansToolbar.java        | 1 -
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/mobile/com.sap.sailing.android.shared/res/layout/fragment_container.xml b/mobile/com.sap.sailing.android.shared/res/layout/fragment_container.xml
index 30271b73897..c9bf7d6a47c 100644
--- a/mobile/com.sap.sailing.android.shared/res/layout/fragment_container.xml
+++ b/mobile/com.sap.sailing.android.shared/res/layout/fragment_container.xml
@@ -7,13 +7,15 @@
         android:id="@+id/toolbar"
         xmlns:android="http://schemas.android.com/apk/res/android"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        android:layout_height="@dimen/toolbar_height"
+        android:minHeight="@dimen/toolbar_height"
         android:theme="@style/AppTheme.Toolbar">
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:orientation="vertical"
+            android:gravity="center_vertical"
             android:padding="10dp">
 
             <TextView
diff --git a/mobile/com.sap.sailing.android.shared/res/values/dimens.xml b/mobile/com.sap.sailing.android.shared/res/values/dimens.xml
index 698721126a1..14e742df84d 100644
--- a/mobile/com.sap.sailing.android.shared/res/values/dimens.xml
+++ b/mobile/com.sap.sailing.android.shared/res/values/dimens.xml
@@ -31,6 +31,7 @@
     <!-- Toolbar -->
     <dimen name="toolbar_separator_height">1dp</dimen>
     <dimen name="toolbar_left_padding">@dimen/fragment_side_margin</dimen>
+    <dimen name="toolbar_height">60dp</dimen>
 
     <!-- List -->
     <dimen name="list_header_height">50dp</dimen>
diff --git a/mobile/com.sap.sailing.android.shared/src/com/sap/sailing/android/shared/ui/customviews/OpenSansToolbar.java b/mobile/com.sap.sailing.android.shared/src/com/sap/sailing/android/shared/ui/customviews/OpenSansToolbar.java
index ca07afd84db..e8daf591347 100644
--- a/mobile/com.sap.sailing.android.shared/src/com/sap/sailing/android/shared/ui/customviews/OpenSansToolbar.java
+++ b/mobile/com.sap.sailing.android.shared/src/com/sap/sailing/android/shared/ui/customviews/OpenSansToolbar.java
@@ -49,7 +49,6 @@ public class OpenSansToolbar extends Toolbar {
 
     public void hideSubtitle() {
         TextView titleTextView = (TextView) findViewById(R.id.toolbar_title);
-        titleTextView.setPadding(0, 6, 0, 0);
         TextView subtitleTextView = (TextView) findViewById(R.id.toolbar_subtitle);
         subtitleTextView.setVisibility(View.GONE);
     }

From 403058a50619f28c703c740126a8bc7141e63750 Mon Sep 17 00:00:00 2001
From: Bennet Brunsen <brunsen@ubilabs.net>
Date: Tue, 7 Jun 2016 12:18:32 +0200
Subject: [PATCH 64/92] Null check for map

---
 .../buoy/positioning/app/ui/fragments/BuoyFragment.java       | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/ui/fragments/BuoyFragment.java b/mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/ui/fragments/BuoyFragment.java
index 5a085415516..c2447c8f983 100644
--- a/mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/ui/fragments/BuoyFragment.java
+++ b/mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/ui/fragments/BuoyFragment.java
@@ -222,7 +222,9 @@ public class BuoyFragment extends BaseFragment implements LocationListener {
     }
 
     private void configureMap(GoogleMap map) {
-        map.getUiSettings().setZoomControlsEnabled(true);
+        if (map != null) {
+            map.getUiSettings().setZoomControlsEnabled(true);
+        }
     }
 
     @Override

From d8433aa6db4b92c2780eef1c5f6f70b7b8b1aa0c Mon Sep 17 00:00:00 2001
From: Bennet Brunsen <brunsen@ubilabs.net>
Date: Tue, 7 Jun 2016 12:22:40 +0200
Subject: [PATCH 65/92] Adjusted side margin for mark list header

---
 .../res/layout/fragment_buoy_postion_overview.xml               | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mobile/com.sap.sailing.buoy.positioning/res/layout/fragment_buoy_postion_overview.xml b/mobile/com.sap.sailing.buoy.positioning/res/layout/fragment_buoy_postion_overview.xml
index 6244d2b18c0..18cb5e7ef13 100644
--- a/mobile/com.sap.sailing.buoy.positioning/res/layout/fragment_buoy_postion_overview.xml
+++ b/mobile/com.sap.sailing.buoy.positioning/res/layout/fragment_buoy_postion_overview.xml
@@ -12,7 +12,7 @@
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="16dp"
+            android:layout_marginLeft="@dimen/fragment_side_margin"
             android:layout_gravity="center_vertical"
             android:text="@string/marks"
             android:textSize="@dimen/list_header_text_size"

From 3ed76047dbbca6832964eb0e4d496efb8a689879 Mon Sep 17 00:00:00 2001
From: Bennet Brunsen <brunsen@ubilabs.net>
Date: Thu, 9 Jun 2016 09:50:59 +0200
Subject: [PATCH 66/92] Remove bold attribute from textview

---
 .../res/layout-land/fragment_buoy_postion_detail.xml             | 1 -
 1 file changed, 1 deletion(-)

diff --git a/mobile/com.sap.sailing.buoy.positioning/res/layout-land/fragment_buoy_postion_detail.xml b/mobile/com.sap.sailing.buoy.positioning/res/layout-land/fragment_buoy_postion_detail.xml
index 6431c6577a4..3eb71db5e0f 100644
--- a/mobile/com.sap.sailing.buoy.positioning/res/layout-land/fragment_buoy_postion_detail.xml
+++ b/mobile/com.sap.sailing.buoy.positioning/res/layout-land/fragment_buoy_postion_detail.xml
@@ -73,7 +73,6 @@
                     android:layout_gravity="center_vertical"
                     android:textColor="@color/fiori_text_color"
                     android:textSize="20sp"
-                    android:textStyle="bold"
                     tools:text="ca. 13m"/>
 
                 <com.sap.sailing.android.shared.ui.customviews.SignalQualityIndicatorView

From bf27d9044a68f5a165bd3fffac5f013c8beb9333 Mon Sep 17 00:00:00 2001
From: Bennet Brunsen <brunsen@ubilabs.net>
Date: Thu, 9 Jun 2016 11:41:55 +0200
Subject: [PATCH 67/92] Fixes app crash

---
 .../app/ui/fragments/BuoyFragment.java          | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/ui/fragments/BuoyFragment.java b/mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/ui/fragments/BuoyFragment.java
index c2447c8f983..1168023ce7d 100644
--- a/mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/ui/fragments/BuoyFragment.java
+++ b/mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/ui/fragments/BuoyFragment.java
@@ -251,6 +251,7 @@ public class BuoyFragment extends BaseFragment implements LocationListener {
     private void initLocationProvider() {
         locationManager = (LocationManager) getActivity().getSystemService(Context.LOCATION_SERVICE);
         locationManager.removeUpdates(this);
+        locationManager.removeGpsStatusListener(mGpsListener);
         locationManager.requestLocationUpdates(LocationManager.GPS_PROVIDER, GPS_MIN_TIME, GPS_MIN_DISTANCE, this);
         locationManager.addGpsStatusListener(mGpsListener);
         
@@ -343,7 +344,7 @@ public class BuoyFragment extends BaseFragment implements LocationListener {
         public void onReceive(Context context, Intent intent) {
             String action = intent.getAction();
             Log.d(TAG, "Action: " + action);
-            if (action.equals(getString(R.string.database_changed))) {
+            if (action.equals(getString(R.string.database_changed)) && isAdded()) {
                 positioningActivity.loadDataFromDatabase();
                 setUpTextUI(lastKnownLocation);
                 updateMap();
@@ -361,12 +362,14 @@ public class BuoyFragment extends BaseFragment implements LocationListener {
         public void onGpsStatusChanged(int event) {
             switch (event) {
                 case GpsStatus.GPS_EVENT_STOPPED: {
-                    disablePositionButton();
-                    distanceTextView.setText(N_A);
-                    accuracyTextView.setText(N_A);
-                    mapFragment.getMap().setMyLocationEnabled(false);
-                    reportGPSQuality(0);
-                    break;
+                    if (isAdded()) {
+                        disablePositionButton();
+                        distanceTextView.setText(N_A);
+                        accuracyTextView.setText(N_A);
+                        mapFragment.getMap().setMyLocationEnabled(false);
+                        reportGPSQuality(0);
+                        break;
+                    }
                 }
             }
         }

From 58f30324e729c0924eb15745ca478703ffe3f79f Mon Sep 17 00:00:00 2001
From: Bennet Brunsen <brunsen@ubilabs.net>
Date: Thu, 9 Jun 2016 14:22:49 +0200
Subject: [PATCH 68/92] Adjusted send position disabled button text

---
 .../res/{color => drawable}/button_text_colors.xml        | 0
 .../res/values-de/strings.xml                             | 4 ++--
 .../res/values-v21/theme.xml                              | 2 +-
 .../res/values/strings.xml                                | 4 ++--
 .../com.sap.sailing.buoy.positioning/res/values/theme.xml | 6 +++---
 .../buoy/positioning/app/ui/fragments/BuoyFragment.java   | 8 +-------
 6 files changed, 9 insertions(+), 15 deletions(-)
 rename mobile/com.sap.sailing.buoy.positioning/res/{color => drawable}/button_text_colors.xml (100%)

diff --git a/mobile/com.sap.sailing.buoy.positioning/res/color/button_text_colors.xml b/mobile/com.sap.sailing.buoy.positioning/res/drawable/button_text_colors.xml
similarity index 100%
rename from mobile/com.sap.sailing.buoy.positioning/res/color/button_text_colors.xml
rename to mobile/com.sap.sailing.buoy.positioning/res/drawable/button_text_colors.xml
diff --git a/mobile/com.sap.sailing.buoy.positioning/res/values-de/strings.xml b/mobile/com.sap.sailing.buoy.positioning/res/values-de/strings.xml
index e9c61332614..24f35fa5273 100644
--- a/mobile/com.sap.sailing.buoy.positioning/res/values-de/strings.xml
+++ b/mobile/com.sap.sailing.buoy.positioning/res/values-de/strings.xml
@@ -4,8 +4,8 @@
     <string name="course_type">Kurstyp</string>
     <string name="marks">Kursmarkierungen</string>
     <string name="set_position">Position setzen</string>
-    <string name="set_position_disabled_gps">POSITION SETZEN\nBitte GPS aktivieren</string>
-    <string name="set_position_no_gps_yet">POSITION SETZEN\nWarte auf GPS Verbindung</string>
+    <string name="set_position_disabled_gps">GPS aktivieren,\n um die Position zu setzen</string>
+    <string name="set_position_no_gps_yet">Warte auf GPS Signal</string>
     <string name="reset_position">Position zurücksetzen</string>
     <string name="getting_marks">Empfangen der Markierungen&#8230;</string>
     <string name="set">Gesetzt</string>
diff --git a/mobile/com.sap.sailing.buoy.positioning/res/values-v21/theme.xml b/mobile/com.sap.sailing.buoy.positioning/res/values-v21/theme.xml
index 50d828d91e9..905ac38f9ea 100644
--- a/mobile/com.sap.sailing.buoy.positioning/res/values-v21/theme.xml
+++ b/mobile/com.sap.sailing.buoy.positioning/res/values-v21/theme.xml
@@ -16,7 +16,7 @@
     <style name="shadowLessButtonStyle" parent="@android:style/Widget.Material.Button.Borderless">
         <item name="android:textAppearance">@style/Base.TextAppearance.AppCompat.Button</item>
         <item name="android:textAllCaps">false</item>
-        <item name="android:textColor">@color/button_text_colors</item>
+        <item name="android:textColor">@drawable/button_text_colors</item>
         <item name="android:elevation">0dp</item>
         <item name="android:stateListAnimator">@null</item>
     </style>
diff --git a/mobile/com.sap.sailing.buoy.positioning/res/values/strings.xml b/mobile/com.sap.sailing.buoy.positioning/res/values/strings.xml
index f1f2a66adc3..61b336016b6 100644
--- a/mobile/com.sap.sailing.buoy.positioning/res/values/strings.xml
+++ b/mobile/com.sap.sailing.buoy.positioning/res/values/strings.xml
@@ -5,8 +5,8 @@
     <string name="course_type">Course Type</string>
     <string name="marks">Marks</string>
     <string name="set_position">Set Position</string>
-    <string name="set_position_disabled_gps">SET POSITION\nPlease activate GPS</string>
-    <string name="set_position_no_gps_yet">SET POSITION\nWaiting for GPS connection</string>
+    <string name="set_position_disabled_gps">Enable GPS\nto set Position</string>
+    <string name="set_position_no_gps_yet">Waiting for GPS connection</string>
     <string name="reset_position">Reset Position</string>
     <string name="getting_marks">Getting race marks&#8230;</string>
     <string name="set">set</string>
diff --git a/mobile/com.sap.sailing.buoy.positioning/res/values/theme.xml b/mobile/com.sap.sailing.buoy.positioning/res/values/theme.xml
index abed22e2346..6a76cd45be1 100644
--- a/mobile/com.sap.sailing.buoy.positioning/res/values/theme.xml
+++ b/mobile/com.sap.sailing.buoy.positioning/res/values/theme.xml
@@ -19,7 +19,7 @@
 
         <!-- You can also set colorControlNormal, colorControlActivated colorControlHighlight & colorSwitchThumbNormal. -->
 
-        <item name="android:buttonStyle">@style/buttonStyle</item>
+        <item name="buttonStyle">@style/buttonStyle</item>
 
         <item name="windowActionBar">false</item>
     </style>
@@ -30,9 +30,9 @@
         <item name="android:background">@color/separator_color</item>
     </style>
 
-    <style name="buttonStyle" parent="Base.Widget.AppCompat.Button">
+    <style name="buttonStyle" parent="Base.Widget.AppCompat.Button.Borderless">
         <item name="android:textAllCaps">false</item>
-        <item name="android:textColor">@color/button_text_colors</item>
+        <item name="android:textColor">@drawable/button_text_colors</item>
     </style>
 
 </resources>
\ No newline at end of file
diff --git a/mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/ui/fragments/BuoyFragment.java b/mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/ui/fragments/BuoyFragment.java
index 1168023ce7d..481b5fb247e 100644
--- a/mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/ui/fragments/BuoyFragment.java
+++ b/mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/ui/fragments/BuoyFragment.java
@@ -16,9 +16,6 @@ import android.location.LocationListener;
 import android.location.LocationManager;
 import android.os.Bundle;
 import android.support.v4.content.LocalBroadcastManager;
-import android.text.SpannableString;
-import android.text.Spanned;
-import android.text.style.AbsoluteSizeSpan;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -131,10 +128,7 @@ public class BuoyFragment extends BaseFragment implements LocationListener {
         boolean gpsEnabled = LocationHelper.isGPSEnabled(getActivity());
         int buttonTextId = gpsEnabled ? R.string.set_position_no_gps_yet : R.string.set_position_disabled_gps;
         String text = getString(buttonTextId);
-        SpannableString disabledButtonText = new SpannableString(text);
-        AbsoluteSizeSpan absoluteSizeSpan = new AbsoluteSizeSpan(10, true);
-        disabledButtonText.setSpan(absoluteSizeSpan, text.indexOf("\n"), text.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
-        setPositionButton.setText(disabledButtonText);
+        setPositionButton.setText(text);
     }
 
     private void checkGPS() {

From f45c3e5bed20699b3f08a57ff40fc36c159defc3 Mon Sep 17 00:00:00 2001
From: Bennet Brunsen <brunsen@ubilabs.net>
Date: Tue, 28 Jun 2016 11:49:57 +0200
Subject: [PATCH 69/92] Make regatta list adapter independent of competitor

---
 .../android/tracking/app/provider/AnalyticsContract.java | 4 ++--
 .../android/tracking/app/ui/fragments/HomeFragment.java  | 9 +++++----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/provider/AnalyticsContract.java b/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/provider/AnalyticsContract.java
index 86a912f6a52..5ce59952385 100644
--- a/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/provider/AnalyticsContract.java
+++ b/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/provider/AnalyticsContract.java
@@ -40,8 +40,8 @@ public class AnalyticsContract {
     public static final Uri BASE_CONTENT_URI = Uri.parse("content://" + CONTENT_AUTHORITY);
 
     private static final String PATH_COMPETITOR = "competitors";
-    private static final String PATH_EVENT = "events";
-    private static final String PATH_LEADERBOARD = "leaderboards";
+    public static final String PATH_EVENT = "events";
+    public static final String PATH_LEADERBOARD = "leaderboards";
     private static final String PATH_CHECKIN_URI = "checkin_uris";
 
     public static class LeaderboardsEventsJoined {
diff --git a/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/fragments/HomeFragment.java b/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/fragments/HomeFragment.java
index 15425a241cc..1be6777fcde 100644
--- a/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/fragments/HomeFragment.java
+++ b/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/fragments/HomeFragment.java
@@ -197,10 +197,11 @@ public class HomeFragment extends AbstractHomeFragment implements LoaderCallback
     public Loader<Cursor> onCreateLoader(int loaderId, Bundle bundle) {
         switch (loaderId) {
         case REGATTA_LOADER:
-            String[] projection = new String[] { "events.event_checkin_digest", "events.event_id", "events._id",
-                    "events.event_name", "events.event_server", "competitors.competitor_display_name",
-                    "competitors.competitor_id", "leaderboards.leaderboard_name",
-                    "competitors.competitor_country_code", "competitors.competitor_sail_id" };
+            String[] projection = new String[] { AnalyticsContract.PATH_EVENT + "." + AnalyticsContract.Event.EVENT_CHECKIN_DIGEST,
+                AnalyticsContract.PATH_EVENT + "." + AnalyticsContract.Event._ID,
+                AnalyticsContract.PATH_EVENT + "." + AnalyticsContract.Event.EVENT_NAME,
+                AnalyticsContract.PATH_EVENT + "." + AnalyticsContract.Event.EVENT_SERVER,
+                AnalyticsContract.PATH_LEADERBOARD + "." + AnalyticsContract.Leaderboard.LEADERBOARD_NAME};
             return new CursorLoader(getActivity(), AnalyticsContract.EventLeaderboardCompetitorJoined.CONTENT_URI,
                     projection, null, null, null);
 

From a1e25c6ef3be982c2ac97f7a447f630d297d51a2 Mon Sep 17 00:00:00 2001
From: Bennet Brunsen <brunsen@ubilabs.net>
Date: Tue, 28 Jun 2016 11:52:00 +0200
Subject: [PATCH 70/92] Use constant for click listener in regatta list

---
 .../sailing/android/tracking/app/ui/fragments/HomeFragment.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/fragments/HomeFragment.java b/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/fragments/HomeFragment.java
index 1be6777fcde..32d7f02bdfe 100644
--- a/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/fragments/HomeFragment.java
+++ b/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/fragments/HomeFragment.java
@@ -273,7 +273,7 @@ public class HomeFragment extends AbstractHomeFragment implements LoaderCallback
             // -1, because there's a header row
             Cursor cursor = (Cursor) adapter.getItem(position - 1);
 
-            String checkinDigest = cursor.getString(cursor.getColumnIndex("event_checkin_digest"));
+            String checkinDigest = cursor.getString(cursor.getColumnIndex(AnalyticsContract.Event.EVENT_CHECKIN_DIGEST));
             startRegatta(checkinDigest);
         }
     }

From a6b40ea054f89c9ee37340945e7c90b5acad8f21 Mon Sep 17 00:00:00 2001
From: Bennet Brunsen <brunsen@ubilabs.net>
Date: Tue, 28 Jun 2016 17:23:58 +0200
Subject: [PATCH 71/92] Extracted data objects for checkin with competitor

---
 ...tCheckinData.java => BaseCheckinData.java} |   2 +-
 .../ui/activities/CheckinDataActivity.java    |   4 +-
 .../shared/util/CheckinDataHandler.java       |   4 +-
 .../ui/fragments/AbstractHomeFragment.java    |   4 +-
 .../app/ui/activities/RegattaActivity.java    |  27 ++--
 .../app/ui/activities/StartActivity.java      |  26 ++--
 .../app/ui/fragments/HomeFragment.java        |  84 ++++++-----
 .../tracking/app/utils/CheckinManager.java    | 133 ++++++++----------
 .../app/valueobjects/CheckinData.java         |  55 ++++----
 .../valueobjects/CompetitorCheckinData.java   |  33 +++++
 .../app/valueobjects/CompetitorUrlData.java   |  15 ++
 .../app/valueobjects/MarkCheckinData.java     |   8 ++
 .../app/valueobjects/MarkUrlData.java         |   8 ++
 .../tracking/app/valueobjects/UrlData.java    |  28 ++++
 .../app/service/MarkerService.java            |   4 +-
 .../app/ui/activities/RegattaActivity.java    |   4 +-
 .../app/ui/activities/StartActivity.java      |   4 +-
 .../app/ui/fragments/HomeFragment.java        |   4 +-
 .../positioning/app/util/CheckinManager.java  |  10 +-
 .../app/valueobjects/CheckinData.java         |   4 +-
 20 files changed, 272 insertions(+), 189 deletions(-)
 rename mobile/com.sap.sailing.android.shared/src/com/sap/sailing/android/shared/data/{AbstractCheckinData.java => BaseCheckinData.java} (52%)
 create mode 100644 mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/valueobjects/CompetitorCheckinData.java
 create mode 100644 mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/valueobjects/CompetitorUrlData.java
 create mode 100644 mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/valueobjects/MarkCheckinData.java
 create mode 100644 mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/valueobjects/MarkUrlData.java
 create mode 100644 mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/valueobjects/UrlData.java

diff --git a/mobile/com.sap.sailing.android.shared/src/com/sap/sailing/android/shared/data/AbstractCheckinData.java b/mobile/com.sap.sailing.android.shared/src/com/sap/sailing/android/shared/data/BaseCheckinData.java
similarity index 52%
rename from mobile/com.sap.sailing.android.shared/src/com/sap/sailing/android/shared/data/AbstractCheckinData.java
rename to mobile/com.sap.sailing.android.shared/src/com/sap/sailing/android/shared/data/BaseCheckinData.java
index 99d5e78054a..5e35cf2370e 100644
--- a/mobile/com.sap.sailing.android.shared/src/com/sap/sailing/android/shared/data/AbstractCheckinData.java
+++ b/mobile/com.sap.sailing.android.shared/src/com/sap/sailing/android/shared/data/BaseCheckinData.java
@@ -1,5 +1,5 @@
 package com.sap.sailing.android.shared.data;
 
-public abstract class AbstractCheckinData {
+public abstract class BaseCheckinData {
 
 }
diff --git a/mobile/com.sap.sailing.android.shared/src/com/sap/sailing/android/shared/ui/activities/CheckinDataActivity.java b/mobile/com.sap.sailing.android.shared/src/com/sap/sailing/android/shared/ui/activities/CheckinDataActivity.java
index e9ae6ade12b..4583375c905 100644
--- a/mobile/com.sap.sailing.android.shared/src/com/sap/sailing/android/shared/ui/activities/CheckinDataActivity.java
+++ b/mobile/com.sap.sailing.android.shared/src/com/sap/sailing/android/shared/ui/activities/CheckinDataActivity.java
@@ -4,13 +4,13 @@ import android.app.AlertDialog;
 import android.content.DialogInterface;
 
 import com.sap.sailing.android.shared.R;
-import com.sap.sailing.android.shared.data.AbstractCheckinData;
+import com.sap.sailing.android.shared.data.BaseCheckinData;
 import com.sap.sailing.android.shared.util.CheckinDataHandler;
 
 public abstract class CheckinDataActivity extends AbstractBaseActivity implements CheckinDataHandler {
 
     @Override
-    public abstract void onCheckinDataAvailable(AbstractCheckinData data);
+    public abstract void onCheckinDataAvailable(BaseCheckinData data);
 
     /**
      * Shows a pop-up-dialog that informs the user than an DB-operation has failed.
diff --git a/mobile/com.sap.sailing.android.shared/src/com/sap/sailing/android/shared/util/CheckinDataHandler.java b/mobile/com.sap.sailing.android.shared/src/com/sap/sailing/android/shared/util/CheckinDataHandler.java
index 8fb8384600d..81fd59edcd0 100644
--- a/mobile/com.sap.sailing.android.shared/src/com/sap/sailing/android/shared/util/CheckinDataHandler.java
+++ b/mobile/com.sap.sailing.android.shared/src/com/sap/sailing/android/shared/util/CheckinDataHandler.java
@@ -1,7 +1,7 @@
 package com.sap.sailing.android.shared.util;
 
-import com.sap.sailing.android.shared.data.AbstractCheckinData;
+import com.sap.sailing.android.shared.data.BaseCheckinData;
 
 public interface CheckinDataHandler {
-    public void onCheckinDataAvailable(AbstractCheckinData data);
+    public void onCheckinDataAvailable(BaseCheckinData data);
 }
diff --git a/mobile/com.sap.sailing.android.shared/src/com/sap/sailing/android/ui/fragments/AbstractHomeFragment.java b/mobile/com.sap.sailing.android.shared/src/com/sap/sailing/android/ui/fragments/AbstractHomeFragment.java
index a0f2e4c7bcf..2a1fc69c22f 100644
--- a/mobile/com.sap.sailing.android.shared/src/com/sap/sailing/android/ui/fragments/AbstractHomeFragment.java
+++ b/mobile/com.sap.sailing.android.shared/src/com/sap/sailing/android/ui/fragments/AbstractHomeFragment.java
@@ -19,7 +19,7 @@ import android.widget.Button;
 import android.widget.Toast;
 
 import com.sap.sailing.android.shared.R;
-import com.sap.sailing.android.shared.data.AbstractCheckinData;
+import com.sap.sailing.android.shared.data.BaseCheckinData;
 import com.sap.sailing.android.shared.logging.ExLog;
 import com.sap.sailing.android.shared.ui.activities.AbstractStartActivity;
 import com.sap.sailing.android.shared.ui.adapters.AbstractRegattaAdapter;
@@ -108,7 +108,7 @@ public abstract class AbstractHomeFragment extends BaseFragment {
      *
      * @param checkinData
      */
-    public abstract void displayUserConfirmationScreen(final AbstractCheckinData data);
+    public abstract void displayUserConfirmationScreen(final BaseCheckinData data);
 
     protected void clearScannedQRCodeInPrefs() {
         prefs.setLastScannedQRCode(null);
diff --git a/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/activities/RegattaActivity.java b/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/activities/RegattaActivity.java
index edcbcdc6608..e13855bc329 100755
--- a/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/activities/RegattaActivity.java
+++ b/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/activities/RegattaActivity.java
@@ -36,7 +36,7 @@ import android.widget.LinearLayout;
 import android.widget.TextView;
 import android.widget.Toast;
 
-import com.sap.sailing.android.shared.data.AbstractCheckinData;
+import com.sap.sailing.android.shared.data.BaseCheckinData;
 import com.sap.sailing.android.shared.data.CheckinUrlInfo;
 import com.sap.sailing.android.shared.data.LeaderboardInfo;
 import com.sap.sailing.android.shared.data.http.HttpGetRequest;
@@ -60,6 +60,7 @@ import com.sap.sailing.android.tracking.app.utils.AppPreferences;
 import com.sap.sailing.android.tracking.app.utils.CheckinManager;
 import com.sap.sailing.android.tracking.app.utils.DatabaseHelper;
 import com.sap.sailing.android.tracking.app.valueobjects.CheckinData;
+import com.sap.sailing.android.tracking.app.valueobjects.CompetitorCheckinData;
 import com.sap.sailing.android.tracking.app.valueobjects.CompetitorInfo;
 import com.sap.sailing.android.tracking.app.valueobjects.EventInfo;
 
@@ -413,19 +414,23 @@ public class RegattaActivity extends AbstractRegattaActivity
     }
 
     @Override
-    public void onCheckinDataAvailable(AbstractCheckinData checkinData) {
+    public void onCheckinDataAvailable(BaseCheckinData checkinData) {
         if (checkinData != null) {
             CheckinData data = (CheckinData) checkinData;
             try {
-                DatabaseHelper.getInstance().deleteRegattaFromDatabase(this, checkinDigest);
-                DatabaseHelper.getInstance().storeCheckinRow(this, data.getEvent(), data.getCompetitor(), data.getLeaderboard(), data.getCheckinUrl());
-                competitor = DatabaseHelper.getInstance().getCompetitor(this, checkinDigest);
-                event = DatabaseHelper.getInstance().getEventInfo(this, checkinDigest);
-                leaderboard = DatabaseHelper.getInstance().getLeaderboard(this, checkinDigest);
-                checkinUrl = DatabaseHelper.getInstance().getCheckinUrl(this, checkinDigest);
-                RegattaFragment regattaFragment = new RegattaFragment();
-                regattaFragment.setFragmentWatcher(this);
-                replaceFragment(R.id.content_frame, regattaFragment);
+                if (data instanceof CompetitorCheckinData) {
+                    CompetitorCheckinData competitorCheckinData = (CompetitorCheckinData) data;
+                    DatabaseHelper.getInstance().deleteRegattaFromDatabase(this, checkinDigest);
+                    DatabaseHelper.getInstance().storeCheckinRow(this, competitorCheckinData.getEvent(), competitorCheckinData.getCompetitor(),
+                        competitorCheckinData.getLeaderboard(), competitorCheckinData.getCheckinUrl());
+                    competitor = DatabaseHelper.getInstance().getCompetitor(this, checkinDigest);
+                    event = DatabaseHelper.getInstance().getEventInfo(this, checkinDigest);
+                    leaderboard = DatabaseHelper.getInstance().getLeaderboard(this, checkinDigest);
+                    checkinUrl = DatabaseHelper.getInstance().getCheckinUrl(this, checkinDigest);
+                    RegattaFragment regattaFragment = new RegattaFragment();
+                    regattaFragment.setFragmentWatcher(this);
+                    replaceFragment(R.id.content_frame, regattaFragment);
+                }
             } catch (DatabaseHelper.GeneralDatabaseHelperException e) {
                 ExLog.e(this, TAG, "Batch insert failed: " + e.getMessage());
                 displayDatabaseError();
diff --git a/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/activities/StartActivity.java b/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/activities/StartActivity.java
index 5e196f181e0..9059d1563b7 100644
--- a/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/activities/StartActivity.java
+++ b/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/activities/StartActivity.java
@@ -9,7 +9,7 @@ import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
 
-import com.sap.sailing.android.shared.data.AbstractCheckinData;
+import com.sap.sailing.android.shared.data.BaseCheckinData;
 import com.sap.sailing.android.shared.logging.ExLog;
 import com.sap.sailing.android.shared.ui.activities.AbstractStartActivity;
 import com.sap.sailing.android.shared.util.EulaHelper;
@@ -20,6 +20,7 @@ import com.sap.sailing.android.tracking.app.utils.AppPreferences;
 import com.sap.sailing.android.tracking.app.utils.CheckinManager;
 import com.sap.sailing.android.tracking.app.utils.DatabaseHelper;
 import com.sap.sailing.android.tracking.app.valueobjects.CheckinData;
+import com.sap.sailing.android.tracking.app.valueobjects.CompetitorCheckinData;
 import com.sap.sailing.android.ui.fragments.AbstractHomeFragment;
 
 public class StartActivity extends AbstractStartActivity {
@@ -98,7 +99,7 @@ public class StartActivity extends AbstractStartActivity {
     }
 
     @Override
-    public void onCheckinDataAvailable(AbstractCheckinData data) {
+    public void onCheckinDataAvailable(BaseCheckinData data) {
         if (data != null && data instanceof CheckinData) {
             CheckinData checkinData = (CheckinData) data;
             if (!checkinData.isUpdate()) {
@@ -109,16 +110,19 @@ public class StartActivity extends AbstractStartActivity {
         }
     }
 
-    private void updateRegatta(AbstractCheckinData data) {
-        if (data instanceof CheckinData)
-        {
+    private void updateRegatta(BaseCheckinData data) {
+        if (data instanceof CheckinData) {
             CheckinData checkinData = (CheckinData) data;
-            try {
-                DatabaseHelper.getInstance().deleteRegattaFromDatabase(this, checkinData.getCheckinUrl().checkinDigest);
-                DatabaseHelper.getInstance().storeCheckinRow(this, checkinData.getEvent(), checkinData.getCompetitor(), checkinData.getLeaderboard(), checkinData.getCheckinUrl());
-            } catch (DatabaseHelper.GeneralDatabaseHelperException e) {
-                ExLog.e(this, TAG, "Batch insert failed: " + e.getMessage());
-                displayDatabaseError();
+            if (checkinData instanceof CompetitorCheckinData) {
+                CompetitorCheckinData competitorCheckinData = (CompetitorCheckinData) checkinData;
+                try {
+                    DatabaseHelper.getInstance().deleteRegattaFromDatabase(this, checkinData.getCheckinUrl().checkinDigest);
+                    DatabaseHelper.getInstance()
+                        .storeCheckinRow(this, checkinData.getEvent(), competitorCheckinData.getCompetitor(), checkinData.getLeaderboard(), checkinData.getCheckinUrl());
+                } catch (DatabaseHelper.GeneralDatabaseHelperException e) {
+                    ExLog.e(this, TAG, "Batch insert failed: " + e.getMessage());
+                    displayDatabaseError();
+                }
             }
         }
     }
diff --git a/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/fragments/HomeFragment.java b/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/fragments/HomeFragment.java
index 32d7f02bdfe..852ff6f4cc2 100644
--- a/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/fragments/HomeFragment.java
+++ b/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/fragments/HomeFragment.java
@@ -26,7 +26,7 @@ import android.widget.AdapterView.OnItemClickListener;
 import android.widget.ListView;
 import android.widget.Toast;
 
-import com.sap.sailing.android.shared.data.AbstractCheckinData;
+import com.sap.sailing.android.shared.data.BaseCheckinData;
 import com.sap.sailing.android.shared.data.http.HttpJsonPostRequest;
 import com.sap.sailing.android.shared.logging.ExLog;
 import com.sap.sailing.android.shared.util.NetworkHelper;
@@ -45,6 +45,7 @@ import com.sap.sailing.android.tracking.app.utils.CheckinManager;
 import com.sap.sailing.android.tracking.app.utils.DatabaseHelper;
 import com.sap.sailing.android.tracking.app.utils.DatabaseHelper.GeneralDatabaseHelperException;
 import com.sap.sailing.android.tracking.app.valueobjects.CheckinData;
+import com.sap.sailing.android.tracking.app.valueobjects.CompetitorCheckinData;
 import com.sap.sailing.android.ui.fragments.AbstractHomeFragment;
 
 public class HomeFragment extends AbstractHomeFragment implements LoaderCallbacks<Cursor> {
@@ -91,7 +92,7 @@ public class HomeFragment extends AbstractHomeFragment implements LoaderCallback
      *
      * @param deviceMappingData
      */
-    private void checkInWithAPIAndDisplayTrackingActivity(CheckinData checkinData) {
+    private void checkInWithAPIAndDisplayTrackingActivity(CompetitorCheckinData checkinData) {
         if (DatabaseHelper.getInstance().eventLeaderboardCompetitorCombinationAvailable(getActivity(),
                 checkinData.checkinDigest)) {
             try {
@@ -122,23 +123,26 @@ public class HomeFragment extends AbstractHomeFragment implements LoaderCallback
      * @param checkinData
      */
     private void performAPICheckin(CheckinData checkinData) {
-        Date date = new Date();
-        StartActivity startActivity = (StartActivity) getActivity();
-        startActivity.showProgressDialog(R.string.please_wait, R.string.checking_in);
-        try {
-            JSONObject requestObject = CheckinHelper.getCheckinJson(checkinData.competitorId, checkinData.deviceUid,
+        if (checkinData instanceof CompetitorCheckinData) {
+            CompetitorCheckinData competitorCheckinData = (CompetitorCheckinData) checkinData;
+            Date date = new Date();
+            StartActivity startActivity = (StartActivity) getActivity();
+            startActivity.showProgressDialog(R.string.please_wait, R.string.checking_in);
+            try {
+                JSONObject requestObject = CheckinHelper.getCheckinJson(competitorCheckinData.competitorId, competitorCheckinData.deviceUid,
                     "TODO push device ID!!", date.getTime());
-            HttpJsonPostRequest request = new HttpJsonPostRequest(getActivity(), new URL(checkinData.checkinURL),
+                HttpJsonPostRequest request = new HttpJsonPostRequest(getActivity(), new URL(competitorCheckinData.checkinURL),
                     requestObject.toString());
-            NetworkHelper.getInstance(getActivity())
-                    .executeHttpJsonRequestAsync(request, new CheckinListener(checkinData.checkinDigest),
-                            new CheckinErrorListener(checkinData.checkinDigest));
-        } catch (JSONException e) {
-            ExLog.e(getActivity(), TAG, "Failed to generate checkin JSON: " + e.getMessage());
-            displayAPIErrorRecommendRetry();
-        } catch (MalformedURLException e) {
-            ExLog.e(getActivity(), TAG, "Failed to perform checkin, MalformedURLException: " + e.getMessage());
-            displayAPIErrorRecommendRetry();
+                NetworkHelper.getInstance(getActivity())
+                    .executeHttpJsonRequestAsync(request, new CheckinListener(competitorCheckinData.checkinDigest),
+                        new CheckinErrorListener(competitorCheckinData.checkinDigest));
+            } catch (JSONException e) {
+                ExLog.e(getActivity(), TAG, "Failed to generate checkin JSON: " + e.getMessage());
+                displayAPIErrorRecommendRetry();
+            } catch (MalformedURLException e) {
+                ExLog.e(getActivity(), TAG, "Failed to perform checkin, MalformedURLException: " + e.getMessage());
+                displayAPIErrorRecommendRetry();
+            }
         }
     }
 
@@ -155,31 +159,33 @@ public class HomeFragment extends AbstractHomeFragment implements LoaderCallback
      * @param checkinData
      */
     @Override
-    public void displayUserConfirmationScreen(final AbstractCheckinData data) {
-        final CheckinData checkinData = (CheckinData) data;
-        String message1 = getString(R.string.confirm_data_hello_name)
+    public void displayUserConfirmationScreen(final BaseCheckinData data) {
+        if (data instanceof CompetitorCheckinData) {
+            CompetitorCheckinData checkinData = (CompetitorCheckinData) data;
+            String message1 = getString(R.string.confirm_data_hello_name)
                 .replace("{full_name}", checkinData.competitorName);
-        String message2 = getString(R.string.confirm_data_you_are_signed_in_as_sail_id).replace("{sail_id}",
+            String message2 = getString(R.string.confirm_data_you_are_signed_in_as_sail_id).replace("{sail_id}",
                 checkinData.competitorSailId);
 
-        AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
-        builder.setMessage(message1 + "\n\n" + message2);
-        builder.setCancelable(true);
-        builder.setPositiveButton(getString(R.string.confirm_data_is_correct), new DialogInterface.OnClickListener() {
-            @Override
-            public void onClick(DialogInterface dialog, int which) {
-                clearScannedQRCodeInPrefs();
-                checkInWithAPIAndDisplayTrackingActivity(checkinData);
-            }
-        }).setNegativeButton(R.string.decline_data_is_incorrect, new DialogInterface.OnClickListener() {
-            @Override
-            public void onClick(DialogInterface dialog, int which) {
-                clearScannedQRCodeInPrefs();
-                dialog.cancel();
-            }
-        });
-        AlertDialog alert = builder.create();
-        alert.show();
+            AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
+            builder.setMessage(message1 + "\n\n" + message2);
+            builder.setCancelable(true);
+            builder.setPositiveButton(getString(R.string.confirm_data_is_correct), new DialogInterface.OnClickListener() {
+                @Override
+                public void onClick(DialogInterface dialog, int which) {
+                    clearScannedQRCodeInPrefs();
+                    checkInWithAPIAndDisplayTrackingActivity((CompetitorCheckinData) data);
+                }
+            }).setNegativeButton(R.string.decline_data_is_incorrect, new DialogInterface.OnClickListener() {
+                @Override
+                public void onClick(DialogInterface dialog, int which) {
+                    clearScannedQRCodeInPrefs();
+                    dialog.cancel();
+                }
+            });
+            AlertDialog alert = builder.create();
+            alert.show();
+        }
     }
 
     /**
diff --git a/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/utils/CheckinManager.java b/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/utils/CheckinManager.java
index 385e722c20c..0ca136deea4 100644
--- a/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/utils/CheckinManager.java
+++ b/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/utils/CheckinManager.java
@@ -5,6 +5,7 @@ import java.net.MalformedURLException;
 import java.net.URL;
 import java.net.URLEncoder;
 import java.security.NoSuchAlgorithmException;
+import java.util.Set;
 import java.util.UUID;
 
 import org.json.JSONException;
@@ -17,7 +18,7 @@ import android.content.DialogInterface;
 import android.net.Uri;
 import android.widget.Toast;
 
-import com.sap.sailing.android.shared.data.AbstractCheckinData;
+import com.sap.sailing.android.shared.data.BaseCheckinData;
 import com.sap.sailing.android.shared.data.http.HttpGetRequest;
 import com.sap.sailing.android.shared.logging.ExLog;
 import com.sap.sailing.android.shared.ui.activities.CheckinDataActivity;
@@ -25,6 +26,11 @@ import com.sap.sailing.android.shared.util.NetworkHelper;
 import com.sap.sailing.android.shared.util.UniqueDeviceUuid;
 import com.sap.sailing.android.tracking.app.R;
 import com.sap.sailing.android.tracking.app.valueobjects.CheckinData;
+import com.sap.sailing.android.tracking.app.valueobjects.CompetitorCheckinData;
+import com.sap.sailing.android.tracking.app.valueobjects.CompetitorUrlData;
+import com.sap.sailing.android.tracking.app.valueobjects.MarkCheckinData;
+import com.sap.sailing.android.tracking.app.valueobjects.MarkUrlData;
+import com.sap.sailing.android.tracking.app.valueobjects.UrlData;
 import com.sap.sailing.domain.abstractlog.race.RaceLog;
 import com.sap.sailing.domain.abstractlog.race.SimpleRaceLogIdentifier;
 import com.sap.sailing.domain.abstractlog.race.analyzing.impl.RaceLogResolver;
@@ -32,7 +38,6 @@ import com.sap.sailing.domain.base.EventBase;
 import com.sap.sailing.domain.base.impl.SharedDomainFactoryImpl;
 import com.sap.sailing.domain.common.racelog.tracking.DeviceMappingConstants;
 import com.sap.sailing.domain.common.tracking.impl.CompetitorJsonConstants;
-import com.sap.sailing.domain.racelogtracking.DeviceIdentifier;
 import com.sap.sailing.domain.racelogtracking.impl.SmartphoneUUIDIdentifierImpl;
 import com.sap.sailing.server.gateway.deserialization.JsonDeserializationException;
 import com.sap.sailing.server.gateway.deserialization.impl.CourseAreaJsonDeserializer;
@@ -45,7 +50,7 @@ import com.sap.sse.shared.media.ImageDescriptor;
 public class CheckinManager {
 
     private final static String TAG = CheckinManager.class.getName();
-    private AbstractCheckinData checkinData;
+    private BaseCheckinData checkinData;
     private CheckinDataActivity activity;
     private AppPreferences prefs;
     private String url;
@@ -62,7 +67,7 @@ public class CheckinManager {
         Uri uri = Uri.parse(url);
         String scheme = uri.getScheme();
 
-        final URLData urlData = extractRequestParametersFromUri(uri, scheme);
+        final UrlData urlData = extractRequestParametersFromUri(uri, scheme);
         if (urlData == null) {
             setCheckinData(null);
             return;
@@ -80,25 +85,33 @@ public class CheckinManager {
         }
     }
 
-    private URLData extractRequestParametersFromUri(Uri uri, String scheme) {
-        URLData urlData = new URLData();
-        urlData.uriStr = uri.toString();
-        urlData.server = scheme + "://" + uri.getHost();
-        urlData.port = uri.getPort();
-        urlData.hostWithPort = urlData.server + (urlData.port == -1 ? "" : (":" + urlData.port));
+    private UrlData extractRequestParametersFromUri(Uri uri, String scheme) {
+        UrlData urlData = null;
+        String server = scheme + "://" + uri.getHost();
+        int port = uri.getPort();
         Exception exception = null;
         try {
             String leaderboardNameFromQR = URLEncoder.encode(uri.getQueryParameter(DeviceMappingConstants.URL_LEADERBOARD_NAME), "UTF-8")
                 .replace("+", "%20");
-            urlData.competitorId = uri.getQueryParameter(DeviceMappingConstants.URL_COMPETITOR_ID_AS_STRING);
-            // TODO alternatively consider a mark_id
+            Set<String> parameterNames = uri.getQueryParameterNames();
+            if (parameterNames.contains(DeviceMappingConstants.URL_COMPETITOR_ID_AS_STRING)) {
+                CompetitorUrlData competitorUrlData = new CompetitorUrlData(server, port);
+                competitorUrlData.competitorId = uri.getQueryParameter(DeviceMappingConstants.URL_COMPETITOR_ID_AS_STRING);
+                competitorUrlData.competitorUrl = competitorUrlData.hostWithPort + prefs.getServerCompetitorPath(competitorUrlData.competitorId);
+                urlData = competitorUrlData;
+            } else {
+                // TODO alternatively consider a mark_id
+                MarkUrlData markUrlData = new MarkUrlData(server, port);
+                urlData = markUrlData;
+            }
+            urlData.uriStr = uri.toString();
             urlData.checkinURLStr = urlData.hostWithPort + prefs.getServerCheckinPath().replace("{leaderboard-name}", leaderboardNameFromQR);
             urlData.eventId = uri.getQueryParameter(DeviceMappingConstants.URL_EVENT_ID);
             urlData.leaderboardName = leaderboardNameFromQR;
             urlData.deviceUuid = new SmartphoneUUIDIdentifierImpl(UUID.fromString(UniqueDeviceUuid.getUniqueId(activity)));
             urlData.eventUrl = urlData.hostWithPort + prefs.getServerEventPath(urlData.eventId);
             urlData.leaderboardUrl = urlData.hostWithPort + prefs.getServerLeaderboardPath(urlData.leaderboardName);
-            urlData.competitorUrl = urlData.hostWithPort + prefs.getServerCompetitorPath(urlData.competitorId);
+
         } catch (UnsupportedEncodingException e) {
             ExLog.e(activity, TAG, "Failed to encode leaderboard name: " + e.getMessage());
             exception = e;
@@ -114,16 +127,15 @@ public class CheckinManager {
         return urlData;
     }
 
-    private void getLeaderBoardFromServer(final URLData urlData, HttpGetRequest getLeaderboardRequest) {
+    private void getLeaderBoardFromServer(final UrlData urlData, HttpGetRequest getLeaderboardRequest) {
         NetworkHelper.getInstance(activity)
             .executeHttpJsonRequestAsync(getLeaderboardRequest, new NetworkHelper.NetworkHelperSuccessListener() {
                 @Override
                 public void performAction(JSONObject response) {
 
-                    final String leaderboardName;
-
                     try {
-                        leaderboardName = response.getString("name");
+                        // Check if call to leaderboard returned valid response
+                        response.getString("name");
                     } catch (JSONException e) {
                         ExLog.e(activity, TAG, "Error getting data from call on URL: " + urlData.leaderboardUrl + ", Error: " + e.getMessage());
                         handleApiError();
@@ -133,7 +145,7 @@ public class CheckinManager {
                     HttpGetRequest getEventRequest;
                     try {
                         getEventRequest = new HttpGetRequest(new URL(urlData.eventUrl), activity);
-                        getEventFromServer(leaderboardName, getEventRequest, urlData);
+                        getEventFromServer(getEventRequest, urlData);
                     } catch (MalformedURLException e1) {
                         ExLog.e(activity, TAG, "Error: Failed to perform checking due to a MalformedURLException: " + e1.getMessage());
                         handleApiError();
@@ -149,7 +161,7 @@ public class CheckinManager {
             });
     }
 
-    private void getEventFromServer(final String leaderboardName, HttpGetRequest getEventRequest, final URLData urlData) {
+    private void getEventFromServer(HttpGetRequest getEventRequest, final UrlData urlData) {
         NetworkHelper.getInstance(activity).executeHttpJsonRequestAsync(getEventRequest, new NetworkHelper.NetworkHelperSuccessListener() {
 
             @Override
@@ -179,14 +191,17 @@ public class CheckinManager {
                     handleApiError();
                     return;
                 }
-                HttpGetRequest getCompetitorRequest;
-                try {
-                    getCompetitorRequest = new HttpGetRequest(new URL(urlData.competitorUrl), activity);
-                    getCompetitorFromServer(getCompetitorRequest, urlData, leaderboardName);
+                if (urlData instanceof CompetitorUrlData) {
+                    CompetitorUrlData competitorUrlData = (CompetitorUrlData) urlData;
+                    HttpGetRequest getCompetitorRequest;
+                    try {
+                        getCompetitorRequest = new HttpGetRequest(new URL(competitorUrlData.competitorUrl), activity);
+                        getCompetitorFromServer(getCompetitorRequest, competitorUrlData);
 
-                } catch (MalformedURLException e2) {
-                    ExLog.e(activity, TAG, "Error: Failed to perform checking due to a MalformedURLException: " + e2.getMessage());
-                    handleApiError();
+                    } catch (MalformedURLException e2) {
+                        ExLog.e(activity, TAG, "Error: Failed to perform checking due to a MalformedURLException: " + e2.getMessage());
+                        handleApiError();
+                    }
                 }
             }
         }, new NetworkHelper.NetworkHelperFailureListener() {
@@ -199,7 +214,7 @@ public class CheckinManager {
         });
     }
 
-    private void getCompetitorFromServer(HttpGetRequest getCompetitorRequest, final URLData urlData, final String leaderboardName) {
+    private void getCompetitorFromServer(HttpGetRequest getCompetitorRequest, final CompetitorUrlData urlData) {
         NetworkHelper.getInstance(activity)
             .executeHttpJsonRequestAsync(getCompetitorRequest, new NetworkHelper.NetworkHelperSuccessListener() {
                 @Override
@@ -217,7 +232,7 @@ public class CheckinManager {
                         handleApiError();
                         return;
                     }
-                    saveCheckinDataAndNotifyListeners(urlData, leaderboardName);
+                    saveCheckinDataAndNotifyListeners(urlData);
                 }
             }, new NetworkHelper.NetworkHelperFailureListener() {
                 @Override
@@ -228,43 +243,33 @@ public class CheckinManager {
             });
     }
 
-    private void saveCheckinDataAndNotifyListeners(URLData urlData, String leaderboardName) {
-        CheckinData data = new CheckinData();
+    private void saveCheckinDataAndNotifyListeners(UrlData urlData) {
+        CheckinData data;
+        if (urlData instanceof CompetitorUrlData) {
+            CompetitorUrlData competitorUrlData = (CompetitorUrlData) urlData;
+            CompetitorCheckinData competitorCheckinData = new CompetitorCheckinData(competitorUrlData);
+            data = competitorCheckinData;
+        } else {
+            MarkUrlData markUrlData = (MarkUrlData) urlData;
+            data = new MarkCheckinData(markUrlData);
+        }
         data.setUpdate(update);
-        data.competitorName = urlData.competitorName;
-        data.competitorId = urlData.competitorId;
-        data.competitorSailId = urlData.competitorSailId;
-        data.competitorNationality = urlData.competitorNationality;
-        data.competitorCountryCode = urlData.competitorCountryCode;
-        data.eventId = urlData.eventId;
-        data.eventName = urlData.eventName;
-        data.eventStartDateStr = urlData.eventStartDateStr;
-        data.eventEndDateStr = urlData.eventEndDateStr;
-        data.eventFirstImageUrl = urlData.eventFirstImageUrl;
-        data.eventServerUrl = urlData.hostWithPort;
-        data.checkinURL = urlData.checkinURLStr;
-        data.leaderboardName = leaderboardName;
-        data.deviceUid = urlData.deviceUuid.getStringRepresentation();
-        data.uriString = urlData.uriStr;
         try {
             data.setCheckinDigestFromString(urlData.uriStr);
             activity.dismissProgressDialog();
             setCheckinData(data);
-        } catch (UnsupportedEncodingException e) {
-            ExLog.e(activity, TAG, "Failed to get generate digest of qr-code string (" + urlData.uriStr + "). " + e.getMessage());
-            handleApiError();
-        } catch (NoSuchAlgorithmException e) {
+        } catch (UnsupportedEncodingException | NoSuchAlgorithmException e) {
             ExLog.e(activity, TAG, "Failed to get generate digest of qr-code string (" + urlData.uriStr + "). " + e.getMessage());
             handleApiError();
         }
     }
 
-    public void setCheckinData(AbstractCheckinData data) {
+    public void setCheckinData(CheckinData data) {
         checkinData = data;
         activity.onCheckinDataAvailable(getCheckinData());
     }
 
-    public AbstractCheckinData getCheckinData() {
+    public BaseCheckinData getCheckinData() {
         return checkinData;
     }
 
@@ -295,30 +300,4 @@ public class CheckinManager {
         setCheckinData(null);
     }
 
-    private class URLData {
-        public String uriStr;
-        public String server;
-        public int port;
-        public String hostWithPort;
-        public String competitorId;
-        public String checkinURLStr;
-        public String eventId;
-        public String leaderboardName;
-        public DeviceIdentifier deviceUuid;
-        public String eventUrl;
-        public String leaderboardUrl;
-        public String competitorUrl;
-        public String competitorName;
-        public String eventName;
-        public String competitorSailId;
-        public String eventStartDateStr;
-        public String eventEndDateStr;
-        public String eventFirstImageUrl;
-        public String competitorNationality;
-        public String competitorCountryCode;
-
-        public URLData() {
-
-        }
-    }
 }
diff --git a/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/valueobjects/CheckinData.java b/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/valueobjects/CheckinData.java
index cc03862f3b5..c1806c656c9 100644
--- a/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/valueobjects/CheckinData.java
+++ b/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/valueobjects/CheckinData.java
@@ -1,33 +1,41 @@
 package com.sap.sailing.android.tracking.app.valueobjects;
 
-import com.sap.sailing.android.shared.data.AbstractCheckinData;
-import com.sap.sailing.android.shared.data.CheckinUrlInfo;
-import com.sap.sailing.android.shared.data.LeaderboardInfo;
-
 import java.io.UnsupportedEncodingException;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 
-public class CheckinData extends AbstractCheckinData {
+import com.sap.sailing.android.shared.data.BaseCheckinData;
+import com.sap.sailing.android.shared.data.CheckinUrlInfo;
+import com.sap.sailing.android.shared.data.LeaderboardInfo;
+
+public class CheckinData extends BaseCheckinData {
     // public String gcmId;
-    public String leaderboardName;
-    public String eventId;
-    public String eventName;
-    public String eventStartDateStr;
-    public String eventEndDateStr;
-    public String eventFirstImageUrl;
-    public String eventServerUrl;
+    private String leaderboardName;
+    private String eventId;
+    private String eventName;
+    private String eventStartDateStr;
+    private String eventEndDateStr;
+    private String eventFirstImageUrl;
+    private String eventServerUrl;
     public String checkinURL;
-    public String competitorName;
-    public String competitorId;
-    public String competitorSailId;
-    public String competitorNationality;
-    public String competitorCountryCode;
     public String deviceUid;
-    public String uriString;
+    private String uriString;
     public String checkinDigest;
     private boolean update;
 
+    public CheckinData(UrlData data) {
+        leaderboardName = data.leaderboardName;
+        deviceUid = data.deviceUuid.getStringRepresentation();
+        eventId = data.eventId;
+        eventName = data.eventName;
+        eventStartDateStr = data.eventStartDateStr;
+        eventEndDateStr = data.eventEndDateStr;
+        eventFirstImageUrl = data.eventFirstImageUrl;
+        eventServerUrl = data.hostWithPort;
+        checkinURL = data.checkinURLStr;
+        uriString = data.uriStr;
+    }
+
     public void setCheckinDigestFromString(String checkinString) throws UnsupportedEncodingException,
             NoSuchAlgorithmException {
         MessageDigest md = MessageDigest.getInstance("SHA-256");
@@ -59,17 +67,6 @@ public class CheckinData extends AbstractCheckinData {
         return leaderboard;
     }
 
-    public CompetitorInfo getCompetitor() {
-        CompetitorInfo competitor = new CompetitorInfo();
-        competitor.name = competitorName;
-        competitor.id = competitorId;
-        competitor.sailId = competitorSailId;
-        competitor.nationality = competitorNationality;
-        competitor.countryCode = competitorCountryCode;
-        competitor.checkinDigest = checkinDigest;
-        return competitor;
-    }
-
     public CheckinUrlInfo getCheckinUrl() {
         CheckinUrlInfo checkinUrlInfo = new CheckinUrlInfo();
         checkinUrlInfo.urlString = uriString;
diff --git a/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/valueobjects/CompetitorCheckinData.java b/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/valueobjects/CompetitorCheckinData.java
new file mode 100644
index 00000000000..52986c618b6
--- /dev/null
+++ b/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/valueobjects/CompetitorCheckinData.java
@@ -0,0 +1,33 @@
+package com.sap.sailing.android.tracking.app.valueobjects;
+
+public class CompetitorCheckinData extends CheckinData {
+
+
+    public String competitorName;
+    public String competitorId;
+    public String competitorUrl;
+    public String competitorSailId;
+    public String competitorNationality;
+    public String competitorCountryCode;
+
+    public CompetitorCheckinData(CompetitorUrlData urlData) {
+        super(urlData);
+        competitorName = urlData.competitorName;
+        competitorId = urlData.competitorId;
+        competitorUrl = urlData.competitorUrl;
+        competitorSailId = urlData.competitorSailId;
+        competitorNationality = urlData.competitorNationality;
+        competitorCountryCode = urlData.competitorCountryCode;
+    }
+
+    public CompetitorInfo getCompetitor() {
+        CompetitorInfo competitor = new CompetitorInfo();
+        competitor.name = competitorName;
+        competitor.id = competitorId;
+        competitor.sailId = competitorSailId;
+        competitor.nationality = competitorNationality;
+        competitor.countryCode = competitorCountryCode;
+        competitor.checkinDigest = checkinDigest;
+        return competitor;
+    }
+}
diff --git a/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/valueobjects/CompetitorUrlData.java b/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/valueobjects/CompetitorUrlData.java
new file mode 100644
index 00000000000..c79517e10f8
--- /dev/null
+++ b/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/valueobjects/CompetitorUrlData.java
@@ -0,0 +1,15 @@
+package com.sap.sailing.android.tracking.app.valueobjects;
+
+public class CompetitorUrlData extends UrlData {
+
+    public String competitorId;
+    public String competitorUrl;
+    public String competitorName;
+    public String competitorSailId;
+    public String competitorNationality;
+    public String competitorCountryCode;
+
+    public CompetitorUrlData(String server, int port) {
+        super(server, port);
+    }
+}
diff --git a/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/valueobjects/MarkCheckinData.java b/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/valueobjects/MarkCheckinData.java
new file mode 100644
index 00000000000..0ae952cfb79
--- /dev/null
+++ b/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/valueobjects/MarkCheckinData.java
@@ -0,0 +1,8 @@
+package com.sap.sailing.android.tracking.app.valueobjects;
+
+public class MarkCheckinData extends CheckinData {
+
+    public MarkCheckinData(MarkUrlData markUrlData) {
+        super(markUrlData);
+    }
+}
diff --git a/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/valueobjects/MarkUrlData.java b/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/valueobjects/MarkUrlData.java
new file mode 100644
index 00000000000..8aa4a42c1f3
--- /dev/null
+++ b/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/valueobjects/MarkUrlData.java
@@ -0,0 +1,8 @@
+package com.sap.sailing.android.tracking.app.valueobjects;
+
+public class MarkUrlData extends UrlData {
+
+    public MarkUrlData(String server, int port) {
+        super(server, port);
+    }
+}
diff --git a/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/valueobjects/UrlData.java b/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/valueobjects/UrlData.java
new file mode 100644
index 00000000000..eb004517aee
--- /dev/null
+++ b/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/valueobjects/UrlData.java
@@ -0,0 +1,28 @@
+package com.sap.sailing.android.tracking.app.valueobjects;
+
+import com.sap.sailing.domain.racelogtracking.DeviceIdentifier;
+
+public abstract class UrlData {
+    public String uriStr;
+    public String server;
+    public int port;
+    public String hostWithPort;
+    public String checkinURLStr;
+    public String eventId;
+    public String leaderboardName;
+    public DeviceIdentifier deviceUuid;
+    public String eventUrl;
+    public String leaderboardUrl;
+    public String eventName;
+    public String eventStartDateStr;
+    public String eventEndDateStr;
+    public String eventFirstImageUrl;
+    public String checkinURL;
+    public String uriString;
+
+    public UrlData(String server, int port) {
+        this.server = server;
+        this.port = port;
+        hostWithPort = server + (port == -1 ? "" : (":" + port));
+    }
+}
diff --git a/mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/service/MarkerService.java b/mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/service/MarkerService.java
index a0bf73b9723..bb63e259c11 100644
--- a/mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/service/MarkerService.java
+++ b/mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/service/MarkerService.java
@@ -8,7 +8,7 @@ import com.sap.sailing.android.buoy.positioning.app.R;
 import com.sap.sailing.android.buoy.positioning.app.util.CheckinManager;
 import com.sap.sailing.android.buoy.positioning.app.util.DatabaseHelper;
 import com.sap.sailing.android.buoy.positioning.app.valueobjects.CheckinData;
-import com.sap.sailing.android.shared.data.AbstractCheckinData;
+import com.sap.sailing.android.shared.data.BaseCheckinData;
 
 public class MarkerService extends IntentService implements  CheckinManager.DataChangedListner{
     private static String TAG = MarkerService.class.getName();
@@ -26,7 +26,7 @@ public class MarkerService extends IntentService implements  CheckinManager.Data
     }
 
     @Override
-    public void handleData(AbstractCheckinData data) {
+    public void handleData(BaseCheckinData data) {
         if (data != null) {
             try {
                 CheckinData checkinData = (CheckinData) data;
diff --git a/mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/ui/activities/RegattaActivity.java b/mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/ui/activities/RegattaActivity.java
index ae89446969d..3f6434adb0f 100644
--- a/mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/ui/activities/RegattaActivity.java
+++ b/mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/ui/activities/RegattaActivity.java
@@ -22,7 +22,7 @@ import com.sap.sailing.android.buoy.positioning.app.util.CheckinManager;
 import com.sap.sailing.android.buoy.positioning.app.util.DatabaseHelper;
 import com.sap.sailing.android.buoy.positioning.app.util.MarkerUtils;
 import com.sap.sailing.android.buoy.positioning.app.valueobjects.CheckinData;
-import com.sap.sailing.android.shared.data.AbstractCheckinData;
+import com.sap.sailing.android.shared.data.BaseCheckinData;
 import com.sap.sailing.android.shared.logging.ExLog;
 import com.sap.sailing.android.shared.services.sending.MessageSendingService;
 import com.sap.sailing.android.shared.ui.activities.AbstractRegattaActivity;
@@ -146,7 +146,7 @@ public class RegattaActivity extends AbstractRegattaActivity {
     }
 
     @Override
-    public void onCheckinDataAvailable(AbstractCheckinData checkinData) {
+    public void onCheckinDataAvailable(BaseCheckinData checkinData) {
         if (checkinData != null) {
             CheckinData data = (CheckinData) checkinData;
             try {
diff --git a/mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/ui/activities/StartActivity.java b/mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/ui/activities/StartActivity.java
index c52c1512f15..31ff5921601 100644
--- a/mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/ui/activities/StartActivity.java
+++ b/mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/ui/activities/StartActivity.java
@@ -10,7 +10,7 @@ import android.view.MenuItem;
 import com.sap.sailing.android.buoy.positioning.app.R;
 import com.sap.sailing.android.buoy.positioning.app.ui.fragments.HomeFragment;
 import com.sap.sailing.android.buoy.positioning.app.util.AboutHelper;
-import com.sap.sailing.android.shared.data.AbstractCheckinData;
+import com.sap.sailing.android.shared.data.BaseCheckinData;
 import com.sap.sailing.android.shared.ui.activities.AbstractStartActivity;
 import com.sap.sailing.android.shared.util.EulaHelper;
 import com.sap.sailing.android.ui.fragments.AbstractHomeFragment;
@@ -68,7 +68,7 @@ public class StartActivity extends AbstractStartActivity {
     }
 
     @Override
-    public void onCheckinDataAvailable(AbstractCheckinData data) {
+    public void onCheckinDataAvailable(BaseCheckinData data) {
         if (data != null) {
             getHomeFragment().displayUserConfirmationScreen(data);
         }
diff --git a/mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/ui/fragments/HomeFragment.java b/mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/ui/fragments/HomeFragment.java
index 6051a9f3a06..9b7a60b6f0a 100644
--- a/mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/ui/fragments/HomeFragment.java
+++ b/mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/ui/fragments/HomeFragment.java
@@ -25,7 +25,7 @@ import com.sap.sailing.android.buoy.positioning.app.util.AppPreferences;
 import com.sap.sailing.android.buoy.positioning.app.util.CheckinManager;
 import com.sap.sailing.android.buoy.positioning.app.util.DatabaseHelper;
 import com.sap.sailing.android.buoy.positioning.app.valueobjects.CheckinData;
-import com.sap.sailing.android.shared.data.AbstractCheckinData;
+import com.sap.sailing.android.shared.data.BaseCheckinData;
 import com.sap.sailing.android.shared.logging.ExLog;
 import com.sap.sailing.android.shared.ui.activities.CheckinDataActivity;
 import com.sap.sailing.android.ui.fragments.AbstractHomeFragment;
@@ -66,7 +66,7 @@ public class HomeFragment extends AbstractHomeFragment implements LoaderCallback
     }
 
     @Override
-    public void displayUserConfirmationScreen(AbstractCheckinData data) {
+    public void displayUserConfirmationScreen(BaseCheckinData data) {
         CheckinData chData = (CheckinData) data;
         checkinWithApiAndStartRegattaActivity(chData);
 
diff --git a/mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/util/CheckinManager.java b/mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/util/CheckinManager.java
index 5f3657101d8..9af0673f32a 100644
--- a/mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/util/CheckinManager.java
+++ b/mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/util/CheckinManager.java
@@ -19,7 +19,7 @@ import com.sap.sailing.android.buoy.positioning.app.R;
 import com.sap.sailing.android.buoy.positioning.app.valueobjects.CheckinData;
 import com.sap.sailing.android.buoy.positioning.app.valueobjects.MarkInfo;
 import com.sap.sailing.android.buoy.positioning.app.valueobjects.MarkPingInfo;
-import com.sap.sailing.android.shared.data.AbstractCheckinData;
+import com.sap.sailing.android.shared.data.BaseCheckinData;
 import com.sap.sailing.android.shared.data.http.HttpGetRequest;
 import com.sap.sailing.android.shared.logging.ExLog;
 import com.sap.sailing.android.shared.ui.activities.CheckinDataActivity;
@@ -49,7 +49,7 @@ import android.widget.Toast;
 
 public class CheckinManager {
     private final static String TAG = CheckinManager.class.getName();
-    private AbstractCheckinData checkinData;
+    private BaseCheckinData checkinData;
     private final CheckinDataActivity activity;
     private final Context mContext;
     private final AppPreferences prefs;
@@ -254,7 +254,7 @@ public class CheckinManager {
         }
     }
 
-    public void setCheckinData(AbstractCheckinData data) {
+    public void setCheckinData(BaseCheckinData data) {
         checkinData = data;
         if (activity != null) {
             activity.onCheckinDataAvailable(getCheckinData());
@@ -264,14 +264,14 @@ public class CheckinManager {
     }
 
     public interface DataChangedListner{
-        void handleData(AbstractCheckinData data);
+        void handleData(BaseCheckinData data);
     }
 
     public void setDataChangedListner(DataChangedListner listner){
         dataChangedListner = listner;
     }
 
-    public AbstractCheckinData getCheckinData() {
+    public BaseCheckinData getCheckinData() {
         return checkinData;
     }
 
diff --git a/mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/valueobjects/CheckinData.java b/mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/valueobjects/CheckinData.java
index 8a6e1060c22..3d529937133 100644
--- a/mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/valueobjects/CheckinData.java
+++ b/mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/valueobjects/CheckinData.java
@@ -1,6 +1,6 @@
 package com.sap.sailing.android.buoy.positioning.app.valueobjects;
 
-import com.sap.sailing.android.shared.data.AbstractCheckinData;
+import com.sap.sailing.android.shared.data.BaseCheckinData;
 import com.sap.sailing.android.shared.data.CheckinUrlInfo;
 import com.sap.sailing.android.shared.data.LeaderboardInfo;
 
@@ -9,7 +9,7 @@ import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 import java.util.List;
 
-public class CheckinData extends AbstractCheckinData {
+public class CheckinData extends BaseCheckinData {
     public String leaderboardName;
     public String deviceUid;
     public String uriString;

From 3e15a023b6c5cec51b0b16320bd61c7ab6800e11 Mon Sep 17 00:00:00 2001
From: Bennet Brunsen <brunsen@ubilabs.net>
Date: Tue, 5 Jul 2016 11:08:15 +0200
Subject: [PATCH 72/92] Extract shared endpoints

---
 .../res/values/api_endpoints.xml                             | 5 +++++
 .../res/values/api_endpoints.xml                             | 1 -
 .../res/values/api_endpoints.xml                             | 2 --
 3 files changed, 5 insertions(+), 3 deletions(-)
 create mode 100644 mobile/com.sap.sailing.android.shared/res/values/api_endpoints.xml

diff --git a/mobile/com.sap.sailing.android.shared/res/values/api_endpoints.xml b/mobile/com.sap.sailing.android.shared/res/values/api_endpoints.xml
new file mode 100644
index 00000000000..3205445caf2
--- /dev/null
+++ b/mobile/com.sap.sailing.android.shared/res/values/api_endpoints.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="preference_server_marks_path" translatable="false">/sailingserver/api/v1/leaderboards/{leaderboard_name}/marks?</string>
+    <string name="preference_server_leaderboard_path" translatable="false">/sailingserver/api/v1/leaderboards/{leaderboard_name}</string>
+</resources>
\ No newline at end of file
diff --git a/mobile/com.sap.sailing.android.tracking.app/res/values/api_endpoints.xml b/mobile/com.sap.sailing.android.tracking.app/res/values/api_endpoints.xml
index 611ab135e08..802fb486143 100644
--- a/mobile/com.sap.sailing.android.tracking.app/res/values/api_endpoints.xml
+++ b/mobile/com.sap.sailing.android.tracking.app/res/values/api_endpoints.xml
@@ -5,7 +5,6 @@
     <string name="preference_server_checkout_path" translatable="false">/sailingserver/api/v1/leaderboards/{leaderboard-name}/device_mappings/end</string>
     <string name="preference_server_event_path" translatable="false">/sailingserver/api/v1/events/{event_id}</string>
     <string name="preference_server_event_url" translatable="false">/gwt/Home.html?navigationTab=Regattas#EventPlace:eventId=%s</string>
-    <string name="preference_server_leaderboard_path" translatable="false">/sailingserver/api/v1/leaderboards/{leaderboard_name}</string>
     <string name="preference_server_competitor_path" translatable="false">/sailingserver/api/v1/competitors/{competitor_id}</string>
     <string name="preference_server_team_info_path" translatable="false">/sailingserver/api/v1/competitors/{competitor_id}/team</string>
     <string name="preference_server_team_image_upload_path" translatable="false">/sailingserver/api/v1/competitors/{competitor_id}/team/image</string>
diff --git a/mobile/com.sap.sailing.buoy.positioning/res/values/api_endpoints.xml b/mobile/com.sap.sailing.buoy.positioning/res/values/api_endpoints.xml
index 98153a144c8..5c7b8a4bd23 100644
--- a/mobile/com.sap.sailing.buoy.positioning/res/values/api_endpoints.xml
+++ b/mobile/com.sap.sailing.buoy.positioning/res/values/api_endpoints.xml
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="preference_server_gps_fixes_post_path" translatable="false">/sailingserver/api/v1/leaderboards/{leaderboard_name}/marks/{mark-id}/gps_fixes</string>
-    <string name="preference_server_marks_path" translatable="false">/sailingserver/api/v1/leaderboards/{leaderboard_name}/marks?</string>
-    <string name="preference_server_leaderboard_path" translatable="false">/sailingserver/api/v1/leaderboards/{leaderboard_name}</string>
 </resources>

From 5674a1538fe1b28a59fafa99d8ac85e6cc13b487 Mon Sep 17 00:00:00 2001
From: Bennet Brunsen <brunsen@ubilabs.net>
Date: Tue, 5 Jul 2016 15:02:39 +0200
Subject: [PATCH 73/92] Get mark from server

---
 .../res/values/api_endpoints.xml              |   1 +
 .../app/ui/fragments/HomeFragment.java        | 134 +++++++++---------
 .../tracking/app/utils/AppPreferences.java    |  16 ++-
 .../tracking/app/utils/CheckinHelper.java     |  18 ++-
 .../tracking/app/utils/CheckinManager.java    |  60 +++++++-
 .../app/valueobjects/MarkCheckinData.java     |   9 ++
 .../app/valueobjects/MarkUrlData.java         |  32 +++++
 7 files changed, 190 insertions(+), 80 deletions(-)

diff --git a/mobile/com.sap.sailing.android.tracking.app/res/values/api_endpoints.xml b/mobile/com.sap.sailing.android.tracking.app/res/values/api_endpoints.xml
index 802fb486143..f00f1a97148 100644
--- a/mobile/com.sap.sailing.android.tracking.app/res/values/api_endpoints.xml
+++ b/mobile/com.sap.sailing.android.tracking.app/res/values/api_endpoints.xml
@@ -8,4 +8,5 @@
     <string name="preference_server_competitor_path" translatable="false">/sailingserver/api/v1/competitors/{competitor_id}</string>
     <string name="preference_server_team_info_path" translatable="false">/sailingserver/api/v1/competitors/{competitor_id}/team</string>
     <string name="preference_server_team_image_upload_path" translatable="false">/sailingserver/api/v1/competitors/{competitor_id}/team/image</string>
+    <string name="preferece_server_mark_path" translatable="false">/sailingserver/api/v1/leaderboards/{leaderboardName}/marks/{markId}</string>
 </resources>
diff --git a/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/fragments/HomeFragment.java b/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/fragments/HomeFragment.java
index 852ff6f4cc2..8bd979ba5e0 100644
--- a/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/fragments/HomeFragment.java
+++ b/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/fragments/HomeFragment.java
@@ -4,7 +4,6 @@ import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.Date;
 
-import android.widget.AdapterView;
 import org.json.JSONException;
 import org.json.JSONObject;
 
@@ -21,8 +20,9 @@ import android.support.v4.content.Loader;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.AdapterView.OnItemLongClickListener;
+import android.widget.AdapterView;
 import android.widget.AdapterView.OnItemClickListener;
+import android.widget.AdapterView.OnItemLongClickListener;
 import android.widget.ListView;
 import android.widget.Toast;
 
@@ -46,6 +46,7 @@ import com.sap.sailing.android.tracking.app.utils.DatabaseHelper;
 import com.sap.sailing.android.tracking.app.utils.DatabaseHelper.GeneralDatabaseHelperException;
 import com.sap.sailing.android.tracking.app.valueobjects.CheckinData;
 import com.sap.sailing.android.tracking.app.valueobjects.CompetitorCheckinData;
+import com.sap.sailing.android.tracking.app.valueobjects.MarkCheckinData;
 import com.sap.sailing.android.ui.fragments.AbstractHomeFragment;
 
 public class HomeFragment extends AbstractHomeFragment implements LoaderCallbacks<Cursor> {
@@ -87,18 +88,18 @@ public class HomeFragment extends AbstractHomeFragment implements LoaderCallback
 
     /**
      * Perform a checkin request and launch RegattaAcitivity afterwards
-     * <p/>
-     * TODO: Google Cloud Messaging token?
-     *
-     * @param deviceMappingData
      */
-    private void checkInWithAPIAndDisplayTrackingActivity(CompetitorCheckinData checkinData) {
-        if (DatabaseHelper.getInstance().eventLeaderboardCompetitorCombinationAvailable(getActivity(),
-                checkinData.checkinDigest)) {
+    private void checkInWithAPIAndDisplayTrackingActivity(CheckinData checkinData) {
+        if (DatabaseHelper.getInstance().eventLeaderboardCompetitorCombinationAvailable(getActivity(), checkinData.checkinDigest)) {
             try {
-                DatabaseHelper.getInstance().storeCheckinRow(getActivity(), checkinData.getEvent(),
-                        checkinData.getCompetitor(), checkinData.getLeaderboard(), checkinData.getCheckinUrl());
-
+                if (checkinData instanceof CompetitorCheckinData) {
+                    CompetitorCheckinData competitorCheckinData = (CompetitorCheckinData) checkinData;
+                    DatabaseHelper.getInstance()
+                        .storeCheckinRow(getActivity(), competitorCheckinData.getEvent(), competitorCheckinData.getCompetitor(),
+                            competitorCheckinData.getLeaderboard(), competitorCheckinData.getCheckinUrl());
+                } else if (checkinData instanceof MarkCheckinData) {
+                    // TODO: handle database for mark
+                }
                 adapter.notifyDataSetChanged();
             } catch (GeneralDatabaseHelperException e) {
                 ExLog.e(getActivity(), TAG, "Batch insert failed: " + e.getMessage());
@@ -111,8 +112,7 @@ public class HomeFragment extends AbstractHomeFragment implements LoaderCallback
             }
         } else {
             ExLog.w(getActivity(), TAG, "Combination of eventId, leaderboardName and competitorId already exists!");
-            Toast.makeText(getActivity(), getString(R.string.info_already_checked_in_this_qr_code), Toast.LENGTH_LONG)
-                    .show();
+            Toast.makeText(getActivity(), getString(R.string.info_already_checked_in_this_qr_code), Toast.LENGTH_LONG).show();
         }
         performAPICheckin(checkinData);
     }
@@ -123,26 +123,30 @@ public class HomeFragment extends AbstractHomeFragment implements LoaderCallback
      * @param checkinData
      */
     private void performAPICheckin(CheckinData checkinData) {
-        if (checkinData instanceof CompetitorCheckinData) {
-            CompetitorCheckinData competitorCheckinData = (CompetitorCheckinData) checkinData;
-            Date date = new Date();
-            StartActivity startActivity = (StartActivity) getActivity();
-            startActivity.showProgressDialog(R.string.please_wait, R.string.checking_in);
-            try {
-                JSONObject requestObject = CheckinHelper.getCheckinJson(competitorCheckinData.competitorId, competitorCheckinData.deviceUid,
-                    "TODO push device ID!!", date.getTime());
-                HttpJsonPostRequest request = new HttpJsonPostRequest(getActivity(), new URL(competitorCheckinData.checkinURL),
-                    requestObject.toString());
-                NetworkHelper.getInstance(getActivity())
-                    .executeHttpJsonRequestAsync(request, new CheckinListener(competitorCheckinData.checkinDigest),
-                        new CheckinErrorListener(competitorCheckinData.checkinDigest));
-            } catch (JSONException e) {
-                ExLog.e(getActivity(), TAG, "Failed to generate checkin JSON: " + e.getMessage());
-                displayAPIErrorRecommendRetry();
-            } catch (MalformedURLException e) {
-                ExLog.e(getActivity(), TAG, "Failed to perform checkin, MalformedURLException: " + e.getMessage());
-                displayAPIErrorRecommendRetry();
+        Date date = new Date();
+        StartActivity startActivity = (StartActivity) getActivity();
+        startActivity.showProgressDialog(R.string.please_wait, R.string.checking_in);
+        try {
+            JSONObject requestObject = null;
+            if (checkinData instanceof CompetitorCheckinData) {
+                CompetitorCheckinData competitorCheckinData = (CompetitorCheckinData) checkinData;
+                requestObject = CheckinHelper
+                    .getCompetitorCheckinJson(competitorCheckinData.competitorId, competitorCheckinData.deviceUid, "TODO push device ID!!", date
+                        .getTime());
+            } else if (checkinData instanceof MarkCheckinData) {
+                MarkCheckinData markCheckinData = (MarkCheckinData) checkinData;
+                requestObject = CheckinHelper
+                    .getMarkCheckinJson(markCheckinData.getMark().getId().toString(), markCheckinData.deviceUid, "TODO push device ID!!", date.getTime());
             }
+            HttpJsonPostRequest request = new HttpJsonPostRequest(getActivity(), new URL(checkinData.checkinURL), requestObject.toString());
+            NetworkHelper.getInstance(getActivity())
+                .executeHttpJsonRequestAsync(request, new CheckinListener(checkinData.checkinDigest), new CheckinErrorListener(checkinData.checkinDigest));
+        } catch (JSONException e) {
+            ExLog.e(getActivity(), TAG, "Failed to generate checkin JSON: " + e.getMessage());
+            displayAPIErrorRecommendRetry();
+        } catch (MalformedURLException e) {
+            ExLog.e(getActivity(), TAG, "Failed to perform checkin, MalformedURLException: " + e.getMessage());
+            displayAPIErrorRecommendRetry();
         }
     }
 
@@ -155,17 +159,13 @@ public class HomeFragment extends AbstractHomeFragment implements LoaderCallback
 
     /**
      * Display a confirmation-dialog in which the user confirms his full name and sail-id.
-     *
-     * @param checkinData
      */
     @Override
     public void displayUserConfirmationScreen(final BaseCheckinData data) {
         if (data instanceof CompetitorCheckinData) {
-            CompetitorCheckinData checkinData = (CompetitorCheckinData) data;
-            String message1 = getString(R.string.confirm_data_hello_name)
-                .replace("{full_name}", checkinData.competitorName);
-            String message2 = getString(R.string.confirm_data_you_are_signed_in_as_sail_id).replace("{sail_id}",
-                checkinData.competitorSailId);
+            final CompetitorCheckinData checkinData = (CompetitorCheckinData) data;
+            String message1 = getString(R.string.confirm_data_hello_name).replace("{full_name}", checkinData.competitorName);
+            String message2 = getString(R.string.confirm_data_you_are_signed_in_as_sail_id).replace("{sail_id}", checkinData.competitorSailId);
 
             AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
             builder.setMessage(message1 + "\n\n" + message2);
@@ -174,7 +174,7 @@ public class HomeFragment extends AbstractHomeFragment implements LoaderCallback
                 @Override
                 public void onClick(DialogInterface dialog, int which) {
                     clearScannedQRCodeInPrefs();
-                    checkInWithAPIAndDisplayTrackingActivity((CompetitorCheckinData) data);
+                    checkInWithAPIAndDisplayTrackingActivity(checkinData);
                 }
             }).setNegativeButton(R.string.decline_data_is_incorrect, new DialogInterface.OnClickListener() {
                 @Override
@@ -185,6 +185,10 @@ public class HomeFragment extends AbstractHomeFragment implements LoaderCallback
             });
             AlertDialog alert = builder.create();
             alert.show();
+        } else if (data instanceof MarkCheckinData) {
+            MarkCheckinData checkinData = (MarkCheckinData) data;
+            clearScannedQRCodeInPrefs();
+            checkInWithAPIAndDisplayTrackingActivity(checkinData);
         }
     }
 
@@ -202,48 +206,47 @@ public class HomeFragment extends AbstractHomeFragment implements LoaderCallback
     @Override
     public Loader<Cursor> onCreateLoader(int loaderId, Bundle bundle) {
         switch (loaderId) {
-        case REGATTA_LOADER:
-            String[] projection = new String[] { AnalyticsContract.PATH_EVENT + "." + AnalyticsContract.Event.EVENT_CHECKIN_DIGEST,
-                AnalyticsContract.PATH_EVENT + "." + AnalyticsContract.Event._ID,
-                AnalyticsContract.PATH_EVENT + "." + AnalyticsContract.Event.EVENT_NAME,
-                AnalyticsContract.PATH_EVENT + "." + AnalyticsContract.Event.EVENT_SERVER,
-                AnalyticsContract.PATH_LEADERBOARD + "." + AnalyticsContract.Leaderboard.LEADERBOARD_NAME};
-            return new CursorLoader(getActivity(), AnalyticsContract.EventLeaderboardCompetitorJoined.CONTENT_URI,
-                    projection, null, null, null);
+            case REGATTA_LOADER:
+                String[] projection = new String[] { AnalyticsContract.PATH_EVENT + "." + AnalyticsContract.Event.EVENT_CHECKIN_DIGEST,
+                    AnalyticsContract.PATH_EVENT + "." + AnalyticsContract.Event._ID,
+                    AnalyticsContract.PATH_EVENT + "." + AnalyticsContract.Event.EVENT_NAME,
+                    AnalyticsContract.PATH_EVENT + "." + AnalyticsContract.Event.EVENT_SERVER,
+                    AnalyticsContract.PATH_LEADERBOARD + "." + AnalyticsContract.Leaderboard.LEADERBOARD_NAME };
+                return new CursorLoader(getActivity(), AnalyticsContract.EventLeaderboardCompetitorJoined.CONTENT_URI, projection, null, null, null);
 
-        default:
-            return null;
+            default:
+                return null;
         }
     }
 
     @Override
     public void onLoadFinished(Loader<Cursor> loader, Cursor cursor) {
         switch (loader.getId()) {
-        case REGATTA_LOADER:
-            adapter.changeCursor(cursor);
-            break;
+            case REGATTA_LOADER:
+                adapter.changeCursor(cursor);
+                break;
 
-        default:
-            break;
+            default:
+                break;
         }
     }
 
     @Override
     public void onLoaderReset(Loader<Cursor> loader) {
         switch (loader.getId()) {
-        case REGATTA_LOADER:
-            adapter.changeCursor(null);
-            break;
+            case REGATTA_LOADER:
+                adapter.changeCursor(null);
+                break;
 
-        default:
-            break;
+            default:
+                break;
         }
     }
 
     private boolean showDeleteConfirmationDialog(int position) {
         // -1, because there's a header row
         Cursor cursor = (Cursor) adapter.getItem(position - 1);
-        final String checkinDigest = cursor.getString(cursor.getColumnIndex("event_checkin_digest"));
+        final String checkinDigest = cursor.getString(cursor.getColumnIndex(AnalyticsContract.Event.EVENT_CHECKIN_DIGEST));
         DatabaseHelper.getInstance().getEventInfo(getActivity(), checkinDigest);
         AlertDialog.Builder builder = new AlertDialog.Builder(getActivity(), R.style.Base_Theme_AppCompat_Dialog_Alert);
         builder.setMessage(getString(R.string.confirm_delete_checkin));
@@ -309,6 +312,7 @@ public class HomeFragment extends AbstractHomeFragment implements LoaderCallback
         public void performAction(JSONObject response) {
             StartActivity startActivity = (StartActivity) getActivity();
             startActivity.dismissProgressDialog();
+            // TODO: Start MarkActivity
             startRegatta(checkinDigest);
         }
     }
@@ -331,12 +335,10 @@ public class HomeFragment extends AbstractHomeFragment implements LoaderCallback
 
             StartActivity startActivity = (StartActivity) getActivity();
             startActivity.dismissProgressDialog();
-            startActivity.showErrorPopup(R.string.error,
-                    R.string.error_could_not_complete_operation_on_server_try_again);
+            startActivity.showErrorPopup(R.string.error, R.string.error_could_not_complete_operation_on_server_try_again);
 
             DatabaseHelper.getInstance().deleteRegattaFromDatabase(getActivity(), checkinDigest);
-            Toast.makeText(getActivity(), getString(R.string.error_while_receiving_server_data), Toast.LENGTH_LONG)
-                    .show();
+            Toast.makeText(getActivity(), getString(R.string.error_while_receiving_server_data), Toast.LENGTH_LONG).show();
         }
     }
 
diff --git a/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/utils/AppPreferences.java b/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/utils/AppPreferences.java
index 389a5eebb55..9b763e84591 100644
--- a/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/utils/AppPreferences.java
+++ b/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/utils/AppPreferences.java
@@ -1,15 +1,14 @@
 package com.sap.sailing.android.tracking.app.utils;
 
-import android.content.Context;
-import android.content.SharedPreferences;
-
-import com.sap.sailing.android.shared.util.PrefUtils;
-import com.sap.sailing.android.tracking.app.R;
-
 import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
 
+import android.content.Context;
+import android.content.SharedPreferences;
+
 import com.sap.sailing.android.shared.util.BaseAppPreferences;
+import com.sap.sailing.android.shared.util.PrefUtils;
+import com.sap.sailing.android.tracking.app.R;
 import com.sap.sailing.domain.abstractlog.AbstractLogEventAuthor;
 import com.sap.sailing.domain.abstractlog.impl.LogEventAuthorImpl;
 
@@ -68,6 +67,11 @@ public class AppPreferences extends BaseAppPreferences {
             competitorId);
     }
 
+    public String getServerMarkPath(String leaderboardName, String markId) {
+        String path = context.getString(R.string.preferece_server_mark_path);
+        return path.replace("{leaderboard_name}", leaderboardName).replace("{markId}", markId);
+    }
+
     public int getGPSFixInterval() {
         // EditTextPreference saves value as string, even if android:inputType="number" is set
         String value = PrefUtils.getString(context, R.string.preference_gps_fix_interval_ms_key,
diff --git a/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/utils/CheckinHelper.java b/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/utils/CheckinHelper.java
index c7097feafd2..43a0d7aa3f3 100644
--- a/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/utils/CheckinHelper.java
+++ b/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/utils/CheckinHelper.java
@@ -3,18 +3,32 @@ package com.sap.sailing.android.tracking.app.utils;
 import org.json.JSONException;
 import org.json.JSONObject;
 
+import android.support.annotation.NonNull;
+
 import com.sap.sailing.domain.common.racelog.tracking.DeviceMappingConstants;
 
 public class CheckinHelper {
-    public static JSONObject getCheckinJson(String competitorId, String deviceUuid, String pushDeviceId, long fromMillis)
+    public static JSONObject getCompetitorCheckinJson(String competitorId, String deviceUuid, String pushDeviceId, long fromMillis)
             throws JSONException {
         JSONObject jsonObject = new JSONObject();
         jsonObject.put(DeviceMappingConstants.JSON_COMPETITOR_ID_AS_STRING, competitorId);
-        // TODO alternatively map device to a mark, providing a mark_id; see also LeaderboardsResource.postCheckin
+        return getBaseCheckinJsom(deviceUuid, pushDeviceId, fromMillis, jsonObject);
+    }
+
+    @NonNull
+    private static JSONObject getBaseCheckinJsom(String deviceUuid, String pushDeviceId, long fromMillis, JSONObject jsonObject)
+        throws JSONException {
         jsonObject.put(DeviceMappingConstants.JSON_DEVICE_TYPE, "android");
         jsonObject.put(DeviceMappingConstants.JSON_DEVICE_UUID, deviceUuid);
         jsonObject.put(DeviceMappingConstants.JSON_PUSH_DEVICE_ID, pushDeviceId);
         jsonObject.put(DeviceMappingConstants.JSON_FROM_MILLIS, fromMillis);
         return jsonObject;
     }
+
+    public static JSONObject getMarkCheckinJson(String markId, String deviceUuid, String pushDeviceId, long fromMillis)
+            throws JSONException {
+        JSONObject jsonObject = new JSONObject();
+        jsonObject.put(DeviceMappingConstants.JSON_MARK_ID_AS_STRING, markId);
+        return getBaseCheckinJsom(deviceUuid, pushDeviceId, fromMillis, jsonObject);
+    }
 }
diff --git a/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/utils/CheckinManager.java b/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/utils/CheckinManager.java
index 0ca136deea4..a432d26e845 100644
--- a/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/utils/CheckinManager.java
+++ b/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/utils/CheckinManager.java
@@ -22,6 +22,7 @@ import com.sap.sailing.android.shared.data.BaseCheckinData;
 import com.sap.sailing.android.shared.data.http.HttpGetRequest;
 import com.sap.sailing.android.shared.logging.ExLog;
 import com.sap.sailing.android.shared.ui.activities.CheckinDataActivity;
+import com.sap.sailing.android.shared.util.JsonHelper;
 import com.sap.sailing.android.shared.util.NetworkHelper;
 import com.sap.sailing.android.shared.util.UniqueDeviceUuid;
 import com.sap.sailing.android.tracking.app.R;
@@ -35,11 +36,13 @@ import com.sap.sailing.domain.abstractlog.race.RaceLog;
 import com.sap.sailing.domain.abstractlog.race.SimpleRaceLogIdentifier;
 import com.sap.sailing.domain.abstractlog.race.analyzing.impl.RaceLogResolver;
 import com.sap.sailing.domain.base.EventBase;
+import com.sap.sailing.domain.base.Mark;
 import com.sap.sailing.domain.base.impl.SharedDomainFactoryImpl;
 import com.sap.sailing.domain.common.racelog.tracking.DeviceMappingConstants;
 import com.sap.sailing.domain.common.tracking.impl.CompetitorJsonConstants;
 import com.sap.sailing.domain.racelogtracking.impl.SmartphoneUUIDIdentifierImpl;
 import com.sap.sailing.server.gateway.deserialization.JsonDeserializationException;
+import com.sap.sailing.server.gateway.deserialization.coursedata.impl.MarkDeserializer;
 import com.sap.sailing.server.gateway.deserialization.impl.CourseAreaJsonDeserializer;
 import com.sap.sailing.server.gateway.deserialization.impl.EventBaseJsonDeserializer;
 import com.sap.sailing.server.gateway.deserialization.impl.LeaderboardGroupBaseJsonDeserializer;
@@ -99,10 +102,14 @@ public class CheckinManager {
                 competitorUrlData.competitorId = uri.getQueryParameter(DeviceMappingConstants.URL_COMPETITOR_ID_AS_STRING);
                 competitorUrlData.competitorUrl = competitorUrlData.hostWithPort + prefs.getServerCompetitorPath(competitorUrlData.competitorId);
                 urlData = competitorUrlData;
-            } else {
-                // TODO alternatively consider a mark_id
+            } else if (parameterNames.contains(DeviceMappingConstants.URL_MARK_ID_AS_STRING)) {
                 MarkUrlData markUrlData = new MarkUrlData(server, port);
+                markUrlData.setMarkId(uri.getQueryParameter(DeviceMappingConstants.URL_MARK_ID_AS_STRING));
+                markUrlData.setMarkUrl(markUrlData.hostWithPort + prefs.getServerMarkPath(leaderboardNameFromQR, markUrlData.getMarkId()));
                 urlData = markUrlData;
+            } else {
+                ExLog.e(activity, TAG, "Neither mark nor competitor checkin");
+                exception = new Exception();
             }
             urlData.uriStr = uri.toString();
             urlData.checkinURLStr = urlData.hostWithPort + prefs.getServerCheckinPath().replace("{leaderboard-name}", leaderboardNameFromQR);
@@ -193,16 +200,25 @@ public class CheckinManager {
                 }
                 if (urlData instanceof CompetitorUrlData) {
                     CompetitorUrlData competitorUrlData = (CompetitorUrlData) urlData;
-                    HttpGetRequest getCompetitorRequest;
                     try {
-                        getCompetitorRequest = new HttpGetRequest(new URL(competitorUrlData.competitorUrl), activity);
+                        HttpGetRequest getCompetitorRequest = new HttpGetRequest(new URL(competitorUrlData.competitorUrl), activity);
                         getCompetitorFromServer(getCompetitorRequest, competitorUrlData);
 
                     } catch (MalformedURLException e2) {
                         ExLog.e(activity, TAG, "Error: Failed to perform checking due to a MalformedURLException: " + e2.getMessage());
                         handleApiError();
                     }
+                } else if (urlData instanceof MarkUrlData) {
+                    MarkUrlData markUrlData = (MarkUrlData) urlData;
+                    try {
+                        HttpGetRequest getMarkRequest = new HttpGetRequest(new URL(markUrlData.getMarkUrl()), activity);
+                        getMarkFromServer(getMarkRequest, markUrlData);
+                    } catch (MalformedURLException exception) {
+                        ExLog.e(activity, TAG, "Error: Failed to perform checking due to a MalformedURLException: " + exception.getMessage());
+                        handleApiError();
+                    }
                 }
+
             }
         }, new NetworkHelper.NetworkHelperFailureListener() {
 
@@ -243,12 +259,44 @@ public class CheckinManager {
             });
     }
 
+    private void getMarkFromServer(HttpGetRequest getMarkRequest, final MarkUrlData urlData) {
+        NetworkHelper.getInstance(activity)
+            .executeHttpJsonRequestAsync(getMarkRequest, new NetworkHelper.NetworkHelperSuccessListener() {
+                @Override
+                public void performAction(JSONObject response) {
+                    try {
+                        org.json.simple.JSONObject simpleMark;
+                        simpleMark = JsonHelper.convertToSimple(response);
+                        MarkDeserializer markDeserializer = new MarkDeserializer(new SharedDomainFactoryImpl(null));
+                        Mark mark = markDeserializer.deserialize(simpleMark);
+                        urlData.setMark(mark);
+                    } catch (ParseException|JsonDeserializationException e) {
+                        ExLog.e(activity, TAG, "Failed to deserialize mark");
+                        if (activity != null) {
+                            activity.dismissProgressDialog();
+                            displayAPIErrorRecommendRetry();
+                        }
+                        return;
+                    }
+                    saveCheckinDataAndNotifyListeners(urlData);
+                }
+            }, new NetworkHelper.NetworkHelperFailureListener() {
+                @Override
+                public void performAction(NetworkHelper.NetworkHelperError e) {
+                    ExLog.e(activity, TAG, "Failed to get mark from server: " + e.getMessage());
+                    if (activity != null) {
+                        activity.dismissProgressDialog();
+                        displayAPIErrorRecommendRetry();
+                    }
+                }
+            });
+    }
+
     private void saveCheckinDataAndNotifyListeners(UrlData urlData) {
         CheckinData data;
         if (urlData instanceof CompetitorUrlData) {
             CompetitorUrlData competitorUrlData = (CompetitorUrlData) urlData;
-            CompetitorCheckinData competitorCheckinData = new CompetitorCheckinData(competitorUrlData);
-            data = competitorCheckinData;
+            data = new CompetitorCheckinData(competitorUrlData);
         } else {
             MarkUrlData markUrlData = (MarkUrlData) urlData;
             data = new MarkCheckinData(markUrlData);
diff --git a/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/valueobjects/MarkCheckinData.java b/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/valueobjects/MarkCheckinData.java
index 0ae952cfb79..32dd56fb579 100644
--- a/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/valueobjects/MarkCheckinData.java
+++ b/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/valueobjects/MarkCheckinData.java
@@ -1,8 +1,17 @@
 package com.sap.sailing.android.tracking.app.valueobjects;
 
+import com.sap.sailing.domain.base.Mark;
+
 public class MarkCheckinData extends CheckinData {
 
+    public Mark mark;
+
     public MarkCheckinData(MarkUrlData markUrlData) {
         super(markUrlData);
+        mark = markUrlData.getMark();
+    }
+
+    public Mark getMark() {
+        return mark;
     }
 }
diff --git a/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/valueobjects/MarkUrlData.java b/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/valueobjects/MarkUrlData.java
index 8aa4a42c1f3..33fcc4c86a3 100644
--- a/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/valueobjects/MarkUrlData.java
+++ b/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/valueobjects/MarkUrlData.java
@@ -1,8 +1,40 @@
 package com.sap.sailing.android.tracking.app.valueobjects;
 
+import com.sap.sailing.domain.base.Mark;
+
 public class MarkUrlData extends UrlData {
 
+    private String markId;
+    private String markUrl;
+    private Mark mark;
+
     public MarkUrlData(String server, int port) {
         super(server, port);
     }
+
+    public String getMarkId() {
+        return markId;
+    }
+
+    public void setMarkId(String markId) {
+        this.markId = markId;
+    }
+
+
+    public String getMarkUrl() {
+        return markUrl;
+    }
+
+    public void setMarkUrl(String markUrl) {
+        this.markUrl = markUrl;
+    }
+
+    public Mark getMark() {
+        return mark;
+    }
+
+    public void setMark(Mark mark) {
+        this.mark = mark;
+    }
+
 }

From a39152b1cdfb8f33ef8efea7000cb2f9e409ba4f Mon Sep 17 00:00:00 2001
From: Bennet Brunsen <brunsen@ubilabs.net>
Date: Tue, 5 Jul 2016 15:39:43 +0200
Subject: [PATCH 74/92] Extract checkout logic to checkout helper

---
 .../app/ui/activities/RegattaActivity.java    | 63 ++++++-------------
 .../tracking/app/utils/CheckoutHelper.java    | 51 +++++++++++++++
 2 files changed, 69 insertions(+), 45 deletions(-)
 create mode 100644 mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/utils/CheckoutHelper.java

diff --git a/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/activities/RegattaActivity.java b/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/activities/RegattaActivity.java
index e13855bc329..aa053924d4e 100755
--- a/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/activities/RegattaActivity.java
+++ b/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/activities/RegattaActivity.java
@@ -20,7 +20,6 @@ import android.content.Intent;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.graphics.drawable.ColorDrawable;
-import android.net.Uri;
 import android.os.AsyncTask;
 import android.os.Bundle;
 import android.os.Environment;
@@ -40,7 +39,6 @@ import com.sap.sailing.android.shared.data.BaseCheckinData;
 import com.sap.sailing.android.shared.data.CheckinUrlInfo;
 import com.sap.sailing.android.shared.data.LeaderboardInfo;
 import com.sap.sailing.android.shared.data.http.HttpGetRequest;
-import com.sap.sailing.android.shared.data.http.HttpJsonPostRequest;
 import com.sap.sailing.android.shared.logging.ExLog;
 import com.sap.sailing.android.shared.ui.activities.AbstractRegattaActivity;
 import com.sap.sailing.android.shared.util.BitmapHelper;
@@ -48,7 +46,6 @@ import com.sap.sailing.android.shared.util.NetworkHelper;
 import com.sap.sailing.android.shared.util.NetworkHelper.NetworkHelperError;
 import com.sap.sailing.android.shared.util.NetworkHelper.NetworkHelperFailureListener;
 import com.sap.sailing.android.shared.util.NetworkHelper.NetworkHelperSuccessListener;
-import com.sap.sailing.android.shared.util.UniqueDeviceUuid;
 import com.sap.sailing.android.tracking.app.BuildConfig;
 import com.sap.sailing.android.tracking.app.R;
 import com.sap.sailing.android.tracking.app.ui.fragments.RegattaFragment;
@@ -58,6 +55,7 @@ import com.sap.sailing.android.tracking.app.upload.UploadTeamImageTask;
 import com.sap.sailing.android.tracking.app.utils.AboutHelper;
 import com.sap.sailing.android.tracking.app.utils.AppPreferences;
 import com.sap.sailing.android.tracking.app.utils.CheckinManager;
+import com.sap.sailing.android.tracking.app.utils.CheckoutHelper;
 import com.sap.sailing.android.tracking.app.utils.DatabaseHelper;
 import com.sap.sailing.android.tracking.app.valueobjects.CheckinData;
 import com.sap.sailing.android.tracking.app.valueobjects.CompetitorCheckinData;
@@ -469,48 +467,23 @@ public class RegattaActivity extends AbstractRegattaActivity
      * Check out from regatta;
      */
     public void checkout() {
-        final String checkoutURLStr = event.server
-                + prefs.getServerCheckoutPath().replace("{leaderboard-name}", Uri.encode(leaderboard.name));
-
-        showProgressDialog(R.string.please_wait, R.string.checking_out);
-
-        JSONObject checkoutData = new JSONObject();
-        try {
-            checkoutData.put("competitorId", competitor.id);
-            checkoutData.put("deviceUuid", UniqueDeviceUuid.getUniqueId(this));
-            checkoutData.put("toMillis", System.currentTimeMillis());
-        } catch (JSONException e) {
-            showErrorPopup(R.string.error, R.string.error_could_not_complete_operation_on_server_try_again);
-            ExLog.e(this, TAG, "Error populating checkout-data: " + e.getMessage());
-            return;
-        }
-
-        try {
-            HttpJsonPostRequest request = new HttpJsonPostRequest(this, new URL(checkoutURLStr), checkoutData.toString());
-            NetworkHelper.getInstance(this).executeHttpJsonRequestAsync(request,
-                    new NetworkHelperSuccessListener() {
-
-                        @Override
-                        public void performAction(JSONObject response) {
-                            DatabaseHelper.getInstance().deleteRegattaFromDatabase(RegattaActivity.this,
-                                    event.checkinDigest);
-                            deleteImageFile(getLeaderboardImageFileName(leaderboard.name));
-                            dismissProgressDialog();
-                            finish();
-                        }
-                    }, new NetworkHelperFailureListener() {
-
-                        @Override
-                        public void performAction(NetworkHelperError e) {
-                            dismissProgressDialog();
-                            showErrorPopup(R.string.error,
-                                    R.string.error_could_not_complete_operation_on_server_try_again);
-                        }
-                    });
-
-        } catch (MalformedURLException e) {
-            ExLog.w(this, TAG, "Error, can't check out, MalformedURLException: " + e.getMessage());
-        }
+        CheckoutHelper checkoutHelper = new CheckoutHelper();
+        checkoutHelper.checkoutCompetitor(this, leaderboard.name, event.server, competitor.id, new NetworkHelperSuccessListener() {
+            @Override
+            public void performAction(JSONObject response) {
+                DatabaseHelper.getInstance().deleteRegattaFromDatabase(RegattaActivity.this, event.checkinDigest);
+                deleteImageFile(getLeaderboardImageFileName(leaderboard.name));
+                dismissProgressDialog();
+                finish();
+            }
+        }, new NetworkHelperFailureListener() {
+            @Override
+            public void performAction(NetworkHelperError e) {
+                dismissProgressDialog();
+                showErrorPopup(R.string.error,
+                    R.string.error_could_not_complete_operation_on_server_try_again);
+            }
+        });
     }
 
     @Override
diff --git a/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/utils/CheckoutHelper.java b/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/utils/CheckoutHelper.java
new file mode 100644
index 00000000000..e16dfe613d0
--- /dev/null
+++ b/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/utils/CheckoutHelper.java
@@ -0,0 +1,51 @@
+package com.sap.sailing.android.tracking.app.utils;
+
+import java.net.MalformedURLException;
+import java.net.URL;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import android.net.Uri;
+
+import com.sap.sailing.android.shared.data.http.HttpJsonPostRequest;
+import com.sap.sailing.android.shared.logging.ExLog;
+import com.sap.sailing.android.shared.ui.activities.AbstractBaseActivity;
+import com.sap.sailing.android.shared.util.NetworkHelper;
+import com.sap.sailing.android.shared.util.UniqueDeviceUuid;
+import com.sap.sailing.android.tracking.app.R;
+import com.sap.sailing.domain.common.racelog.tracking.DeviceMappingConstants;
+
+public class CheckoutHelper {
+    private static String TAG = CheckoutHelper.class.getName();
+
+    public void checkoutCompetitor(AbstractBaseActivity activity, String leaderboardName, String eventServer, String competitorId,
+        NetworkHelper.NetworkHelperSuccessListener successListener, NetworkHelper.NetworkHelperFailureListener failureListener) {
+        AppPreferences prefs = new AppPreferences(activity);
+        final String checkoutURLStr = eventServer
+            + prefs.getServerCheckoutPath().replace("{leaderboard-name}", Uri.encode(leaderboardName));
+
+        activity.showProgressDialog(R.string.please_wait, R.string.checking_out);
+
+        JSONObject checkoutData = new JSONObject();
+        try {
+            checkoutData.put(DeviceMappingConstants.JSON_COMPETITOR_ID_AS_STRING, competitorId);
+            checkoutData.put(DeviceMappingConstants.JSON_DEVICE_UUID, UniqueDeviceUuid.getUniqueId(activity));
+            checkoutData.put(DeviceMappingConstants.JSON_TO_MILLIS, System.currentTimeMillis());
+        } catch (JSONException e) {
+            activity.dismissProgressDialog();
+            activity.showErrorPopup(R.string.error, R.string.error_could_not_complete_operation_on_server_try_again);
+            ExLog.e(activity, TAG, "Error populating checkout-data: " + e.getMessage());
+            return;
+        }
+
+        try {
+            HttpJsonPostRequest request = new HttpJsonPostRequest(activity, new URL(checkoutURLStr), checkoutData.toString());
+            com.sap.sailing.android.shared.util.NetworkHelper.getInstance(activity).executeHttpJsonRequestAsync(request,
+                successListener, failureListener);
+
+        } catch (MalformedURLException e) {
+            ExLog.w(activity, TAG, "Error, can't check out, MalformedURLException: " + e.getMessage());
+        }
+    }
+}

From fc457e4fbfa491037b8f6b54b5bddffd706f1312 Mon Sep 17 00:00:00 2001
From: Bennet Brunsen <brunsen@ubilabs.net>
Date: Tue, 5 Jul 2016 17:18:56 +0200
Subject: [PATCH 75/92] Create mark table

---
 .../app/provider/AnalyticsContract.java       |  24 ++
 .../app/provider/AnalyticsDatabase.java       |  27 +-
 .../app/provider/AnalyticsProvider.java       | 236 ++++++++++--------
 3 files changed, 167 insertions(+), 120 deletions(-)

diff --git a/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/provider/AnalyticsContract.java b/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/provider/AnalyticsContract.java
index 5ce59952385..ea2178198d2 100644
--- a/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/provider/AnalyticsContract.java
+++ b/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/provider/AnalyticsContract.java
@@ -30,6 +30,12 @@ public class AnalyticsContract {
         String EVENT_CHECKIN_DIGEST = "event_checkin_digest";
     }
 
+    interface MarkColums {
+        String MARK_ID = "mark.id";
+        String MARKNAME = "mark.name";
+        String MARK_CHECKIN_DIGEST = "mark.checkin_digest";
+    }
+
     interface CheckinUriColumns {
         String CHECKIN_URI_VALUE = "uri_value";
         String CHECKIN_URI_CHECKIN_DIGEST = "uri_checkin_digest";
@@ -43,6 +49,7 @@ public class AnalyticsContract {
     public static final String PATH_EVENT = "events";
     public static final String PATH_LEADERBOARD = "leaderboards";
     private static final String PATH_CHECKIN_URI = "checkin_uris";
+    private static final String PATH_MARK = "marks";
 
     public static class LeaderboardsEventsJoined {
         public final static Uri CONTENT_URI = BASE_CONTENT_URI.buildUpon().appendPath("leaderboards_events_joined")
@@ -134,6 +141,23 @@ public class AnalyticsContract {
         }
     }
 
+    public static class Mark implements MarkColums, BaseColumns {
+        public static final Uri CONTENT_URI = BASE_CONTENT_URI.buildUpon().appendPath(PATH_MARK).build();
+        public static final String CONTENT_TYPE = ContentResolver.CURSOR_DIR_BASE_TYPE
+            + "/vnd.sap_sailing_analytics.mark";
+        public static final String CONTENT_ITEM_TYPE = ContentResolver.CURSOR_ITEM_BASE_TYPE
+            + "/vnd.sap_sailing_analytics.mark";
+        public static final String DEFAULT_SORT = BaseColumns._ID + " ASC ";
+
+        public static Uri buildMarkUri(String leaderboardId) {
+            return CONTENT_URI.buildUpon().appendPath(leaderboardId).build();
+        }
+
+        public static String getMarkId(Uri uri) {
+            return uri.getPathSegments().get(1);
+        }
+    }
+
     private AnalyticsContract() {
 
     }
diff --git a/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/provider/AnalyticsDatabase.java b/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/provider/AnalyticsDatabase.java
index fb6c14fa4f9..e89c06028c3 100644
--- a/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/provider/AnalyticsDatabase.java
+++ b/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/provider/AnalyticsDatabase.java
@@ -20,8 +20,13 @@ public class AnalyticsDatabase extends SQLiteOpenHelper {
 
     private static final String DATABASE_NAME = "sap_sailing_analytics.db";
 
-    private static final int VER_2014_RELEASE_1 = 1;
-    private static final int CUR_DATABASE_VERSION = VER_2014_RELEASE_1;
+    private static final int VER_2016_RELEASE_1 = 2;
+    private static final int CUR_DATABASE_VERSION = VER_2016_RELEASE_1;
+
+    private static final String createMarkTable = "CREATE TABLE " + Tables.MARKS + " (" +BaseColumns._ID
+        + " INTEGER PRIMARY KEY AUTOINCREMENT, " + AnalyticsContract.Mark.MARK_ID + " TEXT, "
+        + AnalyticsContract.Mark.MARKNAME + " TEXT, "
+        + AnalyticsContract.Mark.MARK_CHECKIN_DIGEST + " TEXT );" ;
 
     private final Context mContext;
 
@@ -31,6 +36,7 @@ public class AnalyticsDatabase extends SQLiteOpenHelper {
         String EVENTS_COMPETITORS = "events_competitors";
         String LEADERBOARDS = "leaderboards";
         String CHECKIN_URIS = "checkin_uris";
+        String MARKS = "marks";
         String EVENTS_JOIN_LEADERBOARDS_JOIN_COMPETITORS = Tables.LEADERBOARDS + " INNER JOIN " + Tables.EVENTS
                 + " ON (" + Tables.LEADERBOARDS + "." + Leaderboard.LEADERBOARD_CHECKIN_DIGEST + " = " + Tables.EVENTS
                 + "." + Event.EVENT_CHECKIN_DIGEST + ") " + " INNER JOIN " + Tables.COMPETITORS + " ON ("
@@ -69,24 +75,15 @@ public class AnalyticsDatabase extends SQLiteOpenHelper {
                 + EventColumns.EVENT_DATE_START + " INTEGER, " + EventColumns.EVENT_DATE_END + " INTEGER, "
                 + EventColumns.EVENT_SERVER + " TEXT, " + EventColumns.EVENT_IMAGE_URL + " TEXT, "
                 + EventColumns.EVENT_CHECKIN_DIGEST + " TEXT )");
+
+        db.execSQL(createMarkTable);
     }
 
     @Override
     public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
         ExLog.i(mContext, TAG, "onUpgrade() from " + oldVersion + " to " + newVersion);
-
-        int version = oldVersion;
-
-        if (version != CUR_DATABASE_VERSION) {
-            ExLog.i(mContext, TAG, "Upgrade unsuccessful - destroying old data during upgrade");
-
-            db.execSQL("DROP TABLE IF EXISTS " + Tables.COMPETITORS);
-            db.execSQL("DROP TABLE IF EXISTS " + Tables.EVENTS);
-            db.execSQL("DROP TABLE IF EXISTS " + Tables.LEADERBOARDS);
-            db.execSQL("DROP TABLE IF EXISTS " + Tables.CHECKIN_URIS);
-
-            onCreate(db);
-            version = CUR_DATABASE_VERSION;
+        if (oldVersion == 1 && newVersion == 2) {
+            db.execSQL(createMarkTable);
         }
     }
 
diff --git a/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/provider/AnalyticsProvider.java b/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/provider/AnalyticsProvider.java
index ce52e4022db..f4b05792b5e 100644
--- a/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/provider/AnalyticsProvider.java
+++ b/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/provider/AnalyticsProvider.java
@@ -1,5 +1,7 @@
 package com.sap.sailing.android.tracking.app.provider;
 
+import java.util.Arrays;
+
 import android.content.ContentProvider;
 import android.content.ContentValues;
 import android.content.Context;
@@ -13,15 +15,13 @@ import android.provider.BaseColumns;
 import com.sap.sailing.android.shared.logging.ExLog;
 import com.sap.sailing.android.shared.util.SelectionBuilder;
 import com.sap.sailing.android.tracking.app.BuildConfig;
+import com.sap.sailing.android.tracking.app.provider.AnalyticsContract.CheckinUri;
 import com.sap.sailing.android.tracking.app.provider.AnalyticsContract.Competitor;
 import com.sap.sailing.android.tracking.app.provider.AnalyticsContract.Event;
 import com.sap.sailing.android.tracking.app.provider.AnalyticsContract.Leaderboard;
 import com.sap.sailing.android.tracking.app.provider.AnalyticsDatabase.Tables;
-import com.sap.sailing.android.tracking.app.provider.AnalyticsContract.CheckinUri;
 import com.sap.sailing.android.tracking.app.utils.AppPreferences;
 
-import java.util.Arrays;
-
 public class AnalyticsProvider extends ContentProvider {
 
     private static final String TAG = AnalyticsProvider.class.getName();
@@ -51,6 +51,9 @@ public class AnalyticsProvider extends ContentProvider {
 
     private static final int LEADERBOARDS_EVENTS_JOINED = 800;
 
+    private static final int MARK = 900;
+    private static final int MARK_ID = 901;
+
     private static UriMatcher buildUriMatcher() {
         final UriMatcher matcher = new UriMatcher(UriMatcher.NO_MATCH);
         final String authority = AnalyticsContract.CONTENT_AUTHORITY;
@@ -76,6 +79,9 @@ public class AnalyticsProvider extends ContentProvider {
 
         matcher.addURI(authority, "leaderboards_events_joined", LEADERBOARDS_EVENTS_JOINED);
 
+        matcher.addURI(authority, "marks", MARK);
+        matcher.addURI(authority, "marks/*", MARK_ID);
+
         return matcher;
     }
 
@@ -95,8 +101,8 @@ public class AnalyticsProvider extends ContentProvider {
     @Override
     public Cursor query(Uri uri, String[] projection, String selection, String[] selectionArgs, String sortOrder) {
         if (BuildConfig.DEBUG && AppPreferences.getPrintDatabaseOperationDebugMessages()) {
-            String message = "query: uri=" + uri + " projection=" + Arrays.toString(projection) + " selection=["
-                    + selection + "] args=" + Arrays.toString(selectionArgs) + " order=[" + sortOrder + "]";
+            String message = "query: uri=" + uri + " projection=" + Arrays.toString(projection) + " selection=[" + selection + "] args=" + Arrays
+                .toString(selectionArgs) + " order=[" + sortOrder + "]";
             ExLog.i(getContext(), TAG, message);
         }
 
@@ -106,58 +112,62 @@ public class AnalyticsProvider extends ContentProvider {
 
         switch (sUriMatcher.match(uri)) {
 
-        case EVENT_LEADERBOARD_COMPETITOR_JOINED:
-            SQLiteQueryBuilder qb = new SQLiteQueryBuilder();
-            qb.setTables(Tables.EVENTS_JOIN_LEADERBOARDS_JOIN_COMPETITORS);
-            cursor = qb.query(db, projection, selection, selectionArgs, null, null, sortOrder);
-            return cursor;
+            case EVENT_LEADERBOARD_COMPETITOR_JOINED:
+                SQLiteQueryBuilder qb = new SQLiteQueryBuilder();
+                qb.setTables(Tables.EVENTS_JOIN_LEADERBOARDS_JOIN_COMPETITORS);
+                cursor = qb.query(db, projection, selection, selectionArgs, null, null, sortOrder);
+                return cursor;
 
-        case LEADERBOARDS_EVENTS_JOINED:
-            SQLiteQueryBuilder el = new SQLiteQueryBuilder();
-            el.setTables(Tables.LEADERBOARDS_JOIN_EVENTS);
-            cursor = el.query(db, projection, selection, selectionArgs, null, null, sortOrder);
-            return cursor;
+            case LEADERBOARDS_EVENTS_JOINED:
+                SQLiteQueryBuilder el = new SQLiteQueryBuilder();
+                el.setTables(Tables.LEADERBOARDS_JOIN_EVENTS);
+                cursor = el.query(db, projection, selection, selectionArgs, null, null, sortOrder);
+                return cursor;
 
-        default:
-            final SelectionBuilder builder = buildExpandedSelection(uri);
+            default:
+                final SelectionBuilder builder = buildExpandedSelection(uri);
 
-            cursor = builder.where(selection, selectionArgs).query(db, false, projection, sortOrder, null);
+                cursor = builder.where(selection, selectionArgs).query(db, false, projection, sortOrder, null);
 
-            Context context = getContext();
-            if (context != null) {
-                cursor.setNotificationUri(context.getContentResolver(), uri);
-            }
+                Context context = getContext();
+                if (context != null) {
+                    cursor.setNotificationUri(context.getContentResolver(), uri);
+                }
 
-            return cursor;
+                return cursor;
         }
     }
 
     @Override
     public String getType(Uri uri) {
         switch (sUriMatcher.match(uri)) {
-        case COMPETITOR:
-            return Competitor.CONTENT_TYPE;
+            case COMPETITOR:
+                return Competitor.CONTENT_TYPE;
 
-        case COMPETITOR_ID:
-            return Competitor.CONTENT_ITEM_TYPE;
+            case COMPETITOR_ID:
+                return Competitor.CONTENT_ITEM_TYPE;
 
-        case EVENT:
-            return Event.CONTENT_TYPE;
+            case EVENT:
+                return Event.CONTENT_TYPE;
 
-        case EVENT_ID:
-            return Event.CONTENT_ITEM_TYPE;
+            case EVENT_ID:
+                return Event.CONTENT_ITEM_TYPE;
 
-        case LEADERBOARD:
-            return Leaderboard.CONTENT_TYPE;
+            case LEADERBOARD:
+                return Leaderboard.CONTENT_TYPE;
 
-        case LEADERBOARD_ID:
-            return Leaderboard.CONTENT_ITEM_TYPE;
-        case CHECKIN_URI:
-            return CheckinUri.CONTENT_TYPE;
-        case CHECKIN_URI_ID:
-            return CheckinUri.CONTENT_ITEM_TYPE;
-        default:
-            throw new UnsupportedOperationException("Unknown uri: " + uri);
+            case LEADERBOARD_ID:
+                return Leaderboard.CONTENT_ITEM_TYPE;
+            case CHECKIN_URI:
+                return CheckinUri.CONTENT_TYPE;
+            case CHECKIN_URI_ID:
+                return CheckinUri.CONTENT_ITEM_TYPE;
+            case MARK:
+                return AnalyticsContract.Mark.CONTENT_TYPE;
+            case MARK_ID:
+                return AnalyticsContract.Mark.CONTENT_ITEM_TYPE;
+            default:
+                throw new UnsupportedOperationException("Unknown uri: " + uri);
         }
     }
 
@@ -171,34 +181,40 @@ public class AnalyticsProvider extends ContentProvider {
         final SQLiteDatabase db = mOpenHelper.getWritableDatabase();
 
         switch (sUriMatcher.match(uri)) {
-        case COMPETITOR:
-            long competitorId = db.insertOrThrow(Tables.COMPETITORS, null, values);
-            notifyChange(uri);
-            return Competitor.buildCompetitorUri(String.valueOf(competitorId));
+            case COMPETITOR:
+                long competitorId = db.insertOrThrow(Tables.COMPETITORS, null, values);
+                notifyChange(uri);
+                return Competitor.buildCompetitorUri(String.valueOf(competitorId));
 
-        case EVENT:
-            long eventId = db.insertOrThrow(Tables.EVENTS, null, values);
-            notifyChange(uri);
-            return Event.buildEventUri(String.valueOf(eventId));
+            case EVENT:
+                long eventId = db.insertOrThrow(Tables.EVENTS, null, values);
+                notifyChange(uri);
+                return Event.buildEventUri(String.valueOf(eventId));
 
-        case LEADERBOARD:
-            long leaderboardId = db.insertOrThrow(Tables.LEADERBOARDS, null, values);
-            notifyChange(uri);
-            return Leaderboard.buildLeaderboardUri(String.valueOf(leaderboardId));
-        case CHECKIN_URI:
-            long checkinUriID = db.insertOrThrow(Tables.CHECKIN_URIS, null, values);
-            notifyChange(uri);
-            return CheckinUri.builCheckInUri(String.valueOf(checkinUriID));
-        default:
-            throw new UnsupportedOperationException("Unknown uri: " + uri);
+            case LEADERBOARD:
+                long leaderboardId = db.insertOrThrow(Tables.LEADERBOARDS, null, values);
+                notifyChange(uri);
+                return Leaderboard.buildLeaderboardUri(String.valueOf(leaderboardId));
+
+            case CHECKIN_URI:
+                long checkinUriID = db.insertOrThrow(Tables.CHECKIN_URIS, null, values);
+                notifyChange(uri);
+                return CheckinUri.builCheckInUri(String.valueOf(checkinUriID));
+
+            case MARK:
+                long markUriID = db.insertOrThrow(Tables.MARKS, null, values);
+                notifyChange(uri);
+                return AnalyticsContract.Mark.buildMarkUri(String.valueOf(markUriID));
+
+            default:
+                throw new UnsupportedOperationException("Unknown uri: " + uri);
         }
     }
 
     @Override
     public int delete(Uri uri, String selection, String[] selectionArgs) {
         if (BuildConfig.DEBUG && AppPreferences.getPrintDatabaseOperationDebugMessages()) {
-            String message = "delete: uri=" + uri + " selection=[" + selection + "] args="
-                    + Arrays.toString(selectionArgs);
+            String message = "delete: uri=" + uri + " selection=[" + selection + "] args=" + Arrays.toString(selectionArgs);
             ExLog.i(getContext(), TAG, message);
         }
 
@@ -206,42 +222,47 @@ public class AnalyticsProvider extends ContentProvider {
 
         switch (sUriMatcher.match(uri)) {
 
-        case COMPETITOR:
-            int numCompetitorRowsDeleted = db.delete(Tables.COMPETITORS, selection, selectionArgs);
-            notifyChange(uri);
-            return numCompetitorRowsDeleted;
+            case COMPETITOR:
+                int numCompetitorRowsDeleted = db.delete(Tables.COMPETITORS, selection, selectionArgs);
+                notifyChange(uri);
+                return numCompetitorRowsDeleted;
 
-        case EVENT:
-            int numEventRowsDeleted = db.delete(Tables.EVENTS, selection, selectionArgs);
-            notifyChange(uri);
-            return numEventRowsDeleted;
+            case EVENT:
+                int numEventRowsDeleted = db.delete(Tables.EVENTS, selection, selectionArgs);
+                notifyChange(uri);
+                return numEventRowsDeleted;
 
-        case LEADERBOARD:
-            int numLeaderboardRowsDeleted = db.delete(Tables.LEADERBOARDS, selection, selectionArgs);
-            notifyChange(uri);
-            return numLeaderboardRowsDeleted;
-        case CHECKIN_URI:
-            int numCheckinUriRowsDeleted = db.delete(Tables.CHECKIN_URIS, selection, selectionArgs);
-            notifyChange(uri);
-            return numCheckinUriRowsDeleted;
-        default:
-            throw new UnsupportedOperationException("Unknown uri: " + uri);
+            case LEADERBOARD:
+                int numLeaderboardRowsDeleted = db.delete(Tables.LEADERBOARDS, selection, selectionArgs);
+                notifyChange(uri);
+                return numLeaderboardRowsDeleted;
+            case CHECKIN_URI:
+                int numCheckinUriRowsDeleted = db.delete(Tables.CHECKIN_URIS, selection, selectionArgs);
+                notifyChange(uri);
+                return numCheckinUriRowsDeleted;
+            case MARK:
+                int numMarkRowsDeleted = db.delete(Tables.MARKS, selection, selectionArgs);
+                notifyChange(uri);
+                return numMarkRowsDeleted;
+            default:
+                throw new UnsupportedOperationException("Unknown uri: " + uri);
         }
     }
 
     @Override
     public int update(Uri uri, ContentValues values, String selection, String[] selectionArgs) {
         if (BuildConfig.DEBUG && AppPreferences.getPrintDatabaseOperationDebugMessages()) {
-            String message = "update: uri=" + uri + " values=[" + values == null ? "null" : values.toString()
-                    + "] selection=[" + selection + "]" + " args=" + Arrays.toString(selectionArgs);
+            String message = "update: uri=" + uri + " values=[" + values == null ?
+                "null" :
+                values.toString() + "] selection=[" + selection + "]" + " args=" + Arrays.toString(selectionArgs);
             ExLog.i(getContext(), TAG, message);
         }
 
         // final SQLiteDatabase db = mOpenHelper.getWritableDatabase();
 
         switch (sUriMatcher.match(uri)) {
-        default:
-            throw new UnsupportedOperationException("Unknown uri: " + uri);
+            default:
+                throw new UnsupportedOperationException("Unknown uri: " + uri);
         }
     }
 
@@ -253,34 +274,39 @@ public class AnalyticsProvider extends ContentProvider {
         final SelectionBuilder builder = new SelectionBuilder(getContext());
 
         switch (sUriMatcher.match(uri)) {
-        case COMPETITOR:
-            return builder.table(Tables.COMPETITORS);
+            case COMPETITOR:
+                return builder.table(Tables.COMPETITORS);
 
-        case COMPETITOR_ID:
-            final String competitor_id = Competitor.getCompetitorId(uri);
-            return builder.table(Tables.COMPETITORS).where(Competitor.COMPETITOR_ID + " = ?", competitor_id);
+            case COMPETITOR_ID:
+                final String competitor_id = Competitor.getCompetitorId(uri);
+                return builder.table(Tables.COMPETITORS).where(Competitor.COMPETITOR_ID + " = ?", competitor_id);
 
-        case LEADERBOARD:
-            return builder.table(Tables.LEADERBOARDS);
+            case LEADERBOARD:
+                return builder.table(Tables.LEADERBOARDS);
 
-        case LEADERBOARD_ID:
-            final String leaderboard_id = Leaderboard.getLeaderboardId(uri);
-            return builder.table(Tables.LEADERBOARDS).where(BaseColumns._ID + " = ?", leaderboard_id);
+            case LEADERBOARD_ID:
+                final String leaderboard_id = Leaderboard.getLeaderboardId(uri);
+                return builder.table(Tables.LEADERBOARDS).where(BaseColumns._ID + " = ?", leaderboard_id);
 
-        case EVENT:
-            return builder.table(Tables.EVENTS);
+            case EVENT:
+                return builder.table(Tables.EVENTS);
 
-        case EVENT_ID:
-            final String event_id = Event.getEventId(uri);
-            return builder.table(Tables.EVENTS).where(Event.EVENT_ID + " = ?", event_id);
-        case CHECKIN_URI:
-            return builder.table(Tables.CHECKIN_URIS);
-        case CHECKIN_URI_ID:
-            final String checkinUriId = AnalyticsContract.CheckinUri.getCheckinUriId(uri);
-            return builder.table(Tables.CHECKIN_URIS).where(BaseColumns._ID + " = ?", checkinUriId);
+            case EVENT_ID:
+                final String event_id = Event.getEventId(uri);
+                return builder.table(Tables.EVENTS).where(Event.EVENT_ID + " = ?", event_id);
+            case CHECKIN_URI:
+                return builder.table(Tables.CHECKIN_URIS);
+            case CHECKIN_URI_ID:
+                final String checkinUriId = AnalyticsContract.CheckinUri.getCheckinUriId(uri);
+                return builder.table(Tables.CHECKIN_URIS).where(BaseColumns._ID + " = ?", checkinUriId);
+            case MARK:
+                return builder.table(Tables.MARKS);
+            case MARK_ID:
+                final String mark_id = AnalyticsContract.Mark.getMarkId(uri);
+                return builder.table(Tables.MARKS).where(BaseColumns._ID + " = ?", mark_id);
 
-        default:
-            throw new UnsupportedOperationException("Unknown uri: " + uri);
+            default:
+                throw new UnsupportedOperationException("Unknown uri: " + uri);
         }
     }
 }

From 28f0e1fc4fa16722f53eb3e02797e7cbcac87ab2 Mon Sep 17 00:00:00 2001
From: Bennet Brunsen <brunsen@ubilabs.net>
Date: Thu, 7 Jul 2016 11:54:55 +0200
Subject: [PATCH 76/92] Add new column checkin type to checkin table

---
 .../android/shared/data/CheckinUrlInfo.java   |  1 +
 .../app/provider/AnalyticsContract.java       |  9 ++---
 .../app/provider/AnalyticsDatabase.java       | 14 ++++----
 .../app/provider/AnalyticsProvider.java       | 18 +++++-----
 .../tracking/app/utils/DatabaseHelper.java    | 36 +++++++++++--------
 5 files changed, 44 insertions(+), 34 deletions(-)

diff --git a/mobile/com.sap.sailing.android.shared/src/com/sap/sailing/android/shared/data/CheckinUrlInfo.java b/mobile/com.sap.sailing.android.shared/src/com/sap/sailing/android/shared/data/CheckinUrlInfo.java
index f2498c25f26..4dbc6ecc6b8 100644
--- a/mobile/com.sap.sailing.android.shared/src/com/sap/sailing/android/shared/data/CheckinUrlInfo.java
+++ b/mobile/com.sap.sailing.android.shared/src/com/sap/sailing/android/shared/data/CheckinUrlInfo.java
@@ -3,5 +3,6 @@ package com.sap.sailing.android.shared.data;
 public class CheckinUrlInfo {
     public String urlString;
     public String checkinDigest;
+    public int type;
     public int rowId;
 }
diff --git a/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/provider/AnalyticsContract.java b/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/provider/AnalyticsContract.java
index ea2178198d2..df1716ee844 100644
--- a/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/provider/AnalyticsContract.java
+++ b/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/provider/AnalyticsContract.java
@@ -30,15 +30,16 @@ public class AnalyticsContract {
         String EVENT_CHECKIN_DIGEST = "event_checkin_digest";
     }
 
-    interface MarkColums {
+    interface markColums {
         String MARK_ID = "mark.id";
         String MARKNAME = "mark.name";
         String MARK_CHECKIN_DIGEST = "mark.checkin_digest";
     }
 
-    interface CheckinUriColumns {
+    interface CheckinColumns {
         String CHECKIN_URI_VALUE = "uri_value";
         String CHECKIN_URI_CHECKIN_DIGEST = "uri_checkin_digest";
+        String CHECKIN_TYPE = "checkin_type";
     }
 
     public static final String CONTENT_AUTHORITY = "com.sap.sailing.android.tracking.app.provider.db";
@@ -123,7 +124,7 @@ public class AnalyticsContract {
         }
     }
 
-    public static class CheckinUri implements CheckinUriColumns, BaseColumns {
+    public static class Checkin implements CheckinColumns, BaseColumns {
         public static final Uri CONTENT_URI = BASE_CONTENT_URI.buildUpon().appendPath(PATH_CHECKIN_URI).build();
 
         public static final String CONTENT_TYPE = ContentResolver.CURSOR_DIR_BASE_TYPE
@@ -141,7 +142,7 @@ public class AnalyticsContract {
         }
     }
 
-    public static class Mark implements MarkColums, BaseColumns {
+    public static class mark implements markColums, BaseColumns {
         public static final Uri CONTENT_URI = BASE_CONTENT_URI.buildUpon().appendPath(PATH_MARK).build();
         public static final String CONTENT_TYPE = ContentResolver.CURSOR_DIR_BASE_TYPE
             + "/vnd.sap_sailing_analytics.mark";
diff --git a/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/provider/AnalyticsDatabase.java b/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/provider/AnalyticsDatabase.java
index e89c06028c3..14834fa0533 100644
--- a/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/provider/AnalyticsDatabase.java
+++ b/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/provider/AnalyticsDatabase.java
@@ -12,7 +12,7 @@ import com.sap.sailing.android.tracking.app.provider.AnalyticsContract.Event;
 import com.sap.sailing.android.tracking.app.provider.AnalyticsContract.EventColumns;
 import com.sap.sailing.android.tracking.app.provider.AnalyticsContract.Leaderboard;
 import com.sap.sailing.android.tracking.app.provider.AnalyticsContract.LeaderboardColumns;
-import com.sap.sailing.android.tracking.app.provider.AnalyticsContract.CheckinUriColumns;
+import com.sap.sailing.android.tracking.app.provider.AnalyticsContract.CheckinColumns;
 
 public class AnalyticsDatabase extends SQLiteOpenHelper {
 
@@ -24,9 +24,9 @@ public class AnalyticsDatabase extends SQLiteOpenHelper {
     private static final int CUR_DATABASE_VERSION = VER_2016_RELEASE_1;
 
     private static final String createMarkTable = "CREATE TABLE " + Tables.MARKS + " (" +BaseColumns._ID
-        + " INTEGER PRIMARY KEY AUTOINCREMENT, " + AnalyticsContract.Mark.MARK_ID + " TEXT, "
-        + AnalyticsContract.Mark.MARKNAME + " TEXT, "
-        + AnalyticsContract.Mark.MARK_CHECKIN_DIGEST + " TEXT );" ;
+        + " INTEGER PRIMARY KEY AUTOINCREMENT, " + AnalyticsContract.mark.MARK_ID + " TEXT, "
+        + AnalyticsContract.mark.MARKNAME + " TEXT, "
+        + AnalyticsContract.mark.MARK_CHECKIN_DIGEST + " TEXT );" ;
 
     private final Context mContext;
 
@@ -60,8 +60,9 @@ public class AnalyticsDatabase extends SQLiteOpenHelper {
                 + LeaderboardColumns.LEADERBOARD_NAME + " TEXT );");
 
         db.execSQL("CREATE TABLE " + Tables.CHECKIN_URIS + " (" + BaseColumns._ID
-                + " INTEGER PRIMARY KEY AUTOINCREMENT, " + CheckinUriColumns.CHECKIN_URI_CHECKIN_DIGEST + " TEXT, "
-                + CheckinUriColumns.CHECKIN_URI_VALUE + " TEXT );");
+                + " INTEGER PRIMARY KEY AUTOINCREMENT, " + CheckinColumns.CHECKIN_URI_CHECKIN_DIGEST + " TEXT, "
+                + CheckinColumns.CHECKIN_URI_VALUE + " TEXT, "
+                + CheckinColumns.CHECKIN_TYPE + " INTEGER );");
 
         db.execSQL("CREATE TABLE " + Tables.COMPETITORS + " (" + BaseColumns._ID
                 + " INTEGER PRIMARY KEY AUTOINCREMENT, " + CompetitorColumns.COMPETITOR_ID + " TEXT, "
@@ -84,6 +85,7 @@ public class AnalyticsDatabase extends SQLiteOpenHelper {
         ExLog.i(mContext, TAG, "onUpgrade() from " + oldVersion + " to " + newVersion);
         if (oldVersion == 1 && newVersion == 2) {
             db.execSQL(createMarkTable);
+            db.execSQL("ALTER TABLE " + Tables.CHECKIN_URIS + "ADD COLUMN " + AnalyticsContract.Checkin.CHECKIN_TYPE + " INTEGER DEFAULT 0");
         }
     }
 
diff --git a/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/provider/AnalyticsProvider.java b/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/provider/AnalyticsProvider.java
index f4b05792b5e..371eb397bef 100644
--- a/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/provider/AnalyticsProvider.java
+++ b/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/provider/AnalyticsProvider.java
@@ -15,7 +15,7 @@ import android.provider.BaseColumns;
 import com.sap.sailing.android.shared.logging.ExLog;
 import com.sap.sailing.android.shared.util.SelectionBuilder;
 import com.sap.sailing.android.tracking.app.BuildConfig;
-import com.sap.sailing.android.tracking.app.provider.AnalyticsContract.CheckinUri;
+import com.sap.sailing.android.tracking.app.provider.AnalyticsContract.Checkin;
 import com.sap.sailing.android.tracking.app.provider.AnalyticsContract.Competitor;
 import com.sap.sailing.android.tracking.app.provider.AnalyticsContract.Event;
 import com.sap.sailing.android.tracking.app.provider.AnalyticsContract.Leaderboard;
@@ -159,13 +159,13 @@ public class AnalyticsProvider extends ContentProvider {
             case LEADERBOARD_ID:
                 return Leaderboard.CONTENT_ITEM_TYPE;
             case CHECKIN_URI:
-                return CheckinUri.CONTENT_TYPE;
+                return Checkin.CONTENT_TYPE;
             case CHECKIN_URI_ID:
-                return CheckinUri.CONTENT_ITEM_TYPE;
+                return Checkin.CONTENT_ITEM_TYPE;
             case MARK:
-                return AnalyticsContract.Mark.CONTENT_TYPE;
+                return AnalyticsContract.mark.CONTENT_TYPE;
             case MARK_ID:
-                return AnalyticsContract.Mark.CONTENT_ITEM_TYPE;
+                return AnalyticsContract.mark.CONTENT_ITEM_TYPE;
             default:
                 throw new UnsupportedOperationException("Unknown uri: " + uri);
         }
@@ -199,12 +199,12 @@ public class AnalyticsProvider extends ContentProvider {
             case CHECKIN_URI:
                 long checkinUriID = db.insertOrThrow(Tables.CHECKIN_URIS, null, values);
                 notifyChange(uri);
-                return CheckinUri.builCheckInUri(String.valueOf(checkinUriID));
+                return Checkin.builCheckInUri(String.valueOf(checkinUriID));
 
             case MARK:
                 long markUriID = db.insertOrThrow(Tables.MARKS, null, values);
                 notifyChange(uri);
-                return AnalyticsContract.Mark.buildMarkUri(String.valueOf(markUriID));
+                return AnalyticsContract.mark.buildMarkUri(String.valueOf(markUriID));
 
             default:
                 throw new UnsupportedOperationException("Unknown uri: " + uri);
@@ -297,12 +297,12 @@ public class AnalyticsProvider extends ContentProvider {
             case CHECKIN_URI:
                 return builder.table(Tables.CHECKIN_URIS);
             case CHECKIN_URI_ID:
-                final String checkinUriId = AnalyticsContract.CheckinUri.getCheckinUriId(uri);
+                final String checkinUriId = Checkin.getCheckinUriId(uri);
                 return builder.table(Tables.CHECKIN_URIS).where(BaseColumns._ID + " = ?", checkinUriId);
             case MARK:
                 return builder.table(Tables.MARKS);
             case MARK_ID:
-                final String mark_id = AnalyticsContract.Mark.getMarkId(uri);
+                final String mark_id = AnalyticsContract.mark.getMarkId(uri);
                 return builder.table(Tables.MARKS).where(BaseColumns._ID + " = ?", mark_id);
 
             default:
diff --git a/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/utils/DatabaseHelper.java b/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/utils/DatabaseHelper.java
index b712058348b..ab9425588db 100644
--- a/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/utils/DatabaseHelper.java
+++ b/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/utils/DatabaseHelper.java
@@ -1,5 +1,8 @@
 package com.sap.sailing.android.tracking.app.utils;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import android.content.ContentProviderOperation;
 import android.content.ContentResolver;
 import android.content.ContentValues;
@@ -9,22 +12,19 @@ import android.database.Cursor;
 import android.os.RemoteException;
 import android.provider.BaseColumns;
 
+import com.sap.sailing.android.shared.data.CheckinUrlInfo;
+import com.sap.sailing.android.shared.data.LeaderboardInfo;
 import com.sap.sailing.android.shared.logging.ExLog;
 import com.sap.sailing.android.tracking.app.BuildConfig;
 import com.sap.sailing.android.tracking.app.provider.AnalyticsContract;
+import com.sap.sailing.android.tracking.app.provider.AnalyticsContract.Checkin;
 import com.sap.sailing.android.tracking.app.provider.AnalyticsContract.Competitor;
 import com.sap.sailing.android.tracking.app.provider.AnalyticsContract.Event;
 import com.sap.sailing.android.tracking.app.provider.AnalyticsContract.EventLeaderboardCompetitorJoined;
 import com.sap.sailing.android.tracking.app.provider.AnalyticsContract.Leaderboard;
-import com.sap.sailing.android.tracking.app.provider.AnalyticsContract.CheckinUri;
 import com.sap.sailing.android.tracking.app.provider.AnalyticsDatabase;
 import com.sap.sailing.android.tracking.app.valueobjects.CompetitorInfo;
 import com.sap.sailing.android.tracking.app.valueobjects.EventInfo;
-import com.sap.sailing.android.shared.data.CheckinUrlInfo;
-import com.sap.sailing.android.shared.data.LeaderboardInfo;
-
-import java.util.ArrayList;
-import java.util.List;
 
 public class DatabaseHelper {
 
@@ -43,11 +43,11 @@ public class DatabaseHelper {
     public List<String> getCheckinUrls(Context context) {
         List<String> checkinUrls = new ArrayList<>();
         ContentResolver cr = context.getContentResolver();
-        Cursor cursor = cr.query(CheckinUri.CONTENT_URI, null, null, null, null);
+        Cursor cursor = cr.query(Checkin.CONTENT_URI, null, null, null, null);
         if (cursor != null) {
             cursor.moveToFirst();
             while (!cursor.isAfterLast()) {
-                String checkinUrl = cursor.getString(cursor.getColumnIndex(CheckinUri.CHECKIN_URI_VALUE));
+                String checkinUrl = cursor.getString(cursor.getColumnIndex(Checkin.CHECKIN_URI_VALUE));
                 if (!checkinUrls.contains(checkinUrl)) {
                     checkinUrls.add(checkinUrl);
                 }
@@ -161,12 +161,13 @@ public class DatabaseHelper {
         CheckinUrlInfo checkinUrlInfo = new CheckinUrlInfo();
         checkinUrlInfo.checkinDigest = checkinDigest;
 
-        Cursor uc = context.getContentResolver().query(CheckinUri.CONTENT_URI, null,
-                CheckinUri.CHECKIN_URI_CHECKIN_DIGEST + " = ?", new String[] { checkinDigest }, null);
+        Cursor uc = context.getContentResolver().query(Checkin.CONTENT_URI, null,
+                Checkin.CHECKIN_URI_CHECKIN_DIGEST + " = ?", new String[] { checkinDigest }, null);
         if (uc != null) {
             if (uc.moveToFirst()) {
                 checkinUrlInfo.rowId = uc.getInt(uc.getColumnIndex(BaseColumns._ID));
-                checkinUrlInfo.urlString = uc.getString(uc.getColumnIndex(CheckinUri.CHECKIN_URI_VALUE));
+                checkinUrlInfo.urlString = uc.getString(uc.getColumnIndex(Checkin.CHECKIN_URI_VALUE));
+                checkinUrlInfo.type = uc.getInt(uc.getColumnIndex(Checkin.CHECKIN_TYPE));
             }
 
             uc.close();
@@ -175,13 +176,15 @@ public class DatabaseHelper {
         return checkinUrlInfo;
     }
 
+    // TODO: Get Mark
+
     public void deleteRegattaFromDatabase(Context context, String checkinDigest) {
         ContentResolver cr = context.getContentResolver();
 
         int d1 = cr.delete(Event.CONTENT_URI, Event.EVENT_CHECKIN_DIGEST + " = ?", new String[] { checkinDigest });
         int d2 = cr.delete(Competitor.CONTENT_URI, Competitor.COMPETITOR_CHECKIN_DIGEST + " = ?", new String[] { checkinDigest });
         int d3 = cr.delete(Leaderboard.CONTENT_URI, Leaderboard.LEADERBOARD_CHECKIN_DIGEST + " = ?", new String[] { checkinDigest });
-        int d4 = cr.delete(CheckinUri.CONTENT_URI, CheckinUri.CHECKIN_URI_CHECKIN_DIGEST + " = ?", new String[] { checkinDigest });
+        int d4 = cr.delete(Checkin.CONTENT_URI, Checkin.CHECKIN_URI_CHECKIN_DIGEST + " = ?", new String[] { checkinDigest });
 
         if (BuildConfig.DEBUG) {
             ExLog.i(context, TAG, "Checkout, number of events deleted: " + d1);
@@ -245,10 +248,11 @@ public class DatabaseHelper {
 
         ContentValues ccuv = new ContentValues();
 
-        ccuv.put(CheckinUri.CHECKIN_URI_VALUE, checkinURL.urlString);
-        ccuv.put(CheckinUri.CHECKIN_URI_CHECKIN_DIGEST, checkinURL.checkinDigest);
+        ccuv.put(Checkin.CHECKIN_URI_VALUE, checkinURL.urlString);
+        ccuv.put(Checkin.CHECKIN_URI_CHECKIN_DIGEST, checkinURL.checkinDigest);
+        ccuv.put(Checkin.CHECKIN_TYPE, checkinURL.type);
 
-        opList.add(ContentProviderOperation.newInsert(CheckinUri.CONTENT_URI).withValues(ccuv).build());
+        opList.add(ContentProviderOperation.newInsert(Checkin.CONTENT_URI).withValues(ccuv).build());
 
         try {
             cr.applyBatch(AnalyticsContract.CONTENT_AUTHORITY, opList);
@@ -259,6 +263,8 @@ public class DatabaseHelper {
         }
     }
 
+    // TODO: Store mark
+
     /**
      * Return true if the combination of event, leaderboard and competitor does not exist in the DB. (based on the
      * digest of the checkin- url obtained from the QR-code.)

From 09e49f0550fc68d7840c25c5bd720f350cd019bd Mon Sep 17 00:00:00 2001
From: Bennet Brunsen <brunsen@ubilabs.net>
Date: Thu, 7 Jul 2016 12:06:03 +0200
Subject: [PATCH 77/92] Provide checkin type information

---
 .../sap/sailing/android/shared/data/CheckinUrlInfo.java    | 4 ++++
 .../android/tracking/app/valueobjects/CheckinData.java     | 5 ++++-
 .../tracking/app/valueobjects/CompetitorCheckinData.java   | 7 +++++++
 .../android/tracking/app/valueobjects/MarkCheckinData.java | 6 ++++++
 4 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/mobile/com.sap.sailing.android.shared/src/com/sap/sailing/android/shared/data/CheckinUrlInfo.java b/mobile/com.sap.sailing.android.shared/src/com/sap/sailing/android/shared/data/CheckinUrlInfo.java
index 4dbc6ecc6b8..23981b6b5f9 100644
--- a/mobile/com.sap.sailing.android.shared/src/com/sap/sailing/android/shared/data/CheckinUrlInfo.java
+++ b/mobile/com.sap.sailing.android.shared/src/com/sap/sailing/android/shared/data/CheckinUrlInfo.java
@@ -1,6 +1,10 @@
 package com.sap.sailing.android.shared.data;
 
 public class CheckinUrlInfo {
+
+    public static int TYPE_COMPETITOR = 0;
+    public static int TYPE_MARK = 1;
+
     public String urlString;
     public String checkinDigest;
     public int type;
diff --git a/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/valueobjects/CheckinData.java b/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/valueobjects/CheckinData.java
index c1806c656c9..524023e999e 100644
--- a/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/valueobjects/CheckinData.java
+++ b/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/valueobjects/CheckinData.java
@@ -8,7 +8,7 @@ import com.sap.sailing.android.shared.data.BaseCheckinData;
 import com.sap.sailing.android.shared.data.CheckinUrlInfo;
 import com.sap.sailing.android.shared.data.LeaderboardInfo;
 
-public class CheckinData extends BaseCheckinData {
+public abstract class CheckinData extends BaseCheckinData {
     // public String gcmId;
     private String leaderboardName;
     private String eventId;
@@ -71,9 +71,12 @@ public class CheckinData extends BaseCheckinData {
         CheckinUrlInfo checkinUrlInfo = new CheckinUrlInfo();
         checkinUrlInfo.urlString = uriString;
         checkinUrlInfo.checkinDigest = checkinDigest;
+        checkinUrlInfo.type = getCheckinType();
         return checkinUrlInfo;
     }
 
+    public abstract int getCheckinType();
+
     public boolean isUpdate() {
         return update;
     }
diff --git a/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/valueobjects/CompetitorCheckinData.java b/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/valueobjects/CompetitorCheckinData.java
index 52986c618b6..0ad96571df5 100644
--- a/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/valueobjects/CompetitorCheckinData.java
+++ b/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/valueobjects/CompetitorCheckinData.java
@@ -1,5 +1,7 @@
 package com.sap.sailing.android.tracking.app.valueobjects;
 
+import com.sap.sailing.android.shared.data.CheckinUrlInfo;
+
 public class CompetitorCheckinData extends CheckinData {
 
 
@@ -30,4 +32,9 @@ public class CompetitorCheckinData extends CheckinData {
         competitor.checkinDigest = checkinDigest;
         return competitor;
     }
+
+    @Override
+    public int getCheckinType() {
+        return CheckinUrlInfo.TYPE_COMPETITOR;
+    }
 }
diff --git a/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/valueobjects/MarkCheckinData.java b/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/valueobjects/MarkCheckinData.java
index 32dd56fb579..3b8cf18e7e5 100644
--- a/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/valueobjects/MarkCheckinData.java
+++ b/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/valueobjects/MarkCheckinData.java
@@ -1,5 +1,6 @@
 package com.sap.sailing.android.tracking.app.valueobjects;
 
+import com.sap.sailing.android.shared.data.CheckinUrlInfo;
 import com.sap.sailing.domain.base.Mark;
 
 public class MarkCheckinData extends CheckinData {
@@ -14,4 +15,9 @@ public class MarkCheckinData extends CheckinData {
     public Mark getMark() {
         return mark;
     }
+
+    @Override
+    public int getCheckinType() {
+        return CheckinUrlInfo.TYPE_MARK;
+    }
 }

From b2a4c1c609b287b9128e12673f4c3f3fae9f78e1 Mon Sep 17 00:00:00 2001
From: Bennet Brunsen <brunsen@ubilabs.net>
Date: Thu, 7 Jul 2016 12:48:04 +0200
Subject: [PATCH 78/92] Provide method to store mark checkin

---
 .../tracking/app/provider/AnalyticsContract.java     | 12 ++++++------
 .../tracking/app/provider/AnalyticsDatabase.java     |  6 +++---
 .../tracking/app/provider/AnalyticsProvider.java     |  8 ++++----
 .../tracking/app/ui/activities/RegattaActivity.java  |  2 +-
 .../tracking/app/ui/activities/StartActivity.java    |  4 +++-
 .../tracking/app/ui/fragments/HomeFragment.java      |  4 ++--
 6 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/provider/AnalyticsContract.java b/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/provider/AnalyticsContract.java
index df1716ee844..ea00c7c8b08 100644
--- a/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/provider/AnalyticsContract.java
+++ b/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/provider/AnalyticsContract.java
@@ -31,9 +31,9 @@ public class AnalyticsContract {
     }
 
     interface markColums {
-        String MARK_ID = "mark.id";
-        String MARKNAME = "mark.name";
-        String MARK_CHECKIN_DIGEST = "mark.checkin_digest";
+        String MARK_ID = "Mark.id";
+        String MARK_NAME = "Mark.name";
+        String MARK_CHECKIN_DIGEST = "Mark.checkin_digest";
     }
 
     interface CheckinColumns {
@@ -142,12 +142,12 @@ public class AnalyticsContract {
         }
     }
 
-    public static class mark implements markColums, BaseColumns {
+    public static class Mark implements markColums, BaseColumns {
         public static final Uri CONTENT_URI = BASE_CONTENT_URI.buildUpon().appendPath(PATH_MARK).build();
         public static final String CONTENT_TYPE = ContentResolver.CURSOR_DIR_BASE_TYPE
-            + "/vnd.sap_sailing_analytics.mark";
+            + "/vnd.sap_sailing_analytics.Mark";
         public static final String CONTENT_ITEM_TYPE = ContentResolver.CURSOR_ITEM_BASE_TYPE
-            + "/vnd.sap_sailing_analytics.mark";
+            + "/vnd.sap_sailing_analytics.Mark";
         public static final String DEFAULT_SORT = BaseColumns._ID + " ASC ";
 
         public static Uri buildMarkUri(String leaderboardId) {
diff --git a/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/provider/AnalyticsDatabase.java b/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/provider/AnalyticsDatabase.java
index 14834fa0533..9658986c13e 100644
--- a/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/provider/AnalyticsDatabase.java
+++ b/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/provider/AnalyticsDatabase.java
@@ -24,9 +24,9 @@ public class AnalyticsDatabase extends SQLiteOpenHelper {
     private static final int CUR_DATABASE_VERSION = VER_2016_RELEASE_1;
 
     private static final String createMarkTable = "CREATE TABLE " + Tables.MARKS + " (" +BaseColumns._ID
-        + " INTEGER PRIMARY KEY AUTOINCREMENT, " + AnalyticsContract.mark.MARK_ID + " TEXT, "
-        + AnalyticsContract.mark.MARKNAME + " TEXT, "
-        + AnalyticsContract.mark.MARK_CHECKIN_DIGEST + " TEXT );" ;
+        + " INTEGER PRIMARY KEY AUTOINCREMENT, " + AnalyticsContract.Mark.MARK_ID + " TEXT, "
+        + AnalyticsContract.Mark.MARK_NAME + " TEXT, "
+        + AnalyticsContract.Mark.MARK_CHECKIN_DIGEST + " TEXT );" ;
 
     private final Context mContext;
 
diff --git a/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/provider/AnalyticsProvider.java b/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/provider/AnalyticsProvider.java
index 371eb397bef..6252a3742a5 100644
--- a/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/provider/AnalyticsProvider.java
+++ b/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/provider/AnalyticsProvider.java
@@ -163,9 +163,9 @@ public class AnalyticsProvider extends ContentProvider {
             case CHECKIN_URI_ID:
                 return Checkin.CONTENT_ITEM_TYPE;
             case MARK:
-                return AnalyticsContract.mark.CONTENT_TYPE;
+                return AnalyticsContract.Mark.CONTENT_TYPE;
             case MARK_ID:
-                return AnalyticsContract.mark.CONTENT_ITEM_TYPE;
+                return AnalyticsContract.Mark.CONTENT_ITEM_TYPE;
             default:
                 throw new UnsupportedOperationException("Unknown uri: " + uri);
         }
@@ -204,7 +204,7 @@ public class AnalyticsProvider extends ContentProvider {
             case MARK:
                 long markUriID = db.insertOrThrow(Tables.MARKS, null, values);
                 notifyChange(uri);
-                return AnalyticsContract.mark.buildMarkUri(String.valueOf(markUriID));
+                return AnalyticsContract.Mark.buildMarkUri(String.valueOf(markUriID));
 
             default:
                 throw new UnsupportedOperationException("Unknown uri: " + uri);
@@ -302,7 +302,7 @@ public class AnalyticsProvider extends ContentProvider {
             case MARK:
                 return builder.table(Tables.MARKS);
             case MARK_ID:
-                final String mark_id = AnalyticsContract.mark.getMarkId(uri);
+                final String mark_id = AnalyticsContract.Mark.getMarkId(uri);
                 return builder.table(Tables.MARKS).where(BaseColumns._ID + " = ?", mark_id);
 
             default:
diff --git a/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/activities/RegattaActivity.java b/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/activities/RegattaActivity.java
index aa053924d4e..3ebb26141c8 100755
--- a/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/activities/RegattaActivity.java
+++ b/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/activities/RegattaActivity.java
@@ -419,7 +419,7 @@ public class RegattaActivity extends AbstractRegattaActivity
                 if (data instanceof CompetitorCheckinData) {
                     CompetitorCheckinData competitorCheckinData = (CompetitorCheckinData) data;
                     DatabaseHelper.getInstance().deleteRegattaFromDatabase(this, checkinDigest);
-                    DatabaseHelper.getInstance().storeCheckinRow(this, competitorCheckinData.getEvent(), competitorCheckinData.getCompetitor(),
+                    DatabaseHelper.getInstance().storeCompetitorCheckinRow(this, competitorCheckinData.getEvent(), competitorCheckinData.getCompetitor(),
                         competitorCheckinData.getLeaderboard(), competitorCheckinData.getCheckinUrl());
                     competitor = DatabaseHelper.getInstance().getCompetitor(this, checkinDigest);
                     event = DatabaseHelper.getInstance().getEventInfo(this, checkinDigest);
diff --git a/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/activities/StartActivity.java b/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/activities/StartActivity.java
index 9059d1563b7..1ca8ec6952d 100644
--- a/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/activities/StartActivity.java
+++ b/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/activities/StartActivity.java
@@ -55,6 +55,7 @@ public class StartActivity extends AbstractStartActivity {
 
         if (prefs.getTrackerIsTracking()) {
             String checkinDigest = prefs.getTrackerIsTrackingCheckinDigest();
+            // TODO: Type in preferences write / read
             startRegatta(checkinDigest);
         }
     }
@@ -66,6 +67,7 @@ public class StartActivity extends AbstractStartActivity {
     }
 
     private void startRegatta(String checkinDigest) {
+        // TODO: Check which activity to be called
         Intent intent = new Intent(this, RegattaActivity.class);
         intent.putExtra(getString(R.string.checkin_digest), checkinDigest);
         startActivity(intent);
@@ -118,7 +120,7 @@ public class StartActivity extends AbstractStartActivity {
                 try {
                     DatabaseHelper.getInstance().deleteRegattaFromDatabase(this, checkinData.getCheckinUrl().checkinDigest);
                     DatabaseHelper.getInstance()
-                        .storeCheckinRow(this, checkinData.getEvent(), competitorCheckinData.getCompetitor(), checkinData.getLeaderboard(), checkinData.getCheckinUrl());
+                        .storeCompetitorCheckinRow(this, checkinData.getEvent(), competitorCheckinData.getCompetitor(), checkinData.getLeaderboard(), checkinData.getCheckinUrl());
                 } catch (DatabaseHelper.GeneralDatabaseHelperException e) {
                     ExLog.e(this, TAG, "Batch insert failed: " + e.getMessage());
                     displayDatabaseError();
diff --git a/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/fragments/HomeFragment.java b/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/fragments/HomeFragment.java
index 8bd979ba5e0..e4b5f389b70 100644
--- a/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/fragments/HomeFragment.java
+++ b/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/fragments/HomeFragment.java
@@ -95,10 +95,10 @@ public class HomeFragment extends AbstractHomeFragment implements LoaderCallback
                 if (checkinData instanceof CompetitorCheckinData) {
                     CompetitorCheckinData competitorCheckinData = (CompetitorCheckinData) checkinData;
                     DatabaseHelper.getInstance()
-                        .storeCheckinRow(getActivity(), competitorCheckinData.getEvent(), competitorCheckinData.getCompetitor(),
+                        .storeCompetitorCheckinRow(getActivity(), competitorCheckinData.getEvent(), competitorCheckinData.getCompetitor(),
                             competitorCheckinData.getLeaderboard(), competitorCheckinData.getCheckinUrl());
                 } else if (checkinData instanceof MarkCheckinData) {
-                    // TODO: handle database for mark
+                    // TODO: handle database for Mark
                 }
                 adapter.notifyDataSetChanged();
             } catch (GeneralDatabaseHelperException e) {

From e91f777caf825661b96bd348b200ddbb8bf44cde Mon Sep 17 00:00:00 2001
From: Bennet Brunsen <brunsen@ubilabs.net>
Date: Thu, 7 Jul 2016 12:48:46 +0200
Subject: [PATCH 79/92] Provide method to get basic mark information

---
 .../tracking/app/utils/DatabaseHelper.java    | 109 ++++++++++++------
 .../tracking/app/valueobjects/MarkInfo.java   |   8 ++
 2 files changed, 82 insertions(+), 35 deletions(-)
 create mode 100644 mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/valueobjects/MarkInfo.java

diff --git a/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/utils/DatabaseHelper.java b/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/utils/DatabaseHelper.java
index ab9425588db..e552b3afe0d 100644
--- a/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/utils/DatabaseHelper.java
+++ b/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/utils/DatabaseHelper.java
@@ -25,6 +25,8 @@ import com.sap.sailing.android.tracking.app.provider.AnalyticsContract.Leaderboa
 import com.sap.sailing.android.tracking.app.provider.AnalyticsDatabase;
 import com.sap.sailing.android.tracking.app.valueobjects.CompetitorInfo;
 import com.sap.sailing.android.tracking.app.valueobjects.EventInfo;
+import com.sap.sailing.android.tracking.app.valueobjects.MarkInfo;
+import com.sap.sailing.domain.base.Mark;
 
 public class DatabaseHelper {
 
@@ -175,8 +177,22 @@ public class DatabaseHelper {
 
         return checkinUrlInfo;
     }
+    
+    public MarkInfo getMarkInfo(Context context, String checkinDigest) {
+        MarkInfo markInfo = new MarkInfo();
+        markInfo.checkinDigest = checkinDigest;
+        Cursor markCursor = context.getContentResolver().query(AnalyticsContract.Mark.CONTENT_URI, null,
+            AnalyticsContract.Mark.MARK_CHECKIN_DIGEST + " = ?", new String[] { checkinDigest }, null);
+        if (markCursor != null) {
+            if (markCursor.moveToFirst()) {
+                markInfo.markId = markCursor.getString(markCursor.getColumnIndex(AnalyticsContract.Mark.MARK_ID));
+                markInfo.markName = markCursor.getString(markCursor.getColumnIndex(AnalyticsContract.Mark.MARK_NAME));
+            }
 
-    // TODO: Get Mark
+            markCursor.close();
+        }
+        return markInfo;
+    }
 
     public void deleteRegattaFromDatabase(Context context, String checkinDigest) {
         ContentResolver cr = context.getContentResolver();
@@ -185,12 +201,14 @@ public class DatabaseHelper {
         int d2 = cr.delete(Competitor.CONTENT_URI, Competitor.COMPETITOR_CHECKIN_DIGEST + " = ?", new String[] { checkinDigest });
         int d3 = cr.delete(Leaderboard.CONTENT_URI, Leaderboard.LEADERBOARD_CHECKIN_DIGEST + " = ?", new String[] { checkinDigest });
         int d4 = cr.delete(Checkin.CONTENT_URI, Checkin.CHECKIN_URI_CHECKIN_DIGEST + " = ?", new String[] { checkinDigest });
+        int d5 = cr.delete(AnalyticsContract.Mark.CONTENT_URI, AnalyticsContract.Mark.MARK_CHECKIN_DIGEST + " = ?", new String[] { checkinDigest });
 
         if (BuildConfig.DEBUG) {
             ExLog.i(context, TAG, "Checkout, number of events deleted: " + d1);
             ExLog.i(context, TAG, "Checkout, number of competitors deleted: " + d2);
-            ExLog.i(context, TAG, "Checkout, number of leaderbards deleted: " + d3);
+            ExLog.i(context, TAG, "Checkout, number of leaderboards deleted: " + d3);
             ExLog.i(context, TAG, "Checkout, number of checkinurls deleted: " + d4);
+            ExLog.i(context, TAG, "Checkout, number of marks deleted: " + d5);
         }
     }
 
@@ -204,33 +222,12 @@ public class DatabaseHelper {
      * @return success or failure
      * @throws GeneralDatabaseHelperException
      */
-    public void storeCheckinRow(Context context, EventInfo event, CompetitorInfo competitor,
+    public void storeCompetitorCheckinRow(Context context, EventInfo event, CompetitorInfo competitor,
             LeaderboardInfo leaderboard, CheckinUrlInfo checkinURL) throws GeneralDatabaseHelperException {
 
-        // inserting leaderboard first
-
-        ContentResolver cr = context.getContentResolver();
-
-        ContentValues clv = new ContentValues();
-        clv.put(Leaderboard.LEADERBOARD_NAME, leaderboard.name);
-        clv.put(Leaderboard.LEADERBOARD_CHECKIN_DIGEST, leaderboard.checkinDigest);
-        cr.insert(Leaderboard.CONTENT_URI, clv);
-
-        // now insert event
-
+        ContentResolver contentResolver = context.getContentResolver();
         ArrayList<ContentProviderOperation> opList = new ArrayList<>();
 
-        ContentValues cev = new ContentValues();
-        cev.put(Event.EVENT_ID, event.id);
-        cev.put(Event.EVENT_NAME, event.name);
-        cev.put(Event.EVENT_DATE_START, event.startMillis);
-        cev.put(Event.EVENT_DATE_END, event.endMillis);
-        cev.put(Event.EVENT_SERVER, event.server);
-        cev.put(Event.EVENT_IMAGE_URL, event.imageUrl);
-        cev.put(Event.EVENT_CHECKIN_DIGEST, event.checkinDigest);
-
-        opList.add(ContentProviderOperation.newInsert(Event.CONTENT_URI).withValues(cev).build());
-
         // competitor
 
         ContentValues ccv = new ContentValues();
@@ -243,6 +240,58 @@ public class DatabaseHelper {
         ccv.put(Competitor.COMPETITOR_CHECKIN_DIGEST, competitor.checkinDigest);
 
         opList.add(ContentProviderOperation.newInsert(Competitor.CONTENT_URI).withValues(ccv).build());
+        storeBasicInformation(leaderboard, event, checkinURL, opList, contentResolver);
+
+        try {
+            contentResolver.applyBatch(AnalyticsContract.CONTENT_AUTHORITY, opList);
+        } catch (RemoteException| OperationApplicationException e) {
+            throw new GeneralDatabaseHelperException(e.getMessage());
+        }
+    }
+
+    public void storeMarkCheckinRow(Context context, EventInfo event, Mark mark,
+        LeaderboardInfo leaderboard, CheckinUrlInfo checkinURL) throws GeneralDatabaseHelperException {
+
+        // Store Mark information
+        ContentResolver contentResolver = context.getContentResolver();
+        ArrayList<ContentProviderOperation> opList = new ArrayList<>();
+        ContentValues markValues = new ContentValues();
+        markValues.put(AnalyticsContract.Mark.MARK_ID, mark.getId().toString());
+        markValues.put(AnalyticsContract.Mark.MARK_NAME, mark.getName());
+        markValues.put(AnalyticsContract.Mark.MARK_CHECKIN_DIGEST, checkinURL.checkinDigest);
+        opList.add(ContentProviderOperation.newInsert(AnalyticsContract.Mark.CONTENT_URI).withValues(markValues).build());
+
+        storeBasicInformation(leaderboard, event, checkinURL, opList, contentResolver);
+
+        try {
+            contentResolver.applyBatch(AnalyticsContract.CONTENT_AUTHORITY, opList);
+        } catch (RemoteException| OperationApplicationException e) {
+            throw new GeneralDatabaseHelperException(e.getMessage());
+        }
+    }
+
+    private void storeBasicInformation(LeaderboardInfo leaderboard, EventInfo event, CheckinUrlInfo checkinURL,
+        ArrayList<ContentProviderOperation> opList, ContentResolver contentResolver) {
+
+        // inserting leaderboard first
+
+        ContentValues clv = new ContentValues();
+        clv.put(Leaderboard.LEADERBOARD_NAME, leaderboard.name);
+        clv.put(Leaderboard.LEADERBOARD_CHECKIN_DIGEST, leaderboard.checkinDigest);
+        contentResolver.insert(Leaderboard.CONTENT_URI, clv);
+
+        // now insert event
+
+        ContentValues cev = new ContentValues();
+        cev.put(Event.EVENT_ID, event.id);
+        cev.put(Event.EVENT_NAME, event.name);
+        cev.put(Event.EVENT_DATE_START, event.startMillis);
+        cev.put(Event.EVENT_DATE_END, event.endMillis);
+        cev.put(Event.EVENT_SERVER, event.server);
+        cev.put(Event.EVENT_IMAGE_URL, event.imageUrl);
+        cev.put(Event.EVENT_CHECKIN_DIGEST, event.checkinDigest);
+
+        opList.add(ContentProviderOperation.newInsert(Event.CONTENT_URI).withValues(cev).build());
 
         // checkin url
 
@@ -253,18 +302,8 @@ public class DatabaseHelper {
         ccuv.put(Checkin.CHECKIN_TYPE, checkinURL.type);
 
         opList.add(ContentProviderOperation.newInsert(Checkin.CONTENT_URI).withValues(ccuv).build());
-
-        try {
-            cr.applyBatch(AnalyticsContract.CONTENT_AUTHORITY, opList);
-        } catch (RemoteException e) {
-            throw new GeneralDatabaseHelperException(e.getMessage());
-        } catch (OperationApplicationException e) {
-            throw new GeneralDatabaseHelperException(e.getMessage());
-        }
     }
 
-    // TODO: Store mark
-
     /**
      * Return true if the combination of event, leaderboard and competitor does not exist in the DB. (based on the
      * digest of the checkin- url obtained from the QR-code.)
diff --git a/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/valueobjects/MarkInfo.java b/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/valueobjects/MarkInfo.java
new file mode 100644
index 00000000000..2bb3e5cbaa8
--- /dev/null
+++ b/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/valueobjects/MarkInfo.java
@@ -0,0 +1,8 @@
+package com.sap.sailing.android.tracking.app.valueobjects;
+
+public class MarkInfo {
+
+    public String markId;
+    public String markName;
+    public String checkinDigest;
+}

From b7f69d533018b0e1446c083e006fd22fb543d59e Mon Sep 17 00:00:00 2001
From: Bennet Brunsen <brunsen@ubilabs.net>
Date: Thu, 7 Jul 2016 14:07:03 +0200
Subject: [PATCH 80/92] Provide method to check if mark event leader
 combination is available

---
 .../app/provider/AnalyticsContract.java       |  5 ++++
 .../app/provider/AnalyticsDatabase.java       |  5 ++++
 .../app/provider/AnalyticsProvider.java       |  7 ++++++
 .../tracking/app/utils/DatabaseHelper.java    | 25 ++++++++++++++++++-
 4 files changed, 41 insertions(+), 1 deletion(-)

diff --git a/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/provider/AnalyticsContract.java b/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/provider/AnalyticsContract.java
index ea00c7c8b08..6a62fd66b22 100644
--- a/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/provider/AnalyticsContract.java
+++ b/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/provider/AnalyticsContract.java
@@ -62,6 +62,11 @@ public class AnalyticsContract {
                 .appendPath("event_leaderboard_competitor_joined").build();
     }
 
+    public static class EventLeaderboardMarkJoined {
+        public final static Uri CONTENT_URI = BASE_CONTENT_URI.buildUpon()
+            .appendPath("event_leaderboard_mark_joined").build();
+    }
+
     public static class Competitor implements CompetitorColumns, BaseColumns {
         public static final Uri CONTENT_URI = BASE_CONTENT_URI.buildUpon().appendPath(PATH_COMPETITOR).build();
 
diff --git a/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/provider/AnalyticsDatabase.java b/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/provider/AnalyticsDatabase.java
index 9658986c13e..608cf4c0b93 100644
--- a/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/provider/AnalyticsDatabase.java
+++ b/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/provider/AnalyticsDatabase.java
@@ -37,6 +37,11 @@ public class AnalyticsDatabase extends SQLiteOpenHelper {
         String LEADERBOARDS = "leaderboards";
         String CHECKIN_URIS = "checkin_uris";
         String MARKS = "marks";
+        String EVENTS_JOIN_LEADERBOARDS_JOIN_MARKS = Tables.LEADERBOARDS + " INNER JOIN " + Tables.EVENTS
+            + " ON (" + Tables.LEADERBOARDS + "." + Leaderboard.LEADERBOARD_CHECKIN_DIGEST + " = " + Tables.EVENTS
+            + "." + Event.EVENT_CHECKIN_DIGEST + ") " + " INNER JOIN " + Tables.COMPETITORS + " ON ("
+            + Tables.LEADERBOARDS + "." + Leaderboard.LEADERBOARD_CHECKIN_DIGEST + " = " + Tables.MARKS + "."
+            + AnalyticsContract.Mark.MARK_CHECKIN_DIGEST + ") ";
         String EVENTS_JOIN_LEADERBOARDS_JOIN_COMPETITORS = Tables.LEADERBOARDS + " INNER JOIN " + Tables.EVENTS
                 + " ON (" + Tables.LEADERBOARDS + "." + Leaderboard.LEADERBOARD_CHECKIN_DIGEST + " = " + Tables.EVENTS
                 + "." + Event.EVENT_CHECKIN_DIGEST + ") " + " INNER JOIN " + Tables.COMPETITORS + " ON ("
diff --git a/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/provider/AnalyticsProvider.java b/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/provider/AnalyticsProvider.java
index 6252a3742a5..244a88aca08 100644
--- a/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/provider/AnalyticsProvider.java
+++ b/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/provider/AnalyticsProvider.java
@@ -46,6 +46,7 @@ public class AnalyticsProvider extends ContentProvider {
     private static final int CHECKIN_URI_ID = 501;
 
     private static final int EVENT_LEADERBOARD_COMPETITOR_JOINED = 600;
+    private static final int EVENT_LEADERBOARD_MARK_JOINED = 601;
 
     private static final int EVENT_GPS_FIXES_JOINED = 700;
 
@@ -74,6 +75,7 @@ public class AnalyticsProvider extends ContentProvider {
         matcher.addURI(authority, "messages/#", MESSAGE_ID);
 
         matcher.addURI(authority, "event_leaderboard_competitor_joined", EVENT_LEADERBOARD_COMPETITOR_JOINED);
+        matcher.addURI(authority, "event_leaderboard_mark_joined", EVENT_LEADERBOARD_MARK_JOINED);
 
         matcher.addURI(authority, "event_gps_fix_joined", EVENT_GPS_FIXES_JOINED);
 
@@ -112,6 +114,11 @@ public class AnalyticsProvider extends ContentProvider {
 
         switch (sUriMatcher.match(uri)) {
 
+            case EVENT_LEADERBOARD_MARK_JOINED:
+                SQLiteQueryBuilder mqb = new SQLiteQueryBuilder();
+                mqb.setTables(Tables.EVENTS_JOIN_LEADERBOARDS_JOIN_MARKS);
+                cursor = mqb.query(db, projection, selection, selectionArgs, null, null, sortOrder);
+                return cursor;
             case EVENT_LEADERBOARD_COMPETITOR_JOINED:
                 SQLiteQueryBuilder qb = new SQLiteQueryBuilder();
                 qb.setTables(Tables.EVENTS_JOIN_LEADERBOARDS_JOIN_COMPETITORS);
diff --git a/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/utils/DatabaseHelper.java b/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/utils/DatabaseHelper.java
index e552b3afe0d..0a3bdda5c76 100644
--- a/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/utils/DatabaseHelper.java
+++ b/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/utils/DatabaseHelper.java
@@ -177,7 +177,7 @@ public class DatabaseHelper {
 
         return checkinUrlInfo;
     }
-    
+
     public MarkInfo getMarkInfo(Context context, String checkinDigest) {
         MarkInfo markInfo = new MarkInfo();
         markInfo.checkinDigest = checkinDigest;
@@ -327,6 +327,29 @@ public class DatabaseHelper {
         return count == 0;
     }
 
+    /**
+     * Return true if the combination of event, leaderboard and mark does not exist in the DB. (based on the
+     * digest of the checkin- url obtained from the QR-code.)
+     *
+     * @param checkinDigest
+     *            SHA-256 digest of QR-code string
+     * @return combination available or not
+     */
+    public boolean eventLeaderboardMarkCombinationAvailable(Context context, String checkinDigest) {
+        ContentResolver cr = context.getContentResolver();
+        String sel = AnalyticsDatabase.Tables.LEADERBOARDS + "." + Leaderboard.LEADERBOARD_CHECKIN_DIGEST + " = ? "
+            + "AND " + AnalyticsDatabase.Tables.MARKS + "." + AnalyticsContract.Mark.MARK_CHECKIN_DIGEST + " = ? "
+            + "AND " + AnalyticsDatabase.Tables.EVENTS + "." + Event.EVENT_CHECKIN_DIGEST + " = ?";
+        Cursor cursor = cr.query(AnalyticsContract.EventLeaderboardMarkJoined.CONTENT_URI, null, sel, new String[] { checkinDigest,
+            checkinDigest, checkinDigest }, null);
+        int count = 0;
+        if (cursor != null) {
+            count = cursor.getCount();
+            cursor.close();
+        }
+        return count == 0;
+    }
+
     public class GeneralDatabaseHelperException extends Exception {
         private static final long serialVersionUID = 4333494334720305541L;
 

From 43c0fc87186fd2979194301ac29eff0dde2d2adf Mon Sep 17 00:00:00 2001
From: Bennet Brunsen <brunsen@ubilabs.net>
Date: Thu, 7 Jul 2016 14:23:51 +0200
Subject: [PATCH 81/92] Store mark checkin data in database after checkin

---
 .../app/ui/fragments/HomeFragment.java        | 44 ++++++++++++++-----
 1 file changed, 34 insertions(+), 10 deletions(-)

diff --git a/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/fragments/HomeFragment.java b/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/fragments/HomeFragment.java
index e4b5f389b70..5d5eda65ef1 100644
--- a/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/fragments/HomeFragment.java
+++ b/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/fragments/HomeFragment.java
@@ -90,16 +90,19 @@ public class HomeFragment extends AbstractHomeFragment implements LoaderCallback
      * Perform a checkin request and launch RegattaAcitivity afterwards
      */
     private void checkInWithAPIAndDisplayTrackingActivity(CheckinData checkinData) {
+        if (checkinData instanceof CompetitorCheckinData) {
+            storeCompetitorCheckinData((CompetitorCheckinData) checkinData);
+        } else if (checkinData instanceof MarkCheckinData) {
+            storeMarkCheckinData((MarkCheckinData) checkinData);
+        }
+        performAPICheckin(checkinData);
+    }
+
+    private void storeCompetitorCheckinData(CompetitorCheckinData checkinData) {
         if (DatabaseHelper.getInstance().eventLeaderboardCompetitorCombinationAvailable(getActivity(), checkinData.checkinDigest)) {
             try {
-                if (checkinData instanceof CompetitorCheckinData) {
-                    CompetitorCheckinData competitorCheckinData = (CompetitorCheckinData) checkinData;
-                    DatabaseHelper.getInstance()
-                        .storeCompetitorCheckinRow(getActivity(), competitorCheckinData.getEvent(), competitorCheckinData.getCompetitor(),
-                            competitorCheckinData.getLeaderboard(), competitorCheckinData.getCheckinUrl());
-                } else if (checkinData instanceof MarkCheckinData) {
-                    // TODO: handle database for Mark
-                }
+                DatabaseHelper.getInstance().storeCompetitorCheckinRow(getActivity(), checkinData.getEvent(), checkinData.getCompetitor(), checkinData
+                    .getLeaderboard(), checkinData.getCheckinUrl());
                 adapter.notifyDataSetChanged();
             } catch (GeneralDatabaseHelperException e) {
                 ExLog.e(getActivity(), TAG, "Batch insert failed: " + e.getMessage());
@@ -114,7 +117,27 @@ public class HomeFragment extends AbstractHomeFragment implements LoaderCallback
             ExLog.w(getActivity(), TAG, "Combination of eventId, leaderboardName and competitorId already exists!");
             Toast.makeText(getActivity(), getString(R.string.info_already_checked_in_this_qr_code), Toast.LENGTH_LONG).show();
         }
-        performAPICheckin(checkinData);
+    }
+
+    private void storeMarkCheckinData(MarkCheckinData checkinData) {
+        if (DatabaseHelper.getInstance().eventLeaderboardMarkCombinationAvailable(getActivity(), checkinData.checkinDigest)) {
+            try {
+                DatabaseHelper.getInstance().storeMarkCheckinRow(getActivity(), checkinData.getEvent(), checkinData.getMark(), checkinData
+                    .getLeaderboard(), checkinData.getCheckinUrl());
+                adapter.notifyDataSetChanged();
+            } catch (GeneralDatabaseHelperException e) {
+                ExLog.e(getActivity(), TAG, "Batch insert failed: " + e.getMessage());
+                ((StartActivity) getActivity()).displayDatabaseError();
+                return;
+            }
+
+            if (BuildConfig.DEBUG) {
+                ExLog.i(getActivity(), TAG, "Batch-insert of checkinData completed.");
+            }
+        } else {
+            ExLog.w(getActivity(), TAG, "Combination of eventId, leaderboardName and markID already exists!");
+            Toast.makeText(getActivity(), getString(R.string.info_already_checked_in_this_qr_code), Toast.LENGTH_LONG).show();
+        }
     }
 
     /**
@@ -136,7 +159,8 @@ public class HomeFragment extends AbstractHomeFragment implements LoaderCallback
             } else if (checkinData instanceof MarkCheckinData) {
                 MarkCheckinData markCheckinData = (MarkCheckinData) checkinData;
                 requestObject = CheckinHelper
-                    .getMarkCheckinJson(markCheckinData.getMark().getId().toString(), markCheckinData.deviceUid, "TODO push device ID!!", date.getTime());
+                    .getMarkCheckinJson(markCheckinData.getMark().getId().toString(), markCheckinData.deviceUid, "TODO push device ID!!", date
+                        .getTime());
             }
             HttpJsonPostRequest request = new HttpJsonPostRequest(getActivity(), new URL(checkinData.checkinURL), requestObject.toString());
             NetworkHelper.getInstance(getActivity())

From 946d422b6fd72768e7f26cad6f6577174ca4198d Mon Sep 17 00:00:00 2001
From: Bennet Brunsen <brunsen@ubilabs.net>
Date: Thu, 7 Jul 2016 15:01:05 +0200
Subject: [PATCH 82/92] Fix database issues

---
 .../tracking/app/provider/AnalyticsContract.java     | 10 +++++-----
 .../tracking/app/provider/AnalyticsDatabase.java     | 12 +++++++-----
 .../tracking/app/ui/fragments/HomeFragment.java      |  5 +++--
 3 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/provider/AnalyticsContract.java b/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/provider/AnalyticsContract.java
index 6a62fd66b22..fb9cc9a129f 100644
--- a/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/provider/AnalyticsContract.java
+++ b/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/provider/AnalyticsContract.java
@@ -31,9 +31,9 @@ public class AnalyticsContract {
     }
 
     interface markColums {
-        String MARK_ID = "Mark.id";
-        String MARK_NAME = "Mark.name";
-        String MARK_CHECKIN_DIGEST = "Mark.checkin_digest";
+        String MARK_ID = "mark_id";
+        String MARK_NAME = "mark_name";
+        String MARK_CHECKIN_DIGEST = "mark_checkin_digest";
     }
 
     interface CheckinColumns {
@@ -49,7 +49,7 @@ public class AnalyticsContract {
     private static final String PATH_COMPETITOR = "competitors";
     public static final String PATH_EVENT = "events";
     public static final String PATH_LEADERBOARD = "leaderboards";
-    private static final String PATH_CHECKIN_URI = "checkin_uris";
+    public static final String PATH_CHECKIN = "checkin_uris";
     private static final String PATH_MARK = "marks";
 
     public static class LeaderboardsEventsJoined {
@@ -130,7 +130,7 @@ public class AnalyticsContract {
     }
 
     public static class Checkin implements CheckinColumns, BaseColumns {
-        public static final Uri CONTENT_URI = BASE_CONTENT_URI.buildUpon().appendPath(PATH_CHECKIN_URI).build();
+        public static final Uri CONTENT_URI = BASE_CONTENT_URI.buildUpon().appendPath(PATH_CHECKIN).build();
 
         public static final String CONTENT_TYPE = ContentResolver.CURSOR_DIR_BASE_TYPE
                 + "/vnd.sap_sailing_analytics.uri";
diff --git a/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/provider/AnalyticsDatabase.java b/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/provider/AnalyticsDatabase.java
index 608cf4c0b93..dd22187ecbf 100644
--- a/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/provider/AnalyticsDatabase.java
+++ b/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/provider/AnalyticsDatabase.java
@@ -23,7 +23,7 @@ public class AnalyticsDatabase extends SQLiteOpenHelper {
     private static final int VER_2016_RELEASE_1 = 2;
     private static final int CUR_DATABASE_VERSION = VER_2016_RELEASE_1;
 
-    private static final String createMarkTable = "CREATE TABLE " + Tables.MARKS + " (" +BaseColumns._ID
+    private static final String createMarkTable = "CREATE TABLE " + Tables.MARKS + " (" + BaseColumns._ID
         + " INTEGER PRIMARY KEY AUTOINCREMENT, " + AnalyticsContract.Mark.MARK_ID + " TEXT, "
         + AnalyticsContract.Mark.MARK_NAME + " TEXT, "
         + AnalyticsContract.Mark.MARK_CHECKIN_DIGEST + " TEXT );" ;
@@ -48,9 +48,11 @@ public class AnalyticsDatabase extends SQLiteOpenHelper {
                 + Tables.LEADERBOARDS + "." + Leaderboard.LEADERBOARD_CHECKIN_DIGEST + " = " + Tables.COMPETITORS + "."
                 + Competitor.COMPETITOR_CHECKIN_DIGEST + ") ";
 
-        String LEADERBOARDS_JOIN_EVENTS = "events LEFT JOIN leaderboards ON " + Tables.EVENTS + "."
-                + Event.EVENT_CHECKIN_DIGEST + " = " + Tables.LEADERBOARDS + "."
-                + Leaderboard.LEADERBOARD_CHECKIN_DIGEST;
+        String LEADERBOARDS_JOIN_EVENTS = Tables.LEADERBOARDS + " INNER JOIN " + Tables.EVENTS
+            + " ON (" + Tables.LEADERBOARDS + "." + Leaderboard.LEADERBOARD_CHECKIN_DIGEST + " = " + Tables.EVENTS
+            + "." + Event.EVENT_CHECKIN_DIGEST + ") " + " INNER JOIN " + Tables.CHECKIN_URIS + " ON ("
+            + Tables.LEADERBOARDS + "." + Leaderboard.LEADERBOARD_CHECKIN_DIGEST + " = " + Tables.CHECKIN_URIS + "."
+            + AnalyticsContract.Checkin.CHECKIN_URI_CHECKIN_DIGEST + ") ";
     }
 
     public AnalyticsDatabase(Context context) {
@@ -90,7 +92,7 @@ public class AnalyticsDatabase extends SQLiteOpenHelper {
         ExLog.i(mContext, TAG, "onUpgrade() from " + oldVersion + " to " + newVersion);
         if (oldVersion == 1 && newVersion == 2) {
             db.execSQL(createMarkTable);
-            db.execSQL("ALTER TABLE " + Tables.CHECKIN_URIS + "ADD COLUMN " + AnalyticsContract.Checkin.CHECKIN_TYPE + " INTEGER DEFAULT 0");
+            db.execSQL("ALTER TABLE " + Tables.CHECKIN_URIS + " ADD COLUMN " + AnalyticsContract.Checkin.CHECKIN_TYPE + " INTEGER DEFAULT 0");
         }
     }
 
diff --git a/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/fragments/HomeFragment.java b/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/fragments/HomeFragment.java
index 5d5eda65ef1..37aa808117b 100644
--- a/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/fragments/HomeFragment.java
+++ b/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/fragments/HomeFragment.java
@@ -235,8 +235,9 @@ public class HomeFragment extends AbstractHomeFragment implements LoaderCallback
                     AnalyticsContract.PATH_EVENT + "." + AnalyticsContract.Event._ID,
                     AnalyticsContract.PATH_EVENT + "." + AnalyticsContract.Event.EVENT_NAME,
                     AnalyticsContract.PATH_EVENT + "." + AnalyticsContract.Event.EVENT_SERVER,
-                    AnalyticsContract.PATH_LEADERBOARD + "." + AnalyticsContract.Leaderboard.LEADERBOARD_NAME };
-                return new CursorLoader(getActivity(), AnalyticsContract.EventLeaderboardCompetitorJoined.CONTENT_URI, projection, null, null, null);
+                    AnalyticsContract.PATH_LEADERBOARD + "." + AnalyticsContract.Leaderboard.LEADERBOARD_NAME,
+                    AnalyticsContract.PATH_CHECKIN + "." + AnalyticsContract.Checkin.CHECKIN_TYPE};
+                return new CursorLoader(getActivity(), AnalyticsContract.LeaderboardsEventsJoined.CONTENT_URI, projection, null, null, null);
 
             default:
                 return null;

From 4a2661cbf074e6aeaacb850bd24fcd977e2e3ade Mon Sep 17 00:00:00 2001
From: Bennet Brunsen <brunsen@ubilabs.net>
Date: Thu, 7 Jul 2016 15:07:55 +0200
Subject: [PATCH 83/92] Provide update operation for mark

---
 .../tracking/app/ui/activities/StartActivity.java     | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/activities/StartActivity.java b/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/activities/StartActivity.java
index 1ca8ec6952d..99ae1ea2b1c 100644
--- a/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/activities/StartActivity.java
+++ b/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/activities/StartActivity.java
@@ -21,6 +21,7 @@ import com.sap.sailing.android.tracking.app.utils.CheckinManager;
 import com.sap.sailing.android.tracking.app.utils.DatabaseHelper;
 import com.sap.sailing.android.tracking.app.valueobjects.CheckinData;
 import com.sap.sailing.android.tracking.app.valueobjects.CompetitorCheckinData;
+import com.sap.sailing.android.tracking.app.valueobjects.MarkCheckinData;
 import com.sap.sailing.android.ui.fragments.AbstractHomeFragment;
 
 public class StartActivity extends AbstractStartActivity {
@@ -125,6 +126,16 @@ public class StartActivity extends AbstractStartActivity {
                     ExLog.e(this, TAG, "Batch insert failed: " + e.getMessage());
                     displayDatabaseError();
                 }
+            } else if (checkinData instanceof MarkCheckinData) {
+                MarkCheckinData markCheckinData = (MarkCheckinData) checkinData;
+                try {
+                    DatabaseHelper.getInstance().deleteRegattaFromDatabase(this, checkinData.getCheckinUrl().checkinDigest);
+                    DatabaseHelper.getInstance()
+                        .storeMarkCheckinRow(this, checkinData.getEvent(), markCheckinData.getMark(), checkinData.getLeaderboard(), checkinData.getCheckinUrl());
+                } catch (DatabaseHelper.GeneralDatabaseHelperException e) {
+                    ExLog.e(this, TAG, "Batch insert failed: " + e.getMessage());
+                    displayDatabaseError();
+                }
             }
         }
     }

From 256d5208354b58e85d0d2f41741d3d135ca16c78 Mon Sep 17 00:00:00 2001
From: Bennet Brunsen <brunsen@ubilabs.net>
Date: Thu, 7 Jul 2016 15:30:41 +0200
Subject: [PATCH 84/92] Checkout from list in start activity

---
 .../app/ui/fragments/HomeFragment.java        | 45 ++++++++++++++++---
 .../tracking/app/utils/CheckoutHelper.java    | 30 +++++++++++++
 2 files changed, 70 insertions(+), 5 deletions(-)

diff --git a/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/fragments/HomeFragment.java b/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/fragments/HomeFragment.java
index 37aa808117b..81475280387 100644
--- a/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/fragments/HomeFragment.java
+++ b/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/fragments/HomeFragment.java
@@ -27,6 +27,8 @@ import android.widget.ListView;
 import android.widget.Toast;
 
 import com.sap.sailing.android.shared.data.BaseCheckinData;
+import com.sap.sailing.android.shared.data.CheckinUrlInfo;
+import com.sap.sailing.android.shared.data.LeaderboardInfo;
 import com.sap.sailing.android.shared.data.http.HttpJsonPostRequest;
 import com.sap.sailing.android.shared.logging.ExLog;
 import com.sap.sailing.android.shared.util.NetworkHelper;
@@ -42,11 +44,15 @@ import com.sap.sailing.android.tracking.app.ui.activities.StartActivity;
 import com.sap.sailing.android.tracking.app.utils.AppPreferences;
 import com.sap.sailing.android.tracking.app.utils.CheckinHelper;
 import com.sap.sailing.android.tracking.app.utils.CheckinManager;
+import com.sap.sailing.android.tracking.app.utils.CheckoutHelper;
 import com.sap.sailing.android.tracking.app.utils.DatabaseHelper;
 import com.sap.sailing.android.tracking.app.utils.DatabaseHelper.GeneralDatabaseHelperException;
 import com.sap.sailing.android.tracking.app.valueobjects.CheckinData;
 import com.sap.sailing.android.tracking.app.valueobjects.CompetitorCheckinData;
+import com.sap.sailing.android.tracking.app.valueobjects.CompetitorInfo;
+import com.sap.sailing.android.tracking.app.valueobjects.EventInfo;
 import com.sap.sailing.android.tracking.app.valueobjects.MarkCheckinData;
+import com.sap.sailing.android.tracking.app.valueobjects.MarkInfo;
 import com.sap.sailing.android.ui.fragments.AbstractHomeFragment;
 
 public class HomeFragment extends AbstractHomeFragment implements LoaderCallbacks<Cursor> {
@@ -272,6 +278,7 @@ public class HomeFragment extends AbstractHomeFragment implements LoaderCallback
         // -1, because there's a header row
         Cursor cursor = (Cursor) adapter.getItem(position - 1);
         final String checkinDigest = cursor.getString(cursor.getColumnIndex(AnalyticsContract.Event.EVENT_CHECKIN_DIGEST));
+        final int type = cursor.getInt(cursor.getColumnIndex(AnalyticsContract.Checkin.CHECKIN_TYPE));
         DatabaseHelper.getInstance().getEventInfo(getActivity(), checkinDigest);
         AlertDialog.Builder builder = new AlertDialog.Builder(getActivity(), R.style.Base_Theme_AppCompat_Dialog_Alert);
         builder.setMessage(getString(R.string.confirm_delete_checkin));
@@ -280,7 +287,7 @@ public class HomeFragment extends AbstractHomeFragment implements LoaderCallback
         builder.setPositiveButton(getString(R.string.yes), new DialogInterface.OnClickListener() {
             @Override
             public void onClick(DialogInterface dialog, int which) {
-                deleteRegatta(checkinDigest);
+                deleteRegatta(checkinDigest, type);
             }
         });
         builder.show();
@@ -288,10 +295,38 @@ public class HomeFragment extends AbstractHomeFragment implements LoaderCallback
         return true;
     }
 
-    private void deleteRegatta(String checkinDigest) {
-        DatabaseHelper.getInstance().deleteRegattaFromDatabase(getActivity(), checkinDigest);
-        adapter.swapCursor(null);
-        adapter.notifyDataSetInvalidated();
+    private void deleteRegatta(final String checkinDigest, final int type) {
+        NetworkHelperSuccessListener successListener = new NetworkHelperSuccessListener() {
+            @Override
+            public void performAction(JSONObject response) {
+                StartActivity startActivity = (StartActivity) getActivity();
+                startActivity.dismissProgressDialog();
+                DatabaseHelper.getInstance().deleteRegattaFromDatabase(getActivity(), checkinDigest);
+                adapter.swapCursor(null);
+                adapter.notifyDataSetInvalidated();
+            }
+        };
+        NetworkHelperFailureListener failureListener = new NetworkHelperFailureListener() {
+            @Override
+            public void performAction(NetworkHelperError e) {
+                StartActivity startActivity = (StartActivity) getActivity();
+                startActivity.dismissProgressDialog();
+                startActivity.showErrorPopup(R.string.error,
+                    R.string.error_could_not_complete_operation_on_server_try_again);
+            }
+        };
+        CheckoutHelper checkoutHelper = new CheckoutHelper();
+        LeaderboardInfo leaderboardInfo = DatabaseHelper.getInstance().getLeaderboard(getActivity(), checkinDigest);
+        EventInfo eventInfo = DatabaseHelper.getInstance().getEventInfo(getActivity(), checkinDigest);
+        if (type == CheckinUrlInfo.TYPE_COMPETITOR) {
+            CompetitorInfo competitorInfo = DatabaseHelper.getInstance().getCompetitor(getActivity(), checkinDigest);
+            checkoutHelper.checkoutCompetitor((StartActivity) getActivity(), leaderboardInfo.name, eventInfo.server, competitorInfo.id,
+                successListener, failureListener);
+        } else if (type == CheckinUrlInfo.TYPE_MARK) {
+            MarkInfo markInfo = DatabaseHelper.getInstance().getMarkInfo(getActivity(), checkinDigest);
+            checkoutHelper.checkoutMark((StartActivity) getActivity(), leaderboardInfo.name, eventInfo.server, markInfo.markId,
+                successListener, failureListener);
+        }
     }
 
     private class ItemClickListener implements OnItemClickListener {
diff --git a/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/utils/CheckoutHelper.java b/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/utils/CheckoutHelper.java
index e16dfe613d0..068b9491e0c 100644
--- a/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/utils/CheckoutHelper.java
+++ b/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/utils/CheckoutHelper.java
@@ -48,4 +48,34 @@ public class CheckoutHelper {
             ExLog.w(activity, TAG, "Error, can't check out, MalformedURLException: " + e.getMessage());
         }
     }
+
+    public void checkoutMark(AbstractBaseActivity activity, String leaderboardName, String eventServer, String markId,
+        NetworkHelper.NetworkHelperSuccessListener successListener, NetworkHelper.NetworkHelperFailureListener failureListener) {
+        AppPreferences prefs = new AppPreferences(activity);
+        final String checkoutURLStr = eventServer
+            + prefs.getServerCheckoutPath().replace("{leaderboard-name}", Uri.encode(leaderboardName));
+
+        activity.showProgressDialog(R.string.please_wait, R.string.checking_out);
+
+        JSONObject checkoutData = new JSONObject();
+        try {
+            checkoutData.put(DeviceMappingConstants.JSON_MARK_ID_AS_STRING, markId);
+            checkoutData.put(DeviceMappingConstants.JSON_DEVICE_UUID, UniqueDeviceUuid.getUniqueId(activity));
+            checkoutData.put(DeviceMappingConstants.JSON_TO_MILLIS, System.currentTimeMillis());
+        } catch (JSONException e) {
+            activity.dismissProgressDialog();
+            activity.showErrorPopup(R.string.error, R.string.error_could_not_complete_operation_on_server_try_again);
+            ExLog.e(activity, TAG, "Error populating checkout-data: " + e.getMessage());
+            return;
+        }
+
+        try {
+            HttpJsonPostRequest request = new HttpJsonPostRequest(activity, new URL(checkoutURLStr), checkoutData.toString());
+            com.sap.sailing.android.shared.util.NetworkHelper.getInstance(activity).executeHttpJsonRequestAsync(request,
+                successListener, failureListener);
+
+        } catch (MalformedURLException e) {
+            ExLog.w(activity, TAG, "Error, can't check out, MalformedURLException: " + e.getMessage());
+        }
+    }
 }

From 38c69d751a36cb77b847a12af659b7f36b737abf Mon Sep 17 00:00:00 2001
From: Bennet Brunsen <brunsen@ubilabs.net>
Date: Thu, 7 Jul 2016 15:33:07 +0200
Subject: [PATCH 85/92] Catch null pointer exception in checkin

---
 .../sailing/android/tracking/app/ui/fragments/HomeFragment.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/fragments/HomeFragment.java b/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/fragments/HomeFragment.java
index 81475280387..956d4ec284b 100644
--- a/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/fragments/HomeFragment.java
+++ b/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/fragments/HomeFragment.java
@@ -171,7 +171,7 @@ public class HomeFragment extends AbstractHomeFragment implements LoaderCallback
             HttpJsonPostRequest request = new HttpJsonPostRequest(getActivity(), new URL(checkinData.checkinURL), requestObject.toString());
             NetworkHelper.getInstance(getActivity())
                 .executeHttpJsonRequestAsync(request, new CheckinListener(checkinData.checkinDigest), new CheckinErrorListener(checkinData.checkinDigest));
-        } catch (JSONException e) {
+        } catch (JSONException|NullPointerException e) {
             ExLog.e(getActivity(), TAG, "Failed to generate checkin JSON: " + e.getMessage());
             displayAPIErrorRecommendRetry();
         } catch (MalformedURLException e) {

From f5f66a61cdf2bc9ec902b878c3ddcb26686b414d Mon Sep 17 00:00:00 2001
From: Bennet Brunsen <brunsen@ubilabs.net>
Date: Thu, 7 Jul 2016 17:01:50 +0200
Subject: [PATCH 86/92] Basic buoy activity

---
 .../AndroidManifest.xml                       |   7 +
 .../res/layout/fragment_buoy.xml              |  27 ++++
 .../res/menu/buoy_menu.xml                    |  20 +++
 .../app/provider/AnalyticsDatabase.java       |   2 +-
 .../app/ui/activities/BuoyActivity.java       | 153 ++++++++++++++++++
 .../app/ui/fragments/BuoyFragment.java        |  33 ++++
 .../app/ui/fragments/HomeFragment.java        |  22 ++-
 .../tracking/app/utils/AppPreferences.java    |   2 +-
 8 files changed, 257 insertions(+), 9 deletions(-)
 create mode 100644 mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_buoy.xml
 create mode 100644 mobile/com.sap.sailing.android.tracking.app/res/menu/buoy_menu.xml
 create mode 100644 mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/activities/BuoyActivity.java
 create mode 100644 mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/fragments/BuoyFragment.java

diff --git a/mobile/com.sap.sailing.android.tracking.app/AndroidManifest.xml b/mobile/com.sap.sailing.android.tracking.app/AndroidManifest.xml
index 22905108ea0..7d3bec6dfd3 100644
--- a/mobile/com.sap.sailing.android.tracking.app/AndroidManifest.xml
+++ b/mobile/com.sap.sailing.android.tracking.app/AndroidManifest.xml
@@ -77,6 +77,13 @@
                 android:name="android.support.PARENT_ACTIVITY"
                 android:value=".ui.activities.StartActivity"/>
         </activity>
+        <activity
+            android:name=".ui.activities.BuoyActivity"
+            android:screenOrientation="portrait">
+            <meta-data
+                android:name="android.support.PARENT_ACTIVITY"
+                android:value=".ui.activities.StartActivity"/>
+        </activity>
         <activity
             android:name=".ui.activities.TrackingActivity"
             android:label="@string/title_activity_tracking"
diff --git a/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_buoy.xml b/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_buoy.xml
new file mode 100644
index 00000000000..05887b6d3f9
--- /dev/null
+++ b/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_buoy.xml
@@ -0,0 +1,27 @@
+<?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:background="@drawable/fiori_main_background">
+
+    <TextView
+        android:id="@+id/buoy_Name"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerInParent="true"
+        android:textSize="@dimen/tracking_button_text_size"/>
+
+    <Button
+        android:id="@+id/start_tracking"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/tracking_button_height"
+        android:layout_alignParentBottom="true"
+        android:layout_marginBottom="@dimen/regatta_button_margin"
+        android:layout_marginLeft="@dimen/fragment_side_margin"
+        android:layout_marginRight="@dimen/fragment_side_margin"
+        android:background="@drawable/start_tracking_button"
+        android:padding="@dimen/regatta_button_padding"
+        android:text="@string/start_tracking"
+        android:textSize="@dimen/tracking_button_text_size"/>
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/mobile/com.sap.sailing.android.tracking.app/res/menu/buoy_menu.xml b/mobile/com.sap.sailing.android.tracking.app/res/menu/buoy_menu.xml
new file mode 100644
index 00000000000..a374cc3c836
--- /dev/null
+++ b/mobile/com.sap.sailing.android.tracking.app/res/menu/buoy_menu.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+      xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <item
+        android:id="@+id/options_menu_settings"
+        android:icon="@drawable/settings_grey"
+        android:title="@string/options_menu_settings"
+        app:showAsAction=""/>
+
+    <item
+        android:id="@+id/options_menu_checkout"
+        android:icon="@drawable/ic_menu_info_details"
+        android:title="@string/options_menu_checkout"
+        app:showAsAction=""/>
+
+    <item
+        android:id="@+id/options_menu_info"
+        android:title="@string/about"/>
+</menu>
\ No newline at end of file
diff --git a/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/provider/AnalyticsDatabase.java b/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/provider/AnalyticsDatabase.java
index dd22187ecbf..780515d5327 100644
--- a/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/provider/AnalyticsDatabase.java
+++ b/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/provider/AnalyticsDatabase.java
@@ -39,7 +39,7 @@ public class AnalyticsDatabase extends SQLiteOpenHelper {
         String MARKS = "marks";
         String EVENTS_JOIN_LEADERBOARDS_JOIN_MARKS = Tables.LEADERBOARDS + " INNER JOIN " + Tables.EVENTS
             + " ON (" + Tables.LEADERBOARDS + "." + Leaderboard.LEADERBOARD_CHECKIN_DIGEST + " = " + Tables.EVENTS
-            + "." + Event.EVENT_CHECKIN_DIGEST + ") " + " INNER JOIN " + Tables.COMPETITORS + " ON ("
+            + "." + Event.EVENT_CHECKIN_DIGEST + ") " + " INNER JOIN " + Tables.MARKS + " ON ("
             + Tables.LEADERBOARDS + "." + Leaderboard.LEADERBOARD_CHECKIN_DIGEST + " = " + Tables.MARKS + "."
             + AnalyticsContract.Mark.MARK_CHECKIN_DIGEST + ") ";
         String EVENTS_JOIN_LEADERBOARDS_JOIN_COMPETITORS = Tables.LEADERBOARDS + " INNER JOIN " + Tables.EVENTS
diff --git a/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/activities/BuoyActivity.java b/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/activities/BuoyActivity.java
new file mode 100644
index 00000000000..a8fec2c1dd5
--- /dev/null
+++ b/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/activities/BuoyActivity.java
@@ -0,0 +1,153 @@
+package com.sap.sailing.android.tracking.app.ui.activities;
+
+import org.json.JSONObject;
+
+import android.app.AlertDialog;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.graphics.drawable.ColorDrawable;
+import android.os.Bundle;
+import android.support.v7.widget.Toolbar;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
+
+import com.sap.sailing.android.shared.data.CheckinUrlInfo;
+import com.sap.sailing.android.shared.data.LeaderboardInfo;
+import com.sap.sailing.android.shared.logging.ExLog;
+import com.sap.sailing.android.shared.ui.activities.AbstractBaseActivity;
+import com.sap.sailing.android.shared.util.NetworkHelper;
+import com.sap.sailing.android.tracking.app.R;
+import com.sap.sailing.android.tracking.app.ui.fragments.BuoyFragment;
+import com.sap.sailing.android.tracking.app.utils.AboutHelper;
+import com.sap.sailing.android.tracking.app.utils.AppPreferences;
+import com.sap.sailing.android.tracking.app.utils.CheckoutHelper;
+import com.sap.sailing.android.tracking.app.utils.DatabaseHelper;
+import com.sap.sailing.android.tracking.app.valueobjects.EventInfo;
+import com.sap.sailing.android.tracking.app.valueobjects.MarkInfo;
+
+public class BuoyActivity extends AbstractBaseActivity {
+
+    private static String TAG = BuoyActivity.class.getName();
+
+    public EventInfo event;
+    public MarkInfo mark;
+    public LeaderboardInfo leaderboard;
+    public CheckinUrlInfo checkinUrl;
+    private String checkinDigest;
+
+    private AppPreferences prefs;
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        Intent intent = getIntent();
+        checkinDigest = intent.getStringExtra(getString(R.string.checkin_digest));
+
+        prefs = new AppPreferences(this);
+        checkinUrl = DatabaseHelper.getInstance().getCheckinUrl(this, checkinDigest);
+        mark = DatabaseHelper.getInstance().getMarkInfo(this, checkinDigest);
+        event = DatabaseHelper.getInstance().getEventInfo(this, checkinDigest);
+        leaderboard = DatabaseHelper.getInstance().getLeaderboard(this, checkinDigest);
+
+        setContentView(R.layout.fragment_container);
+        Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
+        if (toolbar != null) {
+            setSupportActionBar(toolbar);
+        }
+        if (getSupportActionBar() != null) {
+            getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+            getSupportActionBar().setHomeButtonEnabled(true);
+            toolbar.setNavigationIcon(R.drawable.sap_logo_64dp);
+            int sidePadding = (int) getResources().getDimension(R.dimen.toolbar_left_padding);
+            toolbar.setPadding(sidePadding, 0, 0, 0);
+            getSupportActionBar().setTitle(leaderboard.name);
+            getSupportActionBar().setSubtitle(event.name);
+            ColorDrawable backgroundDrawable = new ColorDrawable(getResources().getColor(R.color.toolbar_background));
+            getSupportActionBar().setBackgroundDrawable(backgroundDrawable);
+        }
+        replaceFragment(R.id.content_frame, BuoyFragment.newInstance(mark.markName));
+    }
+
+    @Override
+    public void onStart() {
+        super.onStart();
+        if (prefs != null && prefs.getTrackerIsTracking()) {
+            String checkinDigest = prefs.getTrackerIsTrackingCheckinDigest();
+            startTrackingActivity(checkinDigest);
+        }
+    }
+
+    @Override
+    protected int getOptionsMenuResId() {
+        return 0;
+    }
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        MenuInflater inflater = getMenuInflater();
+        inflater.inflate(R.menu.buoy_menu, menu);
+        return true;
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        switch (item.getItemId()) {
+            case R.id.options_menu_settings:
+                ExLog.i(this, TAG, "Clicked SETTINGS.");
+                startActivity(new Intent(this, SettingsActivity.class));
+                return true;
+            case R.id.options_menu_checkout:
+                ExLog.i(this, TAG, "Clicked CHECKOUT.");
+                displayCheckoutConfirmationDialog();
+                return true;
+            case R.id.options_menu_info:
+                AboutHelper.showInfoActivity(this);
+                return true;
+            default:
+                return super.onOptionsItemSelected(item);
+        }
+    }
+
+    public void startTrackingActivity(String checkinDigest) {
+        Intent intent = new Intent(this, TrackingActivity.class);
+        intent.putExtra(getString(R.string.tracking_activity_checkin_digest_parameter), checkinDigest);
+        startActivity(intent);
+    }
+
+    private void displayCheckoutConfirmationDialog() {
+        AlertDialog.Builder builder = new AlertDialog.Builder(this);
+        builder.setTitle(R.string.warning);
+        builder.setMessage(R.string.checkout_warning_message);
+        builder.setPositiveButton(R.string.yes, new DialogInterface.OnClickListener() {
+            @Override
+            public void onClick(DialogInterface dialog, int which) {
+                checkout();
+            }
+        });
+        builder.setNegativeButton(R.string.no, null);
+        builder.show();
+    }
+
+    /**
+     * Check out from regatta;
+     */
+    public void checkout() {
+        CheckoutHelper checkoutHelper = new CheckoutHelper();
+        checkoutHelper.checkoutMark(this, leaderboard.name, event.server, mark.markId, new NetworkHelper.NetworkHelperSuccessListener() {
+            @Override
+            public void performAction(JSONObject response) {
+                DatabaseHelper.getInstance().deleteRegattaFromDatabase(BuoyActivity.this, event.checkinDigest);
+                dismissProgressDialog();
+                finish();
+            }
+        }, new NetworkHelper.NetworkHelperFailureListener() {
+            @Override
+            public void performAction(NetworkHelper.NetworkHelperError e) {
+                dismissProgressDialog();
+                showErrorPopup(R.string.error,
+                    R.string.error_could_not_complete_operation_on_server_try_again);
+            }
+        });
+    }
+}
diff --git a/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/fragments/BuoyFragment.java b/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/fragments/BuoyFragment.java
new file mode 100644
index 00000000000..7975203e321
--- /dev/null
+++ b/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/fragments/BuoyFragment.java
@@ -0,0 +1,33 @@
+package com.sap.sailing.android.tracking.app.ui.fragments;
+
+import android.annotation.SuppressLint;
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.TextView;
+
+import com.sap.sailing.android.shared.util.ViewHelper;
+import com.sap.sailing.android.tracking.app.R;
+
+public class BuoyFragment extends BaseFragment {
+
+    private static String EXTRA_MARK_NAME = "mark_name";
+
+    public static BuoyFragment newInstance(String markName) {
+        BuoyFragment fragment = new BuoyFragment();
+        Bundle args = new Bundle();
+        args.putString(EXTRA_MARK_NAME, markName);
+        fragment.setArguments(args);
+        return fragment;
+    }
+
+    @SuppressLint("InflateParams")
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+        View view = inflater.inflate(R.layout.fragment_buoy, container, false);
+        TextView markNameText = ViewHelper.get(view, R.id.buoy_Name);
+        markNameText.setText(getArguments().getString(EXTRA_MARK_NAME));
+        return view;
+    }
+}
diff --git a/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/fragments/HomeFragment.java b/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/fragments/HomeFragment.java
index 956d4ec284b..d5cfb662be9 100644
--- a/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/fragments/HomeFragment.java
+++ b/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/fragments/HomeFragment.java
@@ -39,6 +39,7 @@ import com.sap.sailing.android.tracking.app.BuildConfig;
 import com.sap.sailing.android.tracking.app.R;
 import com.sap.sailing.android.tracking.app.adapter.RegattaAdapter;
 import com.sap.sailing.android.tracking.app.provider.AnalyticsContract;
+import com.sap.sailing.android.tracking.app.ui.activities.BuoyActivity;
 import com.sap.sailing.android.tracking.app.ui.activities.RegattaActivity;
 import com.sap.sailing.android.tracking.app.ui.activities.StartActivity;
 import com.sap.sailing.android.tracking.app.utils.AppPreferences;
@@ -170,7 +171,7 @@ public class HomeFragment extends AbstractHomeFragment implements LoaderCallback
             }
             HttpJsonPostRequest request = new HttpJsonPostRequest(getActivity(), new URL(checkinData.checkinURL), requestObject.toString());
             NetworkHelper.getInstance(getActivity())
-                .executeHttpJsonRequestAsync(request, new CheckinListener(checkinData.checkinDigest), new CheckinErrorListener(checkinData.checkinDigest));
+                .executeHttpJsonRequestAsync(request, new CheckinListener(checkinData.checkinDigest, checkinData.getCheckinType()), new CheckinErrorListener(checkinData.checkinDigest));
         } catch (JSONException|NullPointerException e) {
             ExLog.e(getActivity(), TAG, "Failed to generate checkin JSON: " + e.getMessage());
             displayAPIErrorRecommendRetry();
@@ -227,8 +228,13 @@ public class HomeFragment extends AbstractHomeFragment implements LoaderCallback
      *
      * @param checkinDigest
      */
-    private void startRegatta(String checkinDigest) {
-        Intent intent = new Intent(getActivity(), RegattaActivity.class);
+    private void startRegatta(String checkinDigest, int type) {
+        Intent intent = new Intent();
+        if (type == CheckinUrlInfo.TYPE_COMPETITOR) {
+            intent.setClass(getActivity(), RegattaActivity.class);
+        } else if (type == CheckinUrlInfo.TYPE_MARK) {
+            intent.setClass(getActivity(), BuoyActivity.class);
+        }
         intent.putExtra(getString(R.string.checkin_digest), checkinDigest);
         getActivity().startActivity(intent);
     }
@@ -343,7 +349,8 @@ public class HomeFragment extends AbstractHomeFragment implements LoaderCallback
             Cursor cursor = (Cursor) adapter.getItem(position - 1);
 
             String checkinDigest = cursor.getString(cursor.getColumnIndex(AnalyticsContract.Event.EVENT_CHECKIN_DIGEST));
-            startRegatta(checkinDigest);
+            int type = cursor.getInt(cursor.getColumnIndex(AnalyticsContract.Checkin.CHECKIN_TYPE));
+            startRegatta(checkinDigest, type);
         }
     }
 
@@ -363,17 +370,18 @@ public class HomeFragment extends AbstractHomeFragment implements LoaderCallback
     private class CheckinListener implements NetworkHelperSuccessListener {
 
         public String checkinDigest;
+        public int type;
 
-        public CheckinListener(String checkinDigest) {
+        public CheckinListener(String checkinDigest, int type) {
             this.checkinDigest = checkinDigest;
+            this.type = type;
         }
 
         @Override
         public void performAction(JSONObject response) {
             StartActivity startActivity = (StartActivity) getActivity();
             startActivity.dismissProgressDialog();
-            // TODO: Start MarkActivity
-            startRegatta(checkinDigest);
+            startRegatta(checkinDigest, type);
         }
     }
 
diff --git a/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/utils/AppPreferences.java b/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/utils/AppPreferences.java
index 9b763e84591..db91bb8eced 100644
--- a/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/utils/AppPreferences.java
+++ b/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/utils/AppPreferences.java
@@ -69,7 +69,7 @@ public class AppPreferences extends BaseAppPreferences {
 
     public String getServerMarkPath(String leaderboardName, String markId) {
         String path = context.getString(R.string.preferece_server_mark_path);
-        return path.replace("{leaderboard_name}", leaderboardName).replace("{markId}", markId);
+        return path.replace("{leaderboardName}", leaderboardName).replace("{markId}", markId);
     }
 
     public int getGPSFixInterval() {

From 86055a0d712b5981a8cabd3ff4199a4b36d13972 Mon Sep 17 00:00:00 2001
From: Bennet Brunsen <brunsen@ubilabs.net>
Date: Thu, 7 Jul 2016 17:13:26 +0200
Subject: [PATCH 87/92] Fix encoding issue

---
 .../sailing/android/tracking/app/valueobjects/CheckinData.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/valueobjects/CheckinData.java b/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/valueobjects/CheckinData.java
index 524023e999e..f4568749545 100644
--- a/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/valueobjects/CheckinData.java
+++ b/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/valueobjects/CheckinData.java
@@ -24,7 +24,7 @@ public abstract class CheckinData extends BaseCheckinData {
     private boolean update;
 
     public CheckinData(UrlData data) {
-        leaderboardName = data.leaderboardName;
+        leaderboardName = data.leaderboardName.replace("%20", " ");
         deviceUid = data.deviceUuid.getStringRepresentation();
         eventId = data.eventId;
         eventName = data.eventName;

From b3821e323fee86405af93a0192c259b8102e67b3 Mon Sep 17 00:00:00 2001
From: Bennet Brunsen <brunsen@ubilabs.net>
Date: Thu, 7 Jul 2016 17:21:18 +0200
Subject: [PATCH 88/92] Start tracking from buoy fragment

---
 .../tracking/app/ui/activities/BuoyActivity.java | 16 +++++++++++-----
 .../tracking/app/ui/fragments/BuoyFragment.java  | 15 +++++++++++++++
 2 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/activities/BuoyActivity.java b/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/activities/BuoyActivity.java
index a8fec2c1dd5..5f15257c94f 100644
--- a/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/activities/BuoyActivity.java
+++ b/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/activities/BuoyActivity.java
@@ -30,10 +30,10 @@ public class BuoyActivity extends AbstractBaseActivity {
 
     private static String TAG = BuoyActivity.class.getName();
 
-    public EventInfo event;
-    public MarkInfo mark;
-    public LeaderboardInfo leaderboard;
-    public CheckinUrlInfo checkinUrl;
+    private EventInfo event;
+    private MarkInfo mark;
+    private LeaderboardInfo leaderboard;
+    private CheckinUrlInfo checkinUrl;
     private String checkinDigest;
 
     private AppPreferences prefs;
@@ -109,7 +109,13 @@ public class BuoyActivity extends AbstractBaseActivity {
         }
     }
 
-    public void startTrackingActivity(String checkinDigest) {
+    private void startTrackingActivity(String checkinDigest) {
+        Intent intent = new Intent(this, TrackingActivity.class);
+        intent.putExtra(getString(R.string.tracking_activity_checkin_digest_parameter), checkinDigest);
+        startActivity(intent);
+    }
+
+    public void startTrackingActivity() {
         Intent intent = new Intent(this, TrackingActivity.class);
         intent.putExtra(getString(R.string.tracking_activity_checkin_digest_parameter), checkinDigest);
         startActivity(intent);
diff --git a/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/fragments/BuoyFragment.java b/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/fragments/BuoyFragment.java
index 7975203e321..f9b15afbb3f 100644
--- a/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/fragments/BuoyFragment.java
+++ b/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/fragments/BuoyFragment.java
@@ -5,10 +5,13 @@ import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.Button;
 import android.widget.TextView;
 
+import com.sap.sailing.android.shared.util.LocationHelper;
 import com.sap.sailing.android.shared.util.ViewHelper;
 import com.sap.sailing.android.tracking.app.R;
+import com.sap.sailing.android.tracking.app.ui.activities.BuoyActivity;
 
 public class BuoyFragment extends BaseFragment {
 
@@ -28,6 +31,18 @@ public class BuoyFragment extends BaseFragment {
         View view = inflater.inflate(R.layout.fragment_buoy, container, false);
         TextView markNameText = ViewHelper.get(view, R.id.buoy_Name);
         markNameText.setText(getArguments().getString(EXTRA_MARK_NAME));
+        Button startTrackingButton = ViewHelper.get(view, R.id.start_tracking);
+        startTrackingButton.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                if (LocationHelper.isGPSEnabled(getActivity())) {
+                    BuoyActivity buoyActivity = (BuoyActivity) getActivity();
+                    buoyActivity.startTrackingActivity();
+                } else {
+                    LocationHelper.showNoGPSError(getActivity(), getString(R.string.enable_gps));
+                }
+            }
+        });
         return view;
     }
 }

From 333f10ddb32acfe423df51c06e205b1df8372fb8 Mon Sep 17 00:00:00 2001
From: Bennet Brunsen <brunsen@ubilabs.net>
Date: Fri, 8 Jul 2016 10:23:02 +0200
Subject: [PATCH 89/92] Fixes no leaderboard and event information for mark
 tracking

---
 .../tracking/app/ui/activities/TrackingActivity.java        | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/activities/TrackingActivity.java b/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/activities/TrackingActivity.java
index 36410ac544a..870b61b6ba3 100644
--- a/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/activities/TrackingActivity.java
+++ b/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/activities/TrackingActivity.java
@@ -20,6 +20,7 @@ import android.view.View;
 import android.widget.Button;
 import android.widget.TextView;
 
+import com.sap.sailing.android.shared.data.LeaderboardInfo;
 import com.sap.sailing.android.shared.logging.ExLog;
 import com.sap.sailing.android.shared.services.sending.MessageSendingService;
 import com.sap.sailing.android.shared.services.sending.MessageSendingService.APIConnectivity;
@@ -101,10 +102,11 @@ public class TrackingActivity extends BaseActivity implements GPSQualityListener
         }
 
         if (getSupportActionBar() != null) {
-            EventInfo eventInfo = DatabaseHelper.getInstance().getEventInfoWithLeaderboardAndCompetitor(this, checkinDigest);
+            EventInfo eventInfo = DatabaseHelper.getInstance().getEventInfo(this, checkinDigest);
+            LeaderboardInfo leaderboardInfo = DatabaseHelper.getInstance().getLeaderboard(this, checkinDigest);
             getSupportActionBar().setDisplayHomeAsUpEnabled(true);
             getSupportActionBar().setHomeButtonEnabled(true);
-            getSupportActionBar().setTitle(eventInfo.leaderboardName);
+            getSupportActionBar().setTitle(leaderboardInfo.name);
             getSupportActionBar().setSubtitle(getString(R.string.tracking_colon) + " " + eventInfo.name);
             ColorDrawable backgroundDrawable = new ColorDrawable(getResources().getColor(R.color.toolbar_background));
             getSupportActionBar().setBackgroundDrawable(backgroundDrawable);

From a85518a26748af4d3badc409d653206f00c11c7e Mon Sep 17 00:00:00 2001
From: Axel Uhl <axel.uhl@sap.com>
Date: Fri, 8 Jul 2016 11:12:41 +0200
Subject: [PATCH 90/92] formatting only

Change-Id: I014716a2b4d5ea6c49279f43c4120b549595660a
---
 .../sailing/android/tracking/app/valueobjects/MarkUrlData.java   | 1 -
 1 file changed, 1 deletion(-)

diff --git a/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/valueobjects/MarkUrlData.java b/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/valueobjects/MarkUrlData.java
index 33fcc4c86a3..baec9a1a90a 100644
--- a/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/valueobjects/MarkUrlData.java
+++ b/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/valueobjects/MarkUrlData.java
@@ -20,7 +20,6 @@ public class MarkUrlData extends UrlData {
         this.markId = markId;
     }
 
-
     public String getMarkUrl() {
         return markUrl;
     }

From 5e339380688d04676ae30abe0526d74ef3de938e Mon Sep 17 00:00:00 2001
From: Bennet Brunsen <brunsen@ubilabs.net>
Date: Fri, 8 Jul 2016 10:41:22 +0200
Subject: [PATCH 91/92] Remove unused variable

---
 .../android/tracking/app/ui/activities/BuoyActivity.java       | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/activities/BuoyActivity.java b/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/activities/BuoyActivity.java
index 5f15257c94f..56a18e6c17a 100644
--- a/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/activities/BuoyActivity.java
+++ b/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/activities/BuoyActivity.java
@@ -12,7 +12,6 @@ import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
 
-import com.sap.sailing.android.shared.data.CheckinUrlInfo;
 import com.sap.sailing.android.shared.data.LeaderboardInfo;
 import com.sap.sailing.android.shared.logging.ExLog;
 import com.sap.sailing.android.shared.ui.activities.AbstractBaseActivity;
@@ -33,7 +32,6 @@ public class BuoyActivity extends AbstractBaseActivity {
     private EventInfo event;
     private MarkInfo mark;
     private LeaderboardInfo leaderboard;
-    private CheckinUrlInfo checkinUrl;
     private String checkinDigest;
 
     private AppPreferences prefs;
@@ -45,7 +43,6 @@ public class BuoyActivity extends AbstractBaseActivity {
         checkinDigest = intent.getStringExtra(getString(R.string.checkin_digest));
 
         prefs = new AppPreferences(this);
-        checkinUrl = DatabaseHelper.getInstance().getCheckinUrl(this, checkinDigest);
         mark = DatabaseHelper.getInstance().getMarkInfo(this, checkinDigest);
         event = DatabaseHelper.getInstance().getEventInfo(this, checkinDigest);
         leaderboard = DatabaseHelper.getInstance().getLeaderboard(this, checkinDigest);

From 2094fc9c7cd7095d172c79ad60cf4432242d49d2 Mon Sep 17 00:00:00 2001
From: Bennet Brunsen <brunsen@ubilabs.net>
Date: Fri, 8 Jul 2016 10:43:41 +0200
Subject: [PATCH 92/92] Remove unused local variable in toolbar

---
 .../sailing/android/shared/ui/customviews/OpenSansToolbar.java   | 1 -
 1 file changed, 1 deletion(-)

diff --git a/mobile/com.sap.sailing.android.shared/src/com/sap/sailing/android/shared/ui/customviews/OpenSansToolbar.java b/mobile/com.sap.sailing.android.shared/src/com/sap/sailing/android/shared/ui/customviews/OpenSansToolbar.java
index e8daf591347..b3d4aa5f1b4 100644
--- a/mobile/com.sap.sailing.android.shared/src/com/sap/sailing/android/shared/ui/customviews/OpenSansToolbar.java
+++ b/mobile/com.sap.sailing.android.shared/src/com/sap/sailing/android/shared/ui/customviews/OpenSansToolbar.java
@@ -48,7 +48,6 @@ public class OpenSansToolbar extends Toolbar {
     }
 
     public void hideSubtitle() {
-        TextView titleTextView = (TextView) findViewById(R.id.toolbar_title);
         TextView subtitleTextView = (TextView) findViewById(R.id.toolbar_subtitle);
         subtitleTextView.setVisibility(View.GONE);
     }