diff --git a/authenticator/src/main/kotlin/com/bitwarden/authenticator/ui/authenticator/feature/navbar/AuthenticatorNavBarScreen.kt b/authenticator/src/main/kotlin/com/bitwarden/authenticator/ui/authenticator/feature/navbar/AuthenticatorNavBarScreen.kt index 27bec91394..2041842ab3 100644 --- a/authenticator/src/main/kotlin/com/bitwarden/authenticator/ui/authenticator/feature/navbar/AuthenticatorNavBarScreen.kt +++ b/authenticator/src/main/kotlin/com/bitwarden/authenticator/ui/authenticator/feature/navbar/AuthenticatorNavBarScreen.kt @@ -47,12 +47,12 @@ import com.bitwarden.authenticator.ui.authenticator.feature.itemlisting.ItemList import com.bitwarden.authenticator.ui.authenticator.feature.itemlisting.ItemListingRoute import com.bitwarden.authenticator.ui.authenticator.feature.itemlisting.itemListingGraph import com.bitwarden.authenticator.ui.authenticator.feature.itemlisting.navigateToItemListGraph -import com.bitwarden.authenticator.ui.platform.base.util.max import com.bitwarden.authenticator.ui.platform.components.scaffold.BitwardenScaffold import com.bitwarden.authenticator.ui.platform.components.scrim.BitwardenAnimatedScrim import com.bitwarden.authenticator.ui.platform.feature.settings.SettingsGraphRoute import com.bitwarden.authenticator.ui.platform.feature.settings.navigateToSettingsGraph import com.bitwarden.ui.platform.base.util.EventsEffect +import com.bitwarden.ui.platform.base.util.max import com.bitwarden.ui.platform.base.util.toDp import com.bitwarden.ui.platform.theme.RootTransitionProviders import com.bitwarden.ui.platform.util.toObjectNavigationRoute diff --git a/authenticator/src/main/kotlin/com/bitwarden/authenticator/ui/platform/base/util/PaddingValuesExtensions.kt b/authenticator/src/main/kotlin/com/bitwarden/authenticator/ui/platform/base/util/PaddingValuesExtensions.kt deleted file mode 100644 index f02ed56aa3..0000000000 --- a/authenticator/src/main/kotlin/com/bitwarden/authenticator/ui/platform/base/util/PaddingValuesExtensions.kt +++ /dev/null @@ -1,48 +0,0 @@ -package com.bitwarden.authenticator.ui.platform.base.util - -import androidx.compose.foundation.layout.PaddingValues -import androidx.compose.foundation.layout.WindowInsets -import androidx.compose.foundation.layout.asPaddingValues -import androidx.compose.foundation.layout.calculateEndPadding -import androidx.compose.foundation.layout.calculateStartPadding -import androidx.compose.runtime.Composable -import androidx.compose.ui.platform.LocalLayoutDirection -import androidx.compose.ui.unit.LayoutDirection - -/** - * Compares the top, bottom, start, and end values to another [PaddingValues] and returns a new - * 'PaddingValues' using the maximum values of each property respectively. - * - * @param other The other values to compare against. - */ -fun PaddingValues.max( - other: PaddingValues, - direction: LayoutDirection, -): PaddingValues = PaddingValues( - top = maxOf(calculateTopPadding(), other.calculateTopPadding()), - bottom = maxOf(calculateBottomPadding(), other.calculateBottomPadding()), - start = maxOf(calculateStartPadding(direction), other.calculateStartPadding(direction)), - end = maxOf(calculateEndPadding(direction), other.calculateEndPadding(direction)), -) - -/** - * Compares the top, bottom, start, and end values to a [WindowInsets] and returns a new - * 'PaddingValues' using the maximum values of each property respectively. - * - * @param windowInsets The [WindowInsets] to compare against. - */ -@Composable -fun PaddingValues.max( - windowInsets: WindowInsets, -): PaddingValues = max(windowInsets.asPaddingValues()) - -/** - * Compares the top, bottom, start, and end values to another [PaddingValues] and returns a new - * 'PaddingValues' using the maximum values of each property respectively. - * - * @param other The other [PaddingValues] to compare against. - */ -@Composable -fun PaddingValues.max( - other: PaddingValues, -): PaddingValues = max(other, LocalLayoutDirection.current) diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/platform/base/util/PaddingValuesExtensions.kt b/ui/src/main/java/com/bitwarden/ui/platform/base/util/PaddingValuesExtensions.kt similarity index 97% rename from app/src/main/java/com/x8bit/bitwarden/ui/platform/base/util/PaddingValuesExtensions.kt rename to ui/src/main/java/com/bitwarden/ui/platform/base/util/PaddingValuesExtensions.kt index 72cc6bf164..24a3de1621 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/platform/base/util/PaddingValuesExtensions.kt +++ b/ui/src/main/java/com/bitwarden/ui/platform/base/util/PaddingValuesExtensions.kt @@ -1,4 +1,4 @@ -package com.x8bit.bitwarden.ui.platform.base.util +package com.bitwarden.ui.platform.base.util import androidx.compose.foundation.layout.PaddingValues import androidx.compose.foundation.layout.WindowInsets