Merge remote-tracking branch 'server/master'

build.gradle

@@ -6,7 +6,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.0.0-beta2'
+        classpath 'com.android.tools.build:gradle:2.0.0-beta5'
     }
 }
 

mobile/com.sap.sailing.android.shared/res/layout/fragment_home.xml

@@ -1,8 +1,7 @@
 <?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:layout_width="match_parent"
+    android:layout_height="match_parent">
 
     <ImageView
         android:id="@+id/homeBackground"
@@ -11,8 +10,7 @@
         android:layout_alignParentBottom="true"
         android:contentDescription="@string/empty"
         android:scaleType="centerCrop"
-        android:src="@drawable/working_title"/>
-
+        android:src="@drawable/working_title" />
 
     <RelativeLayout
         android:id="@+id/bottomLayout"
@@ -30,7 +28,7 @@
             android:layout_centerVertical="true"
             android:gravity="center"
             android:text="@string/scan_hint"
-            android:textColor="@color/white"/>
+            android:textColor="@color/white" />
     </RelativeLayout>
 
     <com.sap.sailing.android.shared.ui.customviews.OpenSansButton
@@ -46,7 +44,7 @@
         android:text="@string/scan_qr"
         android:textAllCaps="true"
         android:textSize="18sp"
-        android:textStyle="bold"/>
+        android:textStyle="bold" />
 
     <com.sap.sailing.android.shared.ui.customviews.OpenSansButton
         android:id="@+id/noQrCode"
@@ -59,8 +57,9 @@
         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="18sp" />
 
     <ListView
         android:id="@+id/listRegatta"
@@ -69,8 +68,6 @@
         android:layout_above="@id/scanQr"
         android:layout_alignParentTop="true"
         android:divider="@android:color/white"
-        android:dividerHeight="1dp">
-
-    </ListView>
+        android:dividerHeight="1dp" />
 
 </RelativeLayout>

mobile/com.sap.sailing.android.shared/res/values-de/eula.xml

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="eula_url">http://www.sap.com/corporate-de/about/legal/privacy</string>
-</resources>

mobile/com.sap.sailing.android.shared/res/values/eula.xml

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="eula_url">http://www.sap.com/corporate-en/about/legal/privacy</string>
+    <string name="eula_url" translatable="false">http://www.sap.com/corporate-en/about/legal/privacy</string>
 </resources>

mobile/com.sap.sailing.android.shared/res/values/strings.xml

@@ -36,14 +36,14 @@
 
     <!-- QR Code -->
     <string name="notify_user_db_operation_failed">Error: Database operation has failed.</string>
-    <string name="no_qr_code_popup_title">No QR-Code?</string>
-    <string name="no_qr_code_popup_message">Please contact race management if you have not received a QR-Code.</string>
+    <string name="no_qr_code_popup_title">No QR Code?</string>
+    <string name="no_qr_code_popup_message">Please contact race management if you have not received a QR Code.</string>
     <string name="error_play_store_and_scanning_not_available">"PlayStore and Scanning not available."</string>
     <string name="scanning_cancelled">Scanning cancelled</string>
-    <string name="error_scanning_qrcode">Error scanning QR-Code {result-code}</string>
+    <string name="error_scanning_qrcode">Error scanning QR Code {result-code}</string>
     <string name="notify_user_api_call_failed">An error occurred while contacting the server. Please try again.</string>
     <string name="please_wait">Please wait</string>
-    <string name="error_invalid_qr_code">Invalid QR-Code</string>
+    <string name="error_invalid_qr_code">Invalid QR Code</string>
     <string name="checkin_digest" translatable="false">CheckinDigest</string>
     <string name="leaderboard_name" translatable="false">leaderboard_name</string>
     <string name="mark_id" translatable="false">mark_id</string>

mobile/com.sap.sailing.android.shared/res/values/strings_fragment.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="scan_qr">Scan QR-Code</string>
-    <string name="scan_hint">The QR-code can be found on your confirmation of participation</string>
+    <string name="scan_qr">Scan QR Code</string>
+    <string name="scan_hint">The QR Code can be found on your confirmation of participation</string>
     <string name="no_qr_code">Don\'t Have a QR Code?</string>
 </resources>

mobile/com.sap.sailing.android.shared/res/values/view_ids.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <item name="working_title" type="drawable" />
+
+</resources>

mobile/com.sap.sailing.android.shared/src/com/sap/sailing/android/shared/ui/activities/AbstractStartActivity.java

