Skip to content
This repository was archived by the owner on Oct 18, 2024. It is now read-only.

Commit c0c1f0d

Browse files
committed
fix(editor): invalid bottom padding for header container in bottom sheet
1 parent 2cebf4b commit c0c1f0d

File tree

4 files changed

+10
-11
lines changed

4 files changed

+10
-11
lines changed

app/src/main/java/com/itsaky/androidide/app/EdgeToEdgeIDEActivity.kt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,8 @@ import android.view.WindowManager
2828
import androidx.core.view.OnApplyWindowInsetsListener
2929
import androidx.core.view.ViewCompat
3030
import androidx.core.view.doOnAttach
31-
import androidx.core.view.setPadding
3231
import com.itsaky.androidide.utils.EdgeToEdgeUtils
33-
import com.itsaky.androidide.utils.getInsets
32+
import com.itsaky.androidide.utils.getSystemBarInsets
3433
import org.slf4j.LoggerFactory
3534

3635
/**
@@ -141,7 +140,7 @@ abstract class EdgeToEdgeIDEActivity : IDEActivity() {
141140
this.onApplyWindowInsetsListener
142141
)
143142

144-
this.window.decorView.doOnAttach { decorView -> onInsetsUpdated(getInsets(decorView)) }
143+
this.window.decorView.doOnAttach { decorView -> onInsetsUpdated(getSystemBarInsets(decorView)) }
145144
}
146145

147146
/** Called whenever insets are updated */

app/src/main/java/com/itsaky/androidide/ui/EditorBottomSheet.kt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ package com.itsaky.androidide.ui
1919

2020
import android.app.Activity
2121
import android.content.Context
22-
import android.graphics.Rect
2322
import android.text.TextUtils
2423
import android.util.AttributeSet
2524
import android.view.LayoutInflater
@@ -29,7 +28,9 @@ import android.view.ViewTreeObserver
2928
import android.widget.RelativeLayout
3029
import androidx.annotation.GravityInt
3130
import androidx.appcompat.widget.TooltipCompat
31+
import androidx.core.graphics.Insets
3232
import androidx.core.view.ViewCompat
33+
import androidx.core.view.WindowInsetsCompat
3334
import androidx.core.view.updateLayoutParams
3435
import androidx.core.view.updatePadding
3536
import androidx.core.view.updatePaddingRelative
@@ -58,7 +59,6 @@ import com.itsaky.androidide.tasks.TaskExecutor.executeAsyncProvideError
5859
import com.itsaky.androidide.utils.IntentUtils.shareFile
5960
import com.itsaky.androidide.utils.Symbols.forFile
6061
import com.itsaky.androidide.utils.flashError
61-
import com.itsaky.androidide.utils.getInsets
6262
import org.slf4j.LoggerFactory
6363
import java.io.File
6464
import java.io.IOException
@@ -92,7 +92,7 @@ constructor(
9292
var binding: LayoutEditorBottomSheetBinding
9393
val pagerAdapter: EditorBottomSheetTabAdapter
9494

95-
private var windowInsets: Rect? = null
95+
private var windowInsets: Insets? = null
9696

9797
companion object {
9898

@@ -169,8 +169,8 @@ constructor(
169169
}
170170
}
171171

172-
ViewCompat.setOnApplyWindowInsetsListener(this) { view, insets ->
173-
this.windowInsets = getInsets(view)
172+
ViewCompat.setOnApplyWindowInsetsListener(this) { _, insets ->
173+
this.windowInsets = insets.getInsets(WindowInsetsCompat.Type.mandatorySystemGestures())
174174
insets
175175
}
176176
}

common/src/main/java/com/itsaky/androidide/ui/BottomInsetHeightDistributor.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import android.view.ViewGroup
2323
import android.widget.FrameLayout
2424
import androidx.core.view.doOnAttach
2525
import androidx.core.view.updateLayoutParams
26-
import com.itsaky.androidide.utils.getInsets
26+
import com.itsaky.androidide.utils.getSystemBarInsets
2727

2828
/**
2929
* This view will set its height to the value of a bottom screen inset as soon
@@ -55,7 +55,7 @@ class BottomInsetHeightDistributor : FrameLayout {
5555
private fun applyLayoutParameters() {
5656
doOnAttach { view ->
5757
updateLayoutParams<ViewGroup.LayoutParams> {
58-
height = getInsets(view).bottom
58+
height = getSystemBarInsets(view).bottom
5959
}
6060
}
6161
}

common/src/main/java/com/itsaky/androidide/utils/InsetUtils.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ import android.view.WindowInsets
3232
*
3333
* @author Smooth E
3434
*/
35-
fun getInsets(view: View): Rect {
35+
fun getSystemBarInsets(view: View): Rect {
3636
val insets: Rect
3737
val rootWindowInsets = view.rootWindowInsets
3838

0 commit comments

Comments
 (0)