From 7fc571bb92f1e262335749012f03d136abfaf188 Mon Sep 17 00:00:00 2001 From: David Perez Date: Tue, 7 Nov 2023 10:04:33 -0600 Subject: [PATCH] Remove unnecessary backgrounds to reduce overdraw. (#218) --- .../ui/auth/feature/createaccount/CreateAccountScreen.kt | 2 -- .../ui/auth/feature/environment/EnvironmentScreen.kt | 3 --- .../com/x8bit/bitwarden/ui/auth/feature/login/LoginScreen.kt | 2 -- .../bitwarden/ui/platform/feature/settings/SettingsScreen.kt | 5 +---- .../ui/platform/feature/settings/about/AboutScreen.kt | 2 -- .../settings/accountsecurity/AccountSecurityScreen.kt | 2 -- .../platform/feature/settings/appearance/AppearanceScreen.kt | 3 --- .../ui/platform/feature/settings/autofill/AutoFillScreen.kt | 2 -- .../ui/platform/feature/settings/other/OtherScreen.kt | 3 --- .../ui/platform/feature/settings/vault/VaultScreen.kt | 3 --- .../bitwarden/ui/tools/feature/generator/GeneratorScreen.kt | 3 --- .../com/x8bit/bitwarden/ui/tools/feature/send/SendEmpty.kt | 4 +--- .../bitwarden/ui/vault/feature/vault/VaultAddItemScreen.kt | 2 -- .../x8bit/bitwarden/ui/vault/feature/vault/VaultContent.kt | 3 --- .../x8bit/bitwarden/ui/vault/feature/vault/VaultLoading.kt | 3 --- .../x8bit/bitwarden/ui/vault/feature/vault/VaultNoItems.kt | 4 +--- 16 files changed, 3 insertions(+), 43 deletions(-) diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/createaccount/CreateAccountScreen.kt b/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/createaccount/CreateAccountScreen.kt index 0cf28bc27e..26ccbca2a5 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/createaccount/CreateAccountScreen.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/createaccount/CreateAccountScreen.kt @@ -1,7 +1,6 @@ package com.x8bit.bitwarden.ui.auth.feature.createaccount import android.widget.Toast -import androidx.compose.foundation.background import androidx.compose.foundation.clickable import androidx.compose.foundation.interaction.MutableInteractionSource import androidx.compose.foundation.layout.Arrangement @@ -194,7 +193,6 @@ fun CreateAccountScreen( .semantics { testTagsAsResourceId = true } .padding(innerPadding) .fillMaxSize() - .background(color = MaterialTheme.colorScheme.surface) .verticalScroll(rememberScrollState()), ) { Spacer(modifier = Modifier.height(16.dp)) diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/environment/EnvironmentScreen.kt b/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/environment/EnvironmentScreen.kt index 4b0865dd57..dab889ef4c 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/environment/EnvironmentScreen.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/environment/EnvironmentScreen.kt @@ -1,7 +1,6 @@ package com.x8bit.bitwarden.ui.auth.feature.environment import android.widget.Toast -import androidx.compose.foundation.background import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.WindowInsets @@ -16,7 +15,6 @@ import androidx.compose.foundation.layout.padding import androidx.compose.foundation.rememberScrollState import androidx.compose.foundation.verticalScroll import androidx.compose.material3.ExperimentalMaterial3Api -import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Scaffold import androidx.compose.material3.ScaffoldDefaults import androidx.compose.material3.TopAppBarDefaults @@ -110,7 +108,6 @@ fun EnvironmentScreen( Modifier .padding(innerPadding) .fillMaxSize() - .background(color = MaterialTheme.colorScheme.surface) .imePadding() .verticalScroll(rememberScrollState()), ) { diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/login/LoginScreen.kt b/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/login/LoginScreen.kt index 9a94f122df..8b511ea775 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/login/LoginScreen.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/login/LoginScreen.kt @@ -1,7 +1,6 @@ package com.x8bit.bitwarden.ui.auth.feature.login import android.widget.Toast -import androidx.compose.foundation.background import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.fillMaxSize @@ -102,7 +101,6 @@ fun LoginScreen( modifier = Modifier .padding(innerPadding) .fillMaxSize() - .background(MaterialTheme.colorScheme.surface) .verticalScroll(rememberScrollState()), ) { BitwardenLoadingDialog( diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/settings/SettingsScreen.kt b/app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/settings/SettingsScreen.kt index 12f300d56d..87ca5121d6 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/settings/SettingsScreen.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/settings/SettingsScreen.kt @@ -1,6 +1,5 @@ package com.x8bit.bitwarden.ui.platform.feature.settings -import androidx.compose.foundation.background import androidx.compose.foundation.clickable import androidx.compose.foundation.interaction.MutableInteractionSource import androidx.compose.foundation.layout.Arrangement @@ -79,7 +78,6 @@ fun SettingsScreen( modifier = Modifier .padding(innerPadding) .fillMaxSize() - .background(color = MaterialTheme.colorScheme.surface) .verticalScroll(state = rememberScrollState()), ) { Settings.values().forEach { @@ -145,8 +143,7 @@ private fun SettingsRows_preview() { Column( modifier = Modifier .padding(16.dp) - .fillMaxSize() - .background(color = MaterialTheme.colorScheme.surface), + .fillMaxSize(), ) { Settings.values().forEach { SettingsRow( diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/settings/about/AboutScreen.kt b/app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/settings/about/AboutScreen.kt index a43f0ea16f..5d2b4c1831 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/settings/about/AboutScreen.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/settings/about/AboutScreen.kt @@ -1,7 +1,6 @@ package com.x8bit.bitwarden.ui.platform.feature.settings.about import android.widget.Toast -import androidx.compose.foundation.background import androidx.compose.foundation.clickable import androidx.compose.foundation.interaction.MutableInteractionSource import androidx.compose.foundation.layout.Arrangement @@ -152,7 +151,6 @@ private fun ContentColum( ) { Column( modifier = modifier - .background(color = MaterialTheme.colorScheme.surface) .verticalScroll(rememberScrollState()), ) { Spacer(modifier = Modifier.height(8.dp)) diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/settings/accountsecurity/AccountSecurityScreen.kt b/app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/settings/accountsecurity/AccountSecurityScreen.kt index 1f1f298370..3ce7ad0caa 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/settings/accountsecurity/AccountSecurityScreen.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/settings/accountsecurity/AccountSecurityScreen.kt @@ -1,7 +1,6 @@ package com.x8bit.bitwarden.ui.platform.feature.settings.accountsecurity import android.widget.Toast -import androidx.compose.foundation.background import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.fillMaxSize @@ -126,7 +125,6 @@ fun AccountSecurityScreen( Modifier .padding(innerPadding) .fillMaxSize() - .background(color = MaterialTheme.colorScheme.surface) .verticalScroll(rememberScrollState()), ) { BitwardenListHeaderText( diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/settings/appearance/AppearanceScreen.kt b/app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/settings/appearance/AppearanceScreen.kt index b1052d35b8..5a55f70260 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/settings/appearance/AppearanceScreen.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/settings/appearance/AppearanceScreen.kt @@ -1,13 +1,11 @@ package com.x8bit.bitwarden.ui.platform.feature.settings.appearance -import androidx.compose.foundation.background import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.padding import androidx.compose.foundation.rememberScrollState import androidx.compose.foundation.verticalScroll import androidx.compose.material3.ExperimentalMaterial3Api -import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Scaffold import androidx.compose.material3.TopAppBarDefaults import androidx.compose.material3.rememberTopAppBarState @@ -58,7 +56,6 @@ fun AppearanceScreen( Modifier .padding(innerPadding) .fillMaxSize() - .background(color = MaterialTheme.colorScheme.surface) .verticalScroll(rememberScrollState()), ) { // TODO: BIT-929 Display Appearance UI diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/settings/autofill/AutoFillScreen.kt b/app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/settings/autofill/AutoFillScreen.kt index 7e5b6513e3..d0b29dd8ee 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/settings/autofill/AutoFillScreen.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/settings/autofill/AutoFillScreen.kt @@ -1,7 +1,6 @@ package com.x8bit.bitwarden.ui.platform.feature.settings.autofill import android.widget.Toast -import androidx.compose.foundation.background import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.fillMaxSize @@ -82,7 +81,6 @@ fun AutoFillScreen( Modifier .padding(innerPadding) .fillMaxSize() - .background(color = MaterialTheme.colorScheme.surface) .verticalScroll(rememberScrollState()), ) { BitwardenListHeaderText( diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/settings/other/OtherScreen.kt b/app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/settings/other/OtherScreen.kt index 42d02ca930..f639ce9145 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/settings/other/OtherScreen.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/settings/other/OtherScreen.kt @@ -1,13 +1,11 @@ package com.x8bit.bitwarden.ui.platform.feature.settings.other -import androidx.compose.foundation.background import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.padding import androidx.compose.foundation.rememberScrollState import androidx.compose.foundation.verticalScroll import androidx.compose.material3.ExperimentalMaterial3Api -import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Scaffold import androidx.compose.material3.TopAppBarDefaults import androidx.compose.material3.rememberTopAppBarState @@ -58,7 +56,6 @@ fun OtherScreen( Modifier .padding(innerPadding) .fillMaxSize() - .background(color = MaterialTheme.colorScheme.surface) .verticalScroll(rememberScrollState()), ) { // TODO: BIT-930 Display Other UI diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/settings/vault/VaultScreen.kt b/app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/settings/vault/VaultScreen.kt index ea49e8ed0d..421f24ec82 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/settings/vault/VaultScreen.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/settings/vault/VaultScreen.kt @@ -1,13 +1,11 @@ package com.x8bit.bitwarden.ui.platform.feature.settings.vault -import androidx.compose.foundation.background import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.padding import androidx.compose.foundation.rememberScrollState import androidx.compose.foundation.verticalScroll import androidx.compose.material3.ExperimentalMaterial3Api -import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Scaffold import androidx.compose.material3.TopAppBarDefaults import androidx.compose.material3.rememberTopAppBarState @@ -58,7 +56,6 @@ fun VaultScreen( Modifier .padding(innerPadding) .fillMaxSize() - .background(color = MaterialTheme.colorScheme.surface) .verticalScroll(rememberScrollState()), ) { // TODO: BIT-928 Display Vault UI diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/tools/feature/generator/GeneratorScreen.kt b/app/src/main/java/com/x8bit/bitwarden/ui/tools/feature/generator/GeneratorScreen.kt index 7b2f6d45b7..593d51adf5 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/tools/feature/generator/GeneratorScreen.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/tools/feature/generator/GeneratorScreen.kt @@ -3,7 +3,6 @@ package com.x8bit.bitwarden.ui.tools.feature.generator import android.widget.Toast -import androidx.compose.foundation.background import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Row @@ -16,7 +15,6 @@ import androidx.compose.foundation.rememberScrollState import androidx.compose.foundation.text.KeyboardOptions import androidx.compose.foundation.verticalScroll import androidx.compose.material3.ExperimentalMaterial3Api -import androidx.compose.material3.MaterialTheme import androidx.compose.material3.OutlinedTextField import androidx.compose.material3.Scaffold import androidx.compose.material3.Slider @@ -150,7 +148,6 @@ private fun ScrollContent( verticalArrangement = Arrangement.spacedBy(16.dp), modifier = modifier .fillMaxHeight() - .background(color = MaterialTheme.colorScheme.surface) .verticalScroll(rememberScrollState()), ) { diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/tools/feature/send/SendEmpty.kt b/app/src/main/java/com/x8bit/bitwarden/ui/tools/feature/send/SendEmpty.kt index 2527f856b3..26a29f59c1 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/tools/feature/send/SendEmpty.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/tools/feature/send/SendEmpty.kt @@ -1,6 +1,5 @@ package com.x8bit.bitwarden.ui.tools.feature.send -import androidx.compose.foundation.background import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Spacer @@ -29,8 +28,7 @@ fun SendEmpty( ) { Column( modifier = Modifier - .fillMaxSize() - .background(color = MaterialTheme.colorScheme.surface), + .fillMaxSize(), verticalArrangement = Arrangement.Center, horizontalAlignment = Alignment.CenterHorizontally, ) { diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/vault/VaultAddItemScreen.kt b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/vault/VaultAddItemScreen.kt index 8334052afc..9e3f06bd0e 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/vault/VaultAddItemScreen.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/vault/VaultAddItemScreen.kt @@ -1,7 +1,6 @@ package com.x8bit.bitwarden.ui.vault.feature.vault import android.widget.Toast -import androidx.compose.foundation.background import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.fillMaxSize @@ -102,7 +101,6 @@ fun VaultAddItemScreen( Column( modifier = Modifier .padding(innerPadding) - .background(MaterialTheme.colorScheme.surface) .fillMaxSize() .verticalScroll(scrollState), verticalArrangement = Arrangement.spacedBy(16.dp), diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/vault/VaultContent.kt b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/vault/VaultContent.kt index b724cb1d89..e3b3585c5c 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/vault/VaultContent.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/vault/VaultContent.kt @@ -1,6 +1,5 @@ package com.x8bit.bitwarden.ui.vault.feature.vault -import androidx.compose.foundation.background import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.PaddingValues @@ -10,7 +9,6 @@ import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier -import androidx.compose.ui.graphics.Color /** * Content view for the [VaultScreen]. @@ -21,7 +19,6 @@ fun VaultContent(paddingValues: PaddingValues) { Column( modifier = Modifier .fillMaxSize() - .background(Color.White) .padding(paddingValues), verticalArrangement = Arrangement.Center, horizontalAlignment = Alignment.CenterHorizontally, diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/vault/VaultLoading.kt b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/vault/VaultLoading.kt index d146e136ee..dcc675597d 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/vault/VaultLoading.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/vault/VaultLoading.kt @@ -1,13 +1,11 @@ package com.x8bit.bitwarden.ui.vault.feature.vault -import androidx.compose.foundation.background import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.PaddingValues import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.padding import androidx.compose.material3.CircularProgressIndicator -import androidx.compose.material3.MaterialTheme import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier @@ -20,7 +18,6 @@ fun VaultLoading(paddingValues: PaddingValues) { Column( modifier = Modifier .fillMaxSize() - .background(MaterialTheme.colorScheme.surface) .padding(paddingValues), verticalArrangement = Arrangement.Center, horizontalAlignment = Alignment.CenterHorizontally, diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/vault/VaultNoItems.kt b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/vault/VaultNoItems.kt index 0c40e5c41c..e1cbdcd5cf 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/vault/VaultNoItems.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/vault/VaultNoItems.kt @@ -1,6 +1,5 @@ package com.x8bit.bitwarden.ui.vault.feature.vault -import androidx.compose.foundation.background import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.PaddingValues @@ -32,8 +31,7 @@ fun VaultNoItems( Column( modifier = Modifier .fillMaxSize() - .padding(paddingValues) - .background(color = MaterialTheme.colorScheme.surface), + .padding(paddingValues), verticalArrangement = Arrangement.Center, horizontalAlignment = Alignment.CenterHorizontally, ) {