Display remaining time to event start

Author: lucasluqui

assets/lang/lang_en.properties

@@ -126,10 +126,15 @@ m.resource_mod="Resource mod"
 m.code_mod="Code mod"
 m.code_mod_jdkincompatible="Incompatible"
 m.modlist_footer="Displaying {0} out of {1} mod(s)."
-m.days="Days"
-m.hours="Hours"
-m.minutes="Minutes"
-m.seconds="Seconds"
+m.days="Day(s)"
+m.hours="Hour(s)"
+m.minutes="Minute(s)"
+m.seconds="Second(s)"
+m.timer_days="{0} day(s)"
+m.timer_hours="{0} hour(s)"
+m.timer_minutes="{0} minute(s)"
+m.timer_less_than_minute="less than a minute"
+m.timer_seconds="{0} second(s)"
 m.online="Online"
 m.offline="Offline"
 m.recently_restarted="Recently restarted"
@@ -167,7 +172,10 @@ m.animated_banners_disable="Disable animated banners"
 m.animated_banners_enable="Enable animated banners"
 m.add_server="Add a server"
 m.add_server_text="Third party servers will be automatically added to this list once they are publicly available.\n\nYou can redeem Beta access to third party servers by going into the Betas tab in the launcher's settings."
-m.banner_ends_at="Runs through {0}"
+m.banner_starts_at_date="Starts on {0}"
+m.banner_starts_at_remaining="Starts in {0}"
+m.banner_ends_at_date="Runs through {0}"
+m.banner_ends_at_remaining="Ends in {0}"
 m.banner_ends_at_ended="This event has ended"
 
 # Options (usually on comboboxes)

src/main/java/com/luuqui/launcher/LauncherEventHandler.java

@@ -526,20 +526,24 @@ public static void updateBanner() {
         LauncherGUI.bannerLinkButton.setVisible(false);
       }
 
-      if(LauncherApp.selectedServer.announceBannerEndsAt != 0L) {
-        if(System.currentTimeMillis() > LauncherApp.selectedServer.announceBannerEndsAt) {
-          LauncherGUI.bannerEndsAt.setText(Locale.getValue("m.banner_ends_at_ended"));
+      if(LauncherApp.selectedServer.announceBannerEndsAt != 0L || LauncherApp.selectedServer.announceBannerStartsAt != 0L) {
+
+        if(LauncherApp.selectedServer.announceBannerStartsAt > System.currentTimeMillis()) {
+          // The event has not yet started
+          LauncherGUI.bannerTimer.setText(Locale.getValue("m.banner_starts_at_remaining", DateUtil.getFormattedRemaining(LauncherApp.selectedServer.announceBannerStartsAt)));
+        } else if(System.currentTimeMillis() > LauncherApp.selectedServer.announceBannerEndsAt) {
+          // The event already ended
+          LauncherGUI.bannerTimer.setText(Locale.getValue("m.banner_ends_at_ended"));
         } else {
-          Calendar calendar = Calendar.getInstance();
-          calendar.setTimeInMillis(LauncherApp.selectedServer.announceBannerEndsAt);
-          calendar.setTimeZone(TimeZone.getTimeZone("PST")); // Game's timezone
-          SimpleDateFormat dateFormat = new SimpleDateFormat("MMMM"); // Only the month, we'll concatenate the day later.
-
-          LauncherGUI.bannerEndsAt.setText(Locale.getValue("m.banner_ends_at", dateFormat.format(calendar.getTime()) + " " + DateUtil.getDayNumberWithSuffix(calendar.get(Calendar.DATE) - 1)));
+          // The event is currently running
+          LauncherGUI.bannerTimer.setText(Locale.getValue("m.banner_ends_at_date", DateUtil.getFormattedMonthDay(LauncherApp.selectedServer.announceBannerEndsAt)));
         }
-        LauncherGUI.bannerEndsAt.setVisible(true);
+
+        // In any case, the timer needs to be visible
+        LauncherGUI.bannerTimer.setVisible(true);
       } else {
-        LauncherGUI.bannerEndsAt.setVisible(false);
+        // Nothing to show here.
+        LauncherGUI.bannerTimer.setVisible(false);
       }
     });
     refreshThread.start();

src/main/java/com/luuqui/launcher/LauncherGUI.java

