Skip to content

Commit 318df5a

Browse files
committed
Merge branch 'version-10.0.0-dev' of https://github.com/firebase/FirebaseUI-Android into feat/P2
# Conflicts: # auth/src/main/java/com/firebase/ui/auth/compose/configuration/AuthUIConfiguration.kt # auth/src/main/java/com/firebase/ui/auth/compose/ui/components/AuthProviderButton.kt # auth/src/main/java/com/firebase/ui/auth/compose/ui/method_picker/AuthMethodPicker.kt # auth/src/test/java/com/firebase/ui/auth/compose/configuration/AuthUIConfigurationTest.kt # auth/src/test/java/com/firebase/ui/auth/compose/ui/components/AuthProviderButtonTest.kt # auth/src/test/java/com/firebase/ui/auth/compose/ui/method_picker/AuthMethodPickerTest.kt
2 parents 4ba5e5a + 68df21d commit 318df5a

File tree

4 files changed

+8
-12
lines changed

4 files changed

+8
-12
lines changed

auth/src/main/java/com/firebase/ui/auth/compose/ui/components/AuthProviderButton.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,12 @@ import androidx.compose.ui.Alignment
2121
import androidx.compose.ui.Modifier
2222
import androidx.compose.ui.graphics.Color
2323
import androidx.compose.ui.platform.LocalContext
24+
import androidx.compose.ui.text.style.TextAlign
2425
import androidx.compose.ui.text.style.TextOverflow
2526
import androidx.compose.ui.tooling.preview.Preview
2627
import androidx.compose.ui.unit.dp
27-
import com.firebase.ui.auth.compose.configuration.auth_provider.AuthProvider
28-
import com.firebase.ui.auth.compose.configuration.auth_provider.Provider
28+
import com.firebase.ui.auth.compose.configuration.AuthProvider
29+
import com.firebase.ui.auth.compose.configuration.Provider
2930
import com.firebase.ui.auth.compose.configuration.string_provider.AuthUIStringProvider
3031
import com.firebase.ui.auth.compose.configuration.string_provider.DefaultAuthUIStringProvider
3132
import com.firebase.ui.auth.compose.configuration.theme.AuthUIAsset
@@ -69,8 +70,7 @@ fun AuthProviderButton(
6970
val providerLabel = resolveProviderLabel(provider, stringProvider)
7071

7172
Button(
72-
modifier = modifier
73-
.width(208.dp),
73+
modifier = modifier,
7474
contentPadding = PaddingValues(horizontal = 12.dp),
7575
colors = ButtonDefaults.buttonColors(
7676
containerColor = providerStyle.backgroundColor,

auth/src/main/java/com/firebase/ui/auth/compose/ui/method_picker/AuthMethodPicker.kt

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import androidx.compose.foundation.layout.Column
77
import androidx.compose.foundation.layout.fillMaxSize
88
import androidx.compose.foundation.layout.fillMaxWidth
99
import androidx.compose.foundation.layout.padding
10-
import androidx.compose.foundation.layout.safeDrawingPadding
1110
import androidx.compose.foundation.lazy.LazyColumn
1211
import androidx.compose.foundation.lazy.itemsIndexed
1312
import androidx.compose.runtime.Composable
@@ -20,7 +19,7 @@ import androidx.compose.ui.res.stringResource
2019
import androidx.compose.ui.tooling.preview.Preview
2120
import androidx.compose.ui.unit.dp
2221
import com.firebase.ui.auth.R
23-
import com.firebase.ui.auth.compose.configuration.auth_provider.AuthProvider
22+
import com.firebase.ui.auth.compose.configuration.AuthProvider
2423
import com.firebase.ui.auth.compose.configuration.string_provider.DefaultAuthUIStringProvider
2524
import com.firebase.ui.auth.compose.configuration.theme.AuthUIAsset
2625
import com.firebase.ui.auth.compose.ui.components.AuthProviderButton
@@ -64,9 +63,6 @@ fun AuthMethodPicker(
6463

6564
Column(
6665
modifier = modifier
67-
.fillMaxSize()
68-
.safeDrawingPadding(),
69-
horizontalAlignment = Alignment.CenterHorizontally
7066
) {
7167
logo?.let {
7268
Image(

auth/src/test/java/com/firebase/ui/auth/compose/ui/components/AuthProviderButtonTest.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ import androidx.compose.ui.test.onNodeWithContentDescription
2727
import androidx.compose.ui.test.onNodeWithText
2828
import androidx.compose.ui.test.performClick
2929
import androidx.test.core.app.ApplicationProvider
30-
import com.firebase.ui.auth.compose.configuration.auth_provider.AuthProvider
31-
import com.firebase.ui.auth.compose.configuration.auth_provider.Provider
30+
import com.firebase.ui.auth.compose.configuration.AuthProvider
31+
import com.firebase.ui.auth.compose.configuration.Provider
3232
import com.firebase.ui.auth.compose.configuration.string_provider.AuthUIStringProvider
3333
import com.firebase.ui.auth.compose.configuration.string_provider.DefaultAuthUIStringProvider
3434
import com.firebase.ui.auth.compose.configuration.theme.AuthUIAsset

auth/src/test/java/com/firebase/ui/auth/compose/ui/method_picker/AuthMethodPickerTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import androidx.compose.ui.test.performClick
1515
import androidx.compose.ui.test.performScrollToNode
1616
import androidx.test.core.app.ApplicationProvider
1717
import com.firebase.ui.auth.R
18-
import com.firebase.ui.auth.compose.configuration.auth_provider.AuthProvider
18+
import com.firebase.ui.auth.compose.configuration.AuthProvider
1919
import com.firebase.ui.auth.compose.configuration.theme.AuthUIAsset
2020
import com.google.common.truth.Truth
2121
import org.junit.Before

0 commit comments

Comments
 (0)