eclipse-sailing-analytics/sailing-analytics
1
0
Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-09-19 04:05:36 +00:00
Code Activity

panel locks in new layout

Browse Source
This commit is contained in:
Peter Siegmund
2016-01-06 17:08:47 +01:00
parent 08b8ad6d09
commit 03eae2f9ce
20 changed files with 818 additions and 587 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mobile/com.sap.sailing.racecommittee.app/res/layout/panel_button_abandon.xml
+19 -10
View File
@@ -1,12 +1,14 @@
<?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">
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/abandon_flags_layer"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_height="match_parent"
android:layout_centerInParent="true">
<LinearLayout
@@ -23,7 +25,7 @@
<ImageView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:src="?attr/flags_abandon"/>
android:src="?attr/flags_abandon" />
</RelativeLayout>
<TextView
@@ -31,17 +33,24 @@
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:text="@string/flags_abandon"
android:textAppearance="?attr/textPanelCaption"/>
android:textAppearance="?attr/textPanelCaption" />
</LinearLayout>
<ImageView
<FrameLayout
android:id="@+id/abandon_flags_lock"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_alignParentRight="true"
android:src="?attr/corner"
android:layout_alignParentTop="true"
android:background="@color/lock_background"
android:padding="@dimen/panel_lock_padding"
android:visibility="gone"
tools:visibility="visible"/>
tools:visibility="visible">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="?attr/lock_outline" />
</FrameLayout>
</RelativeLayout>
</merge>
mobile/com.sap.sailing.racecommittee.app/res/layout/panel_button_course.xml
+19 -10
View File
@@ -1,12 +1,14 @@
<?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">
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/course_flags_layer"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_height="match_parent"
android:layout_centerInParent="true">
<LinearLayout
@@ -23,7 +25,7 @@
<ImageView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:src="?attr/flags_course"/>
android:src="?attr/flags_course" />
</RelativeLayout>
<TextView
@@ -31,17 +33,24 @@
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:text="@string/flags_course"
android:textAppearance="?attr/textPanelCaption"/>
android:textAppearance="?attr/textPanelCaption" />
</LinearLayout>
<ImageView
<FrameLayout
android:id="@+id/course_flags_lock"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_alignParentRight="true"
android:src="?attr/corner"
android:layout_alignParentTop="true"
android:background="@color/lock_background"
android:padding="@dimen/panel_lock_padding"
android:visibility="gone"
tools:visibility="visible"/>
tools:visibility="visible">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="?attr/lock_outline" />
</FrameLayout>
</RelativeLayout>
</merge>
mobile/com.sap.sailing.racecommittee.app/res/layout/panel_button_more.xml
+19 -10
View File
@@ -1,12 +1,14 @@
<?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">
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/more_flags_layer"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_height="match_parent"
android:layout_centerInParent="true">
<LinearLayout
@@ -23,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_more" />
</RelativeLayout>
<TextView
@@ -31,17 +33,24 @@
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:text="@string/flags_more"
android:textAppearance="?attr/textPanelCaption"/>
android:textAppearance="?attr/textPanelCaption" />
</LinearLayout>
<ImageView
<FrameLayout
android:id="@+id/more_flags_lock"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_alignParentRight="true"
android:src="?attr/corner"
android:layout_alignParentTop="true"
android:background="@color/lock_background"
android:padding="@dimen/panel_lock_padding"
android:visibility="gone"
tools:visibility="visible"/>
tools:visibility="visible">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="?attr/lock_outline" />
</FrameLayout>
</RelativeLayout>
</merge>
mobile/com.sap.sailing.racecommittee.app/res/layout/panel_button_photos.xml
+7 -6
View File
@@ -1,8 +1,9 @@
<?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">
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:showIn="@layout/race_finished_buttons_ver">
<LinearLayout
android:id="@+id/photo"
@@ -19,7 +20,7 @@
android:layout_height="wrap_content"
android:text="@string/finished_list"
android:textAppearance="?attr/textPanelHeader"
android:textSize="@dimen/textSize_18"/>
android:textSize="@dimen/textSize_18" />
<ImageView
android:id="@+id/photo_lock"
@@ -30,7 +31,7 @@
android:src="?attr/lock_outline"
android:tint="?attr/sap_light_gray"
android:visibility="gone"
tools:visibility="visible"/>
tools:visibility="visible" />
</LinearLayout>
<RelativeLayout
@@ -46,6 +47,6 @@
android:drawableTop="?attr/photo_camera"
android:gravity="center_horizontal"
android:text="@string/finished_photos"
android:textAppearance="?attr/textPanelCaption"/>
android:textAppearance="?attr/textPanelCaption" />
</RelativeLayout>
</merge>
mobile/com.sap.sailing.racecommittee.app/res/layout/panel_button_postpone.xml
+19 -10
View File
@@ -1,12 +1,14 @@
<?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">
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/postpone_flags_layer"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_height="match_parent"
android:layout_centerInParent="true">
<LinearLayout
@@ -23,7 +25,7 @@
<ImageView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:src="?attr/flags_postpone"/>
android:src="?attr/flags_postpone" />
</RelativeLayout>
<TextView
@@ -31,17 +33,24 @@
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:text="@string/flags_postpone"
android:textAppearance="?attr/textPanelCaption"/>
android:textAppearance="?attr/textPanelCaption" />
</LinearLayout>
<ImageView
<FrameLayout
android:id="@+id/postpone_flags_lock"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_alignParentRight="true"
android:src="?attr/corner"
android:layout_alignParentTop="true"
android:background="@color/lock_background"
android:padding="@dimen/panel_lock_padding"
android:visibility="gone"
tools:visibility="visible"/>
tools:visibility="visible">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="?attr/lock_outline" />
</FrameLayout>
</RelativeLayout>
</merge>
mobile/com.sap.sailing.racecommittee.app/res/layout/panel_button_recall.xml
+19 -10
View File
@@ -1,12 +1,14 @@
<?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">
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/recall_flags_layer"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_height="match_parent"
android:layout_centerInParent="true">
<LinearLayout
@@ -23,7 +25,7 @@
<ImageView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:src="?attr/flags_recall"/>
android:src="?attr/flags_recall" />
</RelativeLayout>
<TextView
@@ -31,17 +33,24 @@
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:text="@string/flags_recall"
android:textAppearance="?attr/textPanelCaption"/>
android:textAppearance="?attr/textPanelCaption" />
</LinearLayout>
<ImageView
<FrameLayout
android:id="@+id/recall_flags_lock"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_alignParentRight="true"
android:src="?attr/corner"
android:layout_alignParentTop="true"
android:background="@color/lock_background"
android:padding="@dimen/panel_lock_padding"
android:visibility="gone"
tools:visibility="visible"/>
tools:visibility="visible">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="?attr/lock_outline" />
</FrameLayout>
</RelativeLayout>
</merge>
mobile/com.sap.sailing.racecommittee.app/res/layout/panel_button_tracking.xml
+7 -6
View File
@@ -1,8 +1,9 @@
<?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">
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:showIn="@layout/race_finished_buttons_ver">
<LinearLayout
android:id="@+id/list"
@@ -17,7 +18,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/finished_tracking"
android:textAppearance="?attr/textPanelHeader"/>
android:textAppearance="?attr/textPanelHeader" />
<ImageView
android:id="@+id/list_lock"
@@ -28,7 +29,7 @@
android:src="?attr/lock_outline"
android:tint="?attr/sap_light_gray"
android:visibility="gone"
tools:visibility="visible"/>
tools:visibility="visible" />
</LinearLayout>
<RelativeLayout
@@ -44,6 +45,6 @@
android:drawableTop="?attr/dns"
android:gravity="center_horizontal"
android:text="@string/finished_edit"
android:textAppearance="?attr/textPanelCaption"/>
android:textAppearance="?attr/textPanelCaption" />
</RelativeLayout>
</merge>
mobile/com.sap.sailing.racecommittee.app/res/layout/panel_button_voice_record.xml
+39 -28
View File
@@ -1,45 +1,56 @@
<?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">
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:showIn="@layout/race_panel_flags_ver">
<LinearLayout
<RelativeLayout
android:id="@+id/voice_layer"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:orientation="vertical">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:src="?attr/mic_48dp"/>
android:layout_height="match_parent"
android:layout_centerInParent="true">
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:orientation="horizontal"
tools:ignore="UseCompoundDrawables">
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="match_parent"
android:src="?attr/mic_48dp" />
</RelativeLayout>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:gravity="center_horizontal"
android:text="@string/record_voice"
android:textAppearance="?attr/textPanelCaption"/>
android:textAppearance="?attr/textPanelCaption" />
</LinearLayout>
<FrameLayout
android:id="@+id/voice_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:id="@+id/voice_lock"
android:layout_width="@dimen/side_button_lockSize"
android:layout_height="@dimen/side_button_lockSize"
android:layout_gravity="center_vertical"
android:layout_marginLeft="@dimen/lock_margin"
android:src="?attr/lock_outline"
android:visibility="gone"
tools:visibility="visible"/>
</LinearLayout>
</LinearLayout>
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="?attr/lock_outline" />
</FrameLayout>
</RelativeLayout>
</merge>
mobile/com.sap.sailing.racecommittee.app/res/layout/panel_button_voice_replay.xml
+7 -6
View File
@@ -1,8 +1,9 @@
<?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">
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:showIn="@layout/race_finished_buttons_ver">
<LinearLayout
android:id="@+id/voice"
@@ -18,7 +19,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/finished_recording"
android:textAppearance="?attr/textPanelHeader"/>
android:textAppearance="?attr/textPanelHeader" />
<ImageView
android:id="@+id/voice_lock"
@@ -29,7 +30,7 @@
android:src="?attr/lock_outline"
android:tint="?attr/sap_light_gray"
android:visibility="gone"
tools:visibility="visible"/>
tools:visibility="visible" />
</LinearLayout>
<RelativeLayout
@@ -45,6 +46,6 @@
android:drawableTop="?attr/hearing"
android:gravity="center_horizontal"
android:text="@string/finished_replay"
android:textAppearance="?attr/textPanelCaption"/>
android:textAppearance="?attr/textPanelCaption" />
</RelativeLayout>
</merge>
mobile/com.sap.sailing.racecommittee.app/res/layout/race_panel_more.xml
+155 -116
View File
@@ -1,6 +1,5 @@
<?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:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent">
@@ -8,9 +7,10 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:baselineAligned="false"
android:orientation="horizontal">
<RelativeLayout
<FrameLayout
android:id="@+id/start_mode"
android:layout_width="0dp"
android:layout_height="match_parent"
@@ -19,54 +19,67 @@
android:visibility="gone"
tools:visibility="visible">
<ImageView
android:id="@+id/start_mode_marker"
android:layout_width="match_parent"
android:layout_height="@dimen/thin_line"
android:layout_alignParentBottom="true"
android:src="?attr/marker"/>
<TextView
android:id="@+id/start_mode_header"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:layout_marginTop="@dimen/side_padding"
android:text="@string/start_mode"
android:textAppearance="?attr/textPanelHeader"/>
<RelativeLayout
android:id="@+id/start_mode_layer"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_below="@id/start_mode_header">
android:layout_height="match_parent">
<ImageView
android:id="@+id/start_mode_flag"
android:layout_width="@dimen/side_button_imageSize"
android:layout_height="@dimen/side_button_imageSize"
android:id="@+id/start_mode_marker"
android:layout_width="match_parent"
android:layout_height="@dimen/thin_line"
android:layout_alignParentBottom="true"
android:src="?attr/marker" />
<TextView
android:id="@+id/start_mode_header"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:layout_centerInParent="true"
tools:src="@drawable/flag_papa_64dp"/>
android:layout_marginTop="@dimen/side_padding"
android:text="@string/start_mode"
android:textAppearance="?attr/textPanelHeader" />
<ImageView
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_below="@id/start_mode_header">
<ImageView
android:id="@+id/start_mode_flag"
android:layout_width="@dimen/side_button_imageSize"
android:layout_height="@dimen/side_button_imageSize"
android:layout_centerHorizontal="true"
android:layout_centerInParent="true"
tools:src="@drawable/flag_papa_64dp" />
</RelativeLayout>
<FrameLayout
android:id="@+id/start_mode_lock"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="?attr/corner"
android:visibility="gone"
tools:visibility="visible"
android:layout_alignParentRight="true"
android:layout_alignParentBottom="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="wrap_content"
android:layout_height="wrap_content"
android:src="?attr/lock_outline" />
</FrameLayout>
<ImageView
android:layout_width="@dimen/thin_line"
android:layout_height="match_parent"
android:layout_alignParentRight="true"
android:src="?attr/black" />
</RelativeLayout>
</FrameLayout>
<ImageView
android:layout_width="@dimen/thin_line"
android:layout_height="match_parent"
android:layout_alignParentRight="true"
android:src="?attr/black"/>
</RelativeLayout>
<RelativeLayout
<FrameLayout
android:id="@+id/gate_pathfinder"
android:layout_width="0dp"
android:layout_height="match_parent"
@@ -75,54 +88,67 @@
android:visibility="gone"
tools:visibility="visible">
<ImageView
android:id="@+id/gate_pathfinder_marker"
android:layout_width="match_parent"
android:layout_height="@dimen/thin_line"
android:layout_alignParentBottom="true"
android:src="?attr/marker"/>
<TextView
android:id="@+id/gate_pathfinder_header"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:layout_marginTop="@dimen/side_padding"
android:text="@string/gate_start_pathfinder"
android:textAppearance="?attr/textPanelHeader"/>
<RelativeLayout
android:id="@+id/gate_pathfinder_layer"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_below="@id/gate_pathfinder_header">
<TextView
android:id="@+id/gate_pathfinder_value"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:textAppearance="?attr/textPanelCaption"
tools:text="SAD123"/>
android:layout_height="match_parent">
<ImageView
android:id="@+id/gate_pathfinder_marker"
android:layout_width="match_parent"
android:layout_height="@dimen/thin_line"
android:layout_alignParentBottom="true"
android:src="?attr/marker" />
<TextView
android:id="@+id/gate_pathfinder_header"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:layout_marginTop="@dimen/side_padding"
android:text="@string/gate_start_pathfinder"
android:textAppearance="?attr/textPanelHeader" />
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_below="@id/gate_pathfinder_header">
<TextView
android:id="@+id/gate_pathfinder_value"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:textAppearance="?attr/textPanelCaption"
tools:text="SAD123" />
</RelativeLayout>
<FrameLayout
android:id="@+id/gate_pathfinder_lock"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="?attr/corner"
android:visibility="gone"
tools:visibility="visible"
android:layout_alignParentRight="true"
android:layout_alignParentBottom="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="wrap_content"
android:layout_height="wrap_content"
android:src="?attr/lock_outline" />
</FrameLayout>
<ImageView
android:layout_width="@dimen/thin_line"
android:layout_height="match_parent"
android:layout_alignParentRight="true"
android:src="?attr/black" />
</RelativeLayout>
</FrameLayout>
<ImageView
android:layout_width="@dimen/thin_line"
android:layout_height="match_parent"
android:layout_alignParentRight="true"
android:src="?attr/black"/>
</RelativeLayout>
<RelativeLayout
<FrameLayout
android:id="@+id/gate_timing"
android:layout_width="0dp"
android:layout_height="match_parent"
@@ -131,58 +157,71 @@
android:visibility="gone"
tools:visibility="visible">
<ImageView
android:id="@+id/gate_timing_marker"
android:layout_width="match_parent"
android:layout_height="@dimen/thin_line"
android:layout_alignParentBottom="true"
android:src="?attr/marker"/>
<TextView
android:id="@+id/gate_timing_header"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:layout_marginTop="@dimen/side_padding"
android:text="@string/gate_start_timing"
android:textAppearance="?attr/textPanelHeader"/>
<RelativeLayout
android:id="@+id/gate_timing_layer"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_below="@id/gate_timing_header">
<TextView
android:id="@+id/gate_timing_value"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:gravity="center"
android:textAppearance="?attr/textPanelCaption"
tools:text="4 + 3 = 7 Minuten"/>
android:layout_height="match_parent">
<ImageView
android:id="@+id/gate_timing_marker"
android:layout_width="match_parent"
android:layout_height="@dimen/thin_line"
android:layout_alignParentBottom="true"
android:src="?attr/marker" />
<TextView
android:id="@+id/gate_timing_header"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:layout_marginTop="@dimen/side_padding"
android:text="@string/gate_start_timing"
android:textAppearance="?attr/textPanelHeader" />
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_below="@id/gate_timing_header">
<TextView
android:id="@+id/gate_timing_value"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:gravity="center"
android:textAppearance="?attr/textPanelCaption"
tools:text="4 + 3 = 7 Minuten" />
</RelativeLayout>
<FrameLayout
android:id="@+id/gate_timing_lock"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="?attr/corner"
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"
android:layout_alignParentBottom="true"
android:layout_alignParentRight="true"/>
</RelativeLayout>
tools:visibility="visible">
<ImageView
android:layout_width="@dimen/thin_line"
android:layout_height="match_parent"
android:layout_alignParentRight="true"
android:src="?attr/black"/>
</RelativeLayout>
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="?attr/lock_outline" />
</FrameLayout>
<ImageView
android:layout_width="@dimen/thin_line"
android:layout_height="match_parent"
android:layout_alignParentRight="true"
android:src="?attr/black" />
</RelativeLayout>
</FrameLayout>
</LinearLayout>
<View
android:id="@+id/top_line"
android:layout_width="match_parent"
android:layout_height="@dimen/thin_line"
android:background="?attr/black"/>
android:background="?attr/black" />
</RelativeLayout>
mobile/com.sap.sailing.racecommittee.app/res/layout/race_panel_setup_hor.xml
+154 -116
View File
@@ -1,6 +1,5 @@
<?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:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
@@ -12,172 +11,211 @@
android:baselineAligned="false"
android:orientation="horizontal">
<RelativeLayout
<FrameLayout
android:id="@+id/start_procedure"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:background="?attr/sap_gray">
<ImageView
android:id="@+id/start_procedure_marker"
android:layout_width="match_parent"
android:layout_height="@dimen/thin_line"
android:layout_alignParentBottom="true"
android:src="?attr/marker"/>
<TextView
android:id="@+id/start_procedure_header"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:layout_marginTop="@dimen/side_padding"
android:text="@string/start_procedure"
android:textAppearance="?attr/textPanelHeader"/>
<RelativeLayout
android:id="@+id/start_procedure_layer"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_below="@id/start_procedure_header">
<TextView
android:id="@+id/start_procedure_value"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:gravity="center_horizontal"
android:paddingLeft="@dimen/default_padding_half"
android:paddingRight="@dimen/default_padding_half"
android:textAppearance="?attr/textPanelCaption"
tools:text="@string/start_procedure_line_start"/>
android:layout_height="match_parent">
<ImageView
android:id="@+id/start_procedure_marker"
android:layout_width="match_parent"
android:layout_height="@dimen/thin_line"
android:layout_alignParentBottom="true"
android:src="?attr/marker" />
<TextView
android:id="@+id/start_procedure_header"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:layout_marginTop="@dimen/side_padding"
android:text="@string/start_procedure"
android:textAppearance="?attr/textPanelHeader" />
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_below="@id/start_procedure_header">
<TextView
android:id="@+id/start_procedure_value"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:gravity="center_horizontal"
android:paddingLeft="@dimen/default_padding_half"
android:paddingRight="@dimen/default_padding_half"
android:textAppearance="?attr/textPanelCaption"
tools:text="@string/start_procedure_line_start" />
</RelativeLayout>
<FrameLayout
android:id="@+id/start_procedure_lock"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="?attr/corner"
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"
android:layout_alignParentBottom="true"
android:layout_alignParentRight="true"/>
tools:visibility="visible">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="?attr/lock_outline" />
</FrameLayout>
<ImageView
android:layout_width="@dimen/thin_line"
android:layout_height="match_parent"
android:layout_alignParentRight="true"
android:src="?attr/white" />
</RelativeLayout>
<ImageView
android:layout_width="@dimen/thin_line"
android:layout_height="match_parent"
android:layout_alignParentRight="true"
android:src="?attr/white"/>
</RelativeLayout>
</FrameLayout>
<RelativeLayout
<FrameLayout
android:id="@+id/course"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:background="?attr/sap_gray">
<ImageView
android:id="@+id/course_marker"
android:layout_width="match_parent"
android:layout_height="@dimen/thin_line"
android:layout_alignParentBottom="true"
android:src="?attr/marker"/>
<TextView
android:id="@+id/course_header"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:layout_marginTop="@dimen/side_padding"
android:text="@string/course"
android:textAppearance="?attr/textPanelHeader"/>
<RelativeLayout
android:id="@+id/course_layer"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_below="@id/course_header">
<TextView
android:id="@+id/course_value"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:gravity="center_horizontal"
android:textAppearance="?attr/textPanelCaption"
tools:text="012"/>
android:layout_height="match_parent">
<ImageView
android:id="@+id/course_marker"
android:layout_width="match_parent"
android:layout_height="@dimen/thin_line"
android:layout_alignParentBottom="true"
android:src="?attr/marker" />
<TextView
android:id="@+id/course_header"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:layout_marginTop="@dimen/side_padding"
android:text="@string/course"
android:textAppearance="?attr/textPanelHeader" />
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_below="@id/course_header">
<TextView
android:id="@+id/course_value"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:gravity="center_horizontal"
android:textAppearance="?attr/textPanelCaption"
tools:text="012" />
</RelativeLayout>
<FrameLayout
android:id="@+id/course_lock"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="?attr/corner"
android:visibility="gone"
tools:visibility="visible"
android:layout_alignParentRight="true"
android:layout_alignParentBottom="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="wrap_content"
android:layout_height="wrap_content"
android:src="?attr/lock_outline" />
</FrameLayout>
<ImageView
android:layout_width="@dimen/thin_line"
android:layout_height="match_parent"
android:layout_alignParentRight="true"
android:src="?attr/white" />
</RelativeLayout>
</FrameLayout>
<ImageView
android:layout_width="@dimen/thin_line"
android:layout_height="match_parent"
android:layout_alignParentRight="true"
android:src="?attr/white"/>
</RelativeLayout>
<RelativeLayout
<FrameLayout
android:id="@+id/wind"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:background="?attr/sap_gray">
<ImageView
android:id="@+id/wind_marker"
android:layout_width="match_parent"
android:layout_height="@dimen/thin_line"
android:layout_alignParentBottom="true"
android:src="?attr/marker"/>
<TextView
android:id="@+id/wind_header"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:layout_marginTop="@dimen/side_padding"
android:text="@string/wind"
android:textAppearance="?attr/textPanelHeader"/>
<RelativeLayout
android:id="@+id/wind_layer"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_below="@id/wind_header">
<TextView
android:id="@+id/wind_value"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:gravity="center"
android:text="@string/wind_no_data"
android:textAppearance="?attr/textPanelCaption"/>
android:layout_height="match_parent">
<ImageView
android:id="@+id/wind_marker"
android:layout_width="match_parent"
android:layout_height="@dimen/thin_line"
android:layout_alignParentBottom="true"
android:src="?attr/marker" />
<TextView
android:id="@+id/wind_header"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:layout_marginTop="@dimen/side_padding"
android:text="@string/wind"
android:textAppearance="?attr/textPanelHeader" />
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_below="@id/wind_header">
<TextView
android:id="@+id/wind_value"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:gravity="center"
android:text="@string/wind_no_data"
android:textAppearance="?attr/textPanelCaption" />
</RelativeLayout>
<FrameLayout
android:id="@+id/wind_lock"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="?attr/corner"
android:visibility="gone"
tools:visibility="visible"
android:layout_alignParentRight="true"
android:layout_alignParentBottom="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="wrap_content"
android:layout_height="wrap_content"
android:src="?attr/lock_outline" />
</FrameLayout>
</RelativeLayout>
</RelativeLayout>
</FrameLayout>
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="@dimen/thin_line"
android:layout_alignParentBottom="true"
android:background="?attr/black"/>
android:background="?attr/black" />
</RelativeLayout>
mobile/com.sap.sailing.racecommittee.app/res/layout/race_panel_setup_ver.xml
+186 -135
View File
@@ -1,6 +1,5 @@
<?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:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
@@ -11,201 +10,253 @@
android:layout_height="match_parent"
android:orientation="vertical">
<RelativeLayout
<FrameLayout
android:id="@+id/start_procedure"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"
android:background="?attr/sap_gray">
<ImageView
android:id="@+id/start_procedure_marker"
android:layout_width="match_parent"
android:layout_height="@dimen/thin_line"
android:layout_alignParentBottom="true"
android:src="?attr/marker"/>
<TextView
android:id="@+id/start_procedure_header"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:layout_marginTop="@dimen/side_padding"
android:text="@string/start_procedure"
android:textAppearance="?attr/textPanelHeader"/>
<RelativeLayout
android:id="@+id/start_procedure_layer"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_below="@id/start_procedure_header">
<TextView
android:id="@+id/start_procedure_value"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:gravity="center_horizontal"
android:paddingLeft="@dimen/default_padding_half"
android:paddingRight="@dimen/default_padding_half"
android:textAppearance="?attr/textPanelCaption"
tools:text="@string/start_procedure_line_start"/>
android:layout_height="match_parent">
<ImageView
android:id="@+id/start_procedure_marker"
android:layout_width="match_parent"
android:layout_height="@dimen/thin_line"
android:layout_alignParentBottom="true"
android:src="?attr/marker" />
<TextView
android:id="@+id/start_procedure_header"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:layout_marginTop="@dimen/side_padding"
android:text="@string/start_procedure"
android:textAppearance="?attr/textPanelHeader" />
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_below="@id/start_procedure_header">
<TextView
android:id="@+id/start_procedure_value"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:gravity="center_horizontal"
android:paddingLeft="@dimen/default_padding_half"
android:paddingRight="@dimen/default_padding_half"
android:textAppearance="?attr/textPanelCaption"
tools:text="@string/start_procedure_line_start" />
</RelativeLayout>
<FrameLayout
android:id="@+id/start_procedure_lock"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="?attr/corner"
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"
android:layout_alignParentBottom="true"
android:layout_alignParentRight="true"/>
</RelativeLayout>
</RelativeLayout>
tools:visibility="visible">
<RelativeLayout
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="?attr/lock_outline" />
</FrameLayout>
</RelativeLayout>
</FrameLayout>
<FrameLayout
android:id="@+id/course"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"
android:background="?attr/sap_gray">
<ImageView
android:id="@+id/course_marker"
android:layout_width="match_parent"
android:layout_height="@dimen/thin_line"
android:layout_alignParentBottom="true"
android:src="?attr/marker"/>
<TextView
android:id="@+id/course_header"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:layout_marginTop="@dimen/side_padding"
android:text="@string/course"
android:textAppearance="?attr/textPanelHeader"/>
<RelativeLayout
android:id="@+id/course_layer"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_below="@id/course_header">
<TextView
android:id="@+id/course_value"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:gravity="center_horizontal"
android:textAppearance="?attr/textPanelCaption"
tools:text="012"/>
android:layout_height="match_parent">
<ImageView
android:id="@+id/course_marker"
android:layout_width="match_parent"
android:layout_height="@dimen/thin_line"
android:layout_alignParentBottom="true"
android:src="?attr/marker" />
<TextView
android:id="@+id/course_header"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:layout_marginTop="@dimen/side_padding"
android:text="@string/course"
android:textAppearance="?attr/textPanelHeader" />
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_below="@id/course_header">
<TextView
android:id="@+id/course_value"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:gravity="center_horizontal"
android:textAppearance="?attr/textPanelCaption"
tools:text="012" />
</RelativeLayout>
<FrameLayout
android:id="@+id/course_lock"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="?attr/corner"
android:visibility="gone"
tools:visibility="visible"
android:layout_alignParentRight="true"
android:layout_alignParentBottom="true"/>
</RelativeLayout>
</RelativeLayout>
android:layout_alignParentTop="true"
android:background="@color/lock_background"
android:padding="@dimen/panel_lock_padding"
android:visibility="gone"
tools:visibility="visible">
<RelativeLayout
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="?attr/lock_outline" />
</FrameLayout>
</RelativeLayout>
</FrameLayout>
<FrameLayout
android:id="@+id/wind"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"
android:background="?attr/sap_gray">
<ImageView
android:id="@+id/wind_marker"
android:layout_width="match_parent"
android:layout_height="@dimen/thin_line"
android:layout_alignParentBottom="true"
android:src="?attr/marker"/>
<TextView
android:id="@+id/wind_header"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:layout_marginTop="@dimen/side_padding"
android:text="@string/wind"
android:textAppearance="?attr/textPanelHeader"/>
<RelativeLayout
android:id="@+id/wind_layer"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_below="@id/wind_header">
<TextView
android:id="@+id/wind_value"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:gravity="center"
android:text="@string/wind_no_data"
android:textAppearance="?attr/textPanelCaption"/>
android:layout_height="match_parent">
<ImageView
android:id="@+id/wind_marker"
android:layout_width="match_parent"
android:layout_height="@dimen/thin_line"
android:layout_alignParentBottom="true"
android:src="?attr/marker" />
<TextView
android:id="@+id/wind_header"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:layout_marginTop="@dimen/side_padding"
android:text="@string/wind"
android:textAppearance="?attr/textPanelHeader" />
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_below="@id/wind_header">
<TextView
android:id="@+id/wind_value"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:gravity="center"
android:text="@string/wind_no_data"
android:textAppearance="?attr/textPanelCaption" />
</RelativeLayout>
<FrameLayout
android:id="@+id/wind_lock"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="?attr/corner"
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"
android:layout_alignParentBottom="true"
android:layout_alignParentRight="true"/>
</RelativeLayout>
</RelativeLayout>
tools:visibility="visible">
<RelativeLayout
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="?attr/lock_outline" />
</FrameLayout>
</RelativeLayout>
</FrameLayout>
<FrameLayout
android:id="@+id/start_procedure_more"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"
android:background="?attr/sap_gray">
<ImageView
android:id="@+id/start_procedure_more_marker"
android:layout_width="match_parent"
android:layout_height="@dimen/thin_line"
android:layout_alignParentBottom="true"
android:src="?attr/marker"/>
<TextView
android:id="@+id/start_procedure_more_header"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:layout_marginTop="@dimen/side_padding"
android:text="@string/start_procedure_more"
android:textAppearance="?attr/textPanelHeader"/>
<RelativeLayout
android:id="@+id/start_procedure_more_layer"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_below="@id/start_procedure_more_header">
android:layout_height="match_parent">
<ImageView
android:id="@+id/start_procedure_more_icon"
android:id="@+id/start_procedure_more_marker"
android:layout_width="match_parent"
android:layout_height="@dimen/thin_line"
android:layout_alignParentBottom="true"
android:src="?attr/marker" />
<TextView
android:id="@+id/start_procedure_more_header"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:src="?attr/keyboard_control_36dp"/>
android:layout_centerHorizontal="true"
android:layout_marginTop="@dimen/side_padding"
android:text="@string/start_procedure_more"
android:textAppearance="?attr/textPanelHeader" />
<ImageView
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_below="@id/start_procedure_more_header">
<ImageView
android:id="@+id/start_procedure_more_icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:src="?attr/keyboard_control_36dp" />
</RelativeLayout>
<FrameLayout
android:id="@+id/start_procedure_more_lock"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="?attr/corner"
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"
android:layout_alignParentBottom="true"
android:layout_alignParentRight="true"/>
tools:visibility="visible">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="?attr/lock_outline" />
</FrameLayout>
</RelativeLayout>
</RelativeLayout>
</FrameLayout>
</LinearLayout>
<View
@@ -213,5 +264,5 @@
android:layout_height="match_parent"
android:layout_alignParentEnd="true"
android:layout_alignParentRight="true"
android:background="?attr/black"/>
android:background="?attr/black" />
</RelativeLayout>
mobile/com.sap.sailing.racecommittee.app/res/values-sw600dp/dimens.xml
+1
View File
@@ -13,6 +13,7 @@
<dimen name="panel_button_header_size">20sp</dimen>
<dimen name="panel_button_caption_size">18sp</dimen>
<dimen name="panel_lock_padding">5dp</dimen>
<!-- race state dependent -->
<!-- login -->
mobile/com.sap.sailing.racecommittee.app/res/values/colors.xml
+3 -1
View File
@@ -2,7 +2,7 @@
<resources>
<color name="constant_white">#ffffff</color>
<color name="constant_white_transparent">#99FFFFFF</color>
<color name="constant_white_transparent">#99ffffff</color>
<color name="constant_light_gray">#eeeeee</color>
<color name="constant_light_gray_pressed">#e0e0e0</color>
<color name="constant_light_gray_ripple">#d3d3d3</color>
@@ -26,6 +26,8 @@
<color name="accuracy_yellow_light">#f7d57f</color>
<color name="accuracy_green">#8ab54e</color>
<color name="lock_background">#b4b4b4</color>
<!-- buoy colors -->
<!-- color layer -->
<color name="buoy_color">#f8ac00</color> <!-- default -->
mobile/com.sap.sailing.racecommittee.app/res/values/dimens.xml
+1
View File
@@ -66,6 +66,7 @@
<dimen name="panel_button_caption_size">14sp</dimen>
<dimen name="panel_button_header_size">16sp</dimen>
<dimen name="panel_lock_padding">2dp</dimen>
<dimen name="flags">64dp</dimen>
<!-- custom dimens (float, integer) -->
mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/panels/BasePanelFragment.java
+14 -6
View File
@@ -1,8 +1,5 @@
package com.sap.sailing.racecommittee.app.ui.fragments.panels;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import android.app.Fragment;
import android.content.DialogInterface;
import android.graphics.drawable.Drawable;
@@ -10,6 +7,7 @@ import android.os.Bundle;
import android.os.Handler;
import android.support.annotation.IdRes;
import android.support.annotation.IntDef;
import android.support.annotation.Nullable;
import android.support.v7.app.AlertDialog;
import android.view.View;
import android.widget.ImageView;
@@ -20,11 +18,15 @@ import com.sap.sailing.racecommittee.app.ui.fragments.RaceFragment;
import com.sap.sailing.racecommittee.app.ui.fragments.raceinfo.BaseFragment;
import com.sap.sailing.racecommittee.app.utils.ThemeHelper;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
public abstract class BasePanelFragment extends RaceFragment {
@IntDef({LEVEL_UNKNOWN, LEVEL_NORMAL, LEVEL_TOGGLED})
@Retention(RetentionPolicy.SOURCE)
public @interface MarkerLevel {}
public @interface MarkerLevel {
}
/**
* Marker level is unknown, due to an error
@@ -123,10 +125,17 @@ public abstract class BasePanelFragment extends RaceFragment {
return retValue;
}
protected void changeVisibility(View view, int visibility) {
protected void changeVisibility(@Nullable View view, @Nullable View layer, int visibility) {
if (view != null) {
view.setVisibility(visibility);
}
if (layer != null) {
if (visibility != View.VISIBLE) {
layer.setAlpha(1f);
} else {
layer.setAlpha(0.5f);
}
}
}
protected void resetFragment(View lockIcon, @IdRes int idRes, Class<? extends BaseFragment> cls) {
@@ -140,7 +149,6 @@ public abstract class BasePanelFragment extends RaceFragment {
}
}
}
}
protected void replaceFragment(RaceFragment fragment) {
mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/panels/FlagPanelFragment.java
+57 -47
View File
@@ -32,22 +32,27 @@ public class FlagPanelFragment extends BasePanelFragment {
// Abandon Toggle
private View mAbandonFlags;
private View mAbandonLock;
private View mAbandonLayer;
// Recall Toggle
private View mRecallFlags;
private View mRecallLock;
private View mRecallLayer;
// Postpone Toggle
private View mPostponeFlags;
private View mPostponeLock;
private View mPostponeLayer;
// Course Toggle
private View mCourseFlags;
private View mCourseLock;
private View mCourseLayer;
// More Toggle (Finish)
private View mMoreFlags;
private View mMoreLock;
private View mMoreLayer;
public FlagPanelFragment() {
mReceiver = new IntentReceiver();
@@ -68,30 +73,35 @@ public class FlagPanelFragment extends BasePanelFragment {
mAbandonFlags.setOnClickListener(new AbandonFlagsClick());
}
mAbandonLock = ViewHelper.get(layout, R.id.abandon_flags_lock);
mAbandonLayer = ViewHelper.get(layout, R.id.abandon_flags_layer);
mRecallFlags = ViewHelper.get(layout, R.id.recall_flags);
if (mRecallFlags != null) {
mRecallFlags.setOnClickListener(new RecallFlagsClick());
}
mRecallLock = ViewHelper.get(layout, R.id.recall_flags_lock);
mRecallLayer = ViewHelper.get(layout, R.id.recall_flags_layer);
mPostponeFlags = ViewHelper.get(layout, R.id.postpone_flags);
if (mPostponeFlags != null) {
mPostponeFlags.setOnClickListener(new PostponeFlagsClick());
}
mPostponeLock = ViewHelper.get(layout, R.id.postpone_flags_lock);
mPostponeLayer = ViewHelper.get(layout, R.id.postpone_flags_layer);
mCourseFlags = ViewHelper.get(layout, R.id.course_flags);
if (mCourseFlags != null) {
mCourseFlags.setOnClickListener(new CourseFlagsClick());
}
mCourseLock = ViewHelper.get(layout, R.id.course_flags_lock);
mCourseLayer = ViewHelper.get(layout, R.id.course_flags_layer);
mMoreFlags = ViewHelper.get(layout, R.id.more_flags);
if (mMoreFlags != null) {
mMoreFlags.setOnClickListener(new MoreFlagsClick());
}
mMoreLock = ViewHelper.get(layout, R.id.more_flags_lock);
mMoreLayer = ViewHelper.get(layout, R.id.more_flags_layer);
return layout;
}
@@ -123,29 +133,29 @@ public class FlagPanelFragment extends BasePanelFragment {
}
private void checkStatus() {
changeVisibility(mPostponeLock, View.GONE);
changeVisibility(mAbandonLock, View.GONE);
changeVisibility(mRecallLock, View.GONE);
changeVisibility(mCourseLock, View.GONE);
changeVisibility(mMoreLock, View.GONE);
changeVisibility(mPostponeLock, mPostponeLayer, View.GONE);
changeVisibility(mAbandonLock, mAbandonLayer, View.GONE);
changeVisibility(mRecallLock, null, View.GONE);
changeVisibility(mCourseLock, null, View.GONE);
changeVisibility(mMoreLock, null, View.GONE);
switch (getRace().getStatus()) {
case UNSCHEDULED:
changeVisibility(mPostponeFlags, View.VISIBLE);
changeVisibility(mAbandonFlags, View.VISIBLE);
changeVisibility(mRecallFlags, View.VISIBLE);
changeVisibility(mCourseFlags, View.GONE);
changeVisibility(mMoreFlags, View.VISIBLE);
changeVisibility(mPostponeFlags, null, View.VISIBLE);
changeVisibility(mAbandonFlags, null, View.VISIBLE);
changeVisibility(mRecallFlags, null, View.VISIBLE);
changeVisibility(mCourseFlags, null, View.GONE);
changeVisibility(mMoreFlags, null, View.VISIBLE);
uncheckMarker(mCourseFlags);
break;
case PRESCHEDULED:
changeVisibility(mPostponeFlags, View.VISIBLE);
changeVisibility(mAbandonFlags, View.GONE);
changeVisibility(mRecallFlags, View.GONE);
changeVisibility(mCourseFlags, View.GONE);
changeVisibility(mMoreFlags, View.GONE);
changeVisibility(mPostponeFlags, null, View.VISIBLE);
changeVisibility(mAbandonFlags, null, View.GONE);
changeVisibility(mRecallFlags, null, View.GONE);
changeVisibility(mCourseFlags, null, View.GONE);
changeVisibility(mMoreFlags, null, View.GONE);
uncheckMarker(mAbandonFlags);
uncheckMarker(mCourseFlags);
@@ -154,11 +164,11 @@ public class FlagPanelFragment extends BasePanelFragment {
case SCHEDULED:
case STARTPHASE:
changeVisibility(mPostponeFlags, View.VISIBLE);
changeVisibility(mAbandonFlags, View.GONE);
changeVisibility(mRecallFlags, View.GONE);
changeVisibility(mCourseFlags, View.GONE);
changeVisibility(mMoreFlags, View.GONE);
changeVisibility(mPostponeFlags, null, View.VISIBLE);
changeVisibility(mAbandonFlags, null, View.GONE);
changeVisibility(mRecallFlags, null, View.GONE);
changeVisibility(mCourseFlags, null, View.GONE);
changeVisibility(mMoreFlags, null, View.GONE);
uncheckMarker(mAbandonFlags);
uncheckMarker(mRecallFlags);
@@ -166,25 +176,25 @@ public class FlagPanelFragment extends BasePanelFragment {
break;
case RUNNING:
changeVisibility(mPostponeLock, View.VISIBLE);
changeVisibility(mPostponeLock, mPostponeLayer, View.VISIBLE);
changeVisibility(mPostponeFlags, View.VISIBLE);
changeVisibility(mAbandonFlags, View.VISIBLE);
changeVisibility(mRecallFlags, View.VISIBLE);
changeVisibility(mCourseFlags, View.GONE);
changeVisibility(mMoreFlags, View.VISIBLE);
changeVisibility(mPostponeFlags, null, View.VISIBLE);
changeVisibility(mAbandonFlags, null, View.VISIBLE);
changeVisibility(mRecallFlags, null, View.VISIBLE);
changeVisibility(mCourseFlags, null, View.GONE);
changeVisibility(mMoreFlags, null, View.VISIBLE);
uncheckMarker(mCourseFlags);
break;
case FINISHING:
changeVisibility(mPostponeLock, View.VISIBLE);
changeVisibility(mPostponeLock, mPostponeLayer, View.VISIBLE);
changeVisibility(mPostponeFlags, View.VISIBLE);
changeVisibility(mAbandonFlags, View.VISIBLE);
changeVisibility(mRecallFlags, View.GONE);
changeVisibility(mCourseFlags, View.GONE);
changeVisibility(mMoreFlags, View.GONE);
changeVisibility(mPostponeFlags, null, View.VISIBLE);
changeVisibility(mAbandonFlags, null, View.VISIBLE);
changeVisibility(mRecallFlags, null, View.GONE);
changeVisibility(mCourseFlags, null, View.GONE);
changeVisibility(mMoreFlags, null, View.GONE);
uncheckMarker(mRecallFlags);
uncheckMarker(mCourseFlags);
@@ -192,23 +202,23 @@ public class FlagPanelFragment extends BasePanelFragment {
break;
case FINISHED:
changeVisibility(mPostponeLock, View.VISIBLE);
changeVisibility(mPostponeLock, mPostponeLayer, View.VISIBLE);
changeVisibility(mPostponeFlags, View.VISIBLE);
changeVisibility(mAbandonFlags, View.VISIBLE);
changeVisibility(mRecallFlags, View.VISIBLE);
changeVisibility(mCourseFlags, View.GONE);
changeVisibility(mMoreFlags, View.VISIBLE);
changeVisibility(mPostponeFlags, null, View.VISIBLE);
changeVisibility(mAbandonFlags, null, View.VISIBLE);
changeVisibility(mRecallFlags, null, View.VISIBLE);
changeVisibility(mCourseFlags, null, View.GONE);
changeVisibility(mMoreFlags, null, View.VISIBLE);
uncheckMarker(mCourseFlags);
break;
default:
changeVisibility(mPostponeFlags, View.GONE);
changeVisibility(mAbandonFlags, View.GONE);
changeVisibility(mRecallFlags, View.GONE);
changeVisibility(mCourseFlags, View.GONE);
changeVisibility(mMoreFlags, View.GONE);
changeVisibility(mPostponeFlags, mPostponeLayer, View.GONE);
changeVisibility(mAbandonFlags, null, View.GONE);
changeVisibility(mRecallFlags, null, View.GONE);
changeVisibility(mCourseFlags, null, View.GONE);
changeVisibility(mMoreFlags, null, View.GONE);
uncheckMarker(mPostponeFlags);
uncheckMarker(mAbandonFlags);
@@ -254,18 +264,18 @@ public class FlagPanelFragment extends BasePanelFragment {
if (start != null) {
long diff = now.minus(start.asMillis()).asMillis();
if (diff >= 60000) {
changeVisibility(mRecallLock, View.VISIBLE);
changeVisibility(mRecallLock, mRecallLayer, View.VISIBLE);
} else {
changeVisibility(mRecallLock, View.GONE);
changeVisibility(mRecallLock, mRecallLayer, View.GONE);
}
} else {
changeVisibility(mRecallLock, View.GONE);
changeVisibility(mRecallLock, mRecallLayer, View.GONE);
}
break;
case FINISHING:
case FINISHED:
changeVisibility(mRecallLock, View.VISIBLE);
changeVisibility(mRecallLock, mRecallLayer, View.VISIBLE);
break;
default:
mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/panels/MorePanelFragment.java
+35 -25
View File
@@ -41,16 +41,19 @@ public class MorePanelFragment extends BasePanelFragment {
private View mStartMode;
private View mStartModeLock;
private ImageView mStartModeFlag;
private View mStartModeLayer;
// Gate Start PathFinder
private View mGatePathfinder;
private View mGatePathfinderLock;
private TextView mGatePathfinderValue;
private View mGatePathfinderLayer;
// Gate Start Timing
private View mGateTiming;
private View mGateTimingLock;
private TextView mGateTimingValue;
private View mGateTimingLayer;
public MorePanelFragment() {
mReceiver = new IntentReceiver();
@@ -75,6 +78,7 @@ public class MorePanelFragment extends BasePanelFragment {
}
mStartModeLock = ViewHelper.get(layout, R.id.start_mode_lock);
mStartModeFlag = ViewHelper.get(layout, R.id.start_mode_flag);
mStartModeLayer = ViewHelper.get(layout, R.id.start_mode_layer);
mGatePathfinder = ViewHelper.get(layout, R.id.gate_pathfinder);
if (mGatePathfinder != null) {
@@ -82,6 +86,7 @@ public class MorePanelFragment extends BasePanelFragment {
}
mGatePathfinderLock = ViewHelper.get(layout, R.id.gate_pathfinder_lock);
mGatePathfinderValue = ViewHelper.get(layout, R.id.gate_pathfinder_value);
mGatePathfinderLayer = ViewHelper.get(layout, R.id.gate_pathfinder_layer);
mGateTiming = ViewHelper.get(layout, R.id.gate_timing);
if (mGateTiming != null) {
@@ -89,6 +94,7 @@ public class MorePanelFragment extends BasePanelFragment {
}
mGateTimingLock = ViewHelper.get(layout, R.id.gate_timing_lock);
mGateTimingValue = ViewHelper.get(layout, R.id.gate_timing_value);
mGateTimingLayer = ViewHelper.get(layout, R.id.gate_timing_layer);
View view = ViewHelper.get(layout, R.id.top_line);
if (view != null && AppUtils.with(getActivity()).isPort()) {
@@ -131,7 +137,7 @@ public class MorePanelFragment extends BasePanelFragment {
if (mStartMode != null && mStartModeFlag != null) {
mStartMode.setVisibility(View.VISIBLE);
mStartModeFlag.setImageDrawable(FlagsResources
.getFlagDrawable(getActivity(), typedProcedure.getStartModeFlag().name(), getResources().getInteger(R.integer.flag_size)));
.getFlagDrawable(getActivity(), typedProcedure.getStartModeFlag().name(), getResources().getInteger(R.integer.flag_size)));
}
}
@@ -152,54 +158,58 @@ public class MorePanelFragment extends BasePanelFragment {
private void checkStatus() {
switch (getRace().getStatus()) {
case UNSCHEDULED:
changeVisibility(mStartModeLock, View.GONE);
changeVisibility(mGatePathfinderLock, View.GONE);
changeVisibility(mGateTimingLock, View.GONE);
changeVisibility(mStartModeLock, mStartModeLayer, View.GONE);
changeVisibility(mGatePathfinderLock, mGatePathfinderLayer, View.GONE);
changeVisibility(mGateTimingLock, mGateTimingLayer, View.GONE);
break;
case PRESCHEDULED:
changeVisibility(mStartModeLock, View.GONE);
changeVisibility(mGatePathfinderLock, View.GONE);
changeVisibility(mGateTimingLock, View.GONE);
changeVisibility(mStartModeLock, mStartModeLayer, View.GONE);
changeVisibility(mGatePathfinderLock, mGatePathfinderLayer, View.GONE);
changeVisibility(mGateTimingLock, mGateTimingLayer, View.GONE);
break;
case SCHEDULED:
changeVisibility(mStartModeLock, View.GONE);
changeVisibility(mGatePathfinderLock, View.GONE);
changeVisibility(mGateTimingLock, View.GONE);
changeVisibility(mStartModeLock, mStartModeLayer, View.GONE);
changeVisibility(mGatePathfinderLock, mGatePathfinderLayer, View.GONE);
changeVisibility(mGateTimingLock, mGateTimingLayer, View.GONE);
break;
case STARTPHASE:
changeVisibility(mStartModeLock, View.VISIBLE);
changeVisibility(mGatePathfinderLock, View.VISIBLE);
changeVisibility(mGateTimingLock, View.VISIBLE);
changeVisibility(mStartModeLock, mStartModeLayer, View.VISIBLE);
changeVisibility(mGatePathfinderLock, mGatePathfinderLayer, View.VISIBLE);
changeVisibility(mGateTimingLock, mGateTimingLayer, View.VISIBLE);
break;
case RUNNING:
changeVisibility(mStartModeLock, View.VISIBLE);
changeVisibility(mGatePathfinderLock, View.VISIBLE);
changeVisibility(mGateTimingLock, View.VISIBLE);
changeVisibility(mStartModeLock, mStartModeLayer, View.VISIBLE);
changeVisibility(mGatePathfinderLock, mGatePathfinderLayer, View.VISIBLE);
changeVisibility(mGateTimingLock, mGateTimingLayer, View.VISIBLE);
uncheckMarker(mStartMode);
break;
case FINISHING:
changeVisibility(mStartModeLock, View.VISIBLE);
changeVisibility(mGatePathfinderLock, View.VISIBLE);
changeVisibility(mGateTimingLock, View.VISIBLE);
changeVisibility(mStartModeLock, mStartModeLayer, View.VISIBLE);
changeVisibility(mGatePathfinderLock, mGatePathfinderLayer, View.VISIBLE);
changeVisibility(mGateTimingLock, mGateTimingLayer, View.VISIBLE);
uncheckMarker(mStartMode);
break;
case FINISHED:
changeVisibility(mStartModeLock, View.GONE);
changeVisibility(mGatePathfinderLock, View.GONE);
changeVisibility(mGateTimingLock, View.GONE);
changeVisibility(mStartModeLock, mStartModeLayer, View.GONE);
changeVisibility(mGatePathfinderLock, mGatePathfinderLayer, View.GONE);
changeVisibility(mGateTimingLock, mGateTimingLayer, View.GONE);
uncheckMarker(mStartMode);
break;
default:
changeVisibility(mStartModeLock, View.VISIBLE);
changeVisibility(mGatePathfinderLock, View.VISIBLE);
changeVisibility(mGateTimingLock, View.VISIBLE);
changeVisibility(mStartModeLock, mStartModeLayer, View.VISIBLE);
changeVisibility(mGatePathfinderLock, mGatePathfinderLayer, View.VISIBLE);
changeVisibility(mGateTimingLock, mGateTimingLayer, View.VISIBLE);
uncheckMarker(mStartMode);
break;
}
mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/panels/SetupPanelFragment.java
+44 -32
View File
@@ -43,21 +43,25 @@ public class SetupPanelFragment extends BasePanelFragment {
private View mStartProcedure;
private View mStartProcedureLock;
private TextView mStartProcedureValue;
private View mStartProcedureLayer;
// Start Procedure More Toggle
private View mStartProcedureMore;
private View mStartProcedureMoreLock;
private FrameLayout mExtraLayout;
private View mStartProcedureMoreLayer;
// Course Toggle
private View mCourse;
private View mCourseLock;
private TextView mCourseValue;
private View mCourseLayer;
// Wind Toggle
private View mWind;
private View mWindLock;
private TextView mWindValue;
private View mWindLayer;
public SetupPanelFragment() {
mReceiver = new IntentReceiver();
@@ -82,12 +86,14 @@ public class SetupPanelFragment extends BasePanelFragment {
}
mStartProcedureLock = ViewHelper.get(layout, R.id.start_procedure_lock);
mStartProcedureValue = ViewHelper.get(layout, R.id.start_procedure_value);
mStartProcedureLayer = ViewHelper.get(layout, R.id.start_procedure_layer);
mStartProcedureMore = ViewHelper.get(layout, R.id.start_procedure_more);
if (mStartProcedureMore != null) {
mStartProcedureMore.setOnClickListener(new StartProcedureMoreClick());
}
mStartProcedureMoreLock = ViewHelper.get(layout, R.id.start_procedure_more_lock);
mStartProcedureMoreLayer = ViewHelper.get(layout, R.id.start_procedure_more_layer);
mCourse = ViewHelper.get(layout, R.id.course);
if (mCourse != null) {
@@ -95,6 +101,7 @@ public class SetupPanelFragment extends BasePanelFragment {
}
mCourseLock = ViewHelper.get(layout, R.id.course_lock);
mCourseValue = ViewHelper.get(layout, R.id.course_value);
mCourseLayer = ViewHelper.get(layout, R.id.course_layer);
mWind = ViewHelper.get(layout, R.id.wind);
if (mWind != null) {
@@ -102,6 +109,7 @@ public class SetupPanelFragment extends BasePanelFragment {
}
mWindLock = ViewHelper.get(layout, R.id.wind_lock);
mWindValue = ViewHelper.get(layout, R.id.wind_value);
mWindLayer = ViewHelper.get(layout, R.id.wind_layer);
return layout;
}
@@ -154,7 +162,7 @@ public class SetupPanelFragment extends BasePanelFragment {
if (mStartProcedureMore != null) {
if (getRaceState().getRacingProcedure() instanceof RRS26RacingProcedure || getRaceState()
.getRacingProcedure() instanceof GateStartRacingProcedure) {
.getRacingProcedure() instanceof GateStartRacingProcedure) {
mStartProcedureMore.setVisibility(View.VISIBLE);
} else {
mStartProcedureMore.setVisibility(View.GONE);
@@ -172,57 +180,60 @@ public class SetupPanelFragment extends BasePanelFragment {
private void checkStatus() {
switch (getRace().getStatus()) {
case UNSCHEDULED:
changeVisibility(mStartProcedureLock, View.GONE);
changeVisibility(mStartProcedureMoreLock, View.GONE);
changeVisibility(mCourseLock, View.GONE);
changeVisibility(mWindLock, View.GONE);
changeVisibility(mStartProcedureLock, mStartProcedureLayer, View.GONE);
changeVisibility(mStartProcedureMoreLock, mStartProcedureMoreLayer, View.GONE);
changeVisibility(mCourseLock, mCourseLayer, View.GONE);
changeVisibility(mWindLock, mWindLayer, View.GONE);
break;
case PRESCHEDULED:
changeVisibility(mStartProcedureLock, View.GONE);
changeVisibility(mStartProcedureMoreLock, View.GONE);
changeVisibility(mCourseLock, View.GONE);
changeVisibility(mWindLock, View.GONE);
changeVisibility(mStartProcedureLock, mStartProcedureLayer, View.GONE);
changeVisibility(mStartProcedureMoreLock, mStartProcedureMoreLayer, View.GONE);
changeVisibility(mCourseLock, mCourseLayer, View.GONE);
changeVisibility(mWindLock, mWindLayer, View.GONE);
break;
case SCHEDULED:
changeVisibility(mStartProcedureLock, View.GONE);
changeVisibility(mStartProcedureMoreLock, View.GONE);
changeVisibility(mCourseLock, View.GONE);
changeVisibility(mWindLock, View.GONE);
changeVisibility(mStartProcedureLock, mStartProcedureLayer, View.GONE);
changeVisibility(mStartProcedureMoreLock, mStartProcedureMoreLayer, View.GONE);
changeVisibility(mCourseLock, mCourseLayer, View.GONE);
changeVisibility(mWindLock, mWindLayer, View.GONE);
break;
case STARTPHASE:
changeVisibility(mStartProcedureLock, View.VISIBLE);
changeVisibility(mStartProcedureMoreLock, View.GONE);
changeVisibility(mCourseLock, View.GONE);
changeVisibility(mWindLock, View.GONE);
changeVisibility(mStartProcedureLock, mStartProcedureLayer, View.VISIBLE);
changeVisibility(mStartProcedureMoreLock, mStartProcedureMoreLayer, View.GONE);
changeVisibility(mCourseLock, mCourseLayer, View.GONE);
changeVisibility(mWindLock, mWindLayer, View.GONE);
break;
case RUNNING:
changeVisibility(mStartProcedureLock, View.VISIBLE);
changeVisibility(mStartProcedureMoreLock, View.GONE);
changeVisibility(mCourseLock, View.GONE);
changeVisibility(mWindLock, View.GONE);
changeVisibility(mStartProcedureLock, mStartProcedureLayer, View.VISIBLE);
changeVisibility(mStartProcedureMoreLock, mStartProcedureMoreLayer, View.GONE);
changeVisibility(mCourseLock, mCourseLayer, View.GONE);
changeVisibility(mWindLock, mWindLayer, View.GONE);
uncheckMarker(mStartProcedure);
uncheckMarker(mStartProcedureMore);
break;
case FINISHING:
changeVisibility(mStartProcedureLock, View.VISIBLE);
changeVisibility(mStartProcedureMoreLock, View.GONE);
changeVisibility(mCourseLock, View.VISIBLE);
changeVisibility(mWindLock, View.GONE);
changeVisibility(mStartProcedureLock, mStartProcedureLayer, View.VISIBLE);
changeVisibility(mStartProcedureMoreLock, mStartProcedureMoreLayer, View.GONE);
changeVisibility(mCourseLock, mCourseLayer, View.VISIBLE);
changeVisibility(mWindLock, mWindLayer, View.GONE);
uncheckMarker(mStartProcedure);
uncheckMarker(mStartProcedureMore);
uncheckMarker(mCourseLock);
break;
case FINISHED:
changeVisibility(mStartProcedureLock, View.GONE);
changeVisibility(mStartProcedureMoreLock, View.GONE);
changeVisibility(mCourseLock, View.GONE);
changeVisibility(mWindLock, View.GONE);
changeVisibility(mStartProcedureLock, mStartProcedureLayer, View.GONE);
changeVisibility(mStartProcedureMoreLock, mStartProcedureMoreLayer, View.GONE);
changeVisibility(mCourseLock, mCourseLayer, View.GONE);
changeVisibility(mWindLock, mWindLayer, View.GONE);
uncheckMarker(mStartProcedure);
uncheckMarker(mStartProcedureMore);
uncheckMarker(mCourse);
@@ -230,9 +241,10 @@ public class SetupPanelFragment extends BasePanelFragment {
break;
default:
changeVisibility(mStartProcedureLock, View.VISIBLE);
changeVisibility(mCourseLock, View.VISIBLE);
changeVisibility(mWindLock, View.VISIBLE);
changeVisibility(mStartProcedureLock, mStartProcedureLayer, View.VISIBLE);
changeVisibility(mCourseLock, mCourseLayer, View.VISIBLE);
changeVisibility(mWindLock, mWindLayer, View.VISIBLE);
uncheckMarker(mStartProcedure);
uncheckMarker(mStartProcedureMore);
uncheckMarker(mCourse);
mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/panels/TimePanelFragment.java
+13 -13
View File
@@ -1,9 +1,5 @@
package com.sap.sailing.racecommittee.app.ui.fragments.panels;
import static com.sap.sailing.domain.abstractlog.race.analyzing.impl.StartTimeFinderResult.ResolutionFailed.NO_START_TIME_SET;
import java.text.SimpleDateFormat;
import android.content.BroadcastReceiver;
import android.content.Context;
import android.content.DialogInterface;
@@ -35,6 +31,10 @@ import com.sap.sse.common.TimePoint;
import com.sap.sse.common.Util;
import com.sap.sse.common.impl.MillisecondsTimePoint;
import java.text.SimpleDateFormat;
import static com.sap.sailing.domain.abstractlog.race.analyzing.impl.StartTimeFinderResult.ResolutionFailed.NO_START_TIME_SET;
public class TimePanelFragment extends BasePanelFragment {
public final static String TOGGLED = "toggled";
@@ -158,7 +158,7 @@ public class TimePanelFragment extends BasePanelFragment {
SimpleRaceLogIdentifier identifier = Util.get(result.getRacesDependingOn(), 0);
ManagedRace race = DataManager.create(getActivity()).getDataStore().getRace(identifier);
mHeaderTime
.setText(getString(R.string.minutes_after_long, result.getStartTimeDiff().asMinutes(), RaceHelper.getRaceName(race, " / ")));
.setText(getString(R.string.minutes_after_long, result.getStartTimeDiff().asMinutes(), RaceHelper.getRaceName(race, " / ")));
}
}
}
@@ -180,35 +180,35 @@ public class TimePanelFragment extends BasePanelFragment {
private void checkStatus() {
switch (getRace().getStatus()) {
case UNSCHEDULED:
changeVisibility(mTimeLock, View.GONE);
changeVisibility(mTimeLock, null, View.GONE);
break;
case PRESCHEDULED:
changeVisibility(mTimeLock, View.GONE);
changeVisibility(mTimeLock, null, View.GONE);
break;
case SCHEDULED:
changeVisibility(mTimeLock, View.GONE);
changeVisibility(mTimeLock, null, View.GONE);
break;
case STARTPHASE:
changeVisibility(mTimeLock, View.GONE);
changeVisibility(mTimeLock, null, View.GONE);
break;
case RUNNING:
changeVisibility(mTimeLock, View.VISIBLE);
changeVisibility(mTimeLock, null, View.VISIBLE);
break;
case FINISHING:
changeVisibility(mTimeLock, View.VISIBLE);
changeVisibility(mTimeLock, null, View.VISIBLE);
break;
case FINISHED:
changeVisibility(mTimeLock, View.VISIBLE);
changeVisibility(mTimeLock, null, View.VISIBLE);
break;
default:
changeVisibility(mTimeLock, View.VISIBLE);
changeVisibility(mTimeLock, null, View.VISIBLE);
break;
}
}