Merge pull request #1559 from session-foundation/feature/pro-settings-pt2

Pro Settings pt2

Author: ThomasSession

app/src/main/java/org/session/libsession/utilities/TextSecurePreferences.kt

@@ -1737,6 +1737,7 @@ class AppTextSecurePreferences @Inject constructor(
 
     override fun setDebugSubscriptionType(status: DebugMenuViewModel.DebugSubscriptionStatus?) {
         setStringPreference(TextSecurePreferences.DEBUG_SUBSCRIPTION_STATUS, status?.name)
+        _events.tryEmit(TextSecurePreferences.DEBUG_SUBSCRIPTION_STATUS)
     }
 
     override fun getSubscriptionProvider(): String? {

app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/VisibleMessageView.kt

@@ -341,7 +341,10 @@ class VisibleMessageView : FrameLayout {
 
         // Set text & icons as appropriate for the message state. Note: Possible message states we care
         // about are: isFailed, isSyncFailed, isPending, isSyncing, isResyncing, isRead, and isSent.
-        messageStatus.messageText?.let(binding.messageStatusTextView::setText)
+        messageStatus.messageText?.let{
+            binding.messageStatusTextView.setText(it)
+            binding.messageStatusTextView.contentDescription = context.getString(R.string.AccessibilityId_send_status) + it
+        }
         messageStatus.iconTint?.let(binding.messageStatusTextView::setTextColor)
         messageStatus.iconId?.let { ContextCompat.getDrawable(context, it) }
             ?.run { messageStatus.iconTint?.let { mutate().apply { setTint(it) } } ?: this }

app/src/main/java/org/thoughtcrime/securesms/conversation/v2/settings/ConversationSettingsScreen.kt

@@ -419,6 +419,7 @@ private fun ConversationSettings1on1LongNamePreview() {
                 editCommand = ShowGroupEditDialog,
                 description = "This is a long description with a lot of text that should be more than 2 lines and should be truncated but you never know, it depends on size and such things dfkjdfklj asjdlkj lkjdf lkjsa dlkfjlk asdflkjlksdfjklasdfjasdlkfjasdflk dfkjdfklj asjdlkj lkjdf lkjsa dlkfjlk asdflkjlksdfjklasdfjasdlkfjasdflk dfkjdfklj asjdlkj lkjdf lkjsa dlkfjlk asdflkjlksdfjklasdfjasdlkfjasdflk dfkjdfklj asjdlkj lkjdf lkjsa dlkfjlk asdflkjlksdfjklasdfjasdlkfjasdflk dfkjdfklj asjdlkj lkjdf lkjsa dlkfjlk asdflkjlksdfjklasdfjasdlkfjasdflk dfkjdfklj asjdlkj lkjdf lkjsa dlkfjlk asdflkjlksdfjklasdfjasdlkfjasdflk dfkjdfklj asjdlkj lkjdf lkjsa dlkfjlk asdflkjlksdfjklasdfjasdlkfjasdflk dfkjdfklj asjdlkj lkjdf lkjsa dlkfjlk asdflkjlksdfjklasdfjasdlkfjasdflk dfkjdfklj asjdlkj lkjdf lkjsa dlkfjlk asdflkjlksdfjklasdfjasdlkfjasdflk dfkjdfklj asjdlkj lkjdf lkjsa dlkfjlk asdflkjlksdfjklasdfjasdlkfjasdflk dfkjdfklj asjdlkj lkjdf lkjsa dlkfjlk asdflkjlksdfjklasdfjasdlkfjasdflk dfkjdfklj asjdlkj lkjdf lkjsa dlkfjlk asdflkjlksdfjklasdfjasdlkfjasdflk dfkjdfklj asjdlkj lkjdf lkjsa dlkfjlk asdflkjlksdfjklasdfjasdlkfjasdflk dfkjdfklj asjdlkj lkjdf lkjsa dlkfjlk asdflkjlksdfjklasdfjasdlkfjasdflk dfkjdfklj asjdlkj lkjdf lkjsa dlkfjlk asdflkjlksdfjklasdfjasdlkfjasdflk dfkjdfklj asjdlkj lkjdf lkjsa dlkfjlk asdflkjlksdfjklasdfjasdlkfjasdflk dfkjdfklj asjdlkj lkjdf lkjsa dlkfjlk asdflkjlksdfjklasdfjasdlkfjasdflk dfkjdfklj asjdlkj lkjdf lkjsa dlkfjlk asdflkjlksdfjklasdfjasdlkfjasdflk dfkjdfklj asjdlkj lkjdf lkjsa dlkfjlk asdflkjlksdfjklasdfjasdlkfjasdflk dfkjdfklj asjdlkj lkjdf lkjsa dlkfjlk asdflkjlksdfjklasdfjasdlkfjasdflk dfkjdfklj asjdlkj lkjdf lkjsa dlkfjlk asdflkjlksdfjklasdfjasdlkfjasdflk dfkjdfklj asjdlkj lkjdf lkjsa dlkfjlk asdflkjlksdfjklasdfjasdlkfjasdflk lkasdjfalsdkfjasdklfj lsadkfjalsdkfjsadklf lksdjfalsdkfjasdlkfjasdlkf asldkfjasdlkfja and this is the end",
                 displayAccountId = "05000000000000000000000000000000000000000000000000000000000000000",
+                showProBadge = true,
                 avatarUIData = AvatarUIData(
                     listOf(
                         AvatarUIElement(

app/src/main/java/org/thoughtcrime/securesms/home/startconversation/home/StartConversation.kt

@@ -70,12 +70,15 @@ internal fun StartConversationScreen(
             ) {
                 val dividerIndent: Dp = LocalDimensions.current.itemButtonIconSpacing + 2*LocalDimensions.current.smallSpacing
                 val newMessageTitleTxt:String = context.resources.getQuantityString(R.plurals.messageNew, 1, 1)
+                val itemHeight = 50.dp
+
                 ItemButton(
                     text = annotatedStringResource(newMessageTitleTxt),
                     textStyle = LocalType.current.xl,
                     iconRes = R.drawable.ic_message_square,
-                    iconSize = LocalDimensions.current.iconMedium2,
+                    iconSize = LocalDimensions.current.iconMedium,
                     modifier = Modifier.qaTag(R.string.AccessibilityId_messageNew),
+                    minHeight = itemHeight,
                     onClick = {
                         navigateTo(StartConversationDestination.NewMessage)
                     }
@@ -90,8 +93,9 @@ internal fun StartConversationScreen(
                     text = annotatedStringResource(R.string.groupCreate),
                     textStyle = LocalType.current.xl,
                     iconRes = R.drawable.ic_users_group_custom,
-                    iconSize = LocalDimensions.current.iconMedium2,
+                    iconSize = LocalDimensions.current.iconMedium,
                     modifier = Modifier.qaTag(R.string.AccessibilityId_groupCreate),
+                    minHeight = itemHeight,
                     onClick = {
                         navigateTo(StartConversationDestination.CreateGroup)
                     }
@@ -106,8 +110,9 @@ internal fun StartConversationScreen(
                     text = annotatedStringResource(R.string.communityJoin),
                     textStyle = LocalType.current.xl,
                     iconRes = R.drawable.ic_globe,
-                    iconSize = LocalDimensions.current.iconMedium2,
+                    iconSize = LocalDimensions.current.iconMedium,
                     modifier = Modifier.qaTag(R.string.AccessibilityId_communityJoin),
+                    minHeight = itemHeight,
                     onClick = {
                         navigateTo(StartConversationDestination.JoinCommunity)
                     }
@@ -122,8 +127,9 @@ internal fun StartConversationScreen(
                     text = annotatedStringResource(R.string.sessionInviteAFriend),
                     textStyle = LocalType.current.xl,
                     iconRes = R.drawable.ic_user_round_plus,
-                    iconSize = LocalDimensions.current.iconMedium2,
+                    iconSize = LocalDimensions.current.iconMedium,
                     modifier = Modifier.qaTag(R.string.AccessibilityId_sessionInviteAFriendButton),
+                    minHeight = itemHeight,
                     onClick = {
                         navigateTo(StartConversationDestination.InviteFriend)
                     }