Merge branch 'dev' into just-prefs

Author: bemusementpark

app/build.gradle

@@ -381,7 +381,7 @@ dependencies {
     implementation "androidx.compose.ui:ui-tooling:$composeVersion"
     implementation "androidx.compose.runtime:runtime-livedata:$composeVersion"
     implementation "androidx.compose.foundation:foundation-layout:$composeVersion"
-    implementation "androidx.compose.material:material:$composeVersion"
+    implementation "androidx.compose.material3:material3:1.2.1"
     androidTestImplementation "androidx.compose.ui:ui-test-junit4-android:$composeVersion"
     debugImplementation "androidx.compose.ui:ui-test-manifest:$composeVersion"
 

app/src/main/java/org/thoughtcrime/securesms/SessionDialogBuilder.kt

@@ -114,14 +114,14 @@ class SessionDialogBuilder(val context: Context) {
         options,
     ) { dialog, it -> onSelect(it); dialog.dismiss() }
 
-    fun destructiveButton(
+    fun dangerButton(
         @StringRes text: Int,
         @StringRes contentDescription: Int = text,
         listener: () -> Unit = {}
     ) = button(
         text,
         contentDescription,
-        R.style.Widget_Session_Button_Dialog_DestructiveText,
+        R.style.Widget_Session_Button_Dialog_DangerText,
     ) { listener() }
 
     fun okButton(listener: (() -> Unit) = {}) = button(android.R.string.ok) { listener() }

app/src/main/java/org/thoughtcrime/securesms/components/ProfilePictureView.kt

@@ -17,6 +17,7 @@ import org.session.libsession.messaging.contacts.Contact
 import org.session.libsession.utilities.Address
 import org.session.libsession.utilities.GroupUtil
 import org.session.libsession.utilities.TextSecurePreferences
+import org.session.libsession.utilities.prefs
 import org.session.libsession.utilities.recipients.Recipient
 import org.session.libsignal.utilities.Log
 import org.thoughtcrime.securesms.dependencies.DatabaseComponent
@@ -30,7 +31,7 @@ class ProfilePictureView @JvmOverloads constructor(
 
     private val binding = ViewProfilePictureBinding.inflate(LayoutInflater.from(context), this)
     private val glide: GlideRequests = GlideApp.with(this)
-    private val prefs = TextSecurePreferences(context)
+    private val prefs = context.prefs
     private val userPublicKey = prefs.getLocalNumber()
     var publicKey: String? = null
     var displayName: String? = null

app/src/main/java/org/thoughtcrime/securesms/components/emoji/CompositeEmojiPageModel.java

@@ -0,0 +1,39 @@
+package org.thoughtcrime.securesms.components.emoji
+
+import android.net.Uri
+import androidx.annotation.AttrRes
+import java.util.LinkedList
+
+class CompositeEmojiPageModel(
+    @field:AttrRes @param:AttrRes private val iconAttr: Int,
+    private val models: List<EmojiPageModel>
+) : EmojiPageModel {
+
+    override fun getKey(): String {
+        return if (models.isEmpty()) "" else models[0].key
+    }
+
+    override fun getIconAttr(): Int { return iconAttr }
+
+    override fun getEmoji(): List<String> {
+        val emojis: MutableList<String> = LinkedList()
+        for (model in models) {
+            emojis.addAll(model.emoji)
+        }
+        return emojis
+    }
+
+    override fun getDisplayEmoji(): List<Emoji> {
+        val emojis: MutableList<Emoji> = LinkedList()
+        for (model in models) {
+            emojis.addAll(model.displayEmoji)
+        }
+        return emojis
+    }
+
+    override fun hasSpriteMap(): Boolean { return false }
+
+    override fun getSpriteUri(): Uri? { return null }
+
+    override fun isDynamic(): Boolean { return false }
+}

app/src/main/java/org/thoughtcrime/securesms/components/emoji/CompositeEmojiPageModel.kt

@@ -2,7 +2,7 @@ package org.thoughtcrime.securesms.components.menu
 
 import android.content.Context
 import androidx.annotation.AttrRes
-import androidx.annotation.ColorRes
+import androidx.annotation.ColorInt
 
 /**
  * Represents an action to be rendered
@@ -13,5 +13,5 @@ data class ActionItem(
   val action: Runnable,
   val contentDescription: Int? = null,
   val subtitle: ((Context) -> CharSequence?)? = null,
-  @ColorRes val color: Int? = null,
+  @ColorInt val color: Int? = null,
 )

app/src/main/java/org/thoughtcrime/securesms/components/menu/ActionItem.kt

@@ -78,7 +78,7 @@ class ContextMenuList(recyclerView: RecyclerView, onItemClick: () -> Unit) {
 
     override fun bind(model: DisplayItem) {
       val item = model.item
-      val color = item.color?.let { ContextCompat.getColor(context, it) }
+      val color = item.color
 
       if (item.iconRes > 0) {
         val typedValue = TypedValue()

app/src/main/java/org/thoughtcrime/securesms/components/menu/ContextMenuList.kt

@@ -14,7 +14,6 @@ import org.session.libsession.utilities.ExpirationUtil
 import org.session.libsession.utilities.SSKEnvironment.MessageExpirationManagerProtocol
 import org.session.libsession.utilities.TextSecurePreferences
 import org.session.libsession.utilities.getExpirationTypeDisplayValue
-import org.thoughtcrime.securesms.database.ThreadDatabase
 import org.thoughtcrime.securesms.database.model.MessageRecord
 import org.thoughtcrime.securesms.showSessionDialog
 import org.thoughtcrime.securesms.util.ConfigurationMessageUtilities
@@ -57,7 +56,7 @@ class DisappearingMessages @Inject constructor(
                     context.getExpirationTypeDisplayValue(message.isNotDisappearAfterRead)
                 )
         })
-        destructiveButton(
+        dangerButton(
                 text = if (message.expiresIn == 0L) R.string.dialog_disappearing_messages_follow_setting_confirm else R.string.dialog_disappearing_messages_follow_setting_set,
                 contentDescription = if (message.expiresIn == 0L) R.string.AccessibilityId_confirm else R.string.AccessibilityId_set_button
         ) {

app/src/main/java/org/thoughtcrime/securesms/conversation/disappearingmessages/DisappearingMessages.kt

@@ -13,8 +13,8 @@ import kotlin.time.Duration.Companion.seconds
 
 fun State.toUiState() = UiState(
     cards = listOfNotNull(
-        typeOptions()?.let { ExpiryOptionsCard(GetString(R.string.activity_disappearing_messages_delete_type), it) },
-        timeOptions()?.let { ExpiryOptionsCard(GetString(R.string.activity_disappearing_messages_timer), it) }
+        typeOptions()?.let { ExpiryOptionsCardData(GetString(R.string.activity_disappearing_messages_delete_type), it) },
+        timeOptions()?.let { ExpiryOptionsCardData(GetString(R.string.activity_disappearing_messages_timer), it) }
     ),
     showGroupFooter = isGroup && isNewConfigEnabled,
     showSetButton = isSelfAdmin

app/src/main/java/org/thoughtcrime/securesms/conversation/disappearingmessages/ui/Adapter.kt

@@ -3,11 +3,13 @@ package org.thoughtcrime.securesms.conversation.disappearingmessages.ui
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.verticalScroll
-import androidx.compose.material.Text
+import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
@@ -18,15 +20,15 @@ import androidx.compose.ui.unit.dp
 import network.loki.messenger.R
 import network.loki.messenger.libsession_util.util.ExpiryMode
 import org.thoughtcrime.securesms.ui.Callbacks
-import org.thoughtcrime.securesms.ui.LocalDimensions
+import org.thoughtcrime.securesms.ui.theme.LocalDimensions
 import org.thoughtcrime.securesms.ui.NoOpCallbacks
 import org.thoughtcrime.securesms.ui.OptionsCard
 import org.thoughtcrime.securesms.ui.RadioOption
-import org.thoughtcrime.securesms.ui.color.LocalColors
+import org.thoughtcrime.securesms.ui.theme.LocalColors
 import org.thoughtcrime.securesms.ui.components.SlimOutlineButton
 import org.thoughtcrime.securesms.ui.contentDescription
-import org.thoughtcrime.securesms.ui.extraSmall
 import org.thoughtcrime.securesms.ui.fadingEdges
+import org.thoughtcrime.securesms.ui.theme.LocalType
 
 typealias ExpiryCallbacks = Callbacks<ExpiryMode>
 typealias ExpiryRadioOption = RadioOption<ExpiryMode>
@@ -39,26 +41,32 @@ fun DisappearingMessages(
 ) {
     val scrollState = rememberScrollState()
 
-    Column(modifier = modifier.padding(horizontal = LocalDimensions.current.margin)) {
+    Column(modifier = modifier.padding(horizontal = LocalDimensions.current.spacing)) {
         Box(modifier = Modifier.weight(1f)) {
             Column(
                 modifier = Modifier
-                    .padding(bottom = 20.dp)
+                    .padding(vertical = LocalDimensions.current.spacing)
                     .verticalScroll(scrollState)
                     .fadingEdges(scrollState),
-                verticalArrangement = Arrangement.spacedBy(LocalDimensions.current.smallItemSpacing)
             ) {
-                state.cards.forEach {
-                    OptionsCard(it, callbacks)
+                state.cards.forEachIndexed { index, option ->
+                    OptionsCard(option, callbacks)
+
+                    // add spacing if not the last item
+                    if(index != state.cards.lastIndex){
+                        Spacer(modifier = Modifier.height(LocalDimensions.current.spacing))
+                    }
                 }
 
                 if (state.showGroupFooter) Text(
                     text = stringResource(R.string.activity_disappearing_messages_group_footer),
-                    style = extraSmall,
+                    style = LocalType.current.extraSmall,
                     fontWeight = FontWeight(400),
                     color = LocalColors.current.textSecondary,
                     textAlign = TextAlign.Center,
-                    modifier = Modifier.fillMaxWidth()
+                    modifier = Modifier
+                        .fillMaxWidth()
+                        .padding(top = LocalDimensions.current.xsSpacing)
                 )
             }
         }
@@ -68,7 +76,7 @@ fun DisappearingMessages(
             modifier = Modifier
                 .contentDescription(R.string.AccessibilityId_set_button)
                 .align(Alignment.CenterHorizontally)
-                .padding(bottom = 20.dp),
+                .padding(bottom = LocalDimensions.current.spacing),
             onClick = callbacks::onSetClick
         )
     }