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

Show appropriate button text if device is waiting for gps fix

Browse Source
This commit is contained in:
Bennet Brunsen
2016-04-12 10:39:49 +02:00
parent e8c4c0988e
commit f4e7e728b2
3 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mobile/com.sap.sailing.buoy.positioning/res/values-de/strings.xml
+2 -1
View File
@@ -4,7 +4,8 @@
<string name="course_type">Kurstyp</string>
<string name="marks">Kursmarkierungen</string>
<string name="set_position">Position setzen</string>
<string name="set_position_disabled">POSITION SETZEN\nBitte GPS aktivieren</string>
<string name="set_position_disabled_gps">POSITION SETZEN\nBitte GPS aktivieren</string>
<string name="set_position_no_gps_yet">POSITION SETZEN\nWarte auf GPS Verbindung</string>
<string name="reset_position">Position zurücksetzen</string>
<string name="getting_marks">Empfangen der Markierungen&#8230;</string>
<string name="set">Gesetzt</string>
mobile/com.sap.sailing.buoy.positioning/res/values/strings.xml
+2 -1
View File
@@ -5,7 +5,8 @@
<string name="course_type">Course Type</string>
<string name="marks">Marks</string>
<string name="set_position">Set Position</string>
<string name="set_position_disabled">SET POSITION\nPlease activate GPS</string>
<string name="set_position_disabled_gps">SET POSITION\nPlease activate GPS</string>
<string name="set_position_no_gps_yet">POSITION SETZEN\nWaiting for GPS connection</string>
<string name="reset_position">Reset Position</string>
<string name="getting_marks">Getting race marks&#8230;</string>
<string name="set">set</string>
mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/ui/fragments/BuoyFragment.java
+3 -1
View File
@@ -115,7 +115,9 @@ public class BuoyFragment extends BaseFragment implements LocationListener {
private void setUpSetPositionButton(View layout, ClickListener clickListener) {
setPositionButton = ViewHelper.get(layout, R.id.marker_set_position_button);
setPositionButton.setEnabled(false);
String text = getString(R.string.set_position_disabled);
boolean gpsEnabled = LocationHelper.isGPSEnabled(getActivity());
int buttonTextId = gpsEnabled ? R.string.set_position_no_gps_yet : R.string.set_position_disabled_gps;
String text = getString(buttonTextId);
SpannableString disabledButtonText = new SpannableString(text);
AbsoluteSizeSpan absoluteSizeSpan = new AbsoluteSizeSpan(10, true);
disabledButtonText.setSpan(absoluteSizeSpan, text.indexOf("\n"), text.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);