From ba37760f157ddd0cdfdd647e99994370a75fd423 Mon Sep 17 00:00:00 2001 From: Lukas Niemeier Date: Fri, 21 Jun 2013 15:27:11 +0200 Subject: [PATCH] # RRS26 + GateStart setting up their UI on wakeup now --- .../GateStartRunningRaceFragment.java | 37 +++++++------- .../raceinfo/RRS26RunningRaceFragment.java | 33 ++++++------- .../startphase/GateStartPhaseFragment.java | 47 +++++++++--------- .../startphase/RRS26StartPhaseFragment.java | 48 +++++++++---------- .../startphase/StartphaseRaceFragment.java | 1 + 5 files changed, 84 insertions(+), 82 deletions(-) diff --git a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/raceinfo/GateStartRunningRaceFragment.java b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/raceinfo/GateStartRunningRaceFragment.java index 9e30aaee188..100e14fdcbd 100644 --- a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/raceinfo/GateStartRunningRaceFragment.java +++ b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/raceinfo/GateStartRunningRaceFragment.java @@ -69,8 +69,6 @@ public class GateStartRunningRaceFragment extends RaceFragment implements GateSt displayedFlag = (ImageView) getView().findViewById(R.id.currentlyDisplayedFlag); flagToBeDisplayed = (ImageView) getView().findViewById(R.id.flagToBeDisplayed); - setupUi(); - getRace().getState().getStartProcedure().setRunningRaceEventListener(this); PathfinderFinder pathFinderFinder = new PathfinderFinder(this.getRace().getRaceLog()); @@ -84,6 +82,25 @@ public class GateStartRunningRaceFragment extends RaceFragment implements GateSt } + @Override + public void onStart() { + super.onStart(); + + setupUi(); + + ExLog.i(GateStartRunningRaceFragment.class.getName(), + String.format("Fragment %s is now shown", GateStartRunningRaceFragment.class.getName())); + } + + @Override + public void notifyTick() { + if (getRace().getState().getStartTime() == null) + return; + + long millisSinceStart = System.currentTimeMillis() - getRace().getState().getStartTime().asMillis(); + setStarttimeCountupLabel(millisSinceStart); + } + private void setupUi() { boolean golfFlagTakenDown = false; LastFlagsFinder lastFlagFinder = new LastFlagsFinder(getRace().getRaceLog()); @@ -151,22 +168,6 @@ public class GateStartRunningRaceFragment extends RaceFragment implements GateSt alert.show(); } - @Override - public void onStart() { - super.onStart(); - ExLog.i(GateStartRunningRaceFragment.class.getName(), - String.format("Fragment %s is now shown", GateStartRunningRaceFragment.class.getName())); - } - - public void notifyTick() { - if (getRace().getState().getStartTime() == null) - return; - - long millisSinceStart = System.currentTimeMillis() - getRace().getState().getStartTime().asMillis(); - setStarttimeCountupLabel(millisSinceStart); - // TODO: implement count down label text when individual recall is displayed - } - private void setStarttimeCountupLabel(long millisecondsSinceStart) { countUpTextView.setText(String.format(getString(R.string.race_running_since_template), prettyTimeString(millisecondsSinceStart), getRace().getName())); diff --git a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/raceinfo/RRS26RunningRaceFragment.java b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/raceinfo/RRS26RunningRaceFragment.java index 9400389a059..16a6d863c50 100644 --- a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/raceinfo/RRS26RunningRaceFragment.java +++ b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/raceinfo/RRS26RunningRaceFragment.java @@ -86,7 +86,24 @@ public class RRS26RunningRaceFragment extends RaceFragment implements RRS26Runni } } }); + } + + @Override + public void onStart() { + super.onStart(); setupUi(); + getRace().getState().getStartProcedure().setRunningRaceEventListener(this); + ExLog.i(RRS26RunningRaceFragment.class.getName(), String.format("Fragment %s is now shown", RRS26RunningRaceFragment.class.getName())); + } + + @Override + public void notifyTick() { + if (getRace().getState().getStartTime() == null) + return; + + long millisSinceStart = System.currentTimeMillis() - getRace().getState().getStartTime().asMillis(); + setStarttimeCountupLabel(millisSinceStart); + //TODO: implement count down label text when individual recall is displayed } private void setupUi() { @@ -146,22 +163,6 @@ public class RRS26RunningRaceFragment extends RaceFragment implements RRS26Runni AlertDialog alert = builder.create(); alert.show(); } - - @Override - public void onStart() { - super.onStart(); - getRace().getState().getStartProcedure().setRunningRaceEventListener(this); - ExLog.i(RRS26RunningRaceFragment.class.getName(), String.format("Fragment %s is now shown", RRS26RunningRaceFragment.class.getName())); - } - - public void notifyTick() { - if (getRace().getState().getStartTime() == null) - return; - - long millisSinceStart = System.currentTimeMillis() - getRace().getState().getStartTime().asMillis(); - setStarttimeCountupLabel(millisSinceStart); - //TODO: implement count down label text when individual recall is displayed - } private void setStarttimeCountupLabel(long millisecondsSinceStart) { diff --git a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/raceinfo/startphase/GateStartPhaseFragment.java b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/raceinfo/startphase/GateStartPhaseFragment.java index 666a4495e6d..4e57c529bb4 100644 --- a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/raceinfo/startphase/GateStartPhaseFragment.java +++ b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/raceinfo/startphase/GateStartPhaseFragment.java @@ -113,8 +113,31 @@ public class GateStartPhaseFragment extends RaceFragment implements GateStartPha showLineOpeningTimeDialog(); } }); + } + + @Override + public void onStart() { + super.onStart(); setupUi(); + getRace().getState().getStartProcedure().setStartPhaseEventListener(this); + ExLog.w(GateStartPhaseFragment.class.getName(), + String.format("Fragment %s is now shown", GateStartPhaseFragment.class.getName())); + } + + @Override + public void onStop() { + super.onStop(); + + getRace().getState().getStartProcedure().setStartPhaseEventListener(null); + } + + @Override + public void notifyTick() { + TimePoint startTime = getRace().getState().getStartTime(); + if (startTime != null) { + setCountdownLabels(TimeUtils.timeUntil(startTime)); + } } private void showPathFinderDialog() { @@ -163,30 +186,6 @@ public class GateStartPhaseFragment extends RaceFragment implements GateStartPha } } - @Override - public void onStart() { - super.onStart(); - - getRace().getState().getStartProcedure().setStartPhaseEventListener(this); - ExLog.w(GateStartPhaseFragment.class.getName(), - String.format("Fragment %s is now shown", GateStartPhaseFragment.class.getName())); - } - - @Override - public void onStop() { - super.onStop(); - - getRace().getState().getStartProcedure().setStartPhaseEventListener(null); - } - - @Override - public void notifyTick() { - TimePoint startTime = getRace().getState().getStartTime(); - if (startTime != null) { - setCountdownLabels(TimeUtils.timeUntil(startTime)); - } - } - private void setCountdownLabels(long millisecondsTillStart) { setStarttimeCountdownLabel(millisecondsTillStart); setNextFlagCountdownLabel(millisecondsTillStart); diff --git a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/raceinfo/startphase/RRS26StartPhaseFragment.java b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/raceinfo/startphase/RRS26StartPhaseFragment.java index fa01108e2da..6b0467f9f8b 100644 --- a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/raceinfo/startphase/RRS26StartPhaseFragment.java +++ b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/raceinfo/startphase/RRS26StartPhaseFragment.java @@ -100,8 +100,32 @@ public class RRS26StartPhaseFragment extends RaceFragment implements RRS26StartP infoListener.onResetTime(); } }); + } + + @Override + public void onStart() { + super.onStart(); setupUi(); + + getRace().getState().getStartProcedure().setStartPhaseEventListener(this); + ExLog.i(RRS26StartPhaseFragment.class.getName(), + String.format("Fragment %s is now shown", RRS26StartPhaseFragment.class.getName())); + } + + @Override + public void onStop() { + super.onStop(); + + getRace().getState().getStartProcedure().setStartPhaseEventListener(null); + } + + @Override + public void notifyTick() { + TimePoint startTime = getRace().getState().getStartTime(); + if (startTime != null) { + setCountdownLabels(TimeUtils.timeUntil(startTime)); + } } private void setupUi() { @@ -143,30 +167,6 @@ public class RRS26StartPhaseFragment extends RaceFragment implements RRS26StartP } } - @Override - public void onStart() { - super.onStart(); - - getRace().getState().getStartProcedure().setStartPhaseEventListener(this); - ExLog.w(RRS26StartPhaseFragment.class.getName(), - String.format("Fragment %s is now shown", RRS26StartPhaseFragment.class.getName())); - } - - @Override - public void onStop() { - super.onStop(); - - getRace().getState().getStartProcedure().setStartPhaseEventListener(null); - } - - @Override - public void notifyTick() { - TimePoint startTime = getRace().getState().getStartTime(); - if (startTime != null) { - setCountdownLabels(TimeUtils.timeUntil(startTime)); - } - } - private void setCountdownLabels(long millisecondsTillStart) { setStarttimeCountdownLabel(millisecondsTillStart); setNextFlagCountdownLabel(millisecondsTillStart); diff --git a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/raceinfo/startphase/StartphaseRaceFragment.java b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/raceinfo/startphase/StartphaseRaceFragment.java index dc94adf64eb..61b3f612fa5 100644 --- a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/raceinfo/startphase/StartphaseRaceFragment.java +++ b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/raceinfo/startphase/StartphaseRaceFragment.java @@ -69,6 +69,7 @@ public class StartphaseRaceFragment extends RaceFragment { }); } + @Override public void notifyTick() { TimePoint startTime = getRace().getState().getStartTime(); if (startTime != null) {