From 86df691c4ca1fe9de73f093dd65df09ad9aedfbe Mon Sep 17 00:00:00 2001 From: Peter Siegmund Date: Tue, 14 Jun 2016 11:37:00 +0200 Subject: [PATCH 01/16] fixed wrong string format --- .../com.sap.sailing.racecommittee.app/res/values-de/strings.xml | 2 +- mobile/com.sap.sailing.racecommittee.app/res/values/strings.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 82b13da2f3f..2f1b9a792d1 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 @@ -401,7 +401,7 @@ Soll das bisherige Kursdesign verwendet werden? Bitte geben Sie eine gültige Zahl ein. Bitte tragen Sie einen gültigen Pathfinder ein. - Fehler beim Scannen des QRCodes (%s) + Fehler beim Scannen des QRCodes (%i) Ungültige Url Kursmarkierungen: %s Kein Kurs zum Kopieren vorhanden 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 e79e9c77449..077388f32fc 100644 --- a/mobile/com.sap.sailing.racecommittee.app/res/values/strings.xml +++ b/mobile/com.sap.sailing.racecommittee.app/res/values/strings.xml @@ -424,7 +424,7 @@ Use previously published course design? Please enter a valid number Please enter a valid pathfinder - Error scanning QRCode (%s) + Error scanning QRCode (%i) Malformed url Marks: %s No course available to copy From b22ee171bb39242d27c87917b6832194e242719a Mon Sep 17 00:00:00 2001 From: Peter Siegmund Date: Tue, 14 Jun 2016 11:38:50 +0200 Subject: [PATCH 02/16] restart LoginActivity, if server base url changed --- .../racecommittee/app/ui/activities/LoginActivity.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/activities/LoginActivity.java b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/activities/LoginActivity.java index f3132b12290..1470f465de3 100644 --- a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/activities/LoginActivity.java +++ b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/activities/LoginActivity.java @@ -362,6 +362,13 @@ public class LoginActivity extends BaseActivity public void onResume() { super.onResume(); + if (preferences.needConfigRefresh()) { + preferences.setNeedConfigRefresh(false); + Intent intent = new Intent(this, getClass()); + startActivity(intent); + finish(); + } + IntentFilter filter = new IntentFilter(); filter.addAction(AppConstants.INTENT_ACTION_RESET); filter.addAction(AppConstants.INTENT_ACTION_VALID_DATA); @@ -426,7 +433,7 @@ public class LoginActivity extends BaseActivity } }); - if (!preferences.isOfflineMode() && preferences.needConfigRefresh()) { + if (!preferences.isOfflineMode()) { // reload the configuration if needed... getLoaderManager().restartLoader(0, null, configurationLoader).forceLoad(); } else { From 034d14c9b131eb54f4c0d186f23c6dd4f51c762b Mon Sep 17 00:00:00 2001 From: Peter Siegmund Date: Tue, 14 Jun 2016 12:37:35 +0200 Subject: [PATCH 03/16] another solution for #3598 - which doesn't interfere an app start while screen locked --- .../racecommittee/app/ui/activities/LoginActivity.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/activities/LoginActivity.java b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/activities/LoginActivity.java index 1470f465de3..b145b728b0a 100644 --- a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/activities/LoginActivity.java +++ b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/activities/LoginActivity.java @@ -388,7 +388,6 @@ public class LoginActivity extends BaseActivity @Override public void onPause() { super.onPause(); - wakeUp = true; LocalBroadcastManager.getInstance(this).unregisterReceiver(mReceiver); } @@ -525,6 +524,10 @@ public class LoginActivity extends BaseActivity } private void resetData() { + if (backdrop.getY() != 0) { + return; + } + setupDataManager(); addEventListFragment(); @@ -541,12 +544,11 @@ public class LoginActivity extends BaseActivity public void onReceive(Context context, Intent intent) { String action = intent.getAction(); - if (AppConstants.INTENT_ACTION_RESET.equals(action) && !wakeUp) { + if (AppConstants.INTENT_ACTION_RESET.equals(action)) { resetData(); - } else if (AppConstants.INTENT_ACTION_VALID_DATA.equals(action) && !wakeUp) { + } else if (AppConstants.INTENT_ACTION_VALID_DATA.equals(action)) { resetData(); } - wakeUp = false; } } From 7ee189fba8011582d287adc9e9aaf305f141db84 Mon Sep 17 00:00:00 2001 From: Peter Siegmund Date: Tue, 14 Jun 2016 15:00:47 +0200 Subject: [PATCH 04/16] show AlertDialog after changing no-public-events preference, if logged in --- .../res/values-de/strings.xml | 3 ++- .../res/values/strings.xml | 3 ++- .../preference/GeneralPreferenceFragment.java | 27 +++++++++++++++---- 3 files changed, 26 insertions(+), 7 deletions(-) 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 2f1b9a792d1..02d93815428 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 @@ -416,7 +416,7 @@ Darstellungsmodus ändern Die Änderung am Theme wird nach einem Neustart der App wirksam. Die Server URL wurde geändert - Bitte melden Sie sich vom aktuellen Event ab, um die Daten des neuen Servers zu laden. + Bitte melden Sie sich vom aktuellen Event ab, um die Daten des neuen Servers zu laden. XRAY wird eingeholt in %s Fotos senden Fehler @@ -513,5 +513,6 @@ Setze Faktor Beim Setzen des Faktors ist ein Fehler aufgetreten: %s Sync zur Minute + Nicht öffentliche Events \ No newline at end of file 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 077388f32fc..444886cb24b 100644 --- a/mobile/com.sap.sailing.racecommittee.app/res/values/strings.xml +++ b/mobile/com.sap.sailing.racecommittee.app/res/values/strings.xml @@ -439,7 +439,7 @@ Theme Change Changes to the theme will take action after an app restart. Server URL Changed - Please logout from the current event to load the data from the new server. + Please logout from the current event to load the data from the new server. XRAY will be removed in %s Send Photos Error @@ -541,5 +541,6 @@ Set Factor There was an error while setting the factor: %s Sync to minute + Non Public Events diff --git a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/preference/GeneralPreferenceFragment.java b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/preference/GeneralPreferenceFragment.java index c4829ece3d1..204b8863c32 100644 --- a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/preference/GeneralPreferenceFragment.java +++ b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/preference/GeneralPreferenceFragment.java @@ -19,6 +19,7 @@ import com.sap.sailing.android.shared.ui.views.EditSetPreference; import com.sap.sailing.racecommittee.app.AppPreferences; import com.sap.sailing.racecommittee.app.BuildConfig; import com.sap.sailing.racecommittee.app.R; +import com.sap.sailing.racecommittee.app.data.DataManager; import com.sap.sailing.racecommittee.app.utils.QRHelper; import com.sap.sailing.racecommittee.app.utils.autoupdate.AutoUpdater; @@ -59,6 +60,20 @@ public class GeneralPreferenceFragment extends BasePreferenceFragment { return true; } }); + addOnPreferenceChangeListener(findPreference(R.string.preference_non_public_events_key), new OnPreferenceChangeListener() { + @Override + public boolean onPreferenceChange(Preference preference, Object newValue) { + AppPreferences.on(getActivity()).setNeedConfigRefresh(true); + if (DataManager.create(getActivity()).getDataStore().getCourseUUID() != null) { + AlertDialog.Builder builder = new AlertDialog.Builder(getActivity(), R.style.AppTheme_AlertDialog); + builder.setTitle(getString(R.string.non_public_changed_title)); + builder.setMessage(getString(R.string.app_refresh_message)); + builder.setPositiveButton(android.R.string.ok, null); + builder.show(); + } + return true; + } + }); } private void setupPolling() { @@ -109,11 +124,13 @@ public class GeneralPreferenceFragment extends BasePreferenceFragment { @Override public boolean onPreferenceChange(Preference preference, Object newValue) { AppPreferences.on(getActivity()).setNeedConfigRefresh(true); - AlertDialog.Builder builder = new AlertDialog.Builder(getActivity(), R.style.AppTheme_AlertDialog); - builder.setTitle(getString(R.string.url_refresh_title)); - builder.setMessage(getString(R.string.url_refresh_message)); - builder.setPositiveButton(android.R.string.ok, null); - builder.show(); + if (DataManager.create(getActivity()).getDataStore().getCourseUUID() != null) { + AlertDialog.Builder builder = new AlertDialog.Builder(getActivity(), R.style.AppTheme_AlertDialog); + builder.setTitle(getString(R.string.url_refresh_title)); + builder.setMessage(getString(R.string.app_refresh_message)); + builder.setPositiveButton(android.R.string.ok, null); + builder.show(); + } return true; } }); From 93bc05c96b424667dad9909bae7a2e0d2d6c84a0 Mon Sep 17 00:00:00 2001 From: Peter Siegmund Date: Tue, 14 Jun 2016 16:11:44 +0200 Subject: [PATCH 05/16] activate Set Time button on absolute tab after value change --- .../fragments/raceinfo/StartTimeFragment.java | 37 +++++++++++++++++-- 1 file changed, 33 insertions(+), 4 deletions(-) diff --git a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/raceinfo/StartTimeFragment.java b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/raceinfo/StartTimeFragment.java index cecfa30fb4d..cf8c1307cb4 100755 --- a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/raceinfo/StartTimeFragment.java +++ b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/raceinfo/StartTimeFragment.java @@ -69,7 +69,9 @@ public class StartTimeFragment extends BaseFragment private View mRelative; private Button mAbsoluteButton; private Button mRelativeButton; + private Button mSetStartAbsolute; private Button mSetStartRelative; + private int mCurrentTab; private NumberPicker mDatePicker; private NumberPicker mTimeOffset; @@ -153,9 +155,9 @@ public class StartTimeFragment extends BaseFragment syncMinute.setOnClickListener(this); } - View setStartAbsolute = ViewHelper.get(layout, R.id.set_start_time_absolute); - if (setStartAbsolute != null) { - setStartAbsolute.setOnClickListener(this); + mSetStartAbsolute = ViewHelper.get(layout, R.id.set_start_time_absolute); + if (mSetStartAbsolute != null) { + mSetStartAbsolute.setOnClickListener(this); } mSetStartRelative = ViewHelper.get(layout, R.id.set_start_time_relative); @@ -222,6 +224,13 @@ public class StartTimeFragment extends BaseFragment mStartTimeOffset = result.getStartTimeDiff(); mRaceId = Util.get(result.getDependingOnRaces(), 0); } + + if (mSetStartAbsolute != null) { + mSetStartAbsolute.setEnabled(false); + } + if (mSetStartRelative != null) { + mSetStartRelative.setEnabled(false); + } break; default: // MODE_SETUP @@ -548,6 +557,7 @@ public class StartTimeFragment extends BaseFragment } private void showTab(int tab) { + mCurrentTab = tab; int colorGrey = ThemeHelper.getColor(getActivity(), R.attr.sap_light_gray); int colorOrange = ThemeHelper.getColor(getActivity(), R.attr.sap_yellow_1); @@ -630,6 +640,7 @@ public class StartTimeFragment extends BaseFragment mStartTime = mStartTime.getNearestModuloOneMinute(now); mListenerIgnore = true; setPickerTime(); + activateSetTime(); } @Override @@ -637,6 +648,7 @@ public class StartTimeFragment extends BaseFragment if (!mListenerIgnore) { mStartTime = new MillisecondsTimePoint(getPickerTime().asMillis()); setSeconds(); + activateSetTime(); } mListenerIgnore = false; } @@ -646,10 +658,27 @@ public class StartTimeFragment extends BaseFragment if (!mListenerIgnore) { mStartTime = new MillisecondsTimePoint(getPickerTime().asMillis()); setSeconds(); + activateSetTime(); } mListenerIgnore = false; } + private void activateSetTime() { + switch (mCurrentTab) { + case ABSOLUTE: + if (mSetStartAbsolute != null) { + mSetStartAbsolute.setEnabled(true); + } + break; + + case RELATIVE: + if (mSetStartRelative != null) { + mSetStartRelative.setEnabled(true); + } + break; + } + } + private void setSeconds() { setSeconds(0, 0); } @@ -657,7 +686,7 @@ public class StartTimeFragment extends BaseFragment private void setSeconds(int sec, int msec) { if (mStartSeconds != null) { double seconds = sec + msec / (double) 1000; - DecimalFormat format = new DecimalFormat("0.000"); + DecimalFormat format = new DecimalFormat("00.000"); mStartSeconds.setDisplayedValues(new String[] { format.format(seconds) }); } } From f39db6f6073209e947cc8a67cc1415f7e7f85d15 Mon Sep 17 00:00:00 2001 From: Peter Siegmund Date: Tue, 14 Jun 2016 16:15:49 +0200 Subject: [PATCH 06/16] activate Set Time on offset change for relative start time --- .../app/ui/fragments/raceinfo/StartTimeFragment.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/raceinfo/StartTimeFragment.java b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/raceinfo/StartTimeFragment.java index cf8c1307cb4..83c17ace99a 100755 --- a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/raceinfo/StartTimeFragment.java +++ b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/raceinfo/StartTimeFragment.java @@ -288,6 +288,12 @@ public class StartTimeFragment extends BaseFragment mTimeOffset.setMaxValue(MAX_DIFF_MIN); mTimeOffset.setWrapSelectorWheel(false); mTimeOffset.setValue((mStartTimeOffset == null) ? preferences.getDependentRacesOffset() : (int) mStartTimeOffset.asMinutes()); + mTimeOffset.setOnValueChangedListener(new NumberPicker.OnValueChangeListener() { + @Override + public void onValueChange(NumberPicker picker, int oldVal, int newVal) { + activateSetTime(); + } + }); } final DataStore manager = OnlineDataManager.create(getActivity()).getDataStore(); From b21c010592715a677194bd4835d3f789e168429e Mon Sep 17 00:00:00 2001 From: Peter Siegmund Date: Tue, 14 Jun 2016 16:42:57 +0200 Subject: [PATCH 07/16] activate Set Time button for relative start time --- .../fragments/raceinfo/StartTimeFragment.java | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/raceinfo/StartTimeFragment.java b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/raceinfo/StartTimeFragment.java index 83c17ace99a..96400d723c8 100755 --- a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/raceinfo/StartTimeFragment.java +++ b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/raceinfo/StartTimeFragment.java @@ -71,13 +71,13 @@ public class StartTimeFragment extends BaseFragment private Button mRelativeButton; private Button mSetStartAbsolute; private Button mSetStartRelative; - private int mCurrentTab; private NumberPicker mDatePicker; private NumberPicker mTimeOffset; private Spinner mLeaderBoard; private Spinner mFleet; private Spinner mRace; + private boolean mRaceSetupFinished; private TimePicker mTimePicker; private NumberPicker mStartSeconds; private TextView mCountdown; @@ -291,7 +291,7 @@ public class StartTimeFragment extends BaseFragment mTimeOffset.setOnValueChangedListener(new NumberPicker.OnValueChangeListener() { @Override public void onValueChange(NumberPicker picker, int oldVal, int newVal) { - activateSetTime(); + activateSetTime(RELATIVE); } }); } @@ -419,6 +419,10 @@ public class StartTimeFragment extends BaseFragment } String race = mRaceAdapter.getItem(mRace.getSelectedItemPosition()).getA(); identifier = new SimpleRaceLogIdentifierImpl(leaderBoard, race, fleet.getA()); + if (mRaceSetupFinished) { + activateSetTime(RELATIVE); + } + mRaceSetupFinished = true; } @Override @@ -563,7 +567,6 @@ public class StartTimeFragment extends BaseFragment } private void showTab(int tab) { - mCurrentTab = tab; int colorGrey = ThemeHelper.getColor(getActivity(), R.attr.sap_light_gray); int colorOrange = ThemeHelper.getColor(getActivity(), R.attr.sap_yellow_1); @@ -646,7 +649,7 @@ public class StartTimeFragment extends BaseFragment mStartTime = mStartTime.getNearestModuloOneMinute(now); mListenerIgnore = true; setPickerTime(); - activateSetTime(); + activateSetTime(ABSOLUTE); } @Override @@ -654,7 +657,7 @@ public class StartTimeFragment extends BaseFragment if (!mListenerIgnore) { mStartTime = new MillisecondsTimePoint(getPickerTime().asMillis()); setSeconds(); - activateSetTime(); + activateSetTime(ABSOLUTE); } mListenerIgnore = false; } @@ -664,13 +667,13 @@ public class StartTimeFragment extends BaseFragment if (!mListenerIgnore) { mStartTime = new MillisecondsTimePoint(getPickerTime().asMillis()); setSeconds(); - activateSetTime(); + activateSetTime(ABSOLUTE); } mListenerIgnore = false; } - private void activateSetTime() { - switch (mCurrentTab) { + private void activateSetTime(int tab) { + switch (tab) { case ABSOLUTE: if (mSetStartAbsolute != null) { mSetStartAbsolute.setEnabled(true); From 8fc651a67bf71b9f43b51e162785fa548ff04e0b Mon Sep 17 00:00:00 2001 From: Peter Siegmund Date: Tue, 14 Jun 2016 17:14:22 +0200 Subject: [PATCH 08/16] disable Set Time button after fragment creation --- .../fragments/raceinfo/StartTimeFragment.java | 21 ++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/raceinfo/StartTimeFragment.java b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/raceinfo/StartTimeFragment.java index 96400d723c8..2882c86c2e4 100755 --- a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/raceinfo/StartTimeFragment.java +++ b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/raceinfo/StartTimeFragment.java @@ -62,6 +62,7 @@ public class StartTimeFragment extends BaseFragment private static final int FUTURE_DAYS = 25; private static final int PAST_DAYS = 3; private static final int MAX_DIFF_MIN = 60; + private static final int NONE = -1; private static final int ABSOLUTE = 0; private static final int RELATIVE = 1; @@ -224,13 +225,6 @@ public class StartTimeFragment extends BaseFragment mStartTimeOffset = result.getStartTimeDiff(); mRaceId = Util.get(result.getDependingOnRaces(), 0); } - - if (mSetStartAbsolute != null) { - mSetStartAbsolute.setEnabled(false); - } - if (mSetStartRelative != null) { - mSetStartRelative.setEnabled(false); - } break; default: // MODE_SETUP @@ -262,6 +256,11 @@ public class StartTimeFragment extends BaseFragment initViewsAbsolute(time); initViewsRelative(); + + // reset Set Time button after init + if (getArguments() != null && getArguments().getInt(START_MODE, START_MODE_PRESETUP) == MODE_TIME_PANEL) { + activateSetTime(NONE); + } } @Override @@ -685,6 +684,14 @@ public class StartTimeFragment extends BaseFragment mSetStartRelative.setEnabled(true); } break; + + default: + if (mSetStartAbsolute != null) { + mSetStartAbsolute.setEnabled(false); + } + if (mSetStartRelative != null) { + mSetStartRelative.setEnabled(false); + } } } From 2c28adb958cb6598e0f9c3805cb00d1ed746dbfe Mon Sep 17 00:00:00 2001 From: Axel Uhl Date: Tue, 14 Jun 2016 18:13:48 +0200 Subject: [PATCH 09/16] added release notes entry for race management app Change-Id: I6c23092eee648d7fac777b3a5dbb3ef0ab093bbf --- .../sap/sailing/gwt/home/solutions/RaceCommitteeAppNotes.html | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/home/solutions/RaceCommitteeAppNotes.html b/java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/home/solutions/RaceCommitteeAppNotes.html index 039b7a614ad..32c10c8ea61 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/home/solutions/RaceCommitteeAppNotes.html +++ b/java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/home/solutions/RaceCommitteeAppNotes.html @@ -10,6 +10,10 @@
  • The start time editing screen has now a "Sync to minute" button, which replaces the both buttons beside the countdown. This button sets the countdown to the nearest minute and after "Set time" the new start time will be sent to the server.
    • +
  • The "Set Time" button in the start time editing screen remains disabled now until + the user actually makes a change. This also helps to identify that "Set Time" + needs to be tapped in order to transmit a change carried out using the + "Sync to minute" button.
    • May 2016
    From a378d3dd65e5abda0e99687c6bac50c02bbbaf8d Mon Sep 17 00:00:00 2001 From: Axel Uhl Date: Tue, 14 Jun 2016 18:18:40 +0200 Subject: [PATCH 10/16] removed unused field "wakeUp" Change-Id: I0fce9cb6c4ba178133443bfd51d990a6e5026baf --- .../sailing/racecommittee/app/ui/activities/LoginActivity.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/activities/LoginActivity.java b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/activities/LoginActivity.java index b145b728b0a..1caefdf73e7 100644 --- a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/activities/LoginActivity.java +++ b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/activities/LoginActivity.java @@ -72,8 +72,6 @@ public class LoginActivity extends BaseActivity private final static String CourseAreaListFragmentTag = "CourseAreaListFragmentTag"; private final static String AreaPositionListFragmentTag = "AreaPositionListFragmentTag"; - private boolean wakeUp; - private final static String TAG = LoginActivity.class.getName(); private final PositionListFragment positionFragment; From 971fbc6a2f1114accffe48f3180e00dd96d12faa Mon Sep 17 00:00:00 2001 From: Peter Siegmund Date: Tue, 14 Jun 2016 19:03:12 +0200 Subject: [PATCH 11/16] set ellipsize from end to middle in NavDrawer --- .../res/layout/race_list_area_header.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mobile/com.sap.sailing.racecommittee.app/res/layout/race_list_area_header.xml b/mobile/com.sap.sailing.racecommittee.app/res/layout/race_list_area_header.xml index a903999c703..30e626bcfd4 100644 --- a/mobile/com.sap.sailing.racecommittee.app/res/layout/race_list_area_header.xml +++ b/mobile/com.sap.sailing.racecommittee.app/res/layout/race_list_area_header.xml @@ -57,7 +57,7 @@ android:id="@+id/boat_class" android:layout_width="match_parent" android:layout_height="wrap_content" - android:ellipsize="end" + android:ellipsize="middle" android:maxLines="1" android:textAppearance="?attr/textNormal" tools:text="Extreme 40" /> @@ -66,7 +66,7 @@ android:id="@+id/fleet_series" android:layout_width="match_parent" android:layout_height="wrap_content" - android:ellipsize="end" + android:ellipsize="middle" android:maxLines="2" android:textAppearance="?attr/textSmall" tools:text="Day 1\nYellow" /> From 30d494d01f673b2a0f1c63340b33dacb2459b817 Mon Sep 17 00:00:00 2001 From: Axel Uhl Date: Tue, 14 Jun 2016 21:17:59 +0200 Subject: [PATCH 12/16] updated race management app's release notes for bug 3694 Change-Id: Ia7e66267ac4c519458e3d5994a7b0ce2b299dcc5 --- .../sailing/gwt/home/solutions/RaceCommitteeAppNotes.html | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/home/solutions/RaceCommitteeAppNotes.html b/java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/home/solutions/RaceCommitteeAppNotes.html index 32c10c8ea61..4f666f5d8a0 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/home/solutions/RaceCommitteeAppNotes.html +++ b/java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/home/solutions/RaceCommitteeAppNotes.html @@ -14,6 +14,13 @@ the user actually makes a change. This also helps to identify that "Set Time" needs to be tapped in order to transmit a change carried out using the "Sync to minute" button. +
  • The "Set Time" button in the start time editing screen remains disabled now until + the user actually makes a change. This also helps to identify that "Set Time" + needs to be tapped in order to transmit a change carried out using the + "Sync to minute" button.
    • +
  • Changing the server, signing out, changing hidden event visibility, + and changing the regatta now properly ensures that the + content is refreshed based on the new settings.
    • May 2016
    From 8d8081edd5ab07ddaae7c3bd97357d6f14e472ef Mon Sep 17 00:00:00 2001 From: Axel Uhl Date: Tue, 14 Jun 2016 21:35:56 +0200 Subject: [PATCH 13/16] removed duplicate text from race management app release notes document Change-Id: If4d01a1947bab5553ca3003bd2641ccf9a291ee1 --- .../sap/sailing/gwt/home/solutions/RaceCommitteeAppNotes.html | 4 ---- 1 file changed, 4 deletions(-) diff --git a/java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/home/solutions/RaceCommitteeAppNotes.html b/java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/home/solutions/RaceCommitteeAppNotes.html index 4f666f5d8a0..d5679b217f1 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/home/solutions/RaceCommitteeAppNotes.html +++ b/java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/home/solutions/RaceCommitteeAppNotes.html @@ -13,10 +13,6 @@
  • The "Set Time" button in the start time editing screen remains disabled now until the user actually makes a change. This also helps to identify that "Set Time" needs to be tapped in order to transmit a change carried out using the - "Sync to minute" button.
    • -
  • The "Set Time" button in the start time editing screen remains disabled now until - the user actually makes a change. This also helps to identify that "Set Time" - needs to be tapped in order to transmit a change carried out using the "Sync to minute" button.
  • Changing the server, signing out, changing hidden event visibility, and changing the regatta now properly ensures that the From 5df392605d9688c48977c6d7cf78ce12a768fd47 Mon Sep 17 00:00:00 2001 From: Peter Siegmund Date: Tue, 14 Jun 2016 22:42:37 +0200 Subject: [PATCH 14/16] fixed issue 3701 --- .../app/ui/adapters/checked/CheckedItemAdapter.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/adapters/checked/CheckedItemAdapter.java b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/adapters/checked/CheckedItemAdapter.java index 357d6b42dd8..fa8985ad0ff 100644 --- a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/adapters/checked/CheckedItemAdapter.java +++ b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/adapters/checked/CheckedItemAdapter.java @@ -62,6 +62,8 @@ public class CheckedItemAdapter extends ArrayAdapter { } } else if (!item.isEnabled()) { mainTextView.setTextColor(ThemeHelper.getColor(getContext(), R.attr.sap_gray_white_10)); + } else { + mainTextView.setTextColor(ThemeHelper.getColor(getContext(), R.attr.white)); } if (!TextUtils.isEmpty(item.getSubtext())) { From 803d9e488e0ffa4e49d1cd84e1c4b8d547d2267a Mon Sep 17 00:00:00 2001 From: Axel Uhl Date: Wed, 15 Jun 2016 01:16:31 +0200 Subject: [PATCH 15/16] formatting and comments only Change-Id: I719e26661f17f7d129aa65a63059a09715dd2187 --- .../home/communication/event/GetRegattaListViewAction.java | 2 ++ .../gwt/home/communication/eventview/RegattaReferenceDTO.java | 2 +- .../desktop/partials/multiregattalist/MultiRegattaList.java | 2 +- .../com/sap/sailing/gwt/home/server/LeaderboardContext.java | 4 ++-- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/event/GetRegattaListViewAction.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/event/GetRegattaListViewAction.java index 9c3d95c921b..988f09cf788 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/event/GetRegattaListViewAction.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/event/GetRegattaListViewAction.java @@ -38,6 +38,8 @@ public class GetRegattaListViewAction implements SailingAction(EventActionUtil.getEventStateDependentTTL(context, eventId, Duration.ONE_MINUTE.times(3)), new SortedSetResult<>(result)); } diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/eventview/RegattaReferenceDTO.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/eventview/RegattaReferenceDTO.java index 350bdd6da82..d2646012607 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/eventview/RegattaReferenceDTO.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/eventview/RegattaReferenceDTO.java @@ -32,7 +32,7 @@ public class RegattaReferenceDTO implements DTO, Comparable @Override public int compareTo(RegattaReferenceDTO o) { int compareByDisplayName = displayName.compareTo(o.displayName); - if(compareByDisplayName != 0) { + if (compareByDisplayName != 0) { return compareByDisplayName; } return id.compareTo(o.id); diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/multiregattalist/MultiRegattaList.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/multiregattalist/MultiRegattaList.java index 2fdb6c082f4..841ebea8dc3 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/multiregattalist/MultiRegattaList.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/multiregattalist/MultiRegattaList.java @@ -51,7 +51,7 @@ public class MultiRegattaList extends Composite implements RefreshableWidget Date: Wed, 15 Jun 2016 01:40:23 +0200 Subject: [PATCH 16/16] whitespace/formatting change only Change-Id: Ib7c0abb773c7df8efb8e1a9009aab6930e5ab74d --- .../gwt/home/communication/regatta/RegattaWithProgressDTO.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/regatta/RegattaWithProgressDTO.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/regatta/RegattaWithProgressDTO.java index 5fdcbe5d5df..af13ddf7f8c 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/regatta/RegattaWithProgressDTO.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/regatta/RegattaWithProgressDTO.java @@ -24,7 +24,7 @@ public class RegattaWithProgressDTO extends RegattaMetadataDTO { @Override public int compareTo(RegattaReferenceDTO o) { - if(o instanceof RegattaWithProgressDTO) { + if (o instanceof RegattaWithProgressDTO) { RegattaWithProgressDTO other = (RegattaWithProgressDTO) o; RegattaState state = getState(); RegattaState otherState = other.getState();