eclipse-sailing-analytics/sailing-analytics
1
0 Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-10-08 13:20:57 +00:00
Code Activity

added isMagnetic preference for wind input

Browse Source
This commit is contained in:
Peter Siegmund committed 2016-02-23 17:19:33 +01:00
1 parent 8529c57aae
commit 1675e93f76
7 files changed
+32 -4
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

mobile/com.sap.sailing.racecommittee.app/res/values-de/strings.xml
+6
View File
@@ -466,4 +466,10 @@
<string name="get_started">Getting Started</string>
<string name="get_started_url">http://www.sapsailing.com/gwt/Home.html?locale=de#SolutionsPlace:navigationTab=RaceCommitteeApp</string>
<string name="preference_heading_with_declination_subtracted_is_enabled">Ein</string>
<string name="preference_heading_with_declination_subtracted_is_disabled">Aus</string>
<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>
</resources>
mobile/com.sap.sailing.racecommittee.app/res/values/preferences.xml
+3 -1
View File
@@ -76,7 +76,9 @@
<bool name="preference_racing_procedure_league_hasxray_default">false</bool>
<string name="preference_regatta_specific_save_key" translatable="false">basicIndividualRecall</string>
<string name="preference_heading_with_declination_subtracted_key" translatable="false">preferenceHeadingWithDeclinationSubtracted</string>
<bool name="preference_heading_with_declination_subtracted_default">true</bool>
<!-- override android.shared default value -->
<string name="app_folder" translatable="false">racecommittee</string>
<bool name="preference_isSendingActive_default">false</bool>
mobile/com.sap.sailing.racecommittee.app/res/values/strings.xml
+6
View File
@@ -493,4 +493,10 @@
<string name="get_started">Getting Started</string>
<string name="get_started_url">http://www.sapsailing.com/gwt/Home.html?locale=en#SolutionsPlace:navigationTab=RaceCommitteeApp</string>
<string name="preference_heading_with_declination_subtracted_is_enabled">On</string>
<string name="preference_heading_with_declination_subtracted_is_disabled">Off</string>
<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>
</resources>
mobile/com.sap.sailing.racecommittee.app/res/xml/preference_regatta_defaults.xml
+8
View File
@@ -26,6 +26,14 @@
android:numeric="integer"
android:title="@string/preference_dependent_races_offset_header"/>
<SwitchPreference
android:defaultValue="@bool/preference_heading_with_declination_subtracted_default"
android:key="@string/preference_heading_with_declination_subtracted_key"
android:switchTextOn="@string/preference_heading_with_declination_subtracted_is_enabled"
android:switchTextOff="@string/preference_heading_with_declination_subtracted_is_disabled"
android:summaryOn="@string/preference_heading_with_declination_subtracted_summary_is_enabled"
android:summaryOff="@string/preference_heading_with_declination_subtracted_summary_is_disabled"
android:title="@string/preference_heading_with_declination_subtracted_enabled"/>
</PreferenceCategory>
<PreferenceCategory android:title="RRS26">
mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/AppPreferences.java
+5
View File
@@ -447,4 +447,9 @@ public class AppPreferences {
return preferences.getString(context.getString(R.string.preference_theme_key), context.getResources()
.getString(R.string.preference_theme_default));
}
public boolean isMagnetic() {
return preferences.getBoolean(context.getString(R.string.preference_heading_with_declination_subtracted_key),
context.getResources().getBoolean(R.bool.preference_heading_with_declination_subtracted_default));
}
}
mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/activities/RacingActivity.java
+1 -1
View File
@@ -349,7 +349,7 @@ public class RacingActivity extends SessionActivity implements RaceListCallbacks
windValue.setPanelText(String.format(getString(R.string.wind_info), windFix.getKnots(), windFix.getBearing().reverse().toString()));
}
if (mSelectedRace != null) {
mSelectedRace.getState().setWindFix(MillisecondsTimePoint.now(), windFix, /* isMagnetic */ true);
mSelectedRace.getState().setWindFix(MillisecondsTimePoint.now(), windFix, preferences.isMagnetic());
}
mWind = windFix;
mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/raceinfo/WindFragment.java
+3 -2
View File
@@ -460,7 +460,8 @@ public class WindFragment extends BaseFragment implements CompassDirectionListen
*/
private void onSendClick() {
Wind wind = getResultingWindFix();
getRaceState().setWindFix(MillisecondsTimePoint.now(), wind, /* isMagnetic */ true);
boolean isMagnetic = preferences.isMagnetic();
getRaceState().setWindFix(MillisecondsTimePoint.now(), wind, isMagnetic);
saveEntriesInPreferences(wind);
switch (getArguments().getInt(START_MODE, 0)) {
case 1:
@@ -538,7 +539,7 @@ public class WindFragment extends BaseFragment implements CompassDirectionListen
@Override
public void onClick(DialogInterface dialog, int which) {
for (ManagedRace race : mSelectedRaces) {
race.getState().setWindFix(MillisecondsTimePoint.now(), getResultingWindFix(), true);
race.getState().setWindFix(MillisecondsTimePoint.now(), getResultingWindFix(), preferences.isMagnetic());
}
}
});