Skip to content

Commit e7a17f8

Browse files
demolafdemolaf
committed
Merge branch 'version-10.0.0-dev' of https://github.com/firebase/FirebaseUI-Android into version-10.0.0-dev
2 parents dff537a + 2c0aef9 commit e7a17f8

File tree

126 files changed

+769
-648
lines changed

Some content is hidden

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

126 files changed

+769
-648
lines changed

‎app/src/main/java/com/firebase/uidemo/AuthFlowControllerDemoActivity.kt‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@ import androidx.compose.ui.Alignment
1515
import androidx.compose.ui.Modifier
1616
import androidx.compose.ui.text.style.TextAlign
1717
import androidx.compose.ui.unit.dp
18-
import com.firebase.ui.auth.compose.AuthFlowController
19-
import com.firebase.ui.auth.compose.AuthState
20-
import com.firebase.ui.auth.compose.FirebaseAuthActivity
21-
import com.firebase.ui.auth.compose.FirebaseAuthUI
22-
import com.firebase.ui.auth.compose.configuration.AuthUIConfiguration
23-
import com.firebase.ui.auth.compose.configuration.PasswordRule
24-
import com.firebase.ui.auth.compose.configuration.auth_provider.AuthProvider
18+
import com.firebase.ui.auth.AuthFlowController
19+
import com.firebase.ui.auth.AuthState
20+
import com.firebase.ui.auth.FirebaseAuthActivity
21+
import com.firebase.ui.auth.FirebaseAuthUI
22+
import com.firebase.ui.auth.configuration.AuthUIConfiguration
23+
import com.firebase.ui.auth.configuration.PasswordRule
24+
import com.firebase.ui.auth.configuration.auth_provider.AuthProvider
2525
import com.google.firebase.auth.FirebaseAuth
2626
import com.google.firebase.auth.actionCodeSettings
2727
import kotlinx.coroutines.launch

‎app/src/main/java/com/firebase/uidemo/CustomSlotsThemingDemoActivity.kt‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -17,20 +17,20 @@ import androidx.compose.ui.graphics.Color
1717
import androidx.compose.ui.text.input.PasswordVisualTransformation
1818
import androidx.compose.ui.text.style.TextAlign
1919
import androidx.compose.ui.unit.dp
20-
import com.firebase.ui.auth.compose.AuthException
21-
import com.firebase.ui.auth.compose.FirebaseAuthUI
22-
import com.firebase.ui.auth.compose.configuration.PasswordRule
23-
import com.firebase.ui.auth.compose.configuration.authUIConfiguration
24-
import com.firebase.ui.auth.compose.configuration.auth_provider.AuthProvider
25-
import com.firebase.ui.auth.compose.configuration.string_provider.LocalAuthUIStringProvider
26-
import com.firebase.ui.auth.compose.configuration.theme.AuthUIAsset
27-
import com.firebase.ui.auth.compose.configuration.theme.AuthUITheme
28-
import com.firebase.ui.auth.compose.ui.screens.email.EmailAuthContentState
29-
import com.firebase.ui.auth.compose.ui.screens.email.EmailAuthMode
30-
import com.firebase.ui.auth.compose.ui.screens.email.EmailAuthScreen
31-
import com.firebase.ui.auth.compose.ui.screens.phone.PhoneAuthContentState
32-
import com.firebase.ui.auth.compose.ui.screens.phone.PhoneAuthScreen
33-
import com.firebase.ui.auth.compose.ui.screens.phone.PhoneAuthStep
20+
import com.firebase.ui.auth.AuthException
21+
import com.firebase.ui.auth.FirebaseAuthUI
22+
import com.firebase.ui.auth.configuration.AuthUIConfiguration
23+
import com.firebase.ui.auth.configuration.PasswordRule
24+
import com.firebase.ui.auth.configuration.authUIConfiguration
25+
import com.firebase.ui.auth.configuration.auth_provider.AuthProvider
26+
import com.firebase.ui.auth.configuration.string_provider.LocalAuthUIStringProvider
27+
import com.firebase.ui.auth.configuration.theme.AuthUITheme
28+
import com.firebase.ui.auth.ui.screens.email.EmailAuthContentState
29+
import com.firebase.ui.auth.ui.screens.email.EmailAuthMode
30+
import com.firebase.ui.auth.ui.screens.email.EmailAuthScreen
31+
import com.firebase.ui.auth.ui.screens.phone.PhoneAuthContentState
32+
import com.firebase.ui.auth.ui.screens.phone.PhoneAuthScreen
33+
import com.firebase.ui.auth.ui.screens.phone.PhoneAuthStep
3434
import com.google.firebase.auth.AuthResult
3535

