ProtonMail
/
protoncore_android
mirror of https://github.com/ProtonMail/protoncore_android
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

test: Fixed build and dependencies (AccountRecoveryDialogTest is still failing).

This commit is contained in:
Neil Marietta 2024-03-20 13:34:15 +01:00
parent 0ed0712657
commit 1e890eb103
13 changed files with 49 additions and 190 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

159
account-recovery/presentation-compose/api/account-recovery-presentation-compose.api
View File

@ -1,35 +1,3 @@
public class hilt_aggregated_deps/_me_proton_core_accountrecovery_presentation_compose_ui_AccountRecoveryDialogActivity_GeneratedInjector {
public fun <init> ()V
}
public class hilt_aggregated_deps/_me_proton_core_accountrecovery_presentation_compose_ui_PasswordResetDialogActivity_GeneratedInjector {
public fun <init> ()V
}
public class hilt_aggregated_deps/_me_proton_core_accountrecovery_presentation_compose_viewmodel_AccountRecoveryDialogViewModel_HiltModules_BindsModule {
public fun <init> ()V
}
public class hilt_aggregated_deps/_me_proton_core_accountrecovery_presentation_compose_viewmodel_AccountRecoveryDialogViewModel_HiltModules_KeyModule {
public fun <init> ()V
}
public class hilt_aggregated_deps/_me_proton_core_accountrecovery_presentation_compose_viewmodel_AccountRecoveryInfoViewModel_HiltModules_BindsModule {
public fun <init> ()V
}
public class hilt_aggregated_deps/_me_proton_core_accountrecovery_presentation_compose_viewmodel_AccountRecoveryInfoViewModel_HiltModules_KeyModule {
public fun <init> ()V
}
public class hilt_aggregated_deps/_me_proton_core_accountrecovery_presentation_compose_viewmodel_PasswordResetDialogViewModel_HiltModules_BindsModule {
public fun <init> ()V
}
public class hilt_aggregated_deps/_me_proton_core_accountrecovery_presentation_compose_viewmodel_PasswordResetDialogViewModel_HiltModules_KeyModule {
public fun <init> ()V
}
public final class me/proton/core/accountrecovery/presentation/compose/AccountRecoveryNotificationSetup {
public static final field $stable I
public static final field Companion Lme/proton/core/accountrecovery/presentation/compose/AccountRecoveryNotificationSetup$Companion;
@ -41,14 +9,6 @@ public final class me/proton/core/accountrecovery/presentation/compose/AccountRe
public final fun getDeeplink ()Ljava/lang/String;
}
public final class me/proton/core/accountrecovery/presentation/compose/AccountRecoveryNotificationSetup_Factory : dagger/internal/Factory {
public fun <init> (Ljavax/inject/Provider;Ljavax/inject/Provider;)V
public static fun create (Ljavax/inject/Provider;Ljavax/inject/Provider;)Lme/proton/core/accountrecovery/presentation/compose/AccountRecoveryNotificationSetup_Factory;
public synthetic fun get ()Ljava/lang/Object;
public fun get ()Lme/proton/core/accountrecovery/presentation/compose/AccountRecoveryNotificationSetup;
public static fun newInstance (Lme/proton/core/accountrecovery/domain/IsAccountRecoveryEnabled;Lme/proton/core/notification/presentation/deeplink/DeeplinkManager;)Lme/proton/core/accountrecovery/presentation/compose/AccountRecoveryNotificationSetup;
}
public final class me/proton/core/accountrecovery/presentation/compose/BuildConfig {
public static final field BUILD_TYPE Ljava/lang/String;
public static final field DEBUG Z
@ -151,40 +111,6 @@ public final class me/proton/core/accountrecovery/presentation/compose/ui/Accoun
public final fun start (Landroid/content/Context;Lme/proton/core/accountrecovery/presentation/compose/entity/AccountRecoveryDialogInput;)V
}
public abstract interface class me/proton/core/accountrecovery/presentation/compose/ui/AccountRecoveryDialogActivity_GeneratedInjector {
public abstract fun injectAccountRecoveryDialogActivity (Lme/proton/core/accountrecovery/presentation/compose/ui/AccountRecoveryDialogActivity;)V
}
public final class me/proton/core/accountrecovery/presentation/compose/ui/AccountRecoveryDialogActivity_MembersInjector : dagger/MembersInjector {
public fun <init> (Ljavax/inject/Provider;)V
public static fun create (Ljavax/inject/Provider;)Ldagger/MembersInjector;
public static fun injectAccountManagerOrchestrator (Lme/proton/core/accountrecovery/presentation/compose/ui/AccountRecoveryDialogActivity;Lme/proton/core/accountmanager/presentation/AccountManagerOrchestrator;)V
public synthetic fun injectMembers (Ljava/lang/Object;)V
public fun injectMembers (Lme/proton/core/accountrecovery/presentation/compose/ui/AccountRecoveryDialogActivity;)V
}
public abstract class me/proton/core/accountrecovery/presentation/compose/ui/Hilt_AccountRecoveryDialogActivity : me/proton/core/presentation/ui/ProtonActivity, dagger/hilt/internal/GeneratedComponentManagerHolder {
public final fun componentManager ()Ldagger/hilt/android/internal/managers/ActivityComponentManager;
public synthetic fun componentManager ()Ldagger/hilt/internal/GeneratedComponentManager;
protected fun createComponentManager ()Ldagger/hilt/android/internal/managers/ActivityComponentManager;
public final fun generatedComponent ()Ljava/lang/Object;
public fun getDefaultViewModelProviderFactory ()Landroidx/lifecycle/ViewModelProvider$Factory;
protected fun inject ()V
protected fun onCreate (Landroid/os/Bundle;)V
protected fun onDestroy ()V
}
public abstract class me/proton/core/accountrecovery/presentation/compose/ui/Hilt_PasswordResetDialogActivity : me/proton/core/presentation/ui/ProtonActivity, dagger/hilt/internal/GeneratedComponentManagerHolder {
public final fun componentManager ()Ldagger/hilt/android/internal/managers/ActivityComponentManager;
public synthetic fun componentManager ()Ldagger/hilt/internal/GeneratedComponentManager;
protected fun createComponentManager ()Ldagger/hilt/android/internal/managers/ActivityComponentManager;
public final fun generatedComponent ()Ljava/lang/Object;
public fun getDefaultViewModelProviderFactory ()Landroidx/lifecycle/ViewModelProvider$Factory;
protected fun inject ()V
protected fun onCreate (Landroid/os/Bundle;)V
protected fun onDestroy ()V
}
public final class me/proton/core/accountrecovery/presentation/compose/ui/PasswordResetDialogActivity : me/proton/core/presentation/ui/ProtonActivity {
public static final field $stable I
public static final field ARG_INPUT Ljava/lang/String;
@ -196,10 +122,6 @@ public final class me/proton/core/accountrecovery/presentation/compose/ui/Passwo
public final fun start (Landroid/content/Context;Lme/proton/core/domain/entity/UserId;)V
}
public abstract interface class me/proton/core/accountrecovery/presentation/compose/ui/PasswordResetDialogActivity_GeneratedInjector {
public abstract fun injectPasswordResetDialogActivity (Lme/proton/core/accountrecovery/presentation/compose/ui/PasswordResetDialogActivity;)V
}
public final class me/proton/core/accountrecovery/presentation/compose/view/AccountRecoveryInfoKt {
public static final fun AccountRecoveryInfo (Landroidx/compose/ui/Modifier;ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;Lkotlin/jvm/functions/Function0;Ljava/lang/String;Lkotlin/jvm/functions/Function0;ZZLandroidx/compose/runtime/Composer;II)V
public static final fun AccountRecoveryInfo (Landroidx/compose/ui/Modifier;Lme/proton/core/accountrecovery/presentation/compose/viewmodel/AccountRecoveryInfoViewModel;Lkotlin/jvm/functions/Function0;ZZLandroidx/compose/runtime/Composer;II)V
@ -380,66 +302,12 @@ public final class me/proton/core/accountrecovery/presentation/compose/viewmodel
public fun toString ()Ljava/lang/String;
}
public final class me/proton/core/accountrecovery/presentation/compose/viewmodel/AccountRecoveryDialogViewModel_Factory : dagger/internal/Factory {
public fun <init> (Ljavax/inject/Provider;Ljavax/inject/Provider;Ljavax/inject/Provider;Ljavax/inject/Provider;Ljavax/inject/Provider;Ljavax/inject/Provider;Ljavax/inject/Provider;Ljavax/inject/Provider;Ljavax/inject/Provider;Ljavax/inject/Provider;)V
public static fun create (Ljavax/inject/Provider;Ljavax/inject/Provider;Ljavax/inject/Provider;Ljavax/inject/Provider;Ljavax/inject/Provider;Ljavax/inject/Provider;Ljavax/inject/Provider;Ljavax/inject/Provider;Ljavax/inject/Provider;Ljavax/inject/Provider;)Lme/proton/core/accountrecovery/presentation/compose/viewmodel/AccountRecoveryDialogViewModel_Factory;
public synthetic fun get ()Ljava/lang/Object;
public fun get ()Lme/proton/core/accountrecovery/presentation/compose/viewmodel/AccountRecoveryDialogViewModel;
public static fun newInstance (Landroidx/lifecycle/SavedStateHandle;Lme/proton/core/util/android/datetime/Clock;Lme/proton/core/util/android/datetime/DateTimeFormat;Lme/proton/core/user/domain/usecase/ObserveUser;Lme/proton/core/accountrecovery/domain/usecase/ObserveUserRecovery;Lme/proton/core/accountrecovery/domain/usecase/ObserveUserRecoverySelfInitiated;Lme/proton/core/accountrecovery/domain/usecase/CancelRecovery;Lme/proton/core/crypto/common/keystore/KeyStoreCrypto;Lme/proton/core/accountrecovery/domain/IsAccountRecoveryResetEnabled;Lme/proton/core/observability/domain/ObservabilityManager;)Lme/proton/core/accountrecovery/presentation/compose/viewmodel/AccountRecoveryDialogViewModel;
}
public final class me/proton/core/accountrecovery/presentation/compose/viewmodel/AccountRecoveryDialogViewModel_HiltModules {
}
public abstract class me/proton/core/accountrecovery/presentation/compose/viewmodel/AccountRecoveryDialogViewModel_HiltModules$BindsModule {
public abstract fun binds (Lme/proton/core/accountrecovery/presentation/compose/viewmodel/AccountRecoveryDialogViewModel;)Landroidx/lifecycle/ViewModel;
}
public final class me/proton/core/accountrecovery/presentation/compose/viewmodel/AccountRecoveryDialogViewModel_HiltModules$KeyModule {
public static fun provide ()Ljava/lang/String;
}
public final class me/proton/core/accountrecovery/presentation/compose/viewmodel/AccountRecoveryDialogViewModel_HiltModules_KeyModule_ProvideFactory : dagger/internal/Factory {
public fun <init> ()V
public static fun create ()Lme/proton/core/accountrecovery/presentation/compose/viewmodel/AccountRecoveryDialogViewModel_HiltModules_KeyModule_ProvideFactory;
public synthetic fun get ()Ljava/lang/Object;
public fun get ()Ljava/lang/String;
public static fun provide ()Ljava/lang/String;
}
public final class me/proton/core/accountrecovery/presentation/compose/viewmodel/AccountRecoveryInfoViewModel : androidx/lifecycle/ViewModel {
public static final field $stable I
public fun <init> (Lme/proton/core/accountmanager/domain/AccountManager;Lme/proton/core/accountrecovery/domain/usecase/ObserveUserRecovery;Lme/proton/core/util/android/datetime/Clock;Lme/proton/core/util/android/datetime/DateTimeFormat;Lme/proton/core/util/android/datetime/DurationFormat;)V
public final fun getState ()Lkotlinx/coroutines/flow/StateFlow;
}
public final class me/proton/core/accountrecovery/presentation/compose/viewmodel/AccountRecoveryInfoViewModel_Factory : dagger/internal/Factory {
public fun <init> (Ljavax/inject/Provider;Ljavax/inject/Provider;Ljavax/inject/Provider;Ljavax/inject/Provider;Ljavax/inject/Provider;)V
public static fun create (Ljavax/inject/Provider;Ljavax/inject/Provider;Ljavax/inject/Provider;Ljavax/inject/Provider;Ljavax/inject/Provider;)Lme/proton/core/accountrecovery/presentation/compose/viewmodel/AccountRecoveryInfoViewModel_Factory;
public synthetic fun get ()Ljava/lang/Object;
public fun get ()Lme/proton/core/accountrecovery/presentation/compose/viewmodel/AccountRecoveryInfoViewModel;
public static fun newInstance (Lme/proton/core/accountmanager/domain/AccountManager;Lme/proton/core/accountrecovery/domain/usecase/ObserveUserRecovery;Lme/proton/core/util/android/datetime/Clock;Lme/proton/core/util/android/datetime/DateTimeFormat;Lme/proton/core/util/android/datetime/DurationFormat;)Lme/proton/core/accountrecovery/presentation/compose/viewmodel/AccountRecoveryInfoViewModel;
}
public final class me/proton/core/accountrecovery/presentation/compose/viewmodel/AccountRecoveryInfoViewModel_HiltModules {
}
public abstract class me/proton/core/accountrecovery/presentation/compose/viewmodel/AccountRecoveryInfoViewModel_HiltModules$BindsModule {
public abstract fun binds (Lme/proton/core/accountrecovery/presentation/compose/viewmodel/AccountRecoveryInfoViewModel;)Landroidx/lifecycle/ViewModel;
}
public final class me/proton/core/accountrecovery/presentation/compose/viewmodel/AccountRecoveryInfoViewModel_HiltModules$KeyModule {
public static fun provide ()Ljava/lang/String;
}
public final class me/proton/core/accountrecovery/presentation/compose/viewmodel/AccountRecoveryInfoViewModel_HiltModules_KeyModule_ProvideFactory : dagger/internal/Factory {
public fun <init> ()V
public static fun create ()Lme/proton/core/accountrecovery/presentation/compose/viewmodel/AccountRecoveryInfoViewModel_HiltModules_KeyModule_ProvideFactory;
public synthetic fun get ()Ljava/lang/Object;
public fun get ()Ljava/lang/String;
public static fun provide ()Ljava/lang/String;
}
public abstract class me/proton/core/accountrecovery/presentation/compose/viewmodel/AccountRecoveryInfoViewState {
public static final field $stable I
}
@ -552,30 +420,3 @@ public final class me/proton/core/accountrecovery/presentation/compose/viewmodel
public fun toString ()Ljava/lang/String;
}
public final class me/proton/core/accountrecovery/presentation/compose/viewmodel/PasswordResetDialogViewModel_Factory : dagger/internal/Factory {
public fun <init> (Ljavax/inject/Provider;Ljavax/inject/Provider;Ljavax/inject/Provider;Ljavax/inject/Provider;)V
public static fun create (Ljavax/inject/Provider;Ljavax/inject/Provider;Ljavax/inject/Provider;Ljavax/inject/Provider;)Lme/proton/core/accountrecovery/presentation/compose/viewmodel/PasswordResetDialogViewModel_Factory;
public synthetic fun get ()Ljava/lang/Object;
public fun get ()Lme/proton/core/accountrecovery/presentation/compose/viewmodel/PasswordResetDialogViewModel;
public static fun newInstance (Landroidx/lifecycle/SavedStateHandle;Lme/proton/core/user/domain/usecase/ObserveUser;Lme/proton/core/accountrecovery/domain/usecase/StartRecovery;Lme/proton/core/observability/domain/ObservabilityManager;)Lme/proton/core/accountrecovery/presentation/compose/viewmodel/PasswordResetDialogViewModel;
}
public final class me/proton/core/accountrecovery/presentation/compose/viewmodel/PasswordResetDialogViewModel_HiltModules {
}
public abstract class me/proton/core/accountrecovery/presentation/compose/viewmodel/PasswordResetDialogViewModel_HiltModules$BindsModule {
public abstract fun binds (Lme/proton/core/accountrecovery/presentation/compose/viewmodel/PasswordResetDialogViewModel;)Landroidx/lifecycle/ViewModel;
}
public final class me/proton/core/accountrecovery/presentation/compose/viewmodel/PasswordResetDialogViewModel_HiltModules$KeyModule {
public static fun provide ()Ljava/lang/String;
}
public final class me/proton/core/accountrecovery/presentation/compose/viewmodel/PasswordResetDialogViewModel_HiltModules_KeyModule_ProvideFactory : dagger/internal/Factory {
public fun <init> ()V
public static fun create ()Lme/proton/core/accountrecovery/presentation/compose/viewmodel/PasswordResetDialogViewModel_HiltModules_KeyModule_ProvideFactory;
public synthetic fun get ()Ljava/lang/Object;
public fun get ()Ljava/lang/String;
public static fun provide ()Ljava/lang/String;
}

