mirror of
https://github.com/eclipse-sailing-analytics/sailing-analytics.git
synced 2026-10-07 12:51:02 +00:00
show race result list while finishing phase, if activated in preferences - default: false
This commit is contained in:
1 parent
024a2ebf20
commit
acb1da80fd
7 files changed
+31
-3
No files matched your search
@@ -496,5 +496,7 @@
|
||||
|
||||
<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>
|
||||
<string name="preference_race_results_header">Zeige Rennliste</string>
|
||||
<string name="preference_race_results_summary">Erlaube Race-Manager die Zieleinlaufliste in der Finishing-Phase zu bearbeiten</string>
|
||||
|
||||
</resources>
|
||||
@@ -110,5 +110,8 @@
|
||||
</string-array>
|
||||
|
||||
<string name="preference_non_public_events_key" translatable="false">show_non_public_events</string>
|
||||
<bool name="preference_non_public_events_default" translatable="false">false</bool>
|
||||
<bool name="preference_non_public_events_default">false</bool>
|
||||
<string name="preference_race_results_key" translatable="false">allow_race_results</string>
|
||||
<bool name="preference_race_results_default">false</bool>
|
||||
|
||||
</resources>
|
||||
@@ -524,4 +524,7 @@
|
||||
|
||||
<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>
|
||||
<string name="preference_race_results_header">Show Race Results</string>
|
||||
<string name="preference_race_results_summary">Allow race manager to edit race result while finishing phase</string>
|
||||
|
||||
</resources>
|
||||
@@ -66,6 +66,12 @@
|
||||
android:summary="@string/preference_non_public_events_summary"
|
||||
android:title="@string/preference_non_public_events_header"/>
|
||||
|
||||
<CheckBoxPreference
|
||||
android:defaultValue="@bool/preference_race_results_default"
|
||||
android:key="@string/preference_race_results_key"
|
||||
android:summary="@string/preference_race_results_summary"
|
||||
android:title="@string/preference_race_results_header"/>
|
||||
|
||||
<CheckBoxPreference
|
||||
android:defaultValue="@bool/preference_allow_demo_default"
|
||||
android:key="@string/preference_allow_demo_key"
|
||||
|
||||
+5
@@ -467,4 +467,9 @@ public class AppPreferences {
|
||||
return preferences.getBoolean(context.getString(R.string.preference_non_public_events_key),
|
||||
context.getResources().getBoolean(R.bool.preference_non_public_events_default)) ? "true" : "false";
|
||||
}
|
||||
|
||||
public boolean showRaceResults() {
|
||||
return preferences.getBoolean(context.getString(R.string.preference_race_results_key),
|
||||
context.getResources().getBoolean(R.bool.preference_race_results_default));
|
||||
}
|
||||
}
|
||||
+6
-1
@@ -62,6 +62,7 @@ import com.sap.sailing.racecommittee.app.ui.fragments.RaceListFragment;
|
||||
import com.sap.sailing.racecommittee.app.ui.fragments.RaceListFragment.RaceListCallbacks;
|
||||
import com.sap.sailing.racecommittee.app.ui.fragments.WelcomeFragment;
|
||||
import com.sap.sailing.racecommittee.app.ui.fragments.raceinfo.BaseFragment;
|
||||
import com.sap.sailing.racecommittee.app.ui.fragments.raceinfo.RaceFinishingFragment;
|
||||
import com.sap.sailing.racecommittee.app.ui.fragments.raceinfo.RaceFlagViewerFragment;
|
||||
import com.sap.sailing.racecommittee.app.ui.fragments.raceinfo.RaceSummaryFragment;
|
||||
import com.sap.sailing.racecommittee.app.ui.fragments.raceinfo.TrackingListFragment;
|
||||
@@ -520,7 +521,11 @@ public class RacingActivity extends SessionActivity implements RaceListCallbacks
|
||||
if (mSelectedRace.getStatus() != RaceLogRaceStatus.FINISHING) {
|
||||
content = RaceFlagViewerFragment.newInstance();
|
||||
} else {
|
||||
content = TrackingListFragment.newInstance(args, 1);
|
||||
if (preferences.showRaceResults()) {
|
||||
content = TrackingListFragment.newInstance(args, 1);
|
||||
} else {
|
||||
content = RaceFinishingFragment.newInstance();
|
||||
}
|
||||
}
|
||||
content.setArguments(args);
|
||||
transaction.replace(R.id.race_content, content);
|
||||
|
||||
+5
-1
@@ -212,7 +212,11 @@ public class FlagPanelFragment extends BasePanelFragment {
|
||||
changeVisibility(mRecallFlags, null, View.GONE);
|
||||
changeVisibility(mCourseFlags, null, View.GONE);
|
||||
changeVisibility(mBlueFirstFlag, null, View.GONE);
|
||||
changeVisibility(mBlueLastFlag, null, View.VISIBLE);
|
||||
if (preferences.showRaceResults()) {
|
||||
changeVisibility(mBlueLastFlag, null, View.VISIBLE);
|
||||
} else {
|
||||
changeVisibility(mBlueLastFlag, null, View.GONE);
|
||||
}
|
||||
|
||||
uncheckMarker(mRecallFlags);
|
||||
uncheckMarker(mCourseFlags);
|
||||
|
||||
Reference in new issue
Block a user