Skip to content

Commit 44ba101

Browse files
committed
more screens
1 parent a4defea commit 44ba101

12 files changed

+352
-415
lines changed

auth/build.gradle.kts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@ dependencies {
7575
implementation("androidx.compose.foundation:foundation-android:1.8.1")
7676
implementation("androidx.compose.material3:material3:1.2.1")
7777
implementation("androidx.compose.material3:material3-android:1.3.2")
78+
implementation("androidx.compose.runtime:runtime-livedata:1.8.1")
7879

7980
val composeBom = platform("androidx.compose:compose-bom:2025.02.00")
8081
implementation(composeBom)

auth/src/main/AndroidManifest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@
7070
android:windowSoftInputMode="adjustResize" />
7171

7272
<activity
73-
android:name=".ui.email.WelcomeBackPasswordPrompt"
73+
android:name=".ui.email.WelcomeBackPasswordActivity"
7474
android:label="@string/fui_title_welcome_back_password_prompt"
7575
android:exported="false"
7676
android:windowSoftInputMode="adjustResize" />

auth/src/main/java/com/firebase/ui/auth/ui/email/EmailActivity.kt

Lines changed: 14 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,9 @@ package com.firebase.ui.auth.ui.email
1616
import android.content.Context
1717
import android.content.Intent
1818
import android.os.Bundle
19-
import androidx.activity.ComponentActivity
2019
import androidx.activity.compose.setContent
21-
import androidx.annotation.Nullable
2220
import androidx.annotation.RestrictTo
23-
import androidx.annotation.StringRes
2421
import androidx.compose.runtime.Composable
25-
import androidx.compose.runtime.remember
26-
import androidx.core.view.ViewCompat
27-
import androidx.fragment.app.FragmentTransaction
28-
import androidx.compose.ui.platform.LocalContext
2922
import com.firebase.ui.auth.AuthUI
3023
import com.firebase.ui.auth.ErrorCodes
3124
import com.firebase.ui.auth.FirebaseAuthAnonymousUpgradeException
@@ -46,16 +39,9 @@ import com.google.android.material.textfield.TextInputLayout
4639
import com.google.firebase.auth.ActionCodeSettings
4740
import com.google.firebase.auth.EmailAuthProvider
4841
import com.google.firebase.auth.FirebaseAuthInvalidCredentialsException
49-
import com.google.firebase.auth.FirebaseAuthWeakPasswordException
5042
import androidx.lifecycle.ViewModelProvider
5143

52-
import com.firebase.ui.auth.ui.email.CheckEmailFragment
53-
import com.firebase.ui.auth.ui.email.RegisterEmailFragment
54-
import com.firebase.ui.auth.ui.email.EmailLinkFragment
55-
import com.firebase.ui.auth.ui.email.TroubleSigningInFragment
56-
import com.firebase.ui.auth.ui.email.WelcomeBackPasswordPrompt
57-
import com.firebase.ui.auth.ui.email.CheckEmailScreen
58-
import com.firebase.ui.auth.ui.email.RegisterEmailScreen
44+
import com.firebase.ui.auth.viewmodel.email.RecoverPasswordHandler
5945

6046
/**
6147
* Activity to control the entire email sign up flow. Plays host to {@link CheckEmailFragment} and
@@ -243,11 +229,19 @@ class EmailActivity : AppCompatBase(), RegisterEmailFragment.AnonymousUpgradeLis
243229
}
244230
},
245231
onForgotPassword = {
246-
startActivityForResult(
247-
RecoverPasswordActivity.createIntent(this, getFlowParams(), user.email),
248-
RequestCodes.RECOVER_PASSWORD
249-
)
250-
setSlideAnimation()
232+
setContent {
233+
RecoverPasswordScreen(
234+
flowParameters = getFlowParams(),
235+
initialEmail = user.email,
236+
onSuccess = {
237+
finish(RESULT_OK, Intent())
238+
},
239+
onError = { exception ->
240+
finish(RESULT_CANCELED, IdpResponse.getErrorIntent(exception))
241+
},
242+
viewModel = ViewModelProvider(this@EmailActivity)[RecoverPasswordHandler::class.java]
243+
)
244+
}
251245
},
252246
viewModel = mPasswordHandler
253247
)
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
package com.firebase.ui.auth.ui.email;
2+
3+
/**
4+
* Constants for intent extras used in email-related activities.
5+
*/
6+
public class ExtraConstants {
7+
public static final String FLOW_PARAMS = "extra_flow_params";
8+
public static final String IDP_RESPONSE = "extra_idp_response";
9+
}

auth/src/main/java/com/firebase/ui/auth/ui/email/RecoverPasswordActivity.java

Lines changed: 0 additions & 154 deletions
This file was deleted.

0 commit comments

Comments
 (0)