3636
/**
@@ -96,7 +96,7 @@ class CustomSlotsThemingDemoActivity : ComponentActivity() {
9696
modifier = Modifier.fillMaxSize(),
9797
color = MaterialTheme.colorScheme.background
9898
) {
99-
var selectedDemo by remember { mutableStateOf<DemoType>(DemoType.Email) }
99+
var selectedDemo by remember { mutableStateOf(DemoType.Email) }
100100

101101
Column(
102102
modifier = Modifier
@@ -226,7 +226,7 @@ fun DemoSelector(
226226
@Composable
227227
fun EmailAuthDemo(
228228
authUI: FirebaseAuthUI,
229-
configuration: com.firebase.ui.auth.compose.configuration.AuthUIConfiguration,
229+
configuration: AuthUIConfiguration,
230230
context: android.content.Context
231231
) {
232232
var currentUser by remember { mutableStateOf(authUI.getCurrentUser()) }
@@ -563,7 +563,7 @@ fun ResetPasswordUI(state: EmailAuthContentState) {
563563
@Composable
564564
fun PhoneAuthDemo(
565565
authUI: FirebaseAuthUI,
566-
configuration: com.firebase.ui.auth.compose.configuration.AuthUIConfiguration,
566+
configuration: AuthUIConfiguration,
567567
context: android.content.Context
568568
) {
569569
var currentUser by remember { mutableStateOf(authUI.getCurrentUser()) }

‎app/src/main/java/com/firebase/uidemo/HighLevelApiDemoActivity.kt‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -21,17 +21,17 @@ import androidx.compose.ui.Modifier
2121
import androidx.compose.ui.graphics.Color
2222
import androidx.compose.ui.text.style.TextAlign
2323
import androidx.compose.ui.unit.dp
24-
import com.firebase.ui.auth.compose.AuthException
25-
import com.firebase.ui.auth.compose.AuthState
26-
import com.firebase.ui.auth.compose.FirebaseAuthUI
27-
import com.firebase.ui.auth.compose.configuration.PasswordRule
28-
import com.firebase.ui.auth.compose.configuration.authUIConfiguration
29-
import com.firebase.ui.auth.compose.configuration.auth_provider.AuthProvider
30-
import com.firebase.ui.auth.compose.configuration.theme.AuthUIAsset
31-
import com.firebase.ui.auth.compose.configuration.theme.AuthUITheme
32-
import com.firebase.ui.auth.compose.ui.screens.AuthSuccessUiContext
33-
import com.firebase.ui.auth.compose.ui.screens.FirebaseAuthScreen
34-
import com.firebase.ui.auth.compose.util.EmailLinkConstants
24+
import com.firebase.ui.auth.AuthException
25+
import com.firebase.ui.auth.AuthState
26+
import com.firebase.ui.auth.FirebaseAuthUI
27+
import com.firebase.ui.auth.configuration.PasswordRule
28+
import com.firebase.ui.auth.configuration.authUIConfiguration
29+
import com.firebase.ui.auth.configuration.auth_provider.AuthProvider
30+
import com.firebase.ui.auth.configuration.theme.AuthUIAsset
31+
import com.firebase.ui.auth.configuration.theme.AuthUITheme
32+
import com.firebase.ui.auth.ui.screens.AuthSuccessUiContext
33+
import com.firebase.ui.auth.ui.screens.FirebaseAuthScreen
34+
import com.firebase.ui.auth.util.EmailLinkConstants
3535
import com.google.firebase.auth.actionCodeSettings
3636

3737
class HighLevelApiDemoActivity : ComponentActivity() {

‎app/src/main/java/com/firebase/uidemo/MainActivity.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ import androidx.compose.ui.Alignment
2626
import androidx.compose.ui.Modifier
2727
import androidx.compose.ui.text.style.TextAlign
2828
import androidx.compose.ui.unit.dp
29-
import com.firebase.ui.auth.compose.FirebaseAuthUI
30-
import com.firebase.ui.auth.compose.util.EmailLinkConstants
29+
import com.firebase.ui.auth.FirebaseAuthUI
30+
import com.firebase.ui.auth.util.EmailLinkConstants
3131
import com.google.firebase.FirebaseApp
3232

3333
/**

‎auth/MIGRATION.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -397,7 +397,7 @@ class AuthActivity : ComponentActivity() {
397397

398398
**Solution:** Ensure you have the correct import:
399399
```kotlin
400-
import com.firebase.ui.auth.compose.configuration.authUIConfiguration
400+
import com.firebase.ui.auth.configuration.authUIConfiguration
401401
```
402402

403403
### Issue: "ActivityResultLauncher is deprecated"

‎auth/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1136,7 +1136,7 @@ override fun onCreate(savedInstanceState: Bundle?) {
11361136
**Low-Level API** - Using `AuthFlowController`:
11371137

11381138
```kotlin
1139-
import com.firebase.ui.auth.compose.util.EmailLinkConstants
1139+
import com.firebase.ui.auth.util.EmailLinkConstants
11401140

11411141
// In your Activity that handles the deep link:
11421142
override fun onCreate(savedInstanceState: Bundle?) {

‎auth/src/main/AndroidManifest.xml‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<manifest
3-
xmlns:android="http://schemas.android.com/apk/res/android"
4-
xmlns:tools="http://schemas.android.com/tools"
5-
>
2+
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3+
xmlns:tools="http://schemas.android.com/tools">
64

75
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
86
<uses-permission android:name="android.permission.INTERNET" />
@@ -20,7 +18,7 @@
2018

2119
<service android:name="com.google.firebase.components.ComponentDiscoveryService">
2220
<meta-data
23-
android:name="com.google.firebase.components:com.firebase.ui.auth.compose.FirebaseUIComposeRegistrar"
21+
android:name="com.google.firebase.components:com.firebase.ui.auth.FirebaseUIComposeRegistrar"
2422
android:value="com.google.firebase.components.ComponentRegistrar" />
2523
</service>
2624

@@ -37,7 +35,7 @@
3735
android:value="@string/facebook_client_token"/>
3836

3937
<activity
40-
android:name=".compose.FirebaseAuthActivity"
38+
android:name=".FirebaseAuthActivity"
4139
android:label=""
4240
android:exported="false" />
4341

‎auth/src/main/java/com/firebase/ui/auth/AuthException.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@
1212
* limitations under the License.
1313
*/
1414

