eclipse-sailing-analytics/sailing-analytics
1
0 Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-10-27 06:17:27 +00:00
Code Activity

Merge branch 'ubilabs--tracking_app--refactor--extract_shared_components' into ubilabs--buoy_positioning_app--develop

Browse Source
This commit is contained in:
Bennet Brunsen committed 2015-03-19 10:31:29 +01:00
2 parents 0f89da807b 771f3cf69f
commit 08feaf3042
83 files changed
+1279 -782
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

mobile/com.sap.sailing.android.tracking.app/res/layout-land/fragment_compass.xml
+1 -1
View File
@@ -21,7 +21,7 @@
android:paddingTop="15dp"
/>
<com.sap.sailing.android.tracking.app.customviews.AutoResizeLightTextView
<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"
mobile/com.sap.sailing.android.tracking.app/res/layout-land/fragment_home.xml
+3 -3
View File
@@ -23,7 +23,7 @@
android:background="@color/black_transparent"
>
<com.sap.sailing.android.tracking.app.customviews.OpenSansTextView
<com.sap.sailing.android.shared.ui.customviews.OpenSansTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
@@ -42,7 +42,7 @@
android:layout_marginTop="10dp"
>
<com.sap.sailing.android.tracking.app.customviews.OpenSansButton
<com.sap.sailing.android.shared.ui.customviews.OpenSansButton
android:id="@+id/scanQr"
android:layout_weight="1"
android:layout_width="fill_parent"
@@ -55,7 +55,7 @@
android:textStyle="bold"
android:text="@string/scan_qr" />
<com.sap.sailing.android.tracking.app.customviews.OpenSansButton
<com.sap.sailing.android.shared.ui.customviews.OpenSansButton
android:id="@+id/noQrCode"
android:layout_weight="1"
android:layout_width="fill_parent"
mobile/com.sap.sailing.android.tracking.app/res/layout-land/fragment_regatta.xml
+14 -14
View File
@@ -56,7 +56,7 @@
android:paddingRight="@dimen/activity_horizontal_margin"
android:src="@drawable/ic_menu_camera" />
<com.sap.sailing.android.tracking.app.customviews.OpenSansTextView
<com.sap.sailing.android.shared.ui.customviews.OpenSansTextView
android:id="@+id/add_photo_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -80,7 +80,7 @@
android:orientation="horizontal"
android:padding="10dp" >
<com.sap.sailing.android.tracking.app.customviews.OpenSansTextView
<com.sap.sailing.android.shared.ui.customviews.OpenSansTextView
android:id="@+id/competitor_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -111,7 +111,7 @@
android:textColor="@color/white" />
</RelativeLayout>
<com.sap.sailing.android.tracking.app.customviews.OpenSansTextView
<com.sap.sailing.android.shared.ui.customviews.OpenSansTextView
android:id="@+id/sail_id"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -167,7 +167,7 @@
android:orientation="horizontal"
android:visibility="invisible" >
<com.sap.sailing.android.tracking.app.customviews.OpenSansTextView
<com.sap.sailing.android.shared.ui.customviews.OpenSansTextView
android:id="@+id/thank_you_note"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
@@ -186,7 +186,7 @@
android:measureWithLargestChild="false"
android:orientation="horizontal" >
<com.sap.sailing.android.tracking.app.customviews.OpenSansTextView
<com.sap.sailing.android.shared.ui.customviews.OpenSansTextView
android:id="@+id/regatta_starts_in"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
@@ -221,7 +221,7 @@
android:orientation="vertical"
android:padding="0dp" >
<com.sap.sailing.android.tracking.app.customviews.OpenSansTextView
<com.sap.sailing.android.shared.ui.customviews.OpenSansTextView
android:id="@+id/starts_in_days"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -229,7 +229,7 @@
android:textColor="@color/white"
android:textSize="40sp" />
<com.sap.sailing.android.tracking.app.customviews.AutoResizeTextView
<com.sap.sailing.android.shared.ui.customviews.AutoResizeTextView
android:id="@+id/starts_in_days_label"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -252,7 +252,7 @@
android:orientation="vertical"
android:padding="0dp" >
<com.sap.sailing.android.tracking.app.customviews.OpenSansTextView
<com.sap.sailing.android.shared.ui.customviews.OpenSansTextView
android:id="@+id/starts_in_hours"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -260,7 +260,7 @@
android:textColor="@color/white"
android:textSize="40sp" />
<com.sap.sailing.android.tracking.app.customviews.AutoResizeTextView
<com.sap.sailing.android.shared.ui.customviews.AutoResizeTextView
android:id="@+id/starts_in_hours_label"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -283,7 +283,7 @@
android:orientation="vertical"
android:padding="0dp" >
<com.sap.sailing.android.tracking.app.customviews.OpenSansTextView
<com.sap.sailing.android.shared.ui.customviews.OpenSansTextView
android:id="@+id/starts_in_minutes"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -291,7 +291,7 @@
android:textColor="@color/white"
android:textSize="40sp" />
<com.sap.sailing.android.tracking.app.customviews.AutoResizeTextView
<com.sap.sailing.android.shared.ui.customviews.AutoResizeTextView
android:id="@+id/starts_in_minutes_label"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -338,7 +338,7 @@
android:layout_below="@id/white_bar"
android:orientation="horizontal" >
<com.sap.sailing.android.tracking.app.customviews.OpenSansButton
<com.sap.sailing.android.shared.ui.customviews.OpenSansButton
android:id="@+id/show_leaderboards_button"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
@@ -352,7 +352,7 @@
android:textAllCaps="true"
android:textStyle="bold" />
<com.sap.sailing.android.tracking.app.customviews.OpenSansButton
<com.sap.sailing.android.shared.ui.customviews.OpenSansButton
android:id="@+id/start_tracking"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
@@ -377,7 +377,7 @@
android:layout_alignParentStart="true"
android:background="@color/darker_gray" >
<com.sap.sailing.android.tracking.app.customviews.OpenSansTextView
<com.sap.sailing.android.shared.ui.customviews.OpenSansTextView
android:id="@+id/bottom_announcement"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
mobile/com.sap.sailing.android.tracking.app/res/layout-land/fragment_speed.xml
+2 -2
View File
@@ -25,7 +25,7 @@
android:layout_centerInParent="true"
android:orientation="vertical" >
<com.sap.sailing.android.tracking.app.customviews.AutoResizeLightTextView
<com.sap.sailing.android.shared.ui.customviews.AutoResizeLightTextView
android:id="@+id/speed_text_view"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
@@ -36,7 +36,7 @@
android:textSize="124sp"
android:textStyle="bold" />
<com.sap.sailing.android.tracking.app.customviews.AutoResizeLightTextView
<com.sap.sailing.android.shared.ui.customviews.AutoResizeLightTextView
android:id="@+id/speed_unit_text_view"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
mobile/com.sap.sailing.android.tracking.app/res/layout-land/fragment_stop_button.xml
+1 -1
View File
@@ -23,7 +23,7 @@
android:layout_alignParentTop="true"
android:background="@color/white_transparent" />
<com.sap.sailing.android.tracking.app.customviews.OpenSansButton
<com.sap.sailing.android.shared.ui.customviews.OpenSansButton
android:id="@+id/stop_tracking"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
mobile/com.sap.sailing.android.tracking.app/res/layout-land/fragment_tracking.xml
+11 -11
View File
@@ -17,7 +17,7 @@
android:layout_height="wrap_content"
android:background="@color/black" >
<com.sap.sailing.android.tracking.app.customviews.OpenSansTextView
<com.sap.sailing.android.shared.ui.customviews.OpenSansTextView
android:id="@+id/mode_label"
android:layout_width="wrap_content"
android:layout_height="35dp"
@@ -29,7 +29,7 @@
android:paddingRight="10dp"
android:text="@string/tracking_mode" />
<com.sap.sailing.android.tracking.app.customviews.OpenSansTextView
<com.sap.sailing.android.shared.ui.customviews.OpenSansTextView
android:id="@+id/mode"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -42,7 +42,7 @@
android:text="@string/tracking_mode_caching"
android:textColor="@color/sap_green" />
<com.sap.sailing.android.tracking.app.customviews.OpenSansTextView
<com.sap.sailing.android.shared.ui.customviews.OpenSansTextView
android:id="@+id/tracking_unsent_fixes_label"
android:layout_width="wrap_content"
android:layout_height="35dp"
@@ -52,7 +52,7 @@
android:paddingRight="10dp"
android:text="@string/tracking_unsent_fixes" />
<com.sap.sailing.android.tracking.app.customviews.OpenSansTextView
<com.sap.sailing.android.shared.ui.customviews.OpenSansTextView
android:id="@+id/tracking_unsent_fixes"
android:layout_width="wrap_content"
android:layout_height="50dp"
@@ -64,7 +64,7 @@
android:paddingLeft="10dp"
android:text="@string/none" />
<com.sap.sailing.android.tracking.app.customviews.OpenSansTextView
<com.sap.sailing.android.shared.ui.customviews.OpenSansTextView
android:id="@+id/tracking_status_label"
android:layout_width="wrap_content"
android:layout_height="35dp"
@@ -74,7 +74,7 @@
android:paddingRight="10dp"
android:text="@string/tracking_status" />
<com.sap.sailing.android.tracking.app.customviews.OpenSansTextView
<com.sap.sailing.android.shared.ui.customviews.OpenSansTextView
android:id="@+id/tracking_status"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -87,7 +87,7 @@
android:text="@string/tracking_status_tracking"
android:textColor="@color/sap_green" />
<com.sap.sailing.android.tracking.app.customviews.OpenSansTextView
<com.sap.sailing.android.shared.ui.customviews.OpenSansTextView
android:id="@+id/gps_quality"
android:layout_width="wrap_content"
android:layout_height="35dp"
@@ -131,7 +131,7 @@
android:layout_alignTop="@+id/tracking_time_info_label"
android:background="@android:color/darker_gray" />
<com.sap.sailing.android.tracking.app.customviews.OpenSansTextView
<com.sap.sailing.android.shared.ui.customviews.OpenSansTextView
android:id="@+id/tracking_time_info_label"
android:layout_width="fill_parent"
android:layout_height="35dp"
@@ -143,7 +143,7 @@
android:paddingRight="10dp"
android:text="@string/tracking_time" />
<com.sap.sailing.android.tracking.app.customviews.AutoResizeTextView
<com.sap.sailing.android.shared.ui.customviews.AutoResizeTextView
tools:ignore="InconsistentLayout"
android:id="@+id/tracking_time_label"
android:layout_width="match_parent"
@@ -166,7 +166,7 @@
android:layout_alignParentEnd="true"
android:orientation="horizontal" >
<com.sap.sailing.android.tracking.app.customviews.OpenSansTextView
<com.sap.sailing.android.shared.ui.customviews.OpenSansTextView
android:id="@+id/gps_accuracy_label"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -174,7 +174,7 @@
android:paddingLeft="9dp"
android:text="" />
<com.sap.sailing.android.tracking.app.customviews.SignalQualityIndicatorView
<com.sap.sailing.android.shared.ui.customviews.SignalQualityIndicatorView
android:id="@+id/gps_quality_indicator"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_compass.xml
+1 -1
View File
@@ -19,7 +19,7 @@
android:paddingTop="15dp"
/>
<com.sap.sailing.android.tracking.app.customviews.AutoResizeLightTextView
<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"
mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_container.xml
+4 -4
View File
@@ -2,7 +2,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent" >
<com.sap.sailing.android.tracking.app.customviews.OpenSansToolbar
<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"
@@ -14,7 +14,7 @@
android:layout_height="match_parent"
android:padding="10dp">
<com.sap.sailing.android.tracking.app.customviews.OpenSansTextView
<com.sap.sailing.android.shared.ui.customviews.OpenSansTextView
android:id="@+id/toolbar_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -23,7 +23,7 @@
android:singleLine="true"
android:textSize="16sp"/>
<com.sap.sailing.android.tracking.app.customviews.OpenSansTextView
<com.sap.sailing.android.shared.ui.customviews.OpenSansTextView
android:id="@+id/toolbar_subtitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -34,7 +34,7 @@
</LinearLayout>
</com.sap.sailing.android.tracking.app.customviews.OpenSansToolbar>
</com.sap.sailing.android.shared.ui.customviews.OpenSansToolbar>
<FrameLayout
android:id="@+id/content_frame"
mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_home.xml
+3 -3
View File
@@ -23,7 +23,7 @@
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true">
<com.sap.sailing.android.tracking.app.customviews.OpenSansTextView
<com.sap.sailing.android.shared.ui.customviews.OpenSansTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
@@ -33,7 +33,7 @@
android:textColor="@color/white" />
</RelativeLayout>
<com.sap.sailing.android.tracking.app.customviews.OpenSansButton
<com.sap.sailing.android.shared.ui.customviews.OpenSansButton
android:id="@+id/scanQr"
android:layout_width="fill_parent"
android:layout_height="80dp"
@@ -47,7 +47,7 @@
android:textStyle="bold"
android:text="@string/scan_qr" />
<com.sap.sailing.android.tracking.app.customviews.OpenSansButton
<com.sap.sailing.android.shared.ui.customviews.OpenSansButton
android:id="@+id/noQrCode"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_hud_container.xml
+4 -4
View File
@@ -2,7 +2,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent" >
<com.sap.sailing.android.tracking.app.customviews.OpenSansToolbar
<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"
@@ -15,7 +15,7 @@
android:orientation="vertical"
android:padding="0dp" >
<com.sap.sailing.android.tracking.app.customviews.OpenSansTextView
<com.sap.sailing.android.shared.ui.customviews.OpenSansTextView
android:id="@+id/toolbar_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -24,7 +24,7 @@
android:singleLine="true"
android:textSize="16sp" />
<com.sap.sailing.android.tracking.app.customviews.OpenSansTextView
<com.sap.sailing.android.shared.ui.customviews.OpenSansTextView
android:id="@+id/toolbar_subtitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -33,7 +33,7 @@
android:singleLine="true"
android:textSize="12sp" />
</LinearLayout>
</com.sap.sailing.android.tracking.app.customviews.OpenSansToolbar>
</com.sap.sailing.android.shared.ui.customviews.OpenSansToolbar>
<LinearLayout
android:layout_width="match_parent"
mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_regatta.xml
+14 -14
View File
@@ -37,7 +37,7 @@
android:paddingRight="@dimen/activity_horizontal_margin"
android:src="@drawable/ic_menu_camera" />
<com.sap.sailing.android.tracking.app.customviews.OpenSansTextView
<com.sap.sailing.android.shared.ui.customviews.OpenSansTextView
android:id="@+id/add_photo_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -61,7 +61,7 @@
android:orientation="horizontal"
android:padding="10dp" >
<com.sap.sailing.android.tracking.app.customviews.OpenSansTextView
<com.sap.sailing.android.shared.ui.customviews.OpenSansTextView
android:id="@+id/competitor_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -92,7 +92,7 @@
android:textColor="@color/white" />
</RelativeLayout>
<com.sap.sailing.android.tracking.app.customviews.OpenSansTextView
<com.sap.sailing.android.shared.ui.customviews.OpenSansTextView
android:id="@+id/sail_id"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -168,7 +168,7 @@
android:padding="10dp"
android:visibility="invisible" >
<com.sap.sailing.android.tracking.app.customviews.OpenSansTextView
<com.sap.sailing.android.shared.ui.customviews.OpenSansTextView
android:id="@+id/thank_you_note"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
@@ -187,7 +187,7 @@
android:orientation="horizontal"
android:padding="10dp" >
<com.sap.sailing.android.tracking.app.customviews.OpenSansTextView
<com.sap.sailing.android.shared.ui.customviews.OpenSansTextView
android:id="@+id/regatta_starts_in"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
@@ -222,7 +222,7 @@
android:orientation="vertical"
android:padding="0dp" >
<com.sap.sailing.android.tracking.app.customviews.OpenSansTextView
<com.sap.sailing.android.shared.ui.customviews.OpenSansTextView
android:id="@+id/starts_in_days"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -230,7 +230,7 @@
android:textColor="@color/white"
android:textSize="40sp" />
<com.sap.sailing.android.tracking.app.customviews.OpenSansTextView
<com.sap.sailing.android.shared.ui.customviews.OpenSansTextView
android:id="@+id/starts_in_days_label"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -253,7 +253,7 @@
android:orientation="vertical"
android:padding="0dp" >
<com.sap.sailing.android.tracking.app.customviews.OpenSansTextView
<com.sap.sailing.android.shared.ui.customviews.OpenSansTextView
android:id="@+id/starts_in_hours"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -261,7 +261,7 @@
android:textColor="@color/white"
android:textSize="40sp" />
<com.sap.sailing.android.tracking.app.customviews.OpenSansTextView
<com.sap.sailing.android.shared.ui.customviews.OpenSansTextView
android:id="@+id/starts_in_hours_label"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -284,7 +284,7 @@
android:orientation="vertical"
android:padding="0dp" >
<com.sap.sailing.android.tracking.app.customviews.OpenSansTextView
<com.sap.sailing.android.shared.ui.customviews.OpenSansTextView
android:id="@+id/starts_in_minutes"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -292,7 +292,7 @@
android:textColor="@color/white"
android:textSize="40sp" />
<com.sap.sailing.android.tracking.app.customviews.OpenSansTextView
<com.sap.sailing.android.shared.ui.customviews.OpenSansTextView
android:id="@+id/starts_in_minutes_label"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -331,7 +331,7 @@
android:layout_below="@id/white_bar"
android:orientation="horizontal" >
<com.sap.sailing.android.tracking.app.customviews.OpenSansButton
<com.sap.sailing.android.shared.ui.customviews.OpenSansButton
android:id="@+id/show_leaderboards_button"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
@@ -345,7 +345,7 @@
android:textAllCaps="true"
android:textStyle="bold" />
<com.sap.sailing.android.tracking.app.customviews.OpenSansButton
<com.sap.sailing.android.shared.ui.customviews.OpenSansButton
android:id="@+id/start_tracking"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
@@ -370,7 +370,7 @@
android:layout_alignParentStart="true"
android:background="@color/darker_gray" >
<com.sap.sailing.android.tracking.app.customviews.OpenSansTextView
<com.sap.sailing.android.shared.ui.customviews.OpenSansTextView
android:id="@+id/bottom_announcement"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_speed.xml
+2 -2
View File
@@ -23,7 +23,7 @@
android:layout_centerInParent="true"
android:orientation="vertical" >
<com.sap.sailing.android.tracking.app.customviews.AutoResizeLightTextView
<com.sap.sailing.android.shared.ui.customviews.AutoResizeLightTextView
android:id="@+id/speed_text_view"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
@@ -34,7 +34,7 @@
android:textSize="124sp"
android:textStyle="bold" />
<com.sap.sailing.android.tracking.app.customviews.AutoResizeLightTextView
<com.sap.sailing.android.shared.ui.customviews.AutoResizeLightTextView
android:id="@+id/speed_unit_text_view"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_stop_button.xml
+3 -3
View File
@@ -14,7 +14,7 @@
android:baselineAligned="false"
android:paddingTop="15dp" >
<com.sap.sailing.android.tracking.app.customviews.OpenSansTextView
<com.sap.sailing.android.shared.ui.customviews.OpenSansTextView
android:id="@+id/tracking_time"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
@@ -23,7 +23,7 @@
android:layout_alignParentTop="true"
android:text="@string/tracking_time" />
<com.sap.sailing.android.tracking.app.customviews.AutoResizeLightTextView
<com.sap.sailing.android.shared.ui.customviews.AutoResizeLightTextView
tools:ignore="InconsistentLayout"
android:id="@+id/tracking_time_label"
android:layout_width="match_parent"
@@ -44,7 +44,7 @@
android:layout_height="100dp"
android:layout_alignParentBottom="true" >
<com.sap.sailing.android.tracking.app.customviews.OpenSansButton
<com.sap.sailing.android.shared.ui.customviews.OpenSansButton
android:id="@+id/stop_tracking"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_tracking.xml
+9 -9
View File
@@ -16,7 +16,7 @@
android:layout_height="wrap_content"
android:background="@color/black" >
<com.sap.sailing.android.tracking.app.customviews.OpenSansTextView
<com.sap.sailing.android.shared.ui.customviews.OpenSansTextView
android:id="@+id/mode_label"
android:layout_width="wrap_content"
android:layout_height="50dp"
@@ -28,7 +28,7 @@
android:paddingRight="10dp"
android:text="@string/tracking_mode" />
<com.sap.sailing.android.tracking.app.customviews.OpenSansTextView
<com.sap.sailing.android.shared.ui.customviews.OpenSansTextView
android:id="@+id/mode"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -41,7 +41,7 @@
android:text="@string/tracking_mode_caching"
android:textColor="@color/sap_green" />
<com.sap.sailing.android.tracking.app.customviews.OpenSansTextView
<com.sap.sailing.android.shared.ui.customviews.OpenSansTextView
android:id="@+id/tracking_unsent_fixes_label"
android:layout_width="wrap_content"
android:layout_height="50dp"
@@ -51,7 +51,7 @@
android:paddingLeft="10dp"
android:text="@string/tracking_unsent_fixes" />
<com.sap.sailing.android.tracking.app.customviews.OpenSansTextView
<com.sap.sailing.android.shared.ui.customviews.OpenSansTextView
android:id="@+id/tracking_unsent_fixes"
android:layout_width="wrap_content"
android:layout_height="50dp"
@@ -63,7 +63,7 @@
android:paddingLeft="10dp"
android:text="@string/none" />
<com.sap.sailing.android.tracking.app.customviews.OpenSansTextView
<com.sap.sailing.android.shared.ui.customviews.OpenSansTextView
android:id="@+id/tracking_status_label"
android:layout_width="wrap_content"
android:layout_height="50dp"
@@ -73,7 +73,7 @@
android:paddingRight="10dp"
android:text="@string/tracking_status" />
<com.sap.sailing.android.tracking.app.customviews.OpenSansTextView
<com.sap.sailing.android.shared.ui.customviews.OpenSansTextView
android:id="@+id/tracking_status"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -95,7 +95,7 @@
android:gravity="center_vertical"
android:orientation="horizontal" >
<com.sap.sailing.android.tracking.app.customviews.OpenSansTextView
<com.sap.sailing.android.shared.ui.customviews.OpenSansTextView
android:id="@+id/gps_accuracy_label"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -103,7 +103,7 @@
android:paddingLeft="9dp"
android:text="" />
<com.sap.sailing.android.tracking.app.customviews.SignalQualityIndicatorView
<com.sap.sailing.android.shared.ui.customviews.SignalQualityIndicatorView
android:id="@+id/gps_quality_indicator"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -114,7 +114,7 @@
app:signalQuality="none" />
</LinearLayout>
<com.sap.sailing.android.tracking.app.customviews.OpenSansTextView
<com.sap.sailing.android.shared.ui.customviews.OpenSansTextView
android:id="@+id/gps_quality"
android:layout_width="wrap_content"
android:layout_height="50dp"
mobile/com.sap.sailing.android.tracking.app/res/layout/pref_with_actionbar.xml
+4 -4
View File
@@ -5,7 +5,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent">
<com.sap.sailing.android.tracking.app.customviews.OpenSansToolbar
<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"
@@ -17,7 +17,7 @@
android:layout_height="match_parent"
android:padding="10dp">
<com.sap.sailing.android.tracking.app.customviews.OpenSansTextView
<com.sap.sailing.android.shared.ui.customviews.OpenSansTextView
android:id="@+id/toolbar_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -26,7 +26,7 @@
android:singleLine="true"
android:textSize="16sp"/>
<com.sap.sailing.android.tracking.app.customviews.OpenSansTextView
<com.sap.sailing.android.shared.ui.customviews.OpenSansTextView
android:id="@+id/toolbar_subtitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -37,7 +37,7 @@
</LinearLayout>
</com.sap.sailing.android.tracking.app.customviews.OpenSansToolbar>
</com.sap.sailing.android.shared.ui.customviews.OpenSansToolbar>
<View
android:id="@+id/top_bar"
mobile/com.sap.sailing.android.tracking.app/res/layout/ragatta_listview_row.xml
+1 -1
View File
@@ -22,7 +22,7 @@
android:layout_marginEnd="10dp"
android:textColor="@color/white" />
<com.sap.sailing.android.tracking.app.customviews.OpenSansTextView
<com.sap.sailing.android.shared.ui.customviews.OpenSansTextView
android:id="@+id/regattaName"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
mobile/com.sap.sailing.android.tracking.app/res/layout/regatta_listview_header.xml
+1 -1
View File
@@ -13,7 +13,7 @@
android:layout_alignParentTop="true"
android:background="@color/sap_yellow" />
<com.sap.sailing.android.tracking.app.customviews.OpenSansTextView
<com.sap.sailing.android.shared.ui.customviews.OpenSansTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/top_bar"
mobile/com.sap.sailing.android.tracking.app/res/values-de/strings.xml
-11
View File
@@ -23,12 +23,6 @@
<string name="title_activity_tracking">Tracking</string>
<string name="please_confirm">Bitte bestätigen</string>
<string name="do_you_really_want_to_stop_tracking">Soll das Tracking wirklich beendet werden?</string>
<string name="ok">OK</string>
<string name="signal_accuracy_indicator_view_description">GPS Genauigkeit</string>
<string name="poor">schwach</string>
<string name="good">gut</string>
<string name="great">sehr gut</string>
<string name="no_signal">kein Signal</string>
<string name="tracking_status_tracking">Tracking läuft</string>
<string name="tracking_status_no_gps_signal">Kein GPS Signal!</string>
<string name="tracking_mode_offline">Offline</string>
@@ -67,8 +61,6 @@
<string name="your_regattas">Ihre Regattas:</string>
<string name="close">Schließen</string>
<string name="thank_you_you_successfully_participated">Vielen Dank, Sie haben erfolgreich an der Regatta teilgenommen.\n\nIhr SAP Sailing Team</string>
<string name="no_qr_code_popup_title">Kein QR-Code?</string>
<string name="no_qr_code_popup_message">Bitte kontaktieren Sie die Rennleitung, falls Sie keinen QR-Code erhalten haben.</string>
<string name="tracking_colon">Tracke:</string>
<string name="tracking_gps_accuracy">GPS Genauigkeit</string>
<string name="regatta_in_progress">Die Regatta findet gerade statt.</string>
@@ -79,9 +71,6 @@
<string name="show_leaderboard">Leaderboard</string>
<string name="desc_regatta_user_image">Benutzerdefiniertes Bild für Regatta</string>
<string name="desc_add_photo_button">Foto hinzufügen Button</string>
<string name="error_play_store_and_scanning_not_available">"PlayStore und BarcodeScanner-App nicht verfügbar."</string>
<string name="scanning_cancelled">Scan abgebrochen</string>
<string name="error_scanning_qrcode">Fehler beim Scannen des QR-Codes {result-code}</string>
<string name="error_invalid_qr_code">Ungültiger QR-Code</string>
<string name="error_while_receiving_server_data">Fehler beim Empfang vom Server</string>
<string name="info_already_checked_in_this_qr_code">Bereits für diese Regatta eingecheckt</string>
mobile/com.sap.sailing.android.tracking.app/res/values-de/strings_dialog.xml
-2
View File
@@ -1,11 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="notify_user_api_call_failed">Bei der Kommunikation mit dem Server ist ein Fehler aufgetreten. Bitte versuchen Sie es noch einmal.</string>
<string name="confirm_data_hello_name">Hallo {full_name}</string>
<string name="confirm_data_you_are_signed_in_as_sail_id">Sie sind als {sail_id} gemeldet</string>
<string name="confirm_data_is_correct">OK</string>
<string name="decline_data_is_incorrect">Das bin nicht ich!</string>
<string name="notify_user_db_operation_failed">Fehler: Datenbank-Operation ist fehlgeschlagen.</string>
</resources>
mobile/com.sap.sailing.android.tracking.app/res/values/attrs.xml
-11
View File
@@ -1,11 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<declare-styleable name="SignalQualityIndicatorView">
<attr name="signalQuality" format="enum">
<enum name="none" value="0"/>
<enum name="poor" value="2"/>
<enum name="good" value="3"/>
<enum name="great" value="4"/>
</attr>
</declare-styleable>
</resources>
mobile/com.sap.sailing.android.tracking.app/res/values/colors.xml
-4
View File
@@ -4,13 +4,9 @@
<color name="white_transparent">#55FFFFFF</color>
<color name="white_less_transparent">#CCFFFFFF</color>
<color name="black_transparent">#55000000</color>
<color name="black">#000000</color>
<color name="green">#00FF00</color>
<color name="gray">#333333</color>
<color name="darker_gray">#242424</color>
<color name="sap_green">#8AB54E</color>
<color name="sap_red">#E94A1B</color>
<color name="sap_yellow">#EEAA29</color>
<color name="colorPrimary">@color/gray</color>
<color name="colorPrimaryDark">@color/colorPrimary</color>
mobile/com.sap.sailing.android.tracking.app/res/values/preferences.xml
-1
View File
@@ -27,7 +27,6 @@
<string name="preference_tracking_timer_started">trackingTimerStarted</string>
<string name="preference_tracker_is_tracking">trackerIsTracking</string>
<string name="preference_tracker_is_tracking_checkin_digest">trackerIsTrackingCheckinDigest</string>
<string name="preference_last_scanned_qr_code">lastScannedQRCode</string>
<string name="preference_heading_with_declination_subtracted_is_enabled">On</string>
<string name="preference_heading_with_declination_subtracted_is_disabled">Off</string>
mobile/com.sap.sailing.android.tracking.app/res/values/strings.xml
-11
View File
@@ -18,12 +18,6 @@
<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>
<string name="ok">OK</string>
<string name="signal_accuracy_indicator_view_description">GPS Accuracy</string>
<string name="poor">poor</string>
<string name="good">good</string>
<string name="great">great</string>
<string name="no_signal">no signal</string>
<string name="checkin_digest" translatable="false">CheckinDigest</string>
<string name="add_team_photo">Add Team Photo</string>
<string name="do_you_want_to_choose_existing_img_or_take_a_new_one">Do you want to use an existing image or take a new one?</string>
@@ -52,8 +46,6 @@
<string name="your_regattas">Your Regattas:</string>
<string name="close">Close</string>
<string name="thank_you_you_successfully_participated">Thank you, you have successfully taken part in the regatta.\n\nYour SAP Sailing Team</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="tracking_colon">Tracking:</string>
<string name="regatta_in_progress">The regatta is in progress.</string>
<string name="heading">Heading</string>
@@ -61,9 +53,6 @@
<string name="speed_over_ground">Speed over Ground</string>
<string name="none">None</string>
<string name="show_leaderboard">Leader board</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_invalid_qr_code">Invalid QR-Code</string>
<string name="error_while_receiving_server_data">Error while receiving server data</string>
<string name="info_already_checked_in_this_qr_code">Already checked in to this regatta</string>
mobile/com.sap.sailing.android.tracking.app/res/values/strings_dialog.xml
-2
View File
@@ -2,11 +2,9 @@
<string name="yes">Yes</string>
<string name="no">No</string>
<string name="notify_user_api_call_failed">An error occurred while contacting the server. Please try again.</string>
<string name="confirm_data_hello_name">Hello {full_name}</string>
<string name="confirm_data_you_are_signed_in_as_sail_id">You are signing in as {sail_id}</string>
<string name="confirm_data_is_correct">OK</string>
<string name="decline_data_is_incorrect">That\'s not me!</string>
<string name="notify_user_db_operation_failed">Error: Database operation has failed.</string>
</resources>