Add display for games with nonMovementPhaseLength.

zond · May 2, 2020 · fadafab · fadafab · zond · May 2, 2020
1 parent 35a5985
commit fadafab
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 1 deletion.
diff --git a/app/src/main/java/se/oort/diplicity/App.java b/app/src/main/java/se/oort/diplicity/App.java
@@ -121,4 +121,11 @@ public static String minutesToDuration(int mins) {
         return timeLabel.toString();
     }
 
+    public static String makePhaseLengthString(int movementPhaseLength, int nonMovementPhaseLength) {
+        String phaseLengthString = minutesToDuration(movementPhaseLength);
+        if (nonMovementPhaseLength != 0 && nonMovementPhaseLength != movementPhaseLength) {
+            phaseLengthString += "/" + minutesToDuration(nonMovementPhaseLength);
+        }
+        return phaseLengthString;
+    }
 }
diff --git a/app/src/main/java/se/oort/diplicity/GamesAdapter.java b/app/src/main/java/se/oort/diplicity/GamesAdapter.java
@@ -302,7 +302,9 @@ public void bind(final SingleContainer<Game> game, final int pos) {
 
             variant.setText(makeVariantText(game.Properties.Variant));
 
-            deadline.setText(App.minutesToDuration(game.Properties.PhaseLengthMinutes.intValue()));
+            Long nonMovementPhaseLengthLong = game.Properties.NonMovementPhaseLengthMinutes;
+            int nonMovementPhaseLength = (nonMovementPhaseLengthLong != null ? nonMovementPhaseLengthLong.intValue() : 0);
+            deadline.setText(App.makePhaseLengthString(game.Properties.PhaseLengthMinutes.intValue(), nonMovementPhaseLength));
 
             if (
                     game.Properties.Started &&

diff --git a/app/src/main/java/se/oort/diplicity/apigen/Game.java b/app/src/main/java/se/oort/diplicity/apigen/Game.java
@@ -11,6 +11,7 @@ public class Game implements java.io.Serializable {
   public String Desc;
   public String Variant;
   public Long PhaseLengthMinutes;
+  public Long NonMovementPhaseLengthMinutes;
   public Double MaxHated;
   public Double MaxHater;
   public Double MinRating;