github-starred/android
2
0
Fork 0
mirror of https://github.com/bitwarden/android.git synced 2026-05-22 22:24:37 -05:00
Code Issues 1.5k Packages Projects Releases 125 Wiki Activity

BIT-2251: Fix pending login request UI scrolling (#1323)

Browse Source
This commit is contained in:
David Perez
2024-04-30 15:50:47 -05:00
committed by GitHub
parent deaa45e3fd
commit 0d398a4b5f
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/settings/accountsecurity/pendingrequests/PendingRequestsScreen.kt
View File

@@ -19,7 +19,6 @@ import androidx.compose.foundation.rememberScrollState
import androidx.compose.foundation.verticalScroll
import androidx.compose.material.ripple.rememberRipple
import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.HorizontalDivider
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Text
import androidx.compose.material3.TopAppBarDefaults
@@ -46,6 +45,7 @@ import androidx.lifecycle.Lifecycle
import com.x8bit.bitwarden.R
import com.x8bit.bitwarden.ui.platform.base.util.EventsEffect
import com.x8bit.bitwarden.ui.platform.base.util.LivecycleEventEffect
import com.x8bit.bitwarden.ui.platform.base.util.bottomDivider
import com.x8bit.bitwarden.ui.platform.components.appbar.BitwardenTopAppBar
import com.x8bit.bitwarden.ui.platform.components.button.BitwardenFilledTonalButtonWithIcon
import com.x8bit.bitwarden.ui.platform.components.content.BitwardenErrorContent
@@ -199,7 +199,7 @@ private fun PendingRequestsContent(
}
LazyColumn(
Modifier.padding(bottom = 16.dp),
modifier = Modifier.weight(weight = 1f, fill = false),
) {
items(state.requests) { request ->
PendingRequestItem(
@@ -209,14 +209,12 @@ private fun PendingRequestsContent(
onNavigateToLoginApproval = onNavigateToLoginApproval,
modifier = Modifier
.testTag("LoginRequestCell")
.fillMaxWidth(),
)
HorizontalDivider(
thickness = 1.dp,
color = MaterialTheme.colorScheme.outlineVariant,
.fillMaxWidth()
.bottomDivider(),
)
}
}
Spacer(modifier = Modifier.height(16.dp))
BitwardenFilledTonalButtonWithIcon(
label = stringResource(id = R.string.decline_all_requests),