15-
package com.firebase.ui.auth.compose
15+
package com.firebase.ui.auth
1616

17-
import com.firebase.ui.auth.compose.AuthException.Companion.from
17+
import com.firebase.ui.auth.AuthException.Companion.from
1818
import com.google.firebase.FirebaseException
1919
import com.google.firebase.auth.AuthCredential
2020
import com.google.firebase.auth.FirebaseAuthException

‎auth/src/main/java/com/firebase/ui/auth/AuthFlowController.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@
1212
* limitations under the License.
1313
*/
1414

15-
package com.firebase.ui.auth.compose
15+
package com.firebase.ui.auth
1616

1717
import android.app.Activity
1818
import android.content.Context
1919
import android.content.Intent
2020
import androidx.activity.result.ActivityResultLauncher
21-
import com.firebase.ui.auth.compose.configuration.AuthUIConfiguration
21+
import com.firebase.ui.auth.configuration.AuthUIConfiguration
2222
import kotlinx.coroutines.CoroutineScope
2323
import kotlinx.coroutines.Dispatchers
2424
import kotlinx.coroutines.Job

‎auth/src/main/java/com/firebase/ui/auth/AuthState.kt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@
1212
* limitations under the License.
1313
*/
1414

15-
package com.firebase.ui.auth.compose
15+
package com.firebase.ui.auth
1616

17-
import com.firebase.ui.auth.compose.AuthState.Companion.Cancelled
18-
import com.firebase.ui.auth.compose.AuthState.Companion.Idle
17+
import com.firebase.ui.auth.AuthState.Companion.Cancelled
18+
import com.firebase.ui.auth.AuthState.Companion.Idle
1919
import com.google.firebase.auth.AuthResult
2020
import com.google.firebase.auth.FirebaseUser
2121
import com.google.firebase.auth.MultiFactorResolver

0 commit comments

Comments
 (0)