38
account-recovery/presentation-compose/build.gradle.kts
View File

@ -21,7 +21,6 @@ import studio.forface.easygradle.dsl.android.*
plugins {
protonComposeUiLibrary
protonDagger
id("kotlin-parcelize")
}
@ -42,6 +41,24 @@ protonBuild {
dependencies {
api(
activity,
`activity-compose`,
`compose-foundation`,
`compose-foundation-layout`,
`compose-material`,
`compose-runtime`,
`compose-ui`,
`compose-ui-graphics`,
`compose-ui-text`,
`coroutines-core`,
`hilt-navigation-compose`,
`lifecycle-common`,
`lifecycle-viewModel`,
`lifecycle-viewModel-compose`,
`lifecycle-runtime-compose`,
)
implementation(
project(Module.accountRecoveryDomain),
project(Module.accountRecoveryPresentation),
project(Module.accountManagerDomain),
@ -51,29 +68,13 @@ dependencies {
project(Module.notification),
project(Module.kotlinUtil),
project(Module.androidUtilDatetime),
`compose-foundation`,
`compose-foundation-layout`,
`compose-material`,
`compose-runtime`,
`compose-ui`,
`compose-ui-graphics`,
`compose-ui-text`,
`coroutines-core`,
`hilt-android`,
`hilt-navigation-compose`,
`lifecycle-common`,
`lifecycle-viewModel`,
`lifecycle-viewModel-compose`,
)
implementation(
project(Module.observabilityDomain),
project(Module.androidUtilDagger),
`coroutines-core`,
`android-ktx`,
`appcompat`,
`compose-material3`,
`compose-ui-tooling-preview`,
`compose-ui-unit`,
`lifecycle-runtime`,
)
@ -88,7 +89,6 @@ dependencies {
`compose-ui-test-manifest`,
junit,
`mockk-android`,
`hilt-android-testing`,
`junit-ktx`,
`kotlin-test`
)

14
account-recovery/presentation-compose/src/androidTest/kotlin/me/proton/core/accountrecovery/presentation/compose/dialog/AccountRecoveryDialogTest.kt
View File

@ -49,7 +49,7 @@ import org.junit.runner.RunWith
@RunWith(AndroidJUnit4::class)
class AccountRecoveryDialogTest {
@get: Rule
@get:Rule
val composeTestRule = createComposeRule()
private val passwordInput: SemanticsNodeInteraction
@ -84,6 +84,7 @@ class AccountRecoveryDialogTest {
ProtonTheme {
AccountRecoveryDialog(
viewModel = viewModel,
onStartPasswordManager = {},
onClosed = {},
onError = {})
}
@ -121,6 +122,7 @@ class AccountRecoveryDialogTest {
ProtonTheme {
AccountRecoveryDialog(
viewModel = viewModel,
onStartPasswordManager = {},
onClosed = {},
onError = {})
}
@ -154,6 +156,7 @@ class AccountRecoveryDialogTest {
ProtonTheme {
AccountRecoveryDialog(
viewModel = viewModel,
onStartPasswordManager = {},
onClosed = {},
onError = {})
}
@ -185,6 +188,7 @@ class AccountRecoveryDialogTest {
ProtonTheme {
AccountRecoveryDialog(
viewModel = viewModel,
onStartPasswordManager = {},
onClosed = {},
onError = {})
}
@ -215,6 +219,7 @@ class AccountRecoveryDialogTest {
ProtonTheme {
AccountRecoveryDialog(
viewModel = viewModel,
onStartPasswordManager = {},
onClosed = {},
onError = {})
}
@ -254,6 +259,7 @@ class AccountRecoveryDialogTest {
ProtonTheme {
AccountRecoveryDialog(
viewModel = viewModel,
onStartPasswordManager = {},
onClosed = {},
onError = {})
}
@ -288,6 +294,7 @@ class AccountRecoveryDialogTest {
ProtonTheme {
AccountRecoveryDialog(
viewModel = viewModel,
onStartPasswordManager = {},
onClosed = {},
onError = {})
}
@ -319,6 +326,7 @@ class AccountRecoveryDialogTest {
ProtonTheme {
AccountRecoveryDialog(
viewModel = viewModel,
onStartPasswordManager = {},
onClosed = {},
onError = {})
}
@ -353,6 +361,7 @@ class AccountRecoveryDialogTest {
ProtonTheme {
AccountRecoveryDialog(
viewModel = viewModel,
onStartPasswordManager = {},
onClosed = {},
onError = {})
}
@ -387,6 +396,7 @@ class AccountRecoveryDialogTest {
ProtonTheme {
AccountRecoveryDialog(
viewModel = viewModel,
onStartPasswordManager = {},
onClosed = {},
onError = {})
}
@ -419,6 +429,7 @@ class AccountRecoveryDialogTest {
ProtonTheme {
AccountRecoveryDialog(
viewModel = viewModel,
onStartPasswordManager = {},
onClosed = {},
onError = {})
}
@ -450,6 +461,7 @@ class AccountRecoveryDialogTest {
ProtonTheme {
AccountRecoveryDialog(
viewModel = viewModel,
onStartPasswordManager = {},
onClosed = {},
onError = {})
}

2
account-recovery/presentation-compose/src/main/kotlin/me/proton/core/accountrecovery/presentation/compose/viewmodel/AccountRecoveryDialogViewModel.kt
View File

@ -63,10 +63,10 @@ import me.proton.core.user.domain.entity.UserRecovery.State.Grace
import me.proton.core.user.domain.entity.UserRecovery.State.Insecure
import me.proton.core.user.domain.entity.UserRecovery.State.None
import me.proton.core.user.domain.usecase.ObserveUser
import me.proton.core.util.android.dagger.UtcClock
import me.proton.core.util.android.datetime.Clock
import me.proton.core.util.android.datetime.DateTimeFormat
import me.proton.core.util.android.datetime.DateTimeFormat.DateTimeForm
import me.proton.core.util.android.datetime.UtcClock
import me.proton.core.util.kotlin.CoreLogger
import me.proton.core.util.kotlin.coroutine.launchWithResultContext
import javax.inject.Inject

2
account-recovery/presentation-compose/src/main/kotlin/me/proton/core/accountrecovery/presentation/compose/viewmodel/AccountRecoveryInfoViewModel.kt
View File

@ -31,11 +31,11 @@ import me.proton.core.accountmanager.domain.AccountManager
import me.proton.core.accountrecovery.domain.usecase.ObserveUserRecovery
import me.proton.core.compose.viewmodel.stopTimeoutMillis
import me.proton.core.user.domain.entity.UserRecovery
import me.proton.core.util.android.dagger.UtcClock
import me.proton.core.util.android.datetime.Clock
import me.proton.core.util.android.datetime.DateTimeFormat
import me.proton.core.util.android.datetime.DateTimeFormat.DateTimeForm
import me.proton.core.util.android.datetime.DurationFormat
import me.proton.core.util.android.datetime.UtcClock
import javax.inject.Inject
import kotlin.time.Duration.Companion.seconds
import kotlin.time.DurationUnit

1
account-recovery/test/build.gradle.kts
View File

@ -38,6 +38,7 @@ android {
dependencies {
api(
project(Module.accountManagerData),
project(Module.accountRecoveryDomain),
project(Module.authTest),
project(Module.eventManagerDomain),
project(Module.networkData),

2
human-verification/data/build.gradle.kts
View File

@ -53,7 +53,7 @@ dependencies {
)
implementation(
project(Module.androidUtilDagger),
project(Module.androidUtilDatetime),
project(Module.kotlinUtil),
project(Module.cryptoCommon),
`coroutines-core`,

2
human-verification/data/src/main/kotlin/me/proton/core/humanverification/data/DeviceVerificationProviderImpl.kt
View File

@ -22,7 +22,7 @@ import me.proton.core.network.domain.deviceverification.DeviceVerificationProvid
import me.proton.core.network.domain.session.SessionId
import javax.inject.Inject
import io.github.reactivecircus.cache4k.Cache
import me.proton.core.util.android.dagger.Monotonic
import me.proton.core.util.android.datetime.Monotonic
import kotlin.time.Duration.Companion.minutes
import kotlin.time.TimeSource

3
user-settings/presentation/build.gradle.kts
View File

@ -50,7 +50,10 @@ dependencies {
project(Module.cryptoCommon),
project(Module.domain),
project(Module.presentation),
project(Module.presentationCompose),
project(Module.userSettingsDomain),
project(Module.accountManagerPresentation),
project(Module.accountRecoveryDomain),
project(Module.accountRecoveryPresentationCompose),
activity,
`compose-ui`,

6
util/android/dagger/api/util-android-dagger.api
View File

@ -49,9 +49,3 @@ public final class me/proton/core/util/android/dagger/CoreAndroidModule_Companio
public static fun provideMonotonicTimeSource$util_android_dagger_release ()Lkotlin/time/TimeSource;
}
public abstract interface annotation class me/proton/core/util/android/dagger/Monotonic : java/lang/annotation/Annotation {
}
public abstract interface annotation class me/proton/core/util/android/dagger/UtcClock : java/lang/annotation/Annotation {
}

2
util/android/dagger/src/main/kotlin/me/proton/core/util/android/dagger/CoreAndroidModule.kt
View File

@ -30,6 +30,8 @@ import me.proton.core.presentation.app.AppLifecycleProvider
import me.proton.core.util.android.datetime.Clock
import me.proton.core.util.android.datetime.DateTimeFormat
import me.proton.core.util.android.datetime.DurationFormat
import me.proton.core.util.android.datetime.Monotonic
import me.proton.core.util.android.datetime.UtcClock
import me.proton.core.util.kotlin.CoroutineScopeProvider
import me.proton.core.util.kotlin.DefaultCoroutineScopeProvider
import me.proton.core.util.kotlin.DefaultDispatcherProvider

6
util/android/datetime/api/util-android-datetime.api
View File

@ -62,3 +62,9 @@ public final class me/proton/core/util/android/datetime/DurationFormat {
public static synthetic fun format-rnQQ1Ag$default (Lme/proton/core/util/android/datetime/DurationFormat;JLkotlin/time/DurationUnit;Lkotlin/time/DurationUnit;CILjava/lang/Object;)Ljava/lang/String;
}
public abstract interface annotation class me/proton/core/util/android/datetime/Monotonic : java/lang/annotation/Annotation {
}
public abstract interface annotation class me/proton/core/util/android/datetime/UtcClock : java/lang/annotation/Annotation {
}

2
util/android/dagger/src/main/kotlin/me/proton/core/util/android/dagger/qualifiers.kt → util/android/datetime/src/main/kotlin/me/proton/core/util/android/datetime/qualifiers.kt
View File

@ -16,7 +16,7 @@
* along with ProtonCore. If not, see <https://www.gnu.org/licenses/>.
*/
package me.proton.core.util.android.dagger
package me.proton.core.util.android.datetime
import javax.inject.Qualifier