Move files to relevant packages, add support for dynamically setting and getting BufferTextInputLayout properties

Author: hitherejoe

buffertextinputlayout/src/main/java/org/buffer/android/buffertextinputlayout/BufferTextInputLayout.java

@@ -69,7 +69,9 @@
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
+import org.buffer.android.buffertextinputlayout.animator.ValueAnimatorCompat;
 import org.buffer.android.buffertextinputlayout.util.AnimationUtils;
+import org.buffer.android.buffertextinputlayout.util.CollapsingTextHelper;
 import org.buffer.android.buffertextinputlayout.util.DrawableUtils;
 import org.buffer.android.buffertextinputlayout.util.ThemeUtils;
 import org.buffer.android.buffertextinputlayout.util.ViewGroupUtils;
@@ -138,7 +140,7 @@ public class BufferTextInputLayout extends LinearLayout {
     private boolean counterVisible;
 
     private int charactersRemainingUntilCounterDisplay;
-    private TextInputType textInputType;
+    private CounterMode counterMode;
 
     public BufferTextInputLayout(Context context) {
         this(context, null);
@@ -192,7 +194,7 @@ public BufferTextInputLayout(Context context, AttributeSet attrs, int defStyleAt
         counterVisible = counterEnabled;
 
         int type = a.getInt(R.styleable.BufferTextInputLayout_textInputMode, 2);
-        textInputType = TextInputType.fromId(type);
+        counterMode = CounterMode.fromId(type);
 
         charactersRemainingUntilCounterDisplay = a.getInt(
                 R.styleable.BufferTextInputLayout_displayFromCount, getCounterMaxLength());
@@ -232,7 +234,32 @@ public void addView(View child, int index, final ViewGroup.LayoutParams params)
      */
     public void setCharactersRemainingUntilCounterDisplay(int remainingCharacters) {
         charactersRemainingUntilCounterDisplay = remainingCharacters;
-        updateLabelState(true);
+        setCounterVisible(counterVisible && editText.getText().length() >=
+                (getCounterMaxLength() - charactersRemainingUntilCounterDisplay));
+    }
+
+    /**
+     * Retrieve the value set for characters remaining until the counter is displayed
+     * @return  int the value set for remaining characters until the counter is displayed
+     */
+    public int getCharactersRemainingUntilCounterDisplay() {
+        return charactersRemainingUntilCounterDisplay;
+    }
+
+    /**
+     * Set the counter mode to be used when formatting the display of the text input counter.
+     */
+    public void setCounterMode(CounterMode counterMode) {
+        this.counterMode = counterMode;
+        setCounterText(editText.getText().length());
+    }
+
+    /**
+     * Retrieve the current counter mode set for the BufferTextInputLayout
+     * @return CounterMode the counter mode currently set
+     */
+    public CounterMode getCounterMode() {
+        return counterMode;
     }
 
     /**
@@ -278,8 +305,8 @@ private void setEditText(EditText editText) {
         this.editText.addTextChangedListener(new TextWatcher() {
             @Override
             public void afterTextChanged(Editable s) {
-                setCounterVisible(counterVisible &&
-                        s.length() >= (getCounterMaxLength() - charactersRemainingUntilCounterDisplay));
+                setCounterVisible(counterVisible && s.length() >=
+                        (getCounterMaxLength() - charactersRemainingUntilCounterDisplay));
                 updateLabelState(true);
                 if (counterEnabled) {
                     updateCounter(s.length());
@@ -750,7 +777,7 @@ void updateCounter(int length) {
 
     void setCounterText(int length) {
         String text;
-        switch (textInputType) {
+        switch (counterMode) {
             case DESCENDING:
                 text = String.valueOf(counterMaxLength - length);
                 break;

…buffertextinputlayout/TextInputType.java …d/buffertextinputlayout/CounterMode.javabuffertextinputlayout/src/main/java/org/buffer/android/buffertextinputlayout/TextInputType.java renamed to buffertextinputlayout/src/main/java/org/buffer/android/buffertextinputlayout/CounterMode.java buffertextinputlayout/src/main/java/org/buffer/android/buffertextinputlayout/TextInputType.java renamed to buffertextinputlayout/src/main/java/org/buffer/android/buffertextinputlayout/CounterMode.java

@@ -15,18 +15,18 @@
  */
 package org.buffer.android.buffertextinputlayout;
 
-public enum TextInputType {
+public enum CounterMode {
     DESCENDING(0), ASCENDING(1), STANDARD(2);
 
     int id;
 
-    TextInputType(int id) {
+    CounterMode(int id) {
         this.id = id;
     }
 
-    static TextInputType fromId(int id) {
-        for (TextInputType textInputType : values()) {
-            if (textInputType.id == id) return textInputType;
+    static CounterMode fromId(int id) {
+        for (CounterMode counterMode : values()) {
+            if (counterMode.id == id) return counterMode;
         }
         throw new IllegalArgumentException();
     }

…textinputlayout/ValueAnimatorCompat.java …layout/animator/ValueAnimatorCompat.javabuffertextinputlayout/src/main/java/org/buffer/android/buffertextinputlayout/ValueAnimatorCompat.java renamed to buffertextinputlayout/src/main/java/org/buffer/android/buffertextinputlayout/animator/ValueAnimatorCompat.java buffertextinputlayout/src/main/java/org/buffer/android/buffertextinputlayout/ValueAnimatorCompat.java renamed to buffertextinputlayout/src/main/java/org/buffer/android/buffertextinputlayout/animator/ValueAnimatorCompat.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.buffer.android.buffertextinputlayout;
+package org.buffer.android.buffertextinputlayout.animator;
 
 
 import android.support.annotation.NonNull;
@@ -26,7 +26,7 @@
  */
 public class ValueAnimatorCompat {
 
-    interface AnimatorUpdateListener {
+    public interface AnimatorUpdateListener {
         /**
          * <p>Notifies the occurrence of another frame of the animation.</p>
          *
@@ -67,15 +67,15 @@ public void start() {
         impl.start();
     }
 
-    boolean isRunning() {
+    public boolean isRunning() {
         return impl.isRunning();
     }
 
     public void setInterpolator(Interpolator interpolator) {
         impl.setInterpolator(interpolator);
     }
 
-    void addUpdateListener(final AnimatorUpdateListener updateListener) {
+    public void addUpdateListener(final AnimatorUpdateListener updateListener) {
         if (updateListener != null) {
             impl.addUpdateListener(new Impl.AnimatorUpdateListenerProxy() {
                 @Override
@@ -88,19 +88,19 @@ public void onAnimationUpdate() {
         }
     }
 
-    void setFloatValues(float from, float to) {
+    public void setFloatValues(float from, float to) {
         impl.setFloatValues(from, to);
     }
 
-    float getAnimatedFloatValue() {
+    public float getAnimatedFloatValue() {
         return impl.getAnimatedFloatValue();
     }
 
     public void setDuration(long duration) {
         impl.setDuration(duration);
     }
 
-    void cancel() {
+    public void cancel() {
         impl.cancel();
     }
 

…inputlayout/ValueAnimatorCompatImpl.java …ut/animator/ValueAnimatorCompatImpl.javabuffertextinputlayout/src/main/java/org/buffer/android/buffertextinputlayout/ValueAnimatorCompatImpl.java renamed to buffertextinputlayout/src/main/java/org/buffer/android/buffertextinputlayout/animator/ValueAnimatorCompatImpl.java buffertextinputlayout/src/main/java/org/buffer/android/buffertextinputlayout/ValueAnimatorCompatImpl.java renamed to buffertextinputlayout/src/main/java/org/buffer/android/buffertextinputlayout/animator/ValueAnimatorCompatImpl.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.buffer.android.buffertextinputlayout;
+package org.buffer.android.buffertextinputlayout.animator;
 
 import android.animation.ValueAnimator;
 import android.view.animation.Interpolator;