Skip to content
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -45,11 +45,12 @@
android:icon="@mipmap/ic_launcher"
android:label="@string/app_name"
android:largeHeap="true"
android:pageSizeCompat="enabled"
android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true"
android:theme="@style/AppTheme"
android:usesCleartextTraffic="true"
tools:targetApi="35">
tools:targetApi="36">

<meta-data
android:name="com.google.android.gms.cast.framework.OPTIONS_PROVIDER_CLASS_NAME"
Expand Down
17 changes: 17 additions & 0 deletions app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import android.content.res.ColorStateList
import android.content.res.Configuration
import android.graphics.Rect
import android.net.Uri
import android.os.Build
import android.os.Bundle
import android.util.AttributeSet
import android.util.Log
Expand All @@ -19,6 +20,7 @@ import android.view.Menu
import android.view.MenuItem
import android.view.View
import android.view.ViewGroup
import android.view.WindowInsets
import android.view.WindowManager
import android.widget.CheckBox
import android.widget.ImageView
Expand All @@ -38,6 +40,7 @@ import androidx.core.view.isGone
import androidx.core.view.isInvisible
import androidx.core.view.isVisible
import androidx.core.view.marginStart
import androidx.core.view.updatePadding
import androidx.fragment.app.FragmentActivity
import androidx.lifecycle.ViewModelProvider
import androidx.navigation.NavController
Expand Down Expand Up @@ -1268,6 +1271,20 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener, BiometricCa
null
}

// Handle Android 15+ edge-to-edge design
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.VANILLA_ICE_CREAM) { // Android 15+
binding?.root?.setOnApplyWindowInsetsListener { view, insets ->
val systemBars = insets.getInsets(WindowInsets.Type.systemBars())
view.updatePadding(
left = systemBars.left,
right = systemBars.right,
bottom = systemBars.bottom
)

WindowInsets.CONSUMED
}
}

// overscan
val padding = settingsManager.getInt(getString(R.string.overscan_key), 0).toPx
binding?.homeRoot?.setPadding(padding, padding, padding, padding)
Expand Down
3 changes: 0 additions & 3 deletions app/src/main/res/values/styles.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,6 @@
<item name="android:navigationBarColor">?attr/primaryBlackBackground</item>
<item name="android:colorEdgeEffect">?attr/textColor</item>

<!-- Opt out of edgeToEdge enforcement in >= Android 15 -->
<!-- However this will be deprecated in future (ETA ~ 1.6 years) -->
<item name="android:windowOptOutEdgeToEdgeEnforcement" tools:targetApi="35">true</item>
<!--<item name="android:navigationBarColor">@color/darkBackground</item>-->
<item name="android:statusBarColor">?attr/iconGrayBackground</item>

Expand Down
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ workRuntimeKtx = "2.10.5"
jvmTarget = "1.8"
minSdk = "21"
compileSdk = "36"
targetSdk = "35"
targetSdk = "36"

[libraries]
acra-core = { module = "ch.acra:acra-core", version.ref = "acraCore" }
Expand Down