Added tests for Component Registrar and declaration in AndroidManifest

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

@@ -15,13 +15,13 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
-import com.firebase.ui.auth.compose.AuthFlowController
-import com.firebase.ui.auth.compose.AuthState
-import com.firebase.ui.auth.compose.FirebaseAuthActivity
-import com.firebase.ui.auth.compose.FirebaseAuthUI
-import com.firebase.ui.auth.compose.configuration.AuthUIConfiguration
-import com.firebase.ui.auth.compose.configuration.PasswordRule
-import com.firebase.ui.auth.compose.configuration.auth_provider.AuthProvider
+import com.firebase.ui.auth.AuthFlowController
+import com.firebase.ui.auth.AuthState
+import com.firebase.ui.auth.FirebaseAuthActivity
+import com.firebase.ui.auth.FirebaseAuthUI
+import com.firebase.ui.auth.configuration.AuthUIConfiguration
+import com.firebase.ui.auth.configuration.PasswordRule
+import com.firebase.ui.auth.configuration.auth_provider.AuthProvider
 import com.google.firebase.auth.FirebaseAuth
 import com.google.firebase.auth.actionCodeSettings
 import kotlinx.coroutines.launch

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

@@ -17,20 +17,20 @@ import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.text.input.PasswordVisualTransformation
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
-import com.firebase.ui.auth.compose.AuthException
-import com.firebase.ui.auth.compose.FirebaseAuthUI
-import com.firebase.ui.auth.compose.configuration.PasswordRule
-import com.firebase.ui.auth.compose.configuration.authUIConfiguration
-import com.firebase.ui.auth.compose.configuration.auth_provider.AuthProvider
-import com.firebase.ui.auth.compose.configuration.string_provider.LocalAuthUIStringProvider
-import com.firebase.ui.auth.compose.configuration.theme.AuthUIAsset
-import com.firebase.ui.auth.compose.configuration.theme.AuthUITheme
-import com.firebase.ui.auth.compose.ui.screens.email.EmailAuthContentState
-import com.firebase.ui.auth.compose.ui.screens.email.EmailAuthMode
-import com.firebase.ui.auth.compose.ui.screens.email.EmailAuthScreen
-import com.firebase.ui.auth.compose.ui.screens.phone.PhoneAuthContentState
-import com.firebase.ui.auth.compose.ui.screens.phone.PhoneAuthScreen
-import com.firebase.ui.auth.compose.ui.screens.phone.PhoneAuthStep
+import com.firebase.ui.auth.AuthException
+import com.firebase.ui.auth.FirebaseAuthUI
+import com.firebase.ui.auth.configuration.AuthUIConfiguration
+import com.firebase.ui.auth.configuration.PasswordRule
+import com.firebase.ui.auth.configuration.authUIConfiguration
+import com.firebase.ui.auth.configuration.auth_provider.AuthProvider
+import com.firebase.ui.auth.configuration.string_provider.LocalAuthUIStringProvider
+import com.firebase.ui.auth.configuration.theme.AuthUITheme
+import com.firebase.ui.auth.ui.screens.email.EmailAuthContentState
+import com.firebase.ui.auth.ui.screens.email.EmailAuthMode
+import com.firebase.ui.auth.ui.screens.email.EmailAuthScreen
+import com.firebase.ui.auth.ui.screens.phone.PhoneAuthContentState
+import com.firebase.ui.auth.ui.screens.phone.PhoneAuthScreen
+import com.firebase.ui.auth.ui.screens.phone.PhoneAuthStep
 import com.google.firebase.auth.AuthResult
 
 /**
@@ -96,7 +96,7 @@ class CustomSlotsThemingDemoActivity : ComponentActivity() {
                     modifier = Modifier.fillMaxSize(),
                     color = MaterialTheme.colorScheme.background
                 ) {
-                    var selectedDemo by remember { mutableStateOf<DemoType>(DemoType.Email) }
+                    var selectedDemo by remember { mutableStateOf(DemoType.Email) }
 
                     Column(
                         modifier = Modifier
@@ -226,7 +226,7 @@ fun DemoSelector(
 @Composable
 fun EmailAuthDemo(
     authUI: FirebaseAuthUI,
-    configuration: com.firebase.ui.auth.compose.configuration.AuthUIConfiguration,
+    configuration: AuthUIConfiguration,
     context: android.content.Context
 ) {
     var currentUser by remember { mutableStateOf(authUI.getCurrentUser()) }
@@ -563,7 +563,7 @@ fun ResetPasswordUI(state: EmailAuthContentState) {
 @Composable
 fun PhoneAuthDemo(
     authUI: FirebaseAuthUI,
-    configuration: com.firebase.ui.auth.compose.configuration.AuthUIConfiguration,
+    configuration: AuthUIConfiguration,
     context: android.content.Context
 ) {
     var currentUser by remember { mutableStateOf(authUI.getCurrentUser()) }

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

@@ -21,17 +21,17 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
-import com.firebase.ui.auth.compose.AuthException
-import com.firebase.ui.auth.compose.AuthState
-import com.firebase.ui.auth.compose.FirebaseAuthUI
-import com.firebase.ui.auth.compose.configuration.PasswordRule
-import com.firebase.ui.auth.compose.configuration.authUIConfiguration
-import com.firebase.ui.auth.compose.configuration.auth_provider.AuthProvider
-import com.firebase.ui.auth.compose.configuration.theme.AuthUIAsset
-import com.firebase.ui.auth.compose.configuration.theme.AuthUITheme
-import com.firebase.ui.auth.compose.ui.screens.AuthSuccessUiContext
-import com.firebase.ui.auth.compose.ui.screens.FirebaseAuthScreen
-import com.firebase.ui.auth.compose.util.EmailLinkConstants
+import com.firebase.ui.auth.AuthException
+import com.firebase.ui.auth.AuthState
+import com.firebase.ui.auth.FirebaseAuthUI
+import com.firebase.ui.auth.configuration.PasswordRule
+import com.firebase.ui.auth.configuration.authUIConfiguration
+import com.firebase.ui.auth.configuration.auth_provider.AuthProvider
+import com.firebase.ui.auth.configuration.theme.AuthUIAsset
+import com.firebase.ui.auth.configuration.theme.AuthUITheme
+import com.firebase.ui.auth.ui.screens.AuthSuccessUiContext
+import com.firebase.ui.auth.ui.screens.FirebaseAuthScreen
+import com.firebase.ui.auth.util.EmailLinkConstants
 import com.google.firebase.auth.actionCodeSettings
 
 class HighLevelApiDemoActivity : ComponentActivity() {

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

@@ -26,8 +26,8 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
-import com.firebase.ui.auth.compose.FirebaseAuthUI
-import com.firebase.ui.auth.compose.util.EmailLinkConstants
+import com.firebase.ui.auth.FirebaseAuthUI
+import com.firebase.ui.auth.util.EmailLinkConstants
 import com.google.firebase.FirebaseApp
 
 /**

auth/MIGRATION.md

@@ -397,7 +397,7 @@ class AuthActivity : ComponentActivity() {
 
 **Solution:** Ensure you have the correct import:
 ```kotlin
-import com.firebase.ui.auth.compose.configuration.authUIConfiguration
+import com.firebase.ui.auth.configuration.authUIConfiguration
 ```
 
 ### Issue: "ActivityResultLauncher is deprecated"

auth/README.md

@@ -1136,7 +1136,7 @@ override fun onCreate(savedInstanceState: Bundle?) {
 **Low-Level API** - Using `AuthFlowController`:
 
 ```kotlin
-import com.firebase.ui.auth.compose.util.EmailLinkConstants
+import com.firebase.ui.auth.util.EmailLinkConstants
 
 // In your Activity that handles the deep link:
 override fun onCreate(savedInstanceState: Bundle?) {

auth/src/main/AndroidManifest.xml

@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools">
 
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.INTERNET" />
@@ -20,7 +18,7 @@
 
         <service android:name="com.google.firebase.components.ComponentDiscoveryService">
             <meta-data
-                android:name="com.google.firebase.components:com.firebase.ui.auth.compose.FirebaseUIComposeRegistrar"
+                android:name="com.google.firebase.components:com.firebase.ui.auth.FirebaseUIComposeRegistrar"
                 android:value="com.google.firebase.components.ComponentRegistrar" />
         </service>
 
@@ -37,7 +35,7 @@
             android:value="@string/facebook_client_token"/>
 
         <activity
-            android:name=".compose.FirebaseAuthActivity"
+            android:name=".FirebaseAuthActivity"
             android:label=""
             android:exported="false" />
 

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

@@ -12,9 +12,9 @@
  * limitations under the License.
  */
 
