blallo
/
fenix
1
0
Fork 0
Code Releases Activity

Change type for OnboardingAutomaticSignIn (#7474)

master
Tiger Oakes 2020-01-06 14:25:52 -08:00 committed by GitHub
parent aa3a32bbfb
commit 75b87334fa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SessionControlAdapter.kt
View File

@ -96,11 +96,9 @@ sealed class AdapterItem(@LayoutRes val viewType: Int) {
) : AdapterItem(OnboardingSectionHeaderViewHolder.LAYOUT_ID) {
override fun sameAs(other: AdapterItem) = other is OnboardingSectionHeader && labelBuilder == other.labelBuilder
}
data class OnboardingManualSignIn(
val state: OnboardingState
) : AdapterItem(OnboardingManualSignInViewHolder.LAYOUT_ID)
object OnboardingManualSignIn : AdapterItem(OnboardingManualSignInViewHolder.LAYOUT_ID)
data class OnboardingAutomaticSignIn(
val state: OnboardingState
val state: OnboardingState.SignedOutCanAutoSignIn
) : AdapterItem(OnboardingAutomaticSignInViewHolder.LAYOUT_ID)
object OnboardingThemePicker : AdapterItem(OnboardingThemePickerViewHolder.LAYOUT_ID)
object OnboardingTrackingProtection : AdapterItem(OnboardingTrackingProtectionViewHolder.LAYOUT_ID)
@ -197,9 +195,8 @@ class SessionControlAdapter(
(item as AdapterItem.OnboardingSectionHeader).labelBuilder
)
is OnboardingManualSignInViewHolder -> holder.bind()
is OnboardingAutomaticSignInViewHolder -> holder.bind((
(item as AdapterItem.OnboardingAutomaticSignIn).state
as OnboardingState.SignedOutCanAutoSignIn).withAccount
is OnboardingAutomaticSignInViewHolder -> holder.bind(
(item as AdapterItem.OnboardingAutomaticSignIn).state.withAccount
)
}
}

2
app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SessionControlView.kt
View File

@ -89,7 +89,7 @@ private fun onboardingAdapterItems(onboardingState: OnboardingState): List<Adapt
items.addAll(when (onboardingState) {
OnboardingState.SignedOutNoAutoSignIn -> {
listOf(
AdapterItem.OnboardingManualSignIn(onboardingState)
AdapterItem.OnboardingManualSignIn
)
}
is OnboardingState.SignedOutCanAutoSignIn -> {