Merge branch 'version-10.0.0-dev' of https://github.com/firebase/FirebaseUI-Android into feat/P4-e2e

demolaf · demolaf · commit c747bd938dab · 2025-10-27T10:32:36.000+01:00
diff --git a/composeapp/src/main/java/com/firebase/composeapp/HighLevelApiDemoActivity.kt b/composeapp/src/main/java/com/firebase/composeapp/HighLevelApiDemoActivity.kt
@@ -129,7 +129,7 @@ class HighLevelApiDemoActivity : ComponentActivity() {
                         scopes = emptyList(),
                         customParameters = emptyMap(),
                         buttonLabel = "Sign in with LINE",
-                        buttonIcon = AuthUIAsset.Resource(R.drawable.ic_line_logo_24dp),
+                        buttonIcon = AuthUIAsset.Resource(com.firebase.ui.auth.R.drawable.fui_ic_line_24dp),
                         buttonColor = Color(0xFF06C755),
                         contentColor = Color.White
                     )

Original file line number	Diff line number	Diff line change
`@@ -129,7 +129,7 @@ class HighLevelApiDemoActivity : ComponentActivity() {`
`129`	`129`	`scopes = emptyList(),`
`130`	`130`	`customParameters = emptyMap(),`
`131`	`131`	`buttonLabel = "Sign in with LINE",`
`132`		`- buttonIcon = AuthUIAsset.Resource(R.drawable.ic_line_logo_24dp),`
	`132`	`+ buttonIcon = AuthUIAsset.Resource(com.firebase.ui.auth.R.drawable.fui_ic_line_24dp),`
`133`	`133`	`buttonColor = Color(0xFF06C755),`
`134`	`134`	`contentColor = Color.White`
`135`	`135`	`)`