Skip to content

Commit ab270cd

Browse files
david-livefrontdavid-livefront
authored
PM-19466: Handle the IME padding internal to the BitwardenScaffold (#4912)
1 parent 8ed9b97 commit ab270cd

File tree

32 files changed

+16
-77
lines changed

32 files changed

+16
-77
lines changed

‎app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/checkemail/CheckEmailScreen.kt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import androidx.compose.foundation.layout.Spacer
66
import androidx.compose.foundation.layout.fillMaxSize
77
import androidx.compose.foundation.layout.fillMaxWidth
88
import androidx.compose.foundation.layout.height
9-
import androidx.compose.foundation.layout.imePadding
109
import androidx.compose.foundation.layout.navigationBarsPadding
1110
import androidx.compose.foundation.layout.size
1211
import androidx.compose.foundation.layout.wrapContentHeight
@@ -87,7 +86,6 @@ fun CheckEmailScreen(
8786
) {
8887
Column(
8988
modifier = Modifier
90-
.imePadding()
9189
.fillMaxSize()
9290
.verticalScroll(rememberScrollState()),
9391
) {

‎app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/completeregistration/CompleteRegistrationScreen.kt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ import androidx.compose.foundation.layout.Spacer
1111
import androidx.compose.foundation.layout.fillMaxSize
1212
import androidx.compose.foundation.layout.fillMaxWidth
1313
import androidx.compose.foundation.layout.height
14-
import androidx.compose.foundation.layout.imePadding
1514
import androidx.compose.foundation.layout.navigationBarsPadding
1615
import androidx.compose.foundation.layout.size
1716
import androidx.compose.foundation.rememberScrollState
@@ -162,7 +161,6 @@ fun CompleteRegistrationScreen(
162161
) {
163162
Column(
164163
modifier = Modifier
165-
.imePadding()
166164
.fillMaxSize()
167165
.verticalScroll(rememberScrollState()),
168166
) {

‎app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/createaccount/CreateAccountScreen.kt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import androidx.compose.foundation.layout.Spacer
66
import androidx.compose.foundation.layout.fillMaxSize
77
import androidx.compose.foundation.layout.fillMaxWidth
88
import androidx.compose.foundation.layout.height
9-
import androidx.compose.foundation.layout.imePadding
109
import androidx.compose.foundation.layout.navigationBarsPadding
1110
import androidx.compose.foundation.rememberScrollState
1211
import androidx.compose.foundation.verticalScroll
@@ -176,7 +175,6 @@ fun CreateAccountScreen(
176175
) {
177176
Column(
178177
modifier = Modifier
179-
.imePadding()
180178
.fillMaxSize()
181179
.verticalScroll(rememberScrollState()),
182180
) {

‎app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/enterprisesignon/EnterpriseSignOnScreen.kt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import androidx.compose.foundation.layout.Spacer
55
import androidx.compose.foundation.layout.fillMaxSize
66
import androidx.compose.foundation.layout.fillMaxWidth
77
import androidx.compose.foundation.layout.height
8-
import androidx.compose.foundation.layout.imePadding
98
import androidx.compose.foundation.layout.navigationBarsPadding
109
import androidx.compose.foundation.rememberScrollState
1110
import androidx.compose.foundation.verticalScroll
@@ -128,7 +127,6 @@ private fun EnterpriseSignOnScreenContent(
128127
Column(
129128
horizontalAlignment = Alignment.CenterHorizontally,
130129
modifier = modifier
131-
.imePadding()
132130
.verticalScroll(rememberScrollState())
133131
.fillMaxWidth(),
134132
) {

‎app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/environment/EnvironmentScreen.kt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import androidx.compose.foundation.layout.Spacer
66
import androidx.compose.foundation.layout.fillMaxSize
77
import androidx.compose.foundation.layout.fillMaxWidth
88
import androidx.compose.foundation.layout.height
9-
import androidx.compose.foundation.layout.imePadding
109
import androidx.compose.foundation.layout.navigationBarsPadding
1110
import androidx.compose.foundation.layout.padding
1211
import androidx.compose.foundation.rememberScrollState
@@ -181,7 +180,6 @@ fun EnvironmentScreen(
181180
Column(
182181
modifier = Modifier
183182
.fillMaxSize()
184-
.imePadding()
185183
.verticalScroll(rememberScrollState()),
186184
) {
187185
Spacer(modifier = Modifier.height(height = 12.dp))

‎app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/landing/LandingScreen.kt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import androidx.compose.foundation.layout.Spacer
99
import androidx.compose.foundation.layout.fillMaxSize
1010
import androidx.compose.foundation.layout.fillMaxWidth
1111
import androidx.compose.foundation.layout.height
12-
import androidx.compose.foundation.layout.imePadding
1312
import androidx.compose.foundation.layout.navigationBarsPadding
1413
import androidx.compose.foundation.layout.statusBarsPadding
1514
import androidx.compose.foundation.layout.wrapContentHeight
@@ -205,7 +204,6 @@ private fun LandingScreenContent(
205204
horizontalAlignment = Alignment.CenterHorizontally,
206205
modifier = modifier
207206
.fillMaxSize()
208-
.imePadding()
209207
.verticalScroll(rememberScrollState())
210208
.statusBarsPadding(),
211209
) {

‎app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/login/LoginScreen.kt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import androidx.compose.foundation.layout.Spacer
77
import androidx.compose.foundation.layout.fillMaxSize
88
import androidx.compose.foundation.layout.fillMaxWidth
99
import androidx.compose.foundation.layout.height
10-
import androidx.compose.foundation.layout.imePadding
1110
import androidx.compose.foundation.layout.navigationBarsPadding
1211
import androidx.compose.foundation.rememberScrollState
1312
import androidx.compose.foundation.verticalScroll
@@ -234,7 +233,6 @@ private fun LoginScreenContent(
234233
) {
235234
Column(
236235
modifier = modifier
237-
.imePadding()
238236
.verticalScroll(rememberScrollState()),
239237
) {
240238
Spacer(modifier = Modifier.height(height = 12.dp))

‎app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/loginwithdevice/LoginWithDeviceScreen.kt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import androidx.compose.foundation.layout.defaultMinSize
99
import androidx.compose.foundation.layout.fillMaxSize
1010
import androidx.compose.foundation.layout.fillMaxWidth
1111
import androidx.compose.foundation.layout.height
12-
import androidx.compose.foundation.layout.imePadding
1312
import androidx.compose.foundation.layout.navigationBarsPadding
1413
import androidx.compose.foundation.layout.padding
1514
import androidx.compose.foundation.layout.size
@@ -133,7 +132,6 @@ private fun LoginWithDeviceScreenContent(
133132
) {
134133
Column(
135134
modifier = modifier
136-
.imePadding()
137135
.verticalScroll(rememberScrollState()),
138136
) {
139137
Text(

‎app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/newdevicenotice/NewDeviceNoticeEmailAccessScreen.kt

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import androidx.compose.foundation.layout.PaddingValues
77
import androidx.compose.foundation.layout.Spacer
88
import androidx.compose.foundation.layout.fillMaxSize
99
import androidx.compose.foundation.layout.height
10-
import androidx.compose.foundation.layout.imePadding
1110
import androidx.compose.foundation.layout.navigationBarsPadding
1211
import androidx.compose.foundation.layout.size
1312
import androidx.compose.foundation.rememberScrollState
@@ -117,9 +116,7 @@ private fun NewDeviceNoticeEmailAccessContent(
117116
BitwardenFilledButton(
118117
label = stringResource(R.string.continue_text),
119118
onClick = onContinueClick,
120-
modifier = Modifier
121-
.fillMaxSize()
122-
.imePadding(),
119+
modifier = Modifier.fillMaxSize(),
123120
)
124121
Spacer(modifier = Modifier.navigationBarsPadding())
125122
}

‎app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/resetpassword/ResetPasswordScreen.kt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import androidx.compose.foundation.layout.Spacer
66
import androidx.compose.foundation.layout.fillMaxSize
77
import androidx.compose.foundation.layout.fillMaxWidth
88
import androidx.compose.foundation.layout.height
9-
import androidx.compose.foundation.layout.imePadding
109
import androidx.compose.foundation.layout.navigationBarsPadding
1110
import androidx.compose.foundation.rememberScrollState
1211
import androidx.compose.foundation.verticalScroll
@@ -174,7 +173,6 @@ private fun ResetPasswordScreenContent(
174173
Column(
175174
horizontalAlignment = Alignment.CenterHorizontally,
176175
modifier = modifier
177-
.imePadding()
178176
.verticalScroll(rememberScrollState()),
179177
) {
180178
Spacer(modifier = Modifier.height(height = 12.dp))

‎app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/setpassword/SetPasswordScreen.kt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import androidx.compose.foundation.layout.Spacer
55
import androidx.compose.foundation.layout.fillMaxSize
66
import androidx.compose.foundation.layout.fillMaxWidth
77
import androidx.compose.foundation.layout.height
8-
import androidx.compose.foundation.layout.imePadding
98
import androidx.compose.foundation.layout.navigationBarsPadding
109
import androidx.compose.foundation.rememberScrollState
1110
import androidx.compose.foundation.verticalScroll
@@ -96,7 +95,6 @@ fun SetPasswordScreen(
9695
{ viewModel.trySendAction(SetPasswordAction.PasswordHintInputChanged(it)) }
9796
},
9897
modifier = Modifier
99-
.imePadding()
10098
.fillMaxSize(),
10199
)
102100
}

‎app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/startregistration/StartRegistrationScreen.kt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import androidx.compose.foundation.layout.Spacer
1010
import androidx.compose.foundation.layout.fillMaxSize
1111
import androidx.compose.foundation.layout.fillMaxWidth
1212
import androidx.compose.foundation.layout.height
13-
import androidx.compose.foundation.layout.imePadding
1413
import androidx.compose.foundation.layout.navigationBarsPadding
1514
import androidx.compose.foundation.layout.padding
1615
import androidx.compose.foundation.rememberScrollState
@@ -191,7 +190,6 @@ private fun StartRegistrationContent(
191190
horizontalAlignment = Alignment.CenterHorizontally,
192191
modifier = modifier
193192
.fillMaxSize()
194-
.imePadding()
195193
.verticalScroll(rememberScrollState()),
196194
) {
197195
Spacer(modifier = Modifier.height(height = 12.dp))

‎app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/twofactorlogin/TwoFactorLoginScreen.kt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import androidx.compose.foundation.layout.Spacer
77
import androidx.compose.foundation.layout.fillMaxSize
88
import androidx.compose.foundation.layout.fillMaxWidth
99
import androidx.compose.foundation.layout.height
10-
import androidx.compose.foundation.layout.imePadding
1110
import androidx.compose.foundation.layout.navigationBarsPadding
1211
import androidx.compose.foundation.layout.padding
1312
import androidx.compose.foundation.layout.size
@@ -227,7 +226,6 @@ private fun TwoFactorLoginScreenContent(
227226
Column(
228227
horizontalAlignment = Alignment.CenterHorizontally,
229228
modifier = modifier
230-
.imePadding()
231229
.verticalScroll(rememberScrollState()),
232230
) {
233231
if (state.authMethod != TwoFactorAuthMethod.YUBI_KEY) {

‎app/src/main/java/com/x8bit/bitwarden/ui/platform/components/dialog/BitwardenClientCertificateInfoDialog.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ package com.x8bit.bitwarden.ui.platform.components.dialog
22

33
import androidx.compose.foundation.layout.Column
44
import androidx.compose.foundation.layout.Spacer
5+
import androidx.compose.foundation.layout.fillMaxWidth
56
import androidx.compose.foundation.layout.height
6-
import androidx.compose.foundation.layout.imePadding
77
import androidx.compose.material3.AlertDialog
88
import androidx.compose.material3.Text
99
import androidx.compose.runtime.Composable
@@ -86,7 +86,7 @@ fun BitwardenClientCertificateDialog(
8686
autoFocus = true,
8787
cardStyle = CardStyle.Top(dividerPadding = 0.dp),
8888
textFieldTestTag = "AlertClientCertificateAliasInputField",
89-
modifier = Modifier.imePadding(),
89+
modifier = Modifier.fillMaxWidth(),
9090
)
9191

9292
BitwardenPasswordField(
@@ -95,7 +95,7 @@ fun BitwardenClientCertificateDialog(
9595
onValueChange = { password = it },
9696
cardStyle = CardStyle.Bottom,
9797
passwordFieldTestTag = "AlertClientCertificatePasswordInputField",
98-
modifier = Modifier.imePadding(),
98+
modifier = Modifier.fillMaxWidth(),
9999
)
100100
}
101101
},

‎app/src/main/java/com/x8bit/bitwarden/ui/platform/components/dialog/BitwardenMasterPasswordDialog.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ package com.x8bit.bitwarden.ui.platform.components.dialog
22

33
import androidx.compose.foundation.layout.Column
44
import androidx.compose.foundation.layout.Spacer
5+
import androidx.compose.foundation.layout.fillMaxWidth
56
import androidx.compose.foundation.layout.height
6-
import androidx.compose.foundation.layout.imePadding
77
import androidx.compose.material3.AlertDialog
88
import androidx.compose.material3.Text
99
import androidx.compose.runtime.Composable
@@ -80,7 +80,7 @@ fun BitwardenMasterPasswordDialog(
8080
autoFocus = true,
8181
passwordFieldTestTag = "AlertInputField",
8282
cardStyle = CardStyle.Full,
83-
modifier = Modifier.imePadding(),
83+
modifier = Modifier.fillMaxWidth(),
8484
)
8585
}
8686
},

‎app/src/main/java/com/x8bit/bitwarden/ui/platform/components/dialog/BitwardenPinDialog.kt

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package com.x8bit.bitwarden.ui.platform.components.dialog
22

33
import androidx.compose.foundation.layout.fillMaxWidth
4-
import androidx.compose.foundation.layout.imePadding
54
import androidx.compose.material3.AlertDialog
65
import androidx.compose.material3.Text
76
import androidx.compose.runtime.Composable
@@ -68,9 +67,7 @@ fun BitwardenPinDialog(
6867
autoFocus = true,
6968
passwordFieldTestTag = "AlertInputField",
7069
cardStyle = CardStyle.Full,
71-
modifier = Modifier
72-
.fillMaxWidth()
73-
.imePadding(),
70+
modifier = Modifier.fillMaxWidth(),
7471
)
7572
},
7673
shape = BitwardenTheme.shapes.dialog,

‎app/src/main/java/com/x8bit/bitwarden/ui/platform/components/scaffold/BitwardenScaffold.kt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import androidx.compose.foundation.layout.WindowInsets
66
import androidx.compose.foundation.layout.WindowInsetsSides
77
import androidx.compose.foundation.layout.consumeWindowInsets
88
import androidx.compose.foundation.layout.displayCutout
9+
import androidx.compose.foundation.layout.imePadding
910
import androidx.compose.foundation.layout.only
1011
import androidx.compose.foundation.layout.padding
1112
import androidx.compose.foundation.layout.union
@@ -73,7 +74,8 @@ fun BitwardenScaffold(
7374
Column(
7475
modifier = Modifier
7576
.padding(paddingValues = paddingValues)
76-
.consumeWindowInsets(paddingValues = paddingValues),
77+
.consumeWindowInsets(paddingValues = paddingValues)
78+
.imePadding(),
7779
) {
7880
utilityBar()
7981
val internalPullToRefreshState = rememberPullToRefreshState()

‎app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/search/SearchScreen.kt

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ package com.x8bit.bitwarden.ui.platform.feature.search
33
import android.widget.Toast
44
import androidx.compose.foundation.layout.fillMaxSize
55
import androidx.compose.foundation.layout.fillMaxWidth
6-
import androidx.compose.foundation.layout.imePadding
76
import androidx.compose.foundation.layout.padding
87
import androidx.compose.material3.ExperimentalMaterial3Api
98
import androidx.compose.material3.TopAppBarDefaults
@@ -149,28 +148,24 @@ fun SearchScreen(
149148
searchHandlers = searchHandlers,
150149
searchType = state.searchType,
151150
modifier = Modifier
152-
.fillMaxSize()
153-
.imePadding(),
151+
.fillMaxSize(),
154152
)
155153

156154
is SearchState.ViewState.Empty -> SearchEmptyContent(
157155
viewState = viewState,
158156
modifier = Modifier
159-
.fillMaxSize()
160-
.imePadding(),
157+
.fillMaxSize(),
161158
)
162159

163160
is SearchState.ViewState.Error -> BitwardenErrorContent(
164161
message = viewState.message(),
165162
modifier = Modifier
166-
.fillMaxSize()
167-
.imePadding(),
163+
.fillMaxSize(),
168164
)
169165

170166
SearchState.ViewState.Loading -> BitwardenLoadingContent(
171167
modifier = Modifier
172-
.fillMaxSize()
173-
.imePadding(),
168+
.fillMaxSize(),
174169
)
175170
}
176171
}

‎app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/settings/accountsecurity/deleteaccount/DeleteAccountScreen.kt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import androidx.compose.foundation.layout.Spacer
66
import androidx.compose.foundation.layout.fillMaxSize
77
import androidx.compose.foundation.layout.fillMaxWidth
88
import androidx.compose.foundation.layout.height
9-
import androidx.compose.foundation.layout.imePadding
109
import androidx.compose.foundation.layout.navigationBarsPadding
1110
import androidx.compose.foundation.layout.padding
1211
import androidx.compose.foundation.rememberScrollState
@@ -113,7 +112,6 @@ fun DeleteAccountScreen(
113112
) {
114113
Column(
115114
modifier = Modifier
116-
.imePadding()
117115
.fillMaxSize()
118116
.verticalScroll(rememberScrollState()),
119117
) {

‎app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/settings/exportvault/ExportVaultScreen.kt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import androidx.compose.foundation.layout.Spacer
77
import androidx.compose.foundation.layout.fillMaxSize
88
import androidx.compose.foundation.layout.fillMaxWidth
99
import androidx.compose.foundation.layout.height
10-
import androidx.compose.foundation.layout.imePadding
1110
import androidx.compose.foundation.rememberScrollState
1211
import androidx.compose.foundation.verticalScroll
1312
import androidx.compose.material3.ExperimentalMaterial3Api
@@ -193,7 +192,6 @@ private fun ExportVaultScreenContent(
193192
Column(
194193
horizontalAlignment = Alignment.CenterHorizontally,
195194
modifier = modifier
196-
.imePadding()
197195
.verticalScroll(rememberScrollState()),
198196
) {
199197
Spacer(modifier = Modifier.height(height = 12.dp))

‎app/src/main/java/com/x8bit/bitwarden/ui/tools/feature/generator/GeneratorScreen.kt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import androidx.compose.foundation.layout.fillMaxHeight
88
import androidx.compose.foundation.layout.fillMaxSize
99
import androidx.compose.foundation.layout.fillMaxWidth
1010
import androidx.compose.foundation.layout.height
11-
import androidx.compose.foundation.layout.imePadding
1211
import androidx.compose.foundation.layout.navigationBarsPadding
1312
import androidx.compose.foundation.layout.width
1413
import androidx.compose.foundation.lazy.LazyColumn
@@ -386,8 +385,7 @@ private fun CoachMarkScope<ExploreGeneratorCoachMark>.ScrollContent(
386385
LazyColumn(
387386
state = lazyListState,
388387
modifier = modifier
389-
.fillMaxHeight()
390-
.imePadding(),
388+
.fillMaxHeight(),
391389
) {
392390
item {
393391
Spacer(modifier = Modifier.height(12.dp))

0 commit comments

Comments
 (0)