From 99e633d61a2e7f327601e4e046199d93594870ad Mon Sep 17 00:00:00 2001
From: Alexander Bakker <ab@alexbakker.me>
Date: Mon, 26 Aug 2024 22:02:30 +0200
Subject: [PATCH] Replace CircleImageView with ShapeableImageView

---
 app/build.gradle                              |  1 -
 .../aegis/ui/EditEntryActivity.java           |  5 ++--
 .../main/res/layout/activity_edit_entry.xml   |  5 ++--
 .../res/layout/card_assign_icon_entry.xml     | 10 ++++----
 app/src/main/res/layout/card_entry.xml        | 10 ++++----
 .../main/res/layout/card_entry_compact.xml    | 10 ++++----
 app/src/main/res/layout/card_entry_small.xml  | 10 ++++----
 app/src/main/res/layout/card_entry_tile.xml   | 10 ++++----
 app/src/main/res/raw/aboutlibraries.json      | 23 -------------------
 app/src/main/res/values/themes.xml            |  5 ++++
 10 files changed, 40 insertions(+), 49 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 10cdded439..deff5c203d 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -189,7 +189,6 @@ dependencies {
     }
     implementation 'com.mikepenz:aboutlibraries-core-android:11.2.2'
     implementation 'com.nulab-inc:zxcvbn:1.9.0'
-    implementation 'de.hdodenhof:circleimageview:3.1.0'
     implementation 'net.lingala.zip4j:zip4j:2.11.5'
     implementation 'org.bouncycastle:bcprov-jdk18on:1.78.1'
     implementation 'org.simpleflatmapper:sfm-csv:8.2.3'
diff --git a/app/src/main/java/com/beemdevelopment/aegis/ui/EditEntryActivity.java b/app/src/main/java/com/beemdevelopment/aegis/ui/EditEntryActivity.java
index 45755b8297..68f3db7a42 100644
--- a/app/src/main/java/com/beemdevelopment/aegis/ui/EditEntryActivity.java
+++ b/app/src/main/java/com/beemdevelopment/aegis/ui/EditEntryActivity.java
@@ -71,6 +71,7 @@
 import com.google.android.material.chip.Chip;
 import com.google.android.material.chip.ChipGroup;
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
+import com.google.android.material.imageview.ShapeableImageView;
 import com.google.android.material.textfield.TextInputEditText;
 import com.google.android.material.textfield.TextInputLayout;
 
@@ -92,8 +93,6 @@
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.stream.Collectors;
 
