Improve Java interoperability - remove lambdas from public interface

databinding/src/main/kotlin/com/thefuntasty/hauler/databinding/OnDragDismissedListenerAdapter.kt

@@ -2,8 +2,10 @@ package com.thefuntasty.hauler.databinding
 
 import androidx.databinding.BindingAdapter
 import com.thefuntasty.hauler.HaulerView
+import com.thefuntasty.hauler.OnDragDismissedListener
+import com.thefuntasty.hauler.setOnDragDismissedListener
 
 @BindingAdapter("app:onDragDismissedListener")
 fun HaulerView.setOnDragDismissedListener(listener: OnDragDismissedListener) {
-    this.setOnDragDismissedListener { listener.onDragDismissed(it) }
+    this.setOnDragDismissedListener { listener.onDismissed(it) }
 }

library/src/main/kotlin/com/thefuntasty/hauler/HaulerView.kt

@@ -29,7 +29,7 @@ class HaulerView @JvmOverloads constructor(
     private var draggingUp = false
     private var mLastActionEvent: Int = 0
 
-    private var onDragDismissed: ((dragDirection: DragDirection) -> Unit) = { }
+    private var onDragDismissedListener: OnDragDismissedListener? = null
     private var systemChromeFader: SystemChromeFader? = null
 
     private var isDragEnabled = true
@@ -141,8 +141,8 @@ class HaulerView @JvmOverloads constructor(
      * Set lambda reference which is called when dismiss gesture has
      * been performed
      */
-    fun setOnDragDismissedListener(onDragDismissedListener: (dragDirection: DragDirection) -> Unit) {
-        onDragDismissed = onDragDismissedListener
+    fun setOnDragDismissedListener(onDragDismissedListener: OnDragDismissedListener) {
+        this.onDragDismissedListener = onDragDismissedListener
     }
 
     /**
@@ -211,6 +211,6 @@ class HaulerView @JvmOverloads constructor(
 
     private fun dispatchDismissCallback(dragDirection: DragDirection) {
         systemChromeFader?.onDismiss()
-        onDragDismissed.invoke(dragDirection)
+        onDragDismissedListener?.onDismissed(dragDirection)
     }
 }

library/src/main/kotlin/com/thefuntasty/hauler/HaulerViewExtensions.kt

@@ -0,0 +1,9 @@
+package com.thefuntasty.hauler
+
+fun HaulerView.setOnDragDismissedListener(onDragDismissedListener: (DragDirection) -> Unit) {
+    this.setOnDragDismissedListener(object : OnDragDismissedListener {
+        override fun onDismissed(dragDirection: DragDirection) {
+            onDragDismissedListener.invoke(dragDirection)
+        }
+    })
+}

library/src/main/kotlin/com/thefuntasty/hauler/OnDragDismissedListener.kt

@@ -0,0 +1,5 @@
+package com.thefuntasty.hauler
+
+interface OnDragDismissedListener {
+    fun onDismissed(dragDirection: DragDirection)
+}

sample/src/main/AndroidManifest.xml

@@ -20,15 +20,19 @@
 
         <activity
                 android:name=".draggable.SimpleActivity"
-                android:theme="@style/AppTheme.Draggable"/>
+                android:theme="@style/AppTheme.Draggable" />
 
         <activity
                 android:name=".draggable.advanced.AdvancedActivity"
-                android:theme="@style/AppTheme.Draggable"/>
+                android:theme="@style/AppTheme.Draggable" />
 
         <activity
                 android:name=".draggable.databinding.DatabindingActivity"
-                android:theme="@style/AppTheme.Draggable"/>
+                android:theme="@style/AppTheme.Draggable" />
+
+        <activity
+                android:name=".draggable.SimpleJavaActivity"
+                android:theme="@style/AppTheme.Draggable" />
 
     </application>
 </manifest>

sample/src/main/kotlin/com/thefuntasty/haulersample/MainActivity.kt

@@ -3,6 +3,7 @@ package com.thefuntasty.haulersample
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
 import com.thefuntasty.haulersample.draggable.SimpleActivity
+import com.thefuntasty.haulersample.draggable.SimpleJavaActivity
 import com.thefuntasty.haulersample.draggable.advanced.AdvancedActivity
 import com.thefuntasty.haulersample.draggable.databinding.DatabindingActivity
 import kotlinx.android.synthetic.main.activity_main.*
@@ -24,5 +25,9 @@ class MainActivity : AppCompatActivity() {
         startBindingButton.setOnClickListener {
             startActivity(DatabindingActivity.getStartIntent(this))
         }
+
+        startJavaCommonButton.setOnClickListener {
+            startActivity(SimpleJavaActivity.getStartIntent(this))
+        }
     }
 }

sample/src/main/kotlin/com/thefuntasty/haulersample/draggable/SimpleActivity.kt

@@ -4,6 +4,7 @@ import android.content.Context
 import android.content.Intent
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
+import com.thefuntasty.hauler.setOnDragDismissedListener
 import com.thefuntasty.haulersample.R
 import kotlinx.android.synthetic.main.activity_simple.*
 

sample/src/main/kotlin/com/thefuntasty/haulersample/draggable/SimpleJavaActivity.java

@@ -0,0 +1,36 @@
+package com.thefuntasty.haulersample.draggable;
+
+import android.app.Activity;
+import android.content.Context;
+import android.content.Intent;
+import android.os.Bundle;
+
+import androidx.annotation.Nullable;
+
+import com.thefuntasty.hauler.DragDirection;
+import com.thefuntasty.hauler.HaulerView;
+import com.thefuntasty.hauler.OnDragDismissedListener;
+import com.thefuntasty.haulersample.R;
+
+import org.jetbrains.annotations.NotNull;
+
+public class SimpleJavaActivity extends Activity {
+
+    public static Intent getStartIntent(Context context) {
+        return new Intent(context, SimpleJavaActivity.class);
+    }
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_simple);
+
+        HaulerView hv = findViewById(R.id.commonHaulerView);
+        hv.setOnDragDismissedListener(new OnDragDismissedListener() {
+            @Override
+            public void onDismissed(@NotNull DragDirection dragDirection) {
+                finish();
+            }
+        });
+    }
+}

sample/src/main/kotlin/com/thefuntasty/haulersample/draggable/advanced/AdvancedActivity.kt

@@ -6,6 +6,7 @@ import android.os.Bundle
 import android.widget.Toast
 import androidx.appcompat.app.AppCompatActivity
 import com.thefuntasty.hauler.DragDirection
+import com.thefuntasty.hauler.setOnDragDismissedListener
 import com.thefuntasty.haulersample.R
 import kotlinx.android.synthetic.main.activity_advanced.*
 

sample/src/main/res/layout/activity_main.xml

@@ -12,21 +12,28 @@
             android:id="@+id/startCommonButton"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="@string/start_common"
+            android:text="@string/start_simple"
             android:layout_gravity="center"/>
 
     <Button
             android:id="@+id/startAdvancedButton"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@string/start_advanced"
-            android:layout_gravity="center"/>
+            android:layout_gravity="center" />
 
     <Button
             android:id="@+id/startBindingButton"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@string/start_binding"
-            android:layout_gravity="center"/>
+            android:layout_gravity="center" />
+
+    <Button
+            android:id="@+id/startJavaCommonButton"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/start_simple_java"
+            android:layout_gravity="center" />
 
 </LinearLayout>

sample/src/main/res/values/strings.xml

@@ -1,6 +1,7 @@
 <resources>
     <string name="app_name">Hauler</string>
-    <string name="start_common">Start Simple Activity</string>
+    <string name="start_simple">Start Simple Activity</string>
+    <string name="start_simple_java">Start Simple Java Activity</string>
     <string name="start_advanced">Start Advanced Activity</string>
     <string name="start_binding">Start Binding Activity</string>
     <string name="swipe_to_dismiss">Swipe down to dismiss</string>