Adding functionality of displayTimeUnits

rehmanmuradali · May 11, 2020 · b7669fe · b7669fe
1 parent 1ac21de
commit b7669fe
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
@@ -16,6 +16,7 @@
         app:m_arc_stroke_color="@android:color/white"
         app:m_circle_stroke_color="@color/colorPrimary"
         app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
         />
 
 

diff --git a/ticker/src/main/java/ticker/views/com/ticker/widgets/circular/timer/view/CircularView.java b/ticker/src/main/java/ticker/views/com/ticker/widgets/circular/timer/view/CircularView.java
@@ -76,6 +76,7 @@ public class CircularView extends AppCompatTextView {
 
     // Show Text or not
     private boolean shouldDisplayTimer = true;
+    private boolean shouldDisplayTimeUnit = true;
 
     //Timer Callback
     private CircularViewCallback circularViewCallback;
@@ -225,9 +226,14 @@ private void setTextOfTextViewWithSeconds(long value) {
             unit = "\nseconds";
         }
 
+        int highlightedTextLength = numberString.length();
+        if (shouldDisplayTimeUnit) {
+            numberString += unit;
+        }
+
         //To resize the text size according to length
-        SpannableString spannableString = new SpannableString(numberString + unit);
-        spannableString.setSpan(new RelativeSizeSpan(getTextProportion(numberString)), 0, numberString.length(), 0);
+        SpannableString spannableString = new SpannableString(numberString);
+        spannableString.setSpan(new RelativeSizeSpan(getTextProportion(numberString)), 0, highlightedTextLength, 0);
 
         if (shouldDisplayTimer) {
 
@@ -399,6 +405,7 @@ public void setOptions(OptionsBuilder optionBuilder) {
         this.circularViewCallback = optionBuilder.circularViewCallback;
         this.shouldDisplayTimer = optionBuilder.shouldDisplayTimer;
         this.customText = optionBuilder.customText;
+        this.shouldDisplayTimeUnit = optionBuilder.shouldDisplayTimeUnit;
         setTextOfTextViewWithSeconds(counterInSeconds);
     }
 
@@ -410,6 +417,7 @@ public static class OptionsBuilder {
         private boolean shouldDisplayTimer = true;
         private String customText = null;
         private long counterInSeconds = INFINITE;
+        private boolean shouldDisplayTimeUnit = true;
 
 
         public OptionsBuilder setCircularViewCallback(CircularViewCallback circularViewCallback) {
@@ -436,6 +444,11 @@ public OptionsBuilder setCounterInSeconds(long counterInSeconds) {
             return this;
         }
 
+        public OptionsBuilder shouldDisplayTimeUnit(boolean shouldDisplayTimeUnit) {
+            this.shouldDisplayTimeUnit = shouldDisplayTimeUnit;
+            return this;
+        }
+
 
     }