Merge pull request #52 from chrisbanes/cb/update-deps

Update dependencies

.gitignore

@@ -12,8 +12,9 @@ captures
 .idea/caches
 .idea/navEditor.xml
 .idea/tasks.xml
-.idea/tasks.xml
 .idea/modules.xml
+.idea/compiler.xml
+/.idea/jarRepositories.xml
 gradle.xml
 *.iml
 
@@ -24,6 +25,3 @@ gradle.xml
 # Do not commit plain-text signing info
 release/*.properties
 release/*.gpg
-
-# Do not commit firebase config
-google-services.json

build.gradle

@@ -32,7 +32,7 @@ buildscript {
 }
 
 plugins {
-    id "com.diffplug.gradle.spotless" version "3.24.3"
+    id "com.diffplug.gradle.spotless" version "3.28.1"
 }
 
 subprojects {

buildSrc/src/main/java/dev/chrisbanes/insetter/buildsrc/dependencies.kt

@@ -17,14 +17,14 @@
 package dev.chrisbanes.insetter.buildsrc
 
 object Versions {
-    const val ktlint = "0.33.0"
+    const val ktlint = "0.36.0"
 }
 
 object Libs {
     // We need to use an old version of AGP since that controls which data-binding version
     // we use in dbx. Keeping one stable AGP version behind means we're not forcing people to
     // unnecessarily
-    const val androidGradlePlugin = "com.android.tools.build:gradle:3.4.0"
+    const val androidGradlePlugin = "com.android.tools.build:gradle:3.5.0"
 
     const val gradleMavenPublishPlugin = "com.vanniktech:gradle-maven-publish-plugin:0.8.0"
 
@@ -48,8 +48,8 @@ object Libs {
             const val espressoCore = "androidx.test.espresso:espresso-core:3.2.0"
         }
 
-        const val core = "androidx.core:core:1.2.0-beta01"
-        const val coreKtx = "androidx.core:core-ktx:1.2.0-beta01"
+        const val core = "androidx.core:core:1.2.0"
+        const val coreKtx = "androidx.core:core-ktx:1.2.0"
     }
 
     const val constraintLayout = "androidx.constraintlayout:constraintlayout:1.1.3"

ktx/src/main/java/dev/chrisbanes/insetter/viewinsetter.kt

@@ -21,15 +21,9 @@ import androidx.annotation.RequiresApi
 import androidx.core.view.WindowInsetsCompat
 
 inline fun View.doOnApplyWindowInsets(
-    crossinline f: (
-        view: View,
-        insets: WindowInsetsCompat,
-        initialState: ViewState
-    ) -> Unit
-) {
-    Insetter.setOnApplyInsetsListener(this) { view, insets, initialState ->
-        f(view, insets, initialState)
-    }
+    crossinline f: (view: View, insets: WindowInsetsCompat, initialState: ViewState) -> Unit
+) = Insetter.setOnApplyInsetsListener(this) { view, insets, initialState ->
+    f(view, insets, initialState)
 }
 
 fun View.requestApplyInsetsWhenAttached() {
@@ -61,20 +55,16 @@ fun View.applySystemWindowInsetsToPadding(
     top: Boolean = false,
     right: Boolean = false,
     bottom: Boolean = false
-) {
-
-    doOnApplyWindowInsets { view, insets, initialViewState ->
-        Insetter.applyInsetsToView(
-            view,
-            insets,
-            initialViewState,
-            Insetter.generateEnumSet(left, top, right, bottom),
-            null,
-            null,
-            null
-        )
-
-    }
+) = doOnApplyWindowInsets { view, insets, initialViewState ->
+    Insetter.applyInsetsToView(
+        view,
+        insets,
+        initialViewState,
+        Insetter.generateEnumSet(left, top, right, bottom),
+        null,
+        null,
+        null
+    )
 }
 
 /**
@@ -90,20 +80,16 @@ fun View.applySystemWindowInsetsToMargin(
     top: Boolean = false,
     right: Boolean = false,
     bottom: Boolean = false
-) {
-
-    doOnApplyWindowInsets { view, insets, initialViewState ->
-        Insetter.applyInsetsToView(
-            view,
-            insets,
-            initialViewState,
-            null,
-            Insetter.generateEnumSet(left, top, right, bottom),
-            null,
-            null
-        )
-
-    }
+) = doOnApplyWindowInsets { view, insets, initialViewState ->
+    Insetter.applyInsetsToView(
+        view,
+        insets,
+        initialViewState,
+        null,
+        Insetter.generateEnumSet(left, top, right, bottom),
+        null,
+        null
+    )
 }
 
 /**
@@ -119,20 +105,16 @@ fun View.applySystemGestureInsetsToPadding(
     top: Boolean = false,
     right: Boolean = false,
     bottom: Boolean = false
-) {
-
-    doOnApplyWindowInsets { view, insets, initialViewState ->
-        Insetter.applyInsetsToView(
-            view,
-            insets,
-            initialViewState,
-            null,
-            null,
-            Insetter.generateEnumSet(left, top, right, bottom),
-            null
-        )
-
-    }
+) = doOnApplyWindowInsets { view, insets, initialViewState ->
+    Insetter.applyInsetsToView(
+        view,
+        insets,
+        initialViewState,
+        null,
+        null,
+        Insetter.generateEnumSet(left, top, right, bottom),
+        null
+    )
 }
 
 /**
@@ -148,18 +130,14 @@ fun View.applySystemGestureInsetsToMargin(
     top: Boolean = false,
     right: Boolean = false,
     bottom: Boolean = false
-) {
-
-    doOnApplyWindowInsets { view, insets, initialViewState ->
-        Insetter.applyInsetsToView(
-            view,
-            insets,
-            initialViewState,
-            null,
-            null,
-            null,
-            Insetter.generateEnumSet(left, top, right, bottom)
-        )
-
-    }
+) = doOnApplyWindowInsets { view, insets, initialViewState ->
+    Insetter.applyInsetsToView(
+        view,
+        insets,
+        initialViewState,
+        null,
+        null,
+        null,
+        Insetter.generateEnumSet(left, top, right, bottom)
+    )
 }

library/src/androidTest/java/dev/chrisbanes/insetter/InsetterTestCase.kt

@@ -27,12 +27,15 @@ import androidx.test.annotation.UiThreadTest
 import androidx.test.ext.junit.rules.ActivityScenarioRule
 import androidx.test.filters.SdkSuppress
 import dev.chrisbanes.insetter.Insetter.EDGE_TO_EDGE_FLAGS
-import junit.framework.Assert.*
+import java.util.concurrent.CountDownLatch
+import java.util.concurrent.TimeUnit
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertNotNull
+import org.junit.Assert.assertNull
+import org.junit.Assert.assertTrue
 import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
-import java.util.concurrent.CountDownLatch
-import java.util.concurrent.TimeUnit
 
 /**
  * InsetsTestCase
@@ -173,4 +176,4 @@ class InsetterTestCase {
             }
         }
     }
-}
+}

sample/src/main/java/dev/chrisbanes/insetter/sample/DataBindingState.kt

@@ -55,4 +55,4 @@ class DataBindingState : BaseObservable() {
                 notifyPropertyChanged(BR.paddingBottomSystemWindow)
             }
         }
-}
+}

sample/src/main/java/dev/chrisbanes/insetter/sample/InsetterConstraintHelperSample.kt

@@ -30,4 +30,4 @@ class InsetterConstraintHelperSample : Activity() {
                 View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN or
                 View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION
     }
-}
+}

sample/src/main/java/dev/chrisbanes/insetter/sample/MainActivity.kt

@@ -22,7 +22,6 @@ import android.os.Bundle
 import android.view.View
 import android.widget.ListView
 import android.widget.SimpleAdapter
-
 import java.text.Collator
 import java.util.ArrayList
 import java.util.Collections
@@ -133,4 +132,4 @@ class MainActivity : ListActivity() {
             }
         }
     }
-}
+}

test-utils/src/main/java/dev/chrisbanes/insetter/testutils/testutils.kt

@@ -88,4 +88,4 @@ fun View.assertLayoutMargin(left: Int = 0, top: Int = 0, right: Int = 0, bottom:
 fun View.assertLayoutMargin(rect: Rect) = assertLayoutMargin(rect.left, rect.top, rect.right, rect.bottom)
 
 @RequiresApi(20)
-fun WindowInsets.toWindowInsetsCompat() = WindowInsetsCompat.toWindowInsetsCompat(this)
+fun WindowInsets.toWindowInsetsCompat() = WindowInsetsCompat.toWindowInsetsCompat(this)

widgets/src/androidTest/java/dev/chrisbanes/insetter/widgets/InsetterConstraintHelperTestCase.kt

@@ -253,4 +253,4 @@ class InsetsConstraintHelperTestCase {
             assertPadding(top = systemGestureInsets.top)
         }
     }
-}
+}

widgets/src/androidTest/java/dev/chrisbanes/insetter/widgets/InsetterConstraintLayoutTestCase.kt

@@ -253,4 +253,4 @@ class InsetsConstraintLayoutTestCase {
             assertPadding(top = systemGestureInsets.top)
         }
     }
-}
+}