From 6aa4ad1cd0aeba4b732bb02b649ecb63a99017d7 Mon Sep 17 00:00:00 2001
From: Niels Andriesse <andriesseniels@gmail.com>
Date: Thu, 1 Jul 2021 10:02:02 +1000
Subject: [PATCH] Fix profile picture size issue

---
 .../conversation/v2/ConversationActivityV2.kt | 10 +++++++++
 .../loki/views/ProfilePictureView.kt          | 21 +++++--------------
 .../activity_conversation_v2_action_bar.xml   |  7 ++++---
 3 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt
index edf90a0f98..088bde251f 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt
@@ -18,8 +18,10 @@ import android.util.Log
 import android.util.Pair
 import android.util.TypedValue
 import android.view.*
+import android.widget.LinearLayout
 import android.widget.RelativeLayout
 import android.widget.Toast
+import androidx.annotation.DimenRes
 import androidx.appcompat.app.AlertDialog
 import androidx.core.view.isVisible
 import androidx.lifecycle.Observer
@@ -281,6 +283,14 @@ class ConversationActivityV2 : PassphraseRequiredActionBarActivity(), InputBarDe
         actionBar.setCustomView(R.layout.activity_conversation_v2_action_bar)
         actionBar.setDisplayShowCustomEnabled(true)
         conversationTitleView.text = thread.toShortString()
+        @DimenRes val sizeID: Int
+        if (thread.isClosedGroupRecipient) {
+            sizeID = R.dimen.medium_profile_picture_size
+        } else {
+            sizeID = R.dimen.small_profile_picture_size
+        }
+        val size = resources.getDimension(sizeID).roundToInt()
+        profilePictureView.layoutParams = LinearLayout.LayoutParams(size, size)
         profilePictureView.glide = glide
         profilePictureView.update(thread, threadID)
     }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/views/ProfilePictureView.kt b/app/src/main/java/org/thoughtcrime/securesms/loki/views/ProfilePictureView.kt
index 3482088dd9..b07675f5ea 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/loki/views/ProfilePictureView.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/loki/views/ProfilePictureView.kt
@@ -31,23 +31,12 @@ class ProfilePictureView : RelativeLayout {
     private val profilePicturesCache = mutableMapOf<String, String?>()
 
     // region Lifecycle
-    constructor(context: Context) : super(context) {
-        setUpViewHierarchy()
-    }
+    constructor(context: Context) : super(context) { initialize() }
+    constructor(context: Context, attrs: AttributeSet) : super(context, attrs) { initialize() }
+    constructor(context: Context, attrs: AttributeSet, defStyleAttr: Int) : super(context, attrs, defStyleAttr) { initialize() }
+    constructor(context: Context, attrs: AttributeSet, defStyleAttr: Int, defStyleRes: Int) : super(context, attrs, defStyleAttr, defStyleRes) { initialize() }
 
-    constructor(context: Context, attrs: AttributeSet) : super(context, attrs) {
-        setUpViewHierarchy()
-    }
-
-    constructor(context: Context, attrs: AttributeSet, defStyleAttr: Int) : super(context, attrs, defStyleAttr) {
-        setUpViewHierarchy()
-    }
-
-    constructor(context: Context, attrs: AttributeSet, defStyleAttr: Int, defStyleRes: Int) : super(context, attrs, defStyleAttr, defStyleRes) {
-        setUpViewHierarchy()
-    }
-
-    private fun setUpViewHierarchy() {
+    private fun initialize() {
         val inflater = context.getSystemService(Context.LAYOUT_INFLATER_SERVICE) as LayoutInflater
         val contentView = inflater.inflate(R.layout.view_profile_picture, null)
         addView(contentView)
diff --git a/app/src/main/res/layout/activity_conversation_v2_action_bar.xml b/app/src/main/res/layout/activity_conversation_v2_action_bar.xml
index 294e75564c..bd8374eb21 100644
--- a/app/src/main/res/layout/activity_conversation_v2_action_bar.xml
+++ b/app/src/main/res/layout/activity_conversation_v2_action_bar.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="?attr/actionBarSize"
     xmlns:tools="http://schemas.android.com/tools"
@@ -9,8 +10,8 @@
 
     <org.thoughtcrime.securesms.loki.views.ProfilePictureView
         android:id="@+id/profilePictureView"
-        android:layout_width="@dimen/small_profile_picture_size"
-        android:layout_height="@dimen/small_profile_picture_size" />
+        android:layout_width="@dimen/medium_profile_picture_size"
+        android:layout_height="@dimen/medium_profile_picture_size" />
 
     <LinearLayout
         android:layout_width="wrap_content"