mirror of
https://github.com/eclipse-sailing-analytics/sailing-analytics.git
synced 2026-10-27 06:17:27 +00:00
Merge branch 'android_apps' of ssh://sapsailing.com/home/trac/git into android_apps
This commit is contained in:
commit
6b76dd5994
2338 files changed
+121140
-26616
No files matched your search
@@ -1,8 +1,7 @@
|
||||
<?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/com.sap.sailing.android.tracking.app.views"
|
||||
xmlns:tools="http://schemas.android.com/tools"
|
||||
xmlns:app="http://schemas.android.com/apk/res/com.sap.sailing.android.tracking.app"
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:background="@color/black" >
|
||||
|
||||
@@ -1,8 +1,7 @@
|
||||
<?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/com.sap.sailing.android.tracking.app.views"
|
||||
xmlns:tools="http://schemas.android.com/tools"
|
||||
xmlns:app="http://schemas.android.com/apk/res/com.sap.sailing.android.tracking.app"
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="402dp"
|
||||
android:background="@color/black" >
|
||||
|
||||
@@ -5,9 +5,17 @@
|
||||
android:orientation="vertical" >
|
||||
|
||||
<Button
|
||||
android:id="@+id/btnScanBarcode"
|
||||
android:id="@+id/btnScanQRCode"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/scan_race_barcode" />
|
||||
android:text="@string/scan_qrcode"
|
||||
android:onClick="onScanQRCodeClicked" />
|
||||
|
||||
<Button
|
||||
android:id="@+id/btnToggleTracking"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/start_tracking"
|
||||
android:onClick="onToggleTrackingClicked" />
|
||||
|
||||
</LinearLayout>
|
||||
@@ -1,19 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:orientation="vertical" >
|
||||
|
||||
<Button
|
||||
android:id="@+id/btnStartTracking"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/start_tracking" />
|
||||
|
||||
<Button
|
||||
android:id="@+id/btnNextActivity"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/next_activity" />
|
||||
|
||||
</LinearLayout>
|
||||
@@ -1,13 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:orientation="vertical" >
|
||||
|
||||
<Button
|
||||
android:id="@+id/btnStopTracking"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/stop_tracking" />
|
||||
|
||||
</LinearLayout>
|
||||
@@ -13,12 +13,10 @@
|
||||
<string name="server_url">Server</string>
|
||||
<string name="device_identifier">Device Identifier</string>
|
||||
<string name="play_services_available">Google Play services is available</string>
|
||||
<string name="stop_tracking">Stop Tracking</string>
|
||||
<string name="start_tracking">Start Tracking</string>
|
||||
<string name="next_activity">Next Activity</string>
|
||||
<string name="tracker_started">SAP Sailing Tracker started</string>
|
||||
<string name="tracker_stopped">SAP Sailing Tracker stopped</string>
|
||||
<string name="scan_race_barcode">Scan Race Barcode</string>
|
||||
<string name="scan_qrcode">Scan QRCode</string>
|
||||
<string name="gps_fix_interval">GPS fix interval</string>
|
||||
<string name="title_activity_regatta">Regatta</string>
|
||||
<string name="title_activity_webview">Leader board</string>
|
||||
|
||||
Reference in new issue
Block a user