Skip to content

Commit 141bb1b

Browse files
committed
Merge branch 'version-10.0.0-beta01' of https://github.com/firebase/FirebaseUI-Android into fix-fb-auth
2 parents d0c1615 + 7503edb commit 141bb1b

File tree

123 files changed

+3530
-304
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

123 files changed

+3530
-304
lines changed

app/src/main/java/com/firebaseui/android/demo/CustomSlotsThemingDemoActivity.kt

Lines changed: 321 additions & 41 deletions
Large diffs are not rendered by default.

app/src/main/java/com/firebaseui/android/demo/HighLevelApiDemoActivity.kt

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ import android.util.Log
55
import androidx.activity.ComponentActivity
66
import androidx.activity.compose.setContent
77
import androidx.activity.enableEdgeToEdge
8+
import androidx.compose.animation.slideInHorizontally
9+
import androidx.compose.animation.slideOutHorizontally
810
import androidx.compose.foundation.layout.Arrangement
911
import androidx.compose.foundation.layout.Column
1012
import androidx.compose.foundation.layout.Spacer
@@ -13,6 +15,7 @@ import androidx.compose.foundation.layout.height
1315
import androidx.compose.material3.Button
1416
import androidx.compose.material3.CircularProgressIndicator
1517
import androidx.compose.material3.MaterialTheme
18+
import androidx.compose.material3.ShapeDefaults
1619
import androidx.compose.material3.Surface
1720
import androidx.compose.material3.Text
1821
import androidx.compose.runtime.Composable
@@ -24,6 +27,7 @@ import androidx.compose.ui.unit.dp
2427
import com.firebase.ui.auth.AuthException
2528
import com.firebase.ui.auth.AuthState
2629
import com.firebase.ui.auth.FirebaseAuthUI
30+
import com.firebase.ui.auth.configuration.AuthUITransitions
2731
import com.firebase.ui.auth.configuration.PasswordRule
2832
import com.firebase.ui.auth.configuration.authUIConfiguration
2933
import com.firebase.ui.auth.configuration.auth_provider.AuthProvider
@@ -42,12 +46,23 @@ class HighLevelApiDemoActivity : ComponentActivity() {
4246
val authUI = FirebaseAuthUI.getInstance()
4347
val emailLink = intent.getStringExtra(EmailLinkConstants.EXTRA_EMAIL_LINK)
4448

49+
val customTheme = AuthUITheme.Default.copy(
50+
providerButtonShape = ShapeDefaults.ExtraLarge
51+
)
52+
4553
val configuration = authUIConfiguration {
4654
context = applicationContext
55+
theme = customTheme
4756
logo = AuthUIAsset.Resource(R.drawable.firebase_auth)
4857
tosUrl = "https://policies.google.com/terms"
4958
privacyPolicyUrl = "https://policies.google.com/privacy"
5059
isAnonymousUpgradeEnabled = false
60+
transitions = AuthUITransitions(
61+
enterTransition = { slideInHorizontally { it } },
62+
exitTransition = { slideOutHorizontally { -it } },
63+
popEnterTransition = { slideInHorizontally { -it } },
64+
popExitTransition = { slideOutHorizontally { it } }
65+
)
5166
providers {
5267
provider(AuthProvider.Anonymous)
5368
provider(

app/src/main/java/com/firebaseui/android/demo/MainActivity.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ import com.google.firebase.FirebaseApp
3636
*/
3737
class MainActivity : ComponentActivity() {
3838
companion object {
39-
private const val USE_AUTH_EMULATOR = false
39+
private const val USE_AUTH_EMULATOR = true
4040
private const val AUTH_EMULATOR_HOST = "10.0.2.2"
4141
private const val AUTH_EMULATOR_PORT = 9099
4242
}

0 commit comments

Comments
 (0)