Merge branch 'ubilabs--rcapp--master' into ubilabs--rcapp--develop

mobile/com.sap.sailing.racecommittee.app/res/layout/race_list_header.xml

@@ -27,7 +27,7 @@
         android:layout_margin="@dimen/default_margin"
         android:background="@drawable/round_button"
         android:padding="10dp"
-        android:src="@drawable/ic_assignment_white_48dp" />
+        android:src="@drawable/ic_power_settings_new_white_48dp" />
 
     <TextView
         android:id="@+id/regatta_data"

mobile/com.sap.sailing.racecommittee.app/res/values-de/strings.xml

@@ -34,7 +34,7 @@
     <string name="flag_ap">AP</string>
     <string name="flag_november">November</string>
     <string name="flag_jury">Jury</string>
-    <string name="label_login_events">Event</string>
+    <string name="label_login_events">Regatta</string>
     <string name="label_login_course_area">Bahn</string>
     <string name="label_login_position">Position</string>
     <string name="login_type_viewer">Im Demo-Modus anmelden</string>
@@ -269,7 +269,7 @@
     <string name="course">Kurs</string>
     <string name="confirm_start_time">Startzeit Bestätigen</string>
     <string name="confirm_start_mode">Startmodus Bestätigen</string>
-    <string name="login_sub_text">Wo halten Sie sich auf?</string>
+    <string name="login_sub_text">Bitte wählen Sie eine Regatta aus</string>
     <string name="login_text">Willkommen in der SAP Sailing\nRace Committee App</string>
     <string name="nav_drawer_close">Navigation-Drawer schließen</string>
     <string name="nav_drawer_open">Navigation-Drawer öffnen</string>

mobile/com.sap.sailing.racecommittee.app/res/values/strings.xml

@@ -43,7 +43,7 @@
     <string name="flag_ap">AP</string>
     <string name="flag_november">November</string>
     <string name="flag_jury">Jury</string>
-    <string name="label_login_events">Event</string>
+    <string name="label_login_events">Regatta</string>
     <string name="label_login_course_area">Area</string>
     <string name="label_login_position">Position</string>
     <string name="login_type_officer_on_start_vessel">Login as race officer on the selected course\'s start vessel.</string>
@@ -292,7 +292,7 @@
     <string name="loading_events_succeded">Events loaded.</string>
 
     <string name="login_text">Welcome to SAP Sailing\nRace Committee App</string>
-    <string name="login_sub_text">Where are you?</string>
+    <string name="login_sub_text">Please select a regatta</string>
     <string name="sign_up">Sign Me Up</string>
     <string name="wind_display">dd</string>
     <string name="flags_abandon">Abandon</string>

mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/preference/RegattaPreferenceFragment.java

@@ -16,6 +16,7 @@ import com.sap.sailing.racecommittee.app.ui.activities.PreferenceActivity;
 import com.sap.sailing.racecommittee.app.ui.activities.SettingsActivity;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
 /**
@@ -109,54 +110,58 @@ public class RegattaPreferenceFragment extends BasePreferenceFragment {
     private void setupRacingProcedureTypePreference() {
         final ListPreference startProcedurePreference = findPreference(R.string.preference_racing_procedure_override_key);
 
-        List<CharSequence> entries = new ArrayList<CharSequence>();
-        List<CharSequence> entryValues = new ArrayList<CharSequence>();
+        List<String> entries = new ArrayList<>();
+        List<String> entryValues = new ArrayList<>();
         for (RacingProcedureType type : RacingProcedureType.validValues()) {
             entries.add(type.toString());
             entryValues.add(type.name());
         }
 
-        startProcedurePreference.setEntries(entries.toArray(new CharSequence[entries.size()]));
-        startProcedurePreference.setEntryValues(entryValues.toArray(new CharSequence[entryValues.size()]));
+        startProcedurePreference.setEntries(entries.toArray(new String[entries.size()]));
+        startProcedurePreference.setEntryValues(entryValues.toArray(new String[entryValues.size()]));
 
         bindPreferenceSummaryToValue(startProcedurePreference);
     }
 
     private void setupCourseDesignerTypePreference() {
-        final ListPreference courseDesignerPreference = findPreference(R.string.preference_course_designer_override_key);
+        final ListPreference preference = findPreference(R.string.preference_course_designer_override_key);
 
-        List<CharSequence> entries = new ArrayList<CharSequence>();
-        List<CharSequence> entryValues = new ArrayList<CharSequence>();
+        List<String> entries = new ArrayList<>();
+        List<String> entryValues = new ArrayList<>();
         for (CourseDesignerMode type : CourseDesignerMode.validValues()) {
             entries.add(type.toString());
             entryValues.add(type.name());
         }
 
-        courseDesignerPreference.setEntries(entries.toArray(new CharSequence[0]));
-        courseDesignerPreference.setEntryValues(entryValues.toArray(new CharSequence[0]));
+        preference.setEntries(entries.toArray(new String[entries.size()]));
+        preference.setEntryValues(entryValues.toArray(new String[entryValues.size()]));
 
-        bindPreferenceSummaryToValue(courseDesignerPreference);
+        bindPreferenceSummaryToValue(preference);
     }
 
     private void setupRRS26StartmodeFlagsList() {
-        MultiSelectListPreference listPreference = findPreference(R.string.preference_racing_procedure_rrs26_startmode_flags_key);
-        List<String> flags = new ArrayList<String>();
+        MultiSelectListPreference preference = findPreference(R.string.preference_racing_procedure_rrs26_startmode_flags_key);
+        List<String> flags = new ArrayList<>();
         for (Flags flag : Flags.validValues()) {
             flags.add(flag.name());
         }
-        listPreference.setEntries(flags.toArray(new String[flags.size()]));
-        listPreference.setEntryValues(flags.toArray(new String[flags.size()]));
+
+        Collections.sort(flags);
+        preference.setEntries(flags.toArray(new String[flags.size()]));
+        preference.setEntryValues(flags.toArray(new String[flags.size()]));
     }
 
     private void setupClassFlagList(ListPreference preference) {
-        List<CharSequence> entries = new ArrayList<CharSequence>();
-        List<CharSequence> entryValues = new ArrayList<CharSequence>();
+        List<String> entries = new ArrayList<>();
+        List<String> entryValues = new ArrayList<>();
         for (Flags flag : Flags.validValues()) {
             entries.add(flag.toString());
             entryValues.add(flag.name());
         }
 
-        preference.setEntries(entries.toArray(new CharSequence[entries.size()]));
-        preference.setEntryValues(entryValues.toArray(new CharSequence[entryValues.size()]));
+        Collections.sort(entries);
+        Collections.sort(entryValues);
+        preference.setEntries(entries.toArray(new String[entries.size()]));
+        preference.setEntryValues(entryValues.toArray(new String[entryValues.size()]));
     }
 }