Merge branch 'develop'

Author: roman-itexus

.idea/codeStyles/Project.xml

@@ -0,0 +1,45 @@
+apply plugin: 'com.github.dcendents.android-maven'
+
+group = 'com.github.codeerow.databinding'
+
+
+apply plugin: 'com.android.library'
+apply plugin: 'kotlin-android'
+apply plugin: 'kotlin-android-extensions'
+
+
+android {
+    compileSdkVersion 29
+    buildToolsVersion "29.0.2"
+
+
+    defaultConfig {
+        minSdkVersion 14
+        targetSdkVersion 29
+        versionCode 1
+        versionName "1.0"
+
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+        consumerProguardFiles 'consumer-rules.pro'
+    }
+
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+        }
+    }
+
+}
+
+dependencies {
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+    implementation 'androidx.appcompat:appcompat:1.1.0'
+    implementation 'androidx.core:core-ktx:1.1.0'
+    testImplementation 'junit:junit:4.12'
+    androidTestImplementation 'androidx.test:runner:1.2.0'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
+
+    api project(':androidx-core')
+}

.idea/gradle.xml

@@ -0,0 +1,24 @@
+package com.codeerow.databinding.android.core
+
+import androidx.test.platform.app.InstrumentationRegistry
+import androidx.test.runner.AndroidJUnit4
+
+import org.junit.Test
+import org.junit.runner.RunWith
+
+import org.junit.Assert.*
+
+/**
+ * Instrumented test, which will execute on an Android device.
+ *
+ * See [testing documentation](http://d.android.com/tools/testing).
+ */
+@RunWith(AndroidJUnit4::class)
+class ExampleInstrumentedTest {
+    @Test
+    fun useAppContext() {
+        // Context of the app under test.
+        val appContext = InstrumentationRegistry.getInstrumentation().targetContext
+        assertEquals("com.codeerow.databinding.android.core.test", appContext.packageName)
+    }
+}

app/.gitignore renamed to androidx-core-ktx/.gitignore

@@ -1,3 +1,2 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="com.codeerow.dsl_databinding">
-</manifest>
+        package="com.codeerow.databinding.android.core" />

androidx-core-ktx/build.gradle

@@ -0,0 +1,10 @@
+package com.codeerow.databinding.androidx.core
+
+import androidx.lifecycle.LifecycleOwner
+
+
+fun LifecycleOwner.dataBinding(form: LifecycleDataBinding.() -> Unit): LifecycleDataBinding {
+    val dataBinding = LifecycleDataBinding(this)
+    form(dataBinding)
+    return dataBinding
+}

androidx-core-ktx/consumer-rules.pro

@@ -0,0 +1,14 @@
+package com.codeerow.databinding.androidx.core.bindings.seekbar
+
+import android.widget.SeekBar
+import androidx.lifecycle.MutableLiveData
+import com.codeerow.databinding.androidx.core.LifecycleDataBinding
+
+
+fun LifecycleDataBinding.progress(
+    view: SeekBar,
+    liveData: MutableLiveData<Int>,
+    twoWay: Boolean = false
+) {
+    this.apply(ProgressBinding(view, lifecycleOwner, liveData, twoWay))
+}

app/proguard-rules.pro renamed to androidx-core-ktx/proguard-rules.pro

@@ -0,0 +1,14 @@
+package com.codeerow.databinding.androidx.core.bindings.textview
+
+import android.widget.TextView
+import androidx.lifecycle.MutableLiveData
+import com.codeerow.databinding.androidx.core.LifecycleDataBinding
+
+
+fun LifecycleDataBinding.text(
+    view: TextView,
+    liveData: MutableLiveData<String>,
+    twoWay: Boolean = false
+) {
+    this.apply(TextBinding(view, lifecycleOwner, liveData, twoWay))
+}

androidx-core-ktx/src/androidTest/java/com/codeerow/databinding/android/core/ExampleInstrumentedTest.kt

