filippodb/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2025-01-11 09:23:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

renaming xml ids to the email verification domain and attaching the click logic for resending verification emails

Browse Source
This commit is contained in:
Adam Brown 2022-04-27 17:30:15 +01:00
parent 4964c9f151
commit 817d692471
2 changed files with 34 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -25,7 +25,6 @@ import androidx.core.view.isVisible
import com.airbnb.mvrx.args import com.airbnb.mvrx.args
import im.vector.app.R import im.vector.app.R
import im.vector.app.databinding.FragmentFtueWaitForEmailVerificationBinding import im.vector.app.databinding.FragmentFtueWaitForEmailVerificationBinding
import im.vector.app.databinding.FragmentLoginWaitForEmailBinding
import im.vector.app.features.onboarding.OnboardingAction import im.vector.app.features.onboarding.OnboardingAction
import im.vector.app.features.onboarding.RegisterAction import im.vector.app.features.onboarding.RegisterAction
import kotlinx.parcelize.Parcelize import kotlinx.parcelize.Parcelize
@ -54,7 +53,10 @@ class FtueAuthWaitForEmailFragment @Inject constructor() : AbstractFtueAuthFragm
} }
private fun setupUi() { private fun setupUi() {
views.accountCreatedSubtitle.text = getString(R.string.ftue_auth_email_verification_subtitle, params.email) views.emailVerificationSubtitle.text = getString(R.string.ftue_auth_email_verification_subtitle, params.email)
views.emailVerificationResendEmail.debouncedClicks {
viewModel.handle(OnboardingAction.PostRegisterAction(RegisterAction.SendAgainThreePid))
}
} }
override fun onResume() { override fun onResume() {
@ -64,8 +66,8 @@ class FtueAuthWaitForEmailFragment @Inject constructor() : AbstractFtueAuthFragm
} }
private fun showLoadingIfReturningToScreen() { private fun showLoadingIfReturningToScreen() {
when (inferHasLeftAndReturnedToScreen){ when (inferHasLeftAndReturnedToScreen) {
true -> views.accountCreatedWaiting.isVisible = true true -> views.emailVerificationWaiting.isVisible = true
false -> { false -> {
inferHasLeftAndReturnedToScreen = true inferHasLeftAndReturnedToScreen = true
} }

56
vector/src/main/res/layout/fragment_ftue_wait_for_email_verification.xml
View File

@ -20,16 +20,16 @@
app:layout_constraintGuide_percent="@dimen/ftue_auth_gutter_end_percent" /> app:layout_constraintGuide_percent="@dimen/ftue_auth_gutter_end_percent" />
<Space <Space
android:id="@+id/accountCreatedSpace1" android:id="@+id/emailVerificationSpace1"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="0dp" android:layout_height="0dp"
app:layout_constraintBottom_toTopOf="@id/accountCreatedLogo" app:layout_constraintBottom_toTopOf="@id/emailVerificationLogo"
app:layout_constraintHeight_percent="0.10" app:layout_constraintHeight_percent="0.10"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_chainStyle="spread_inside" /> app:layout_constraintVertical_chainStyle="spread_inside" />
<ImageView <ImageView
android:id="@+id/accountCreatedLogo" android:id="@+id/emailVerificationLogo"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="0dp" android:layout_height="0dp"
android:adjustViewBounds="true" android:adjustViewBounds="true"
@ -37,79 +37,79 @@
android:backgroundTint="?colorSecondary" android:backgroundTint="?colorSecondary"
android:importantForAccessibility="no" android:importantForAccessibility="no"
android:src="@drawable/ic_email" android:src="@drawable/ic_email"
app:layout_constraintBottom_toTopOf="@id/accountCreatedSpace2" app:layout_constraintBottom_toTopOf="@id/emailVerificationSpace2"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHeight_percent="0.12" app:layout_constraintHeight_percent="0.12"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/accountCreatedSpace1" /> app:layout_constraintTop_toBottomOf="@id/emailVerificationSpace1" />
<Space <Space
android:id="@+id/accountCreatedSpace2" android:id="@+id/emailVerificationSpace2"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="0dp" android:layout_height="0dp"
app:layout_constraintBottom_toTopOf="@id/accountCreatedTitle" app:layout_constraintBottom_toTopOf="@id/emailVerificationTitle"
app:layout_constraintHeight_percent="0.05" app:layout_constraintHeight_percent="0.05"
app:layout_constraintTop_toBottomOf="@id/accountCreatedLogo" /> app:layout_constraintTop_toBottomOf="@id/emailVerificationLogo" />
<TextView <TextView
android:id="@+id/accountCreatedTitle" android:id="@+id/emailVerificationTitle"
style="@style/Widget.Vector.TextView.Title" style="@style/Widget.Vector.TextView.Title"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="center" android:gravity="center"
android:text="@string/ftue_auth_email_verification_title" android:text="@string/ftue_auth_email_verification_title"
android:transitionName="loginTitleTransition" android:transitionName="loginTitleTransition"
app:layout_constraintBottom_toTopOf="@id/accountCreatedSubtitle" app:layout_constraintBottom_toTopOf="@id/emailVerificationSubtitle"
app:layout_constraintEnd_toEndOf="@id/ftueAuthGutterEnd" app:layout_constraintEnd_toEndOf="@id/ftueAuthGutterEnd"
app:layout_constraintStart_toStartOf="@id/ftueAuthGutterStart" app:layout_constraintStart_toStartOf="@id/ftueAuthGutterStart"
app:layout_constraintTop_toBottomOf="@id/accountCreatedSpace2" /> app:layout_constraintTop_toBottomOf="@id/emailVerificationSpace2" />
<TextView <TextView
android:id="@+id/accountCreatedSubtitle" android:id="@+id/emailVerificationSubtitle"
style="@style/Widget.Vector.TextView.Subtitle" style="@style/Widget.Vector.TextView.Subtitle"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="8dp" android:layout_marginTop="8dp"
android:gravity="center" android:gravity="center"
app:layout_constraintBottom_toTopOf="@id/accountCreatedSpace4" app:layout_constraintBottom_toTopOf="@id/emailVerificationSpace4"
app:layout_constraintEnd_toEndOf="@id/ftueAuthGutterEnd" app:layout_constraintEnd_toEndOf="@id/ftueAuthGutterEnd"
app:layout_constraintStart_toStartOf="@id/ftueAuthGutterStart" app:layout_constraintStart_toStartOf="@id/ftueAuthGutterStart"
app:layout_constraintTop_toBottomOf="@id/accountCreatedTitle" app:layout_constraintTop_toBottomOf="@id/emailVerificationTitle"
tools:text="To confirm your email address, tap the button in the email we just sent to hello@world.org" /> tools:text="To confirm your email address, tap the button in the email we just sent to hello@world.org" />
<Space <Space
android:id="@+id/accountCreatedSpace4" android:id="@+id/emailVerificationSpace4"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="0dp" android:layout_height="0dp"
app:layout_constraintBottom_toTopOf="@id/accountCreatedPersonalize" app:layout_constraintBottom_toTopOf="@id/emailVerificationResendEmail"
app:layout_constraintTop_toBottomOf="@id/accountCreatedSubtitle" /> app:layout_constraintTop_toBottomOf="@id/emailVerificationSubtitle" />
<ProgressBar <ProgressBar
android:id="@+id/accountCreatedWaiting" android:id="@+id/emailVerificationWaiting"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:visibility="gone" android:visibility="gone"
app:layout_constraintBottom_toBottomOf="@id/accountCreatedSpace4" app:layout_constraintBottom_toBottomOf="@id/emailVerificationSpace4"
app:layout_constraintEnd_toEndOf="@id/ftueAuthGutterEnd" app:layout_constraintEnd_toEndOf="@id/ftueAuthGutterEnd"
app:layout_constraintStart_toStartOf="@id/ftueAuthGutterStart" app:layout_constraintStart_toStartOf="@id/ftueAuthGutterStart"
app:layout_constraintTop_toTopOf="@id/accountCreatedSpace4" app:layout_constraintTop_toTopOf="@id/emailVerificationSpace4"
tools:visibility="visible" /> tools:visibility="visible" />
<TextView <TextView
android:id="@+id/accountCreatedFooter" android:id="@+id/emailVerificationFooter"
style="@style/Widget.Vector.TextView.Subtitle" style="@style/Widget.Vector.TextView.Subtitle"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="8dp" android:layout_marginTop="8dp"
android:gravity="center" android:gravity="center"
android:text="@string/ftue_auth_email_verification_footer" android:text="@string/ftue_auth_email_verification_footer"
app:layout_constraintBottom_toTopOf="@id/accountCreatedPersonalize" app:layout_constraintBottom_toTopOf="@id/emailVerificationResendEmail"
app:layout_constraintEnd_toEndOf="@id/ftueAuthGutterEnd" app:layout_constraintEnd_toEndOf="@id/ftueAuthGutterEnd"
app:layout_constraintStart_toStartOf="@id/ftueAuthGutterStart" app:layout_constraintStart_toStartOf="@id/ftueAuthGutterStart"
app:layout_constraintTop_toBottomOf="@id/accountCreatedSpace4" /> app:layout_constraintTop_toBottomOf="@id/emailVerificationSpace4" />
<Button <Button
android:id="@+id/accountCreatedPersonalize" android:id="@+id/emailVerificationResendEmail"
style="@style/Widget.Vector.Button.Text.Login" style="@style/Widget.Vector.Button.Text.Login"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@ -118,17 +118,17 @@
android:textAllCaps="true" android:textAllCaps="true"
android:textColor="?colorSecondary" android:textColor="?colorSecondary"
android:transitionName="loginSubmitTransition" android:transitionName="loginSubmitTransition"
app:layout_constraintBottom_toTopOf="@id/accountCreatedSpace5" app:layout_constraintBottom_toTopOf="@id/emailVerificationSpace5"
app:layout_constraintEnd_toEndOf="@id/ftueAuthGutterEnd" app:layout_constraintEnd_toEndOf="@id/ftueAuthGutterEnd"
app:layout_constraintStart_toStartOf="@id/ftueAuthGutterStart" app:layout_constraintStart_toStartOf="@id/ftueAuthGutterStart"
app:layout_constraintTop_toBottomOf="@id/accountCreatedFooter" /> app:layout_constraintTop_toBottomOf="@id/emailVerificationFooter" />
<Space <Space
android:id="@+id/accountCreatedSpace5" android:id="@+id/emailVerificationSpace5"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="0dp" android:layout_height="0dp"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintHeight_percent="0.05" app:layout_constraintHeight_percent="0.05"
app:layout_constraintTop_toBottomOf="@id/accountCreatedPersonalize" /> app:layout_constraintTop_toBottomOf="@id/emailVerificationResendEmail" />
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>