From 9ed2f88428079ef0b6ca9d3f5633c381fe34f8d7 Mon Sep 17 00:00:00 2001 From: Papick Garcia Taboada Date: Tue, 21 Jul 2015 16:59:55 +0200 Subject: [PATCH] Countdown initial styling --- .../mobile/partials/countdown/Countdown.gss | 1 + .../partials/countdown/Countdown.ui.xml | 2 +- .../partials/countdown/CountdownTicker.java | 1 + .../partials/stage/LiveEventStageTeaser.java | 4 -- .../stage/PopularEventStageTeaser.java | 4 -- .../mobile/partials/stage/StageTeaser.java | 64 ++----------------- .../mobile/partials/stage/StageTeaser.ui.xml | 32 +++++----- .../statisticsBox/StatisticsBox.ui.xml | 3 +- 8 files changed, 28 insertions(+), 83 deletions(-) diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/countdown/Countdown.gss b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/countdown/Countdown.gss index 8569a5ccab4..c49af3514e2 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/countdown/Countdown.gss +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/countdown/Countdown.gss @@ -6,6 +6,7 @@ } .countdown_content_panewrapper { font-size: 0; + margin: auto; } .countdown_content_pane { border: 0.2em solid #fff; diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/countdown/Countdown.ui.xml b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/countdown/Countdown.ui.xml index 6916c46e007..6dec67cfb3b 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/countdown/Countdown.ui.xml +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/countdown/Countdown.ui.xml @@ -3,7 +3,7 @@ xmlns:g="urn:import:com.google.gwt.user.client.ui" xmlns:s="urn:import:com.sap.sailing.gwt.home.client.shared"> - +
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/countdown/CountdownTicker.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/countdown/CountdownTicker.java index aab0f710da8..25c39e8b52d 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/countdown/CountdownTicker.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/countdown/CountdownTicker.java @@ -27,6 +27,7 @@ public class CountdownTicker extends Composite { private final Countdown countdown; public CountdownTicker(Date startTime) { + CountdownResources.INSTANCE.css().ensureInjected(); initWidget(uiBinder.createAndBindUi(this)); this.countdown = new Countdown(new MillisecondsTimePoint(startTime), new CountdownTickerListener()); } diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/stage/LiveEventStageTeaser.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/stage/LiveEventStageTeaser.java index 8a0b4cb65c4..be743a3e718 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/stage/LiveEventStageTeaser.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/stage/LiveEventStageTeaser.java @@ -1,7 +1,5 @@ package com.sap.sailing.gwt.home.mobile.partials.stage; -import com.google.gwt.dom.client.Style.Display; -import com.google.gwt.dom.client.Style.Visibility; import com.sap.sailing.gwt.home.mobile.app.MobilePlacesNavigator; import com.sap.sailing.gwt.ui.shared.start.EventStageDTO; @@ -15,8 +13,6 @@ public class LiveEventStageTeaser extends StageTeaser { title.setInnerText(event.getDisplayName()); subtitle.setInnerText(event.getLocationAndVenue()); - countdown.getStyle().setDisplay(Display.NONE); - countdown.getStyle().setVisibility(Visibility.HIDDEN); bandCount.setAttribute("data-bandcount", "1"); diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/stage/PopularEventStageTeaser.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/stage/PopularEventStageTeaser.java index 0234ccb8e90..c39db293bb9 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/stage/PopularEventStageTeaser.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/stage/PopularEventStageTeaser.java @@ -1,6 +1,5 @@ package com.sap.sailing.gwt.home.mobile.partials.stage; -import com.google.gwt.dom.client.Style.Display; import com.sap.sailing.gwt.home.mobile.app.MobilePlacesNavigator; import com.sap.sailing.gwt.ui.shared.start.EventStageDTO; @@ -13,9 +12,6 @@ public class PopularEventStageTeaser extends StageTeaser { title.setInnerText(event.getDisplayName()); subtitle.setInnerText(event.getLocationAndVenue()); - - countdown.getStyle().setDisplay(Display.NONE); - bandCount.setAttribute("data-bandcount", "1"); teaserBand = new PopularEventStageTeaserBand(event, placeNavigator); stageTeaserBandsPanel.getElement().appendChild(teaserBand.getElement()); diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/stage/StageTeaser.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/stage/StageTeaser.java index 95a92235803..5471e8c4706 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/stage/StageTeaser.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/stage/StageTeaser.java @@ -5,8 +5,6 @@ import com.google.gwt.dom.client.DivElement; import com.google.gwt.dom.client.Element; import com.google.gwt.dom.client.EventTarget; import com.google.gwt.dom.client.SpanElement; -import com.google.gwt.dom.client.Style.Display; -import com.google.gwt.dom.client.Style.Visibility; import com.google.gwt.event.dom.client.ClickEvent; import com.google.gwt.event.dom.client.ClickHandler; import com.google.gwt.uibinder.client.UiBinder; @@ -14,9 +12,7 @@ import com.google.gwt.uibinder.client.UiField; import com.google.gwt.user.client.ui.Composite; import com.google.gwt.user.client.ui.HTMLPanel; import com.google.gwt.user.client.ui.Widget; -import com.sap.sailing.gwt.home.client.shared.Countdown; -import com.sap.sailing.gwt.home.client.shared.Countdown.CountdownListener; -import com.sap.sailing.gwt.home.client.shared.Countdown.RemainingTime; +import com.sap.sailing.gwt.home.mobile.partials.countdown.CountdownTicker; import com.sap.sailing.gwt.ui.shared.start.EventStageDTO; import com.sap.sse.common.TimePoint; import com.sap.sse.common.impl.MillisecondsTimePoint; @@ -29,20 +25,8 @@ public abstract class StageTeaser extends Composite implements LazyLoadable { SpanElement subtitle; @UiField SpanElement title; - @UiField - DivElement countdown; - @UiField - DivElement countdownMajor; - @UiField - DivElement countdownMajorValue; - @UiField - DivElement countdownMajorUnit; - @UiField - DivElement countdownMinor; - @UiField - DivElement countdownMinorValue; - @UiField - DivElement countdownMinorUnit; + @UiField(provided = true) + CountdownTicker countdownTickerUi; @UiField HTMLPanel stageTeaserBandsPanel; @UiField @@ -70,18 +54,10 @@ public abstract class StageTeaser extends Composite implements LazyLoadable { public StageTeaser(EventStageDTO event) { this.event = event; StageResources.INSTANCE.css().ensureInjected(); - initWidget(uiBinder.createAndBindUi(this)); TimePoint eventStart = new MillisecondsTimePoint(event.getStartDate()); - CountdownListener countdownListener = new CountdownListener() { - - @Override - public void changed(RemainingTime major, RemainingTime minor) { - updateCountdown(major, minor); - } - - }; - new Countdown(eventStart, countdownListener); + countdownTickerUi = new CountdownTicker(eventStart.asDate()); + initWidget(uiBinder.createAndBindUi(this)); addDomHandler(new ClickHandler() { @@ -101,33 +77,5 @@ public abstract class StageTeaser extends Composite implements LazyLoadable { }, ClickEvent.getType()); } - private void updateCountdown(RemainingTime major, RemainingTime minor) { - if (major == null && minor == null) { - countdownMajorValue.setInnerHTML(null); - countdownMajorUnit.setInnerHTML(null); - countdownMinorValue.setInnerHTML(null); - countdownMinorUnit.setInnerHTML(null); - countdown.getStyle().setDisplay(Display.NONE); - countdown.getStyle().setVisibility(Visibility.HIDDEN); - } else { - if (major != null) { - countdownMajorValue.setInnerHTML(String.valueOf(major.value)); - countdownMajorUnit.setInnerHTML(String.valueOf(major.unitI18n())); - } else { - countdownMajorValue.setInnerHTML(null); - countdownMajorUnit.setInnerHTML(null); - countdownMajor.getStyle().setDisplay(Display.NONE); - countdownMajor.getStyle().setVisibility(Visibility.HIDDEN); - } - if (minor != null) { - countdownMinorValue.setInnerHTML(String.valueOf(minor.value)); - countdownMinorUnit.setInnerHTML(String.valueOf(minor.unitI18n())); - } else { - countdownMinorValue.setInnerHTML(null); - countdownMinorUnit.setInnerHTML(null); - countdownMinor.getStyle().setDisplay(Display.NONE); - countdownMinor.getStyle().setVisibility(Visibility.HIDDEN); - } - } - } + } diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/stage/StageTeaser.ui.xml b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/stage/StageTeaser.ui.xml index 2c05ba05dd2..337076dfccd 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/stage/StageTeaser.ui.xml +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/stage/StageTeaser.ui.xml @@ -1,34 +1,36 @@ + xmlns:g="urn:import:com.google.gwt.user.client.ui" + xmlns:s="urn:import:com.sap.sailing.gwt.home.client.shared" + xmlns:mp="urn:import:com.sap.sailing.gwt.home.mobile.partials" + > - + + .countdownPosition { + position: absolute; + top: 1em; + width: 100%; + } +
-