@@ -0,0 +1,14 @@
+package com.codeerow.databinding.android.core.bindings.toolbar
+
+import android.view.View
+import androidx.appcompat.widget.Toolbar
+import com.codeerow.databinding.DataBinding
+
+
+fun DataBinding.navButtonClick(view: Toolbar, listener: View.OnClickListener) {
+    view.setNavigationOnClickListener(listener)
+}
+
+fun DataBinding.navButtonClick(view: Toolbar, listener: (View) -> Unit) {
+    view.setNavigationOnClickListener(listener)
+}

app/src/main/AndroidManifest.xml renamed to androidx-core-ktx/src/main/AndroidManifest.xml

@@ -0,0 +1,27 @@
+package com.codeerow.databinding.androidx.core.bindings.view
+
+import android.view.View
+import androidx.lifecycle.MutableLiveData
+import com.codeerow.databinding.androidx.core.LifecycleDataBinding
+
+
+fun LifecycleDataBinding.visibility(
+    view: View,
+    liveData: MutableLiveData<Boolean>,
+    goneWhenInvisible: Boolean = false
+) {
+    this.apply(VisibilityBinding(view, lifecycleOwner, liveData, goneWhenInvisible))
+}
+
+fun LifecycleDataBinding.enabled(view: View, liveData: MutableLiveData<Boolean>) {
+    this.apply(EnabledBinding(view, lifecycleOwner, liveData))
+}
+
+
+fun LifecycleDataBinding.click(view: View, listener: View.OnClickListener) {
+    this.apply(ClickBinding(view, listener))
+}
+
+fun LifecycleDataBinding.click(view: View, listener: (View) -> Unit) {
+    this.apply(ClickBinding(view, listener))
+}

androidx-core-ktx/src/main/java/com/codeerow/databinding/androidx/core/LifecycleOwnerExt.kt

@@ -0,0 +1,3 @@
+<resources>
+    <string name="app_name">android-core-ktx</string>
+</resources>

androidx-core-ktx/src/main/java/com/codeerow/databinding/androidx/core/bindings/seekbar/SeekbarBindingExt.kt

@@ -0,0 +1,17 @@
+package com.codeerow.databinding.android.core
+
+import org.junit.Test
+
+import org.junit.Assert.*
+
+/**
+ * Example local unit test, which will execute on the development machine (host).
+ *
+ * See [testing documentation](http://d.android.com/tools/testing).
+ */
+class ExampleUnitTest {
+    @Test
+    fun addition_isCorrect() {
+        assertEquals(4, 2 + 2)
+    }
+}

androidx-core-ktx/src/main/java/com/codeerow/databinding/androidx/core/bindings/textview/TextViewBindingExt.kt

@@ -0,0 +1 @@
+/build

androidx-core-ktx/src/main/java/com/codeerow/databinding/androidx/core/bindings/toolbar/ToolbarBindingExt.kt

@@ -1,36 +1,41 @@
 apply plugin: 'com.github.dcendents.android-maven'
 
-group = 'com.github.codeerow.dsldatabinding'
+group = 'com.github.codeerow.databinding'
 
 
 apply plugin: 'com.android.library'
-apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-android-extensions'
-
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion 29
+    buildToolsVersion "29.0.2"
+
+
     defaultConfig {
         minSdkVersion 14
-        targetSdkVersion 28
+        targetSdkVersion 29
         versionCode 1
         versionName "1.0"
+
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+        consumerProguardFiles 'consumer-rules.pro'
     }
+
     buildTypes {
         release {
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
+
 }
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$project.versions.kotlin"
-    implementation 'androidx.appcompat:appcompat:1.0.2'
-    implementation 'androidx.core:core-ktx:1.0.2'
+
+    implementation 'androidx.appcompat:appcompat:1.1.0'
     testImplementation 'junit:junit:4.12'
     androidTestImplementation 'androidx.test:runner:1.2.0'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
+
+    api project(':core')
 }

androidx-core-ktx/src/main/java/com/codeerow/databinding/androidx/core/bindings/view/ViewBindingExt.kt

@@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile