Skip to content

Commit 55bae3d

Browse files
author
Nick Rout
committed
Update Insetter to 0.5.0
1 parent 1a94278 commit 55bae3d

File tree

10 files changed

+72
-25
lines changed

10 files changed

+72
-25
lines changed

Diff for: ‎app/src/main/java/dev/ricknout/rugbyranker/ui/LauncherActivity.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ import android.content.Intent
44
import android.graphics.drawable.Drawable
55
import android.os.Bundle
66
import androidx.appcompat.app.AppCompatActivity
7+
import androidx.core.view.WindowCompat
78
import androidx.vectordrawable.graphics.drawable.Animatable2Compat
89
import androidx.vectordrawable.graphics.drawable.AnimatedVectorDrawableCompat
9-
import dev.chrisbanes.insetter.setEdgeToEdgeSystemUiFlags
1010
import dev.ricknout.rugbyranker.R
1111
import dev.ricknout.rugbyranker.databinding.ActivityLauncherBinding
1212

@@ -37,6 +37,6 @@ class LauncherActivity : AppCompatActivity() {
3737
}
3838

3939
private fun setupEdgeToEdge() {
40-
binding.root.setEdgeToEdgeSystemUiFlags()
40+
WindowCompat.setDecorFitsSystemWindows(window, false)
4141
}
4242
}

Diff for: ‎app/src/main/java/dev/ricknout/rugbyranker/ui/MainActivity.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@ import android.os.Bundle
44
import android.view.View
55
import androidx.activity.viewModels
66
import androidx.appcompat.app.AppCompatActivity
7+
import androidx.core.view.WindowCompat
78
import androidx.core.view.WindowInsetsCompat
89
import androidx.core.view.updatePadding
910
import androidx.navigation.fragment.NavHostFragment
1011
import androidx.navigation.ui.setupWithNavController
1112
import dagger.hilt.android.AndroidEntryPoint
1213
import dev.chrisbanes.insetter.Insetter
13-
import dev.chrisbanes.insetter.setEdgeToEdgeSystemUiFlags
1414
import dev.ricknout.rugbyranker.BuildConfig
1515
import dev.ricknout.rugbyranker.R
1616
import dev.ricknout.rugbyranker.databinding.ActivityMainBinding
@@ -43,7 +43,7 @@ class MainActivity : AppCompatActivity() {
4343
}
4444

