From 0cbb97502833658703a539968f516bbf030e6c95 Mon Sep 17 00:00:00 2001
From: John Carlson <jawnnypoo@gmail.com>
Date: Sun, 6 Nov 2016 21:00:34 -0600
Subject: [PATCH] Add more of the Kotlin extensions

---
 README.md                                     |  17 ++
 app/src/main/AndroidManifest.xml              |   3 +-
 .../commit451/easel/sample/MainActivity.java  |  21 +-
 app/src/main/res/layout/activity_main.xml     |   5 -
 .../java/com/commit451/easel/kotlin/easel.kt  |  20 +-
 .../main/java/com/commit451/easel/Easel.java  | 233 +++++++++---------
 6 files changed, 152 insertions(+), 147 deletions(-)

diff --git a/README.md b/README.md
index 2e1aa3f..28a7af0 100644
--- a/README.md
+++ b/README.md
@@ -32,6 +32,23 @@ If you are using Kotlin, extensions methods make it even easier:
 checkbox.tint(color)
 ```
 
+# Currently Supported Views
+Currently, you can tint the following views at run time:
+- Button
+- Checkbox
+- EditText
+- ProgressBar
+- RadioButton
+- SeekBar
+- SwitchCompat
+
+In addition, you can also tint other things which are somewhat difficult to tint in Android, such as:
+- Drawable
+- EditText cursor
+- MenuItem
+- Toolbar overflow
+- View Edget effect (on scroll)
+
 # Thanks
 Props to the project [Material Dialogs](https://github.com/afollestad/material-dialogs/blob/master/core/src/main/java/com/afollestad/materialdialogs/internal/MDTintHelper.java) where a lot of the tinting code came from.
 
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 1592add..ca3ed18 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -9,7 +9,8 @@
         android:theme="@style/AppTheme">
         <activity
             android:name=".MainActivity"
-            android:label="@string/app_name">
+            android:label="@string/app_name"
+            android:windowSoftInputMode="stateHidden">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
diff --git a/app/src/main/java/com/commit451/easel/sample/MainActivity.java b/app/src/main/java/com/commit451/easel/sample/MainActivity.java
index 1ddf07c..d8a9bc1 100644
--- a/app/src/main/java/com/commit451/easel/sample/MainActivity.java
+++ b/app/src/main/java/com/commit451/easel/sample/MainActivity.java
@@ -2,13 +2,11 @@
 
 import android.content.Intent;
 import android.graphics.Color;
-import android.os.Build;
 import android.os.Bundle;
 import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.SwitchCompat;
 import android.support.v7.widget.Toolbar;
 import android.view.View;
-import android.view.ViewTreeObserver;
 import android.widget.Button;
 import android.widget.CheckBox;
 import android.widget.EditText;
@@ -30,19 +28,11 @@ protected void onCreate(Bundle savedInstanceState) {
         toolbar.setTitle("Easel");
         toolbar.inflateMenu(R.menu.menu_main);
         Easel.tint(toolbar.getMenu(), Color.MAGENTA);
+        Easel.tintOverflow(toolbar, Color.MAGENTA);
 
         ScrollView scrollView = (ScrollView) findViewById(R.id.scrollview);
         Easel.tintEdgeEffect(scrollView, Color.MAGENTA);
 
-        final ViewTreeObserver viewTreeObserver = getWindow().getDecorView().getViewTreeObserver();
-        viewTreeObserver.addOnGlobalLayoutListener(new ViewTreeObserver.OnGlobalLayoutListener() {
-            @Override
-            public void onGlobalLayout() {
-                Easel.tintOverflow(toolbar, Color.MAGENTA);
-                removeOnGlobalLayoutListener(getWindow().getDecorView(), this);
-            }
-        });
-
         EditText editText = (EditText) findViewById(R.id.editText);
         RadioButton radioButton = (RadioButton) findViewById(R.id.radioButton);
         CheckBox checkBox = (CheckBox) findViewById(R.id.checkBox);
@@ -64,13 +54,4 @@ public void onClick(View view) {
             }
         });
     }
-
-    public void removeOnGlobalLayoutListener(View v, ViewTreeObserver.OnGlobalLayoutListener listener) {
-        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.JELLY_BEAN) {
-            v.getViewTreeObserver().removeGlobalOnLayoutListener(listener);
-        }
-        else {
-            v.getViewTreeObserver().removeOnGlobalLayoutListener(listener);
-        }
-    }
 }
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 54804ec..57ffd54 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -62,11 +62,6 @@
                 android:layout_height="wrap_content"
                 android:text="New Button" />
 
-            <Button
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="New Button" />
-
             <Button
                 android:id="@+id/button_kotlin"
                 android:layout_width="wrap_content"
diff --git a/easel-kotlin/src/main/java/com/commit451/easel/kotlin/easel.kt b/easel-kotlin/src/main/java/com/commit451/easel/kotlin/easel.kt
index 2534ea0..1472f05 100644
--- a/easel-kotlin/src/main/java/com/commit451/easel/kotlin/easel.kt
+++ b/easel-kotlin/src/main/java/com/commit451/easel/kotlin/easel.kt
@@ -1,9 +1,12 @@
 package com.commit451.easel.kotlin
 
+import android.annotation.TargetApi
 import android.support.annotation.ColorInt
 import android.support.v7.widget.SwitchCompat
+import android.support.v7.widget.Toolbar
 import android.view.Menu
 import android.view.MenuItem
+import android.view.View
 import android.widget.*
 import com.commit451.easel.Easel
 import com.commit451.easel.R
@@ -12,10 +15,6 @@ import com.commit451.easel.R
  * Kotlin bindings for Easel
  */
 
-fun EditText.tintCursor(@ColorInt color: Int) {
-    Easel.tintCursor(this, color)
-}
-
 fun EditText.tint(@ColorInt color : Int) {
     Easel.tint(this, color)
 }
@@ -52,4 +51,17 @@ fun SeekBar.tint(@ColorInt color : Int) {
     Easel.tint(this, color)
 }
 
+fun Toolbar.tintOverflow(@ColorInt color : Int) {
+    Easel.tintOverflow(this, color)
+}
+
+fun EditText.tintCursor(@ColorInt color: Int) {
+    Easel.tintCursor(this, color)
+}
+
+@TargetApi(21)
+fun View.tintEdgeEffect(@ColorInt color :Int) {
+    Easel.tintEdgeEffect(this, color)
+}
+
 
diff --git a/easel/src/main/java/com/commit451/easel/Easel.java b/easel/src/main/java/com/commit451/easel/Easel.java
index 15bb9ca..5f6429e 100644
--- a/easel/src/main/java/com/commit451/easel/Easel.java
+++ b/easel/src/main/java/com/commit451/easel/Easel.java
@@ -41,31 +41,6 @@
  */
 public class Easel {
 
-    /**
-     * Simplified way of getting a drawable and tinting it to a certain color
-     *
-     * @param context context
-     * @param resId   the drawable resource ID
-     * @param color   the color to tint the drawable to
-     * @return the tinted drawable
-     */
-    public static Drawable tint(Context context, @DrawableRes int resId, @ColorInt int color) {
-        return tint(ContextCompat.getDrawable(context, resId), color);
-    }
-
-    /**
-     * Simplified way of tinting a drawable to a certain color
-     *
-     * @param drawable the drawable to tint
-     * @param color    the color to tint the drawable to
-     * @return the tinted drawable
-     */
-    public static Drawable tint(Drawable drawable, @ColorInt int color) {
-        drawable = DrawableCompat.wrap(drawable);
-        DrawableCompat.setTint(drawable, color);
-        return drawable;
-    }
-
     /**
      * Get a darker version of the specified color (10% darker)
      *
@@ -137,26 +112,94 @@ public static boolean isColorDark(@ColorInt int color) {
         return darkness >= 0.5;
     }
 
-    public static void tint(@NonNull SwitchCompat switchCompat, @ColorInt int color) {
-        tint(switchCompat, color, getThemeAttrColor(switchCompat.getContext(), R.attr.colorSwitchThumbNormal));
+    /**
+     * Simplified way of getting a drawable and tinting it to a certain color
+     *
+     * @param context context
+     * @param resId   the drawable resource ID
+     * @param color   the color to tint the drawable to
+     * @return the tinted drawable
+     */
+    public static Drawable tint(Context context, @DrawableRes int resId, @ColorInt int color) {
+        return tint(ContextCompat.getDrawable(context, resId), color);
     }
 
-    public static void tint(@NonNull SwitchCompat switchCompat, @ColorInt int color, @ColorInt int unpressedColor) {
+    /**
+     * Simplified way of tinting a drawable to a certain color
+     *
+     * @param drawable the drawable to tint
+     * @param color    the color to tint the drawable to
+     * @return the tinted drawable
+     */
+    public static Drawable tint(Drawable drawable, @ColorInt int color) {
+        drawable = DrawableCompat.wrap(drawable);
+        DrawableCompat.setTint(drawable, color);
+        return drawable;
+    }
+
+    /**
+     * Tint the button
+     *
+     * @param button the button
+     * @param color  the color
+     */
+    public static void tint(@NonNull Button button, @ColorInt int color) {
         ColorStateList sl = new ColorStateList(new int[][]{
-                new int[]{-android.R.attr.state_checked},
-                new int[]{android.R.attr.state_checked}
+                new int[]{}
         }, new int[]{
-                unpressedColor,
                 color
         });
+        ViewCompat.setBackgroundTintList(button, sl);
+    }
 
-        DrawableCompat.setTintList(switchCompat.getThumbDrawable(), sl);
-        DrawableCompat.setTintList(switchCompat.getTrackDrawable(), createSwitchTrackColorStateList(switchCompat.getContext(), color));
+    /**
+     * Tint the checkbox
+     *
+     * @param checkBox the checkbox
+     * @param color    the color
+     */
+    public static void tint(@NonNull CheckBox checkBox, @ColorInt int color) {
+        final int disabledColor = getDisabledColor(checkBox.getContext());
+        ColorStateList sl = new ColorStateList(new int[][]{
+                new int[]{android.R.attr.state_enabled, -android.R.attr.state_checked},
+                new int[]{android.R.attr.state_enabled, android.R.attr.state_checked},
+                new int[]{-android.R.attr.state_enabled, -android.R.attr.state_checked},
+                new int[]{-android.R.attr.state_enabled, android.R.attr.state_checked}
+        }, new int[]{
+                getThemeAttrColor(checkBox.getContext(), R.attr.colorControlNormal),
+                color,
+                disabledColor,
+                disabledColor
+        });
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+            checkBox.setButtonTintList(sl);
+        } else {
+            Drawable checkDrawable = ContextCompat.getDrawable(checkBox.getContext(), R.drawable.abc_btn_check_material);
+            Drawable drawable = DrawableCompat.wrap(checkDrawable);
+            DrawableCompat.setTintList(drawable, sl);
+            checkBox.setButtonDrawable(drawable);
+        }
+    }
+
+    /**
+     * Tint the edit text
+     *
+     * @param editText the edit text
+     * @param color    the color
+     */
+    public static void tint(@NonNull EditText editText, @ColorInt int color) {
+        ColorStateList editTextColorStateList = createEditTextColorStateList(editText.getContext(), color);
+        if (editText instanceof AppCompatEditText) {
+            ((AppCompatEditText) editText).setSupportBackgroundTintList(editTextColorStateList);
+        } else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+            editText.setBackgroundTintList(editTextColorStateList);
+        }
+        tintCursor(editText, color);
     }
 
     /**
      * Tint all menu items within a menu to be a certain color. Note that this does not tint the
-     * overflow menu. Call {@link #tintOverflow(Toolbar, int)} for that
+     * overflow menu. Call {@link #tintOverflow(Toolbar, int)} for that.
      *
      * @param menu  the menu
      * @param color the color
@@ -185,6 +228,35 @@ public static void tint(@NonNull MenuItem menuItem, @ColorInt int color) {
         }
     }
 
+    /**
+     * Tint the progressbar
+     *
+     * @param progressBar the progress bar
+     * @param color       the color
+     */
+    public static void tint(@NonNull ProgressBar progressBar, @ColorInt int color) {
+        tint(progressBar, color, false);
+    }
+
+    public static void tint(@NonNull ProgressBar progressBar, @ColorInt int color, boolean skipIndeterminate) {
+        ColorStateList sl = ColorStateList.valueOf(color);
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+            progressBar.setProgressTintList(sl);
+            progressBar.setSecondaryProgressTintList(sl);
+            if (!skipIndeterminate)
+                progressBar.setIndeterminateTintList(sl);
+        } else {
+            PorterDuff.Mode mode = PorterDuff.Mode.SRC_IN;
+            if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.GINGERBREAD_MR1) {
+                mode = PorterDuff.Mode.MULTIPLY;
+            }
+            if (!skipIndeterminate && progressBar.getIndeterminateDrawable() != null)
+                progressBar.getIndeterminateDrawable().setColorFilter(color, mode);
+            if (progressBar.getProgressDrawable() != null)
+                progressBar.getProgressDrawable().setColorFilter(color, mode);
+        }
+    }
+
     /**
      * Tint the radio button
      *
@@ -246,93 +318,21 @@ public static void tint(@NonNull SeekBar seekBar, @ColorInt int color) {
         }
     }
 
-    /**
-     * Tint the progressbar
-     *
-     * @param progressBar the progress bar
-     * @param color       the color
-     */
-    public static void tint(@NonNull ProgressBar progressBar, @ColorInt int color) {
-        tint(progressBar, color, false);
-    }
-
-    public static void tint(@NonNull ProgressBar progressBar, @ColorInt int color, boolean skipIndeterminate) {
-        ColorStateList sl = ColorStateList.valueOf(color);
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-            progressBar.setProgressTintList(sl);
-            progressBar.setSecondaryProgressTintList(sl);
-            if (!skipIndeterminate)
-                progressBar.setIndeterminateTintList(sl);
-        } else {
-            PorterDuff.Mode mode = PorterDuff.Mode.SRC_IN;
-            if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.GINGERBREAD_MR1) {
-                mode = PorterDuff.Mode.MULTIPLY;
-            }
-            if (!skipIndeterminate && progressBar.getIndeterminateDrawable() != null)
-                progressBar.getIndeterminateDrawable().setColorFilter(color, mode);
-            if (progressBar.getProgressDrawable() != null)
-                progressBar.getProgressDrawable().setColorFilter(color, mode);
-        }
-    }
-
-    /**
-     * Tint the edit text
-     *
-     * @param editText the edit text
-     * @param color    the color
-     */
-    public static void tint(@NonNull EditText editText, @ColorInt int color) {
-        ColorStateList editTextColorStateList = createEditTextColorStateList(editText.getContext(), color);
-        if (editText instanceof AppCompatEditText) {
-            ((AppCompatEditText) editText).setSupportBackgroundTintList(editTextColorStateList);
-        } else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-            editText.setBackgroundTintList(editTextColorStateList);
-        }
-        tintCursor(editText, color);
-    }
-
-    /**
-     * Tint the checkbox
-     *
-     * @param checkBox the checkbox
-     * @param color    the color
-     */
-    public static void tint(@NonNull CheckBox checkBox, @ColorInt int color) {
-        final int disabledColor = getDisabledColor(checkBox.getContext());
-        ColorStateList sl = new ColorStateList(new int[][]{
-                new int[]{android.R.attr.state_enabled, -android.R.attr.state_checked},
-                new int[]{android.R.attr.state_enabled, android.R.attr.state_checked},
-                new int[]{-android.R.attr.state_enabled, -android.R.attr.state_checked},
-                new int[]{-android.R.attr.state_enabled, android.R.attr.state_checked}
-        }, new int[]{
-                getThemeAttrColor(checkBox.getContext(), R.attr.colorControlNormal),
-                color,
-                disabledColor,
-                disabledColor
-        });
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-            checkBox.setButtonTintList(sl);
-        } else {
-            Drawable checkDrawable = ContextCompat.getDrawable(checkBox.getContext(), R.drawable.abc_btn_check_material);
-            Drawable drawable = DrawableCompat.wrap(checkDrawable);
-            DrawableCompat.setTintList(drawable, sl);
-            checkBox.setButtonDrawable(drawable);
-        }
+    public static void tint(@NonNull SwitchCompat switchCompat, @ColorInt int color) {
+        tint(switchCompat, color, getThemeAttrColor(switchCompat.getContext(), R.attr.colorSwitchThumbNormal));
     }
 
-    /**
-     * Tint the button
-     *
-     * @param button the button
-     * @param color  the color
-     */
-    public static void tint(@NonNull Button button, @ColorInt int color) {
+    public static void tint(@NonNull SwitchCompat switchCompat, @ColorInt int color, @ColorInt int unpressedColor) {
         ColorStateList sl = new ColorStateList(new int[][]{
-                new int[]{}
+                new int[]{-android.R.attr.state_checked},
+                new int[]{android.R.attr.state_checked}
         }, new int[]{
+                unpressedColor,
                 color
         });
-        ViewCompat.setBackgroundTintList(button, sl);
+
+        DrawableCompat.setTintList(switchCompat.getThumbDrawable(), sl);
+        DrawableCompat.setTintList(switchCompat.getTrackDrawable(), createSwitchTrackColorStateList(switchCompat.getContext(), color));
     }
 
     /**
@@ -367,8 +367,7 @@ public static boolean tintCursor(@NonNull EditText editText, @ColorInt int color
     }
 
     /**
-     * Sets the color of the overflow menu item. You most likely need to use a {@link android.view.ViewTreeObserver.OnGlobalLayoutListener} with this to make it work since
-     * the color cannot be applied until the overflow icon exists
+     * Sets the color of the overflow menu item within the Toolbar.
      *
      * @param toolbar the toolbar
      * @param color   color to set the overflow icon to