Merge develop into feature/fga/dagger_setup

2022-12-19 16:14:14 +01:00 · 2022-12-19 16:14:14 +01:00 · 4c88d8e3c2
commit 4c88d8e3c2
parent 9aa0ce9438 17c80a311f
214 changed files with 2662 additions and 1833 deletions
--- a/features/login/src/androidTest/java/io/element/android/x/features/login/ExampleInstrumentedTest.kt
+++ b/features/login/src/androidTest/java/io/element/android/x/features/login/ExampleInstrumentedTest.kt
@ -1,13 +1,11 @@
 package io.element.android.x.features.login

-import androidx.test.platform.app.InstrumentationRegistry
 import androidx.test.ext.junit.runners.AndroidJUnit4
-
+import androidx.test.platform.app.InstrumentationRegistry
+import org.junit.Assert.assertEquals
 import org.junit.Test
 import org.junit.runner.RunWith

-import org.junit.Assert.*
-
 /**
 * Instrumented test, which will execute on an Android device.
 *
@ -21,4 +19,4 @@ class ExampleInstrumentedTest {
        val appContext = InstrumentationRegistry.getInstrumentation().targetContext
        assertEquals("io.element.android.x.features.login.test", appContext.packageName)
    }
-}
+}
--- a/features/login/src/main/AndroidManifest.xml
+++ b/features/login/src/main/AndroidManifest.xml
@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+<manifest>

-</manifest>
+</manifest>
--- a/features/login/src/main/java/io/element/android/x/features/login/LoginScreen.kt
+++ b/features/login/src/main/java/io/element/android/x/features/login/LoginScreen.kt
@ -2,7 +2,13 @@

 package io.element.android.x.features.login

-import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.imePadding
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.systemBarsPadding
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.text.KeyboardActions
 import androidx.compose.foundation.text.KeyboardOptions
@ -10,8 +16,21 @@ import androidx.compose.foundation.verticalScroll
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Visibility
 import androidx.compose.material.icons.filled.VisibilityOff
-import androidx.compose.material3.*
-import androidx.compose.runtime.*
+import androidx.compose.material3.Button
+import androidx.compose.material3.CircularProgressIndicator
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.OutlinedTextField
+import androidx.compose.material3.Surface
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.text.font.FontWeight
@ -56,19 +75,22 @@ fun LoginScreen(
    )
 }

-
@OptIn(ExperimentalMaterial3Api::class)
@Composable
 fun LoginContent(
    state: LoginViewState,
    formState: LoginFormState,
+    modifier: Modifier = Modifier,
    onChangeServer: () -> Unit = {},
    onLoginChanged: (String) -> Unit = {},
    onPasswordChanged: (String) -> Unit = {},
    onSubmitClicked: () -> Unit = {},
    onLoginWithSuccess: (MatrixClient) -> Unit = {},
 ) {
-    Surface(color = MaterialTheme.colorScheme.background) {
+    Surface(
+        modifier = modifier,
+        color = MaterialTheme.colorScheme.background,
+    ) {
        Box(
            modifier = Modifier
                .fillMaxSize()
@ -96,7 +118,7 @@ fun LoginContent(
                )
                // Form
                Column(
-                    //modifier = Modifier.weight(1f),
+                    // modifier = Modifier.weight(1f),
                ) {
                    Box(
                        modifier = Modifier.fillMaxWidth()
--- a/features/login/src/main/java/io/element/android/x/features/login/LoginViewModel.kt
+++ b/features/login/src/main/java/io/element/android/x/features/login/LoginViewModel.kt
@ -66,4 +66,4 @@ class LoginViewModel @AssistedInject constructor(
        formState.value = formState.value.copy(login = name)
        setState { copy(loggedInClient = Uninitialized) }
    }
-}
+}
--- a/features/login/src/main/java/io/element/android/x/features/login/LoginViewState.kt
+++ b/features/login/src/main/java/io/element/android/x/features/login/LoginViewState.kt
@ -23,5 +23,4 @@ data class LoginFormState(
    companion object {
        val Default = LoginFormState("", "")
    }
-
-}
+}
--- a/features/login/src/main/java/io/element/android/x/features/login/changeserver/ChangeServerScreen.kt
+++ b/features/login/src/main/java/io/element/android/x/features/login/changeserver/ChangeServerScreen.kt
@ -3,13 +3,27 @@
 package io.element.android.x.features.login.changeserver

 import androidx.compose.foundation.background
-import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.defaultMinSize
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.imePadding
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.systemBarsPadding
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.foundation.text.KeyboardActions
 import androidx.compose.foundation.text.KeyboardOptions
 import androidx.compose.foundation.verticalScroll
-import androidx.compose.material3.*
+import androidx.compose.material3.Button
+import androidx.compose.material3.CircularProgressIndicator
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.OutlinedTextField
+import androidx.compose.material3.Surface
+import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.ui.Alignment
@ -45,15 +59,18 @@ fun ChangeServerScreen(
    )
 }

-
@Composable
 fun ChangeServerContent(
    state: ChangeServerViewState,
+    modifier: Modifier = Modifier,
    onChangeServer: (String) -> Unit = {},
    onChangeServerSubmit: () -> Unit = {},
    onChangeServerSuccess: () -> Unit = {},
 ) {
-    Surface(color = MaterialTheme.colorScheme.background) {
+    Surface(
+        modifier = modifier,
+        color = MaterialTheme.colorScheme.background,
+    ) {
        val scrollState = rememberScrollState()
        Box(
            modifier = Modifier
@ -67,8 +84,7 @@ fun ChangeServerContent(
                        state = scrollState,
                    )
                    .padding(horizontal = 16.dp)
-            )
-            {
+            ) {
                val isError = state.changeServerAction is Fail
                Box(
                    modifier = Modifier
@ -101,7 +117,7 @@ fun ChangeServerContent(
                )
                Text(
                    text = "A server is a home for all your data.\n" +
-                            "You choose your server and it’s easy to make one.", // TODO "Learn more.",
+                        "You choose your server and it’s easy to make one.", // TODO "Learn more.",
                    modifier = Modifier
                        .fillMaxWidth()
                        .align(Alignment.CenterHorizontally)
--- a/features/login/src/main/java/io/element/android/x/features/login/changeserver/ChangeServerViewModel.kt
+++ b/features/login/src/main/java/io/element/android/x/features/login/changeserver/ChangeServerViewModel.kt
@ -48,4 +48,4 @@ class ChangeServerViewModel @AssistedInject constructor(
            }
        }
    }
-}
+}
--- a/features/login/src/main/java/io/element/android/x/features/login/changeserver/ChangeServerViewState.kt
+++ b/features/login/src/main/java/io/element/android/x/features/login/changeserver/ChangeServerViewState.kt
@ -10,4 +10,4 @@ data class ChangeServerViewState(
    val changeServerAction: Async<Unit> = Uninitialized,
 ) : MavericksState {
    val submitEnabled = homeserver.isNotEmpty() && changeServerAction !is Loading
-}
+}
--- a/features/login/src/main/java/io/element/android/x/features/login/error/ErrorFormatter.kt
+++ b/features/login/src/main/java/io/element/android/x/features/login/error/ErrorFormatter.kt
@ -3,8 +3,8 @@ package io.element.android.x.features.login.error
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.res.stringResource
 import io.element.android.x.core.uri.isValidUrl
-import io.element.android.x.features.login.LoginFormState
 import io.element.android.x.element.resources.R as ElementR
+import io.element.android.x.features.login.LoginFormState

@Composable
 fun loginError(
--- a/features/login/src/main/res/drawable/element_logo_green.xml
+++ b/features/login/src/main/res/drawable/element_logo_green.xml
@ -1,22 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="64dp"
-    android:height="64dp"
-    android:viewportWidth="64"
-    android:viewportHeight="64">
-    <path
-        android:pathData="M23.04,3.84C23.04,1.7192 24.7593,0 26.88,0C41.0185,0 52.48,11.4615 52.48,25.6C52.48,27.7208 50.7608,29.44 48.64,29.44C46.5193,29.44 44.8,27.7208 44.8,25.6C44.8,15.7031 36.777,7.68 26.88,7.68C24.7593,7.68 23.04,5.9608 23.04,3.84Z"
-        android:fillColor="#0DBD8B"
-        android:fillType="evenOdd"/>
-    <path
-        android:pathData="M40.96,60.16C40.96,62.2808 39.2407,64 37.12,64C22.9815,64 11.52,52.5385 11.52,38.4C11.52,36.2792 13.2392,34.56 15.36,34.56C17.4807,34.56 19.2,36.2792 19.2,38.4C19.2,48.2969 27.223,56.32 37.12,56.32C39.2407,56.32 40.96,58.0392 40.96,60.16Z"
-        android:fillColor="#0DBD8B"
-        android:fillType="evenOdd"/>
-    <path
-        android:pathData="M3.84,40.96C1.7192,40.96 -0,39.2407 -0,37.12C-0,22.9815 11.4615,11.52 25.6,11.52C27.7208,11.52 29.44,13.2392 29.44,15.36C29.44,17.4807 27.7208,19.2 25.6,19.2C15.7031,19.2 7.68,27.223 7.68,37.12C7.68,39.2407 5.9608,40.96 3.84,40.96Z"
-        android:fillColor="#0DBD8B"
-        android:fillType="evenOdd"/>
-    <path
-        android:pathData="M60.16,23.04C62.2808,23.04 64,24.7593 64,26.88C64,41.0185 52.5385,52.48 38.4,52.48C36.2792,52.48 34.56,50.7608 34.56,48.64C34.56,46.5193 36.2792,44.8 38.4,44.8C48.2969,44.8 56.32,36.777 56.32,26.88C56.32,24.7593 58.0392,23.04 60.16,23.04Z"
-        android:fillColor="#0DBD8B"
-        android:fillType="evenOdd"/>
-</vector>
--- a/features/login/src/main/res/drawable/ic_baseline_dataset_24.xml
+++ b/features/login/src/main/res/drawable/ic_baseline_dataset_24.xml
@ -1,5 +1,10 @@
-<vector android:height="24dp" android:tint="#000000"
-    android:viewportHeight="24" android:viewportWidth="24"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="@android:color/white" android:pathData="M19,3H5C3.9,3 3,3.9 3,5v14c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2V5C21,3.9 20.1,3 19,3zM11,17H7v-4h4V17zM11,11H7V7h4V11zM17,17h-4v-4h4V17zM17,11h-4V7h4V11z"/>
+<vector android:height="24dp"
+    android:tint="#000000"
+    android:viewportHeight="24"
+    android:viewportWidth="24"
+    android:width="24dp"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M19,3H5C3.9,3 3,3.9 3,5v14c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2V5C21,3.9 20.1,3 19,3zM11,17H7v-4h4V17zM11,11H7V7h4V11zM17,17h-4v-4h4V17zM17,11h-4V7h4V11z" />
 </vector>
--- a/features/login/src/test/java/io/element/android/x/features/login/ExampleUnitTest.kt
+++ b/features/login/src/test/java/io/element/android/x/features/login/ExampleUnitTest.kt
@ -1,9 +1,8 @@
 package io.element.android.x.features.login

+import org.junit.Assert.assertEquals
 import org.junit.Test

-import org.junit.Assert.*
-
 /**
 * Example local unit test, which will execute on the development machine (host).
 *
@ -14,4 +13,4 @@ class ExampleUnitTest {
    fun addition_isCorrect() {
        assertEquals(4, 2 + 2)
    }
-}
+}