mirror of
https://github.com/eclipse-sailing-analytics/sailing-analytics.git
synced 2026-10-07 12:51:02 +00:00
Merge branch 'ubilabs--rcapp--develop' into ubilabs--rcapp--bug-3148
This commit is contained in:
Peter Siegmund committed
commit
182a46d8d1
131 files changed
+1807
-734
No files matched your search
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Binary file not shown.
|
After Width: | Height: | Size: 751 B |
Binary file not shown.
|
After Width: | Height: | Size: 625 B |
Binary file not shown.
|
After Width: | Height: | Size: 751 B |
Binary file not shown.
|
After Width: | Height: | Size: 1004 B |
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Binary file not shown.
|
After Width: | Height: | Size: 583 B |
Binary file not shown.
|
After Width: | Height: | Size: 487 B |
Binary file not shown.
|
After Width: | Height: | Size: 583 B |
Binary file not shown.
|
After Width: | Height: | Size: 751 B |
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Binary file not shown.
|
After Width: | Height: | Size: 934 B |
Binary file not shown.
|
After Width: | Height: | Size: 751 B |
Binary file not shown.
|
After Width: | Height: | Size: 934 B |
Binary file not shown.
|
After Width: | Height: | Size: 1.2 KiB |
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Binary file not shown.
|
After Width: | Height: | Size: 1.2 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 1004 B |
Binary file not shown.
|
After Width: | Height: | Size: 1.2 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 1.8 KiB |
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Binary file not shown.
|
After Width: | Height: | Size: 1.6 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 1.2 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 1.6 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 2.4 KiB |
+1
-1
@@ -6,7 +6,7 @@
|
||||
android:top="0dp">
|
||||
<bitmap
|
||||
android:gravity="center"
|
||||
android:src="@drawable/flag_first_blue_32dp"/>
|
||||
android:src="@drawable/flag_blue_first_32dp"/>
|
||||
</item>
|
||||
|
||||
</layer-list>
|
||||
+1
-1
@@ -6,7 +6,7 @@
|
||||
android:top="0dp">
|
||||
<bitmap
|
||||
android:gravity="center"
|
||||
android:src="@drawable/flag_first_blue_32dp"/>
|
||||
android:src="@drawable/flag_blue_first_32dp"/>
|
||||
</item>
|
||||
|
||||
<item
|
||||
+1
-1
@@ -6,7 +6,7 @@
|
||||
android:top="0dp">
|
||||
<bitmap
|
||||
android:gravity="center"
|
||||
android:src="@drawable/flag_first_blue_64dp"/>
|
||||
android:src="@drawable/flag_blue_first_48dp"/>
|
||||
</item>
|
||||
|
||||
</layer-list>
|
||||
+1
-1
@@ -6,7 +6,7 @@
|
||||
android:top="0dp">
|
||||
<bitmap
|
||||
android:gravity="center"
|
||||
android:src="@drawable/flag_first_blue_48dp"/>
|
||||
android:src="@drawable/flag_blue_first_48dp"/>
|
||||
</item>
|
||||
|
||||
<item
|
||||
+1
-1
@@ -6,7 +6,7 @@
|
||||
android:top="0dp">
|
||||
<bitmap
|
||||
android:gravity="center"
|
||||
android:src="@drawable/flag_first_blue_48dp"/>
|
||||
android:src="@drawable/flag_blue_first_64dp"/>
|
||||
</item>
|
||||
|
||||
</layer-list>
|
||||
+1
-1
@@ -6,7 +6,7 @@
|
||||
android:top="0dp">
|
||||
<bitmap
|
||||
android:gravity="center"
|
||||
android:src="@drawable/flag_first_blue_64dp"/>
|
||||
android:src="@drawable/flag_blue_first_64dp"/>
|
||||
</item>
|
||||
|
||||
<item
|
||||
+1
-1
@@ -6,7 +6,7 @@
|
||||
android:top="0dp">
|
||||
<bitmap
|
||||
android:gravity="center"
|
||||
android:src="@drawable/flag_first_blue_96dp"/>
|
||||
android:src="@drawable/flag_blue_first_96dp"/>
|
||||
</item>
|
||||
|
||||
</layer-list>
|
||||
+1
-1
@@ -6,7 +6,7 @@
|
||||
android:top="0dp">
|
||||
<bitmap
|
||||
android:gravity="center"
|
||||
android:src="@drawable/flag_first_blue_96dp"/>
|
||||
android:src="@drawable/flag_blue_first_96dp"/>
|
||||
</item>
|
||||
|
||||
<item
|
||||
@@ -0,0 +1,12 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
|
||||
<item
|
||||
android:left="0dp"
|
||||
android:top="0dp">
|
||||
<bitmap
|
||||
android:gravity="center"
|
||||
android:src="@drawable/flag_blue_last_32dp"/>
|
||||
</item>
|
||||
|
||||
</layer-list>
|
||||
@@ -0,0 +1,20 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
|
||||
<item
|
||||
android:left="0dp"
|
||||
android:top="0dp">
|
||||
<bitmap
|
||||
android:gravity="center"
|
||||
android:src="@drawable/flag_blue_last_32dp"/>
|
||||
</item>
|
||||
|
||||
<item
|
||||
android:left="0dp"
|
||||
android:top="0dp">
|
||||
<bitmap
|
||||
android:gravity="center"
|
||||
android:src="@drawable/flag_shape_01_outline_32dp"/>
|
||||
</item>
|
||||
|
||||
</layer-list>
|
||||
@@ -0,0 +1,12 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
|
||||
<item
|
||||
android:left="0dp"
|
||||
android:top="0dp">
|
||||
<bitmap
|
||||
android:gravity="center"
|
||||
android:src="@drawable/flag_blue_last_48dp"/>
|
||||
</item>
|
||||
|
||||
</layer-list>
|
||||
@@ -0,0 +1,20 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
|
||||
<item
|
||||
android:left="0dp"
|
||||
android:top="0dp">
|
||||
<bitmap
|
||||
android:gravity="center"
|
||||
android:src="@drawable/flag_blue_last_48dp"/>
|
||||
</item>
|
||||
|
||||
<item
|
||||
android:left="0dp"
|
||||
android:top="0dp">
|
||||
<bitmap
|
||||
android:gravity="center"
|
||||
android:src="@drawable/flag_shape_01_outline_48dp"/>
|
||||
</item>
|
||||
|
||||
</layer-list>
|
||||
@@ -0,0 +1,12 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
|
||||
<item
|
||||
android:left="0dp"
|
||||
android:top="0dp">
|
||||
<bitmap
|
||||
android:gravity="center"
|
||||
android:src="@drawable/flag_blue_last_64dp"/>
|
||||
</item>
|
||||
|
||||
</layer-list>
|
||||
@@ -0,0 +1,20 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
|
||||
<item
|
||||
android:left="0dp"
|
||||
android:top="0dp">
|
||||
<bitmap
|
||||
android:gravity="center"
|
||||
android:src="@drawable/flag_blue_last_64dp"/>
|
||||
</item>
|
||||
|
||||
<item
|
||||
android:left="0dp"
|
||||
android:top="0dp">
|
||||
<bitmap
|
||||
android:gravity="center"
|
||||
android:src="@drawable/flag_shape_01_outline_64dp"/>
|
||||
</item>
|
||||
|
||||
</layer-list>
|
||||
@@ -0,0 +1,12 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
|
||||
<item
|
||||
android:left="0dp"
|
||||
android:top="0dp">
|
||||
<bitmap
|
||||
android:gravity="center"
|
||||
android:src="@drawable/flag_blue_last_96dp"/>
|
||||
</item>
|
||||
|
||||
</layer-list>
|
||||
@@ -0,0 +1,20 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
|
||||
<item
|
||||
android:left="0dp"
|
||||
android:top="0dp">
|
||||
<bitmap
|
||||
android:gravity="center"
|
||||
android:src="@drawable/flag_blue_last_96dp"/>
|
||||
</item>
|
||||
|
||||
<item
|
||||
android:left="0dp"
|
||||
android:top="0dp">
|
||||
<bitmap
|
||||
android:gravity="center"
|
||||
android:src="@drawable/flag_shape_01_outline_96dp"/>
|
||||
</item>
|
||||
|
||||
</layer-list>
|
||||
@@ -2,45 +2,14 @@
|
||||
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||
android:orientation="vertical">
|
||||
|
||||
<RelativeLayout
|
||||
<com.sap.sailing.racecommittee.app.ui.layouts.HeaderLayout
|
||||
android:id="@+id/header"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="@dimen/selector_header_height"
|
||||
android:background="?attr/sap_gray"
|
||||
android:clickable="true">
|
||||
|
||||
<LinearLayout
|
||||
android:id="@+id/header_layout"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_centerVertical="true"
|
||||
android:layout_marginLeft="@dimen/side_padding"
|
||||
android:orientation="horizontal">
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/header_back"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:src="?attr/chevron_left_24dp"
|
||||
android:layout_gravity="center_vertical"/>
|
||||
|
||||
<TextView
|
||||
android:id="@+id/header_text"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/not_available"
|
||||
android:textAppearance="?attr/textHeader"
|
||||
android:layout_gravity="center"/>
|
||||
</LinearLayout>
|
||||
|
||||
<View
|
||||
android:id="@+id/line_top"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="@dimen/unscheduled_header_line"
|
||||
android:layout_alignParentBottom="true"
|
||||
android:background="?attr/black"/>
|
||||
</RelativeLayout>
|
||||
android:layout_height="wrap_content"
|
||||
app:headerText="@string/not_available"/>
|
||||
|
||||
<ListView
|
||||
android:id="@+id/listView"
|
||||
|
||||
@@ -0,0 +1,27 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:tools="http://schemas.android.com/tools"
|
||||
android:id="@+id/header"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="@dimen/selector_header_height"
|
||||
android:background="?attr/sap_gray"
|
||||
android:clickable="true">
|
||||
|
||||
<TextView
|
||||
android:id="@+id/header_text"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="center_vertical"
|
||||
android:layout_marginLeft="@dimen/side_padding"
|
||||
android:drawableLeft="?attr/chevron_left_24dp"
|
||||
android:gravity="center"
|
||||
android:textAppearance="?attr/textHeader"
|
||||
tools:text="Header Text" />
|
||||
|
||||
<View
|
||||
android:id="@+id/line_top"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="@dimen/header_line"
|
||||
android:layout_gravity="bottom"
|
||||
android:background="?attr/black" />
|
||||
</FrameLayout>
|
||||
@@ -44,7 +44,7 @@
|
||||
tools:text="https://dev.sapsailing.com"/>
|
||||
</RelativeLayout>
|
||||
|
||||
<com.sap.sailing.racecommittee.app.ui.views.FloatLabelLayout
|
||||
<com.sap.sailing.racecommittee.app.ui.layouts.FloatLabelLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
app:floatLabelPaddingLeft="@dimen/float_label_padding"
|
||||
@@ -59,9 +59,9 @@
|
||||
android:textAppearance="?attr/textSmall"
|
||||
android:textColor="@color/constant_black"
|
||||
android:textColorHint="@color/dialog_color_text"/>
|
||||
</com.sap.sailing.racecommittee.app.ui.views.FloatLabelLayout>
|
||||
</com.sap.sailing.racecommittee.app.ui.layouts.FloatLabelLayout>
|
||||
|
||||
<com.sap.sailing.racecommittee.app.ui.views.FloatLabelLayout
|
||||
<com.sap.sailing.racecommittee.app.ui.layouts.FloatLabelLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
app:floatLabelPaddingLeft="@dimen/float_label_padding"
|
||||
@@ -76,7 +76,7 @@
|
||||
android:textAppearance="?attr/textSmall"
|
||||
android:textColor="@color/constant_black"
|
||||
android:textColorHint="@color/dialog_color_text"/>
|
||||
</com.sap.sailing.racecommittee.app.ui.views.FloatLabelLayout>
|
||||
</com.sap.sailing.racecommittee.app.ui.layouts.FloatLabelLayout>
|
||||
|
||||
<Button
|
||||
android:id="@+id/login_request"
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
android:orientation="vertical"
|
||||
android:padding="@dimen/side_padding">
|
||||
|
||||
<com.sap.sailing.racecommittee.app.ui.views.FloatLabelLayout
|
||||
<com.sap.sailing.racecommittee.app.ui.layouts.FloatLabelLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="@dimen/side_padding"
|
||||
@@ -24,9 +24,9 @@
|
||||
android:textColor="@color/black"
|
||||
android:textColorHint="@color/dialog_color_text"
|
||||
tools:text="@string/preference_server_url_default"/>
|
||||
</com.sap.sailing.racecommittee.app.ui.views.FloatLabelLayout>
|
||||
</com.sap.sailing.racecommittee.app.ui.layouts.FloatLabelLayout>
|
||||
|
||||
<com.sap.sailing.racecommittee.app.ui.views.FloatLabelLayout
|
||||
<com.sap.sailing.racecommittee.app.ui.layouts.FloatLabelLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="@dimen/side_padding"
|
||||
@@ -45,5 +45,5 @@
|
||||
android:textColor="@color/black"
|
||||
android:textColorHint="@color/dialog_color_text"
|
||||
tools:text="N10"/>
|
||||
</com.sap.sailing.racecommittee.app.ui.views.FloatLabelLayout>
|
||||
</com.sap.sailing.racecommittee.app.ui.layouts.FloatLabelLayout>
|
||||
</LinearLayout>
|
||||
+3
-3
@@ -6,7 +6,7 @@
|
||||
tools:showIn="@layout/race_panel_flags_ver">
|
||||
|
||||
<RelativeLayout
|
||||
android:id="@+id/more_flags_layer"
|
||||
android:id="@+id/blue_first_flags_layer"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_centerInParent="true">
|
||||
@@ -25,7 +25,7 @@
|
||||
<ImageView
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="@dimen/side_button_imageSize"
|
||||
android:src="?attr/flags_more" />
|
||||
android:src="?attr/flags_blue_first" />
|
||||
</RelativeLayout>
|
||||
|
||||
<TextView
|
||||
@@ -37,7 +37,7 @@
|
||||
</LinearLayout>
|
||||
|
||||
<FrameLayout
|
||||
android:id="@+id/more_flags_lock"
|
||||
android:id="@+id/blue_first_flags_lock"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_alignParentRight="true"
|
||||
@@ -0,0 +1,57 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<merge 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"
|
||||
tools:showIn="@layout/race_panel_flags_ver">
|
||||
|
||||
<RelativeLayout
|
||||
android:id="@+id/blue_last_flags_layer"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_centerInParent="true">
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_centerInParent="true"
|
||||
android:orientation="vertical">
|
||||
|
||||
<RelativeLayout
|
||||
android:layout_width="@dimen/side_button_imageSize"
|
||||
android:layout_height="@dimen/side_button_imageSize"
|
||||
android:layout_gravity="center_horizontal">
|
||||
|
||||
<ImageView
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="@dimen/side_button_imageSize"
|
||||
android:src="?attr/flags_blue_last" />
|
||||
</RelativeLayout>
|
||||
|
||||
<TextView
|
||||
android:id="@+id/blue_last_flags_text"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="center_horizontal"
|
||||
android:textAppearance="?attr/textPanelCaption"
|
||||
tools:text="00:12:34" />
|
||||
</LinearLayout>
|
||||
|
||||
<FrameLayout
|
||||
android:id="@+id/blue_last_flags_lock"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_alignParentRight="true"
|
||||
android:layout_alignParentTop="true"
|
||||
android:background="@color/lock_background"
|
||||
android:padding="@dimen/panel_lock_padding"
|
||||
android:visibility="gone"
|
||||
tools:visibility="visible">
|
||||
|
||||
<ImageView
|
||||
android:layout_width="@dimen/side_button_lockSize"
|
||||
android:layout_height="@dimen/side_button_lockSize"
|
||||
android:src="?attr/lock_outline" />
|
||||
</FrameLayout>
|
||||
</RelativeLayout>
|
||||
</merge>
|
||||
@@ -1,55 +1,22 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<LinearLayout
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:orientation="vertical">
|
||||
|
||||
<FrameLayout
|
||||
android:id="@+id/photo_header"
|
||||
<com.sap.sailing.racecommittee.app.ui.layouts.HeaderLayout
|
||||
android:id="@+id/header"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="@dimen/selector_header_height"
|
||||
android:background="?attr/sap_gray"
|
||||
android:clickable="false">
|
||||
|
||||
<LinearLayout
|
||||
android:id="@+id/header_text"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="center_vertical"
|
||||
android:layout_marginLeft="@dimen/side_padding"
|
||||
android:orientation="horizontal">
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/header_back"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="center_vertical"
|
||||
android:src="?attr/chevron_left_24dp"/>
|
||||
|
||||
<TextView
|
||||
android:id="@+id/header_caption"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="center"
|
||||
android:text="@string/finished_list"
|
||||
android:textAppearance="?attr/textHeader"/>
|
||||
</LinearLayout>
|
||||
|
||||
<View
|
||||
android:id="@+id/line_top"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="@dimen/unscheduled_header_line"
|
||||
android:layout_gravity="bottom"
|
||||
android:background="?attr/black"/>
|
||||
</FrameLayout>
|
||||
android:layout_height="wrap_content"
|
||||
app:headerText="@string/finished_list" />
|
||||
|
||||
<android.support.v7.widget.RecyclerView
|
||||
android:id="@+id/photo_list"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="0dp"
|
||||
android:layout_weight="4"
|
||||
android:paddingTop="@dimen/side_padding"/>
|
||||
android:paddingTop="@dimen/side_padding" />
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
@@ -70,7 +37,7 @@
|
||||
android:layout_gravity="center"
|
||||
android:background="@drawable/round_button_outline"
|
||||
android:padding="@dimen/default_padding_half"
|
||||
android:src="?attr/photo_camera"/>
|
||||
android:src="?attr/photo_camera" />
|
||||
</FrameLayout>
|
||||
|
||||
<FrameLayout
|
||||
@@ -78,7 +45,7 @@
|
||||
android:layout_height="match_parent"
|
||||
android:layout_weight="1">
|
||||
|
||||
<include layout="@layout/photo_list_button"/>
|
||||
<include layout="@layout/photo_list_button" />
|
||||
</FrameLayout>
|
||||
</LinearLayout>
|
||||
</LinearLayout>
|
||||
@@ -7,7 +7,7 @@
|
||||
android:clickable="true">
|
||||
|
||||
<RelativeLayout
|
||||
android:id="@+id/tracking_header"
|
||||
android:id="@+id/protest_header"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="@dimen/selector_header_height"
|
||||
android:background="?attr/sap_gray"
|
||||
@@ -41,7 +41,7 @@
|
||||
<View
|
||||
android:id="@+id/line_top"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="@dimen/unscheduled_header_line"
|
||||
android:layout_height="@dimen/header_line"
|
||||
android:layout_alignParentBottom="true"
|
||||
android:background="?attr/black"/>
|
||||
</RelativeLayout>
|
||||
@@ -78,7 +78,7 @@
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_above="@id/bottom_bar"
|
||||
android:layout_below="@+id/tracking_header"
|
||||
android:layout_below="@id/protest_header"
|
||||
android:background="?attr/sap_gray_black_30">
|
||||
|
||||
<RelativeLayout
|
||||
|
||||
@@ -36,7 +36,7 @@
|
||||
android:layout_gravity="center"
|
||||
android:layout_marginLeft="@dimen/side_padding"
|
||||
android:layout_marginRight="@dimen/side_padding"
|
||||
android:src="?attr/flag_first_blue" />
|
||||
android:src="?attr/flag_blue_first" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/header_headline"
|
||||
|
||||
@@ -5,21 +5,36 @@
|
||||
android:layout_height="@dimen/navigation_drawer_cell_height"
|
||||
android:background="?attr/sap_gray">
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/protest_image"
|
||||
<LinearLayout
|
||||
android:id="@+id/protest_layout"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_alignParentRight="true"
|
||||
android:layout_centerVertical="true"
|
||||
android:layout_marginLeft="@dimen/default_margin"
|
||||
android:layout_marginRight="@dimen/default_margin"
|
||||
tools:src="@drawable/flag_bravo_48dp" />
|
||||
android:orientation="vertical">
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/protest_image"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginLeft="@dimen/default_margin"
|
||||
android:layout_marginRight="@dimen/default_margin"
|
||||
tools:src="@drawable/flag_bravo_48dp" />
|
||||
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/protest_time"
|
||||
android:layout_gravity="center_horizontal"
|
||||
android:paddingTop="3dp"
|
||||
android:textAppearance="?attr/textPanelCaption"/>
|
||||
</LinearLayout>
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/delimiter_line"
|
||||
android:layout_width="@dimen/thin_line"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_toLeftOf="@id/protest_image"
|
||||
android:layout_toLeftOf="@id/protest_layout"
|
||||
android:background="?attr/black" />
|
||||
|
||||
<ImageView
|
||||
|
||||
@@ -79,19 +79,35 @@
|
||||
</RelativeLayout>
|
||||
|
||||
<RelativeLayout
|
||||
android:id="@+id/more_flags"
|
||||
android:id="@+id/blue_first_flags"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_weight="1">
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/more_flags_marker"
|
||||
android:id="@+id/first_blue_flags_marker"
|
||||
android:layout_width="@dimen/thin_line"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_alignParentRight="true"
|
||||
android:src="?attr/marker"/>
|
||||
|
||||
<include layout="@layout/panel_button_more"/>
|
||||
<include layout="@layout/panel_button_blue_first"/>
|
||||
</RelativeLayout>
|
||||
|
||||
<RelativeLayout
|
||||
android:id="@+id/blue_last_flags"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_weight="1">
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/blue_down_flags_marker"
|
||||
android:layout_width="@dimen/thin_line"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_alignParentRight="true"
|
||||
android:src="?attr/marker"/>
|
||||
|
||||
<include layout="@layout/panel_button_blue_last"/>
|
||||
</RelativeLayout>
|
||||
|
||||
<RelativeLayout
|
||||
|
||||
@@ -80,19 +80,35 @@
|
||||
</RelativeLayout>
|
||||
|
||||
<RelativeLayout
|
||||
android:id="@+id/more_flags"
|
||||
android:id="@+id/blue_first_flags"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="0dp"
|
||||
android:layout_weight="1">
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/more_flags_marker"
|
||||
android:id="@+id/first_blue_flags_marker"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="@dimen/thin_line"
|
||||
android:layout_alignParentBottom="true"
|
||||
android:src="?attr/marker"/>
|
||||
|
||||
<include layout="@layout/panel_button_more"/>
|
||||
<include layout="@layout/panel_button_blue_first"/>
|
||||
</RelativeLayout>
|
||||
|
||||
<RelativeLayout
|
||||
android:id="@+id/blue_last_flags"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="0dp"
|
||||
android:layout_weight="1">
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/blue_down_flags_marker"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="@dimen/thin_line"
|
||||
android:layout_alignParentBottom="true"
|
||||
android:src="?attr/marker"/>
|
||||
|
||||
<include layout="@layout/panel_button_blue_last"/>
|
||||
</RelativeLayout>
|
||||
|
||||
<RelativeLayout
|
||||
|
||||
@@ -1,39 +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="@dimen/selector_header_height"
|
||||
android:background="?attr/sap_gray"
|
||||
android:clickable="true">
|
||||
|
||||
<LinearLayout
|
||||
android:id="@+id/header_text"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_centerVertical="true"
|
||||
android:layout_marginLeft="@dimen/side_padding"
|
||||
android:orientation="horizontal">
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/header_back"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="center_vertical"
|
||||
android:src="?attr/chevron_left_24dp"/>
|
||||
|
||||
<TextView
|
||||
android:id="@+id/header_caption"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="center"
|
||||
android:text="@string/course"
|
||||
android:textAppearance="?attr/textHeader"/>
|
||||
</LinearLayout>
|
||||
|
||||
<View
|
||||
android:id="@+id/line_top"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="@dimen/unscheduled_header_line"
|
||||
android:layout_alignParentBottom="true"
|
||||
android:background="?attr/black"/>
|
||||
</RelativeLayout>
|
||||
@@ -1,14 +1,16 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<LinearLayout
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||
android:background="?attr/sap_gray_black_30"
|
||||
android:clickable="true"
|
||||
android:orientation="vertical">
|
||||
|
||||
<include
|
||||
<com.sap.sailing.racecommittee.app.ui.layouts.HeaderLayout
|
||||
android:id="@+id/header"
|
||||
layout="@layout/race_schedule_course_header"/>
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
app:headerText="@string/course"/>
|
||||
|
||||
</LinearLayout>
|
||||
+6
-5
@@ -2,11 +2,14 @@
|
||||
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||
android:orientation="vertical">
|
||||
|
||||
<include
|
||||
<com.sap.sailing.racecommittee.app.ui.layouts.HeaderLayout
|
||||
android:id="@+id/header"
|
||||
layout="@layout/race_schedule_course_header" />
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
app:headerText="@string/course"/>
|
||||
|
||||
<FrameLayout
|
||||
android:layout_width="match_parent"
|
||||
@@ -59,9 +62,7 @@
|
||||
android:id="@+id/new_course"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_above="@id/bottom_bar"
|
||||
android:layout_marginLeft="@dimen/side_padding"
|
||||
android:layout_marginRight="@dimen/side_padding" />
|
||||
android:layout_above="@id/bottom_bar" />
|
||||
</RelativeLayout>
|
||||
</FrameLayout>
|
||||
</RelativeLayout>
|
||||
+5
-2
@@ -2,11 +2,14 @@
|
||||
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||
android:orientation="vertical">
|
||||
|
||||
<include
|
||||
<com.sap.sailing.racecommittee.app.ui.layouts.HeaderLayout
|
||||
android:id="@+id/header"
|
||||
layout="@layout/race_schedule_course_header" />
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
app:headerText="@string/course"/>
|
||||
|
||||
<RelativeLayout
|
||||
android:layout_width="match_parent"
|
||||
|
||||
@@ -1,12 +1,14 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<RelativeLayout
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent">
|
||||
|
||||
<include
|
||||
<com.sap.sailing.racecommittee.app.ui.layouts.HeaderLayout
|
||||
android:id="@+id/header"
|
||||
layout="@layout/race_schedule_course_header"/>
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
app:headerText="@string/course" />
|
||||
|
||||
<ListView
|
||||
android:id="@+id/listView"
|
||||
@@ -15,5 +17,5 @@
|
||||
android:layout_below="@id/header"
|
||||
android:background="?attr/sap_gray_black_30"
|
||||
android:divider="@null"
|
||||
android:dividerHeight="0dp"/>
|
||||
android:dividerHeight="0dp" />
|
||||
</RelativeLayout>
|
||||
@@ -1,44 +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">
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto">
|
||||
|
||||
<RelativeLayout
|
||||
<com.sap.sailing.racecommittee.app.ui.layouts.HeaderLayout
|
||||
android:id="@+id/header"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="@dimen/selector_header_height"
|
||||
android:background="?attr/sap_gray">
|
||||
|
||||
<LinearLayout
|
||||
android:id="@+id/header_text"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_centerVertical="true"
|
||||
android:layout_marginLeft="@dimen/side_padding"
|
||||
android:orientation="horizontal">
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/header_back"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="center"
|
||||
android:src="?attr/chevron_left_24dp"/>
|
||||
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/start_mode"
|
||||
android:textAppearance="?attr/textHeader"
|
||||
android:layout_gravity="center"/>
|
||||
</LinearLayout>
|
||||
|
||||
<View
|
||||
android:id="@+id/line_top"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="@dimen/unscheduled_header_line"
|
||||
android:layout_alignParentBottom="true"
|
||||
android:background="?attr/black"/>
|
||||
</RelativeLayout>
|
||||
android:layout_height="wrap_content"
|
||||
app:headerText="@string/start_mode"/>
|
||||
|
||||
<ListView
|
||||
android:id="@+id/listView"
|
||||
|
||||
@@ -1,46 +1,14 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<RelativeLayout
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
<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"
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto">
|
||||
|
||||
<RelativeLayout
|
||||
<com.sap.sailing.racecommittee.app.ui.layouts.HeaderLayout
|
||||
android:id="@+id/header"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="@dimen/selector_header_height"
|
||||
android:background="?attr/sap_gray"
|
||||
android:clickable="true">
|
||||
|
||||
<LinearLayout
|
||||
android:id="@+id/header_text"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_centerVertical="true"
|
||||
android:layout_marginLeft="@dimen/side_padding"
|
||||
android:orientation="horizontal">
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/header_back"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="center"
|
||||
android:src="?attr/chevron_left_24dp"/>
|
||||
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="center"
|
||||
android:text="@string/start_procedure"
|
||||
android:textAppearance="?attr/textHeader"/>
|
||||
</LinearLayout>
|
||||
|
||||
<View
|
||||
android:id="@+id/line_top"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="@dimen/unscheduled_header_line"
|
||||
android:layout_alignParentBottom="true"
|
||||
android:background="?attr/black"/>
|
||||
</RelativeLayout>
|
||||
android:layout_height="wrap_content"
|
||||
app:headerText="@string/start_procedure"/>
|
||||
|
||||
<ListView
|
||||
android:id="@+id/listView"
|
||||
|
||||
+8
-40
@@ -5,43 +5,11 @@
|
||||
android:layout_height="match_parent"
|
||||
android:background="?attr/sap_gray_black_30">
|
||||
|
||||
<RelativeLayout
|
||||
<com.sap.sailing.racecommittee.app.ui.layouts.HeaderLayout
|
||||
android:id="@+id/header"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="@dimen/selector_header_height"
|
||||
android:background="?attr/sap_gray"
|
||||
android:clickable="true">
|
||||
|
||||
<LinearLayout
|
||||
android:id="@+id/header_text"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_centerVertical="true"
|
||||
android:layout_marginLeft="@dimen/side_padding"
|
||||
android:orientation="horizontal">
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/header_back"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="center"
|
||||
android:src="?attr/chevron_left_24dp" />
|
||||
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="center"
|
||||
android:text="@string/gate_start_pathfinder"
|
||||
android:textAppearance="?attr/textHeader" />
|
||||
</LinearLayout>
|
||||
</RelativeLayout>
|
||||
|
||||
<View
|
||||
android:id="@+id/line_top"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="@dimen/unscheduled_header_line"
|
||||
android:layout_below="@id/header"
|
||||
android:background="?attr/black" />
|
||||
android:layout_height="wrap_content"
|
||||
app:headerText="@string/gate_start_pathfinder"/>
|
||||
|
||||
<RelativeLayout
|
||||
android:id="@+id/path_finder"
|
||||
@@ -66,7 +34,7 @@
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_above="@id/path_finder"
|
||||
android:layout_below="@id/line_top">
|
||||
android:layout_below="@id/header">
|
||||
|
||||
<RelativeLayout
|
||||
android:layout_width="wrap_content"
|
||||
@@ -80,7 +48,7 @@
|
||||
android:layout_below="@id/label_area"
|
||||
android:orientation="horizontal">
|
||||
|
||||
<com.sap.sailing.racecommittee.app.ui.views.FloatLabelLayout
|
||||
<com.sap.sailing.racecommittee.app.ui.layouts.FloatLabelLayout
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1"
|
||||
@@ -97,9 +65,9 @@
|
||||
android:inputType="textCapCharacters"
|
||||
android:textAppearance="?attr/textNormal"
|
||||
android:textColor="?attr/white" />
|
||||
</com.sap.sailing.racecommittee.app.ui.views.FloatLabelLayout>
|
||||
</com.sap.sailing.racecommittee.app.ui.layouts.FloatLabelLayout>
|
||||
|
||||
<com.sap.sailing.racecommittee.app.ui.views.FloatLabelLayout
|
||||
<com.sap.sailing.racecommittee.app.ui.layouts.FloatLabelLayout
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1"
|
||||
@@ -116,7 +84,7 @@
|
||||
android:inputType="number"
|
||||
android:textAppearance="?attr/textNormal"
|
||||
android:textColor="?attr/white" />
|
||||
</com.sap.sailing.racecommittee.app.ui.views.FloatLabelLayout>
|
||||
</com.sap.sailing.racecommittee.app.ui.layouts.FloatLabelLayout>
|
||||
</LinearLayout>
|
||||
</RelativeLayout>
|
||||
</RelativeLayout>
|
||||
|
||||
+4
-4
@@ -37,7 +37,7 @@
|
||||
android:layout_margin="@dimen/default_margin_twice"
|
||||
android:orientation="horizontal">
|
||||
|
||||
<com.sap.sailing.racecommittee.app.ui.views.FloatLabelLayout
|
||||
<com.sap.sailing.racecommittee.app.ui.layouts.FloatLabelLayout
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1"
|
||||
@@ -54,9 +54,9 @@
|
||||
android:inputType="textCapCharacters"
|
||||
android:textAppearance="?attr/textNormal"
|
||||
android:textColor="?attr/white" />
|
||||
</com.sap.sailing.racecommittee.app.ui.views.FloatLabelLayout>
|
||||
</com.sap.sailing.racecommittee.app.ui.layouts.FloatLabelLayout>
|
||||
|
||||
<com.sap.sailing.racecommittee.app.ui.views.FloatLabelLayout
|
||||
<com.sap.sailing.racecommittee.app.ui.layouts.FloatLabelLayout
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1"
|
||||
@@ -73,7 +73,7 @@
|
||||
android:inputType="number"
|
||||
android:textAppearance="?attr/textNormal"
|
||||
android:textColor="?attr/white" />
|
||||
</com.sap.sailing.racecommittee.app.ui.views.FloatLabelLayout>
|
||||
</com.sap.sailing.racecommittee.app.ui.layouts.FloatLabelLayout>
|
||||
</LinearLayout>
|
||||
</RelativeLayout>
|
||||
</RelativeLayout>
|
||||
+6
-38
@@ -2,46 +2,14 @@
|
||||
<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"
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto">
|
||||
|
||||
<RelativeLayout
|
||||
<com.sap.sailing.racecommittee.app.ui.layouts.HeaderLayout
|
||||
android:id="@+id/header"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="@dimen/selector_header_height"
|
||||
android:background="?attr/sap_gray"
|
||||
android:clickable="true">
|
||||
|
||||
<LinearLayout
|
||||
android:id="@+id/header_text"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_centerVertical="true"
|
||||
android:layout_marginLeft="@dimen/side_padding"
|
||||
android:orientation="horizontal">
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/header_back"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="center"
|
||||
android:src="?attr/chevron_left_24dp" />
|
||||
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="center"
|
||||
android:text="@string/gate_start_timing"
|
||||
android:textAppearance="?attr/textHeader" />
|
||||
</LinearLayout>
|
||||
</RelativeLayout>
|
||||
|
||||
<View
|
||||
android:id="@+id/line_top"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="@dimen/unscheduled_header_line"
|
||||
android:layout_below="@id/header"
|
||||
android:background="?attr/black" />
|
||||
|
||||
android:layout_height="wrap_content"
|
||||
app:headerText="@string/gate_start_timing"/>
|
||||
|
||||
<RelativeLayout
|
||||
android:id="@+id/gate_button_layout"
|
||||
@@ -66,7 +34,7 @@
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_above="@id/gate_button_layout"
|
||||
android:layout_below="@id/line_top"
|
||||
android:layout_below="@id/header"
|
||||
android:background="?attr/sap_gray_black_30">
|
||||
|
||||
<LinearLayout
|
||||
|
||||
+2
-1
@@ -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"
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto">
|
||||
|
||||
<RelativeLayout
|
||||
android:id="@+id/gate_button_layout"
|
||||
|
||||
@@ -1,45 +1,14 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<RelativeLayout
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
<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"
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto">
|
||||
|
||||
<RelativeLayout
|
||||
<com.sap.sailing.racecommittee.app.ui.layouts.HeaderLayout
|
||||
android:id="@+id/header"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="@dimen/selector_header_height"
|
||||
android:background="?attr/sap_gray">
|
||||
|
||||
<LinearLayout
|
||||
android:id="@+id/header_text"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_centerVertical="true"
|
||||
android:layout_marginLeft="@dimen/side_padding"
|
||||
android:orientation="horizontal">
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/header_back"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="center"
|
||||
android:src="?attr/chevron_left_24dp"/>
|
||||
|
||||
<TextView
|
||||
android:id="@+id/header_headline"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="center"
|
||||
android:text="@string/set_time"
|
||||
android:textAppearance="?attr/textHeader"/>
|
||||
</LinearLayout>
|
||||
|
||||
<View
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="@dimen/thin_line"
|
||||
android:layout_alignParentBottom="true"
|
||||
android:background="?attr/black"/>
|
||||
</RelativeLayout>
|
||||
android:layout_height="wrap_content"
|
||||
app:headerText="@string/set_time"/>
|
||||
|
||||
<include
|
||||
layout="@layout/race_time_picker"
|
||||
|
||||
+163
@@ -0,0 +1,163 @@
|
||||
<?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="wrap_content"
|
||||
android:orientation="vertical"
|
||||
android:paddingLeft="24dp"
|
||||
android:paddingRight="24dp">
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="horizontal">
|
||||
|
||||
<TextView
|
||||
android:id="@+id/competitor_position_label"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="center"
|
||||
android:layout_weight="1"
|
||||
android:text="@string/position"
|
||||
android:textColor="@color/dialog_color_text"/>
|
||||
|
||||
<Spinner
|
||||
android:id="@+id/competitor_position"
|
||||
android:layout_width="@dimen/competitor_edit_width"
|
||||
android:layout_height="wrap_content"
|
||||
android:background="@drawable/spinner_background_light"
|
||||
android:spinnerMode="dropdown"/>
|
||||
</LinearLayout>
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="horizontal">
|
||||
|
||||
<TextView
|
||||
android:id="@+id/competitor_penalty_label"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="center"
|
||||
android:layout_weight="1"
|
||||
android:text="@string/penalty"
|
||||
android:textColor="@color/dialog_color_text"/>
|
||||
|
||||
<Spinner
|
||||
android:id="@+id/competitor_penalty"
|
||||
android:layout_width="@dimen/competitor_edit_width"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginBottom="@dimen/side_padding"
|
||||
android:layout_marginTop="@dimen/side_padding"
|
||||
android:background="@drawable/spinner_background_light"
|
||||
android:spinnerMode="dropdown"/>
|
||||
</LinearLayout>
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="horizontal">
|
||||
|
||||
<TextView
|
||||
android:id="@+id/competitor_score_label"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="center"
|
||||
android:layout_weight="1"
|
||||
android:text="@string/score"
|
||||
android:textColor="@color/dialog_color_text"/>
|
||||
|
||||
<EditText
|
||||
android:id="@+id/competitor_score"
|
||||
android:layout_width="@dimen/competitor_edit_width"
|
||||
android:layout_height="wrap_content"
|
||||
android:inputType="numberDecimal"/>
|
||||
</LinearLayout>
|
||||
|
||||
<LinearLayout
|
||||
android:id="@+id/competitor_finish_date_layout"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="horizontal">
|
||||
|
||||
<TextView
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="center"
|
||||
android:layout_weight="1"
|
||||
android:text="@string/finishing_date"
|
||||
android:textColor="@color/dialog_color_text"/>
|
||||
|
||||
<Spinner
|
||||
android:id="@+id/competitor_finish_date"
|
||||
android:layout_width="@dimen/competitor_edit_width"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginBottom="@dimen/side_padding"
|
||||
android:layout_marginTop="@dimen/side_padding"
|
||||
android:background="@drawable/spinner_background_light"
|
||||
android:spinnerMode="dropdown"/>
|
||||
</LinearLayout>
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="horizontal">
|
||||
|
||||
<TextView
|
||||
android:id="@+id/competitor_finish_time_label"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="center"
|
||||
android:layout_weight="1"
|
||||
android:maxLines="2"
|
||||
android:text="@string/finishing_time"
|
||||
android:textColor="@color/dialog_color_text"/>
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="@dimen/competitor_edit_width"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="horizontal">
|
||||
|
||||
<NumberPicker
|
||||
android:id="@+id/competitor_finish_time_hours"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1"/>
|
||||
|
||||
<NumberPicker
|
||||
android:id="@+id/competitor_finish_time_minutes"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginLeft="8dp"
|
||||
android:layout_marginRight="8dp"
|
||||
android:layout_weight="1"/>
|
||||
|
||||
<NumberPicker
|
||||
android:id="@+id/competitor_finish_time_seconds"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1"/>
|
||||
</LinearLayout>
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="horizontal">
|
||||
|
||||
<TextView
|
||||
android:id="@+id/competitor_comment_label"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="center"
|
||||
android:layout_weight="1"
|
||||
android:text="@string/comment"
|
||||
android:textColor="@color/dialog_color_text"/>
|
||||
|
||||
<EditText
|
||||
android:id="@+id/competitor_comment"
|
||||
android:layout_width="@dimen/competitor_edit_width"
|
||||
android:layout_height="wrap_content"
|
||||
android:inputType="text"/>
|
||||
</LinearLayout>
|
||||
</LinearLayout>
|
||||
+167
@@ -0,0 +1,167 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="vertical"
|
||||
android:paddingLeft="24dp"
|
||||
android:paddingRight="24dp">
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="vertical"
|
||||
android:paddingLeft="@dimen/float_label_padding">
|
||||
|
||||
<TextView
|
||||
android:id="@+id/competitor_position_label"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:paddingBottom="8dp"
|
||||
android:text="@string/position"
|
||||
android:textColor="@color/dialog_color_text"/>
|
||||
|
||||
<Spinner
|
||||
android:id="@+id/competitor_position"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:background="@drawable/spinner_background_light"
|
||||
android:spinnerMode="dropdown"/>
|
||||
</LinearLayout>
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="vertical"
|
||||
android:paddingLeft="@dimen/float_label_padding"
|
||||
android:paddingTop="@dimen/side_padding">
|
||||
|
||||
<TextView
|
||||
android:id="@+id/competitor_penalty_label"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:paddingBottom="8dp"
|
||||
android:text="@string/penalty"
|
||||
android:textColor="@color/dialog_color_text"/>
|
||||
|
||||
<Spinner
|
||||
android:id="@+id/competitor_penalty"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:background="@drawable/spinner_background_light"
|
||||
android:spinnerMode="dropdown"/>
|
||||
</LinearLayout>
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="vertical"
|
||||
android:paddingTop="@dimen/side_padding">
|
||||
|
||||
<com.sap.sailing.racecommittee.app.ui.layouts.FloatLabelLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
app:floatLabelPaddingLeft="@dimen/float_label_padding"
|
||||
app:floatLabelTextAppearance="@style/AppTheme.AlertDialog.FloatLabel">
|
||||
|
||||
<EditText
|
||||
android:id="@+id/competitor_score"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:hint="@string/score"
|
||||
android:inputType="numberDecimal"
|
||||
android:textColorHint="@color/dialog_color_text"/>
|
||||
</com.sap.sailing.racecommittee.app.ui.layouts.FloatLabelLayout>
|
||||
</LinearLayout>
|
||||
|
||||
<LinearLayout
|
||||
android:id="@+id/competitor_finish_date_layout"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="vertical"
|
||||
android:paddingLeft="@dimen/float_label_padding"
|
||||
android:paddingTop="@dimen/side_padding">
|
||||
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:paddingBottom="8dp"
|
||||
android:text="@string/finishing_date"
|
||||
android:textColor="@color/dialog_color_text"/>
|
||||
|
||||
<Spinner
|
||||
android:id="@+id/competitor_finish_date"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:background="@drawable/spinner_background_light"
|
||||
android:spinnerMode="dropdown"/>
|
||||
</LinearLayout>
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="vertical"
|
||||
android:paddingLeft="@dimen/float_label_padding"
|
||||
android:paddingTop="@dimen/side_padding">
|
||||
|
||||
<TextView
|
||||
android:id="@+id/competitor_finish_time_label"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:maxLines="2"
|
||||
android:text="@string/finishing_time"
|
||||
android:textColor="@color/dialog_color_text"/>
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="@dimen/competitor_edit_width"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="center"
|
||||
android:orientation="horizontal">
|
||||
|
||||
<NumberPicker
|
||||
android:id="@+id/competitor_finish_time_hours"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="@dimen/side_padding"
|
||||
android:layout_weight="1"/>
|
||||
|
||||
<NumberPicker
|
||||
android:id="@+id/competitor_finish_time_minutes"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginBottom="@dimen/side_padding"
|
||||
android:layout_marginLeft="8dp"
|
||||
android:layout_marginRight="8dp"
|
||||
android:layout_marginTop="@dimen/side_padding"
|
||||
android:layout_weight="1"/>
|
||||
|
||||
<NumberPicker
|
||||
android:id="@+id/competitor_finish_time_seconds"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="@dimen/side_padding"
|
||||
android:layout_weight="1"/>
|
||||
</LinearLayout>
|
||||
</LinearLayout>
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="vertical">
|
||||
|
||||
<com.sap.sailing.racecommittee.app.ui.layouts.FloatLabelLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
app:floatLabelPaddingLeft="@dimen/float_label_padding"
|
||||
app:floatLabelTextAppearance="@style/AppTheme.AlertDialog.FloatLabel">
|
||||
|
||||
<EditText
|
||||
android:id="@+id/competitor_comment"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:hint="@string/comment"
|
||||
android:inputType="text"
|
||||
android:textColorHint="@color/dialog_color_text"/>
|
||||
</com.sap.sailing.racecommittee.app.ui.layouts.FloatLabelLayout>
|
||||
</LinearLayout>
|
||||
</LinearLayout>
|
||||
+1
-1
@@ -20,7 +20,7 @@
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="center_vertical"
|
||||
android:textAppearance="?attr/textSmall"
|
||||
tools:text="GDR001"/>
|
||||
tools:text="GDR001" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/competitor"
|
||||
|
||||
+8
-1
@@ -27,7 +27,7 @@
|
||||
<LinearLayout
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_weight="10"
|
||||
android:layout_weight="12"
|
||||
android:orientation="horizontal">
|
||||
|
||||
<TextView
|
||||
@@ -50,6 +50,13 @@
|
||||
tools:text="Cool Runnings"/>
|
||||
</LinearLayout>
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/edit_item"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="center_vertical"
|
||||
android:src="?attr/create"/>
|
||||
|
||||
<RelativeLayout
|
||||
android:id="@id/drag_handle"
|
||||
android:layout_width="42dp"
|
||||
|
||||
@@ -1,49 +1,16 @@
|
||||
<?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:clickable="true">
|
||||
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||
xmlns:tools="http://schemas.android.com/tools"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:clickable="true">
|
||||
|
||||
<RelativeLayout
|
||||
android:id="@+id/tracking_header"
|
||||
<com.sap.sailing.racecommittee.app.ui.layouts.HeaderLayout
|
||||
android:id="@+id/header"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="@dimen/selector_header_height"
|
||||
android:background="?attr/sap_gray"
|
||||
android:clickable="false">
|
||||
|
||||
<LinearLayout
|
||||
android:id="@+id/header_text"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_centerVertical="true"
|
||||
android:layout_marginLeft="@dimen/side_padding"
|
||||
android:orientation="horizontal">
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/header_back"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="center_vertical"
|
||||
android:src="?attr/chevron_left_24dp"/>
|
||||
|
||||
<TextView
|
||||
android:id="@+id/header_caption"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="center"
|
||||
android:text="@string/tracking_list"
|
||||
android:textAppearance="?attr/textHeader"/>
|
||||
</LinearLayout>
|
||||
|
||||
<View
|
||||
android:id="@+id/line_top"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="@dimen/unscheduled_header_line"
|
||||
android:layout_alignParentBottom="true"
|
||||
android:background="?attr/black"/>
|
||||
</RelativeLayout>
|
||||
android:layout_height="wrap_content"
|
||||
app:headerText="@string/tracking_list_01"/>
|
||||
|
||||
<RelativeLayout
|
||||
android:id="@+id/bottom_bar"
|
||||
@@ -58,8 +25,8 @@
|
||||
<View
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="@dimen/thin_line"
|
||||
android:background="?attr/sap_gray"
|
||||
android:layout_alignParentTop="true"/>
|
||||
android:layout_alignParentTop="true"
|
||||
android:background="?attr/sap_gray"/>
|
||||
|
||||
<Button
|
||||
android:id="@+id/confirm"
|
||||
@@ -67,8 +34,8 @@
|
||||
android:layout_width="@dimen/default_button_width"
|
||||
android:layout_height="@dimen/default_button_height"
|
||||
android:layout_centerInParent="true"
|
||||
android:layout_marginTop="@dimen/side_padding"
|
||||
android:layout_marginBottom="@dimen/side_padding"
|
||||
android:layout_marginTop="@dimen/side_padding"
|
||||
android:text="@string/confirm_tracking_list"
|
||||
android:textSize="@dimen/textSize_18"/>
|
||||
</RelativeLayout>
|
||||
@@ -77,7 +44,7 @@
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_above="@id/bottom_bar"
|
||||
android:layout_below="@+id/tracking_header"
|
||||
android:layout_below="@+id/header"
|
||||
android:background="?attr/sap_gray_black_30">
|
||||
|
||||
<RelativeLayout
|
||||
@@ -123,24 +90,48 @@
|
||||
</LinearLayout>
|
||||
</RelativeLayout>
|
||||
|
||||
<FrameLayout
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_above="@id/panel_switcher"
|
||||
android:paddingLeft="@dimen/side_padding"
|
||||
android:paddingRight="@dimen/side_padding">
|
||||
android:orientation="vertical">
|
||||
|
||||
<LinearLayout
|
||||
android:id="@+id/spinner_header"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_margin="@dimen/side_padding"
|
||||
android:orientation="horizontal">
|
||||
|
||||
<TextView
|
||||
android:id="@+id/page_title"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="center_vertical"
|
||||
android:layout_weight="1"
|
||||
android:text="@string/tracking_list_01"
|
||||
android:textAppearance="?textXSmall"
|
||||
android:visibility="invisible"/>
|
||||
|
||||
<Spinner
|
||||
android:id="@+id/sort_spinner"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="2"
|
||||
android:background="@drawable/spinner_background_light"
|
||||
android:spinnerMode="dropdown"/>
|
||||
</LinearLayout>
|
||||
|
||||
<android.support.v7.widget.RecyclerView
|
||||
android:id="@+id/list_positioning_all"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"/>
|
||||
|
||||
<android.support.v7.widget.RecyclerView
|
||||
android:id="@+id/list_positioning_chosen"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:visibility="visible"/>
|
||||
|
||||
<android.support.v7.widget.RecyclerView
|
||||
android:id="@+id/list_positioning_all"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:visibility="gone"/>
|
||||
</FrameLayout>
|
||||
</LinearLayout>
|
||||
</RelativeLayout>
|
||||
</RelativeLayout>
|
||||
@@ -1,6 +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">
|
||||
|
||||
@@ -21,12 +22,12 @@
|
||||
android:layout_marginLeft="@dimen/default_margin_half"
|
||||
android:layout_weight="1"
|
||||
android:gravity="center"
|
||||
android:text="@string/availableFinishingCompetitors"
|
||||
android:text="@string/tracking_list_01"
|
||||
android:textAppearance="?attr/textNormal"/>
|
||||
|
||||
<Space
|
||||
android:layout_width="16dp"
|
||||
android:layout_height="wrap_content" />
|
||||
android:layout_height="wrap_content"/>
|
||||
|
||||
<TextView
|
||||
android:layout_width="0dp"
|
||||
@@ -34,7 +35,7 @@
|
||||
android:layout_marginRight="@dimen/default_margin_half"
|
||||
android:layout_weight="1"
|
||||
android:gravity="center"
|
||||
android:text="@string/tracking_list"
|
||||
android:text="@string/tracking_list_02"
|
||||
android:textAppearance="?attr/textNormal"/>
|
||||
</LinearLayout>
|
||||
|
||||
@@ -64,20 +65,35 @@
|
||||
android:layout_height="match_parent"
|
||||
android:layout_above="@id/bottom_bar"
|
||||
android:layout_below="@id/header_bar"
|
||||
android:layout_marginBottom="@dimen/default_margin_half"
|
||||
android:layout_marginLeft="@dimen/side_padding"
|
||||
android:layout_marginRight="@dimen/side_padding"
|
||||
android:gravity="center"
|
||||
android:orientation="horizontal">
|
||||
|
||||
<android.support.v7.widget.RecyclerView
|
||||
android:id="@+id/list_positioning_all"
|
||||
<LinearLayout
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_weight="1"/>
|
||||
android:layout_weight="1"
|
||||
android:orientation="vertical">
|
||||
|
||||
<Spinner
|
||||
android:id="@+id/sort_spinner"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_margin="@dimen/side_padding"
|
||||
android:background="@drawable/spinner_background_light"
|
||||
android:spinnerMode="dropdown"/>
|
||||
|
||||
<android.support.v7.widget.RecyclerView
|
||||
android:id="@+id/list_positioning_all"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"/>
|
||||
</LinearLayout>
|
||||
|
||||
<Space
|
||||
android:layout_width="16dp"
|
||||
android:layout_height="wrap_content" />
|
||||
android:layout_height="wrap_content"/>
|
||||
|
||||
<android.support.v7.widget.RecyclerView
|
||||
android:id="@+id/list_positioning_chosen"
|
||||
|
||||
@@ -67,7 +67,7 @@
|
||||
<View
|
||||
android:id="@+id/line_top"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="@dimen/unscheduled_header_line"
|
||||
android:layout_height="@dimen/header_line"
|
||||
android:layout_alignParentBottom="true"
|
||||
android:background="?attr/black" />
|
||||
</RelativeLayout>
|
||||
|
||||
@@ -76,7 +76,7 @@
|
||||
<View
|
||||
android:id="@+id/line_top"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="@dimen/unscheduled_header_line"
|
||||
android:layout_height="@dimen/header_line"
|
||||
android:layout_alignParentBottom="true"
|
||||
android:background="?attr/black"/>
|
||||
</RelativeLayout>
|
||||
|
||||
@@ -69,7 +69,7 @@
|
||||
<View
|
||||
android:id="@+id/line_top"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="@dimen/unscheduled_header_line"
|
||||
android:layout_height="@dimen/header_line"
|
||||
android:layout_alignParentBottom="true"
|
||||
android:background="?attr/black"/>
|
||||
</RelativeLayout>
|
||||
|
||||
@@ -76,7 +76,7 @@
|
||||
<View
|
||||
android:id="@+id/line_top"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="@dimen/unscheduled_header_line"
|
||||
android:layout_height="@dimen/header_line"
|
||||
android:layout_alignParentBottom="true"
|
||||
android:background="?attr/black"/>
|
||||
</RelativeLayout>
|
||||
|
||||
@@ -95,7 +95,8 @@
|
||||
<string name="retry">Wiederholen</string>
|
||||
<string name="yes">Ja</string>
|
||||
<string name="no">Nein</string>
|
||||
<string name="tracking_list">Ergebnisliste</string>
|
||||
<string name="tracking_list_01">Teilnehmerliste</string>
|
||||
<string name="tracking_list_02">Ergebnisliste</string>
|
||||
<string name="set_tracking_list">Ergebnisliste füllen</string>
|
||||
<string name="confirm_tracking_list">Ergebnisliste bestätigen</string>
|
||||
<string name="availableFinishingCompetitors">Segler</string>
|
||||
@@ -465,7 +466,14 @@
|
||||
<string name="onboarding_input">Manuelle Eingabe</string>
|
||||
<string name="race_group">Group Race</string>
|
||||
<string name="wind_select_race">Select Race</string>
|
||||
<string name="added_to_result_list">\'%1$s\' zur Ergebnisliste hinzugefügt an Position %2$s</string>
|
||||
<string name="get_started">Getting Started</string>
|
||||
<string name="position">Position</string>
|
||||
<string name="penalty">Strafe</string>
|
||||
<string name="score">Punkte</string>
|
||||
<string name="finishing_time">Zielzeit</string>
|
||||
<string name="finishing_date">Zieldatum</string>
|
||||
<string name="comment">Kommentar</string>
|
||||
<string name="get_started_url">https://www.sapsailing.com/gwt/Home.html?locale=de#SolutionsPlace:navigationTab=RaceCommitteeApp</string>
|
||||
<string name="user_unauthorized">Request fehlgeschlagen. User ist nicht autorisiert.</string>
|
||||
<string name="server_url">Server</string>
|
||||
@@ -481,6 +489,10 @@
|
||||
<string name="preference_heading_with_declination_subtracted_summary_is_enabled">Rechtweisend</string>
|
||||
<string name="preference_heading_with_declination_subtracted_summary_is_disabled">Missweisend</string>
|
||||
<string name="preference_heading_with_declination_subtracted_enabled">Kursanzeige</string>
|
||||
<string-array name="sort_by_values">
|
||||
<item>nach Segelnummer</item>
|
||||
<item>nach Namen</item>
|
||||
</string-array>
|
||||
|
||||
<string name="preference_non_public_events_header">Zeige nicht öffentliche Events</string>
|
||||
<string name="preference_non_public_events_summary">Lade alle Events, auch die nicht öffentlichen.</string>
|
||||
|
||||
@@ -5,11 +5,13 @@
|
||||
<item name="chevron_left">@drawable/ic_chevron_left_white_36dp</item>
|
||||
<item name="chevron_right">@drawable/ic_chevron_right_white_36dp</item>
|
||||
|
||||
<item name="flag_first_blue">@drawable/flag_first_blue_32dp_dark</item>
|
||||
<item name="flag_blue_first">@drawable/flag_blue_first_32dp_dark</item>
|
||||
<item name="flag_blue_last">@drawable/flag_blue_last_32dp_dark</item>
|
||||
|
||||
<item name="flags_abandon">@drawable/flags_abandon_64dp_dark</item>
|
||||
<item name="flags_blue_first">@drawable/flag_blue_first_64dp_dark</item>
|
||||
<item name="flags_blue_last">@drawable/flag_blue_last_64dp_dark</item>
|
||||
<item name="flags_course">@drawable/flags_course_64dp_dark</item>
|
||||
<item name="flags_more">@drawable/flags_more_64dp_dark</item>
|
||||
<item name="flags_postpone">@drawable/flags_postpone_64dp_dark</item>
|
||||
<item name="flags_recall">@drawable/flags_recall_64dp_dark</item>
|
||||
</style>
|
||||
|
||||
@@ -5,11 +5,13 @@
|
||||
<item name="chevron_left">@drawable/ic_chevron_left_black_36dp</item>
|
||||
<item name="chevron_right">@drawable/ic_chevron_right_black_36dp</item>
|
||||
|
||||
<item name="flag_first_blue">@drawable/flag_first_blue_32dp_light</item>
|
||||
<item name="flag_blue_first">@drawable/flag_blue_first_32dp_light</item>
|
||||
<item name="flag_blue_last">@drawable/flag_blue_last_32dp_light</item>
|
||||
|
||||
<item name="flags_abandon">@drawable/flags_abandon_64dp_light</item>
|
||||
<item name="flags_blue_first">@drawable/flag_blue_first_64dp_light</item>
|
||||
<item name="flags_blue_last">@drawable/flag_blue_last_64dp_light</item>
|
||||
<item name="flags_course">@drawable/flags_course_64dp_light</item>
|
||||
<item name="flags_more">@drawable/flags_more_64dp_light</item>
|
||||
<item name="flags_postpone">@drawable/flags_postpone_64dp_light</item>
|
||||
<item name="flags_recall">@drawable/flags_recall_64dp_light</item>
|
||||
</style>
|
||||
|
||||
@@ -13,6 +13,8 @@
|
||||
<dimen name="listView_row_height">85dp</dimen>
|
||||
<dimen name="listView_row_min_height">85dp</dimen>
|
||||
|
||||
<dimen name="header_line">@dimen/thick_line</dimen>
|
||||
|
||||
<dimen name="preference_margin">0dp</dimen>
|
||||
|
||||
<dimen name="panel_text_padding">5dp</dimen>
|
||||
@@ -62,7 +64,6 @@
|
||||
|
||||
<!-- race state dependent -->
|
||||
<!-- unscheduled -->
|
||||
<dimen name="unscheduled_header_line">@dimen/thick_line</dimen>
|
||||
<dimen name="unscheduled_confirm_button_margin">@dimen/default_margin_twice</dimen>
|
||||
<dimen name="unscheduled_padding_dependent_race_item">@dimen/default_padding_half</dimen>
|
||||
<dimen name="unscheduled_spinner_width">460dp</dimen>
|
||||
|
||||
@@ -5,11 +5,13 @@
|
||||
<item name="chevron_left">@drawable/ic_chevron_left_white_36dp</item>
|
||||
<item name="chevron_right">@drawable/ic_chevron_right_white_36dp</item>
|
||||
|
||||
<item name="flag_first_blue">@drawable/flag_first_blue_48dp_dark</item>
|
||||
<item name="flag_blue_first">@drawable/flag_blue_first_48dp_dark</item>
|
||||
<item name="flag_blue_last">@drawable/flag_blue_last_48dp_dark</item>
|
||||
|
||||
<item name="flags_abandon">@drawable/flags_abandon_96dp_dark</item>
|
||||
<item name="flags_blue_first">@drawable/flag_blue_first_96dp_dark</item>
|
||||
<item name="flags_blue_last">@drawable/flag_blue_last_96dp_dark</item>
|
||||
<item name="flags_course">@drawable/flags_course_96dp_dark</item>
|
||||
<item name="flags_more">@drawable/flags_more_96dp_dark</item>
|
||||
<item name="flags_postpone">@drawable/flags_postpone_96dp_dark</item>
|
||||
<item name="flags_recall">@drawable/flags_recall_96dp_dark</item>
|
||||
</style>
|
||||
|
||||
@@ -5,11 +5,13 @@
|
||||
<item name="chevron_left">@drawable/ic_chevron_left_black_36dp</item>
|
||||
<item name="chevron_right">@drawable/ic_chevron_right_black_36dp</item>
|
||||
|
||||
<item name="flag_first_blue">@drawable/flag_first_blue_48dp_light</item>
|
||||
<item name="flag_blue_first">@drawable/flag_blue_first_48dp_light</item>
|
||||
<item name="flag_blue_last">@drawable/flag_blue_last_48dp_light</item>
|
||||
|
||||
<item name="flags_abandon">@drawable/flags_abandon_96dp_light</item>
|
||||
<item name="flags_blue_first">@drawable/flag_blue_first_96dp_light</item>
|
||||
<item name="flags_blue_last">@drawable/flag_blue_last_96dp_light</item>
|
||||
<item name="flags_course">@drawable/flags_course_96dp_light</item>
|
||||
<item name="flags_more">@drawable/flags_more_96dp_light</item>
|
||||
<item name="flags_postpone">@drawable/flags_postpone_96dp_light</item>
|
||||
<item name="flags_recall">@drawable/flags_recall_96dp_light</item>
|
||||
</style>
|
||||
|
||||
@@ -86,14 +86,18 @@
|
||||
<attr name="wind_off" format="reference"/>
|
||||
|
||||
<!-- flag drawables -->
|
||||
<attr name="flag_first_blue" format="reference"/>
|
||||
<attr name="flag_blue_first" format="reference"/>
|
||||
<attr name="flag_blue_last" format="reference"/>
|
||||
|
||||
<attr name="flag_ap_alpha_96dp" format="reference"/>
|
||||
<attr name="flag_ap_hotel_96dp" format="reference"/>
|
||||
<attr name="flag_november_alpha_96dp" format="reference"/>
|
||||
<attr name="flag_november_hotel_96dp" format="reference"/>
|
||||
|
||||
<attr name="flags_abandon" format="reference"/>
|
||||
<attr name="flags_blue_first" format="reference"/>
|
||||
<attr name="flags_blue_last" format="reference"/>
|
||||
<attr name="flags_course" format="reference"/>
|
||||
<attr name="flags_more" format="reference"/>
|
||||
<attr name="flags_postpone" format="reference"/>
|
||||
<attr name="flags_recall" format="reference"/>
|
||||
|
||||
|
||||
@@ -1,6 +1,11 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources>
|
||||
|
||||
<declare-styleable name="HeaderLayout">
|
||||
<attr name="headerText" format="reference|string" />
|
||||
<attr name="showChevron" format="boolean" />
|
||||
</declare-styleable>
|
||||
|
||||
<declare-styleable name="PanelButton">
|
||||
<attr name="buttonHeader" format="reference|string" />
|
||||
|
||||
|
||||
@@ -14,6 +14,8 @@
|
||||
<dimen name="listView_row_height">80dp</dimen>
|
||||
<dimen name="listView_row_min_height">64dp</dimen>
|
||||
|
||||
<dimen name="header_line">@dimen/thin_line</dimen>
|
||||
|
||||
<dimen name="preference_margin">0dp</dimen>
|
||||
|
||||
<dimen name="panel_text_padding">5dp</dimen>
|
||||
@@ -72,6 +74,10 @@
|
||||
<dimen name="panel_lock_padding">2dp</dimen>
|
||||
<dimen name="flags">64dp</dimen>
|
||||
|
||||
<dimen name="competitor_dialog_width">420dp</dimen>
|
||||
<dimen name="competitor_edit_width">200dp</dimen>
|
||||
<dimen name="dialog_top_padding">24dp</dimen>
|
||||
|
||||
<!-- custom dimens (float, integer) -->
|
||||
<item name="picker_scale" format="float" type="integer">1</item>
|
||||
<item name="flag_size" format="integer" type="integer">32</item>
|
||||
@@ -102,7 +108,6 @@
|
||||
<dimen name="login_text_size">@dimen/textSize_20</dimen>
|
||||
|
||||
<!-- unscheduled -->
|
||||
<dimen name="unscheduled_header_line">@dimen/thin_line</dimen>
|
||||
<dimen name="unscheduled_confirm_button_margin">@dimen/default_margin</dimen>
|
||||
<dimen name="unscheduled_padding_dependent_race_item">6dp</dimen>
|
||||
<dimen name="unscheduled_spinner_width">240dp</dimen>
|
||||
|
||||
@@ -108,7 +108,8 @@
|
||||
<string name="retry">Retry</string>
|
||||
<string name="yes">Yes</string>
|
||||
<string name="no">No</string>
|
||||
<string name="tracking_list">Tracking List</string>
|
||||
<string name="tracking_list_01">Competitor List</string>
|
||||
<string name="tracking_list_02">Tracking List</string>
|
||||
<string name="availableFinishingCompetitors">Competitors</string>
|
||||
<string name="choose_blue_flag_finishing">Finish race</string>
|
||||
<string name="drag_handle_description">Drag handle</string>
|
||||
@@ -492,7 +493,13 @@
|
||||
<string name="onboarding_input">Manual Input</string>
|
||||
<string name="race_group">Group Racing</string>
|
||||
<string name="wind_select_race">Select Race</string>
|
||||
<string name="added_to_result_list">Added \'%1$s\' to result list at position %2$s</string>
|
||||
<string name="get_started">Getting Started</string>
|
||||
<string name="position">Position</string>
|
||||
<string name="penalty">Penalty</string>
|
||||
<string name="score">Score</string>
|
||||
<string name="finishing_time">Finishing Time</string>
|
||||
<string name="comment">Comment</string>
|
||||
<string name="get_started_url">https://www.sapsailing.com/gwt/Home.html?locale=en#SolutionsPlace:navigationTab=RaceCommitteeApp</string>
|
||||
<string name="user_unauthorized">Request failed. User is unauthorized.</string>
|
||||
<string name="server_url">Server</string>
|
||||
@@ -508,6 +515,12 @@
|
||||
<string name="preference_heading_with_declination_subtracted_summary_is_enabled">Magnetic</string>
|
||||
<string name="preference_heading_with_declination_subtracted_summary_is_disabled">North-based</string>
|
||||
<string name="preference_heading_with_declination_subtracted_enabled">Heading</string>
|
||||
<string name="finishing_date">Finishing Date</string>
|
||||
<string name="date_short" translatable="false">yyyy-MM-dd</string>
|
||||
<string-array name="sort_by_values">
|
||||
<item>by Sail Id</item>
|
||||
<item>by Name</item>
|
||||
</string-array>
|
||||
|
||||
<string name="preference_non_public_events_header">Show Non Public Events</string>
|
||||
<string name="preference_non_public_events_summary">Load all events including the no public one.</string>
|
||||
|
||||
Loaded 100 of 131 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Block a user