From 6fff1e18321b799df25108ec248617a00227a2fa Mon Sep 17 00:00:00 2001
From: ThomasSession <thomas.r@getsession.org>
Date: Fri, 9 Aug 2024 11:08:04 +1000
Subject: [PATCH] Better styling

---
 .../org/thoughtcrime/securesms/avatar/AvatarSelection.kt   | 7 +++++--
 .../thoughtcrime/securesms/preferences/SettingsActivity.kt | 6 +++++-
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/avatar/AvatarSelection.kt b/app/src/main/java/org/thoughtcrime/securesms/avatar/AvatarSelection.kt
index 6b712ff67d..d4184cd32d 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/avatar/AvatarSelection.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/avatar/AvatarSelection.kt
@@ -39,17 +39,20 @@ object AvatarSelection {
         launcher: ActivityResultLauncher<CropImageContractOptions>,
         inputFile: Uri?,
         outputFile: Uri?,
-        @StringRes title: Int
+        @StringRes title: Int,
+        bgColor: Int
     ) {
         launcher.launch(
             options(inputFile) {
                 setGuidelines(CropImageView.Guidelines.ON)
                 setAspectRatio(1, 1)
-                setCropShape(if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) CropImageView.CropShape.RECTANGLE else CropImageView.CropShape.OVAL)
+                setCropShape(CropImageView.CropShape.OVAL)
                 setOutputUri(outputFile)
                 setAllowRotation(true)
                 setAllowFlipping(true)
                 setBackgroundColor(ContextCompat.getColor(activity, R.color.avatar_background))
+                setToolbarColor(bgColor)
+                setActivityBackgroundColor(bgColor)
                 setActivityTitle(activity.getString(title))
             }
         )
diff --git a/app/src/main/java/org/thoughtcrime/securesms/preferences/SettingsActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/preferences/SettingsActivity.kt
index 7cc98b22f1..dac2329f5d 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/preferences/SettingsActivity.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/preferences/SettingsActivity.kt
@@ -61,6 +61,7 @@ import org.session.libsession.utilities.ProfileKeyUtil
 import org.session.libsession.utilities.ProfilePictureUtilities
 import org.session.libsession.utilities.SSKEnvironment.ProfileManagerProtocol
 import org.session.libsession.utilities.TextSecurePreferences
+import org.session.libsession.utilities.getColorFromAttr
 import org.session.libsession.utilities.recipients.Recipient
 import org.session.libsession.utilities.truncateIdForDisplay
 import org.session.libsignal.utilities.Log
@@ -111,6 +112,8 @@ class SettingsActivity : PassphraseRequiredActionBarActivity() {
 
     private val hexEncodedPublicKey: String get() = TextSecurePreferences.getLocalNumber(this)!!
 
+    private val bgColor by lazy { getColorFromAttr(android.R.attr.colorPrimary) }
+
     private val onAvatarCropped = registerForActivityResult(CropImageContract()) { result ->
         when {
             result.isSuccessful -> {
@@ -226,7 +229,8 @@ class SettingsActivity : PassphraseRequiredActionBarActivity() {
                     launcher = onAvatarCropped,
                     inputFile = inputFile,
                     outputFile = outputFile,
-                    title = R.string.CropImageActivity_profile_avatar
+                    title = R.string.CropImageActivity_profile_avatar,
+                    bgColor = bgColor
                 )
             }
         }