Skip to content

Commit 340affe

Browse files
committed
fix (window insets) : makes sure insets are consumed from drawer fragments
1 parent f3b631b commit 340affe

File tree

2 files changed

+32
-0
lines changed

2 files changed

+32
-0
lines changed

vector/src/main/java/im/vector/app/features/home/HomeDrawerFragment.kt

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,9 @@ import android.view.View
1313
import android.view.ViewGroup
1414
import androidx.core.app.ActivityOptionsCompat
1515
import androidx.core.view.ViewCompat
16+
import androidx.core.view.WindowInsetsCompat
1617
import androidx.core.view.isVisible
18+
import androidx.core.view.updatePadding
1719
import dagger.hilt.android.AndroidEntryPoint
1820
import im.vector.app.R
1921
import im.vector.app.core.extensions.observeK
@@ -109,6 +111,20 @@ class HomeDrawerFragment :
109111
}
110112
}
111113

114+
ViewCompat.setOnApplyWindowInsetsListener(view) { v, insets ->
115+
val systemBars = insets.getInsets(
116+
WindowInsetsCompat.Type.systemBars() or
117+
WindowInsetsCompat.Type.displayCutout()
118+
)
119+
v.updatePadding(
120+
systemBars.left,
121+
systemBars.top,
122+
systemBars.right,
123+
systemBars.bottom,
124+
)
125+
WindowInsetsCompat.CONSUMED
126+
}
127+
112128
// Debug menu
113129
views.homeDrawerHeaderDebugView.debouncedClicks {
114130
sharedActionViewModel.post(HomeActivitySharedAction.CloseDrawer)

vector/src/main/java/im/vector/app/features/home/room/breadcrumbs/BreadcrumbsFragment.kt

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@ import android.os.Bundle
1111
import android.view.LayoutInflater
1212
import android.view.View
1313
import android.view.ViewGroup
14+
import androidx.core.view.ViewCompat
15+
import androidx.core.view.WindowInsetsCompat
16+
import androidx.core.view.updatePadding
1417
import com.airbnb.mvrx.fragmentViewModel
1518
import com.airbnb.mvrx.withState
1619
import dagger.hilt.android.AndroidEntryPoint
@@ -38,6 +41,19 @@ class BreadcrumbsFragment :
3841

3942
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
4043
super.onViewCreated(view, savedInstanceState)
44+
ViewCompat.setOnApplyWindowInsetsListener(views.breadcrumbsRecyclerView) { v, insets ->
45+
val systemBars = insets.getInsets(
46+
WindowInsetsCompat.Type.systemBars() or
47+
WindowInsetsCompat.Type.displayCutout()
48+
)
49+
v.updatePadding(
50+
systemBars.left,
51+
systemBars.top,
52+
systemBars.right,
53+
systemBars.bottom,
54+
)
55+
WindowInsetsCompat.CONSUMED
56+
}
4157
setupRecyclerView()
4258
sharedActionViewModel = activityViewModelProvider.get(RoomDetailSharedActionViewModel::class.java)
4359
}

0 commit comments

Comments
 (0)