@@ -26,7 +26,7 @@ public abstract class AbstractStartActivity extends CheckinDataActivity {
             setSupportActionBar(toolbar);
             toolbar.hideSubtitle();
             toolbar.setTitleSize(20);
-            toolbar.setNavigationIcon(R.drawable.sap_logo_64_sq);
+            toolbar.setNavigationIcon(R.drawable.sap_logo_64dp);
             toolbar.setPadding(20, 0, 0, 0);
             toolbar.setBackgroundColor(getResources().getColor(R.color.colorPrimary));
         }

mobile/com.sap.sailing.android.tracking.app/res/values/strings.xml

@@ -14,7 +14,7 @@
     <string name="title_activity_regatta">Regatta</string>
     <string name="title_activity_leaderboard">Leader board</string>
     <string name="title_activity_event">Event</string>
-    <string name="title_activity_start">Setup GPS-Tracker</string>
+    <string name="title_activity_start">Set Up GPS Tracker</string>
     <string name="title_activity_tracking">Tracking</string>
     <string name="please_confirm">Please confirm</string>
     <string name="do_you_really_want_to_stop_tracking">Do you really want to stop tracking?</string>

mobile/com.sap.sailing.android.tracking.app/res/values/strings_fragment.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="scan_qr">Scan QR-Code</string>
-    <string name="scan_hint">The QR-code can be found on your confirmation of participation</string>
+    <string name="scan_qr">Scan QR Code</string>
+    <string name="scan_hint">The QR Code can be found on your confirmation of participation</string>
     <string name="no_qr_code">Don\'t Have a QR Code?</string>
     <string name="start_tracking">Start tracking</string>
     <string name="stop_tracking">Stop tracking</string>

mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/activities/AboutActivity.java

