Add corner support for navigation view

Disable corners by default for dynamic theme 2.

Author: pranavpandey

dynamic-support/src/main/java/com/pranavpandey/android/dynamic/support/Dynamic.java

@@ -82,6 +82,7 @@
 import com.pranavpandey.android.dynamic.support.widget.DynamicFloatingActionButton;
 import com.pranavpandey.android.dynamic.support.widget.DynamicMaterialCardView;
 import com.pranavpandey.android.dynamic.support.widget.DynamicNavigationRailView;
+import com.pranavpandey.android.dynamic.support.widget.DynamicNavigationView;
 import com.pranavpandey.android.dynamic.support.widget.DynamicTextInputLayout;
 import com.pranavpandey.android.dynamic.support.widget.base.DynamicBackgroundWidget;
 import com.pranavpandey.android.dynamic.support.widget.base.DynamicLinkWidget;
@@ -1561,6 +1562,7 @@ public static void setPreventCornerOverlap(@Nullable View view, boolean preventC
      * @param corner The corner to be set.
      *
      * @see DynamicButton#setCorner(Integer)
+     * @see DynamicNavigationView#setCorner(Float)
      * @see DynamicBottomNavigationView#setCorner(Float)
      * @see DynamicNavigationRailView#setCorner(Float)
      * @see DynamicFloatingActionButton#setCorner(Float)
@@ -1572,6 +1574,8 @@ public static void setPreventCornerOverlap(@Nullable View view, boolean preventC
     public static void setCorner(@Nullable View view, float corner) {
         if (view instanceof DynamicButton) {
             ((DynamicButton) view).setCorner((int) corner);
+        } else if (view instanceof DynamicNavigationView) {
+            ((DynamicNavigationView) view).setCorner((float) corner);
         } else if (view instanceof DynamicBottomNavigationView) {
             ((DynamicBottomNavigationView) view).setCorner((float) corner);
         } else if (view instanceof DynamicNavigationRailView) {
@@ -1600,6 +1604,12 @@ public static void setCorner(@Nullable View view, float corner) {
     public static void setCornerMin(@Nullable View view, float cornerMax) {
         if (view instanceof DynamicButton) {
             setCorner(view, Math.min(((DynamicButton) view).getCorner(), cornerMax));
+        } else if (view instanceof DynamicNavigationView) {
+            setCorner(view, Math.min(((DynamicNavigationView) view).getCorner(), cornerMax));
+        } else if (view instanceof DynamicNavigationRailView) {
+            setCorner(view, Math.min(((DynamicNavigationRailView) view).getCorner(), cornerMax));
+        } else if (view instanceof DynamicBottomNavigationView) {
+            setCorner(view, Math.min(((DynamicBottomNavigationView) view).getCorner(), cornerMax));
         } else if (view instanceof DynamicFloatingActionButton) {
             setCorner(view, Math.min(((DynamicFloatingActionButton) view).getCorner(), cornerMax));
         } else if (view instanceof DynamicCardView) {

dynamic-support/src/main/java/com/pranavpandey/android/dynamic/support/widget/DynamicNavigationView.java

@@ -43,6 +43,7 @@
 import com.pranavpandey.android.dynamic.support.util.DynamicShapeUtils;
 import com.pranavpandey.android.dynamic.support.util.DynamicTintUtils;
 import com.pranavpandey.android.dynamic.support.widget.base.DynamicBackgroundWidget;
+import com.pranavpandey.android.dynamic.support.widget.base.DynamicCornerWidget;
 import com.pranavpandey.android.dynamic.support.widget.base.DynamicScrollableWidget;
 import com.pranavpandey.android.dynamic.support.widget.base.DynamicStateSelectedWidget;
 import com.pranavpandey.android.dynamic.support.widget.base.WindowInsetsWidget;
@@ -57,8 +58,8 @@
  * A {@link NavigationView} to apply {@link DynamicTheme} according to the supplied parameters.
  */
 public class DynamicNavigationView extends NavigationView
-        implements WindowInsetsWidget, DynamicBackgroundWidget,
-        DynamicScrollableWidget, DynamicStateSelectedWidget {
+        implements WindowInsetsWidget, DynamicBackgroundWidget, DynamicScrollableWidget,
+        DynamicStateSelectedWidget, DynamicCornerWidget<Float> {
 
     /**
      * Color type applied to this view.
@@ -171,6 +172,11 @@ public class DynamicNavigationView extends NavigationView
      */
     protected int mContrast;
 
+    /**
+     * Corner size used by this view.
+     */
+    protected float mCornerSize;
+
     public DynamicNavigationView(@NonNull Context context) {
         this(context, null);
     }
@@ -239,7 +245,7 @@ public void loadFromAttributes(@Nullable AttributeSet attrs) {
 
             if (a.getBoolean(R.styleable.DynamicNavigationView_adt_dynamicCornerSize,
                     Defaults.ADS_DYNAMIC_CORNER_SIZE)) {
-                updateBackground();
+                setCorner((float) DynamicTheme.getInstance().get().getCornerRadius());
             }
 
             if (a.getBoolean(
@@ -254,31 +260,6 @@ public void loadFromAttributes(@Nullable AttributeSet attrs) {
         initialize();
     }
 
-    /**
-     * Update background according to the corner size.
-     */
-    private void updateBackground() {
-        if (getBackground() instanceof MaterialShapeDrawable) {
-            MaterialShapeDrawable drawable = (MaterialShapeDrawable) getBackground();
-            ShapeAppearanceModel.Builder builder =
-                    drawable.getShapeAppearanceModel().toBuilder();
-            float cornerSize = DynamicTheme.getInstance().get().getCornerRadius();
-
-            builder.setTopLeftCornerSize(Theme.Corner.MIN);
-            builder.setTopRightCornerSize(Theme.Corner.MIN);
-
-            if (drawable.getBottomLeftCornerResolvedSize() > 0) {
-                builder.setBottomLeftCornerSize(cornerSize);
-            }
-
-            if (drawable.getBottomRightCornerResolvedSize() > 0) {
-                builder.setBottomRightCornerSize(cornerSize);
-            }
-
-            drawable.setShapeAppearanceModel(builder.build());
-        }
-    }
-
     @Override
     public void initialize() {
         if (mBackgroundColorType != Theme.ColorType.NONE
@@ -611,7 +592,37 @@ public void setContrast(int contrast) {
     protected void onSizeChanged(int w, int h, int oldw, int oldh) {
         super.onSizeChanged(w, h, oldw, oldh);
 
-        updateBackground();
+        Dynamic.setCornerMin(this, Math.min(
+                getWidth() / Theme.Corner.FACTOR_MAX,
+                getHeight() / Theme.Corner.FACTOR_MAX));
+    }
+
+    @Override
+    public @NonNull Float getCorner() {
+        return mCornerSize;
+    }
+
+    @Override
+    public void setCorner(@NonNull Float cornerSize) {
+        this.mCornerSize = cornerSize;
+
+        if (getBackground() instanceof MaterialShapeDrawable) {
+            MaterialShapeDrawable drawable = (MaterialShapeDrawable) getBackground();
+            ShapeAppearanceModel.Builder builder = drawable.getShapeAppearanceModel().toBuilder();
+
+            builder.setTopLeftCornerSize(Theme.Corner.MIN);
+            builder.setTopRightCornerSize(Theme.Corner.MIN);
+
+            if (drawable.getBottomLeftCornerResolvedSize() > 0) {
+                builder.setBottomLeftCornerSize(cornerSize);
+            }
+
+            if (drawable.getBottomRightCornerResolvedSize() > 0) {
+                builder.setBottomRightCornerSize(cornerSize);
+            }
+
+            drawable.setShapeAppearanceModel(builder.build());
+        }
     }
 
     @Override

dynamic-support/src/main/res/values/dimens.xml

@@ -79,6 +79,7 @@
     <dimen name="ads_nav_header_spacing">@dimen/ads_margin_medium</dimen>
     <dimen name="ads_nav_header_spacing_top">@dimen/ads_margin_medium</dimen>
     <dimen name="ads_nav_header_height">160dp</dimen>
+    <dimen name="ads_nav_corner_size">0dp</dimen>
     <dimen name="ads_collapsing_toolbar_height">120dp</dimen>
     <dimen name="ads_fab_size">56dp</dimen>
     <dimen name="ads_fab_size_mini">40dp</dimen>

dynamic-support/src/main/res/values/styles_v2.xml

@@ -361,6 +361,7 @@
         <item name="android:textSize">@dimen/ads_font_size_navigation_view</item>
         <item name="itemBackground">@null</item>
         <item name="itemRippleColor">@null</item>
+        <item name="drawerLayoutCornerSize">@dimen/ads_nav_corner_size</item>
     </style>
     <style name="Widget.Dynamic2.NavigationView.ThemeOverlay"
         parent="ThemeOverlay.Material3.NavigationView">