Commit 5e6d6265 authored by Thomas's avatar Thomas
Browse files

- Migrate to targetSdk 35 with edge-to-edge opt-out

parent e3b8676f

app/build.gradle

+3 −2
Original line number Diff line number Diff line
@@ -8,11 +8,11 @@ plugins { 
}

def flavor

android {

    compileSdk 34

    compileSdk 35



    defaultConfig {

        minSdk 21

        targetSdk 34

        targetSdk 35

        versionCode 540

        versionName "3.35.1"

        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -105,6 +105,7 @@ dependencies { 
    playstoreImplementation('org.unifiedpush.android:embedded-fcm-distributor:3.0.0')



    implementation 'androidx.appcompat:appcompat:1.7.0'

    implementation 'androidx.activity:activity:1.9.3'



    implementation 'com.google.android.material:material:1.10.0'

app/src/main/java/app/fedilab/android/peertube/services/RetrieveInfoService.java

+5 −0
Original line number Diff line number Diff line
@@ -160,4 +160,9 @@ public class RetrieveInfoService extends Service implements NetworkStateReceiver 
    public void networkUnavailable() {



    }



    @Override

    public void onTimeout(int startId, int fgsType) {

        stopSelf();

    }

}

app/src/main/res/values-night/themes.xml

+2 −0
Original line number Diff line number Diff line
@@ -46,11 +46,13 @@ 
        </item>

        <item name="android:windowSharedElementExitTransition">@transition/change_image_transform

        </item>

        <item name="android:windowOptOutEdgeToEdgeEnforcement" tools:targetApi="35">true</item>

        <item name="alertDialogTheme">@style/AppThemeAlertDialog</item>

    </style>



    <style name="AppThemeBar" parent="Theme.Material3.Dark">

        <item name="android:statusBarColor">?android:colorBackground</item>

        <item name="android:windowOptOutEdgeToEdgeEnforcement" tools:targetApi="35">true</item>

        <item name="linkColor">@color/md_theme_dark_primary</item>

        <item name="colorPrimary">@color/md_theme_dark_primary</item>

        <item name="colorOnPrimary">@color/md_theme_dark_onPrimary</item>

app/src/main/res/values/themes.xml

+2 −0
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ 
        <item name="android:windowSharedElementExitTransition">@transition/change_image_transform

        </item>

        <item name="android:statusBarColor">?android:colorBackground</item>

        <item name="android:windowOptOutEdgeToEdgeEnforcement" tools:targetApi="35">true</item>

        <item name="alertDialogTheme">@style/AppThemeAlertDialog</item>

    </style>
@@ -83,6 +84,7 @@ 
        <item name="android:windowLightNavigationBar" tools:targetApi="o_mr1">true</item>

        <item name="android:isLightTheme" tools:targetApi="q">true</item>

        <item name="android:statusBarColor">?android:colorBackground</item>

        <item name="android:windowOptOutEdgeToEdgeEnforcement" tools:targetApi="35">true</item>

        <item name="alertDialogTheme">@style/AppThemeAlertDialog</item>

        <item name="preferenceTheme">@style/AppPreferenceThemeOverlay</item>

    </style>