Merge pull request #94 from Tiqr/bugfix/edured-101-handle_show_keyboa…

…rd_with_input Edured-101: Changing the screens layout so that when the keyboard is …
Tiqr · May 26, 2023 · 3e786a2 · 3e786a2
2 parents 4ddc998 + 47944dd
commit 3e786a2
Show file tree

Hide file tree

Showing 39 changed files with 1,326 additions and 902 deletions.
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -28,7 +28,8 @@
         android:label="@string/app_name"
         android:networkSecurityConfig="@xml/network_security_config"
         android:roundIcon="@mipmap/ic_launcher_round"
-        android:theme="@style/AppTheme">
+        android:theme="@style/AppTheme"
+        android:windowSoftInputMode="adjustResize">
 
         <activity-alias
             android:name="org.tiqr.core.MainActivity"

diff --git a/app/src/main/kotlin/nl/eduid/MainComposeActivity.kt b/app/src/main/kotlin/nl/eduid/MainComposeActivity.kt
@@ -4,6 +4,7 @@ import android.content.Intent
 import android.os.Bundle
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
+import androidx.core.view.WindowCompat
 import androidx.navigation.compose.rememberNavController
 import dagger.hilt.android.AndroidEntryPoint
 import nl.eduid.graphs.MainGraph
@@ -15,6 +16,7 @@ class MainComposeActivity : ComponentActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        WindowCompat.setDecorFitsSystemWindows(window, false)
         setContent {
             EduidAppAndroidTheme {
                 MainGraph(navController = rememberNavController())

diff --git a/app/src/main/kotlin/nl/eduid/graphs/MainGraph.kt b/app/src/main/kotlin/nl/eduid/graphs/MainGraph.kt
@@ -25,8 +25,8 @@ import nl.eduid.screens.deleteaccountsecondconfirm.DeleteAccountSecondConfirmVie
 import nl.eduid.screens.editemail.EditEmailScreen
 import nl.eduid.screens.editemail.EditEmailViewModel
 import nl.eduid.screens.editname.EditNameScreen
-import nl.eduid.screens.firsttimedialog.LinkAccountViewModel
 import nl.eduid.screens.firsttimedialog.FirstTimeDialogScreen
+import nl.eduid.screens.firsttimedialog.LinkAccountViewModel
 import nl.eduid.screens.homepage.HomePageScreen
 import nl.eduid.screens.homepage.HomePageViewModel
 import nl.eduid.screens.manageaccount.ManageAccountScreen
@@ -38,20 +38,20 @@ import nl.eduid.screens.personalinfo.PersonalInfoViewModel
 import nl.eduid.screens.pinsetup.NextStep
 import nl.eduid.screens.pinsetup.RegistrationPinSetupScreen
 import nl.eduid.screens.pinsetup.RegistrationPinSetupViewModel
-import nl.eduid.screens.requestiddetails.RequestEduIdFormScreen
-import nl.eduid.screens.requestiddetails.RequestEduIdFormViewModel
-import nl.eduid.screens.requestidlinksent.RequestEduIdEmailSentScreen
 import nl.eduid.screens.recovery.confirmsms.ConfirmCodeScreen
 import nl.eduid.screens.recovery.confirmsms.ConfirmCodeViewModel
 import nl.eduid.screens.recovery.requestsms.PhoneRequestCodeScreen
 import nl.eduid.screens.recovery.requestsms.PhoneRequestCodeViewModel
+import nl.eduid.screens.requestiddetails.RequestEduIdFormScreen
+import nl.eduid.screens.requestiddetails.RequestEduIdFormViewModel
+import nl.eduid.screens.requestidlinksent.RequestEduIdEmailSentScreen
 import nl.eduid.screens.requestidstart.RequestEduIdStartScreen
 import nl.eduid.screens.scan.ScanScreen
 import nl.eduid.screens.scan.StatelessScanViewModel
-import nl.eduid.screens.start.WelcomeStartScreen
-import nl.eduid.screens.start.WelcomeStartViewModel
 import nl.eduid.screens.security.SecurityScreen
 import nl.eduid.screens.security.SecurityViewModel
+import nl.eduid.screens.start.WelcomeStartScreen
+import nl.eduid.screens.start.WelcomeStartViewModel
 import nl.eduid.screens.twofactorkey.TwoFactorKeyScreen
 import nl.eduid.screens.twofactorkey.TwoFactorKeyViewModel
 import nl.eduid.screens.twofactorkeydelete.TwoFactorKeyDeleteScreen

diff --git a/app/src/main/kotlin/nl/eduid/screens/accountlinked/AccountLinkedScreen.kt b/app/src/main/kotlin/nl/eduid/screens/accountlinked/AccountLinkedScreen.kt
@@ -2,8 +2,11 @@ package nl.eduid.screens.accountlinked
 
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.navigationBarsPadding
+import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.verticalScroll
 import androidx.compose.material3.LinearProgressIndicator
@@ -33,15 +36,23 @@ import nl.eduid.ui.theme.TextGreen
 fun AccountLinkedScreen(
     viewModel: PersonalInfoViewModel,
     continueToHome: () -> Unit,
+) = EduIdTopAppBar(
+    withBackIcon = false
 ) {
-    AccountLinkedContent(
-        personalInfo = viewModel.uiState.personalInfo,
-        isLoading = viewModel.uiState.isLoading,
-        errorData = viewModel.uiState.errorData,
-        dismissError = viewModel::clearErrorData,
-        continueToHome = continueToHome,
-        removeConnection = { index -> viewModel.removeConnection(index) },
-    )
+    Column(
+        modifier = Modifier
+            .fillMaxSize()
+            .padding(it)
+    ) {
+        AccountLinkedContent(
+            personalInfo = viewModel.uiState.personalInfo,
+            isLoading = viewModel.uiState.isLoading,
+            errorData = viewModel.uiState.errorData,
+            dismissError = viewModel::clearErrorData,
+            continueToHome = continueToHome,
+            removeConnection = { index -> viewModel.removeConnection(index) },
+        )
+    }
 }
 
 @Composable
@@ -52,88 +63,85 @@ private fun AccountLinkedContent(
     dismissError: () -> Unit = {},
     continueToHome: () -> Unit = {},
     removeConnection: (Int) -> Unit = {},
-) = EduIdTopAppBar(
-    withBackIcon = false
+) = Column(
+    modifier = Modifier
+        .verticalScroll(rememberScrollState())
+        .navigationBarsPadding()
+        .padding(start = 24.dp, end = 24.dp, bottom = 24.dp)
 ) {
-    Column(
-        modifier = Modifier
-            .fillMaxWidth()
-            .verticalScroll(rememberScrollState())
-    ) {
-        if (errorData != null) {
-            val context = LocalContext.current
-            AlertDialogWithSingleButton(
-                title = errorData.title(context),
-                explanation = errorData.message(context),
-                buttonLabel = stringResource(R.string.button_ok),
-                onDismiss = dismissError
-            )
-        }
-        Spacer(Modifier.height(36.dp))
-        Text(
-            style = MaterialTheme.typography.titleLarge.copy(
-                textAlign = TextAlign.Start, color = TextGreen
-            ),
-            text = stringResource(R.string.account_linked_title),
-            modifier = Modifier.fillMaxWidth()
+    if (errorData != null) {
+        val context = LocalContext.current
+        AlertDialogWithSingleButton(
+            title = errorData.title(context),
+            explanation = errorData.message(context),
+            buttonLabel = stringResource(R.string.button_ok),
+            onDismiss = dismissError
         )
-        Spacer(Modifier.height(12.dp))
-        Text(
-            style = MaterialTheme.typography.titleLarge.copy(fontWeight = FontWeight.SemiBold),
-            text = stringResource(R.string.account_linked_subtitle),
+    }
+    Spacer(Modifier.height(36.dp))
+    Text(
+        style = MaterialTheme.typography.titleLarge.copy(
+            textAlign = TextAlign.Start, color = TextGreen
+        ),
+        text = stringResource(R.string.account_linked_title),
+        modifier = Modifier.fillMaxWidth()
+    )
+    Spacer(Modifier.height(12.dp))
+    Text(
+        style = MaterialTheme.typography.titleLarge.copy(fontWeight = FontWeight.SemiBold),
+        text = stringResource(R.string.account_linked_subtitle),
+        modifier = Modifier.fillMaxWidth()
+    )
+    Spacer(Modifier.height(12.dp))
+    Text(
+        style = MaterialTheme.typography.bodyLarge,
+        text = stringResource(R.string.account_linked_description),
+        modifier = Modifier.fillMaxWidth()
+    )
+    if (isLoading) {
+        Spacer(modifier = Modifier.height(16.dp))
+        LinearProgressIndicator(
             modifier = Modifier.fillMaxWidth()
         )
+        Spacer(modifier = Modifier.height(16.dp))
+    } else {
         Spacer(Modifier.height(12.dp))
-        Text(
-            style = MaterialTheme.typography.bodyLarge,
-            text = stringResource(R.string.account_linked_description),
-            modifier = Modifier.fillMaxWidth()
-        )
-        if (isLoading) {
-            Spacer(modifier = Modifier.height(16.dp))
-            LinearProgressIndicator(
-                modifier = Modifier.fillMaxWidth()
-            )
-            Spacer(modifier = Modifier.height(16.dp))
+    }
+    InfoField(
+        title = personalInfo.name,
+        subtitle = if (personalInfo.nameProvider == null) {
+            stringResource(R.string.infotab_providedby_you)
         } else {
-            Spacer(Modifier.height(12.dp))
-        }
-        InfoField(
-            title = personalInfo.name,
-            subtitle = if (personalInfo.nameProvider == null) {
-                stringResource(R.string.infotab_providedby_you)
-            } else {
-                stringResource(R.string.infotab_providedby, personalInfo.nameProvider)
-            },
-            endIcon = R.drawable.shield_tick_blue,
-            label = stringResource(R.string.infotab_fullname)
+            stringResource(R.string.infotab_providedby, personalInfo.nameProvider)
+        },
+        endIcon = R.drawable.shield_tick_blue,
+        label = stringResource(R.string.infotab_fullname)
+    )
+    Spacer(Modifier.height(16.dp))
+    if (personalInfo.institutionAccounts.isNotEmpty()) {
+        Text(
+            text = stringResource(R.string.infotab_role_institution),
+            style = MaterialTheme.typography.bodyLarge.copy(
+                textAlign = TextAlign.Start,
+                fontWeight = FontWeight.SemiBold,
+            ),
         )
-        Spacer(Modifier.height(16.dp))
-        if (personalInfo.institutionAccounts.isNotEmpty()) {
-            Text(
-                text = stringResource(R.string.infotab_role_institution),
-                style = MaterialTheme.typography.bodyLarge.copy(
-                    textAlign = TextAlign.Start,
-                    fontWeight = FontWeight.SemiBold,
-                ),
-            )
-            Spacer(Modifier.height(6.dp))
-        }
-        personalInfo.institutionAccounts.forEachIndexed { index, account ->
-            ConnectionCard(
-                title = account.role,
-                subtitle = stringResource(R.string.infotab_at, account.roleProvider),
-                institutionInfo = account,
-                onRemoveConnection = { removeConnection(index) },
-            )
-        }
-        PrimaryButton(
-            text = stringResource(R.string.button_continue),
-            onClick = continueToHome,
-            modifier = Modifier.fillMaxWidth(),
+        Spacer(Modifier.height(6.dp))
+    }
+    personalInfo.institutionAccounts.forEachIndexed { index, account ->
+        ConnectionCard(
+            title = account.role,
+            subtitle = stringResource(R.string.infotab_at, account.roleProvider),
+            institutionInfo = account,
+            onRemoveConnection = { removeConnection(index) },
         )
-        Spacer(Modifier.height(40.dp))
     }
+    PrimaryButton(
+        text = stringResource(R.string.button_continue),
+        onClick = continueToHome,
+        modifier = Modifier
+            .fillMaxWidth() ,
+    )
 }
 
 

diff --git a/app/src/main/kotlin/nl/eduid/screens/authorize/AuthenticationCompletedScreen.kt b/app/src/main/kotlin/nl/eduid/screens/authorize/AuthenticationCompletedScreen.kt
@@ -3,10 +3,11 @@ package nl.eduid.screens.authorize
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.consumeWindowInsets
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.navigationBarsPadding
+import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.wrapContentSize
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
@@ -25,21 +26,25 @@ import nl.eduid.ui.PrimaryButton
 import nl.eduid.ui.theme.EduidAppAndroidTheme
 import nl.eduid.ui.theme.TextGreen
 import nl.eduid.ui.theme.findActivity
-import timber.log.Timber
 
 @Composable
 fun AuthenticationCompletedScreen(goHome: () -> Unit = {}) = EduIdTopAppBar(
     withBackIcon = false
 ) {
-    val activity = LocalContext.current.findActivity()
-    Column(modifier = Modifier.fillMaxSize()) {
+    val context = LocalContext.current
+    Column(
+        modifier = Modifier
+            .fillMaxSize()
+            .padding(it)
+            .padding(horizontal = 24.dp),
+        verticalArrangement = Arrangement.SpaceBetween
+    ) {
         Text(
             style = MaterialTheme.typography.titleLarge.copy(
                 textAlign = TextAlign.Start, color = TextGreen
             ), text = stringResource(R.string.authorize_title), modifier = Modifier.fillMaxWidth()
         )
         Column(
-            modifier = Modifier.weight(1f),
             verticalArrangement = Arrangement.Center,
             horizontalAlignment = Alignment.CenterHorizontally
         ) {
@@ -60,15 +65,17 @@ fun AuthenticationCompletedScreen(goHome: () -> Unit = {}) = EduIdTopAppBar(
             )
         }
         PrimaryButton(
-            modifier = Modifier.fillMaxWidth(),
+            modifier = Modifier
+                .fillMaxWidth()
+                .weight(1f, false)
+                .navigationBarsPadding()
+                .padding(bottom = 24.dp),
             text = stringResource(R.string.button_ok),
             onClick = {
-                Timber.e("Finishing activity: ${activity.hashCode()}")
                 goHome()
-                activity.finish()
+                context.findActivity().finish()
             },
         )
-        Spacer(Modifier.height(24.dp))
     }
 }