diff --git a/mobile/com.sap.sailing.racecommittee.app/res/values-de/strings.xml b/mobile/com.sap.sailing.racecommittee.app/res/values-de/strings.xml index 8aa6a821c2b..d25953c5d70 100644 --- a/mobile/com.sap.sailing.racecommittee.app/res/values-de/strings.xml +++ b/mobile/com.sap.sailing.racecommittee.app/res/values-de/strings.xml @@ -423,4 +423,7 @@ Sende Email... Daten wurden extern verändert Daten müssen neu geladen werden. Eventueller Datenverlust ist möglich. + Relative Startzeit + Aktiviert relative Startzeiten zwischen Rennen + Standard Offset der relativen Startzeit (Minuten) \ No newline at end of file diff --git a/mobile/com.sap.sailing.racecommittee.app/res/values/preferences.xml b/mobile/com.sap.sailing.racecommittee.app/res/values/preferences.xml index af04903df68..e5dad97f7e9 100644 --- a/mobile/com.sap.sailing.racecommittee.app/res/values/preferences.xml +++ b/mobile/com.sap.sailing.racecommittee.app/res/values/preferences.xml @@ -81,6 +81,11 @@ racecommittee false + dependentRaces + false + dependentRacesOffset + 5 + allow_demo false diff --git a/mobile/com.sap.sailing.racecommittee.app/res/values/strings.xml b/mobile/com.sap.sailing.racecommittee.app/res/values/strings.xml index c46b58fa7aa..1a993ae3d67 100644 --- a/mobile/com.sap.sailing.racecommittee.app/res/values/strings.xml +++ b/mobile/com.sap.sailing.racecommittee.app/res/values/strings.xml @@ -444,5 +444,8 @@ Send mail... Data has changed externally Data have to be reloaded. Possible data loss is possible. + Relative Start Time (Minutes) + Enable Relative Start Time between Races + Default Relative Start Time Offset \ No newline at end of file diff --git a/mobile/com.sap.sailing.racecommittee.app/res/xml/preference_regatta_defaults.xml b/mobile/com.sap.sailing.racecommittee.app/res/xml/preference_regatta_defaults.xml index 17295cd827b..000bcfc00df 100644 --- a/mobile/com.sap.sailing.racecommittee.app/res/xml/preference_regatta_defaults.xml +++ b/mobile/com.sap.sailing.racecommittee.app/res/xml/preference_regatta_defaults.xml @@ -1,118 +1,128 @@ - + - - - - - - - + android:title="@string/override_default_start_procedure_type_select_header"/> + + + + + + + + + + + - + android:summary="@string/empty" + android:title="@string/preference_racing_procedure_classflag_header"/> + - - - + android:key="@string/preference_racing_procedure_rrs26_hasxray_key" + android:summary="@string/preference_racing_procedure_hasxray_description" + android:title="@string/preference_racing_procedure_hasxray_header"/> + + + - - - + + + - + android:summary="@string/empty" + android:title="@string/preference_racing_procedure_classflag_header"/> + - + android:key="@string/preference_racing_procedure_gatestart_hasxray_key" + android:summary="@string/preference_racing_procedure_hasxray_description" + android:title="@string/preference_racing_procedure_hasxray_header"/> + - + android:key="@string/preference_racing_procedure_gatestart_haspathfinder_key" + android:summary="@string/preference_racing_procedure_gatestart_haspathfinder_description" + android:title="@string/preference_racing_procedure_gatestart_haspathfinder_header"/> + - + android:key="@string/preference_racing_procedure_gatestart_hasadditionalgolfdowntime_key" + android:summary="@string/preference_racing_procedure_gatestart_hasadditionalgolfdowntime_description" + android:title="@string/preference_racing_procedure_gatestart_hasadditionalgolfdowntime_header"/> + - - - + + + - + android:summary="@string/empty" + android:title="@string/preference_racing_procedure_classflag_header"/> + - + android:key="@string/preference_racing_procedure_ess_hasxray_key" + android:summary="@string/preference_racing_procedure_hasxray_description" + android:title="@string/preference_racing_procedure_hasxray_header"/> + - - - + + + - + android:summary="@string/empty" + android:title="@string/preference_racing_procedure_classflag_header"/> + - + android:key="@string/preference_racing_procedure_basic_hasxray_key" + android:summary="@string/preference_racing_procedure_hasxray_description" + android:title="@string/preference_racing_procedure_hasxray_header"/> + - + + android:key="@string/preference_racing_procedure_league_classflag_key" + android:summary="@string/empty" + android:title="@string/preference_racing_procedure_classflag_header"/> + android:key="@string/preference_racing_procedure_league_hasxray_key" + android:summary="@string/preference_racing_procedure_hasxray_description" + android:title="@string/preference_racing_procedure_hasxray_header"/> - \ No newline at end of file diff --git a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/preference/RegattaPreferenceFragment.java b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/preference/RegattaPreferenceFragment.java index 7e2f96a7103..0443a50abfb 100644 --- a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/preference/RegattaPreferenceFragment.java +++ b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/preference/RegattaPreferenceFragment.java @@ -105,6 +105,7 @@ public class RegattaPreferenceFragment extends BasePreferenceFragment { private void setupGeneral() { setupRacingProcedureTypePreference(); setupCourseDesignerTypePreference(); + setupDependentRacesPreference(); } private void setupRacingProcedureTypePreference() { @@ -139,6 +140,10 @@ public class RegattaPreferenceFragment extends BasePreferenceFragment { bindPreferenceSummaryToValue(preference); } + private void setupDependentRacesPreference() { + bindPreferenceSummaryToInteger(findPreference(R.string.preference_dependent_races_offset_key)); + } + private void setupRRS26StartmodeFlagsList() { MultiSelectListPreference preference = findPreference(R.string.preference_racing_procedure_rrs26_startmode_flags_key); List flags = new ArrayList<>();