Merge pull request #1385 from session-foundation/feature/avatar-picker-updates

New avatar editing rules

Author: ThomasSession

app/build.gradle.kts

@@ -442,7 +442,6 @@ dependencies {
     implementation(libs.androidx.navigation.compose)
 
     implementation(libs.accompanist.permissions)
-    implementation(libs.accompanist.drawablepainter)
 
     implementation(libs.androidx.camera.camera2)
     implementation(libs.androidx.camera.lifecycle)

app/src/main/java/org/thoughtcrime/securesms/preferences/SettingsActivity.kt

@@ -54,6 +54,7 @@ import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.AnnotatedString
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.tooling.preview.PreviewParameter
 import androidx.compose.ui.unit.dp
@@ -85,8 +86,7 @@ import org.thoughtcrime.securesms.debugmenu.DebugActivity
 import org.thoughtcrime.securesms.home.PathActivity
 import org.thoughtcrime.securesms.messagerequests.MessageRequestsActivity
 import org.thoughtcrime.securesms.permissions.Permissions
-import org.thoughtcrime.securesms.preferences.SettingsViewModel.AvatarDialogState.TempAvatar
-import org.thoughtcrime.securesms.preferences.SettingsViewModel.AvatarDialogState.UserAvatar
+import org.thoughtcrime.securesms.preferences.SettingsViewModel.AvatarDialogState.*
 import org.thoughtcrime.securesms.preferences.appearance.AppearanceSettingsActivity
 import org.thoughtcrime.securesms.recoverypassword.RecoveryPasswordActivity
 import org.thoughtcrime.securesms.reviews.InAppReviewManager
@@ -100,9 +100,9 @@ import org.thoughtcrime.securesms.ui.DialogButtonData
 import org.thoughtcrime.securesms.ui.Divider
 import org.thoughtcrime.securesms.ui.GetString
 import org.thoughtcrime.securesms.ui.LargeItemButton
-import org.thoughtcrime.securesms.ui.LargeItemButtonWithDrawable
 import org.thoughtcrime.securesms.ui.LoadingDialog
 import org.thoughtcrime.securesms.ui.OpenURLAlertDialog
+import org.thoughtcrime.securesms.ui.PathDot
 import org.thoughtcrime.securesms.ui.components.AcccentOutlineCopyButton
 import org.thoughtcrime.securesms.ui.components.AccentOutlineButton
 import org.thoughtcrime.securesms.ui.components.Avatar
@@ -119,6 +119,8 @@ import org.thoughtcrime.securesms.ui.theme.SessionColorsParameterProvider
 import org.thoughtcrime.securesms.ui.theme.ThemeColors
 import org.thoughtcrime.securesms.ui.theme.accentTextButtonColors
 import org.thoughtcrime.securesms.ui.theme.dangerButtonColors
+import org.thoughtcrime.securesms.ui.theme.primaryGreen
+import org.thoughtcrime.securesms.ui.theme.primaryYellow
 import org.thoughtcrime.securesms.util.FileProviderUtil
 import org.thoughtcrime.securesms.util.applyCommonWindowInsetsOnViews
 import org.thoughtcrime.securesms.util.push
@@ -533,10 +535,16 @@ class SettingsActivity : ScreenLockActionBarActivity() {
 
             Cell {
                 Column {
-                    Crossfade(if (hasPaths) R.drawable.ic_status else R.drawable.ic_path_yellow, label = "path") {
-                        LargeItemButtonWithDrawable(
-                            R.string.onionRoutingPath,
-                            it,
+                    Crossfade(if (hasPaths) primaryGreen else primaryYellow, label = "path") {
+                        LargeItemButton(
+                            AnnotatedString(stringResource(R.string.onionRoutingPath)),
+                            icon = {
+                                PathDot(
+                                    modifier = Modifier.align(Alignment.Center),
+                                    dotSize = LocalDimensions.current.iconSmall,
+                                    color = it
+                                )
+                            },
                             shape = if (BuildConfig.BUILD_TYPE != "release") RectangleShape
                             else getCellTopShape()
                         ) { push<PathActivity>() }
@@ -843,7 +851,9 @@ class SettingsActivity : ScreenLockActionBarActivity() {
                             .padding(LocalDimensions.current.xxxsSpacing)
                             .align(Alignment.BottomEnd)
                         ,
-                        painter = painterResource(id = R.drawable.ic_plus),
+                        painter = painterResource(id =
+                            if(state.avatarDialogState is NoAvatar) R.drawable.ic_plus
+                        else R.drawable.ic_pencil),
                         contentDescription = null,
                         colorFilter = ColorFilter.tint(Color.Black)
                     )

app/src/main/java/org/thoughtcrime/securesms/ui/Components.kt

@@ -23,6 +23,7 @@ import androidx.compose.foundation.layout.IntrinsicSize
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.heightIn
@@ -33,6 +34,7 @@ import androidx.compose.foundation.layout.wrapContentSize
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.itemsIndexed
 import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.foundation.text.BasicTextField
 import androidx.compose.foundation.verticalScroll
@@ -90,10 +92,10 @@ import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.tooling.preview.PreviewParameter
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.times
 import com.bumptech.glide.integration.compose.ExperimentalGlideComposeApi
 import com.bumptech.glide.integration.compose.GlideSubcomposition
 import com.bumptech.glide.integration.compose.RequestState
-import com.google.accompanist.drawablepainter.rememberDrawablePainter
 import com.squareup.phrase.Phrase
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
@@ -123,6 +125,61 @@ import org.thoughtcrime.securesms.ui.theme.primaryYellow
 import org.thoughtcrime.securesms.ui.theme.transparentButtonColors
 import kotlin.math.roundToInt
 
+@Composable
+fun PathDot(
+    modifier: Modifier = Modifier,
+    dotSize: Dp = LocalDimensions.current.iconMedium,
+    glowSize: Dp = LocalDimensions.current.xxsSpacing,
+    color: Color = primaryGreen
+) {
+    val fullSize = dotSize + 2*glowSize
+    Box(
+        modifier = modifier.size(fullSize),
+        contentAlignment = Alignment.Center
+    ) {
+        // Glow effect (outer circle with radial gradient)
+        Canvas(modifier = Modifier.fillMaxSize()) {
+            val center = Offset(this.size.width / 2, this.size.height / 2)
+            val radius = (fullSize * 0.5f).toPx()
+
+            drawCircle(
+                brush = Brush.radialGradient(
+                    colors = listOf(
+                        color, // Start color (opaque)
+                        color.copy(alpha = 0f)  // End color (transparent)
+                    ),
+                    center = center,
+                    radius = radius
+                ),
+                center = center,
+                radius = radius
+            )
+        }
+
+        // Inner solid dot
+        Box(
+            modifier = Modifier
+                .size(dotSize)
+                .background(
+                    color = color,
+                    shape = CircleShape
+                )
+        )
+    }
+}
+
+@Preview
+@Composable
+fun PreviewPathDot(){
+    PreviewTheme {
+        Box(
+            modifier = Modifier.padding(20.dp)
+        ) {
+            PathDot()
+        }
+    }
+}
+
 data class RadioOption<T>(
     val value: T,
     val title: GetString,
@@ -202,14 +259,12 @@ fun ItemButtonWithDrawable(
     shape: Shape = RectangleShape,
     onClick: () -> Unit
 ) {
-    val context = LocalContext.current
-
     ItemButton(
         annotatedStringText = AnnotatedString(stringResource(textId)),
         modifier = modifier,
         icon = {
             Image(
-                painter = rememberDrawablePainter(drawable = AppCompatResources.getDrawable(context, icon)),
+                painter = painterResource(id = icon),
                 contentDescription = null,
                 modifier = Modifier.align(Alignment.Center)
             )
@@ -280,7 +335,7 @@ fun LargeItemButton(
 @Composable
 fun LargeItemButton(
     annotatedStringText: AnnotatedString,
-    @DrawableRes icon: Int,
+    icon: @Composable BoxScope.() -> Unit,
     modifier: Modifier = Modifier,
     enabled: Boolean = true,
     colors: ButtonColors = transparentButtonColors(),

app/src/main/java/org/thoughtcrime/securesms/ui/theme/Dimensions.kt

@@ -34,7 +34,7 @@ data class Dimensions(
     val iconLargeAvatar: Dp = 36.dp,
     val iconLarge: Dp = 46.dp,
     val iconXLarge: Dp = 60.dp,
-    val iconXXLarge: Dp = 80.dp,
+    val iconXXLarge: Dp = 90.dp,
     val iconXXLargeAvatar: Dp = 190.dp,
 
     val shapeExtraSmall: Dp = 8.dp,

app/src/main/res/drawable/ic_path_yellow.xml

@@ -3,7 +3,6 @@ androidMinSdkVersion = "26"
 androidTargetSdkVersion = "35"
 androidCompileSdkVersion = "35"
 accompanistPermissionsVersion = "0.37.3"
-accompanistThemeadapterAppcompatVersion = "0.33.1-alpha"
 activityKtxVersion = "1.10.1"
 androidImageCropperVersion = "4.5.0"
 androidVersion = "125.6422.07"
@@ -79,7 +78,6 @@ huaweiPushVersion = "6.7.0.300"
 googlePlayReviewVersion = "2.0.2"
 
 [libraries]
-accompanist-drawablepainter = { module = "com.google.accompanist:accompanist-drawablepainter", version.ref = "accompanistThemeadapterAppcompatVersion" }
 accompanist-permissions = { module = "com.google.accompanist:accompanist-permissions", version.ref = "accompanistPermissionsVersion" }
 android = { module = "io.github.webrtc-sdk:android", version.ref = "androidVersion" }
 android-image-cropper = { module = "com.vanniktech:android-image-cropper", version.ref = "androidImageCropperVersion" }