@@ -24,7 +24,7 @@ public class AboutActivity extends BaseActivity {
         if (getSupportActionBar() != null) {
             getSupportActionBar().setDisplayHomeAsUpEnabled(true);
             getSupportActionBar().setHomeButtonEnabled(true);
-            toolbar.setNavigationIcon(R.drawable.sap_logo_64_sq);
+            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);

mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/activities/LeaderboardWebViewActivity.java

@@ -35,7 +35,7 @@ public class LeaderboardWebViewActivity extends BaseActivity {
         if (getSupportActionBar() != null) {
             getSupportActionBar().setDisplayHomeAsUpEnabled(true);
             getSupportActionBar().setHomeButtonEnabled(true);
-            toolbar.setNavigationIcon(R.drawable.sap_logo_64_sq);
+            toolbar.setNavigationIcon(R.drawable.sap_logo_64dp);
             toolbar.setPadding(20, 0, 0, 0);
             getSupportActionBar().setTitle(getString(R.string.title_activity_leaderboard));
         }

mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/activities/RegattaActivity.java

@@ -106,7 +106,7 @@ public class RegattaActivity extends AbstractRegattaActivity
         if (getSupportActionBar() != null) {
             getSupportActionBar().setDisplayHomeAsUpEnabled(true);
             getSupportActionBar().setHomeButtonEnabled(true);
-            toolbar.setNavigationIcon(R.drawable.sap_logo_64_sq);
+            toolbar.setNavigationIcon(R.drawable.sap_logo_64dp);
             toolbar.setPadding(20, 0, 0, 0);
             getSupportActionBar().setTitle(leaderboard.name);
             getSupportActionBar().setSubtitle(event.name);

mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/activities/SettingsActivity.java

@@ -31,7 +31,7 @@ public class SettingsActivity extends AppCompatActivity {
             getSupportActionBar().setDisplayHomeAsUpEnabled(true);
             getSupportActionBar().setHomeButtonEnabled(true);
             getSupportActionBar().setTitle(R.string.preferences);
-            toolbar.setNavigationIcon(R.drawable.sap_logo_64_sq);
+            toolbar.setNavigationIcon(R.drawable.sap_logo_64dp);
             toolbar.setPadding(20, 0, 0, 0);
         }
 

mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/activities/TrackingActivity.java

@@ -90,7 +90,7 @@ public class TrackingActivity extends BaseActivity implements GPSQualityListener
         Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
         if (toolbar != null) {
             setSupportActionBar(toolbar);
-            toolbar.setNavigationIcon(R.drawable.sap_logo_64_sq);
+            toolbar.setNavigationIcon(R.drawable.sap_logo_64dp);
             toolbar.setPadding(20, 0, 0, 0);
             toolbar.setBackgroundColor(getResources().getColor(R.color.colorPrimary));
         }
@@ -100,7 +100,7 @@ public class TrackingActivity extends BaseActivity implements GPSQualityListener
                     checkinDigest);
             getSupportActionBar().setDisplayHomeAsUpEnabled(true);
             getSupportActionBar().setHomeButtonEnabled(true);
-            toolbar.setNavigationIcon(R.drawable.sap_logo_64_sq);
+            toolbar.setNavigationIcon(R.drawable.sap_logo_64dp);
             toolbar.setPadding(20, 0, 0, 0);
             getSupportActionBar().setTitle(eventInfo.leaderboardName);
             getSupportActionBar().setSubtitle(getString(R.string.tracking_colon) + " " + eventInfo.name);

mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/ui/activities/AboutActivity.java

@@ -23,7 +23,7 @@ public class AboutActivity extends BaseActivity {
         if (getSupportActionBar() != null) {
             getSupportActionBar().setDisplayHomeAsUpEnabled(true);
             getSupportActionBar().setHomeButtonEnabled(true);
-            toolbar.setNavigationIcon(R.drawable.sap_logo_64_sq);
+            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);

mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/ui/activities/PositioningActivity.java

@@ -46,7 +46,7 @@ public class PositioningActivity extends BaseActivity implements pingListener {
         if (getSupportActionBar() != null) {
             getSupportActionBar().setDisplayHomeAsUpEnabled(true);
             getSupportActionBar().setHomeButtonEnabled(true);
-            toolbar.setNavigationIcon(R.drawable.sap_logo_64_sq);
+            toolbar.setNavigationIcon(R.drawable.sap_logo_64dp);
             toolbar.setPadding(20, 0, 0, 0);
             getSupportActionBar().setTitle(getString(R.string.set_position));
         }

mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/ui/activities/RegattaActivity.java

@@ -59,7 +59,7 @@ public class RegattaActivity extends AbstractRegattaActivity {
         if (getSupportActionBar() != null) {
             getSupportActionBar().setDisplayHomeAsUpEnabled(true);
             getSupportActionBar().setHomeButtonEnabled(true);
-            toolbar.setNavigationIcon(R.drawable.sap_logo_64_sq);
+            toolbar.setNavigationIcon(R.drawable.sap_logo_64dp);
             toolbar.setPadding(20, 0, 0, 0);
             toolbar.setBackgroundColor(getResources().getColor(R.color.colorPrimary));
             getSupportActionBar().setTitle(leaderboardName);

mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/ui/activities/SettingActivity.java

@@ -38,7 +38,7 @@ public class SettingActivity extends AppCompatActivity {
         if (getSupportActionBar() != null) {
             getSupportActionBar().setDisplayHomeAsUpEnabled(true);
             getSupportActionBar().setHomeButtonEnabled(true);
-            toolbar.setNavigationIcon(R.drawable.sap_logo_64_sq);
+            toolbar.setNavigationIcon(R.drawable.sap_logo_64dp);
             toolbar.setPadding(20, 0, 0, 0);
             getSupportActionBar().setTitle(getString(R.string.settings));
         }

mobile/com.sap.sailing.racecommittee.app/res/values/strings.xml

@@ -330,7 +330,7 @@
     <string name="wind_kn">kts</string>
     <string name="wind_address_hint">Enter Address</string>
     <string name="wind_sensor"><![CDATA[at %1$s / from %2$.0f° / %3$.1f kts]]></string>
-    <string name="wind_panel"><![CDATA[from %1$.0f°\nwith %2$.1f kts]]></string>
+    <string name="wind_panel"><![CDATA[From %1$.0f°\nwith %2$.1f kts]]></string>
     <string name="wind_no_data">No Data</string>
 
     <string name="time_up">Up in #TIME#</string>
@@ -486,7 +486,7 @@
     <string name="reset_message_1">Do you want to clear the list?</string>
     <string name="reset_message_2">Do you want to reset to the last state?</string>
     <string name="geo_coords" translatable="false">%1$d° %2$d′ %3$.3f″</string>
-    <string name="onboarding_scan">Scan QR-Code</string>
+    <string name="onboarding_scan">Scan QR Code</string>
     <string name="onboarding_input">Manual Input</string>
     <string name="race_group">Group Racing</string>
     <string name="wind_select_race">Select Race</string>