@@ -358,6 +358,21 @@ protected void paintComponent(Graphics g) {
     launcherVersion.setBounds(10, 493, 230, 15);
     sidePane.add(launcherVersion);
 
+    Icon timerIcon = IconFontSwing.buildIcon(FontAwesome.CLOCK_O, 16, Color.WHITE);
+    bannerTimer = new JLabel("");
+    bannerTimer.setIcon(timerIcon);
+    bannerTimer.setBounds(40, 50, 225, 25);
+    bannerTimer.setFont(Fonts.fontReg);
+    bannerTimer.setForeground(Color.WHITE);
+    bannerTimer.setHorizontalAlignment(SwingConstants.CENTER);
+    bannerTimer.setVerticalAlignment(SwingConstants.CENTER);
+    bannerTimer.putClientProperty(FlatClientProperties.STYLE,
+            "background:" + ColorUtil.colorToHexString(CustomColors.INTERFACE_MAINPANE_BACKGROUND)
+                    + "AA; foreground:" + ColorUtil.colorToHexString(Color.WHITE)
+                    + "; arc:999;");
+    bannerTimer.setVisible(false);
+    mainPane.add(bannerTimer);
+
     bannerTitle = new JLabel(Locale.getValue("m.banner_title_default"));
     bannerTitle.setBounds(35, -60, 700, 340);
     bannerTitle.setFont(Fonts.fontMedGiant);
@@ -376,21 +391,6 @@ protected void paintComponent(Graphics g) {
     bannerSubtitle2.setForeground(Color.WHITE);
     mainPane.add(bannerSubtitle2);
 
-    Icon endsAtIcon = IconFontSwing.buildIcon(FontAwesome.CLOCK_O, 16, Color.WHITE);
-    bannerEndsAt = new JLabel("");
-    bannerEndsAt.setIcon(endsAtIcon);
-    bannerEndsAt.setBounds(40, 50, 225, 25);
-    bannerEndsAt.setFont(Fonts.fontReg);
-    bannerEndsAt.setForeground(Color.WHITE);
-    bannerEndsAt.setHorizontalAlignment(SwingConstants.CENTER);
-    bannerEndsAt.setVerticalAlignment(SwingConstants.CENTER);
-    bannerEndsAt.putClientProperty(FlatClientProperties.STYLE,
-            "background:" + ColorUtil.colorToHexString(CustomColors.INTERFACE_MAINPANE_BACKGROUND)
-            + "AA; foreground:" + ColorUtil.colorToHexString(Color.WHITE)
-            + "; arc:999;");
-    bannerEndsAt.setVisible(false);
-    mainPane.add(bannerEndsAt);
-
     bannerLinkButton = new JButton(Locale.getValue("b.learn_more"));
     bannerLinkButton.setBounds(40, 195, 110, 25);
     bannerLinkButton.setFont(Fonts.fontMed);
@@ -727,10 +727,10 @@ protected static void specialKeyReleased() {
   // Main pane
   public static JPanel mainPane;
   public static BufferedImage banner = null;
+  public static JLabel bannerTimer;
   public static JLabel bannerTitle;
   public static JLabel bannerSubtitle1;
   public static JLabel bannerSubtitle2;
-  public static JLabel bannerEndsAt;
   public static JButton bannerLinkButton;
   public static JButton launchButton;
   public static JButton updateButton;

src/main/java/com/luuqui/util/DateUtil.java

@@ -1,19 +1,54 @@
 package com.luuqui.util;
 
+import com.luuqui.launcher.Locale;
+
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.Calendar;
 import java.util.Date;
+import java.util.TimeZone;
+
+import static com.luuqui.util.Log.log;
 
 public class DateUtil {
 
+  private static final String TIMEZONE = "PST"; // Game's timezone
+
   public static String getDateAsString() {
     Date date = Calendar.getInstance().getTime();
     DateFormat dateFormat = new SimpleDateFormat("yyyy_MM_dd_hh_mm_ss");
     return dateFormat.format(date);
   }
 
-  public static String getDayNumberWithSuffix(int date) {
+  public static String getFormattedRemaining(long timestamp) {
+    long remainingMillis = timestamp - System.currentTimeMillis();
+    long minutesRemaining = (remainingMillis / 1000L) / 60L;
+    long hoursRemaining = minutesRemaining / 60L;
+    long daysRemaining = hoursRemaining / 24L;
+
+    log.info("Remaining time", "remainingMillis", remainingMillis, "daysRemaining", daysRemaining, "hoursRemaining", hoursRemaining, "minutesRemaining", minutesRemaining);
+
+    if(daysRemaining > 0L) {
+      return Locale.getValue("m.timer_days", String.valueOf(daysRemaining));
+    } else if(hoursRemaining > 0L) {
+      return Locale.getValue("m.timer_hours", String.valueOf(hoursRemaining));
+    } else if(minutesRemaining > 0L) {
+      return Locale.getValue("m.timer_minutes", String.valueOf(minutesRemaining));
+    } else {
+      return Locale.getValue("m.timer_less_than_minute");
+    }
+  }
+
+  public static String getFormattedMonthDay(long timestamp) {
+    Calendar calendar = Calendar.getInstance();
+    calendar.setTimeInMillis(timestamp);
+    calendar.setTimeZone(TimeZone.getTimeZone(TIMEZONE));
+    SimpleDateFormat dateFormat = new SimpleDateFormat("MMMM"); // Only the month, we'll concatenate the day later.
+
+    return dateFormat.format(calendar.getTime()) + " " + DateUtil.getDayNumberWithSuffix(calendar.get(Calendar.DATE) - 1);
+  }
+
+  private static String getDayNumberWithSuffix(int date) {
     String suffix = "th";
     switch (date) {
       case 1: