fix #131 login screen text (#135)

# *login screen text* ## ♻️ Current situation & Problem #131 ## ⚙️ Release Notes the exact text is not yet known, but PR is already preparing it in order to integrate the change as quickly and easily as possible. ## 📝 Code of Conduct & Contributing Guidelines By submitting creating this pull request, you agree to follow our [Code of Conduct](https://github.com/StanfordSpezi/.github/blob/main/CODE_OF_CONDUCT.md) and [Contributing Guidelines](https://github.com/StanfordSpezi/.github/blob/main/CONTRIBUTING.md): - [x] I agree to follow the [Code of Conduct](https://github.com/StanfordSpezi/.github/blob/main/CODE_OF_CONDUCT.md) and [Contributing Guidelines](https://github.com/StanfordSpezi/.github/blob/main/CONTRIBUTING.md). --------- Signed-off-by: Basler182 <[email protected]> Co-authored-by: Eldi Cano <[email protected]>
StanfordSpezi · Nov 3, 2024 · 891883b · 891883b
1 parent dc72363
commit 891883b
Show file tree

Hide file tree

Showing 5 changed files with 91 additions and 7 deletions.
diff --git a/modules/account/src/main/kotlin/edu/stanford/spezi/module/account/login/LoginScreen.kt b/modules/account/src/main/kotlin/edu/stanford/spezi/module/account/login/LoginScreen.kt
@@ -14,6 +14,7 @@ import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.imePadding
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.text.ClickableText
 import androidx.compose.foundation.text.KeyboardActions
 import androidx.compose.foundation.text.KeyboardOptions
 import androidx.compose.foundation.verticalScroll
@@ -34,9 +35,12 @@ import androidx.compose.ui.input.pointer.pointerInput
 import androidx.compose.ui.platform.LocalSoftwareKeyboardController
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.SpanStyle
+import androidx.compose.ui.text.buildAnnotatedString
 import androidx.compose.ui.text.input.ImeAction
 import androidx.compose.ui.text.input.PasswordVisualTransformation
 import androidx.compose.ui.text.input.VisualTransformation
+import androidx.compose.ui.text.withStyle
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.tooling.preview.PreviewParameter
 import androidx.compose.ui.tooling.preview.PreviewParameterProvider
@@ -96,12 +100,33 @@ internal fun LoginScreen(
             text = stringResource(R.string.your_account), style = titleLarge
         )
         Spacer(modifier = Modifier.height(Spacings.large))
-        Text(
-            text = """
-The ENGAGE-HF demonstrates the usage of the Firebase Account Module. 
-                
-You may login to your existing account or create a new one if you don't have one already.""",
-            style = bodyLarge,
+        val annotatedText = buildAnnotatedString {
+            append(stringResource(R.string.login_screen_description))
+            pushStringAnnotation(
+                tag = "EMAIL",
+                annotation = stringResource(R.string.engage_support_email)
+            )
+            withStyle(
+                style = SpanStyle(
+                    color = Colors.primary
+                )
+            ) {
+                append(stringResource(R.string.engage_support_email))
+            }
+            pop()
+        }
+        ClickableText(
+            text = annotatedText,
+            style = bodyLarge.copy(color = Colors.onBackground),
+            onClick = { offset ->
+                annotatedText.getStringAnnotations(
+                    tag = "EMAIL",
+                    start = offset,
+                    end = offset
+                ).firstOrNull()?.let {
+                    onAction(Action.EmailClicked(it.item))
+                }
+            }
         )
         Spacer(modifier = Modifier.height(Spacings.large))
         IconLeadingContent(

diff --git a/modules/account/src/main/kotlin/edu/stanford/spezi/module/account/login/LoginViewModel.kt b/modules/account/src/main/kotlin/edu/stanford/spezi/module/account/login/LoginViewModel.kt
@@ -1,8 +1,12 @@
 package edu.stanford.spezi.module.account.login
 
+import android.content.Context
+import android.content.Intent
+import android.net.Uri
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import dagger.hilt.android.lifecycle.HiltViewModel
+import dagger.hilt.android.qualifiers.ApplicationContext
 import edu.stanford.spezi.core.navigation.Navigator
 import edu.stanford.spezi.core.utils.MessageNotifier
 import edu.stanford.spezi.module.account.AccountEvents
@@ -24,6 +28,7 @@ internal class LoginViewModel @Inject constructor(
     private val accountEvents: AccountEvents,
     private val messageNotifier: MessageNotifier,
     private val authValidator: AuthValidator,
+    @ApplicationContext private val context: Context,
 ) : ViewModel() {
     private var hasAttemptedSubmit: Boolean = false
     private val email: String
@@ -52,6 +57,15 @@ internal class LoginViewModel @Inject constructor(
                 navigateToRegister()
             }
 
+            is Action.EmailClicked -> {
+                val data = Uri.parse("mailto:${action.email}")
+                val emailIntent = Intent()
+                    .setAction(Intent.ACTION_SENDTO)
+                    .setData(data)
+                    .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+                context.startActivity(emailIntent)
+            }
+
             is Action.Async.GoogleSignInOrSignUp -> {
                 execute(action = action, block = ::onGoogleSignInOrSignUp)
             }

diff --git a/modules/account/src/main/kotlin/edu/stanford/spezi/module/account/login/UiState.kt b/modules/account/src/main/kotlin/edu/stanford/spezi/module/account/login/UiState.kt
@@ -22,6 +22,7 @@ sealed interface Action {
     data class TextFieldUpdate(val newValue: String, val type: TextFieldType) : Action
     data object TogglePasswordVisibility : Action
     data object NavigateToRegister : Action
+    data class EmailClicked(val email: String) : Action
 
     sealed interface Async : Action {
         data object ForgotPassword : Async

diff --git a/modules/account/src/main/res/values/strings.xml b/modules/account/src/main/res/values/strings.xml
@@ -20,4 +20,6 @@
     <string name="e_mail_address">E-Mail Address</string>
     <string name="signup">Signup</string>
     <string name="login">Login</string>
+    <string name="login_screen_description">You may login to your existing account or create a new one if you don\'t have one already. You can also sign in with your Google Account. If you are having  difficulty logging in or resetting your password, you can reach out to:\u00A0</string>
+    <string name="engage_support_email">[email protected]</string>
 </resources>
diff --git a/modules/account/src/test/java/edu/stanford/spezi/module/account/login/LoginViewModelTest.kt b/modules/account/src/test/java/edu/stanford/spezi/module/account/login/LoginViewModelTest.kt
@@ -1,5 +1,8 @@
 package edu.stanford.spezi.module.account.login
 
+import android.content.Context
+import android.content.Intent
+import android.net.Uri
 import com.google.common.truth.Truth.assertThat
 import edu.stanford.spezi.core.navigation.Navigator
 import edu.stanford.spezi.core.testing.CoroutineTestRule
@@ -17,7 +20,12 @@ import io.mockk.coVerify
 import io.mockk.every
 import io.mockk.just
 import io.mockk.mockk
+import io.mockk.mockkConstructor
+import io.mockk.mockkStatic
+import io.mockk.unmockkConstructor
+import io.mockk.unmockkStatic
 import io.mockk.verify
+import org.junit.After
 import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
@@ -30,6 +38,7 @@ class LoginViewModelTest {
     private val accountEvents: AccountEvents = mockk(relaxed = true)
     private val validator: AuthValidator = mockk()
     private val navigator: Navigator = mockk()
+    private val context: Context = mockk()
 
     @get:Rule
     val coroutineTestRule = CoroutineTestRule()
@@ -43,15 +52,26 @@ class LoginViewModelTest {
         }
 
         every { navigator.navigateTo(any()) } just Runs
+
+        mockkStatic(Uri::class)
+        mockkConstructor(Intent::class)
+
         loginViewModel = LoginViewModel(
             authenticationManager = authenticationManager,
             messageNotifier = messageNotifier,
             accountEvents = accountEvents,
             navigator = navigator,
-            authValidator = validator
+            authValidator = validator,
+            context = context,
         )
     }
 
+    @After
+    fun tearDown() {
+        unmockkStatic(Uri::class)
+        unmockkConstructor(Intent::class)
+    }
+
     @Test
     fun `it should update email correctly`() =
         runTestUnconfined {
@@ -120,6 +140,28 @@ class LoginViewModelTest {
             verify { navigator.navigateTo(expectedNavigationEvent) }
         }
 
+    @Test
+    fun `it should handle Email clicked correctly`() {
+        // given
+        val email = "[email protected]"
+        val uri: Uri = mockk()
+        every { Uri.parse("mailto:$email") } returns uri
+        val intent = mockk<Intent>()
+        every { anyConstructed<Intent>().setAction(Intent.ACTION_SENDTO) } returns intent
+        every { intent.setData(uri) } returns intent
+        every { intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK) } returns intent
+        every { context.startActivity(intent) } just Runs
+
+        // when
+        loginViewModel.onAction(Action.EmailClicked(email))
+
+        // then
+        verify { anyConstructed<Intent>().setAction(Intent.ACTION_SENDTO) }
+        verify { intent.setData(uri) }
+        verify { intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK) }
+        verify { context.startActivity(intent) }
+    }
+
     @Test
     fun `it should handle successful google sign in correctly`() = runTestUnconfined {
         // given