From 83e4142aca8a601061f1b09618830dab51f7494d Mon Sep 17 00:00:00 2001 From: Peter Siegmund Date: Tue, 5 Apr 2016 09:26:58 +0200 Subject: [PATCH] reload races --- .../drawable-hdpi/ic_change_role_white_48dp.png | Bin 328 -> 0 bytes .../drawable-mdpi/ic_change_role_white_48dp.png | Bin 199 -> 0 bytes .../drawable-xhdpi/ic_change_role_white_48dp.png | Bin 289 -> 0 bytes .../drawable-xxhdpi/ic_change_role_white_48dp.png | Bin 453 -> 0 bytes .../ic_change_role_white_48dp.png | Bin 460 -> 0 bytes .../res/layout/race_list_header_content.xml | 2 +- .../res/menu/options_menu.xml | 12 ++++++++---- .../res/values-de/strings.xml | 1 + .../res/values/strings.xml | 1 + .../sailing/racecommittee/app/AppConstants.java | 12 +++++++----- .../app/ui/activities/RacingActivity.java | 11 ++++++++++- .../app/ui/fragments/RaceListFragment.java | 3 +-- 12 files changed, 29 insertions(+), 13 deletions(-) delete mode 100644 mobile/com.sap.sailing.racecommittee.app/res/drawable-hdpi/ic_change_role_white_48dp.png delete mode 100644 mobile/com.sap.sailing.racecommittee.app/res/drawable-mdpi/ic_change_role_white_48dp.png delete mode 100644 mobile/com.sap.sailing.racecommittee.app/res/drawable-xhdpi/ic_change_role_white_48dp.png delete mode 100644 mobile/com.sap.sailing.racecommittee.app/res/drawable-xxhdpi/ic_change_role_white_48dp.png delete mode 100644 mobile/com.sap.sailing.racecommittee.app/res/drawable-xxxhdpi/ic_change_role_white_48dp.png diff --git a/mobile/com.sap.sailing.racecommittee.app/res/drawable-hdpi/ic_change_role_white_48dp.png b/mobile/com.sap.sailing.racecommittee.app/res/drawable-hdpi/ic_change_role_white_48dp.png deleted file mode 100644 index c29cb246f2559e4a03ad3f63027e32a36560f4f2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 328 zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY3?!3`olAj~L4Z$)E0F$A3b6KNF#zfjC<*cl zW>C2QU*++04T0^gJ#zvjZ6$LY_Y?}?G_t9m*w+a z`zA?j{mdu6>Bi5G3yVqtmboFyt=akR{0OuH=ivR!s diff --git a/mobile/com.sap.sailing.racecommittee.app/res/drawable-mdpi/ic_change_role_white_48dp.png b/mobile/com.sap.sailing.racecommittee.app/res/drawable-mdpi/ic_change_role_white_48dp.png deleted file mode 100644 index e966f5104b87f2f936ae21723acd70f1c9d8f589..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 199 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA3?vioaBc-s`~f~8u0Z-f66kljmjM)FEeY}q zW@!H3Q1ei~?3Rq6x=zzZiWvw(`PB1*ZekV%}U(T$o*&x^T_>mRkD_B{;HTk?*v)O+eF3!rTbp00i_>zopr0FX#iS^xk5 diff --git a/mobile/com.sap.sailing.racecommittee.app/res/drawable-xhdpi/ic_change_role_white_48dp.png b/mobile/com.sap.sailing.racecommittee.app/res/drawable-xhdpi/ic_change_role_white_48dp.png deleted file mode 100644 index b811a20b30111a7be79260994b0622ce8fc83019..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 289 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD3?#3*wSy%11AIbUf%JbQ(C>6F11Q8=666=m z(EPul=AnMyRiMBgPZ!6KjC*gdd-EM~;9&{$uYOmbX2)cv@wheC$s?Bi#AbCz6~S|s z&*v1MJGzKbl{e!e!=A&k3FQ?GFZlc$?l^Awz_cT{iaFW(#ik{V3uXBZoZ(YXNNJzX zG*|i72VcL9{V%6okdIo$HtX|rhw^`15qE!bEBwAL{&o7yRgIlL{STb@bH8^_MebDw zlmA~Q@}9M4QsI5zULw{cmK3!h?#?7OJEsc>$n@9Izy7>6$T2(jzhIN;W6iw%{PiE8 PKNvh+{an^LB{Ts5pP78V diff --git a/mobile/com.sap.sailing.racecommittee.app/res/drawable-xxhdpi/ic_change_role_white_48dp.png b/mobile/com.sap.sailing.racecommittee.app/res/drawable-xxhdpi/ic_change_role_white_48dp.png deleted file mode 100644 index 02076b894fb19744c9f0019ac69ff4ba4f9b2d78..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 453 zcmeAS@N?(olHy`uVBq!ia0vp^6F``Q8Ax83A=Cw=)B}7%T!Hj|BEULZFH4|O-jX1{ zV20-Z4U_v>rsov=&ZznL``md321W-@7srr_TW@bZ0z0V5G8%rF-W?$d5T$)=|z5z=U3_+ zjihrGruNDyOzbUF=;OXk;vd$@?2>{!z B&=3Fs diff --git a/mobile/com.sap.sailing.racecommittee.app/res/drawable-xxxhdpi/ic_change_role_white_48dp.png b/mobile/com.sap.sailing.racecommittee.app/res/drawable-xxxhdpi/ic_change_role_white_48dp.png deleted file mode 100644 index e4cf3914bd9baf670b844cc8afd30a929ecff215..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 460 zcmeAS@N?(olHy`uVBq!ia0vp^2SAvE8Azrw%`pX1`~f~8u0Z-f66kljmjM)FEeY}q zW@!H3Q1ei~?74$leFm3^kMMnRdKi@PgGh42^I25aU1R2(KmTdN zGuqCpw|nrapiYcw)*E|S10W%NA?^RkhSg{P6*KmJ`+vKe;mYUz91^|f&igQA|F1r9 z^w$6X)A!u`7t7?fk@?y8d?AAuj6amO1PN3*zF=J_-Vz67>=I{5y})etXJvjkvM^j8 goq-ZulfHz-8>x$YtXev$9~cJ=p00i_>zopr0An@C!vFvP diff --git a/mobile/com.sap.sailing.racecommittee.app/res/layout/race_list_header_content.xml b/mobile/com.sap.sailing.racecommittee.app/res/layout/race_list_header_content.xml index 88b2d17c939..b77bf67bbb8 100644 --- a/mobile/com.sap.sailing.racecommittee.app/res/layout/race_list_header_content.xml +++ b/mobile/com.sap.sailing.racecommittee.app/res/layout/race_list_header_content.xml @@ -26,7 +26,7 @@ android:layout_alignParentEnd="true" android:layout_alignParentRight="true" android:layout_margin="@dimen/default_margin" - android:src="@drawable/ic_change_role_white_48dp"/> + android:src="@drawable/ic_refresh_white_48dp"/> + android:title="@string/reset_race" /> + android:title="@string/options_menu_settings" /> + android:title="@string/options_menu_info" /> + + + android:title="@string/logout" /> \ No newline at end of file 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 e1eee8695aa..29b4f4d7818 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 @@ -496,5 +496,6 @@ Zeige nicht öffentliche Events Lade alle Events, auch die nicht öffentlichen. + Rolle wechseln \ 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 82318e4453e..f98bb9f2525 100644 --- a/mobile/com.sap.sailing.racecommittee.app/res/values/strings.xml +++ b/mobile/com.sap.sailing.racecommittee.app/res/values/strings.xml @@ -524,4 +524,5 @@ Show Non Public Events Load all events including the no public one. + Change Regatta diff --git a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/AppConstants.java b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/AppConstants.java index 8c5cd7fd0b7..bd7b7a0f771 100755 --- a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/AppConstants.java +++ b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/AppConstants.java @@ -22,11 +22,13 @@ public class AppConstants { public final static String DARK_THEME = "dark"; public final static String LIGHT_THEME = "light"; - public final static String INTENT_ACTION_RESET = PACKAGE_NAME + ".action.reset"; - public final static String INTENT_ACTION_REGISTER_RACE = PACKAGE_NAME + ".action.registerRace"; - public final static String INTENT_ACTION_CLEAR_RACES = PACKAGE_NAME + ".action.clearRaces"; - public final static String INTENT_ACTION_ALARM_ACTION = PACKAGE_NAME + ".action.alarmAction"; - public final static String INTENT_ACTION_START_PROCEDURE_SPECIFIC_ACTION = PACKAGE_NAME + ".action.startProcedureSpecificAction"; + private final static String INTENT_ACTION = PACKAGE_NAME + ".action"; + public final static String INTENT_ACTION_RESET = INTENT_ACTION + ".reset"; + public final static String INTENT_ACTION_REGISTER_RACE = INTENT_ACTION + ".registerRace"; + public final static String INTENT_ACTION_CLEAR_RACES = INTENT_ACTION + ".clearRaces"; + public final static String INTENT_ACTION_ALARM_ACTION = INTENT_ACTION + ".alarmAction"; + public final static String INTENT_ACTION_RELOAD_RACES = INTENT_ACTION + ".reloadRaces"; + public final static String INTENT_ACTION_START_PROCEDURE_SPECIFIC_ACTION = INTENT_ACTION + ".startProcedureSpecificAction"; // Login activity public final static String EventIdTag = "EventId"; diff --git a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/activities/RacingActivity.java b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/activities/RacingActivity.java index b8f2a462cea..2a6d0d922bc 100755 --- a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/activities/RacingActivity.java +++ b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/activities/RacingActivity.java @@ -118,7 +118,7 @@ public class RacingActivity extends SessionActivity implements RaceListCallbacks setProgressSpinnerVisibility(true); ExLog.i(this, TAG, "Issuing loading of managed races from data manager"); - getLoaderManager().initLoader(RacesLoaderId, null, dataManager.createRacesLoader(courseArea.getId(), new RaceLoadClient(courseArea))); + getLoaderManager().initLoader(RacesLoaderId, null, dataManager.createRacesLoader(courseArea.getId(), new RaceLoadClient(courseArea))).forceLoad(); } private boolean resetEditFragments(@IdRes int id, String action) { @@ -246,6 +246,7 @@ public class RacingActivity extends SessionActivity implements RaceListCallbacks filter.addAction(AppConstants.INTENT_ACTION_SHOW_MAIN_CONTENT); filter.addAction(AppConstants.INTENT_ACTION_SHOW_SUMMARY_CONTENT); filter.addAction(AppConstants.INTENT_ACTION_REMOVE_PROTEST); + filter.addAction(AppConstants.INTENT_ACTION_RELOAD_RACES); LocalBroadcastManager.getInstance(this).registerReceiver(mReceiver, filter); } @@ -342,6 +343,10 @@ public class RacingActivity extends SessionActivity implements RaceListCallbacks resetRace(); return true; + case R.id.options_menu_role: + logoutSession(); + return true; + default: return super.onOptionsItemSelected(item); } @@ -553,6 +558,10 @@ public class RacingActivity extends SessionActivity implements RaceListCallbacks } } + if (AppConstants.INTENT_ACTION_RELOAD_RACES.equals(action)) { + loadRaces(dataManager.getDataStore().getCourseArea(getCourseAreaIdFromIntent())); + } + transaction.commit(); } diff --git a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/RaceListFragment.java b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/RaceListFragment.java index a143adaad97..639df723dfa 100644 --- a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/RaceListFragment.java +++ b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/RaceListFragment.java @@ -55,7 +55,6 @@ import com.sap.sailing.racecommittee.app.data.DataManager; import com.sap.sailing.racecommittee.app.data.ReadonlyDataManager; import com.sap.sailing.racecommittee.app.domain.ManagedRace; import com.sap.sailing.racecommittee.app.domain.impl.RaceGroupSeriesFleet; -import com.sap.sailing.racecommittee.app.ui.activities.RacingActivity; import com.sap.sailing.racecommittee.app.ui.activities.SessionActivity; import com.sap.sailing.racecommittee.app.ui.adapters.racelist.ManagedRaceListAdapter; import com.sap.sailing.racecommittee.app.ui.adapters.racelist.RaceListDataType; @@ -270,7 +269,7 @@ public class RaceListFragment extends LoggableFragment implements OnItemClickLis @Override public void onClick(View v) { - ((RacingActivity) getActivity()).logoutSession(); + BroadcastManager.getInstance(getActivity()).addIntent(new Intent(AppConstants.INTENT_ACTION_RELOAD_RACES)); } }); }