implemented setting up from menu programmatically, added view binder.

st235 · st235 · commit 2d4f22ecbb52 · 2021-01-16T23:45:57.000+02:00
diff --git a/app/src/main/java/github/com/st235/swipetoactionlayout/ContactInfo.kt b/app/src/main/java/github/com/st235/swipetoactionlayout/ContactInfo.kt
@@ -3,7 +3,8 @@ package github.com.st235.swipetoactionlayout
 data class ContactInfo(
     val name: String,
     val position: String,
-    val isOnline: Boolean
+    val isOnline: Boolean,
+    val isAuthor: Boolean = false
 ) {
 
     val email: String
diff --git a/app/src/main/java/github/com/st235/swipetoactionlayout/ContactsAdapter.kt b/app/src/main/java/github/com/st235/swipetoactionlayout/ContactsAdapter.kt
@@ -5,6 +5,7 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.core.graphics.ColorUtils
 import androidx.recyclerview.widget.RecyclerView
+import github.com.st235.lib_swipetoactionlayout.ActionBindHelper
 import github.com.st235.lib_swipetoactionlayout.SwipeAction
 import github.com.st235.lib_swipetoactionlayout.SwipeMenuListener
 import github.com.st235.swipetoactionlayout.identicon.IdenticonDrawable
@@ -18,6 +19,8 @@ class ContactsAdapter(
     private val onActionClicked: OnActionClicked
 ): RecyclerView.Adapter<ContactsAdapter.ContactsViewHolder>() {
 
+    private val actionsBindHelper = ActionBindHelper()
+
     fun remove(contact: ContactInfo) {
         val index = contacts.indexOf(contact)
         contacts.removeAt(index)
@@ -35,7 +38,9 @@ class ContactsAdapter(
     }
 
     override fun onBindViewHolder(holder: ContactsViewHolder, position: Int) {
-        holder.bind(contacts.get(position))
+        val contact = contacts[position]
+        actionsBindHelper.bind(contact.name, holder.swipeToActionLayout)
+        holder.bind(contact)
     }
 
     inner class ContactsViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView), SwipeMenuListener {
@@ -64,14 +69,23 @@ class ContactsAdapter(
             }
 
             description.text = String.format("%s, %s", contact.position, contact.email)
+
+            if (contact.isAuthor) {
+                isOnline.setImageResource(R.drawable.ic_favorite_black_18dp)
+                swipeToActionLayout.setActionsRes(R.menu.special_menu)
+            } else {
+                isOnline.setImageResource(R.drawable.circle_green)
+                swipeToActionLayout.setActionsRes(R.menu.swipe_to_action_menu)
+            }
         }
 
         override fun onClosed(view: View) {
             // empty on purpose
         }
 
         override fun onOpened(view: View) {
-            // empty on purpose
+            val contact = contacts[adapterPosition]
+            actionsBindHelper.closeOtherThan(contact.name)
         }
 
         override fun onFullyOpened(view: View, quickAction: SwipeAction) {
diff --git a/app/src/main/java/github/com/st235/swipetoactionlayout/MainActivity.kt b/app/src/main/java/github/com/st235/swipetoactionlayout/MainActivity.kt
@@ -1,13 +1,14 @@
 package github.com.st235.swipetoactionlayout
 
+import android.content.Intent
+import android.net.Uri
 import android.os.Bundle
-import android.view.View
 import android.widget.Toast
 import androidx.appcompat.app.AppCompatActivity
 import androidx.recyclerview.widget.LinearLayoutManager
-import github.com.st235.lib_swipetoactionlayout.SwipeAction
 import kotlinx.android.synthetic.main.activity_main.*
 
+
 class MainActivity : AppCompatActivity() {
 
     private val adapter = ContactsAdapter(
@@ -31,7 +32,7 @@ class MainActivity : AppCompatActivity() {
             ContactInfo("Landyn Martin", "Product Designer", true),
             ContactInfo("Madalyn Savage", "Software Engineer", true),
             ContactInfo("Cindy Moss", "Sales Manager", true),
-            ContactInfo("Alexander Dadukin", "Cats Lover", true),
+            ContactInfo("Alexander Dadukin", "Cats Lover", true, true),
             ContactInfo("Mathew Tapia", "Software Engineer", true),
             ContactInfo("Ayanna Shields", "Copyrighter", false)
         )
@@ -40,6 +41,7 @@ class MainActivity : AppCompatActivity() {
             R.id.call -> call(item)
             R.id.email -> email(item)
             R.id.delete -> remove(item)
+            R.id.star -> openRepo()
         }
     }
 
@@ -62,4 +64,11 @@ class MainActivity : AppCompatActivity() {
     private fun remove(item: ContactInfo) {
         adapter.remove(item)
     }
+
+    private fun openRepo() {
+        val url = "https://github.com/st235/SwipeToActionLayout"
+        val i = Intent(Intent.ACTION_VIEW)
+        i.data = Uri.parse(url)
+        startActivity(i)
+    }
 }
diff --git a/app/src/main/res/drawable/circle_green.xml b/app/src/main/res/drawable/circle_green.xml
@@ -4,4 +4,6 @@
 
     <solid android:color="#00b248" />
 
+    <stroke android:color="#fff" android:width="2dp" />
+
 </shape>
diff --git a/app/src/main/res/drawable/ic_favorite_black_18dp.xml b/app/src/main/res/drawable/ic_favorite_black_18dp.xml
@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="18dp"
+    android:height="18dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M16.5,5c-1.54,0 -3.04,0.99 -3.56,2.36h-1.87C10.54,5.99 9.04,5 7.5,5 5.5,5 4,6.5 4,8.5c0,2.89 3.14,5.74 7.9,10.05l0.1,0.1 0.1,-0.1C16.86,14.24 20,11.39 20,8.5c0,-2 -1.5,-3.5 -3.5,-3.5z"
+      android:fillColor="#f50057" />
+  <path
+      android:pathData="M16.5,3c-1.74,0 -3.41,0.81 -4.5,2.09C10.91,3.81 9.24,3 7.5,3 4.42,3 2,5.42 2,8.5c0,3.78 3.4,6.86 8.55,11.54L12,21.35l1.45,-1.32C18.6,15.36 22,12.28 22,8.5 22,5.42 19.58,3 16.5,3zM12.1,18.55l-0.1,0.1 -0.1,-0.1C7.14,14.24 4,11.39 4,8.5 4,6.5 5.5,5 7.5,5c1.54,0 3.04,0.99 3.57,2.36h1.87C13.46,5.99 14.96,5 16.5,5c2,0 3.5,1.5 3.5,3.5 0,2.89 -3.14,5.74 -7.9,10.05z"
+      android:fillColor="#fff"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_grade_black_18dp.xml b/app/src/main/res/drawable/ic_grade_black_18dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="18dp"
+    android:height="18dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M12,17.27l5.17,3.12c0.38,0.23 0.85,-0.11 0.75,-0.54l-1.37,-5.88 4.56,-3.95c0.33,-0.29 0.16,-0.84 -0.29,-0.88l-6.01,-0.51 -2.35,-5.54c-0.17,-0.41 -0.75,-0.41 -0.92,0L9.19,8.63l-6.01,0.51c-0.44,0.04 -0.62,0.59 -0.28,0.88l4.56,3.95 -1.37,5.88c-0.1,0.43 0.37,0.77 0.75,0.54L12,17.27z"
+      android:fillColor="#000000"/>
+</vector>
diff --git a/app/src/main/res/layout/item_contact.xml b/app/src/main/res/layout/item_contact.xml
@@ -19,9 +19,8 @@
 
     <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/isOnline"
-        android:layout_width="8dp"
-        android:layout_height="8dp"
-        android:layout_margin="3dp"
+        android:layout_width="14dp"
+        android:layout_height="14dp"
         app:srcCompat="@drawable/circle_green"
         app:layout_constraintEnd_toEndOf="@id/icon"
         app:layout_constraintBottom_toBottomOf="@id/icon" />
diff --git a/app/src/main/res/menu/special_menu.xml b/app/src/main/res/menu/special_menu.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item
+        android:id="@+id/star"
+        android:icon="@drawable/ic_grade_black_18dp"
+        android:background="@drawable/action_background"
+        android:iconTint="#ffab00"
+        tools:ignore="MenuTitle,UnusedAttribute" />
+</menu>
diff --git a/lib-swipetoactionlayout/src/main/java/github/com/st235/lib_swipetoactionlayout/ActionBindHelper.kt b/lib-swipetoactionlayout/src/main/java/github/com/st235/lib_swipetoactionlayout/ActionBindHelper.kt
@@ -0,0 +1,35 @@
+package github.com.st235.lib_swipetoactionlayout
+
+import java.util.*
+
+class ActionBindHelper {
+
+    private val actions: MutableMap<String, SwipeToActionLayout> = Collections.synchronizedMap(mutableMapOf())
+
+    fun bind(id: String, swipeToActionLayout: SwipeToActionLayout) {
+        val oldId = findWithView(swipeToActionLayout)
+        oldId?.let { actions.remove(it) }
+        actions[id] = swipeToActionLayout
+    }
+
+    private fun findWithView(swipeToActionLayout: SwipeToActionLayout): String? {
+        for ((id, actionLayout) in actions.entries) {
+            if (actionLayout == swipeToActionLayout) {
+                return id
+            }
+        }
+
+        return null
+    }
+
+    fun closeOtherThan(currentId: String) {
+        for ((id, actionLayout) in actions.entries) {
+            if (id == currentId) {
+                continue
+            }
+
+            actionLayout.close()
+        }
+    }
+
+}
diff --git a/lib-swipetoactionlayout/src/main/java/github/com/st235/lib_swipetoactionlayout/SwipeToActionLayout.kt b/lib-swipetoactionlayout/src/main/java/github/com/st235/lib_swipetoactionlayout/SwipeToActionLayout.kt
@@ -4,6 +4,7 @@ import android.content.Context
 import android.util.AttributeSet
 import android.util.Log
 import android.view.*
+import androidx.annotation.MenuRes
 import androidx.core.view.ViewCompat
 import androidx.customview.widget.ViewDragHelper
 import github.com.st235.lib_swipetoactionlayout.behaviour.BehaviourDelegate
@@ -120,12 +121,6 @@ class SwipeToActionLayout @JvmOverloads constructor(
                 QuickActionsStates.FULL_OPENED -> {
                     menuListener?.onFullyOpened(this, actions.last())
                 }
-                QuickActionsStates.OPENED -> {
-                    menuListener?.onOpened(this)
-                }
-                QuickActionsStates.CLOSED -> {
-                    menuListener?.onClosed(this)
-                }
             }
 
         }
@@ -137,12 +132,23 @@ class SwipeToActionLayout @JvmOverloads constructor(
                         performHapticFeedback(HapticFeedbackConstants.CLOCK_TICK)
                     }
                 }
-                else -> {
+                QuickActionsStates.OPENED -> {
+                    menuListener?.onOpened(this)
+                }
+                QuickActionsStates.CLOSED -> {
+                    menuListener?.onClosed(this)
                 }
             }
         }
     }
 
