Merge branch 'develop' into feature/fga/improve_node_architecture

.github/workflows/nightly.yml

@@ -34,7 +34,7 @@ jobs:
           FIREBASE_TOKEN: ${{ secrets.ELEMENT_ANDROID_NIGHTLY_FIREBASE_TOKEN }}
       - name: Additionally upload Nightly APK to browserstack for testing
         continue-on-error: true # don't block anything by this upload failing (for now)
-        run: curl -u "$BROWSERSTACK_USERNAME:$BROWSERSTACK_PASSWORD" -X POST "https://api-cloud.browserstack.com/app-automate/upload" -F "file=@app/build/outputs/apk/nightly/app-nightly.apk" -F "custom_id=element-x-android-nightly"
+        run: curl -u "$BROWSERSTACK_USERNAME:$BROWSERSTACK_PASSWORD" -X POST "https://api-cloud.browserstack.com/app-automate/upload" -F "file=@app/build/outputs/apk/nightly/app-universal-nightly.apk" -F "custom_id=element-x-android-nightly"
         env:
           BROWSERSTACK_USERNAME: ${{ secrets.ELEMENT_ANDROID_BROWSERSTACK_USERNAME }}
           BROWSERSTACK_PASSWORD: ${{ secrets.ELEMENT_ANDROID_BROWSERSTACK_ACCESS_KEY }}

.github/workflows/nightly_manual.yml

@@ -13,6 +13,15 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
+      - name: Install towncrier
+        run: |
+          python3 -m pip install towncrier
+      - name: Prepare changelog file
+        run: |
+          mv towncrier.toml towncrier.toml.bak
+          sed 's/CHANGES\.md/CHANGES_NIGHTLY\.md/' towncrier.toml.bak > towncrier.toml
+          rm towncrier.toml.bak
+          yes n | towncrier build --version nightly
       - name: Build and upload Nightly APK
         run: |
           ./gradlew assembleNightly appDistributionUploadNightly $CI_GRADLE_ARG_PROPERTIES
@@ -23,8 +32,7 @@ jobs:
           FIREBASE_TOKEN: ${{ secrets.ELEMENT_ANDROID_NIGHTLY_FIREBASE_TOKEN }}
       - name: Additionally upload Nightly APK to browserstack for testing
         continue-on-error: true # don't block anything by this upload failing (for now)
-        run: curl -u "$BROWSERSTACK_USERNAME:$BROWSERSTACK_PASSWORD" -X POST "https://api-cloud.browserstack.com/app-automate/upload" -F "file=@app/build/outputs/apk/nightly/app-nightly.apk" -F "custom_id=element-x-android-nightly"
+        run: curl -u "$BROWSERSTACK_USERNAME:$BROWSERSTACK_PASSWORD" -X POST "https://api-cloud.browserstack.com/app-automate/upload" -F "file=@app/build/outputs/apk/nightly/app-universal-nightly.apk" -F "custom_id=element-x-android-nightly"
         env:
           BROWSERSTACK_USERNAME: ${{ secrets.ELEMENT_ANDROID_BROWSERSTACK_USERNAME }}
           BROWSERSTACK_PASSWORD: ${{ secrets.ELEMENT_ANDROID_BROWSERSTACK_ACCESS_KEY }}
-

app/build.gradle.kts

