From ed20a96ed0de4d0ab754180395b4e0ed3ecabe82 Mon Sep 17 00:00:00 2001
From: Niels Andriesse <andriesseniels@gmail.com>
Date: Mon, 6 Jan 2020 10:18:43 +1100
Subject: [PATCH] Fix profile picture view

---
 ...profile_picture_view_medium_foreground.xml | 11 ++++
 .../profile_picture_view_small_foreground.xml | 11 ++++
 res/layout/view_profile_picture.xml           | 58 +++++++++++++++----
 .../loki/redesign/views/ProfilePictureView.kt | 16 +++--
 4 files changed, 78 insertions(+), 18 deletions(-)
 create mode 100644 res/drawable/profile_picture_view_medium_foreground.xml
 create mode 100644 res/drawable/profile_picture_view_small_foreground.xml

diff --git a/res/drawable/profile_picture_view_medium_foreground.xml b/res/drawable/profile_picture_view_medium_foreground.xml
new file mode 100644
index 0000000000..e62cfbe3fb
--- /dev/null
+++ b/res/drawable/profile_picture_view_medium_foreground.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid  android:color="@color/transparent" />
+
+    <corners android:radius="23dp" />
+
+    <stroke android:width="@dimen/profile_picture_border_thickness" android:color="@color/border" />
+</shape>
\ No newline at end of file
diff --git a/res/drawable/profile_picture_view_small_foreground.xml b/res/drawable/profile_picture_view_small_foreground.xml
new file mode 100644
index 0000000000..98d2b0a4e7
--- /dev/null
+++ b/res/drawable/profile_picture_view_small_foreground.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid  android:color="@color/transparent" />
+
+    <corners android:radius="18dp" />
+
+    <stroke android:width="@dimen/profile_picture_border_thickness" android:color="@color/border" />
+</shape>
\ No newline at end of file
diff --git a/res/layout/view_profile_picture.xml b/res/layout/view_profile_picture.xml
index 660db39c45..128f850b2f 100644
--- a/res/layout/view_profile_picture.xml
+++ b/res/layout/view_profile_picture.xml
@@ -9,29 +9,63 @@
         android:layout_width="@dimen/medium_profile_picture_size"
         android:layout_height="@dimen/medium_profile_picture_size">
 
-        <ImageView
-            android:id="@+id/doubleModeImageView1"
+        <RelativeLayout
             android:layout_width="@dimen/small_profile_picture_size"
             android:layout_height="@dimen/small_profile_picture_size"
-            android:background="@drawable/profile_picture_view_small_background"
             android:layout_alignParentLeft="true"
-            android:layout_alignParentTop="true" />
+            android:layout_alignParentTop="true">
 
-        <ImageView
-            android:id="@+id/doubleModeImageView2"
+            <ImageView
+                android:id="@+id/doubleModeImageView1"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:background="@drawable/profile_picture_view_small_background" />
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:background="@drawable/profile_picture_view_small_foreground" />
+
+        </RelativeLayout>
+
+        <RelativeLayout
             android:layout_width="@dimen/small_profile_picture_size"
             android:layout_height="@dimen/small_profile_picture_size"
-            android:background="@drawable/profile_picture_view_small_background"
             android:layout_alignParentRight="true"
-            android:layout_alignParentBottom="true" />
+            android:layout_alignParentBottom="true">
+
+            <ImageView
+                android:id="@+id/doubleModeImageView2"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:background="@drawable/profile_picture_view_small_background" />
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:background="@drawable/profile_picture_view_small_foreground" />
+
+        </RelativeLayout>
 
     </RelativeLayout>
 
-    <ImageView
-        android:id="@+id/singleModeImageView"
+    <RelativeLayout
+        android:id="@+id/singleModeImageViewContainer"
         android:layout_width="@dimen/medium_profile_picture_size"
-        android:layout_height="@dimen/medium_profile_picture_size"
-        android:background="@drawable/profile_picture_view_medium_background" />
+        android:layout_height="@dimen/medium_profile_picture_size">
+
+        <ImageView
+            android:id="@+id/singleModeImageView"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:background="@drawable/profile_picture_view_medium_background" />
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:background="@drawable/profile_picture_view_medium_foreground" />
+
+    </RelativeLayout>
 
     <TextView
         android:id="@+id/rssTextView"
