diff --git a/build.gradle b/build.gradle index 95bb3e340e4..4602d4c3b88 100644 --- a/build.gradle +++ b/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' } } diff --git a/mobile/com.sap.sailing.android.shared/res/drawable-hdpi/sap_logo_64dp.png b/mobile/com.sap.sailing.android.shared/res/drawable-hdpi/sap_logo_64dp.png new file mode 100644 index 00000000000..7540f83c220 Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable-hdpi/sap_logo_64dp.png differ diff --git a/mobile/com.sap.sailing.android.shared/res/drawable-mdpi/sap_logo_64dp.png b/mobile/com.sap.sailing.android.shared/res/drawable-mdpi/sap_logo_64dp.png new file mode 100644 index 00000000000..1db89e3ff9e Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable-mdpi/sap_logo_64dp.png differ diff --git a/mobile/com.sap.sailing.android.shared/res/drawable-xhdpi/sap_logo_64dp.png b/mobile/com.sap.sailing.android.shared/res/drawable-xhdpi/sap_logo_64dp.png new file mode 100644 index 00000000000..ab2b42cac8d Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable-xhdpi/sap_logo_64dp.png differ diff --git a/mobile/com.sap.sailing.android.shared/res/drawable-xxhdpi/sap_logo_64dp.png b/mobile/com.sap.sailing.android.shared/res/drawable-xxhdpi/sap_logo_64dp.png new file mode 100644 index 00000000000..f436465e01a Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable-xxhdpi/sap_logo_64dp.png differ diff --git a/mobile/com.sap.sailing.android.shared/res/drawable-xxxhdpi/sap_logo_64dp.png b/mobile/com.sap.sailing.android.shared/res/drawable-xxxhdpi/sap_logo_64dp.png new file mode 100644 index 00000000000..ea31ac4210d Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable-xxxhdpi/sap_logo_64dp.png differ diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/sap_logo_64_sq.png b/mobile/com.sap.sailing.android.shared/res/drawable/sap_logo_64_sq.png deleted file mode 100644 index d51305ede3d..00000000000 Binary files a/mobile/com.sap.sailing.android.shared/res/drawable/sap_logo_64_sq.png and /dev/null differ diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/working_title.png b/mobile/com.sap.sailing.android.shared/res/drawable/working_title.png deleted file mode 100644 index f0ca3537590..00000000000 Binary files a/mobile/com.sap.sailing.android.shared/res/drawable/working_title.png and /dev/null differ 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 4381e48840d..e53039986c4 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,8 +1,7 @@ + android:layout_width="match_parent" + android:layout_height="match_parent"> - + android:src="@drawable/working_title" /> + android:textColor="@color/white" /> + android:textStyle="bold" /> + android:textSize="18sp" /> - - + android:dividerHeight="1dp" /> \ No newline at end of file diff --git a/mobile/com.sap.sailing.android.shared/res/values-de/eula.xml b/mobile/com.sap.sailing.android.shared/res/values-de/eula.xml deleted file mode 100644 index 1d49aced580..00000000000 --- a/mobile/com.sap.sailing.android.shared/res/values-de/eula.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - http://www.sap.com/corporate-de/about/legal/privacy - \ No newline at end of file diff --git a/mobile/com.sap.sailing.android.shared/res/values/eula.xml b/mobile/com.sap.sailing.android.shared/res/values/eula.xml index 71997f5d350..9004e61ce18 100644 --- a/mobile/com.sap.sailing.android.shared/res/values/eula.xml +++ b/mobile/com.sap.sailing.android.shared/res/values/eula.xml @@ -1,4 +1,4 @@ - http://www.sap.com/corporate-en/about/legal/privacy + http://www.sap.com/corporate-en/about/legal/privacy \ No newline at end of file diff --git a/mobile/com.sap.sailing.android.shared/res/values/strings.xml b/mobile/com.sap.sailing.android.shared/res/values/strings.xml index 67a79e48f44..36f425926e8 100644 --- a/mobile/com.sap.sailing.android.shared/res/values/strings.xml +++ b/mobile/com.sap.sailing.android.shared/res/values/strings.xml @@ -36,14 +36,14 @@ Error: Database operation has failed. - No QR-Code? - Please contact race management if you have not received a QR-Code. + No QR Code? + Please contact race management if you have not received a QR Code. "PlayStore and Scanning not available." Scanning cancelled - Error scanning QR-Code {result-code} + Error scanning QR Code {result-code} An error occurred while contacting the server. Please try again. Please wait - Invalid QR-Code + Invalid QR Code CheckinDigest leaderboard_name mark_id diff --git a/mobile/com.sap.sailing.android.shared/res/values/strings_fragment.xml b/mobile/com.sap.sailing.android.shared/res/values/strings_fragment.xml index bdb17bb047e..9a9e16b6aca 100644 --- a/mobile/com.sap.sailing.android.shared/res/values/strings_fragment.xml +++ b/mobile/com.sap.sailing.android.shared/res/values/strings_fragment.xml @@ -1,6 +1,6 @@ - Scan QR-Code - The QR-code can be found on your confirmation of participation + Scan QR Code + The QR Code can be found on your confirmation of participation Don\'t Have a QR Code? diff --git a/mobile/com.sap.sailing.android.shared/res/values/view_ids.xml b/mobile/com.sap.sailing.android.shared/res/values/view_ids.xml new file mode 100644 index 00000000000..2aaded1f169 --- /dev/null +++ b/mobile/com.sap.sailing.android.shared/res/values/view_ids.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file 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 316ff09d72c..f45be118535 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 @@ -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)); } diff --git a/mobile/com.sap.sailing.android.tracking.app/res/values/strings.xml b/mobile/com.sap.sailing.android.tracking.app/res/values/strings.xml index 8f778575362..77dd1fd0b2e 100644 --- a/mobile/com.sap.sailing.android.tracking.app/res/values/strings.xml +++ b/mobile/com.sap.sailing.android.tracking.app/res/values/strings.xml @@ -14,7 +14,7 @@ Regatta Leader board Event - Setup GPS-Tracker + Set Up GPS Tracker Tracking Please confirm Do you really want to stop tracking? diff --git a/mobile/com.sap.sailing.android.tracking.app/res/values/strings_fragment.xml b/mobile/com.sap.sailing.android.tracking.app/res/values/strings_fragment.xml index 067085222a8..aae85b43f44 100644 --- a/mobile/com.sap.sailing.android.tracking.app/res/values/strings_fragment.xml +++ b/mobile/com.sap.sailing.android.tracking.app/res/values/strings_fragment.xml @@ -1,7 +1,7 @@ - Scan QR-Code - The QR-code can be found on your confirmation of participation + Scan QR Code + The QR Code can be found on your confirmation of participation Don\'t Have a QR Code? Start tracking Stop tracking 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 55e51a24364..54598595a68 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 @@ -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); 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 c771638e47f..7adfcd0e5c5 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 @@ -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)); } 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 49f2f15de6a..cee8debe433 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 @@ -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); 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 3f750560f19..3b0228ee13c 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 @@ -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); } 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 4565e1b3b2d..294ea488cf8 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 @@ -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); diff --git a/mobile/com.sap.sailing.buoy.positioning/res/drawable/working_title.png b/mobile/com.sap.sailing.buoy.positioning/res/drawable-mdpi/working_title.png similarity index 100% rename from mobile/com.sap.sailing.buoy.positioning/res/drawable/working_title.png rename to mobile/com.sap.sailing.buoy.positioning/res/drawable-mdpi/working_title.png 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 5b301ae7563..4c361476d07 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 @@ -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); 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 0c4c5f8cef9..56aca3f9bc0 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 @@ -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)); } 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 5c251099fd8..07d58f5f055 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 @@ -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); 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 f646ca88926..0911e033128 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 @@ -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)); } diff --git a/mobile/com.sap.sailing.racecommittee.app/res/values/strings.xml b/mobile/com.sap.sailing.racecommittee.app/res/values/strings.xml index d57eaf4eb8f..f17e4036d2f 100644 --- a/mobile/com.sap.sailing.racecommittee.app/res/values/strings.xml +++ b/mobile/com.sap.sailing.racecommittee.app/res/values/strings.xml @@ -330,7 +330,7 @@ kts Enter Address - + No Data Up in #TIME# @@ -486,7 +486,7 @@ Do you want to clear the list? Do you want to reset to the last state? %1$d° %2$d′ %3$.3f″ - Scan QR-Code + Scan QR Code Manual Input Group Racing Select Race