Merge pull request #1528 from session-foundation/fix/new-message-compose

Fix/new message compose

Author: ThomasSession

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

@@ -183,6 +183,7 @@ private fun CommunityScreen(
                     .fillMaxWidth()
                     .qaTag(R.string.AccessibilityId_communityJoin),
                 enabled = state.isJoinButtonEnabled,
+                disabledColor = LocalColors.current.textSecondary,
                 onClick = {
                     sendCommand(JoinCommunityViewModel.Commands.JoinCommunity(
                         state.communityUrl

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

@@ -74,6 +74,7 @@ internal fun StartConversationScreen(
                     text = annotatedStringResource(newMessageTitleTxt),
                     textStyle = LocalType.current.xl,
                     iconRes = R.drawable.ic_message_square,
+                    iconSize = LocalDimensions.current.iconMedium2,
                     modifier = Modifier.qaTag(R.string.AccessibilityId_messageNew),
                     onClick = {
                         navigateTo(StartConversationDestination.NewMessage)
@@ -89,6 +90,7 @@ internal fun StartConversationScreen(
                     text = annotatedStringResource(R.string.groupCreate),
                     textStyle = LocalType.current.xl,
                     iconRes = R.drawable.ic_users_group_custom,
+                    iconSize = LocalDimensions.current.iconMedium2,
                     modifier = Modifier.qaTag(R.string.AccessibilityId_groupCreate),
                     onClick = {
                         navigateTo(StartConversationDestination.CreateGroup)
@@ -104,6 +106,7 @@ internal fun StartConversationScreen(
                     text = annotatedStringResource(R.string.communityJoin),
                     textStyle = LocalType.current.xl,
                     iconRes = R.drawable.ic_globe,
+                    iconSize = LocalDimensions.current.iconMedium2,
                     modifier = Modifier.qaTag(R.string.AccessibilityId_communityJoin),
                     onClick = {
                         navigateTo(StartConversationDestination.JoinCommunity)
@@ -119,6 +122,7 @@ internal fun StartConversationScreen(
                     text = annotatedStringResource(R.string.sessionInviteAFriend),
                     textStyle = LocalType.current.xl,
                     iconRes = R.drawable.ic_user_round_plus,
+                    iconSize = LocalDimensions.current.iconMedium2,
                     modifier = Modifier.qaTag(R.string.AccessibilityId_sessionInviteAFriendButton),
                     onClick = {
                         navigateTo(StartConversationDestination.InviteFriend)

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

@@ -139,6 +139,7 @@ private fun EnterAccountId(
                     .fillMaxWidth()
                     .qaTag(R.string.next),
                 enabled = state.isNextButtonEnabled,
+                disabledColor = LocalColors.current.textSecondary,
                 onClick = callbacks::onContinue
             ) {
                 LoadingArcOr(state.loading) {

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

@@ -59,6 +59,7 @@ import androidx.compose.ui.text.style.TextAlign
 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.sp
 import com.bumptech.glide.integration.compose.ExperimentalGlideComposeApi
 import com.bumptech.glide.integration.compose.GlideImage
 import network.loki.messenger.BuildConfig
@@ -107,6 +108,7 @@ import org.thoughtcrime.securesms.ui.ProBadgeText
 import org.thoughtcrime.securesms.ui.RadioOption
 import org.thoughtcrime.securesms.ui.components.AcccentOutlineCopyButton
 import org.thoughtcrime.securesms.ui.components.AccentOutlineButton
+import org.thoughtcrime.securesms.ui.components.AnnotatedTextWithIcon
 import org.thoughtcrime.securesms.ui.components.AppBarCloseIcon
 import org.thoughtcrime.securesms.ui.components.Avatar
 import org.thoughtcrime.securesms.ui.components.BaseBottomSheet
@@ -116,6 +118,7 @@ import org.thoughtcrime.securesms.ui.components.SessionOutlinedTextField
 import org.thoughtcrime.securesms.ui.components.SmallCircularProgressIndicator
 import org.thoughtcrime.securesms.ui.components.annotatedStringResource
 import org.thoughtcrime.securesms.ui.qaTag
+import org.thoughtcrime.securesms.ui.safeContentWidth
 import org.thoughtcrime.securesms.ui.theme.LocalColors
 import org.thoughtcrime.securesms.ui.theme.LocalDimensions
 import org.thoughtcrime.securesms.ui.theme.LocalType
@@ -252,16 +255,21 @@ fun Settings(
             Spacer(modifier = Modifier.height(LocalDimensions.current.spacing))
 
             // name
-            ProBadgeText(
+            AnnotatedTextWithIcon(
                 modifier = Modifier.qaTag(R.string.AccessibilityId_displayName)
+                    .fillMaxWidth()
+                    .safeContentWidth()
                     .clickable(
                         interactionSource = remember { MutableInteractionSource() },
                         indication = null
                     ) {
                         sendCommand(ShowUsernameDialog)
                     },
                 text = uiState.username,
-                showBadge = uiState.showProBadge,
+                iconRes = if(uiState.showProBadge) R.drawable.ic_pro_badge else null,
+                onIconClick = null,
+                iconSize = 53.sp to 24.sp,
+                style = LocalType.current.h5,
             )
 
             Spacer(modifier = Modifier.height(LocalDimensions.current.smallSpacing))

app/src/main/java/org/thoughtcrime/securesms/preferences/prosettings/ProSettingsHomeScreen.kt

@@ -254,6 +254,7 @@ fun ProStats(
             verticalArrangement = Arrangement.spacedBy(LocalDimensions.current.smallSpacing)
         ){
             Row(
+                verticalAlignment = Alignment.CenterVertically,
                 horizontalArrangement = Arrangement.spacedBy(LocalDimensions.current.xsSpacing)
             ) {
                 // groups updated
@@ -281,6 +282,7 @@ fun ProStats(
             }
 
             Row(
+                verticalAlignment = Alignment.CenterVertically,
                 horizontalArrangement = Arrangement.spacedBy(LocalDimensions.current.xsSpacing)
             ) {
                 // Pro Badges
@@ -324,7 +326,7 @@ fun ProStatItem(
         Image(
             painter = painterResource(id = icon),
             contentDescription = null,
-            modifier = Modifier.size(LocalDimensions.current.iconRowItem),
+            modifier = Modifier.size(LocalDimensions.current.iconMedium2),
             colorFilter = ColorFilter.tint(LocalColors.current.accent)
         )
 

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

@@ -264,7 +264,7 @@ fun ItemButton(
     modifier: Modifier = Modifier,
     textStyle: TextStyle = LocalType.current.h8,
     iconTint: Color? = null,
-    iconSize: Dp = LocalDimensions.current.iconRowItem,
+    iconSize: Dp = LocalDimensions.current.iconMedium,
     subtitle: String? = null,
     @StringRes subtitleQaTag: Int? = null,
     enabled: Boolean = true,
@@ -1058,7 +1058,7 @@ fun IconActionRowItem(
     textStyle: TextStyle = LocalType.current.h8,
     subtitleStyle: TextStyle = LocalType.current.small,
     iconColor: Color = LocalColors.current.text,
-    iconSize: Dp = LocalDimensions.current.iconRowItem,
+    iconSize: Dp = LocalDimensions.current.iconMedium,
     minHeight: Dp = LocalDimensions.current.minItemButtonHeight,
     paddingValues: PaddingValues = PaddingValues(horizontal = LocalDimensions.current.smallSpacing),
 ){

app/src/main/java/org/thoughtcrime/securesms/ui/components/BottomSheets.kt

@@ -1,5 +1,8 @@
 package org.thoughtcrime.securesms.ui.components
 
+import android.app.Activity
+import android.graphics.Color
+import android.os.Build
 import androidx.annotation.DrawableRes
 import androidx.annotation.StringRes
 import androidx.compose.foundation.clickable
@@ -20,13 +23,18 @@ import androidx.compose.material3.Text
 import androidx.compose.material3.rememberModalBottomSheetState
 import androidx.compose.material3.rememberStandardBottomSheetState
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.DisposableEffect
+import androidx.compose.runtime.SideEffect
 import androidx.compose.ui.Alignment.Companion.CenterVertically
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalView
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.tooling.preview.PreviewParameter
+import androidx.compose.ui.window.DialogWindowProvider
+import androidx.core.view.WindowCompat
 import network.loki.messenger.R
 import org.thoughtcrime.securesms.ui.qaTag
 import org.thoughtcrime.securesms.ui.theme.LocalColors
@@ -58,9 +66,30 @@ fun BaseBottomSheet(
             topEnd = LocalDimensions.current.xsSpacing
         ),
         dragHandle = dragHandle,
-        containerColor = LocalColors.current.backgroundSecondary,
-        content = content
-    )
+        containerColor = LocalColors.current.backgroundSecondary
+    ){
+        // make sure the status and navigation bars follow our theme color's light vs dark
+        val view = LocalView.current
+        val isLight = LocalColors.current.isLight
+
+        DisposableEffect(Unit) {
+            val window = (view.parent as? DialogWindowProvider)?.window
+            if (window != null && Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+                val prev = window.isNavigationBarContrastEnforced
+                window.isNavigationBarContrastEnforced = false
+                // Set status bar color
+                WindowCompat.getInsetsController(window, view).isAppearanceLightStatusBars = isLight
+                // Set navigation bar color
+                WindowCompat.getInsetsController(window, view).isAppearanceLightNavigationBars = isLight
+
+                onDispose { window.isNavigationBarContrastEnforced = prev }
+            } else {
+                onDispose { }
+            }
+        }
+
+        content()
+    }
 }
 
 

app/src/main/java/org/thoughtcrime/securesms/ui/components/Button.kt

@@ -162,8 +162,13 @@ fun Button(
     Button(text, onClick, ButtonType.Outline(LocalColors.current.accentText), modifier, enabled, minWidth = minWidth)
 }
 
-@Composable fun AccentOutlineButton(modifier: Modifier = Modifier, enabled: Boolean = true, onClick: () -> Unit, content: @Composable RowScope.() -> Unit) {
-    Button(onClick, ButtonType.Outline(LocalColors.current.accentText), modifier, enabled, content = content)
+@Composable fun AccentOutlineButton(modifier: Modifier = Modifier, enabled: Boolean = true,
+                                    disabledColor: Color = LocalColors.current.disabled,
+                                    onClick: () -> Unit, content: @Composable RowScope.() -> Unit) {
+    Button(onClick, ButtonType.Outline(
+        contentColor = LocalColors.current.accentText,
+        disabledColor = disabledColor
+    ), modifier, enabled, content = content)
 }
 
 @Composable fun SlimOutlineButton(modifier: Modifier = Modifier, color: Color = LocalColors.current.text, enabled: Boolean = true, onClick: () -> Unit, content: @Composable RowScope.() -> Unit) {

app/src/main/java/org/thoughtcrime/securesms/ui/components/ButtonType.kt

@@ -26,18 +26,19 @@ interface ButtonType {
 
     class Outline(
         private val contentColor: Color,
-        private val borderColor: Color = contentColor
+        private val borderColor: Color = contentColor,
+        private val disabledColor: Color? = null
     ): ButtonType {
         @Composable
         override fun border(enabled: Boolean) = BorderStroke(
             width = LocalDimensions.current.borderStroke,
-            color = if (enabled) borderColor else LocalColors.current.disabled
+            color = if (enabled) borderColor else disabledColor ?: LocalColors.current.disabled
         )
         @Composable
         override fun buttonColors() = ButtonDefaults.buttonColors(
             contentColor = contentColor,
             containerColor = Color.Transparent,
-            disabledContentColor = LocalColors.current.disabled,
+            disabledContentColor = disabledColor ?: LocalColors.current.disabled,
             disabledContainerColor = Color.Transparent
         )
     }

app/src/main/java/org/thoughtcrime/securesms/ui/components/Text.kt

@@ -259,7 +259,7 @@ fun AnnotatedTextWithIcon(
     style: TextStyle = LocalType.current.base,
     color: Color = Color.Unspecified,
     iconSize: Pair<TextUnit, TextUnit> = 12.sp to 12.sp,
-    iconPaddingValues: PaddingValues = PaddingValues(1.dp),
+    iconPaddingValues: PaddingValues = PaddingValues(start = style.lineHeight.value.dp * 0.2f),
     onIconClick: (() -> Unit)? = null
 ) {
     var inlineContent: Map<String, InlineTextContent> = mapOf()