Skip to content

Commit c603b78

Browse files
committed
extracting common breaker background selection to ftue extensions
1 parent 1361852 commit c603b78

File tree

6 files changed

+11
-14
lines changed

6 files changed

+11
-14
lines changed

vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthResetPasswordBreakerFragment.kt

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -54,12 +54,7 @@ class FtueAuthResetPasswordBreakerFragment : AbstractFtueAuthFragment<FragmentFt
5454
}
5555

5656
private fun setupUi() {
57-
views.resetPasswordBreakerGradientContainer.setBackgroundResource(
58-
when (themeProvider.isLightTheme()) {
59-
true -> R.drawable.bg_waiting_for_email_verification
60-
false -> R.drawable.bg_color_background
61-
}
62-
)
57+
views.resetPasswordBreakerGradientContainer.setBackgroundResource(themeProvider.ftueBreakerBackground())
6358
views.resetPasswordBreakerTitle.text = getString(R.string.ftue_auth_reset_password_breaker_title)
6459
.colorTerminatingFullStop(ThemeUtils.getColor(requireContext(), R.attr.colorSecondary))
6560
views.resetPasswordBreakerSubtitle.text = getString(R.string.ftue_auth_email_verification_subtitle, params.email)

vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthWaitForEmailFragment.kt

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -58,12 +58,7 @@ class FtueAuthWaitForEmailFragment @Inject constructor(
5858
}
5959

6060
private fun setupUi() {
61-
views.emailVerificationGradientContainer.setBackgroundResource(
62-
when (themeProvider.isLightTheme()) {
63-
true -> R.drawable.bg_waiting_for_email_verification
64-
false -> R.drawable.bg_color_background
65-
}
66-
)
61+
views.emailVerificationGradientContainer.setBackgroundResource(themeProvider.ftueBreakerBackground())
6762
views.emailVerificationTitle.text = getString(R.string.ftue_auth_email_verification_title)
6863
.colorTerminatingFullStop(ThemeUtils.getColor(requireContext(), R.attr.colorSecondary))
6964
views.emailVerificationSubtitle.text = getString(R.string.ftue_auth_email_verification_subtitle, params.email)

vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueExtensions.kt

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,11 @@ package im.vector.app.features.onboarding.ftueauth
1818

1919
import android.widget.Button
2020
import com.google.android.material.textfield.TextInputLayout
21+
import im.vector.app.R
2122
import im.vector.app.core.extensions.hasContentFlow
2223
import im.vector.app.features.login.SignMode
2324
import im.vector.app.features.onboarding.OnboardingAction
25+
import im.vector.app.features.themes.ThemeProvider
2426
import kotlinx.coroutines.flow.Flow
2527
import kotlinx.coroutines.flow.combine
2628
import kotlinx.coroutines.flow.onEach
@@ -49,3 +51,8 @@ fun observeContentChangesAndResetErrors(username: TextInputLayout, password: Tex
4951
submit.isEnabled = it
5052
}
5153
}
54+
55+
fun ThemeProvider.ftueBreakerBackground() = when (isLightTheme()) {
56+
true -> R.drawable.bg_gradient_ftue_breaker
57+
false -> R.drawable.bg_color_background
58+
}

vector/src/main/res/layout/fragment_ftue_reset_password_breaker.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
android:layout_height="0dp"
2626
app:layout_constraintHeight_percent="0.60"
2727
app:layout_constraintTop_toTopOf="parent"
28-
tools:background="@drawable/bg_waiting_for_email_verification" />
28+
tools:background="@drawable/bg_gradient_ftue_breaker" />
2929

3030
<Space
3131
android:id="@+id/resetPasswordBreakerSpace1"

vector/src/main/res/layout/fragment_ftue_wait_for_email_verification.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
android:layout_height="0dp"
2626
app:layout_constraintHeight_percent="0.60"
2727
app:layout_constraintTop_toTopOf="parent"
28-
tools:background="@drawable/bg_waiting_for_email_verification" />
28+
tools:background="@drawable/bg_gradient_ftue_breaker" />
2929

3030
<Space
3131
android:id="@+id/emailVerificationSpace1"

0 commit comments

Comments
 (0)