Add borderless support for tint widgets

pranavpandey · Apr 22, 2021 · 9f30de8 · 9f30de8
1 parent e59e222
commit 9f30de8
Show file tree

Hide file tree

Showing 9 changed files with 154 additions and 63 deletions.
diff --git a/dynamic-support/src/main/java/com/pranavpandey/android/dynamic/support/Defaults.java b/dynamic-support/src/main/java/com/pranavpandey/android/dynamic/support/Defaults.java
@@ -282,10 +282,16 @@ public class Defaults {
 
     /**
      * Default borderless value for the widgets.
-     * <p>{@code true} if the widget is borderless.
+     * <p>{@code true} if the widget has borderless style.
      */
     public static final boolean ADS_STYLE_BORDERLESS = false;
 
+    /**
+     * Default borderless value for the group widgets.
+     * <p>{@code true} if the widget has borderless style.
+     */
+    public static final boolean ADS_STYLE_BORDERLESS_GROUP = true;
+
     /**
      * Default tint background value for the widgets.
      * <p>{@code true} to enable the background tinting.

diff --git a/...-support/src/main/java/com/pranavpandey/android/dynamic/support/widget/DynamicButton.java b/...-support/src/main/java/com/pranavpandey/android/dynamic/support/widget/DynamicButton.java
@@ -88,14 +88,14 @@ public class DynamicButton extends MaterialButton implements DynamicWidget,
     private @Theme.BackgroundAware int mBackgroundAware;
 
     /**
-     * {@code true} if style applied to this view is borderless.
+     * {@code true} to tint background according to the widget color.
      */
-    private boolean mStyleBorderless;
+    private boolean mTintBackground;
 
     /**
-     * {@code true} to tint background according to the widget color.
+     * {@code true} if the style applied to this view is borderless.
      */
-    private boolean mTintBackground;
+    private boolean mStyleBorderless;
 
     public DynamicButton(@NonNull Context context) {
         this(context, null);
@@ -114,25 +114,6 @@ public DynamicButton(@NonNull Context context,
         loadFromAttributes(attrs);
     }
 
-    /**
-     * @return {@code true} if style applied to this view is borderless.
-     */
-    public boolean isStyleBorderless() {
-        return mStyleBorderless;
-    }
-
-    /**
-     * Set the value of {@link #mStyleBorderless}.
-     *
-     * @param styleBorderless {@code true} if style applied to this view
-     *                        is borderless.
-     */
-    public void setStyleBorderless(boolean styleBorderless) {
-        this.mStyleBorderless = styleBorderless;
-
-        setColor();
-    }
-
     @Override
     public void loadFromAttributes(@Nullable AttributeSet attrs) {
         TypedArray a = getContext().obtainStyledAttributes(attrs,
@@ -154,12 +135,12 @@ public void loadFromAttributes(@Nullable AttributeSet attrs) {
             mBackgroundAware = a.getInteger(
                     R.styleable.DynamicButton_ads_backgroundAware,
                     Defaults.getBackgroundAware());
-            mStyleBorderless = a.getBoolean(
-                    R.styleable.DynamicButton_ads_styleBorderless,
-                    Defaults.ADS_STYLE_BORDERLESS);
             mTintBackground = a.getBoolean(
                     R.styleable.DynamicButton_ads_tintBackground,
                     Defaults.ADS_TINT_BACKGROUND);
+            mStyleBorderless = a.getBoolean(
+                    R.styleable.DynamicButton_ads_styleBorderless,
+                    Defaults.ADS_STYLE_BORDERLESS);
         } finally {
             a.recycle();
         }
@@ -268,6 +249,18 @@ public void setTintBackground(boolean tintBackground) {
         setColor();
     }
 
+    @Override
+    public boolean isStyleBorderless() {
+        return mStyleBorderless;
+    }
+
+    @Override
+    public void setStyleBorderless(boolean styleBorderless) {
+        this.mStyleBorderless = styleBorderless;
+
+        setColor();
+    }
+
     @Override
     public void setEnabled(boolean enabled) {
         super.setEnabled(enabled);

diff --git a/...ort/src/main/java/com/pranavpandey/android/dynamic/support/widget/DynamicFrameLayout.java b/...ort/src/main/java/com/pranavpandey/android/dynamic/support/widget/DynamicFrameLayout.java
@@ -90,6 +90,11 @@ public class DynamicFrameLayout extends FrameLayout implements DynamicWidget, Dy
      */
     private boolean mTintBackground;
 
+    /**
+     * {@code true} if the style applied to this view is borderless.
+     */
+    private boolean mStyleBorderless;
+
     public DynamicFrameLayout(@NonNull Context context) {
         this(context, null);
     }
@@ -129,8 +134,11 @@ public void loadFromAttributes(@Nullable AttributeSet attrs) {
                     R.styleable.DynamicFrameLayout_ads_backgroundAware,
                     Defaults.getBackgroundAware());
             mTintBackground = a.getBoolean(
-                    R.styleable.DynamicImageButton_ads_tintBackground,
+                    R.styleable.DynamicFrameLayout_ads_tintBackground,
                     Defaults.ADS_TINT_BACKGROUND);
+            mStyleBorderless = a.getBoolean(
+                    R.styleable.DynamicFrameLayout_ads_styleBorderless,
+                    Defaults.ADS_STYLE_BORDERLESS_GROUP);
         } finally {
             a.recycle();
         }
@@ -273,6 +281,18 @@ public void setTintBackground(boolean tintBackground) {
         setColor();
     }
 
+    @Override
+    public boolean isStyleBorderless() {
+        return mStyleBorderless;
+    }
+
+    @Override
+    public void setStyleBorderless(boolean styleBorderless) {
+        this.mStyleBorderless = styleBorderless;
+
+        setColor();
+    }
+
     @Override
     public void setColor() {
         if (mColor != Theme.Color.UNKNOWN) {
@@ -289,7 +309,7 @@ public void setColor() {
         }
 
         if (isBackgroundAware() && isTintBackground()) {
-            Dynamic.tintBackground(this, mContrastWithColor);
+            Dynamic.tintBackground(this, mContrastWithColor, isStyleBorderless());
         }
     }
 }
diff --git a/...ort/src/main/java/com/pranavpandey/android/dynamic/support/widget/DynamicImageButton.java b/...ort/src/main/java/com/pranavpandey/android/dynamic/support/widget/DynamicImageButton.java
@@ -90,14 +90,14 @@ public class DynamicImageButton extends AppCompatImageButton
     private @Theme.BackgroundAware int mBackgroundAware;
 
     /**
-     * {@code true} if style applied to this view is borderless.
+     * {@code true} to tint background according to the widget color.
      */
-    private boolean mStyleBorderless;
+    private boolean mTintBackground;
 
     /**
-     * {@code true} to tint background according to the widget color.
+     * {@code true} if the style applied to this view is borderless.
      */
-    private boolean mTintBackground;
+    private boolean mStyleBorderless;
 
     public DynamicImageButton(@NonNull Context context) {
         this(context, null);
@@ -116,25 +116,6 @@ public DynamicImageButton(@NonNull Context context,
         loadFromAttributes(attrs);
     }
 
-    /**
-     * @return {@code true} if style applied to this view is borderless.
-     */
-    public boolean isStyleBorderless() {
-        return mStyleBorderless;
-    }
-
-    /**
-     * Set the value of {@link #mStyleBorderless}.
-     *
-     * @param styleBorderless {@code true} if style applied to this view
-     *                        is borderless.
-     */
-    public void setStyleBorderless(boolean styleBorderless) {
-        this.mStyleBorderless = styleBorderless;
-
-        setColor();
-    }
-
     @Override
     public void loadFromAttributes(@Nullable AttributeSet attrs) {
         TypedArray a = getContext().obtainStyledAttributes(attrs, 
@@ -156,12 +137,12 @@ public void loadFromAttributes(@Nullable AttributeSet attrs) {
             mBackgroundAware = a.getInteger(
                     R.styleable.DynamicImageButton_ads_backgroundAware,
                     Defaults.getBackgroundAware());
-            mStyleBorderless = a.getBoolean(
-                    R.styleable.DynamicImageButton_ads_styleBorderless,
-                    Defaults.ADS_STYLE_BORDERLESS);
             mTintBackground = a.getBoolean(
                     R.styleable.DynamicImageButton_ads_tintBackground,
                     Defaults.ADS_TINT_BACKGROUND);
+            mStyleBorderless = a.getBoolean(
+                    R.styleable.DynamicImageButton_ads_styleBorderless,
+                    Defaults.ADS_STYLE_BORDERLESS);
         } finally {
             a.recycle();
         }
@@ -290,6 +271,18 @@ public void setTintBackground(boolean tintBackground) {
         setColor();
     }
 
+    @Override
+    public boolean isStyleBorderless() {
+        return mStyleBorderless;
+    }
+
+    @Override
+    public void setStyleBorderless(boolean styleBorderless) {
+        this.mStyleBorderless = styleBorderless;
+
+        setColor();
+    }
+
     @SuppressLint("RestrictedApi")
     @Override
     public void setColor() {
@@ -308,7 +301,7 @@ public void setColor() {
         }
 
         if (isBackgroundAware() && isTintBackground()) {
-            Dynamic.tintBackground(this, mContrastWithColor, mStyleBorderless);
+            Dynamic.tintBackground(this, mContrastWithColor, isStyleBorderless());
         }
     }
 }
diff --git a/...pport/src/main/java/com/pranavpandey/android/dynamic/support/widget/DynamicImageView.java b/...pport/src/main/java/com/pranavpandey/android/dynamic/support/widget/DynamicImageView.java
@@ -91,6 +91,11 @@ public class DynamicImageView extends AppCompatImageView
      */
     private boolean mTintBackground;
 
+    /**
+     * {@code true} if the style applied to this view is borderless.
+     */
+    private boolean mStyleBorderless;
+
     public DynamicImageView(@NonNull Context context) {
         this(context, null);
     }
@@ -139,8 +144,11 @@ public void loadFromAttributes(@Nullable AttributeSet attrs) {
                     R.styleable.DynamicImageView_ads_backgroundAware,
                     Defaults.getBackgroundAware());
             mTintBackground = a.getBoolean(
-                    R.styleable.DynamicImageButton_ads_tintBackground,
+                    R.styleable.DynamicImageView_ads_tintBackground,
                     Defaults.ADS_TINT_BACKGROUND);
+            mStyleBorderless = a.getBoolean(
+                    R.styleable.DynamicImageView_ads_styleBorderless,
+                    Defaults.ADS_STYLE_BORDERLESS);
 
             if (mColorType == Theme.ColorType.NONE && mColor == Theme.Color.UNKNOWN) {
                 if (getId() == R.id.submenuarrow) {
@@ -289,6 +297,18 @@ public void setTintBackground(boolean tintBackground) {
         setColor();
     }
 
+    @Override
+    public boolean isStyleBorderless() {
+        return mStyleBorderless;
+    }
+
+    @Override
+    public void setStyleBorderless(boolean styleBorderless) {
+        this.mStyleBorderless = styleBorderless;
+
+        setColor();
+    }
+
     @Override
     public void setColor() {
         if (mColor != Theme.Color.UNKNOWN) {
@@ -309,7 +329,7 @@ public void setColor() {
         }
 
         if (isBackgroundAware() && isTintBackground()) {
-            Dynamic.tintBackground(this, mContrastWithColor);
+            Dynamic.tintBackground(this, mContrastWithColor, isStyleBorderless());
         }
     }
 }
diff --git a/...rt/src/main/java/com/pranavpandey/android/dynamic/support/widget/DynamicLinearLayout.java b/...rt/src/main/java/com/pranavpandey/android/dynamic/support/widget/DynamicLinearLayout.java
@@ -90,6 +90,11 @@ public class DynamicLinearLayout extends LinearLayout implements DynamicWidget,
      */
     private boolean mTintBackground;
 
+    /**
+     * {@code true} if the style applied to this view is borderless.
+     */
+    private boolean mStyleBorderless;
+
     public DynamicLinearLayout(@NonNull Context context) {
         this(context, null);
     }
@@ -131,6 +136,9 @@ public void loadFromAttributes(@Nullable AttributeSet attrs) {
             mTintBackground = a.getBoolean(
                     R.styleable.DynamicImageButton_ads_tintBackground,
                     Defaults.ADS_TINT_BACKGROUND);
+            mStyleBorderless = a.getBoolean(
+                    R.styleable.DynamicImageButton_ads_styleBorderless,
+                    Defaults.ADS_STYLE_BORDERLESS_GROUP);
         } finally {
             a.recycle();
         }
@@ -273,6 +281,18 @@ public void setTintBackground(boolean tintBackground) {
         setColor();
     }
 
+    @Override
+    public boolean isStyleBorderless() {
+        return mStyleBorderless;
+    }
+
+    @Override
+    public void setStyleBorderless(boolean styleBorderless) {
+        this.mStyleBorderless = styleBorderless;
+
+        setColor();
+    }
+
     @Override
     public void setColor() {
         if (mColor != Theme.Color.UNKNOWN) {
@@ -289,7 +309,7 @@ public void setColor() {
         }
 
         if (isBackgroundAware() && isTintBackground()) {
-            Dynamic.tintBackground(this, mContrastWithColor);
+            Dynamic.tintBackground(this, mContrastWithColor, isStyleBorderless());
         }
     }
 }
diff --git a/.../src/main/java/com/pranavpandey/android/dynamic/support/widget/DynamicRelativeLayout.java b/.../src/main/java/com/pranavpandey/android/dynamic/support/widget/DynamicRelativeLayout.java
@@ -91,6 +91,11 @@ public class DynamicRelativeLayout extends RelativeLayout
      */
     private boolean mTintBackground;
 
+    /**
+     * {@code true} if the style applied to this view is borderless.
+     */
+    private boolean mStyleBorderless;
+
     public DynamicRelativeLayout(@NonNull Context context) {
         this(context, null);
     }
@@ -130,8 +135,11 @@ public void loadFromAttributes(@Nullable AttributeSet attrs) {
                     R.styleable.DynamicRelativeLayout_ads_backgroundAware,
                     Defaults.getBackgroundAware());
             mTintBackground = a.getBoolean(
-                    R.styleable.DynamicImageButton_ads_tintBackground,
+                    R.styleable.DynamicRelativeLayout_ads_tintBackground,
                     Defaults.ADS_TINT_BACKGROUND);
+            mStyleBorderless = a.getBoolean(
+                    R.styleable.DynamicRelativeLayout_ads_styleBorderless,
+                    Defaults.ADS_STYLE_BORDERLESS_GROUP);
         } finally {
             a.recycle();
         }
@@ -274,6 +282,18 @@ public void setTintBackground(boolean tintBackground) {
         setColor();
     }
 
+    @Override
+    public boolean isStyleBorderless() {
+        return mStyleBorderless;
+    }
+
+    @Override
+    public void setStyleBorderless(boolean styleBorderless) {
+        this.mStyleBorderless = styleBorderless;
+
+        setColor();
+    }
+
     @Override
     public void setColor() {
         if (mColor != Theme.Color.UNKNOWN) {
@@ -290,7 +310,7 @@ public void setColor() {
         }
 
         if (isBackgroundAware() && isTintBackground()) {
-            Dynamic.tintBackground(this, mContrastWithColor);
+            Dynamic.tintBackground(this, mContrastWithColor, isStyleBorderless());
         }
     }
 }