+    fun setActionsRes(@MenuRes menuRes: Int) {
+        val barParser = XmlMenuParser(context)
+        val items = barParser.inflate(menuRes)
+        actions = items
+        reloadActions()
+    }
+
     fun close() {
         transitionToState(QuickActionsStates.CLOSED)
     }
diff --git a/lib-swipetoactionlayout/src/main/java/github/com/st235/lib_swipetoactionlayout/utils/VelocityHelper.kt b/lib-swipetoactionlayout/src/main/java/github/com/st235/lib_swipetoactionlayout/utils/VelocityHelper.kt
@@ -1,7 +1,6 @@
 package github.com.st235.lib_swipetoactionlayout.utils
 
 import android.content.Context
-import android.util.Log
 import android.view.ViewConfiguration
 import kotlin.math.abs
 

Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@ import android.content.Context`
`4`	`4`	`import android.util.AttributeSet`
`5`	`5`	`import android.util.Log`
`6`	`6`	`import android.view.*`
	`7`	`+import androidx.annotation.MenuRes`
`7`	`8`	`import androidx.core.view.ViewCompat`
`8`	`9`	`import androidx.customview.widget.ViewDragHelper`
`9`	`10`	`import github.com.st235.lib_swipetoactionlayout.behaviour.BehaviourDelegate`
`@@ -120,12 +121,6 @@ class SwipeToActionLayout @JvmOverloads constructor(`
`120`	`121`	`QuickActionsStates.FULL_OPENED -> {`
`121`	`122`	`menuListener?.onFullyOpened(this, actions.last())`
`122`	`123`	`}`
`123`		`- QuickActionsStates.OPENED -> {`
`124`		`- menuListener?.onOpened(this)`
`125`		`- }`
`126`		`- QuickActionsStates.CLOSED -> {`
`127`		`- menuListener?.onClosed(this)`
`128`		`- }`
`129`	`124`	`}`
`130`	`125`
`131`	`126`	`}`
`@@ -137,12 +132,23 @@ class SwipeToActionLayout @JvmOverloads constructor(`
`137`	`132`	`performHapticFeedback(HapticFeedbackConstants.CLOCK_TICK)`
`138`	`133`	`}`
`139`	`134`	`}`
`140`		`- else -> {`
	`135`	`+ QuickActionsStates.OPENED -> {`
	`136`	`+ menuListener?.onOpened(this)`
	`137`	`+ }`
	`138`	`+ QuickActionsStates.CLOSED -> {`
	`139`	`+ menuListener?.onClosed(this)`
`141`	`140`	`}`
`142`	`141`	`}`
`143`	`142`	`}`
`144`	`143`	`}`
`145`	`144`
	`145`	`+ fun setActionsRes(@MenuRes menuRes: Int) {`
	`146`	`+ val barParser = XmlMenuParser(context)`
	`147`	`+ val items = barParser.inflate(menuRes)`
	`148`	`+ actions = items`
	`149`	`+ reloadActions()`
	`150`	`+ }`
	`151`	`+`
`146`	`152`	`fun close() {`
`147`	`153`	`transitionToState(QuickActionsStates.CLOSED)`
`148`	`154`	`}`