-package com.firebase.ui.auth.compose
+package com.firebase.ui.auth
 
-import com.firebase.ui.auth.compose.AuthException.Companion.from
+import com.firebase.ui.auth.AuthException.Companion.from
 import com.google.firebase.FirebaseException
 import com.google.firebase.auth.AuthCredential
 import com.google.firebase.auth.FirebaseAuthException

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

@@ -12,13 +12,13 @@
  * limitations under the License.
  */
 
-package com.firebase.ui.auth.compose
+package com.firebase.ui.auth
 
 import android.app.Activity
 import android.content.Context
 import android.content.Intent
 import androidx.activity.result.ActivityResultLauncher
-import com.firebase.ui.auth.compose.configuration.AuthUIConfiguration
+import com.firebase.ui.auth.configuration.AuthUIConfiguration
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job

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

@@ -12,10 +12,10 @@
  * limitations under the License.
  */
 
-package com.firebase.ui.auth.compose
+package com.firebase.ui.auth
 
-import com.firebase.ui.auth.compose.AuthState.Companion.Cancelled
-import com.firebase.ui.auth.compose.AuthState.Companion.Idle
+import com.firebase.ui.auth.AuthState.Companion.Cancelled
+import com.firebase.ui.auth.AuthState.Companion.Idle
 import com.google.firebase.auth.AuthResult
 import com.google.firebase.auth.FirebaseUser
 import com.google.firebase.auth.MultiFactorResolver