diff --git a/src/org/thoughtcrime/securesms/loki/redesign/views/ProfilePictureView.kt b/src/org/thoughtcrime/securesms/loki/redesign/views/ProfilePictureView.kt
index 351d314bdb..82ab51ad6d 100644
--- a/src/org/thoughtcrime/securesms/loki/redesign/views/ProfilePictureView.kt
+++ b/src/org/thoughtcrime/securesms/loki/redesign/views/ProfilePictureView.kt
@@ -1,6 +1,7 @@
 package org.thoughtcrime.securesms.loki.redesign.views
 
 import android.content.Context
+import android.support.annotation.DimenRes
 import android.util.AttributeSet
 import android.view.LayoutInflater
 import android.view.View
@@ -10,6 +11,7 @@ import com.bumptech.glide.load.engine.DiskCacheStrategy
 import kotlinx.android.synthetic.main.view_profile_picture.view.*
 import network.loki.messenger.R
 import org.thoughtcrime.securesms.database.Address
+import org.thoughtcrime.securesms.loki.JazzIdenticonDrawable
 import org.thoughtcrime.securesms.mms.GlideRequests
 import org.thoughtcrime.securesms.recipients.Recipient
 
@@ -48,24 +50,26 @@ class ProfilePictureView : RelativeLayout {
         val hexEncodedPublicKey = hexEncodedPublicKey ?: return
         val additionalHexEncodedPublicKey = additionalHexEncodedPublicKey
         doubleModeImageViewContainer.visibility = if (additionalHexEncodedPublicKey != null && !isRSSFeed) View.VISIBLE else View.INVISIBLE
-        singleModeImageView.visibility = if (additionalHexEncodedPublicKey == null && !isRSSFeed) View.VISIBLE else View.INVISIBLE
+        singleModeImageViewContainer.visibility = if (additionalHexEncodedPublicKey == null && !isRSSFeed) View.VISIBLE else View.INVISIBLE
         rssTextView.visibility = if (isRSSFeed) View.VISIBLE else View.INVISIBLE
-        fun setProfilePictureIfNeeded(imageView: ImageView, hexEncodedPublicKey: String) {
+        fun setProfilePictureIfNeeded(imageView: ImageView, hexEncodedPublicKey: String, @DimenRes sizeID: Int) {
             glide.clear(imageView)
             if (hexEncodedPublicKey.isNotEmpty()) {
                 val signalProfilePicture = Recipient.from(context, Address.fromSerialized(hexEncodedPublicKey), false).contactPhoto
                 if (signalProfilePicture != null) {
                     glide.load(signalProfilePicture).diskCacheStrategy(DiskCacheStrategy.ALL).circleCrop().into(imageView)
                 } else {
-                    imageView.setImageDrawable(null)
+                    val size = resources.getDimensionPixelSize(sizeID)
+                    val jazzIcon = JazzIdenticonDrawable(size, size, hexEncodedPublicKey)
+                    glide.load(jazzIcon).diskCacheStrategy(DiskCacheStrategy.ALL).circleCrop().into(imageView)
                 }
             } else {
                 imageView.setImageDrawable(null)
             }
         }
-        setProfilePictureIfNeeded(singleModeImageView, hexEncodedPublicKey)
-        setProfilePictureIfNeeded(doubleModeImageView1, hexEncodedPublicKey)
-        setProfilePictureIfNeeded(doubleModeImageView2, additionalHexEncodedPublicKey ?: "")
+        setProfilePictureIfNeeded(singleModeImageView, hexEncodedPublicKey, R.dimen.medium_profile_picture_size)
+        setProfilePictureIfNeeded(doubleModeImageView1, hexEncodedPublicKey, R.dimen.small_profile_picture_size)
+        setProfilePictureIfNeeded(doubleModeImageView2, additionalHexEncodedPublicKey ?: "", R.dimen.small_profile_picture_size)
     }
     // endregion
 }
\ No newline at end of file