From ad2ecf54cd4ed29bedf01df4ba3efcfe5a19d422 Mon Sep 17 00:00:00 2001
From: NekoInverter <7741672-NekoInverter@users.noreply.gitlab.com>
Date: Fri, 1 Jan 2021 17:05:24 +0800
Subject: [PATCH] Make avatar in drawer rounded

---
 app/src/main/java/com/hippo/widget/FixedAspectImageView.java | 5 ++---
 app/src/main/res/layout/nav_header_main.xml                  | 3 ++-
 app/src/main/res/values/styles.xml                           | 4 ++++
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/com/hippo/widget/FixedAspectImageView.java b/app/src/main/java/com/hippo/widget/FixedAspectImageView.java
index ed03b20e0..11ef888ee 100644
--- a/app/src/main/java/com/hippo/widget/FixedAspectImageView.java
+++ b/app/src/main/java/com/hippo/widget/FixedAspectImageView.java
@@ -22,12 +22,11 @@ import android.graphics.drawable.Drawable;
 import android.util.AttributeSet;
 import android.view.View;
 
-import androidx.appcompat.widget.AppCompatImageView;
-
+import com.google.android.material.imageview.ShapeableImageView;
 import com.hippo.ehviewer.R;
 import com.hippo.yorozuya.MathUtils;
 
-public class FixedAspectImageView extends AppCompatImageView {
+public class FixedAspectImageView extends ShapeableImageView {
 
     private static final int[] MIN_ATTRS = {
             android.R.attr.minWidth,
diff --git a/app/src/main/res/layout/nav_header_main.xml b/app/src/main/res/layout/nav_header_main.xml
index 1ecaaa662..50326c289 100644
--- a/app/src/main/res/layout/nav_header_main.xml
+++ b/app/src/main/res/layout/nav_header_main.xml
@@ -35,7 +35,8 @@
         android:layout_height="64dp"
         android:layout_gravity="bottom"
         android:layout_marginLeft="16dp"
-        android:layout_marginBottom="48dp" />
+        android:layout_marginBottom="48dp"
+        app:shapeAppearanceOverlay="@style/ShapeAppearanceOverlay.App.CornerSize50Percent" />
 
     <TextView
         android:id="@+id/display_name"
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 09d223b2d..c117c1bd9 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -113,4 +113,8 @@
         <item name="cardBackgroundColor">?attr/contentColorReactive</item>
     </style>
 
+    <style name="ShapeAppearanceOverlay.App.CornerSize50Percent" parent="">
+        <item name="cornerSize">50%</item>
+    </style>
+
 </resources>