Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 468d56b4 authored by Frank PREEL's avatar Frank PREEL
Browse files

fix: The page GenerationPasswordScreen cannot scroll in low resolution mode and/or big font size.

Made the view fully scrollable by removing fillMaxHeight that should block scroll.
parent 33eaef69
Loading
Loading
Loading
Loading
+0 −1
Original line number Diff line number Diff line
@@ -3,7 +3,6 @@ package foundation.e.findmydevice.activity
import android.content.res.Configuration
import android.os.Build
import android.os.Bundle
import android.util.Log
import androidx.activity.compose.BackHandler
import androidx.activity.compose.setContent
import androidx.annotation.RequiresApi
+10 −6
Original line number Diff line number Diff line
@@ -44,7 +44,8 @@ import androidx.biometric.BiometricManager
import androidx.biometric.BiometricPrompt
import androidx.compose.foundation.background
import androidx.compose.foundation.border
import androidx.compose.foundation.layout.fillMaxHeight
import androidx.compose.foundation.rememberScrollState
import androidx.compose.foundation.verticalScroll
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.layout.width
import androidx.compose.foundation.shape.RoundedCornerShape
@@ -52,7 +53,6 @@ import androidx.compose.material3.Icon
import androidx.compose.ui.draw.clip
import androidx.compose.ui.res.colorResource
import androidx.compose.ui.res.painterResource
import androidx.compose.ui.text.TextStyle
import androidx.core.content.ContextCompat
import foundation.e.findmydevice.activity.FindMyDeviceActivity
import foundation.e.findmydevice.activity.FindMyDeviceActivity.Companion.TAG
@@ -238,9 +238,8 @@ fun generatePasswordScreenContent(onSelection: () -> Unit,

        if (!isProvisioned) {
            Row(
                modifier = Modifier.fillMaxWidth().fillMaxHeight(),
                horizontalArrangement = Arrangement.End,
                verticalAlignment = Alignment.Bottom
                modifier = Modifier.fillMaxWidth(),
                horizontalArrangement = Arrangement.End
            ) {
                Button(
                    onClick = {
@@ -258,7 +257,12 @@ fun generatePasswordScreenContent(onSelection: () -> Unit,
        }
    }

    Column(modifier = Modifier.padding(16.dp)) {
    val scrollState = rememberScrollState()
    Column(
        modifier = Modifier
            .verticalScroll(scrollState)
            .padding(16.dp)
    ) {

        Text(
            text = stringResource(id = R.string.welcome_screen_intro_1),