From 97eb3490d89eb4fbc27f01d19f5e78e92693fda2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20Sch=C3=A4ttgen?= <michael@schattgen.me>
Date: Wed, 6 Jun 2018 23:53:33 +0200
Subject: [PATCH] MainActivity is now using CircleImageView too

---
 .../me/impy/aegis/helpers/TextDrawableHelper.java  |  8 +++++---
 .../java/me/impy/aegis/ui/EditProfileActivity.java |  4 ++--
 .../java/me/impy/aegis/ui/views/KeyProfile.java    |  6 ++++--
 .../me/impy/aegis/ui/views/KeyProfileHolder.java   |  2 +-
 app/src/main/res/layout/card_keyprofile.xml        | 14 ++++++++------
 5 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/app/src/main/java/me/impy/aegis/helpers/TextDrawableHelper.java b/app/src/main/java/me/impy/aegis/helpers/TextDrawableHelper.java
index cdf96610..03b960e6 100644
--- a/app/src/main/java/me/impy/aegis/helpers/TextDrawableHelper.java
+++ b/app/src/main/java/me/impy/aegis/helpers/TextDrawableHelper.java
@@ -1,5 +1,7 @@
 package me.impy.aegis.helpers;
 
+import android.view.View;
+
 import com.amulyakhare.textdrawable.TextDrawable;
 import com.amulyakhare.textdrawable.util.ColorGenerator;
 
@@ -8,7 +10,7 @@ public class TextDrawableHelper {
 
     }
 
-    public static TextDrawable generate(String s) {
+    public static TextDrawable generate(String s, View view) {
         if (s == null || s.length() <= 1) {
             return null;
         }
@@ -16,7 +18,7 @@ public class TextDrawableHelper {
         ColorGenerator generator = ColorGenerator.MATERIAL;
         int color = generator.getColor(s);
         return TextDrawable.builder().beginConfig()
-                .width(100)
-                .height(100).endConfig().buildRect(s.substring(0, 1).toUpperCase(), color);
+                .width(view.getWidth())
+                .height(view.getHeight()).endConfig().buildRect(s.substring(0, 1).toUpperCase(), color);
     }
 }
diff --git a/app/src/main/java/me/impy/aegis/ui/EditProfileActivity.java b/app/src/main/java/me/impy/aegis/ui/EditProfileActivity.java
index fe04ea70..20476833 100644
--- a/app/src/main/java/me/impy/aegis/ui/EditProfileActivity.java
+++ b/app/src/main/java/me/impy/aegis/ui/EditProfileActivity.java
@@ -131,7 +131,7 @@ public class EditProfileActivity extends AegisActivity {
 
             @Override
             public void afterTextChanged(Editable s) {
-                TextDrawable drawable = TextDrawableHelper.generate(s.toString());
+                TextDrawable drawable = TextDrawableHelper.generate(s.toString(), _iconView);
                 _iconView.setImageDrawable(drawable);
             }
         });
@@ -166,7 +166,7 @@ public class EditProfileActivity extends AegisActivity {
 
     private void updateFields() {
         DatabaseEntry entry = _profile.getEntry();
-        _iconView.setImageDrawable(_profile.getDrawable());
+        _iconView.setImageDrawable(_profile.getDrawable(_iconView));
 
         _textName.setText(entry.getName());
         _textIssuer.setText(entry.getInfo().getIssuer());
diff --git a/app/src/main/java/me/impy/aegis/ui/views/KeyProfile.java b/app/src/main/java/me/impy/aegis/ui/views/KeyProfile.java
index addc14d6..a375bad8 100644
--- a/app/src/main/java/me/impy/aegis/ui/views/KeyProfile.java
+++ b/app/src/main/java/me/impy/aegis/ui/views/KeyProfile.java
@@ -1,5 +1,7 @@
 package me.impy.aegis.ui.views;
 
+import android.view.View;
+
 import com.amulyakhare.textdrawable.TextDrawable;
 
 import java.io.Serializable;
@@ -38,7 +40,7 @@ public class KeyProfile implements Serializable {
         return _code;
     }
 
-    public TextDrawable getDrawable() {
-        return TextDrawableHelper.generate(getEntry().getName());
+    public TextDrawable getDrawable(View view) {
+        return TextDrawableHelper.generate(getEntry().getName(), view);
     }
 }
diff --git a/app/src/main/java/me/impy/aegis/ui/views/KeyProfileHolder.java b/app/src/main/java/me/impy/aegis/ui/views/KeyProfileHolder.java
index 8bd15d06..e2a4f884 100644
--- a/app/src/main/java/me/impy/aegis/ui/views/KeyProfileHolder.java
+++ b/app/src/main/java/me/impy/aegis/ui/views/KeyProfileHolder.java
@@ -73,7 +73,7 @@ public class KeyProfileHolder extends RecyclerView.ViewHolder {
         }
         else
         {
-            TextDrawable drawable = profile.getDrawable();
+            TextDrawable drawable = profile.getDrawable(_profileDrawable);
             _profileDrawable.setImageDrawable(drawable);
         }
 
diff --git a/app/src/main/res/layout/card_keyprofile.xml b/app/src/main/res/layout/card_keyprofile.xml
index 22b8c510..eb4b0681 100644
--- a/app/src/main/res/layout/card_keyprofile.xml
+++ b/app/src/main/res/layout/card_keyprofile.xml
@@ -23,12 +23,14 @@
             android:layout_height="match_parent"
             android:paddingLeft="16dp">
 
-            <ImageView android:layout_width="60dp"
-                       android:layout_height="60dp"
-                       android:id="@+id/ivTextDrawable"
-                       android:layout_centerVertical="true"
-                       android:layout_alignParentLeft="true"
-                       android:layout_alignParentStart="true"/>
+            <de.hdodenhof.circleimageview.CircleImageView
+                android:id="@+id/ivTextDrawable"
+                android:layout_width="60dp"
+                android:layout_height="60dp"
+                android:layout_centerVertical="true"
+                android:layout_alignParentLeft="true"
+                android:layout_alignParentStart="true"
+                />
         </RelativeLayout>
 
         <RelativeLayout