add a new UNICODE_COLORFUL_BAR style

Author: ctongfei

CHANGELOG.md

@@ -1,7 +1,9 @@
 # Changelog
  * `0.9.5`:
      - Bugfixes:
-        - Fixed the problem of `ProgressState` not being public, thus making `setEtaFunction` useless (#147, PR #146). Thanks @deejgregor, @natanfudge !  
+        - Fixed the problem of `ProgressState` not being public, thus making `setEtaFunction` useless (#147, PR #146). Thanks @deejgregor, @natanfudge !
+     - New functionalities:
+        - Added a new `UNICODE_COLORFUL_BAR` style.
  * `0.9.4`:
      - New functionalities:
         - In `ProgressBarBuilder`s, one can now switch whether to show the remaining time, or to provide a custom

docs/builder.md

@@ -15,6 +15,9 @@ ProgressBarBuilder pbb = new ProgressBarBuilder()
     .showSpeed();
   // or .showSpeed(new DecimalFormat("#.##")) to customize speed display
     .setEtaFunction(state -> ...)
+  // This function is of type `ProgressState -> Optional<Duration>` 
+  // that should output the estimated ETA of the progress.
+  // Returning `Optional.empty()` means that ETA is not available.
 for (T x : ProgressBar.wrap(collection, pbb)) {
     ...
 }

src/main/java/me/tongfei/progressbar/DefaultProgressBarRenderer.java

@@ -152,7 +152,15 @@ public String render(ProgressState progress, int maxLength) {
         else {
             sb.append(Util.repeat(style.block, progressIntegralPart(progress, length)));
             if (progress.current < progress.max) {
-                sb.append(style.fractionSymbols.charAt(progressFractionalPart(progress, length)));
+                int fraction = progressFractionalPart(progress, length);
+                if (fraction != 0) {
+                    sb.append(style.fractionSymbols.charAt(fraction));
+                    sb.append(style.delimitingSequence);
+                }
+                else {
+                    sb.append(style.delimitingSequence);
+                    sb.append(style.rightSideFractionSymbol);
+                }
                 sb.append(Util.repeat(style.space, length - progressIntegralPart(progress, length) - 1));
             }
         }

src/main/java/me/tongfei/progressbar/ProgressBarStyle.java

@@ -7,28 +7,34 @@
  */
 public enum ProgressBarStyle {
 
-    COLORFUL_UNICODE_BLOCK("\r", "\u001b[33m│", "│\u001b[0m", '█', ' ', " ▏▎▍▌▋▊▉"),
+    COLORFUL_UNICODE_BLOCK("\r", "\u001b[33m│", "", "│\u001b[0m", '█', ' ', " ▏▎▍▌▋▊▉", ' '),
+
+    COLORFUL_UNICODE_BAR("\r", "\u001b[33m", "\u001b[90m", "\u001b[0m", '━', '━', " ╸", '╺'),
 
     /** Use Unicode block characters to draw the progress bar. */
-    UNICODE_BLOCK("\r", "│", "│", '█', ' ', " ▏▎▍▌▋▊▉"),
+    UNICODE_BLOCK("\r", "|", "", "|", '█', ' ', " ▏▎▍▌▋▊▉", ' '),
 
     /** Use only ASCII characters to draw the progress bar. */
-    ASCII("\r", "[", "]", '=', ' ', ">");
+    ASCII("\r", "[", "", "]", '=', ' ', ">", ' ');
 
     String refreshPrompt;
     String leftBracket;
+    String delimitingSequence;
     String rightBracket;
     char block;
     char space;
     String fractionSymbols;
+    char rightSideFractionSymbol;
 
-    ProgressBarStyle(String refreshPrompt, String leftBracket, String rightBracket, char block, char space, String fractionSymbols) {
+    ProgressBarStyle(String refreshPrompt, String leftBracket, String delimitingSequence, String rightBracket, char block, char space, String fractionSymbols, char rightSideFractionSymbol) {
         this.refreshPrompt = refreshPrompt;
         this.leftBracket = leftBracket;
+        this.delimitingSequence = delimitingSequence;
         this.rightBracket = rightBracket;
         this.block = block;
         this.space = space;
         this.fractionSymbols = fractionSymbols;
+        this.rightSideFractionSymbol = rightSideFractionSymbol;
     }
 
 }

src/test/java/me/tongfei/progressbar/ProgressBarTest.java

@@ -19,7 +19,7 @@ class ProgressBarTest {
     void test() {
         try (ProgressBar pb = new ProgressBarBuilder()
              .setTaskName("Test").setInitialMax(5).setUpdateIntervalMillis(50)
-             .setStyle(ProgressBarStyle.UNICODE_BLOCK).setUnit("K", 1024).build()) {
+             .setStyle(ProgressBarStyle.COLORFUL_UNICODE_BAR).setUnit("K", 1024).build()) {
 
             double x = 1.0;
             double y = x * x;