4545
private fun setupEdgeToEdge() {
46-
binding.drawerLayout.setEdgeToEdgeSystemUiFlags()
46+
WindowCompat.setDecorFitsSystemWindows(window, false)
4747
Insetter.builder().setOnApplyInsetsListener { view, insets, _ ->
4848
val systemBars = insets.getInsets(WindowInsetsCompat.Type.systemBars())
4949
view.findViewById<View>(R.id.design_navigation_view).updatePadding(

Diff for: ‎app/src/main/java/dev/ricknout/rugbyranker/ui/SportFragment.kt

+16-5
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,7 @@ import com.google.android.material.tabs.TabLayoutMediator
2424
import com.google.android.material.transition.MaterialContainerTransform
2525
import com.google.android.material.transition.MaterialFadeThrough
2626
import dagger.hilt.android.AndroidEntryPoint
27-
import dev.chrisbanes.insetter.applySystemWindowInsetsToMargin
28-
import dev.chrisbanes.insetter.applySystemWindowInsetsToPadding
27+
import dev.chrisbanes.insetter.applyInsetter
2928
import dev.ricknout.rugbyranker.R
3029
import dev.ricknout.rugbyranker.core.model.Sport
3130
import dev.ricknout.rugbyranker.core.ui.openDrawer
@@ -286,9 +285,21 @@ class SportFragment : Fragment() {
286285
}
287286

288287
private fun setupEdgeToEdge() {
289-
binding.appBar.appBarLayout.applySystemWindowInsetsToPadding(left = true, top = true, right = true)
290-
binding.fab.applySystemWindowInsetsToMargin(left = true, right = true, bottom = true)
291-
binding.predictionBar.applySystemWindowInsetsToMargin(left = true, right = true, bottom = true)
288+
binding.appBar.appBarLayout.applyInsetter {
289+
type(statusBars = true, navigationBars = true) {
290+
padding(horizontal = true, top = true)
291+
}
292+
}
293+
binding.fab.applyInsetter {
294+
type(navigationBars = true) {
295+
margin()
296+
}
297+
}
298+
binding.predictionBar.applyInsetter {
299+
type(navigationBars = true) {
300+
margin()
301+
}
302+
}
292303
}
293304

294305
inner class SportAdapter(fragment: Fragment) : FragmentStateAdapter(fragment) {

Diff for: ‎buildSrc/src/main/java/dev/ricknout/rugbyranker/buildsrc/Dependencies.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ object Versions {
77
const val androidGradlePlugin = "4.2.0-beta04"
88
const val ktlint = "0.40.0"
99
const val coil = "1.1.1"
10-
const val insetter = "0.4.0"
10+
const val insetter = "0.5.0"
1111
object Kotlin {
1212
const val kotlin = "1.4.30"
1313
const val coroutines = "1.4.2"

Diff for: ‎info/src/main/java/dev/ricknout/rugbyranker/info/ui/InfoFragment.kt

+11-3
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import androidx.navigation.fragment.findNavController
1414
import com.google.android.gms.oss.licenses.OssLicensesMenuActivity
1515
import com.google.android.material.transition.MaterialFadeThrough
1616
import dagger.hilt.android.AndroidEntryPoint
17-
import dev.chrisbanes.insetter.applySystemWindowInsetsToPadding
17+
import dev.chrisbanes.insetter.applyInsetter
1818
import dev.ricknout.rugbyranker.core.ui.openDrawer
1919
import dev.ricknout.rugbyranker.core.util.CustomTabUtils
2020
import dev.ricknout.rugbyranker.info.R
@@ -136,8 +136,16 @@ class InfoFragment : Fragment() {
136136
}
137137

138138
private fun setupEdgeToEdge() {
139-
binding.appBarLayout.applySystemWindowInsetsToPadding(left = true, top = true, right = true)
140-
binding.nestedScrollView.applySystemWindowInsetsToPadding(left = true, right = true, bottom = true)
139+
binding.appBarLayout.applyInsetter {
140+
type(statusBars = true, navigationBars = true) {
141+
padding(horizontal = true, top = true)
142+
}
143+
}
144+
binding.nestedScrollView.applyInsetter {
145+
type(navigationBars = true) {
146+
padding()
147+
}
148+
}
141149
}
142150

143151
companion object {

Diff for: ‎live/src/main/java/dev/ricknout/rugbyranker/live/ui/LiveMatchFragment.kt

+6-2
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import com.google.android.material.elevation.ElevationOverlayProvider
1515
import com.google.android.material.floatingactionbutton.FloatingActionButton
1616
import com.google.android.material.snackbar.Snackbar
1717
import dagger.hilt.android.AndroidEntryPoint
18-
import dev.chrisbanes.insetter.applySystemWindowInsetsToPadding
18+
import dev.chrisbanes.insetter.applyInsetter
1919
import dev.ricknout.rugbyranker.core.model.Sport
2020
import dev.ricknout.rugbyranker.live.R
2121
import dev.ricknout.rugbyranker.live.databinding.FragmentLiveMatchBinding
@@ -133,7 +133,11 @@ class LiveMatchFragment : Fragment() {
133133
}
134134

135135
private fun setupEdgeToEdge() {
136-
binding.recyclerView.applySystemWindowInsetsToPadding(left = true, right = true, bottom = true)
136+
binding.recyclerView.applyInsetter {
137+
type(navigationBars = true) {
138+
padding()
139+
}
140+
}
137141
}
138142

139143
private fun setupRecyclerView() {

Diff for: ‎match/src/main/java/dev/ricknout/rugbyranker/match/ui/MatchFragment.kt

+6-2
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import com.google.android.material.elevation.ElevationOverlayProvider
1616
import com.google.android.material.floatingactionbutton.FloatingActionButton
1717
import com.google.android.material.snackbar.Snackbar
1818
import dagger.hilt.android.AndroidEntryPoint
19-
import dev.chrisbanes.insetter.applySystemWindowInsetsToPadding
19+
import dev.chrisbanes.insetter.applyInsetter
2020
import dev.ricknout.rugbyranker.core.model.Sport
2121
import dev.ricknout.rugbyranker.match.R
2222
import dev.ricknout.rugbyranker.match.databinding.FragmentMatchBinding
@@ -146,7 +146,11 @@ class MatchFragment : Fragment() {
146146
}
147147

148148
private fun setupEdgeToEdge() {
149-
binding.recyclerView.applySystemWindowInsetsToPadding(left = true, right = true, bottom = true)
149+
binding.recyclerView.applyInsetter {
150+
type(navigationBars = true) {
151+
padding()
152+
}
153+
}
150154
}
151155

152156
companion object {

Diff for: ‎news/src/main/java/dev/ricknout/rugbyranker/news/ui/NewsFragment.kt

+11-3
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import com.google.android.material.elevation.ElevationOverlayProvider
1616
import com.google.android.material.snackbar.Snackbar
1717
import com.google.android.material.transition.MaterialFadeThrough
1818
import dagger.hilt.android.AndroidEntryPoint
19-
import dev.chrisbanes.insetter.applySystemWindowInsetsToPadding
19+
import dev.chrisbanes.insetter.applyInsetter
2020
import dev.ricknout.rugbyranker.core.ui.openDrawer
2121
import dev.ricknout.rugbyranker.core.util.CustomTabUtils
2222
import dev.ricknout.rugbyranker.news.R
@@ -155,7 +155,15 @@ class NewsFragment : Fragment() {
155155
}
156156

157157
private fun setupEdgeToEdge() {
158-
binding.appBarLayout.applySystemWindowInsetsToPadding(left = true, top = true, right = true)
159-
binding.recyclerView.applySystemWindowInsetsToPadding(left = true, right = true, bottom = true)
158+
binding.appBarLayout.applyInsetter {
159+
type(statusBars = true, navigationBars = true) {
160+
padding(horizontal = true, top = true)
161+
}
162+
}
163+
binding.recyclerView.applyInsetter {
164+
type(navigationBars = true) {
165+
padding()
166+
}
167+
}
160168
}
161169
}

Diff for: ‎prediction/src/main/java/dev/ricknout/rugbyranker/prediction/ui/PredictionBottomSheetDialogFragment.kt

+11-3
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import com.google.android.material.bottomsheet.BottomSheetDialog
1919
import com.google.android.material.bottomsheet.BottomSheetDialogFragment
2020
import com.google.android.material.color.MaterialColors
2121
import dagger.hilt.android.AndroidEntryPoint
22-
import dev.chrisbanes.insetter.applySystemWindowInsetsToPadding
22+
import dev.chrisbanes.insetter.applyInsetter
2323
import dev.chrisbanes.insetter.setEdgeToEdgeSystemUiFlags
2424
import dev.ricknout.rugbyranker.core.model.Sport
2525
import dev.ricknout.rugbyranker.core.ui.MaterialListPopupWindow
@@ -291,8 +291,16 @@ class PredictionBottomSheetDialogFragment : BottomSheetDialogFragment() {
291291
container.fitsSystemWindows = false
292292
coordinator.fitsSystemWindows = false
293293
container.setEdgeToEdgeSystemUiFlags()
294-
container.applySystemWindowInsetsToPadding(top = true)
295-
requireView().applySystemWindowInsetsToPadding(left = true, right = true, bottom = true)
294+
container.applyInsetter {
295+
type(statusBars = true) {
296+
padding()
297+
}
298+
}
299+
requireView().applyInsetter {
300+
type(navigationBars = true) {
301+
padding()
302+
}
303+
}
296304
}
297305

298306
private fun createPopupMenu(

Diff for: ‎ranking/src/main/java/dev/ricknout/rugbyranker/ranking/ui/RankingFragment.kt

+6-2
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import com.google.android.material.elevation.ElevationOverlayProvider
1616
import com.google.android.material.floatingactionbutton.FloatingActionButton
1717
import com.google.android.material.snackbar.Snackbar
1818
import dagger.hilt.android.AndroidEntryPoint
19-
import dev.chrisbanes.insetter.applySystemWindowInsetsToPadding
19+
import dev.chrisbanes.insetter.applyInsetter
2020
import dev.ricknout.rugbyranker.core.model.Sport
2121
import dev.ricknout.rugbyranker.core.util.DateUtils
2222
import dev.ricknout.rugbyranker.prediction.ui.MensPredictionViewModel
@@ -171,7 +171,11 @@ class RankingFragment : Fragment() {
171171
}
172172

173173
private fun setupEdgeToEdge() {
174-
binding.recyclerView.applySystemWindowInsetsToPadding(left = true, right = true, bottom = true)
174+
binding.recyclerView.applyInsetter {
175+
type(navigationBars = true) {
176+
padding()
177+
}
178+
}
175179
}
176180

177181
companion object {

0 commit comments

Comments
 (0)