Merge pull request #614 from vector-im/feature/bma/optIn2

Iterate on analytics opt in screen

libraries/androidutils/build.gradle.kts

@@ -28,5 +28,6 @@ dependencies {
     implementation(libs.androidx.activity.activity)
     implementation(libs.androidx.exifinterface)
     implementation(libs.androidx.security.crypto)
+    implementation(libs.androidx.browser)
     implementation(projects.libraries.core)
 }

libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/browser/ChromeCustomTab.kt

@@ -0,0 +1,60 @@
+/*
+ * Copyright (c) 2023 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.element.android.libraries.androidutils.browser
+
+import android.app.Activity
+import android.content.ActivityNotFoundException
+import android.net.Uri
+import androidx.browser.customtabs.CustomTabColorSchemeParams
+import androidx.browser.customtabs.CustomTabsIntent
+import androidx.browser.customtabs.CustomTabsSession
+
+/**
+ * Open url in custom tab or, if not available, in the default browser.
+ * If several compatible browsers are installed, the user will be proposed to choose one.
+ * Ref: https://developer.chrome.com/multidevice/android/customtabs.
+ */
+fun Activity.openUrlInChromeCustomTab(
+    session: CustomTabsSession?,
+    darkTheme: Boolean,
+    url: String
+) {
+    try {
+        CustomTabsIntent.Builder()
+            .setDefaultColorSchemeParams(
+                CustomTabColorSchemeParams.Builder()
+                    // TODO .setToolbarColor(ThemeUtils.getColor(context, android.R.attr.colorBackground))
+                    // TODO .setNavigationBarColor(ThemeUtils.getColor(context, android.R.attr.colorBackground))
+                    .build()
+            )
+            .setColorScheme(
+                when (darkTheme) {
+                    false -> CustomTabsIntent.COLOR_SCHEME_LIGHT
+                    true -> CustomTabsIntent.COLOR_SCHEME_DARK
+                }
+            )
+            // Note: setting close button icon does not work
+            // .setCloseButtonIcon(BitmapFactory.decodeResource(context.resources, R.drawable.ic_back_24dp))
+            // .setStartAnimations(context, R.anim.enter_fade_in, R.anim.exit_fade_out)
+            // .setExitAnimations(context, R.anim.enter_fade_in, R.anim.exit_fade_out)
+            .apply { session?.let { setSession(it) } }
+            .build()
+            .launchUrl(this, Uri.parse(url))
+    } catch (activityNotFoundException: ActivityNotFoundException) {
+        // TODO context.toast(R.string.error_no_external_application_found)
+    }
+}

libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/text/AnnotatedStrings.kt

@@ -0,0 +1,84 @@
+/*
+ * Copyright (c) 2023 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.element.android.libraries.designsystem.text
+
+import android.graphics.Typeface
+import android.text.SpannableString
+import android.text.style.ForegroundColorSpan
+import android.text.style.StyleSpan
+import android.text.style.UnderlineSpan
+import androidx.annotation.StringRes
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.AnnotatedString
+import androidx.compose.ui.text.SpanStyle
+import androidx.compose.ui.text.buildAnnotatedString
+import androidx.compose.ui.text.font.FontStyle
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.style.TextDecoration
+import io.element.android.libraries.designsystem.LinkColor
+
+fun String.toAnnotatedString(): AnnotatedString = buildAnnotatedString {
+    append(this@toAnnotatedString)
+    val spannable = SpannableString(this@toAnnotatedString)
+    spannable.getSpans(0, spannable.length, Any::class.java).forEach { span ->
+        val start = spannable.getSpanStart(span)
+        val end = spannable.getSpanEnd(span)
+        when (span) {
+            is StyleSpan -> when (span.style) {
+                Typeface.BOLD -> addStyle(SpanStyle(fontWeight = FontWeight.Bold), start, end)
+                Typeface.ITALIC -> addStyle(SpanStyle(fontStyle = FontStyle.Italic), start, end)
+                Typeface.BOLD_ITALIC -> addStyle(SpanStyle(fontWeight = FontWeight.Bold, fontStyle = FontStyle.Italic), start, end)
+            }
+            is UnderlineSpan -> addStyle(SpanStyle(textDecoration = TextDecoration.Underline), start, end)
+            is ForegroundColorSpan -> addStyle(SpanStyle(color = Color(span.foregroundColor)), start, end)
+        }
+    }
+}
+
+/**
+ * Convert a string to an [AnnotatedString] with styles applied.
+ *
+ * @param fullTextRes the string resource to use as the full text. Must contain a single %s
+ * @param coloredTextRes the string resource to use as the colored part of the string
+ * @param color the color to apply to the string
+ * @param underline whether to underline the string
+ * @param bold whether to bold the string
+ */
+@Composable
+fun buildAnnotatedStringWithStyledPart(
+    @StringRes fullTextRes: Int,
+    @StringRes coloredTextRes: Int,
+    color: Color = LinkColor,
+    underline: Boolean = true,
+    bold: Boolean = false,
+) = buildAnnotatedString {
+    val coloredPart = stringResource(coloredTextRes)
+    val fullText = stringResource(fullTextRes, coloredPart)
+    val startIndex = fullText.indexOf(coloredPart)
+    append(fullText)
+    addStyle(
+        style = SpanStyle(
+            color = color,
+            textDecoration = if (underline) TextDecoration.Underline else null,
+            fontWeight = if (bold) FontWeight.Bold else null,
+        ),
+        start = startIndex,
+        end = startIndex + coloredPart.length,
+    )
+}