From 54a4b6758be629c357e83c8af5440f1f91e8d501 Mon Sep 17 00:00:00 2001
From: Arne <arne@monocles.de>
Date: Sun, 1 Sep 2024 18:48:29 +0200
Subject: [PATCH] Apply shapeable avatars

---
 build.gradle                                  |  2 +
 .../res/layout/activity_contact_details.xml   |  3 +-
 src/main/res/layout/activity_edit_account.xml |  5 +-
 src/main/res/layout/activity_muc_details.xml  |  3 +-
 src/main/res/layout/item_account.xml          |  5 +-
 .../res/layout/item_channel_discovery.xml     |  5 +-
 src/main/res/layout/item_contact.xml          |  5 +-
 src/main/res/layout/item_conversation.xml     |  5 +-
 src/main/res/layout/item_message_received.xml |  5 +-
 src/main/res/layout/item_message_sent.xml     |  5 +-
 src/main/res/layout/item_message_status.xml   |  5 +-
 src/main/res/layout/item_user_preview.xml     |  5 +-
 src/main/res/values/arrays.xml                | 12 ++++
 src/main/res/values/defaults.xml              |  1 +
 src/main/res/values/dimens.xml                |  3 +
 src/main/res/values/strings.xml               |  6 ++
 src/main/res/xml/preferences_interface.xml    |  7 ++
 .../conversations/ui/widget/AvatarView.kt     | 71 +++++++++++++++++++
 18 files changed, 122 insertions(+), 31 deletions(-)
 create mode 100644 src/monocleschat/java/eu/siacs/conversations/ui/widget/AvatarView.kt

diff --git a/build.gradle b/build.gradle
index 9ac734e658..88a03fc042 100644
--- a/build.gradle
+++ b/build.gradle
@@ -7,6 +7,7 @@ buildscript {
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:8.3.2'
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.21"
     }
 }
 
@@ -16,6 +17,7 @@ plugins {
 }
 
 apply plugin: 'com.android.application'
