diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/accountsetup/SetupAutofillScreen.kt b/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/accountsetup/SetupAutofillScreen.kt index b0f71a16c7..c1d7445159 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/accountsetup/SetupAutofillScreen.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/accountsetup/SetupAutofillScreen.kt @@ -31,7 +31,9 @@ import androidx.hilt.navigation.compose.hiltViewModel import androidx.lifecycle.compose.collectAsStateWithLifecycle import com.bitwarden.ui.platform.base.util.EventsEffect import com.bitwarden.ui.platform.components.model.CardStyle +import com.bitwarden.ui.platform.model.WindowSize import com.bitwarden.ui.platform.theme.BitwardenTheme +import com.bitwarden.ui.platform.util.rememberWindowSize import com.x8bit.bitwarden.R import com.x8bit.bitwarden.ui.auth.feature.accountsetup.handlers.rememberSetupAutoFillHandler import com.x8bit.bitwarden.ui.platform.base.util.standardHorizontalMargin @@ -47,8 +49,6 @@ import com.x8bit.bitwarden.ui.platform.components.toggle.BitwardenSwitch import com.x8bit.bitwarden.ui.platform.components.util.rememberVectorPainter import com.x8bit.bitwarden.ui.platform.composition.LocalIntentManager import com.x8bit.bitwarden.ui.platform.manager.intent.IntentManager -import com.x8bit.bitwarden.ui.platform.model.WindowSize -import com.x8bit.bitwarden.ui.platform.util.rememberWindowSize /** * Top level composable for the Auto-fill setup screen. diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/accountsetup/SetupUnlockScreen.kt b/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/accountsetup/SetupUnlockScreen.kt index 9636d54a66..5e3972541d 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/accountsetup/SetupUnlockScreen.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/accountsetup/SetupUnlockScreen.kt @@ -35,7 +35,9 @@ import androidx.hilt.navigation.compose.hiltViewModel import androidx.lifecycle.compose.collectAsStateWithLifecycle import com.bitwarden.ui.platform.base.util.EventsEffect import com.bitwarden.ui.platform.components.model.CardStyle +import com.bitwarden.ui.platform.model.WindowSize import com.bitwarden.ui.platform.theme.BitwardenTheme +import com.bitwarden.ui.platform.util.rememberWindowSize import com.x8bit.bitwarden.R import com.x8bit.bitwarden.ui.auth.feature.accountsetup.handlers.SetupUnlockHandler import com.x8bit.bitwarden.ui.platform.base.util.standardHorizontalMargin @@ -53,8 +55,6 @@ import com.x8bit.bitwarden.ui.platform.components.util.rememberVectorPainter import com.x8bit.bitwarden.ui.platform.composition.LocalBiometricsManager import com.x8bit.bitwarden.ui.platform.manager.biometrics.BiometricSupportStatus import com.x8bit.bitwarden.ui.platform.manager.biometrics.BiometricsManager -import com.x8bit.bitwarden.ui.platform.model.WindowSize -import com.x8bit.bitwarden.ui.platform.util.rememberWindowSize /** * Top level composable for the setup unlock screen. diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/completeregistration/CompleteRegistrationScreen.kt b/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/completeregistration/CompleteRegistrationScreen.kt index b9952e3447..728aa2da19 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/completeregistration/CompleteRegistrationScreen.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/completeregistration/CompleteRegistrationScreen.kt @@ -37,7 +37,9 @@ import androidx.hilt.navigation.compose.hiltViewModel import androidx.lifecycle.compose.collectAsStateWithLifecycle import com.bitwarden.ui.platform.base.util.EventsEffect import com.bitwarden.ui.platform.components.model.CardStyle +import com.bitwarden.ui.platform.model.WindowSize import com.bitwarden.ui.platform.theme.BitwardenTheme +import com.bitwarden.ui.platform.util.rememberWindowSize import com.x8bit.bitwarden.R import com.x8bit.bitwarden.ui.auth.feature.completeregistration.handlers.CompleteRegistrationHandler import com.x8bit.bitwarden.ui.auth.feature.completeregistration.handlers.rememberCompleteRegistrationHandler @@ -56,8 +58,6 @@ import com.x8bit.bitwarden.ui.platform.components.scaffold.BitwardenScaffold import com.x8bit.bitwarden.ui.platform.components.text.BitwardenClickableText import com.x8bit.bitwarden.ui.platform.components.toggle.BitwardenSwitch import com.x8bit.bitwarden.ui.platform.components.util.rememberVectorPainter -import com.x8bit.bitwarden.ui.platform.model.WindowSize -import com.x8bit.bitwarden.ui.platform.util.rememberWindowSize /** * Top level composable for the complete registration screen. diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/welcome/WelcomeScreen.kt b/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/welcome/WelcomeScreen.kt index ca33afd39e..3f415a743c 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/welcome/WelcomeScreen.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/welcome/WelcomeScreen.kt @@ -42,15 +42,15 @@ import androidx.compose.ui.unit.dp import androidx.hilt.navigation.compose.hiltViewModel import androidx.lifecycle.compose.collectAsStateWithLifecycle import com.bitwarden.ui.platform.base.util.EventsEffect +import com.bitwarden.ui.platform.model.WindowSize import com.bitwarden.ui.platform.theme.BitwardenTheme +import com.bitwarden.ui.platform.util.rememberWindowSize import com.x8bit.bitwarden.R import com.x8bit.bitwarden.ui.platform.base.util.standardHorizontalMargin import com.x8bit.bitwarden.ui.platform.components.button.BitwardenFilledButton import com.x8bit.bitwarden.ui.platform.components.button.BitwardenOutlinedButton import com.x8bit.bitwarden.ui.platform.components.scaffold.BitwardenScaffold import com.x8bit.bitwarden.ui.platform.components.util.rememberVectorPainter -import com.x8bit.bitwarden.ui.platform.model.WindowSize -import com.x8bit.bitwarden.ui.platform.util.rememberWindowSize import kotlinx.coroutines.launch /** diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/platform/base/util/ModifierExtensions.kt b/app/src/main/java/com/x8bit/bitwarden/ui/platform/base/util/ModifierExtensions.kt index b64e4d65c2..6c07f7dae1 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/platform/base/util/ModifierExtensions.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/platform/base/util/ModifierExtensions.kt @@ -50,9 +50,9 @@ import com.bitwarden.core.annotation.OmitFromCoverage import com.bitwarden.ui.platform.base.util.toScrolledContainerColor import com.bitwarden.ui.platform.base.util.toScrolledContainerDividerAlpha import com.bitwarden.ui.platform.components.model.CardStyle +import com.bitwarden.ui.platform.model.WindowSize import com.bitwarden.ui.platform.theme.BitwardenTheme -import com.x8bit.bitwarden.ui.platform.model.WindowSize -import com.x8bit.bitwarden.ui.platform.util.getWindowSize +import com.bitwarden.ui.platform.util.getWindowSize /** * Adds a performance-optimized background color specified by the given [topAppBarScrollBehavior] diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/scaffold/BitwardenScaffold.kt b/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/scaffold/BitwardenScaffold.kt index ef0846fcad..c7d57cf63f 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/scaffold/BitwardenScaffold.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/scaffold/BitwardenScaffold.kt @@ -40,15 +40,15 @@ import androidx.compose.ui.semantics.testTagsAsResourceId import androidx.compose.ui.unit.dp import androidx.compose.ui.zIndex import com.bitwarden.ui.platform.base.util.toDp +import com.bitwarden.ui.platform.model.WindowSize import com.bitwarden.ui.platform.theme.BitwardenTheme +import com.bitwarden.ui.platform.util.rememberWindowSize import com.x8bit.bitwarden.ui.platform.components.model.BitwardenPullToRefreshState import com.x8bit.bitwarden.ui.platform.components.model.ScaffoldNavigationData import com.x8bit.bitwarden.ui.platform.components.model.rememberBitwardenPullToRefreshState import com.x8bit.bitwarden.ui.platform.components.navigation.BitwardenBottomAppBar import com.x8bit.bitwarden.ui.platform.components.navigation.BitwardenNavigationRail import com.x8bit.bitwarden.ui.platform.components.scrim.BitwardenAnimatedScrim -import com.x8bit.bitwarden.ui.platform.model.WindowSize -import com.x8bit.bitwarden.ui.platform.util.rememberWindowSize /** * Direct passthrough to [Scaffold] but contains a few specific override values. Everything is diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/qrcodescan/QrCodeScanScreen.kt b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/qrcodescan/QrCodeScanScreen.kt index 59a9212218..3b25f3a105 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/qrcodescan/QrCodeScanScreen.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/qrcodescan/QrCodeScanScreen.kt @@ -52,16 +52,16 @@ import androidx.core.content.ContextCompat import androidx.hilt.navigation.compose.hiltViewModel import androidx.lifecycle.compose.LocalLifecycleOwner import com.bitwarden.ui.platform.base.util.EventsEffect +import com.bitwarden.ui.platform.model.WindowSize import com.bitwarden.ui.platform.theme.BitwardenTheme import com.bitwarden.ui.platform.theme.LocalBitwardenColorScheme import com.bitwarden.ui.platform.theme.color.darkBitwardenColorScheme +import com.bitwarden.ui.platform.util.rememberWindowSize import com.x8bit.bitwarden.R import com.x8bit.bitwarden.ui.platform.base.util.toAnnotatedString import com.x8bit.bitwarden.ui.platform.components.appbar.BitwardenTopAppBar import com.x8bit.bitwarden.ui.platform.components.scaffold.BitwardenScaffold import com.x8bit.bitwarden.ui.platform.components.util.rememberVectorPainter -import com.x8bit.bitwarden.ui.platform.model.WindowSize -import com.x8bit.bitwarden.ui.platform.util.rememberWindowSize import com.x8bit.bitwarden.ui.vault.feature.qrcodescan.util.QrCodeAnalyzer import com.x8bit.bitwarden.ui.vault.feature.qrcodescan.util.QrCodeAnalyzerImpl import java.util.concurrent.Executors diff --git a/ui/build.gradle.kts b/ui/build.gradle.kts index ee617f411a..0e12961dd9 100644 --- a/ui/build.gradle.kts +++ b/ui/build.gradle.kts @@ -43,6 +43,7 @@ dependencies { implementation(platform(libs.androidx.compose.bom)) implementation(libs.androidx.compose.animation) implementation(libs.androidx.compose.material3) + implementation(libs.androidx.compose.material3.adaptive) implementation(libs.androidx.compose.runtime) implementation(libs.androidx.compose.ui) implementation(libs.androidx.compose.ui.graphics) diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/platform/model/WindowSize.kt b/ui/src/main/java/com/bitwarden/ui/platform/model/WindowSize.kt similarity index 74% rename from app/src/main/java/com/x8bit/bitwarden/ui/platform/model/WindowSize.kt rename to ui/src/main/java/com/bitwarden/ui/platform/model/WindowSize.kt index bc8859c165..66d38a12ce 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/platform/model/WindowSize.kt +++ b/ui/src/main/java/com/bitwarden/ui/platform/model/WindowSize.kt @@ -1,4 +1,4 @@ -package com.x8bit.bitwarden.ui.platform.model +package com.bitwarden.ui.platform.model /** * Enum representing the window size classes currently supported by the app. diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/platform/util/WindowAdaptiveInfoExtensions.kt b/ui/src/main/java/com/bitwarden/ui/platform/util/WindowAdaptiveInfoExtensions.kt similarity index 91% rename from app/src/main/java/com/x8bit/bitwarden/ui/platform/util/WindowAdaptiveInfoExtensions.kt rename to ui/src/main/java/com/bitwarden/ui/platform/util/WindowAdaptiveInfoExtensions.kt index 98660739e2..50d140f1a0 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/platform/util/WindowAdaptiveInfoExtensions.kt +++ b/ui/src/main/java/com/bitwarden/ui/platform/util/WindowAdaptiveInfoExtensions.kt @@ -1,11 +1,11 @@ -package com.x8bit.bitwarden.ui.platform.util +package com.bitwarden.ui.platform.util import androidx.compose.material3.adaptive.WindowAdaptiveInfo import androidx.compose.material3.adaptive.currentWindowAdaptiveInfo import androidx.compose.runtime.Composable import androidx.compose.runtime.remember import androidx.window.core.layout.WindowWidthSizeClass -import com.x8bit.bitwarden.ui.platform.model.WindowSize +import com.bitwarden.ui.platform.model.WindowSize /** * Remembers the [WindowSize] class for the window corresponding to the current window metrics.