-import de.hdodenhof.circleimageview.CircleImageView;
-
 public class EditEntryActivity extends AegisActivity {
     private boolean _isNew = false;
     private boolean _isManual = false;
@@ -103,7 +102,7 @@ public class EditEntryActivity extends AegisActivity {
     // keep track of icon changes separately as the generated jpeg's are not deterministic
     private boolean _hasChangedIcon = false;
     private IconPack.Icon _selectedIcon;
-    private CircleImageView _iconView;
+    private ShapeableImageView _iconView;
     private ImageView _saveImageButton;
 
     private TextInputEditText _textName;
diff --git a/app/src/main/res/layout/activity_edit_entry.xml b/app/src/main/res/layout/activity_edit_entry.xml
index f89c1275c7..6a63c26b0f 100644
--- a/app/src/main/res/layout/activity_edit_entry.xml
+++ b/app/src/main/res/layout/activity_edit_entry.xml
@@ -37,12 +37,13 @@
                     android:layout_width="match_parent"
                     android:layout_height="250dp">
 
-                    <de.hdodenhof.circleimageview.CircleImageView
+                    <com.google.android.material.imageview.ShapeableImageView
                         android:id="@+id/profile_drawable"
                         android:layout_width="100dp"
                         android:layout_height="100dp"
                         android:layout_centerHorizontal="true"
-                        android:layout_centerVertical="true" />
+                        android:layout_centerVertical="true"
+                        app:shapeAppearanceOverlay="@style/ShapeAppearanceOverlay.Aegis.ImageView.Circle" />
 
                     <com.avito.android.krop.KropView
                         android:id="@+id/krop_view"
diff --git a/app/src/main/res/layout/card_assign_icon_entry.xml b/app/src/main/res/layout/card_assign_icon_entry.xml
index 06c2cc9259..fdc5d81aac 100644
--- a/app/src/main/res/layout/card_assign_icon_entry.xml
+++ b/app/src/main/res/layout/card_assign_icon_entry.xml
@@ -47,11 +47,12 @@
             android:layout_height="wrap_content"
             android:orientation="horizontal">
 
-            <de.hdodenhof.circleimageview.CircleImageView
+            <com.google.android.material.imageview.ShapeableImageView
                 android:id="@+id/ivOldImage"
                 android:layout_width="60dp"
                 android:layout_height="60dp"
-                android:layout_gravity="center_vertical" />
+                android:layout_gravity="center_vertical"
+                app:shapeAppearanceOverlay="@style/ShapeAppearanceOverlay.Aegis.ImageView.Circle" />
 
             <ImageView
                 android:layout_width="32dp"
@@ -62,11 +63,12 @@
                 android:layout_marginEnd="15dp"
                 android:layout_gravity="center_vertical"/>
 
-            <de.hdodenhof.circleimageview.CircleImageView
+            <com.google.android.material.imageview.ShapeableImageView
                 android:id="@+id/ivNewImage"
                 android:layout_width="60dp"
                 android:layout_height="60dp"
-                android:layout_gravity="center_vertical" />
+                android:layout_gravity="center_vertical"
+                app:shapeAppearanceOverlay="@style/ShapeAppearanceOverlay.Aegis.ImageView.Circle" />
 
             <View
                 android:layout_width="0dp"
diff --git a/app/src/main/res/layout/card_entry.xml b/app/src/main/res/layout/card_entry.xml
index 734cc1835b..47b0533084 100644
--- a/app/src/main/res/layout/card_entry.xml
+++ b/app/src/main/res/layout/card_entry.xml
@@ -34,14 +34,15 @@
             android:layout_height="match_parent"
             android:paddingStart="14dp">
 
-            <de.hdodenhof.circleimageview.CircleImageView
+            <com.google.android.material.imageview.ShapeableImageView
                 android:id="@+id/ivTextDrawable"
                 android:layout_width="60dp"
                 android:layout_height="60dp"
                 android:layout_centerVertical="true"
-                android:layout_alignParentStart="true" />
+                android:layout_alignParentStart="true"
+                app:shapeAppearanceOverlay="@style/ShapeAppearanceOverlay.Aegis.ImageView.Circle" />
 
-            <de.hdodenhof.circleimageview.CircleImageView
+            <com.google.android.material.imageview.ShapeableImageView
                 android:id="@+id/ivSelected"
                 android:layout_width="60dp"
                 android:layout_height="60dp"
@@ -49,7 +50,8 @@
                 android:layout_centerVertical="true"
                 android:src="@drawable/item_selected"
                 android:visibility="gone"
-                app:civ_circle_background_color="?attr/colorPrimaryAlternative" />
+                android:background="?attr/colorPrimaryAlternative"
+                app:shapeAppearanceOverlay="@style/ShapeAppearanceOverlay.Aegis.ImageView.Circle" />
         </RelativeLayout>
 
         <RelativeLayout
diff --git a/app/src/main/res/layout/card_entry_compact.xml b/app/src/main/res/layout/card_entry_compact.xml
index f563c61e77..053e2585e6 100644
--- a/app/src/main/res/layout/card_entry_compact.xml
+++ b/app/src/main/res/layout/card_entry_compact.xml
@@ -36,14 +36,15 @@
             android:layout_height="match_parent"
             android:paddingStart="12dp">
 
-            <de.hdodenhof.circleimageview.CircleImageView
+            <com.google.android.material.imageview.ShapeableImageView
                 android:id="@+id/ivTextDrawable"
                 android:layout_width="45dp"
                 android:layout_height="45dp"
                 android:layout_alignParentStart="true"
-                android:layout_centerVertical="true" />
+                android:layout_centerVertical="true"
+                app:shapeAppearanceOverlay="@style/ShapeAppearanceOverlay.Aegis.ImageView.Circle" />
 
-            <de.hdodenhof.circleimageview.CircleImageView
+            <com.google.android.material.imageview.ShapeableImageView
                 android:id="@+id/ivSelected"
                 android:layout_width="45dp"
                 android:layout_height="45dp"
@@ -51,7 +52,8 @@
                 android:layout_centerVertical="true"
                 android:src="@drawable/item_selected"
                 android:visibility="gone"
-                app:civ_circle_background_color="?attr/colorPrimaryAlternative" />
+                android:background="?attr/colorPrimaryAlternative"
+                app:shapeAppearanceOverlay="@style/ShapeAppearanceOverlay.Aegis.ImageView.Circle" />
         </RelativeLayout>
 
         <RelativeLayout
diff --git a/app/src/main/res/layout/card_entry_small.xml b/app/src/main/res/layout/card_entry_small.xml
index 94ababe077..104d954e8c 100644
--- a/app/src/main/res/layout/card_entry_small.xml
+++ b/app/src/main/res/layout/card_entry_small.xml
@@ -36,14 +36,15 @@
             android:layout_height="match_parent"
             android:paddingStart="14dp">
 
-            <de.hdodenhof.circleimageview.CircleImageView
+            <com.google.android.material.imageview.ShapeableImageView
                 android:id="@+id/ivTextDrawable"
                 android:layout_width="45dp"
                 android:layout_height="45dp"
                 android:layout_centerVertical="true"
-                android:layout_alignParentStart="true"  />
+                android:layout_alignParentStart="true"
+                app:shapeAppearanceOverlay="@style/ShapeAppearanceOverlay.Aegis.ImageView.Circle" />
 
-            <de.hdodenhof.circleimageview.CircleImageView
+            <com.google.android.material.imageview.ShapeableImageView
                 android:id="@+id/ivSelected"
                 android:layout_width="45dp"
                 android:layout_height="45dp"
@@ -51,7 +52,8 @@
                 android:layout_centerVertical="true"
                 android:src="@drawable/item_selected"
                 android:visibility="gone"
-                app:civ_circle_background_color="?attr/colorPrimaryAlternative" />
+                android:background="?attr/colorPrimaryAlternative"
+                app:shapeAppearanceOverlay="@style/ShapeAppearanceOverlay.Aegis.ImageView.Circle" />
         </RelativeLayout>
 
         <RelativeLayout
diff --git a/app/src/main/res/layout/card_entry_tile.xml b/app/src/main/res/layout/card_entry_tile.xml
index 8a18a16283..eac01a6642 100644
--- a/app/src/main/res/layout/card_entry_tile.xml
+++ b/app/src/main/res/layout/card_entry_tile.xml
@@ -46,14 +46,15 @@
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent">
 
-                    <de.hdodenhof.circleimageview.CircleImageView
+                    <com.google.android.material.imageview.ShapeableImageView
                         android:id="@+id/ivTextDrawable"
                         android:layout_width="24dp"
                         android:layout_height="24dp"
                         android:layout_marginEnd="6dp"
-                        android:layout_alignParentStart="true" />
+                        android:layout_alignParentStart="true"
+                        app:shapeAppearanceOverlay="@style/ShapeAppearanceOverlay.Aegis.ImageView.Circle" />
 
-                    <de.hdodenhof.circleimageview.CircleImageView
+                    <com.google.android.material.imageview.ShapeableImageView
                         android:id="@+id/ivSelected"
                         android:layout_width="24dp"
                         android:layout_height="24dp"
@@ -61,7 +62,8 @@
                         android:layout_alignParentStart="true"
                         android:src="@drawable/item_selected"
                         android:visibility="gone"
-                        app:civ_circle_background_color="?attr/colorPrimaryAlternative" />
+                        android:background="?attr/colorPrimaryAlternative"
+                        app:shapeAppearanceOverlay="@style/ShapeAppearanceOverlay.Aegis.ImageView.Circle" />
             </RelativeLayout>
 
             <RelativeLayout
diff --git a/app/src/main/res/raw/aboutlibraries.json b/app/src/main/res/raw/aboutlibraries.json
index 914eeec3e6..e94d1ad4b7 100644
--- a/app/src/main/res/raw/aboutlibraries.json
+++ b/app/src/main/res/raw/aboutlibraries.json
@@ -2543,29 +2543,6 @@
                 "MIT"
             ]
         },
-        {
-            "uniqueId": "de.hdodenhof:circleimageview",
-            "funding": [
-                
-            ],
-            "developers": [
-                {
-                    "name": "Henning Dodenhof"
-                }
-            ],
-            "artifactVersion": "3.1.0",
-            "description": "A fast circular ImageView for Android",
-            "scm": {
-                "connection": "scm:git@github.com:hdodenhof/CircleImageView.git",
-                "url": "https://github.com/hdodenhof/CircleImageView",
-                "developerConnection": "scm:git@github.com:hdodenhof/CircleImageView.git"
-            },
-            "name": "CircleImageView",
-            "website": "https://github.com/hdodenhof/CircleImageView",
-            "licenses": [
-                "Apache-2.0"
-            ]
-        },
         {
             "uniqueId": "info.guardianproject.trustedintents:trustedintents",
             "funding": [
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index f743089a17..f6529d4c81 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -263,4 +263,9 @@
         <item name="cornerFamily">rounded</item>
         <item name="cornerSize">8dp</item>
     </style>
+
+    <style name="ShapeAppearanceOverlay.Aegis.ImageView.Circle" parent="">
+        <item name="cornerFamily">rounded</item>
+        <item name="cornerSize">50%</item>
+    </style>
 </resources>