@@ -125,6 +125,10 @@ android {
 
             firebaseAppDistribution {
                 artifactType = "APK"
+                // We upload the universal APK to fix this error:
+                // "App Distribution found more than 1 output file for this variant.
+                // Please contact firebase-support@google.com for help using APK splits with App Distribution."
+                artifactPath = "$rootDir/app/build/outputs/apk/nightly/app-universal-nightly.apk"
                 // This file will be generated by the GitHub action
                 releaseNotesFile = "CHANGES_NIGHTLY.md"
                 groups = "external-testers"

changelog.d/101.bugfix

@@ -0,0 +1 @@
+Address design issues in the change server screen

features/login/impl/src/main/kotlin/io/element/android/features/login/impl/changeserver/ChangeServerView.kt

@@ -17,6 +17,7 @@
 package io.element.android.features.login.impl.changeserver
 
 import androidx.compose.foundation.background
+import androidx.compose.foundation.interaction.MutableInteractionSource
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Spacer
@@ -44,23 +45,32 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalFocusManager
 import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.ExperimentalTextApi
+import androidx.compose.ui.text.ParagraphStyle
+import androidx.compose.ui.text.SpanStyle
+import androidx.compose.ui.text.UrlAnnotation
+import androidx.compose.ui.text.buildAnnotatedString
 import androidx.compose.ui.text.input.ImeAction
 import androidx.compose.ui.text.input.KeyboardType
 import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.text.withStyle
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.tooling.preview.PreviewParameter
 import androidx.compose.ui.unit.dp
 import io.element.android.features.login.impl.R
 import io.element.android.features.login.impl.error.changeServerError
+import io.element.android.features.login.impl.util.LoginConstants
 import io.element.android.libraries.architecture.Async
 import io.element.android.libraries.designsystem.ElementTextStyles
+import io.element.android.libraries.designsystem.LinkColor
+import io.element.android.libraries.designsystem.components.ClickableLinkText
+import io.element.android.libraries.designsystem.components.button.BackButton
 import io.element.android.libraries.designsystem.components.dialogs.ConfirmationDialog
 import io.element.android.libraries.designsystem.components.dialogs.ErrorDialog
 import io.element.android.libraries.designsystem.components.form.textFieldState
 import io.element.android.libraries.designsystem.preview.ElementPreviewDark
 import io.element.android.libraries.designsystem.preview.ElementPreviewLight
 import io.element.android.libraries.designsystem.theme.LocalColors
-import io.element.android.libraries.designsystem.components.button.BackButton
 import io.element.android.libraries.designsystem.theme.components.Button
 import io.element.android.libraries.designsystem.theme.components.CircularProgressIndicator
 import io.element.android.libraries.designsystem.theme.components.Icon
@@ -75,7 +85,7 @@ import io.element.android.libraries.testtags.testTag
 import org.matrix.rustcomponents.sdk.AuthenticationException
 import io.element.android.libraries.ui.strings.R as StringR
 
-@OptIn(ExperimentalMaterial3Api::class)
+@OptIn(ExperimentalMaterial3Api::class, ExperimentalTextApi::class)
 @Composable
 fun ChangeServerView(
     state: ChangeServerState,
@@ -215,12 +225,27 @@ fun ChangeServerView(
                     }
                 }
                 Spacer(Modifier.height(8.dp))
-                Text(
+                val footerMessage = stringResource(StringR.string.server_selection_server_footer)
-                    text = stringResource(StringR.string.server_selection_server_footer),
+                val footerAction = stringResource(StringR.string.server_selection_server_footer_action)
+                val footerText = buildAnnotatedString {
+                    val defaultColor = MaterialTheme.colorScheme.tertiary
+                    withStyle(ParagraphStyle(textAlign = TextAlign.Start)) {
+                        withStyle(SpanStyle(color = defaultColor)) {
+                            append(footerMessage)
+                            append(" ")
+                        }
+                        val start = length
+                        withStyle(SpanStyle(color = LinkColor)) {
+                            append(footerAction)
+                        }
+                        addUrlAnnotation(UrlAnnotation(LoginConstants.SLIDING_SYNC_READ_MORE_URL), start, length)
+                    }
+                }
+                ClickableLinkText(
+                    text = footerText,
+                    interactionSource = MutableInteractionSource(),
                     modifier = Modifier.padding(horizontal = 16.dp),
                     style = ElementTextStyles.Regular.caption1,
-                    textAlign = TextAlign.Start,
-                    color = MaterialTheme.colorScheme.tertiary,
                 )
                 Spacer(Modifier.height(32.dp))
                 Button(
@@ -259,6 +284,8 @@ internal fun SlidingSyncNotSupportedDialog(onLearnMoreClicked: () -> Unit, onDis
         onDismiss = onDismiss,
         submitText = stringResource(StringR.string.action_learn_more),
         onSubmitClicked = onLearnMoreClicked,
+        onCancelClicked = onDismiss,
+        emphasizeSubmitButton = true,
         title = stringResource(StringR.string.server_selection_sliding_sync_alert_title),
         content = stringResource(StringR.string.server_selection_sliding_sync_alert_message),
     )

gradle/libs.versions.toml

@@ -36,7 +36,6 @@ test_core = "1.5.0"
 coil = "2.2.2"
 datetime = "0.4.0"
 serialization_json = "1.5.0"
-# Warning, also hard-coded in composeDependencies()
 showkase = "1.0.0-beta17"
 jsoup = "1.15.4"
 appyx = "1.0.5"

libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/Color.kt

@@ -68,4 +68,4 @@ val ElementGreen = Color(0xFF0DBD8B)
 val ElementOrange = Color(0xFFD9B072)
 val Vermilion = Color(0xFFFF5B55)
 
-val LinkColor = Color(0xFF054F6E)
+val LinkColor = Color(0xFF0086E6)

libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/ClickableLinkText.kt

@@ -30,6 +30,7 @@ import androidx.compose.ui.geometry.Offset
 import androidx.compose.ui.input.pointer.pointerInput
 import androidx.compose.ui.platform.LocalUriHandler
 import androidx.compose.ui.text.AnnotatedString
+import androidx.compose.ui.text.ExperimentalTextApi
 import androidx.compose.ui.text.ParagraphStyle
 import androidx.compose.ui.text.TextLayoutResult
 import androidx.compose.ui.text.TextStyle
@@ -40,14 +41,15 @@ import io.element.android.libraries.designsystem.theme.components.Text
 import kotlinx.collections.immutable.ImmutableMap
 import kotlinx.collections.immutable.persistentMapOf
 
+@OptIn(ExperimentalTextApi::class)
 @Composable
 fun ClickableLinkText(
     text: AnnotatedString,
-    linkAnnotationTag: String,
-    onClick: () -> Unit,
-    onLongClick: () -> Unit,
     interactionSource: MutableInteractionSource,
     modifier: Modifier = Modifier,
+    linkAnnotationTag: String = "",
+    onClick: () -> Unit = {},
+    onLongClick: () -> Unit = {},
     style: TextStyle = LocalTextStyle.current,
     inlineContent: ImmutableMap<String, InlineTextContent> = persistentMapOf(),
 ) {
@@ -71,12 +73,14 @@ fun ClickableLinkText(
         ) { offset ->
             layoutResult.value?.let { layoutResult ->
                 val position = layoutResult.getOffsetForPosition(offset)
-                val linkAnnotations =
+                val linkUrlAnnotations = text.getUrlAnnotations(position, position)
+                    .map { AnnotatedString.Range(it.item.url, it.start, it.end, linkAnnotationTag) }
+                val linkStringAnnotations = linkUrlAnnotations +
                     text.getStringAnnotations(linkAnnotationTag, position, position)
-                if (linkAnnotations.isEmpty()) {
+                if (linkStringAnnotations.isEmpty()) {
                     onClick()
                 } else {
-                    uriHandler.openUri(linkAnnotations.first().item)
+                    uriHandler.openUri(linkStringAnnotations.first().item)
                 }
             }
         }

libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/dialogs/ConfirmationDialog.kt

@@ -16,9 +16,6 @@
 
 package io.element.android.libraries.designsystem.components.dialogs
 
-import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.material3.AlertDialog
 import androidx.compose.material3.AlertDialogDefaults
 import androidx.compose.material3.MaterialTheme
@@ -29,28 +26,33 @@ import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.Shape
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.tooling.preview.PreviewParameter
 import androidx.compose.ui.unit.Dp
+import io.element.android.libraries.designsystem.ElementTextStyles
 import io.element.android.libraries.designsystem.preview.ElementPreviewDark
 import io.element.android.libraries.designsystem.preview.ElementPreviewLight
 import io.element.android.libraries.designsystem.theme.components.Text
+import io.element.android.libraries.designsystem.utils.BooleanProvider
 import io.element.android.libraries.ui.strings.R as StringR
 
 @Composable
 fun ConfirmationDialog(
     title: String,
     content: String,
+    onSubmitClicked: () -> Unit,
+    onDismiss: () -> Unit,
     modifier: Modifier = Modifier,
     submitText: String = stringResource(id = StringR.string.ok),
     cancelText: String = stringResource(id = StringR.string.action_cancel),
     thirdButtonText: String? = null,
-    onSubmitClicked: () -> Unit = {},
+    emphasizeSubmitButton: Boolean = false,
-    onCancelClicked: () -> Unit = {},
+    onCancelClicked: () -> Unit = onDismiss,
     onThirdButtonClicked: () -> Unit = {},
-    onDismiss: () -> Unit = {},
     shape: Shape = AlertDialogDefaults.shape,
     containerColor: Color = AlertDialogDefaults.containerColor,
     iconContentColor: Color = AlertDialogDefaults.iconContentColor,
-    titleContentColor: Color = AlertDialogDefaults.titleContentColor,
+    // According to the design team, `primary` should be used here instead of the default `onSurface`
+    titleContentColor: Color = MaterialTheme.colorScheme.primary,
     textContentColor: Color = AlertDialogDefaults.textContentColor,
     tonalElevation: Dp = AlertDialogDefaults.TonalElevation,
 ) {
@@ -79,9 +81,16 @@ fun ConfirmationDialog(
             TextButton(
                 onClick = {
                     onSubmitClicked()
-                }
+                },
             ) {
-                Text(submitText)
+                Text(
+                    submitText,
+                    style = if (emphasizeSubmitButton) {
+                        ElementTextStyles.Bold.subheadline
+                    } else {
+                        MaterialTheme.typography.labelLarge
+                    }
+                )
             }
         },
         shape = shape,
@@ -95,17 +104,22 @@ fun ConfirmationDialog(
 
 @Preview
 @Composable
-internal fun ConfirmationDialogLightPreview() = ElementPreviewLight { ContentToPreview() }
+internal fun ConfirmationDialogLightPreview(@PreviewParameter(BooleanProvider::class) emphasizeSubmitButton: Boolean) =
+    ElementPreviewLight { ContentToPreview(emphasizeSubmitButton) }
 
 @Preview
 @Composable
-internal fun ConfirmationDialogDarkPreview() = ElementPreviewDark { ContentToPreview() }
+internal fun ConfirmationDialogDarkPreview(@PreviewParameter(BooleanProvider::class) emphasizeSubmitButton: Boolean) =
+    ElementPreviewDark { ContentToPreview(emphasizeSubmitButton) }
 
 @Composable
-private fun ContentToPreview() {
+private fun ContentToPreview(emphasizeSubmitButton: Boolean) {
     ConfirmationDialog(
         title = "Title",
         content = "Content",
-        thirdButtonText = "Disable"
+        thirdButtonText = "Disable",
+        onSubmitClicked = {},
+        onDismiss = {},
+        emphasizeSubmitButton = emphasizeSubmitButton,
     )
 }

libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/ColorsDark.kt

@@ -24,6 +24,7 @@ import io.element.android.libraries.designsystem.Azure
 import io.element.android.libraries.designsystem.Black_800
 import io.element.android.libraries.designsystem.Black_950
 import io.element.android.libraries.designsystem.DarkGrey
+import io.element.android.libraries.designsystem.Gray_300
 import io.element.android.libraries.designsystem.Gray_400
 import io.element.android.libraries.designsystem.Gray_450
 import io.element.android.libraries.designsystem.SystemGrey5Dark
@@ -59,7 +60,7 @@ val materialColorSchemeDark = darkColorScheme(
     surface = Black_800,
     onSurface = Color.White,
     surfaceVariant = Black_950,
-    onSurfaceVariant = Color.White,
+    onSurfaceVariant = Gray_300,
     // TODO surfaceTint = primary,
     // TODO inverseSurface = ColorDarkTokens.InverseSurface,
     // TODO inverseOnSurface = ColorDarkTokens.InverseOnSurface,

libraries/ui-strings/src/main/res/values/strings_eax.xml

@@ -12,6 +12,7 @@
     <string name="login_hide_password">Hide password</string>
     <string name="ex_choose_server_subtitle">What is the address of your server?</string>
     <string name="server_selection_server_footer">You can only connect to an existing server that supports sliding sync. Your homeserver admin will need to configure it.</string>
+    <string name="server_selection_server_footer_action">Learn more</string>
     <string name="server_selection_sliding_sync_alert_title">Server not supported</string>
     <string name="server_selection_sliding_sync_alert_message">This server currently doesn\'t support sliding sync.</string>
     <!-- Create room -->

plugins/src/main/kotlin/extension/DependencyHandleScope.kt

@@ -26,8 +26,8 @@ import org.gradle.kotlin.dsl.project
 /**
  * Dependencies used by all the modules
  */
-fun DependencyHandlerScope.commonDependencies() {
+fun DependencyHandlerScope.commonDependencies(libs: LibrariesForLibs) {
-    implementation("com.jakewharton.timber:timber:5.0.1")
+    implementation(libs.timber)
 }
 
 /**
@@ -44,10 +44,10 @@ fun DependencyHandlerScope.composeDependencies(libs: LibrariesForLibs) {
     implementation("androidx.compose.material3:material3:1.1.0-alpha04")
     implementation("androidx.compose.material:material-icons-extended")
     implementation("androidx.compose.ui:ui-tooling-preview")
-    implementation("androidx.activity:activity-compose:1.6.1")
+    implementation(libs.androidx.activity.compose)
     debugImplementation("androidx.compose.ui:ui-tooling")
     debugImplementation("androidx.compose.ui:ui-test-manifest")
-    implementation("com.airbnb.android:showkase:1.0.0-beta17")
+    implementation(libs.showkase)
     implementation("org.jetbrains.kotlinx:kotlinx-collections-immutable:0.3.5")
 }
 

plugins/src/main/kotlin/io.element.android-compose-application.gradle.kts

@@ -36,6 +36,6 @@ android {
 }
 
 dependencies {
-    commonDependencies()
+    commonDependencies(libs)
     composeDependencies(libs)
 }

plugins/src/main/kotlin/io.element.android-compose-library.gradle.kts

@@ -44,6 +44,6 @@ android {
 }
 
 dependencies {
-    commonDependencies()
+    commonDependencies(libs)
     composeDependencies(libs)
 }

plugins/src/main/kotlin/io.element.android-library.gradle.kts

@@ -19,6 +19,9 @@
  */
 import extension.androidConfig
 import extension.commonDependencies
+import org.gradle.accessors.dm.LibrariesForLibs
+
+val libs = the<LibrariesForLibs>()
 
 plugins {
     id("com.android.library")
@@ -38,5 +41,5 @@ android {
 }
 
 dependencies {
-    commonDependencies()
+    commonDependencies(libs)
 }