From f7699009769ad0dd23d2a71d7993b649ebf03fc3 Mon Sep 17 00:00:00 2001 From: David Perez Date: Fri, 6 Jun 2025 12:29:02 -0500 Subject: [PATCH] PM-22456: Move Temporal Accessor Extensions to 'Core' module (#5324) --- .../FlightRecorderManagerImpl.kt | 2 +- .../FlightRecorderWriterImpl.kt | 2 +- .../dialog/BitwardenDateSelectButton.kt | 2 +- .../dialog/BitwardenTimeSelectButton.kt | 2 +- .../search/util/SearchTypeDataExtensions.kt | 2 +- .../util/FlightRecorderDataSetExtensions.kt | 2 +- .../accountsecurity/AccountSecurityScreen.kt | 2 +- .../loginapproval/LoginApprovalViewModel.kt | 2 +- .../PendingRequestsViewModel.kt | 2 +- .../exportvault/ExportVaultViewModel.kt | 2 +- .../util/FlightRecorderDataSetExtensions.kt | 2 +- .../feature/settings/other/OtherViewModel.kt | 2 +- .../manager/intent/IntentManagerImpl.kt | 2 +- .../PasswordHistoryViewModel.kt | 2 +- .../AddEditSendCustomDateChooser.kt | 2 +- .../feature/send/util/SendDataExtensions.kt | 2 +- .../send/viewsend/util/SendViewExtensions.kt | 2 +- .../addedit/util/CipherViewExtensions.kt | 2 +- .../feature/item/util/CipherViewExtensions.kt | 2 +- .../util/VaultItemListingDataExtensions.kt | 2 +- .../util/FlightRecorderDataSetExtensions.kt | 2 +- .../PasswordHistoryViewModelTest.kt | 2 +- .../settings/export/ExportViewModel.kt | 3 +-- .../platform/util/TemporalAccessExtensions.kt | 22 ------------------- .../data}/util/TemporalAccessorExtensions.kt | 2 +- .../util/TemporalAccessorExtensionsTest.kt | 2 +- 26 files changed, 25 insertions(+), 48 deletions(-) delete mode 100644 authenticator/src/main/kotlin/com/bitwarden/authenticator/ui/platform/util/TemporalAccessExtensions.kt rename {app/src/main/kotlin/com/x8bit/bitwarden/ui/platform => core/src/main/kotlin/com/bitwarden/core/data}/util/TemporalAccessorExtensions.kt (93%) rename {app/src/test/kotlin/com/x8bit/bitwarden/ui/platform => core/src/test/kotlin/com/bitwarden/core/data}/util/TemporalAccessorExtensionsTest.kt (96%) diff --git a/app/src/main/kotlin/com/x8bit/bitwarden/data/platform/manager/flightrecorder/FlightRecorderManagerImpl.kt b/app/src/main/kotlin/com/x8bit/bitwarden/data/platform/manager/flightrecorder/FlightRecorderManagerImpl.kt index 88c9961cdc..0f3158b55b 100644 --- a/app/src/main/kotlin/com/x8bit/bitwarden/data/platform/manager/flightrecorder/FlightRecorderManagerImpl.kt +++ b/app/src/main/kotlin/com/x8bit/bitwarden/data/platform/manager/flightrecorder/FlightRecorderManagerImpl.kt @@ -5,11 +5,11 @@ import android.content.Context import android.content.Intent import android.content.IntentFilter import com.bitwarden.core.data.util.concurrentMapOf +import com.bitwarden.core.data.util.toFormattedPattern import com.bitwarden.data.manager.DispatcherManager import com.x8bit.bitwarden.data.platform.datasource.disk.SettingsDiskSource import com.x8bit.bitwarden.data.platform.datasource.disk.model.FlightRecorderDataSet import com.x8bit.bitwarden.data.platform.repository.model.FlightRecorderDuration -import com.x8bit.bitwarden.ui.platform.util.toFormattedPattern import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Job import kotlinx.coroutines.delay diff --git a/app/src/main/kotlin/com/x8bit/bitwarden/data/platform/manager/flightrecorder/FlightRecorderWriterImpl.kt b/app/src/main/kotlin/com/x8bit/bitwarden/data/platform/manager/flightrecorder/FlightRecorderWriterImpl.kt index 8617c007fd..cee3f6e5d6 100644 --- a/app/src/main/kotlin/com/x8bit/bitwarden/data/platform/manager/flightrecorder/FlightRecorderWriterImpl.kt +++ b/app/src/main/kotlin/com/x8bit/bitwarden/data/platform/manager/flightrecorder/FlightRecorderWriterImpl.kt @@ -3,11 +3,11 @@ package com.x8bit.bitwarden.data.platform.manager.flightrecorder import android.os.Build import android.util.Log import com.bitwarden.annotation.OmitFromCoverage +import com.bitwarden.core.data.util.toFormattedPattern import com.bitwarden.data.manager.DispatcherManager import com.x8bit.bitwarden.BuildConfig import com.x8bit.bitwarden.data.platform.datasource.disk.model.FlightRecorderDataSet import com.x8bit.bitwarden.data.vault.manager.FileManager -import com.x8bit.bitwarden.ui.platform.util.toFormattedPattern import kotlinx.coroutines.withContext import timber.log.Timber import java.io.BufferedWriter diff --git a/app/src/main/kotlin/com/x8bit/bitwarden/ui/platform/components/dialog/BitwardenDateSelectButton.kt b/app/src/main/kotlin/com/x8bit/bitwarden/ui/platform/components/dialog/BitwardenDateSelectButton.kt index d9b03e22a4..2d3d37f077 100644 --- a/app/src/main/kotlin/com/x8bit/bitwarden/ui/platform/components/dialog/BitwardenDateSelectButton.kt +++ b/app/src/main/kotlin/com/x8bit/bitwarden/ui/platform/components/dialog/BitwardenDateSelectButton.kt @@ -29,6 +29,7 @@ import androidx.compose.ui.semantics.semantics import androidx.compose.ui.semantics.testTag import androidx.compose.ui.semantics.testTagsAsResourceId import androidx.compose.ui.unit.dp +import com.bitwarden.core.data.util.toFormattedPattern import com.bitwarden.ui.platform.base.util.cardStyle import com.bitwarden.ui.platform.components.field.color.bitwardenTextFieldButtonColors import com.bitwarden.ui.platform.components.field.color.bitwardenTextFieldColors @@ -39,7 +40,6 @@ import com.x8bit.bitwarden.R import com.x8bit.bitwarden.ui.platform.components.button.BitwardenTextButton import com.x8bit.bitwarden.ui.platform.components.row.BitwardenRowOfActions import com.x8bit.bitwarden.ui.platform.util.orNow -import com.x8bit.bitwarden.ui.platform.util.toFormattedPattern import java.time.Instant import java.time.ZoneOffset import java.time.ZonedDateTime diff --git a/app/src/main/kotlin/com/x8bit/bitwarden/ui/platform/components/dialog/BitwardenTimeSelectButton.kt b/app/src/main/kotlin/com/x8bit/bitwarden/ui/platform/components/dialog/BitwardenTimeSelectButton.kt index 0725b10eda..e8bb6cef1c 100644 --- a/app/src/main/kotlin/com/x8bit/bitwarden/ui/platform/components/dialog/BitwardenTimeSelectButton.kt +++ b/app/src/main/kotlin/com/x8bit/bitwarden/ui/platform/components/dialog/BitwardenTimeSelectButton.kt @@ -19,6 +19,7 @@ import androidx.compose.ui.semantics.clearAndSetSemantics import androidx.compose.ui.semantics.contentDescription import androidx.compose.ui.semantics.role import androidx.compose.ui.unit.dp +import com.bitwarden.core.data.util.toFormattedPattern import com.bitwarden.ui.platform.base.util.cardStyle import com.bitwarden.ui.platform.components.field.color.bitwardenTextFieldButtonColors import com.bitwarden.ui.platform.components.model.CardStyle @@ -27,7 +28,6 @@ import com.bitwarden.ui.platform.theme.BitwardenTheme import com.x8bit.bitwarden.R import com.x8bit.bitwarden.ui.platform.components.row.BitwardenRowOfActions import com.x8bit.bitwarden.ui.platform.util.orNow -import com.x8bit.bitwarden.ui.platform.util.toFormattedPattern import java.time.ZonedDateTime /** diff --git a/app/src/main/kotlin/com/x8bit/bitwarden/ui/platform/feature/search/util/SearchTypeDataExtensions.kt b/app/src/main/kotlin/com/x8bit/bitwarden/ui/platform/feature/search/util/SearchTypeDataExtensions.kt index 528c8bc50d..a4d9807942 100644 --- a/app/src/main/kotlin/com/x8bit/bitwarden/ui/platform/feature/search/util/SearchTypeDataExtensions.kt +++ b/app/src/main/kotlin/com/x8bit/bitwarden/ui/platform/feature/search/util/SearchTypeDataExtensions.kt @@ -4,6 +4,7 @@ package com.x8bit.bitwarden.ui.platform.feature.search.util import androidx.annotation.DrawableRes import com.bitwarden.core.data.repository.util.SpecialCharWithPrecedenceComparator +import com.bitwarden.core.data.util.toFormattedPattern import com.bitwarden.send.SendType import com.bitwarden.send.SendView import com.bitwarden.ui.platform.base.util.removeDiacritics @@ -20,7 +21,6 @@ import com.x8bit.bitwarden.ui.platform.components.model.IconData import com.x8bit.bitwarden.ui.platform.feature.search.SearchState import com.x8bit.bitwarden.ui.platform.feature.search.SearchTypeData import com.x8bit.bitwarden.ui.platform.feature.search.model.AutofillSelectionOption -import com.x8bit.bitwarden.ui.platform.util.toFormattedPattern import com.x8bit.bitwarden.ui.tools.feature.send.util.toLabelIcons import com.x8bit.bitwarden.ui.tools.feature.send.util.toOverflowActions import com.x8bit.bitwarden.ui.vault.feature.util.toLabelIcons diff --git a/app/src/main/kotlin/com/x8bit/bitwarden/ui/platform/feature/settings/about/util/FlightRecorderDataSetExtensions.kt b/app/src/main/kotlin/com/x8bit/bitwarden/ui/platform/feature/settings/about/util/FlightRecorderDataSetExtensions.kt index 2c88eabdf6..db871f6aef 100644 --- a/app/src/main/kotlin/com/x8bit/bitwarden/ui/platform/feature/settings/about/util/FlightRecorderDataSetExtensions.kt +++ b/app/src/main/kotlin/com/x8bit/bitwarden/ui/platform/feature/settings/about/util/FlightRecorderDataSetExtensions.kt @@ -1,10 +1,10 @@ package com.x8bit.bitwarden.ui.platform.feature.settings.about.util +import com.bitwarden.core.data.util.toFormattedPattern import com.bitwarden.ui.util.Text import com.bitwarden.ui.util.asText import com.x8bit.bitwarden.R import com.x8bit.bitwarden.data.platform.datasource.disk.model.FlightRecorderDataSet -import com.x8bit.bitwarden.ui.platform.util.toFormattedPattern import java.time.Clock import java.time.Instant diff --git a/app/src/main/kotlin/com/x8bit/bitwarden/ui/platform/feature/settings/accountsecurity/AccountSecurityScreen.kt b/app/src/main/kotlin/com/x8bit/bitwarden/ui/platform/feature/settings/accountsecurity/AccountSecurityScreen.kt index 582e2da995..fe1c5e8db3 100644 --- a/app/src/main/kotlin/com/x8bit/bitwarden/ui/platform/feature/settings/accountsecurity/AccountSecurityScreen.kt +++ b/app/src/main/kotlin/com/x8bit/bitwarden/ui/platform/feature/settings/accountsecurity/AccountSecurityScreen.kt @@ -33,6 +33,7 @@ import androidx.compose.ui.unit.dp import androidx.core.net.toUri import androidx.hilt.navigation.compose.hiltViewModel import androidx.lifecycle.compose.collectAsStateWithLifecycle +import com.bitwarden.core.data.util.toFormattedPattern import com.bitwarden.ui.platform.base.util.EventsEffect import com.bitwarden.ui.platform.base.util.standardHorizontalMargin import com.bitwarden.ui.platform.components.appbar.BitwardenTopAppBar @@ -69,7 +70,6 @@ import com.x8bit.bitwarden.ui.platform.manager.biometrics.BiometricsManager import com.x8bit.bitwarden.ui.platform.manager.intent.IntentManager import com.x8bit.bitwarden.ui.platform.util.displayLabel import com.x8bit.bitwarden.ui.platform.util.minutes -import com.x8bit.bitwarden.ui.platform.util.toFormattedPattern import kotlinx.collections.immutable.toImmutableList import java.time.LocalTime import javax.crypto.Cipher diff --git a/app/src/main/kotlin/com/x8bit/bitwarden/ui/platform/feature/settings/accountsecurity/loginapproval/LoginApprovalViewModel.kt b/app/src/main/kotlin/com/x8bit/bitwarden/ui/platform/feature/settings/accountsecurity/loginapproval/LoginApprovalViewModel.kt index 582fbb3780..b2b4d7f8c1 100644 --- a/app/src/main/kotlin/com/x8bit/bitwarden/ui/platform/feature/settings/accountsecurity/loginapproval/LoginApprovalViewModel.kt +++ b/app/src/main/kotlin/com/x8bit/bitwarden/ui/platform/feature/settings/accountsecurity/loginapproval/LoginApprovalViewModel.kt @@ -5,6 +5,7 @@ package com.x8bit.bitwarden.ui.platform.feature.settings.accountsecurity.loginap import android.os.Parcelable import androidx.lifecycle.SavedStateHandle import androidx.lifecycle.viewModelScope +import com.bitwarden.core.data.util.toFormattedPattern import com.bitwarden.ui.platform.base.BaseViewModel import com.bitwarden.ui.util.Text import com.bitwarden.ui.util.asText @@ -14,7 +15,6 @@ import com.x8bit.bitwarden.data.auth.manager.model.AuthRequestUpdatesResult import com.x8bit.bitwarden.data.auth.repository.AuthRepository import com.x8bit.bitwarden.data.platform.manager.SpecialCircumstanceManager import com.x8bit.bitwarden.data.platform.manager.model.SpecialCircumstance -import com.x8bit.bitwarden.ui.platform.util.toFormattedPattern import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.flow.launchIn import kotlinx.coroutines.flow.map diff --git a/app/src/main/kotlin/com/x8bit/bitwarden/ui/platform/feature/settings/accountsecurity/pendingrequests/PendingRequestsViewModel.kt b/app/src/main/kotlin/com/x8bit/bitwarden/ui/platform/feature/settings/accountsecurity/pendingrequests/PendingRequestsViewModel.kt index 00fa09614d..89b7daf88e 100644 --- a/app/src/main/kotlin/com/x8bit/bitwarden/ui/platform/feature/settings/accountsecurity/pendingrequests/PendingRequestsViewModel.kt +++ b/app/src/main/kotlin/com/x8bit/bitwarden/ui/platform/feature/settings/accountsecurity/pendingrequests/PendingRequestsViewModel.kt @@ -3,6 +3,7 @@ package com.x8bit.bitwarden.ui.platform.feature.settings.accountsecurity.pending import android.os.Parcelable import androidx.lifecycle.SavedStateHandle import androidx.lifecycle.viewModelScope +import com.bitwarden.core.data.util.toFormattedPattern import com.bitwarden.ui.platform.base.BaseViewModel import com.bitwarden.ui.util.Text import com.x8bit.bitwarden.data.auth.manager.model.AuthRequest @@ -10,7 +11,6 @@ import com.x8bit.bitwarden.data.auth.manager.model.AuthRequestsUpdatesResult import com.x8bit.bitwarden.data.auth.repository.AuthRepository import com.x8bit.bitwarden.data.platform.repository.SettingsRepository import com.x8bit.bitwarden.ui.platform.base.util.isOverFiveMinutesOld -import com.x8bit.bitwarden.ui.platform.util.toFormattedPattern import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.Job import kotlinx.coroutines.flow.launchIn diff --git a/app/src/main/kotlin/com/x8bit/bitwarden/ui/platform/feature/settings/exportvault/ExportVaultViewModel.kt b/app/src/main/kotlin/com/x8bit/bitwarden/ui/platform/feature/settings/exportvault/ExportVaultViewModel.kt index d4445e0540..07c84641f8 100644 --- a/app/src/main/kotlin/com/x8bit/bitwarden/ui/platform/feature/settings/exportvault/ExportVaultViewModel.kt +++ b/app/src/main/kotlin/com/x8bit/bitwarden/ui/platform/feature/settings/exportvault/ExportVaultViewModel.kt @@ -4,6 +4,7 @@ import android.net.Uri import android.os.Parcelable import androidx.lifecycle.SavedStateHandle import androidx.lifecycle.viewModelScope +import com.bitwarden.core.data.util.toFormattedPattern import com.bitwarden.network.model.PolicyTypeJson import com.bitwarden.ui.platform.base.BaseViewModel import com.bitwarden.ui.util.Text @@ -23,7 +24,6 @@ import com.x8bit.bitwarden.ui.auth.feature.completeregistration.PasswordStrength import com.x8bit.bitwarden.ui.platform.feature.settings.exportvault.model.ExportVaultFormat import com.x8bit.bitwarden.ui.platform.feature.settings.exportvault.model.toExportFormat import com.x8bit.bitwarden.ui.platform.util.fileExtension -import com.x8bit.bitwarden.ui.platform.util.toFormattedPattern import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.Job import kotlinx.coroutines.flow.launchIn diff --git a/app/src/main/kotlin/com/x8bit/bitwarden/ui/platform/feature/settings/flightrecorder/recordedLogs/util/FlightRecorderDataSetExtensions.kt b/app/src/main/kotlin/com/x8bit/bitwarden/ui/platform/feature/settings/flightrecorder/recordedLogs/util/FlightRecorderDataSetExtensions.kt index 939c9a038e..a4c20a8a4b 100644 --- a/app/src/main/kotlin/com/x8bit/bitwarden/ui/platform/feature/settings/flightrecorder/recordedLogs/util/FlightRecorderDataSetExtensions.kt +++ b/app/src/main/kotlin/com/x8bit/bitwarden/ui/platform/feature/settings/flightrecorder/recordedLogs/util/FlightRecorderDataSetExtensions.kt @@ -1,5 +1,6 @@ package com.x8bit.bitwarden.ui.platform.feature.settings.flightrecorder.recordedLogs.util +import com.bitwarden.core.data.util.toFormattedPattern import com.bitwarden.ui.util.Text import com.bitwarden.ui.util.asText import com.x8bit.bitwarden.R @@ -7,7 +8,6 @@ import com.x8bit.bitwarden.data.platform.datasource.disk.model.FlightRecorderDat import com.x8bit.bitwarden.data.platform.util.fileOf import com.x8bit.bitwarden.ui.platform.feature.settings.flightrecorder.recordedLogs.RecordedLogsState import com.x8bit.bitwarden.ui.platform.util.formatBytes -import com.x8bit.bitwarden.ui.platform.util.toFormattedPattern import kotlinx.collections.immutable.toImmutableList import java.time.Clock import java.time.Instant diff --git a/app/src/main/kotlin/com/x8bit/bitwarden/ui/platform/feature/settings/other/OtherViewModel.kt b/app/src/main/kotlin/com/x8bit/bitwarden/ui/platform/feature/settings/other/OtherViewModel.kt index 70275d8aa9..6f5d39d1d7 100644 --- a/app/src/main/kotlin/com/x8bit/bitwarden/ui/platform/feature/settings/other/OtherViewModel.kt +++ b/app/src/main/kotlin/com/x8bit/bitwarden/ui/platform/feature/settings/other/OtherViewModel.kt @@ -3,6 +3,7 @@ package com.x8bit.bitwarden.ui.platform.feature.settings.other import android.os.Parcelable import androidx.lifecycle.SavedStateHandle import androidx.lifecycle.viewModelScope +import com.bitwarden.core.data.util.toFormattedPattern import com.bitwarden.ui.platform.base.BaseViewModel import com.bitwarden.ui.util.Text import com.bitwarden.ui.util.asText @@ -11,7 +12,6 @@ import com.x8bit.bitwarden.data.platform.manager.network.NetworkConnectionManage import com.x8bit.bitwarden.data.platform.repository.SettingsRepository import com.x8bit.bitwarden.data.platform.repository.model.ClearClipboardFrequency import com.x8bit.bitwarden.data.vault.repository.VaultRepository -import com.x8bit.bitwarden.ui.platform.util.toFormattedPattern import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.flow.drop import kotlinx.coroutines.flow.launchIn diff --git a/app/src/main/kotlin/com/x8bit/bitwarden/ui/platform/manager/intent/IntentManagerImpl.kt b/app/src/main/kotlin/com/x8bit/bitwarden/ui/platform/manager/intent/IntentManagerImpl.kt index e89d3c2709..ee5ab8697d 100644 --- a/app/src/main/kotlin/com/x8bit/bitwarden/ui/platform/manager/intent/IntentManagerImpl.kt +++ b/app/src/main/kotlin/com/x8bit/bitwarden/ui/platform/manager/intent/IntentManagerImpl.kt @@ -24,13 +24,13 @@ import androidx.core.content.FileProvider import androidx.core.net.toUri import androidx.credentials.CredentialManager import com.bitwarden.annotation.OmitFromCoverage +import com.bitwarden.core.data.util.toFormattedPattern import com.x8bit.bitwarden.BuildConfig import com.x8bit.bitwarden.MainActivity import com.x8bit.bitwarden.R import com.x8bit.bitwarden.data.autofill.model.chrome.ChromeReleaseChannel import com.x8bit.bitwarden.data.autofill.util.toPendingIntentMutabilityFlag import com.x8bit.bitwarden.data.platform.util.isBuildVersionBelow -import com.x8bit.bitwarden.ui.platform.util.toFormattedPattern import java.io.File import java.time.Clock diff --git a/app/src/main/kotlin/com/x8bit/bitwarden/ui/tools/feature/generator/passwordhistory/PasswordHistoryViewModel.kt b/app/src/main/kotlin/com/x8bit/bitwarden/ui/tools/feature/generator/passwordhistory/PasswordHistoryViewModel.kt index d57de7c4d8..435d732cf3 100644 --- a/app/src/main/kotlin/com/x8bit/bitwarden/ui/tools/feature/generator/passwordhistory/PasswordHistoryViewModel.kt +++ b/app/src/main/kotlin/com/x8bit/bitwarden/ui/tools/feature/generator/passwordhistory/PasswordHistoryViewModel.kt @@ -4,6 +4,7 @@ import android.os.Parcelable import androidx.lifecycle.SavedStateHandle import androidx.lifecycle.viewModelScope import com.bitwarden.core.data.repository.model.DataState +import com.bitwarden.core.data.util.toFormattedPattern import com.bitwarden.ui.platform.base.BaseViewModel import com.bitwarden.ui.util.Text import com.bitwarden.ui.util.asText @@ -14,7 +15,6 @@ import com.x8bit.bitwarden.data.platform.manager.clipboard.BitwardenClipboardMan import com.x8bit.bitwarden.data.platform.repository.model.LocalDataState import com.x8bit.bitwarden.data.tools.generator.repository.GeneratorRepository import com.x8bit.bitwarden.data.vault.repository.VaultRepository -import com.x8bit.bitwarden.ui.platform.util.toFormattedPattern import com.x8bit.bitwarden.ui.tools.feature.generator.model.GeneratorPasswordHistoryMode import com.x8bit.bitwarden.ui.tools.feature.generator.passwordhistory.PasswordHistoryState.GeneratedPassword import dagger.hilt.android.lifecycle.HiltViewModel diff --git a/app/src/main/kotlin/com/x8bit/bitwarden/ui/tools/feature/send/addedit/components/AddEditSendCustomDateChooser.kt b/app/src/main/kotlin/com/x8bit/bitwarden/ui/tools/feature/send/addedit/components/AddEditSendCustomDateChooser.kt index a3f6ebd33a..a2688d9e2a 100644 --- a/app/src/main/kotlin/com/x8bit/bitwarden/ui/tools/feature/send/addedit/components/AddEditSendCustomDateChooser.kt +++ b/app/src/main/kotlin/com/x8bit/bitwarden/ui/tools/feature/send/addedit/components/AddEditSendCustomDateChooser.kt @@ -10,13 +10,13 @@ import androidx.compose.runtime.setValue import androidx.compose.ui.Modifier import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp +import com.bitwarden.core.data.util.toFormattedPattern import com.bitwarden.ui.platform.components.model.CardStyle import com.bitwarden.ui.util.Text import com.bitwarden.ui.util.asText import com.x8bit.bitwarden.R import com.x8bit.bitwarden.ui.platform.components.dropdown.BitwardenMultiSelectButton import com.x8bit.bitwarden.ui.platform.composition.LocalClock -import com.x8bit.bitwarden.ui.platform.util.toFormattedPattern import kotlinx.collections.immutable.persistentMapOf import kotlinx.collections.immutable.toImmutableList import kotlinx.parcelize.Parcelize diff --git a/app/src/main/kotlin/com/x8bit/bitwarden/ui/tools/feature/send/util/SendDataExtensions.kt b/app/src/main/kotlin/com/x8bit/bitwarden/ui/tools/feature/send/util/SendDataExtensions.kt index 82ac060770..3c35f84d92 100644 --- a/app/src/main/kotlin/com/x8bit/bitwarden/ui/tools/feature/send/util/SendDataExtensions.kt +++ b/app/src/main/kotlin/com/x8bit/bitwarden/ui/tools/feature/send/util/SendDataExtensions.kt @@ -1,9 +1,9 @@ package com.x8bit.bitwarden.ui.tools.feature.send.util +import com.bitwarden.core.data.util.toFormattedPattern import com.bitwarden.send.SendType import com.bitwarden.send.SendView import com.x8bit.bitwarden.data.vault.repository.model.SendData -import com.x8bit.bitwarden.ui.platform.util.toFormattedPattern import com.x8bit.bitwarden.ui.tools.feature.send.SendState import java.time.Clock diff --git a/app/src/main/kotlin/com/x8bit/bitwarden/ui/tools/feature/send/viewsend/util/SendViewExtensions.kt b/app/src/main/kotlin/com/x8bit/bitwarden/ui/tools/feature/send/viewsend/util/SendViewExtensions.kt index 35699912b7..0628869dfa 100644 --- a/app/src/main/kotlin/com/x8bit/bitwarden/ui/tools/feature/send/viewsend/util/SendViewExtensions.kt +++ b/app/src/main/kotlin/com/x8bit/bitwarden/ui/tools/feature/send/viewsend/util/SendViewExtensions.kt @@ -1,10 +1,10 @@ package com.x8bit.bitwarden.ui.tools.feature.send.viewsend.util +import com.bitwarden.core.data.util.toFormattedPattern import com.bitwarden.send.SendFileView import com.bitwarden.send.SendTextView import com.bitwarden.send.SendType import com.bitwarden.send.SendView -import com.x8bit.bitwarden.ui.platform.util.toFormattedPattern import com.x8bit.bitwarden.ui.tools.feature.send.util.toSendUrl import com.x8bit.bitwarden.ui.tools.feature.send.viewsend.ViewSendState import java.time.Clock diff --git a/app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/addedit/util/CipherViewExtensions.kt b/app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/addedit/util/CipherViewExtensions.kt index 11669eb215..f5736194e8 100644 --- a/app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/addedit/util/CipherViewExtensions.kt +++ b/app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/addedit/util/CipherViewExtensions.kt @@ -2,6 +2,7 @@ package com.x8bit.bitwarden.ui.vault.feature.addedit.util +import com.bitwarden.core.data.util.toFormattedPattern import com.bitwarden.ui.util.asText import com.bitwarden.vault.CipherRepromptType import com.bitwarden.vault.CipherType @@ -15,7 +16,6 @@ import com.bitwarden.vault.LoginUriView import com.x8bit.bitwarden.R import com.x8bit.bitwarden.data.auth.repository.model.UserState import com.x8bit.bitwarden.ui.platform.manager.resource.ResourceManager -import com.x8bit.bitwarden.ui.platform.util.toFormattedPattern import com.x8bit.bitwarden.ui.vault.feature.addedit.VaultAddEditState import com.x8bit.bitwarden.ui.vault.feature.addedit.model.UriItem import com.x8bit.bitwarden.ui.vault.model.TotpData diff --git a/app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/item/util/CipherViewExtensions.kt b/app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/item/util/CipherViewExtensions.kt index 10f8ddde8b..2d9e131e85 100644 --- a/app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/item/util/CipherViewExtensions.kt +++ b/app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/item/util/CipherViewExtensions.kt @@ -1,6 +1,7 @@ package com.x8bit.bitwarden.ui.vault.feature.item.util import androidx.annotation.DrawableRes +import com.bitwarden.core.data.util.toFormattedPattern import com.bitwarden.ui.platform.base.util.nullIfAllEqual import com.bitwarden.ui.platform.base.util.orNullIfBlank import com.bitwarden.ui.platform.base.util.orZeroWidthSpace @@ -17,7 +18,6 @@ import com.bitwarden.vault.LoginUriView import com.x8bit.bitwarden.R import com.x8bit.bitwarden.data.vault.repository.model.VaultData import com.x8bit.bitwarden.ui.platform.components.model.IconData -import com.x8bit.bitwarden.ui.platform.util.toFormattedPattern import com.x8bit.bitwarden.ui.vault.feature.item.VaultItemState import com.x8bit.bitwarden.ui.vault.feature.item.model.TotpCodeItemData import com.x8bit.bitwarden.ui.vault.feature.item.model.VaultItemLocation diff --git a/app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/itemlisting/util/VaultItemListingDataExtensions.kt b/app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/itemlisting/util/VaultItemListingDataExtensions.kt index 18376b42ef..dc235912d6 100644 --- a/app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/itemlisting/util/VaultItemListingDataExtensions.kt +++ b/app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/itemlisting/util/VaultItemListingDataExtensions.kt @@ -3,6 +3,7 @@ package com.x8bit.bitwarden.ui.vault.feature.itemlisting.util import androidx.annotation.DrawableRes +import com.bitwarden.core.data.util.toFormattedPattern import com.bitwarden.fido.Fido2CredentialAutofillView import com.bitwarden.send.SendType import com.bitwarden.send.SendView @@ -20,7 +21,6 @@ import com.x8bit.bitwarden.data.credentials.model.CreateCredentialRequest import com.x8bit.bitwarden.data.platform.util.subtitle import com.x8bit.bitwarden.data.vault.repository.model.VaultData import com.x8bit.bitwarden.ui.platform.components.model.IconData -import com.x8bit.bitwarden.ui.platform.util.toFormattedPattern import com.x8bit.bitwarden.ui.tools.feature.send.util.toLabelIcons import com.x8bit.bitwarden.ui.tools.feature.send.util.toOverflowActions import com.x8bit.bitwarden.ui.vault.feature.itemlisting.VaultItemListingState diff --git a/app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/vault/util/FlightRecorderDataSetExtensions.kt b/app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/vault/util/FlightRecorderDataSetExtensions.kt index 63d5327a27..03f8efbe10 100644 --- a/app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/vault/util/FlightRecorderDataSetExtensions.kt +++ b/app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/vault/util/FlightRecorderDataSetExtensions.kt @@ -1,10 +1,10 @@ package com.x8bit.bitwarden.ui.vault.feature.vault.util +import com.bitwarden.core.data.util.toFormattedPattern import com.bitwarden.ui.util.asText import com.x8bit.bitwarden.R import com.x8bit.bitwarden.data.platform.datasource.disk.model.FlightRecorderDataSet import com.x8bit.bitwarden.ui.platform.components.snackbar.BitwardenSnackbarData -import com.x8bit.bitwarden.ui.platform.util.toFormattedPattern import java.time.Clock import java.time.Instant diff --git a/app/src/test/kotlin/com/x8bit/bitwarden/ui/tools/feature/generator/passwordhistory/PasswordHistoryViewModelTest.kt b/app/src/test/kotlin/com/x8bit/bitwarden/ui/tools/feature/generator/passwordhistory/PasswordHistoryViewModelTest.kt index 57db444bc1..97e82a4489 100644 --- a/app/src/test/kotlin/com/x8bit/bitwarden/ui/tools/feature/generator/passwordhistory/PasswordHistoryViewModelTest.kt +++ b/app/src/test/kotlin/com/x8bit/bitwarden/ui/tools/feature/generator/passwordhistory/PasswordHistoryViewModelTest.kt @@ -3,6 +3,7 @@ package com.x8bit.bitwarden.ui.tools.feature.generator.passwordhistory import androidx.lifecycle.SavedStateHandle import app.cash.turbine.test import com.bitwarden.core.data.repository.model.DataState +import com.bitwarden.core.data.util.toFormattedPattern import com.bitwarden.ui.platform.base.BaseViewModelTest import com.bitwarden.ui.util.Text import com.bitwarden.ui.util.asText @@ -14,7 +15,6 @@ import com.x8bit.bitwarden.data.platform.repository.model.LocalDataState import com.x8bit.bitwarden.data.tools.generator.repository.util.FakeGeneratorRepository import com.x8bit.bitwarden.data.vault.datasource.sdk.model.createMockCipherView import com.x8bit.bitwarden.data.vault.repository.VaultRepository -import com.x8bit.bitwarden.ui.platform.util.toFormattedPattern import com.x8bit.bitwarden.ui.tools.feature.generator.model.GeneratorPasswordHistoryMode import io.mockk.every import io.mockk.just diff --git a/authenticator/src/main/kotlin/com/bitwarden/authenticator/ui/platform/feature/settings/export/ExportViewModel.kt b/authenticator/src/main/kotlin/com/bitwarden/authenticator/ui/platform/feature/settings/export/ExportViewModel.kt index c2ff2b6977..6757811fbe 100644 --- a/authenticator/src/main/kotlin/com/bitwarden/authenticator/ui/platform/feature/settings/export/ExportViewModel.kt +++ b/authenticator/src/main/kotlin/com/bitwarden/authenticator/ui/platform/feature/settings/export/ExportViewModel.kt @@ -7,7 +7,7 @@ import com.bitwarden.authenticator.data.authenticator.repository.AuthenticatorRe import com.bitwarden.authenticator.data.authenticator.repository.model.ExportDataResult import com.bitwarden.authenticator.ui.platform.feature.settings.export.model.ExportVaultFormat import com.bitwarden.authenticator.ui.platform.util.fileExtension -import com.bitwarden.authenticator.ui.platform.util.toFormattedPattern +import com.bitwarden.core.data.util.toFormattedPattern import com.bitwarden.ui.platform.base.BaseViewModel import com.bitwarden.ui.util.Text import com.bitwarden.ui.util.asText @@ -69,7 +69,6 @@ class ExportViewModel @Inject constructor( } private fun handleConfirmExportClick() { - val date = clock.instant().toFormattedPattern( pattern = "yyyyMMddHHmmss", clock = clock, diff --git a/authenticator/src/main/kotlin/com/bitwarden/authenticator/ui/platform/util/TemporalAccessExtensions.kt b/authenticator/src/main/kotlin/com/bitwarden/authenticator/ui/platform/util/TemporalAccessExtensions.kt deleted file mode 100644 index 936527cf53..0000000000 --- a/authenticator/src/main/kotlin/com/bitwarden/authenticator/ui/platform/util/TemporalAccessExtensions.kt +++ /dev/null @@ -1,22 +0,0 @@ -package com.bitwarden.authenticator.ui.platform.util - -import java.time.Clock -import java.time.ZoneId -import java.time.format.DateTimeFormatter -import java.time.temporal.TemporalAccessor - -/** - * Converts the [TemporalAccessor] to a formatted string based on the provided pattern and timezone. - */ -fun TemporalAccessor.toFormattedPattern( - pattern: String, - zone: ZoneId, -): String = DateTimeFormatter.ofPattern(pattern).withZone(zone).format(this) - -/** - * Converts the [TemporalAccessor] to a formatted string based on the provided pattern and timezone. - */ -fun TemporalAccessor.toFormattedPattern( - pattern: String, - clock: Clock = Clock.systemDefaultZone(), -): String = toFormattedPattern(pattern = pattern, zone = clock.zone) diff --git a/app/src/main/kotlin/com/x8bit/bitwarden/ui/platform/util/TemporalAccessorExtensions.kt b/core/src/main/kotlin/com/bitwarden/core/data/util/TemporalAccessorExtensions.kt similarity index 93% rename from app/src/main/kotlin/com/x8bit/bitwarden/ui/platform/util/TemporalAccessorExtensions.kt rename to core/src/main/kotlin/com/bitwarden/core/data/util/TemporalAccessorExtensions.kt index 6f2aab0a00..de1f06c12c 100644 --- a/app/src/main/kotlin/com/x8bit/bitwarden/ui/platform/util/TemporalAccessorExtensions.kt +++ b/core/src/main/kotlin/com/bitwarden/core/data/util/TemporalAccessorExtensions.kt @@ -1,4 +1,4 @@ -package com.x8bit.bitwarden.ui.platform.util +package com.bitwarden.core.data.util import java.time.Clock import java.time.ZoneId diff --git a/app/src/test/kotlin/com/x8bit/bitwarden/ui/platform/util/TemporalAccessorExtensionsTest.kt b/core/src/test/kotlin/com/bitwarden/core/data/util/TemporalAccessorExtensionsTest.kt similarity index 96% rename from app/src/test/kotlin/com/x8bit/bitwarden/ui/platform/util/TemporalAccessorExtensionsTest.kt rename to core/src/test/kotlin/com/bitwarden/core/data/util/TemporalAccessorExtensionsTest.kt index eebadfebdd..48d300aa90 100644 --- a/app/src/test/kotlin/com/x8bit/bitwarden/ui/platform/util/TemporalAccessorExtensionsTest.kt +++ b/core/src/test/kotlin/com/bitwarden/core/data/util/TemporalAccessorExtensionsTest.kt @@ -1,4 +1,4 @@ -package com.x8bit.bitwarden.ui.platform.util +package com.bitwarden.core.data.util import org.junit.jupiter.api.Assertions.assertEquals import org.junit.jupiter.api.Test