auth/src/main/java/com/firebase/ui/auth/FirebaseAuthActivity.kt

@@ -12,7 +12,7 @@
  * limitations under the License.
  */
 
-package com.firebase.ui.auth.compose
+package com.firebase.ui.auth
 
 import android.app.Activity
 import android.content.Context
@@ -22,10 +22,10 @@ import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
 import androidx.activity.enableEdgeToEdge
 import androidx.lifecycle.lifecycleScope
-import com.firebase.ui.auth.compose.configuration.AuthUIConfiguration
-import com.firebase.ui.auth.compose.configuration.theme.AuthUITheme
-import com.firebase.ui.auth.compose.ui.screens.FirebaseAuthScreen
-import com.firebase.ui.auth.compose.util.EmailLinkConstants
+import com.firebase.ui.auth.configuration.AuthUIConfiguration
+import com.firebase.ui.auth.configuration.theme.AuthUITheme
+import com.firebase.ui.auth.ui.screens.FirebaseAuthScreen
+import com.firebase.ui.auth.util.EmailLinkConstants
 import kotlinx.coroutines.launch
 import java.util.UUID
 import java.util.concurrent.ConcurrentHashMap
@@ -158,23 +158,23 @@ class FirebaseAuthActivity : ComponentActivity() {
     }
 
     companion object {
-        private const val EXTRA_CONFIGURATION_KEY = "com.firebase.ui.auth.compose.CONFIGURATION_KEY"
+        private const val EXTRA_CONFIGURATION_KEY = "com.firebase.ui.auth.CONFIGURATION_KEY"
 
         /**
          * Intent extra key for user ID on successful sign-in.
          * Use [com.google.firebase.auth.FirebaseAuth.getInstance().currentUser] to get the full user object.
          */
-        const val EXTRA_USER_ID = "com.firebase.ui.auth.compose.USER_ID"
+        const val EXTRA_USER_ID = "com.firebase.ui.auth.USER_ID"
 
         /**
          * Intent extra key for isNewUser flag on successful sign-in.
          */
-        const val EXTRA_IS_NEW_USER = "com.firebase.ui.auth.compose.IS_NEW_USER"
+        const val EXTRA_IS_NEW_USER = "com.firebase.ui.auth.IS_NEW_USER"
 
         /**
          * Intent extra key for [AuthException] on error.
          */
-        const val EXTRA_ERROR = "com.firebase.ui.auth.compose.ERROR"
+        const val EXTRA_ERROR = "com.firebase.ui.auth.ERROR"
 
         /**
          * Cache for configurations passed through Intents.

auth/src/main/java/com/firebase/ui/auth/FirebaseAuthUI.kt

@@ -12,14 +12,14 @@
  * limitations under the License.
  */
 
-package com.firebase.ui.auth.compose
+package com.firebase.ui.auth
 
 import android.content.Context
 import android.content.Intent
 import androidx.annotation.RestrictTo
-import com.firebase.ui.auth.compose.configuration.AuthUIConfiguration
-import com.firebase.ui.auth.compose.configuration.auth_provider.AuthProvider
-import com.firebase.ui.auth.compose.configuration.auth_provider.signOutFromGoogle
+import com.firebase.ui.auth.configuration.AuthUIConfiguration
+import com.firebase.ui.auth.configuration.auth_provider.AuthProvider
+import com.firebase.ui.auth.configuration.auth_provider.signOutFromGoogle
 import com.google.firebase.FirebaseApp
 import com.google.firebase.auth.FirebaseAuth
 import com.google.firebase.auth.FirebaseAuth.AuthStateListener

auth/src/main/java/com/firebase/ui/auth/FirebaseUIComposeRegistrar.kt

@@ -12,8 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.firebase.ui.auth.compose
+package com.firebase.ui.auth
 
+import android.util.Log
 import androidx.annotation.Keep
 import com.firebase.ui.auth.BuildConfig
 import com.google.firebase.components.Component
@@ -27,6 +28,7 @@ import com.google.firebase.platforminfo.LibraryVersionComponent
 @Keep
 class FirebaseUIComposeRegistrar : ComponentRegistrar {
     override fun getComponents(): List<Component<*>> {
+        Log.d("FirebaseUIRegistrar", "FirebaseUI Compose Registrar initialized")
         return listOf(
             LibraryVersionComponent.create(BuildConfig.LIBRARY_NAME, BuildConfig.VERSION_NAME)
         )

auth/src/main/java/com/firebase/ui/auth/configuration/AuthUIConfiguration.kt

@@ -12,17 +12,17 @@
  * limitations under the License.
  */
 
-package com.firebase.ui.auth.compose.configuration
+package com.firebase.ui.auth.configuration
 
 import android.content.Context
 import androidx.compose.ui.graphics.vector.ImageVector
-import com.firebase.ui.auth.compose.configuration.auth_provider.AuthProvider
-import com.firebase.ui.auth.compose.configuration.auth_provider.AuthProvidersBuilder
-import com.firebase.ui.auth.compose.configuration.auth_provider.Provider
-import com.firebase.ui.auth.compose.configuration.string_provider.AuthUIStringProvider
-import com.firebase.ui.auth.compose.configuration.string_provider.DefaultAuthUIStringProvider
-import com.firebase.ui.auth.compose.configuration.theme.AuthUIAsset
-import com.firebase.ui.auth.compose.configuration.theme.AuthUITheme
+import com.firebase.ui.auth.configuration.auth_provider.AuthProvider
+import com.firebase.ui.auth.configuration.auth_provider.AuthProvidersBuilder
+import com.firebase.ui.auth.configuration.auth_provider.Provider
+import com.firebase.ui.auth.configuration.string_provider.AuthUIStringProvider
+import com.firebase.ui.auth.configuration.string_provider.DefaultAuthUIStringProvider
+import com.firebase.ui.auth.configuration.theme.AuthUIAsset
+import com.firebase.ui.auth.configuration.theme.AuthUITheme
 import com.google.firebase.auth.ActionCodeSettings
 import java.util.Locale
 

auth/src/main/java/com/firebase/ui/auth/configuration/MfaConfiguration.kt

@@ -12,7 +12,7 @@
  * limitations under the License.
  */
 
-package com.firebase.ui.auth.compose.configuration
+package com.firebase.ui.auth.configuration
 
 /**
  * Configuration class for Multi-Factor Authentication (MFA) enrollment and verification behavior.

auth/src/main/java/com/firebase/ui/auth/configuration/MfaFactor.kt

@@ -12,7 +12,7 @@
  * limitations under the License.
  */
 
-package com.firebase.ui.auth.compose.configuration
+package com.firebase.ui.auth.configuration
 
 /**
  * Represents the different Multi-Factor Authentication (MFA) factors that can be used

auth/src/main/java/com/firebase/ui/auth/configuration/PasswordRule.kt

@@ -12,13 +12,13 @@
  * limitations under the License.
  */
 
-package com.firebase.ui.auth.compose.configuration
+package com.firebase.ui.auth.configuration
 
-import com.firebase.ui.auth.compose.configuration.string_provider.AuthUIStringProvider
+import com.firebase.ui.auth.configuration.string_provider.AuthUIStringProvider
 
 /**
  * An abstract class representing a set of validation rules that can be applied to a password field,
- * typically within the [com.firebase.ui.auth.compose.configuration.auth_provider.AuthProvider.Email] configuration.
+ * typically within the [com.firebase.ui.auth.configuration.auth_provider.AuthProvider.Email] configuration.
  */
 abstract class PasswordRule {
     /**

auth/src/main/java/com/firebase/ui/auth/configuration/auth_provider/AnonymousAuthProvider+FirebaseAuthUI.kt

@@ -1,11 +1,11 @@
-package com.firebase.ui.auth.compose.configuration.auth_provider
+package com.firebase.ui.auth.configuration.auth_provider
 
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
-import com.firebase.ui.auth.compose.AuthException
-import com.firebase.ui.auth.compose.AuthState
-import com.firebase.ui.auth.compose.FirebaseAuthUI
+import com.firebase.ui.auth.AuthException
+import com.firebase.ui.auth.AuthState
+import com.firebase.ui.auth.FirebaseAuthUI
 import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.tasks.await