File tree Expand file tree Collapse file tree 4 files changed +2
-29
lines changed
java/com/battlelancer/seriesguide/backend Expand file tree Collapse file tree 4 files changed +2
-29
lines changed Original file line number Diff line number Diff line change @@ -21,6 +21,7 @@ import com.battlelancer.seriesguide.databinding.FragmentCloudSetupBinding
2121import com.battlelancer.seriesguide.sync.SgSyncAdapter
2222import com.battlelancer.seriesguide.sync.SyncProgress
2323import com.battlelancer.seriesguide.traktapi.ConnectTraktActivity
24+ import com.battlelancer.seriesguide.ui.SeriesGuidePreferences
2425import com.battlelancer.seriesguide.util.Errors
2526import com.battlelancer.seriesguide.util.ThemeUtils
2627import com.battlelancer.seriesguide.util.safeShow
@@ -254,10 +255,7 @@ class CloudSetupFragment : Fragment() {
254255 .createSignInIntentBuilder()
255256 .setAvailableProviders(hexagonTools.firebaseSignInProviders)
256257 .setCredentialManagerEnabled(hexagonTools.isGoogleSignInAvailable)
257- // AuthUI is not compatible with edge-to-edge on Android 15 (target SDK 35),
258- // so opt out its activities.
259- // https://github.com/firebase/FirebaseUI-Android/issues/2177
260- .setTheme(R .style.Theme_SeriesGuide_DayNight_OptOutEdgeToEdge )
258+ .setTheme(SeriesGuidePreferences .THEME )
261259 .setAuthMethodPickerLayout(authPickerLayout)
262260 .build()
263261
Load Diff This file was deleted.
Original file line number Diff line number Diff line change 1111
1212 <style name =" Theme.SeriesGuide.DayNight" parent =" Theme.SeriesGuide.Light" />
1313
14- <!--
15- Opts an activity out of enforced edge-to-edge display on Android 15+.
16- https://medium.com/androiddevelopers/insets-handling-tips-for-android-15s-edge-to-edge-enforcement-872774e8839b
17- WARNING This will stop working once targeting Android 16 (SDK 36).
18- https://developer.android.com/about/versions/16/behavior-changes-16#edge-to-edge
19- -->
20- <style name =" Theme.SeriesGuide.DayNight.OptOutEdgeToEdge" >
21- <!-- Only configured on API-level 35 (Android 15) or higher, see values-v35/themes.xml -->
22- </style >
23-
2414 <style name =" Theme.BaseSeriesGuide.Dark" parent =" Theme.Material3.Dark.NoActionBar" >
2515
2616 <!-- All customizations that are SPECIFIC to API-level 23 go here. -->
Original file line number Diff line number Diff line change @@ -17,8 +17,6 @@ plugins {
1717buildscript {
1818 val sgCompileSdk by extra(36 ) // Android 16 (BAKLAVA)
1919 val sgMinSdk by extra(23 ) // Android 6 (M)
20- // WARNING Can not increase to 36 (Android 16) until Theme.SeriesGuide.DayNight.OptOutEdgeToEdge
21- // is no longer used as windowOptOutEdgeToEdgeEnforcement will be ignored (see notes on theme).
2220 val sgTargetSdk by extra(35 ) // Android 15 (VANILLA_ICE_CREAM)
2321
2422 // YYYY.<release-of-year>.<build> - like 2024.1.0
You can’t perform that action at this time.
0 commit comments