+apply plugin: 'org.jetbrains.kotlin.android'
 
 repositories {
     google()
diff --git a/src/main/res/layout/activity_contact_details.xml b/src/main/res/layout/activity_contact_details.xml
index 0ebba5e5f6..e58c787fc0 100644
--- a/src/main/res/layout/activity_contact_details.xml
+++ b/src/main/res/layout/activity_contact_details.xml
@@ -43,12 +43,11 @@
                         android:layout_height="wrap_content"
                         android:padding="@dimen/card_padding_regular">
 
-                        <com.google.android.material.imageview.ShapeableImageView
+                        <eu.siacs.conversations.ui.widget.AvatarView
                             android:id="@+id/details_contact_badge"
                             android:layout_width="@dimen/avatar_on_details_screen_size"
                             android:layout_height="@dimen/avatar_on_details_screen_size"
                             android:layout_alignParentTop="true"
-                            app:shapeAppearance="@style/ShapeAppearanceOverlay.Photo"
                             android:scaleType="centerCrop" />
 
                         <LinearLayout
diff --git a/src/main/res/layout/activity_edit_account.xml b/src/main/res/layout/activity_edit_account.xml
index 07431bfe2b..e4328a487d 100644
--- a/src/main/res/layout/activity_edit_account.xml
+++ b/src/main/res/layout/activity_edit_account.xml
@@ -47,14 +47,13 @@
                         android:layout_height="wrap_content"
                         android:padding="@dimen/card_padding_regular">
 
-                        <com.google.android.material.imageview.ShapeableImageView
+                        <eu.siacs.conversations.ui.widget.AvatarView
                             android:id="@+id/avater"
                             android:layout_width="@dimen/avatar_on_details_screen_size"
                             android:layout_height="@dimen/avatar_on_details_screen_size"
                             android:layout_alignParentTop="true"
                             android:layout_marginEnd="@dimen/avatar_item_distance"
-                            android:contentDescription="@string/account_image_description"
-                            app:shapeAppearance="@style/ShapeAppearanceOverlay.Photo" />
+                            android:contentDescription="@string/account_image_description" />
 
                         <LinearLayout
                             android:layout_width="fill_parent"
diff --git a/src/main/res/layout/activity_muc_details.xml b/src/main/res/layout/activity_muc_details.xml
index 6e291795c9..bec362eee8 100644
--- a/src/main/res/layout/activity_muc_details.xml
+++ b/src/main/res/layout/activity_muc_details.xml
@@ -50,12 +50,11 @@
                             android:layout_marginBottom="32dp"
                             android:paddingHorizontal="@dimen/card_padding_regular">
 
-                            <com.google.android.material.imageview.ShapeableImageView
+                            <eu.siacs.conversations.ui.widget.AvatarView
                                 android:id="@+id/your_photo"
                                 android:layout_width="@dimen/avatar_on_details_screen_size"
                                 android:layout_height="@dimen/avatar_on_details_screen_size"
                                 android:layout_alignParentStart="true"
-                                app:shapeAppearance="@style/ShapeAppearanceOverlay.Photo"
                                 android:layout_marginEnd="@dimen/avatar_item_distance" />
 
                             <LinearLayout
diff --git a/src/main/res/layout/item_account.xml b/src/main/res/layout/item_account.xml
index 3346c98f72..6379b0b193 100644
--- a/src/main/res/layout/item_account.xml
+++ b/src/main/res/layout/item_account.xml
@@ -17,13 +17,12 @@
         android:paddingBottom="8dp"
         android:paddingTop="8dp">
 
-        <com.google.android.material.imageview.ShapeableImageView
+        <eu.siacs.conversations.ui.widget.AvatarView
             android:id="@+id/account_image"
             android:layout_width="48dp"
             android:layout_height="48dp"
             android:layout_alignParentStart="true"
-            android:contentDescription="@string/account_image_description"
-            app:shapeAppearance="@style/ShapeAppearanceOverlay.Photo" />
+            android:contentDescription="@string/account_image_description" />
 
         <LinearLayout
             android:layout_width="fill_parent"
diff --git a/src/main/res/layout/item_channel_discovery.xml b/src/main/res/layout/item_channel_discovery.xml
index 65b9c6e224..3e041f04a2 100644
--- a/src/main/res/layout/item_channel_discovery.xml
+++ b/src/main/res/layout/item_channel_discovery.xml
@@ -9,13 +9,12 @@
         android:background="?selectableItemBackground"
         android:padding="@dimen/list_padding">
 
-        <com.google.android.material.imageview.ShapeableImageView
+        <eu.siacs.conversations.ui.widget.AvatarView
             android:id="@+id/avatar"
             android:layout_width="48dp"
             android:layout_height="48dp"
             android:layout_alignParentStart="true"
-            android:scaleType="centerCrop"
-            app:shapeAppearance="@style/ShapeAppearanceOverlay.Photo" />
+            android:scaleType="centerCrop" />
 
         <RelativeLayout
             android:layout_width="wrap_content"
diff --git a/src/main/res/layout/item_contact.xml b/src/main/res/layout/item_contact.xml
index 48af1e91d5..840d328cf5 100644
--- a/src/main/res/layout/item_contact.xml
+++ b/src/main/res/layout/item_contact.xml
@@ -13,13 +13,12 @@
         android:layout_height="wrap_content"
         android:padding="@dimen/list_padding">
 
-        <com.google.android.material.imageview.ShapeableImageView
+        <eu.siacs.conversations.ui.widget.AvatarView
             android:id="@+id/contact_photo"
             android:layout_width="48dp"
             android:layout_height="48dp"
             android:layout_alignParentStart="true"
-            android:scaleType="centerCrop"
-            app:shapeAppearance="@style/ShapeAppearanceOverlay.Photo" />
+            android:scaleType="centerCrop" />
 
         <LinearLayout
             android:layout_width="wrap_content"
diff --git a/src/main/res/layout/item_conversation.xml b/src/main/res/layout/item_conversation.xml
index c1acbe1a26..4f083e6f8f 100644
--- a/src/main/res/layout/item_conversation.xml
+++ b/src/main/res/layout/item_conversation.xml
@@ -19,13 +19,12 @@
                 android:orientation="horizontal"
                 android:padding="8dp">
 
-                <com.google.android.material.imageview.ShapeableImageView
+                <eu.siacs.conversations.ui.widget.AvatarView
                     android:id="@+id/conversation_image"
                     android:layout_width="56dp"
                     android:layout_height="56dp"
                     android:layout_alignParentStart="true"
-                    android:scaleType="centerCrop"
-                    app:shapeAppearance="@style/ShapeAppearanceOverlay.Photo" />
+                    android:scaleType="centerCrop" />
 
                 <RelativeLayout
                     android:layout_width="fill_parent"
diff --git a/src/main/res/layout/item_message_received.xml b/src/main/res/layout/item_message_received.xml
index 4b2fb64074..de9717852b 100644
--- a/src/main/res/layout/item_message_received.xml
+++ b/src/main/res/layout/item_message_received.xml
@@ -27,15 +27,14 @@
         android:paddingHorizontal="8dp"
         android:paddingVertical="4dp">
 
-        <com.google.android.material.imageview.ShapeableImageView
+        <eu.siacs.conversations.ui.widget.AvatarView
             android:id="@+id/message_photo"
             android:layout_width="48dp"
             android:layout_height="48dp"
             android:layout_alignParentStart="true"
             android:layout_alignParentTop="true"
             android:layout_marginEnd="0dp"
-            android:scaleType="centerCrop"
-            app:shapeAppearance="@style/ShapeAppearanceOverlay.Photo" />
+            android:scaleType="centerCrop" />
 
         <LinearLayout
             android:id="@+id/message_box"
diff --git a/src/main/res/layout/item_message_sent.xml b/src/main/res/layout/item_message_sent.xml
index 6769ad5b87..3c48b30aaf 100644
--- a/src/main/res/layout/item_message_sent.xml
+++ b/src/main/res/layout/item_message_sent.xml
@@ -37,12 +37,11 @@
             android:layout_marginStart="0dp"
             android:orientation="vertical">
 
-        <com.google.android.material.imageview.ShapeableImageView
+        <eu.siacs.conversations.ui.widget.AvatarView
                 android:id="@+id/message_photo"
                 android:layout_width="48dp"
                 android:layout_height="48dp"
-                android:scaleType="centerCrop"
-                app:shapeAppearance="@style/ShapeAppearanceOverlay.Photo" />
+                android:scaleType="centerCrop" />
         </LinearLayout>
 
 
diff --git a/src/main/res/layout/item_message_status.xml b/src/main/res/layout/item_message_status.xml
index b563582f7b..31e688c311 100644
--- a/src/main/res/layout/item_message_status.xml
+++ b/src/main/res/layout/item_message_status.xml
@@ -20,7 +20,7 @@
             android:layout_centerVertical="true"
             android:text="@string/load_more_messages" />
 
-        <com.google.android.material.imageview.ShapeableImageView
+        <eu.siacs.conversations.ui.widget.AvatarView
             android:id="@+id/message_photo"
             android:layout_width="32dp"
             android:layout_height="32dp"
@@ -28,8 +28,7 @@
             android:layout_alignParentTop="true"
             android:layout_marginEnd="-1.5dp"
             android:padding="0dp"
-            android:scaleType="centerCrop"
-            app:shapeAppearance="@style/ShapeAppearanceOverlay.Photo" />
+            android:scaleType="centerCrop" />
 
         <TextView
             android:id="@+id/status_message"
diff --git a/src/main/res/layout/item_user_preview.xml b/src/main/res/layout/item_user_preview.xml
index 9645b23159..7447749938 100644
--- a/src/main/res/layout/item_user_preview.xml
+++ b/src/main/res/layout/item_user_preview.xml
@@ -7,11 +7,10 @@
         android:layout_height="match_parent"
         android:background="?selectableItemBackgroundBorderless"
         android:padding="2dp">
-        <com.google.android.material.imageview.ShapeableImageView
+        <eu.siacs.conversations.ui.widget.AvatarView
             android:id="@+id/avatar"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:scaleType="centerCrop"
-            app:shapeAppearance="@style/ShapeAppearanceOverlay.Photo" />
+            android:scaleType="centerCrop" />
     </eu.siacs.conversations.ui.widget.SquareFrameLayout>
 </layout>
diff --git a/src/main/res/values/arrays.xml b/src/main/res/values/arrays.xml
index d457da4580..c12dfa9d06 100644
--- a/src/main/res/values/arrays.xml
+++ b/src/main/res/values/arrays.xml
@@ -48,6 +48,18 @@
 		<item>SEND_LOCATION</item>
 	</string-array>
 
+	<string-array name="avatars_shape">
+		<item>@string/avater_shape_rounded_square</item>
+		<item>@string/avater_shape_oval</item>
+		<item>@string/avater_shape_square</item>
+	</string-array>
+
+	<string-array name="avatars_shape_values">
+		<item>rounded_square</item>
+		<item>oval</item>
+		<item>square</item>
+	</string-array>
+
 	<string-array name="picture_compression_values">
 		<item>never</item>
 		<item>auto</item>
diff --git a/src/main/res/values/defaults.xml b/src/main/res/values/defaults.xml
index 9286cfc2a5..d14b8fddc1 100644
--- a/src/main/res/values/defaults.xml
+++ b/src/main/res/values/defaults.xml
@@ -54,4 +54,5 @@
     <bool name="send_link_previews">true</bool>
     <bool name="compose_rich_text">true</bool>
     <bool name="auto_accept_unmetered">true</bool>
+    <string name="avatar_shape">rounded_square</string>
 </resources>
diff --git a/src/main/res/values/dimens.xml b/src/main/res/values/dimens.xml
index ebadf82b5f..7f8fed8bcb 100644
--- a/src/main/res/values/dimens.xml
+++ b/src/main/res/values/dimens.xml
@@ -55,4 +55,7 @@
     <dimen name="small_margin">4dp</dimen>
     <dimen name="actionbar_text_size">20sp</dimen>
     <dimen name="material_input_text_to_prefix_suffix_padding">0dp</dimen>
+
+
+    <dimen name="avatar_corners_radius">8dp</dimen>
 </resources>
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 4f65d95f77..fbe503906a 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -1076,4 +1076,10 @@
     <string name="welcome_to_monocles_chat">Welcome to monocles chat</string>
     <string name="monocles_chat_intro_description">monocles chat is an app that connects you to a global network called Jabber. This network includes services, called gateways, for chatting with other networks such as SMS, IRC, Matrix, and more.</string>
     <string name="how_the_xmpp_network_works">How the XMPP network works</string>
+
+    <string name="avater_shape_oval">Oval</string>
+    <string name="avater_shape_rounded_square">Rounded Square</string>
+    <string name="avater_shape_square">Square</string>
+    <string name="pref_avatars_shape">Avatars shape</string>
+    <string name="pref_avatar_shape_summary">Allows you to select avatars shape globally</string>
 </resources>
diff --git a/src/main/res/xml/preferences_interface.xml b/src/main/res/xml/preferences_interface.xml
index a08013b421..2d5a01156d 100644
--- a/src/main/res/xml/preferences_interface.xml
+++ b/src/main/res/xml/preferences_interface.xml
@@ -81,6 +81,13 @@
             app:colorpicker_showAlpha="false" />
     </PreferenceCategory>>
     <PreferenceCategory android:title="@string/appearance">
+        <ListPreference
+            android:defaultValue="@string/avatar_shape"
+            android:key="avatar_shape"
+            android:entries="@array/avatars_shape"
+            android:entryValues="@array/avatars_shape_values"
+            android:summary="@string/pref_avatar_shape_summary"
+            android:title="@string/pref_avatars_shape" />
         <SwitchPreferenceCompat
             android:defaultValue="@bool/use_green_background"
             android:icon="@drawable/ic_forum_24dp"
diff --git a/src/monocleschat/java/eu/siacs/conversations/ui/widget/AvatarView.kt b/src/monocleschat/java/eu/siacs/conversations/ui/widget/AvatarView.kt
new file mode 100644
index 0000000000..f98d77a85a
--- /dev/null
+++ b/src/monocleschat/java/eu/siacs/conversations/ui/widget/AvatarView.kt
@@ -0,0 +1,71 @@
+package eu.siacs.conversations.ui.widget
+
+import android.content.Context
+import android.content.SharedPreferences
+import android.graphics.Outline
+import androidx.preference.PreferenceManager
+import android.util.AttributeSet
+import android.view.View
+import android.view.ViewOutlineProvider
+import androidx.appcompat.widget.AppCompatImageView
+import eu.siacs.conversations.R
+
+class AvatarView : AppCompatImageView {
+    private var currentShape: String = ""
+
+    private val preferencesListener = SharedPreferences.OnSharedPreferenceChangeListener { _, _ -> invalidateShape() }
+
+    constructor(context: Context) : super(context)
+    constructor(context: Context, attrs: AttributeSet?) : super(context, attrs)
+    constructor(context: Context, attrs: AttributeSet?, defStyleAttr: Int) : super(
+        context,
+        attrs,
+        defStyleAttr
+    )
+
+    override fun onAttachedToWindow() {
+        super.onAttachedToWindow()
+        invalidateShape()
+        PreferenceManager.getDefaultSharedPreferences(context).registerOnSharedPreferenceChangeListener(preferencesListener)
+    }
+
+    override fun onDetachedFromWindow() {
+        super.onDetachedFromWindow()
+        PreferenceManager.getDefaultSharedPreferences(context).unregisterOnSharedPreferenceChangeListener(preferencesListener)
+    }
+
+    private fun invalidateShape() {
+        val shape = PreferenceManager.getDefaultSharedPreferences(context).getString("avatar_shape", context.getString(R.string.avatar_shape))
+
+        if (shape == currentShape) {
+            return
+        }
+
+        when {
+            shape == "oval" -> {
+                clipToOutline = true
+                outlineProvider = object : ViewOutlineProvider() {
+                    override fun getOutline(view: View, outline: Outline) {
+                        outline.setOval(0, 0, view.width, view.height)
+                    }
+                }
+            }
+            shape == "rounded_square" -> {
+                clipToOutline = true
+                outlineProvider = object : ViewOutlineProvider() {
+                    override fun getOutline(view: View, outline: Outline) {
+                        val maxRadius = minOf(view.width, view.height) / 2f
+                        val radius = minOf(context.resources.getDimension(R.dimen.avatar_corners_radius), maxRadius)
+                        outline.setRoundRect(0, 0, view.width, view.height, radius)
+                    }
+                }
+            }
+            shape == "square" -> {
+                clipToOutline = false
+                outlineProvider = ViewOutlineProvider.BACKGROUND
+            }
+        }
+
+        currentShape = shape!!
+    }
+}
\ No newline at end of file