diff --git a/core/ui/compose/common/src/main/kotlin/net/thunderbird/core/ui/compose/common/modifier/SafeDrawingCompat.kt b/core/ui/compose/common/src/main/kotlin/net/thunderbird/core/ui/compose/common/modifier/SafeDrawingCompat.kt deleted file mode 100644 index b8b2c4305a7..00000000000 --- a/core/ui/compose/common/src/main/kotlin/net/thunderbird/core/ui/compose/common/modifier/SafeDrawingCompat.kt +++ /dev/null @@ -1,77 +0,0 @@ -package net.thunderbird.core.ui.compose.common.modifier - -import android.annotation.SuppressLint -import android.content.res.Configuration -import android.os.Build -import android.view.ViewConfiguration -import androidx.compose.foundation.layout.WindowInsets -import androidx.compose.foundation.layout.padding -import androidx.compose.foundation.layout.safeDrawing -import androidx.compose.foundation.layout.windowInsetsPadding -import androidx.compose.runtime.Composable -import androidx.compose.ui.Modifier -import androidx.compose.ui.composed -import androidx.compose.ui.platform.LocalConfiguration -import androidx.compose.ui.platform.LocalContext -import androidx.compose.ui.platform.LocalDensity -import androidx.compose.ui.platform.LocalResources -import androidx.compose.ui.unit.Dp -import androidx.compose.ui.unit.dp - -/** - * Applies padding to avoid unsafe drawing areas such as notches and system bars. - * - * For API level 23 and above, it uses the reliable [WindowInsets.safeDrawing] method. - * For API levels 21 and 22, it falls back to manually calculating the status bar and - * navigation bar heights to apply appropriate padding. - * - * @return A [Modifier] with safe drawing padding applied. - */ -@SuppressLint("InternalInsetResource", "UnnecessaryComposedModifier") -@Composable -fun Modifier.safeDrawingPaddingCompat(): Modifier = composed { - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { - this.windowInsetsPadding(WindowInsets.safeDrawing) - } else { - val legacyPaddings = calculateLegacyPaddings() - - this.padding( - top = legacyPaddings.top, - bottom = legacyPaddings.bottom, - ) - } -} - -private data class LegacyPaddings(val top: Dp, val bottom: Dp) - -/** - * Calculates system bar padding for pre-Marshmallow devices (API 21, 22) - * by reading system dimension resources. - */ -@SuppressLint("InternalInsetResource", "DiscouragedApi") -@Composable -private fun calculateLegacyPaddings(): LegacyPaddings { - val context = LocalContext.current - val resources = LocalResources.current - val density = LocalDensity.current - val configuration = LocalConfiguration.current - - // Calculate top padding for the status bar - val statusBarResourceId = resources.getIdentifier("status_bar_height", "dimen", "android") - val topPadding = if (statusBarResourceId > 0) { - with(density) { resources.getDimensionPixelSize(statusBarResourceId).toDp() } - } else { - 24.dp // Default fallback - } - - // Calculate bottom padding, but only if a software navigation bar is likely present - val hasSoftwareNavBar = !ViewConfiguration.get(context).hasPermanentMenuKey() - val isPortrait = configuration.orientation == Configuration.ORIENTATION_PORTRAIT - val navBarResourceId = resources.getIdentifier("navigation_bar_height", "dimen", "android") - val bottomPadding = if (hasSoftwareNavBar && isPortrait && navBarResourceId > 0) { - with(density) { resources.getDimensionPixelSize(navBarResourceId).toDp() } - } else { - 0.dp - } - return LegacyPaddings(top = topPadding, bottom = bottomPadding) -} diff --git a/core/ui/legacy/theme2/common/src/main/res/values/styles.xml b/core/ui/legacy/theme2/common/src/main/res/values/styles.xml new file mode 100644 index 00000000000..ad1d40da677 --- /dev/null +++ b/core/ui/legacy/theme2/common/src/main/res/values/styles.xml @@ -0,0 +1,15 @@ + + + + + + + + diff --git a/feature/account/server/settings/src/debug/kotlin/app/k9mail/feature/account/server/settings/ui/incoming/IncomingServerSettingsContentPreview.kt b/feature/account/server/settings/src/debug/kotlin/app/k9mail/feature/account/server/settings/ui/incoming/IncomingServerSettingsContentPreview.kt index 211f651d233..e669a3db4c2 100644 --- a/feature/account/server/settings/src/debug/kotlin/app/k9mail/feature/account/server/settings/ui/incoming/IncomingServerSettingsContentPreview.kt +++ b/feature/account/server/settings/src/debug/kotlin/app/k9mail/feature/account/server/settings/ui/incoming/IncomingServerSettingsContentPreview.kt @@ -1,6 +1,5 @@ package app.k9mail.feature.account.server.settings.ui.incoming -import androidx.compose.foundation.layout.PaddingValues import androidx.compose.runtime.Composable import app.k9mail.core.ui.compose.common.annotation.PreviewDevices import app.k9mail.core.ui.compose.designsystem.PreviewWithTheme @@ -14,7 +13,6 @@ internal fun IncomingServerSettingsContentPreview() { mode = InteractionMode.Create, onEvent = { }, state = IncomingServerSettingsContract.State(), - contentPadding = PaddingValues(), ) } } diff --git a/feature/account/server/settings/src/debug/kotlin/app/k9mail/feature/account/server/settings/ui/outgoing/OutgoingServerSettingsContentPreview.kt b/feature/account/server/settings/src/debug/kotlin/app/k9mail/feature/account/server/settings/ui/outgoing/OutgoingServerSettingsContentPreview.kt index 1cadc1d179e..7d737f54377 100644 --- a/feature/account/server/settings/src/debug/kotlin/app/k9mail/feature/account/server/settings/ui/outgoing/OutgoingServerSettingsContentPreview.kt +++ b/feature/account/server/settings/src/debug/kotlin/app/k9mail/feature/account/server/settings/ui/outgoing/OutgoingServerSettingsContentPreview.kt @@ -1,6 +1,5 @@ package app.k9mail.feature.account.server.settings.ui.outgoing -import androidx.compose.foundation.layout.PaddingValues import androidx.compose.runtime.Composable import app.k9mail.core.ui.compose.common.annotation.PreviewDevices import app.k9mail.core.ui.compose.designsystem.PreviewWithTheme @@ -14,7 +13,6 @@ internal fun OutgoingServerSettingsContentPreview() { mode = InteractionMode.Create, state = OutgoingServerSettingsContract.State(), onEvent = { }, - contentPadding = PaddingValues(), ) } } diff --git a/feature/account/server/settings/src/main/kotlin/app/k9mail/feature/account/server/settings/ui/incoming/IncomingServerSettingsContent.kt b/feature/account/server/settings/src/main/kotlin/app/k9mail/feature/account/server/settings/ui/incoming/IncomingServerSettingsContent.kt index 19638642e36..c8c8653bbbc 100644 --- a/feature/account/server/settings/src/main/kotlin/app/k9mail/feature/account/server/settings/ui/incoming/IncomingServerSettingsContent.kt +++ b/feature/account/server/settings/src/main/kotlin/app/k9mail/feature/account/server/settings/ui/incoming/IncomingServerSettingsContent.kt @@ -1,11 +1,7 @@ package app.k9mail.feature.account.server.settings.ui.incoming import androidx.compose.foundation.layout.Arrangement -import androidx.compose.foundation.layout.PaddingValues import androidx.compose.foundation.layout.fillMaxSize -import androidx.compose.foundation.layout.fillMaxWidth -import androidx.compose.foundation.layout.imePadding -import androidx.compose.foundation.layout.padding import androidx.compose.foundation.lazy.LazyColumn import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment @@ -24,7 +20,6 @@ internal fun IncomingServerSettingsContent( mode: InteractionMode, state: State, onEvent: (Event) -> Unit, - contentPadding: PaddingValues, modifier: Modifier = Modifier, ) { val resources = LocalResources.current @@ -32,14 +27,10 @@ internal fun IncomingServerSettingsContent( ResponsiveWidthContainer( modifier = Modifier .testTagAsResourceId("IncomingServerSettingsContent") - .padding(contentPadding) - .fillMaxWidth() .then(modifier), ) { contentPadding -> LazyColumn( - modifier = Modifier - .fillMaxSize() - .imePadding(), + modifier = Modifier.fillMaxSize(), contentPadding = contentPadding, horizontalAlignment = Alignment.Start, verticalArrangement = Arrangement.spacedBy(MainTheme.spacings.default), diff --git a/feature/account/server/settings/src/main/kotlin/app/k9mail/feature/account/server/settings/ui/incoming/IncomingServerSettingsScreen.kt b/feature/account/server/settings/src/main/kotlin/app/k9mail/feature/account/server/settings/ui/incoming/IncomingServerSettingsScreen.kt index e56bdb1ec8f..fc4c85aad1a 100644 --- a/feature/account/server/settings/src/main/kotlin/app/k9mail/feature/account/server/settings/ui/incoming/IncomingServerSettingsScreen.kt +++ b/feature/account/server/settings/src/main/kotlin/app/k9mail/feature/account/server/settings/ui/incoming/IncomingServerSettingsScreen.kt @@ -2,8 +2,11 @@ package app.k9mail.feature.account.server.settings.ui.incoming import androidx.activity.compose.BackHandler import androidx.compose.foundation.layout.WindowInsets +import androidx.compose.foundation.layout.consumeWindowInsets +import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.imePadding import androidx.compose.foundation.layout.navigationBars +import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.windowInsetsPadding import androidx.compose.runtime.Composable import androidx.compose.runtime.LaunchedEffect @@ -68,7 +71,11 @@ fun IncomingServerSettingsScreen( mode = viewModel.mode, onEvent = { dispatch(it) }, state = state.value, - contentPadding = innerPadding, + modifier = Modifier + .fillMaxSize() + .padding(innerPadding) + .consumeWindowInsets(innerPadding) + .imePadding(), ) } } diff --git a/feature/account/server/settings/src/main/kotlin/app/k9mail/feature/account/server/settings/ui/outgoing/OutgoingServerSettingsContent.kt b/feature/account/server/settings/src/main/kotlin/app/k9mail/feature/account/server/settings/ui/outgoing/OutgoingServerSettingsContent.kt index 73977d7cccf..d2c2e64dac1 100644 --- a/feature/account/server/settings/src/main/kotlin/app/k9mail/feature/account/server/settings/ui/outgoing/OutgoingServerSettingsContent.kt +++ b/feature/account/server/settings/src/main/kotlin/app/k9mail/feature/account/server/settings/ui/outgoing/OutgoingServerSettingsContent.kt @@ -1,11 +1,7 @@ package app.k9mail.feature.account.server.settings.ui.outgoing import androidx.compose.foundation.layout.Arrangement -import androidx.compose.foundation.layout.PaddingValues import androidx.compose.foundation.layout.fillMaxSize -import androidx.compose.foundation.layout.fillMaxWidth -import androidx.compose.foundation.layout.imePadding -import androidx.compose.foundation.layout.padding import androidx.compose.foundation.lazy.LazyColumn import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment @@ -24,7 +20,6 @@ internal fun OutgoingServerSettingsContent( mode: InteractionMode, state: State, onEvent: (Event) -> Unit, - contentPadding: PaddingValues, modifier: Modifier = Modifier, ) { val resources = LocalResources.current @@ -32,14 +27,10 @@ internal fun OutgoingServerSettingsContent( ResponsiveWidthContainer( modifier = Modifier .testTagAsResourceId("OutgoingServerSettingsContent") - .padding(contentPadding) - .fillMaxWidth() .then(modifier), ) { contentPadding -> LazyColumn( - modifier = Modifier - .fillMaxSize() - .imePadding(), + modifier = Modifier.fillMaxSize(), contentPadding = contentPadding, horizontalAlignment = Alignment.Start, verticalArrangement = Arrangement.spacedBy(MainTheme.spacings.default), diff --git a/feature/account/server/settings/src/main/kotlin/app/k9mail/feature/account/server/settings/ui/outgoing/OutgoingServerSettingsScreen.kt b/feature/account/server/settings/src/main/kotlin/app/k9mail/feature/account/server/settings/ui/outgoing/OutgoingServerSettingsScreen.kt index 8b1844f4002..0493f4c3cd5 100644 --- a/feature/account/server/settings/src/main/kotlin/app/k9mail/feature/account/server/settings/ui/outgoing/OutgoingServerSettingsScreen.kt +++ b/feature/account/server/settings/src/main/kotlin/app/k9mail/feature/account/server/settings/ui/outgoing/OutgoingServerSettingsScreen.kt @@ -2,8 +2,11 @@ package app.k9mail.feature.account.server.settings.ui.outgoing import androidx.activity.compose.BackHandler import androidx.compose.foundation.layout.WindowInsets +import androidx.compose.foundation.layout.consumeWindowInsets +import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.imePadding import androidx.compose.foundation.layout.navigationBars +import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.windowInsetsPadding import androidx.compose.runtime.Composable import androidx.compose.runtime.LaunchedEffect @@ -68,7 +71,11 @@ fun OutgoingServerSettingsScreen( mode = viewModel.mode, state = state.value, onEvent = { dispatch(it) }, - contentPadding = innerPadding, + modifier = Modifier + .fillMaxSize() + .padding(innerPadding) + .consumeWindowInsets(innerPadding) + .imePadding(), ) } } diff --git a/feature/account/setup/src/main/kotlin/app/k9mail/feature/account/setup/ui/specialfolders/SpecialFoldersScreen.kt b/feature/account/setup/src/main/kotlin/app/k9mail/feature/account/setup/ui/specialfolders/SpecialFoldersScreen.kt index 6f936dc2a87..1e757e8e998 100644 --- a/feature/account/setup/src/main/kotlin/app/k9mail/feature/account/setup/ui/specialfolders/SpecialFoldersScreen.kt +++ b/feature/account/setup/src/main/kotlin/app/k9mail/feature/account/setup/ui/specialfolders/SpecialFoldersScreen.kt @@ -1,6 +1,10 @@ package app.k9mail.feature.account.setup.ui.specialfolders import androidx.activity.compose.BackHandler +import androidx.compose.foundation.layout.WindowInsets +import androidx.compose.foundation.layout.imePadding +import androidx.compose.foundation.layout.navigationBars +import androidx.compose.foundation.layout.windowInsetsPadding import androidx.compose.runtime.Composable import androidx.compose.runtime.LaunchedEffect import androidx.compose.ui.Modifier @@ -44,9 +48,10 @@ fun SpecialFoldersScreen( state = WizardNavigationBarState( showNext = state.value.isManualSetup && state.value.isLoading.not(), ), + modifier = Modifier.imePadding(), ) }, - modifier = modifier, + modifier = modifier.windowInsetsPadding(WindowInsets.navigationBars), ) { innerPadding -> SpecialFoldersContent( state = state.value, diff --git a/feature/navigation/drawer/dropdown/src/main/kotlin/net/thunderbird/feature/navigation/drawer/dropdown/DropDownDrawer.kt b/feature/navigation/drawer/dropdown/src/main/kotlin/net/thunderbird/feature/navigation/drawer/dropdown/DropDownDrawer.kt index 998207b3817..05be9e00189 100644 --- a/feature/navigation/drawer/dropdown/src/main/kotlin/net/thunderbird/feature/navigation/drawer/dropdown/DropDownDrawer.kt +++ b/feature/navigation/drawer/dropdown/src/main/kotlin/net/thunderbird/feature/navigation/drawer/dropdown/DropDownDrawer.kt @@ -3,6 +3,7 @@ package net.thunderbird.feature.navigation.drawer.dropdown import androidx.appcompat.app.AppCompatActivity import androidx.compose.ui.platform.ComposeView import androidx.core.view.GravityCompat +import androidx.core.view.ViewCompat import androidx.drawerlayout.widget.DrawerLayout import androidx.lifecycle.compose.collectAsStateWithLifecycle import kotlinx.coroutines.flow.MutableStateFlow @@ -46,6 +47,12 @@ class DropDownDrawer( init { drawer.addDrawerListener(createDrawerListener()) + // Make insets available to the drawer's Compose content + ViewCompat.setOnApplyWindowInsetsListener(drawer) { _, insets -> + drawerContent.dispatchApplyWindowInsets(insets.toWindowInsets()) + insets + } + drawerContent.setContent { themeProvider.WithTheme { val state = drawerState.collectAsStateWithLifecycle() diff --git a/feature/navigation/drawer/dropdown/src/main/kotlin/net/thunderbird/feature/navigation/drawer/dropdown/ui/DrawerContent.kt b/feature/navigation/drawer/dropdown/src/main/kotlin/net/thunderbird/feature/navigation/drawer/dropdown/ui/DrawerContent.kt index f264acc5557..ca1624baa65 100644 --- a/feature/navigation/drawer/dropdown/src/main/kotlin/net/thunderbird/feature/navigation/drawer/dropdown/ui/DrawerContent.kt +++ b/feature/navigation/drawer/dropdown/src/main/kotlin/net/thunderbird/feature/navigation/drawer/dropdown/ui/DrawerContent.kt @@ -6,16 +6,18 @@ import androidx.compose.animation.slideInVertically import androidx.compose.animation.slideOutVertically import androidx.compose.animation.togetherWith import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.WindowInsets import androidx.compose.foundation.layout.fillMaxHeight import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.safeDrawing import androidx.compose.foundation.layout.width +import androidx.compose.foundation.layout.windowInsetsPadding import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.unit.IntOffset import app.k9mail.core.ui.compose.designsystem.atom.DividerHorizontal import app.k9mail.core.ui.compose.designsystem.atom.Surface import app.k9mail.core.ui.compose.theme2.MainTheme -import net.thunderbird.core.ui.compose.common.modifier.safeDrawingPaddingCompat import net.thunderbird.core.ui.compose.common.modifier.testTagAsResourceId import net.thunderbird.feature.navigation.drawer.dropdown.domain.entity.DisplayAccount import net.thunderbird.feature.navigation.drawer.dropdown.domain.entity.UnifiedDisplayAccount @@ -49,7 +51,7 @@ internal fun DrawerContent( val selectedAccount = state.accounts.firstOrNull { it.id == state.selectedAccountId } Column( - modifier = Modifier.safeDrawingPaddingCompat(), + modifier = Modifier.windowInsetsPadding(WindowInsets.safeDrawing), ) { selectedAccount?.let { AccountView( diff --git a/feature/onboarding/permissions/src/main/kotlin/app/k9mail/feature/onboarding/permissions/ui/PermissionsContent.kt b/feature/onboarding/permissions/src/main/kotlin/app/k9mail/feature/onboarding/permissions/ui/PermissionsContent.kt index 1e8fd60f648..9ef7a461b1e 100644 --- a/feature/onboarding/permissions/src/main/kotlin/app/k9mail/feature/onboarding/permissions/ui/PermissionsContent.kt +++ b/feature/onboarding/permissions/src/main/kotlin/app/k9mail/feature/onboarding/permissions/ui/PermissionsContent.kt @@ -7,10 +7,13 @@ import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.WindowInsets import androidx.compose.foundation.layout.fillMaxHeight import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.navigationBars import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.windowInsetsPadding import androidx.compose.foundation.rememberScrollState import androidx.compose.foundation.verticalScroll import androidx.compose.runtime.Composable @@ -41,6 +44,7 @@ internal fun PermissionsContent( state: State, onEvent: (Event) -> Unit, brandName: String, + modifier: Modifier = Modifier, ) { val scrollState = rememberScrollState() @@ -48,6 +52,7 @@ internal fun PermissionsContent( bottomBar = { BottomBar(state, onEvent, scrollState) }, + modifier = modifier.windowInsetsPadding(WindowInsets.navigationBars), ) { innerPadding -> ResponsiveWidthContainer( modifier = Modifier diff --git a/feature/onboarding/permissions/src/main/kotlin/app/k9mail/feature/onboarding/permissions/ui/PermissionsScreen.kt b/feature/onboarding/permissions/src/main/kotlin/app/k9mail/feature/onboarding/permissions/ui/PermissionsScreen.kt index 4af7beb7991..53959382f53 100644 --- a/feature/onboarding/permissions/src/main/kotlin/app/k9mail/feature/onboarding/permissions/ui/PermissionsScreen.kt +++ b/feature/onboarding/permissions/src/main/kotlin/app/k9mail/feature/onboarding/permissions/ui/PermissionsScreen.kt @@ -38,7 +38,7 @@ fun PermissionsScreen( } BackHandler { - // no back navigation + dispatch(Event.NextClicked) } LaunchedEffect(key1 = Unit) { diff --git a/feature/settings/import/src/main/res/layout/account_setup_oauth.xml b/feature/settings/import/src/main/res/layout/account_setup_oauth.xml index f9e8f408138..69f515b0476 100644 --- a/feature/settings/import/src/main/res/layout/account_setup_oauth.xml +++ b/feature/settings/import/src/main/res/layout/account_setup_oauth.xml @@ -1,7 +1,9 @@ - - + + + + + - + diff --git a/legacy/ui/legacy/src/main/java/com/fsck/k9/activity/MainActivity.kt b/legacy/ui/legacy/src/main/java/com/fsck/k9/activity/MainActivity.kt index caf3b935c8c..6c634d7d203 100644 --- a/legacy/ui/legacy/src/main/java/com/fsck/k9/activity/MainActivity.kt +++ b/legacy/ui/legacy/src/main/java/com/fsck/k9/activity/MainActivity.kt @@ -12,7 +12,6 @@ import android.view.MenuItem import android.view.View import android.view.animation.AnimationUtils import android.widget.ProgressBar -import androidx.activity.enableEdgeToEdge import androidx.appcompat.app.ActionBar import androidx.appcompat.view.ActionMode import androidx.appcompat.widget.SearchView @@ -153,8 +152,6 @@ open class MainActivity : public override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - enableEdgeToEdge() - // If the app's main task was not created using the default launch intent (e.g. from a notification, a widget, // or a shortcut), using the app icon to "launch" the app will create a new MessageList instance instead of only // bringing the app's task to the foreground. We catch this situation here and simply finish the activity. This diff --git a/legacy/ui/legacy/src/main/java/com/fsck/k9/ui/changelog/RecentChangesActivity.kt b/legacy/ui/legacy/src/main/java/com/fsck/k9/ui/changelog/RecentChangesActivity.kt index 8b951eb42ac..e8f3a3e1faa 100644 --- a/legacy/ui/legacy/src/main/java/com/fsck/k9/ui/changelog/RecentChangesActivity.kt +++ b/legacy/ui/legacy/src/main/java/com/fsck/k9/ui/changelog/RecentChangesActivity.kt @@ -19,7 +19,7 @@ class RecentChangesActivity : BaseActivity() { arguments = bundleOf(ChangelogFragment.ARG_MODE to ChangeLogMode.RECENT_CHANGES) } supportFragmentManager.commit { - add(R.id.fragment_container, fragment) + add(R.id.content_container, fragment) } } } diff --git a/legacy/ui/legacy/src/main/java/com/fsck/k9/ui/push/PushInfoActivity.kt b/legacy/ui/legacy/src/main/java/com/fsck/k9/ui/push/PushInfoActivity.kt index 10869eb75fb..adf6db989c1 100644 --- a/legacy/ui/legacy/src/main/java/com/fsck/k9/ui/push/PushInfoActivity.kt +++ b/legacy/ui/legacy/src/main/java/com/fsck/k9/ui/push/PushInfoActivity.kt @@ -17,7 +17,7 @@ class PushInfoActivity : BaseActivity() { if (savedInstanceState == null) { supportFragmentManager.commit { - add(R.id.fragment_container, PushInfoFragment()) + add(R.id.content_container, PushInfoFragment()) } } } diff --git a/legacy/ui/legacy/src/main/res/layout/account_setup_composition.xml b/legacy/ui/legacy/src/main/res/layout/account_setup_composition.xml index 1c420dcbfce..653d66031e8 100644 --- a/legacy/ui/legacy/src/main/res/layout/account_setup_composition.xml +++ b/legacy/ui/legacy/src/main/res/layout/account_setup_composition.xml @@ -1,21 +1,33 @@ - - + + + + + - + diff --git a/legacy/ui/legacy/src/main/res/layout/activity_push_info.xml b/legacy/ui/legacy/src/main/res/layout/activity_push_info.xml index 9e9bb36c974..2a6e12a4f4a 100644 --- a/legacy/ui/legacy/src/main/res/layout/activity_push_info.xml +++ b/legacy/ui/legacy/src/main/res/layout/activity_push_info.xml @@ -1,21 +1,33 @@ - - + + + + + + - + diff --git a/legacy/ui/legacy/src/main/res/layout/activity_recent_changes.xml b/legacy/ui/legacy/src/main/res/layout/activity_recent_changes.xml index c7652b88dd6..f82767d180a 100644 --- a/legacy/ui/legacy/src/main/res/layout/activity_recent_changes.xml +++ b/legacy/ui/legacy/src/main/res/layout/activity_recent_changes.xml @@ -1,21 +1,32 @@ - - + + + + + - + diff --git a/legacy/ui/legacy/src/main/res/layout/crypto_key_transfer.xml b/legacy/ui/legacy/src/main/res/layout/crypto_key_transfer.xml index 06fd4e9601a..477ac2c3128 100644 --- a/legacy/ui/legacy/src/main/res/layout/crypto_key_transfer.xml +++ b/legacy/ui/legacy/src/main/res/layout/crypto_key_transfer.xml @@ -1,24 +1,35 @@ - - + + + + + - + diff --git a/legacy/ui/legacy/src/main/res/layout/edit_identity.xml b/legacy/ui/legacy/src/main/res/layout/edit_identity.xml index e62470b88d9..aed59a8fe2c 100644 --- a/legacy/ui/legacy/src/main/res/layout/edit_identity.xml +++ b/legacy/ui/legacy/src/main/res/layout/edit_identity.xml @@ -1,21 +1,32 @@ - - + - - android:layout_width="fill_parent" - android:layout_height="0dip" - android:layout_weight="1" + + + - + diff --git a/legacy/ui/legacy/src/main/res/layout/upgrade_databases.xml b/legacy/ui/legacy/src/main/res/layout/upgrade_databases.xml index 1c405408780..4290941524f 100644 --- a/legacy/ui/legacy/src/main/res/layout/upgrade_databases.xml +++ b/legacy/ui/legacy/src/main/res/layout/upgrade_databases.xml @@ -1,21 +1,33 @@ - - + + + + + - + diff --git a/legacy/ui/legacy/src/main/res/values/styles.xml b/legacy/ui/legacy/src/main/res/values/styles.xml index 6454da11846..e8f81b4079a 100644 --- a/legacy/ui/legacy/src/main/res/values/styles.xml +++ b/legacy/ui/legacy/src/main/res/values/styles.xml @@ -34,19 +34,6 @@ ?attr/tintColorBulletPointNegative - - - - - -