From 58ea5d0ecfd8f7c966965868a00b0a3a38872954 Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Thu, 29 Mar 2018 16:40:58 -0400 Subject: [PATCH] Show background and icon when swiping to archive --- .../ConversationItemTouchCallback.kt | 49 ++++++++++++++++++- .../main/java/feature/main/MainActivity.kt | 5 +- .../res/drawable/ic_archive_black_24dp.xml | 9 ++++ .../res/drawable/ic_folder_black_24dp.xml | 27 ---------- .../res/layout/conversation_info_activity.xml | 2 +- .../src/main/res/layout/drawer_view.xml | 2 +- 6 files changed, 63 insertions(+), 31 deletions(-) create mode 100644 presentation/src/main/res/drawable/ic_archive_black_24dp.xml delete mode 100644 presentation/src/main/res/drawable/ic_folder_black_24dp.xml diff --git a/presentation/src/main/java/feature/conversations/ConversationItemTouchCallback.kt b/presentation/src/main/java/feature/conversations/ConversationItemTouchCallback.kt index 7de68c78..fd6e0a87 100644 --- a/presentation/src/main/java/feature/conversations/ConversationItemTouchCallback.kt +++ b/presentation/src/main/java/feature/conversations/ConversationItemTouchCallback.kt @@ -18,20 +18,67 @@ */ package feature.conversations +import android.content.Context +import android.graphics.Bitmap +import android.graphics.Canvas +import android.graphics.Paint import android.support.v7.widget.RecyclerView import android.support.v7.widget.helper.ItemTouchHelper +import androidx.graphics.drawable.toBitmap +import com.moez.QKSMS.R +import common.util.extensions.dpToPx import io.reactivex.subjects.PublishSubject import io.reactivex.subjects.Subject import javax.inject.Inject -class ConversationItemTouchCallback @Inject constructor() : ItemTouchHelper.SimpleCallback(0, ItemTouchHelper.LEFT or ItemTouchHelper.RIGHT) { + +class ConversationItemTouchCallback @Inject constructor(private val context: Context) : ItemTouchHelper.SimpleCallback(0, ItemTouchHelper.LEFT or ItemTouchHelper.RIGHT) { val swipes: Subject = PublishSubject.create() + private var paint = Paint() + private lateinit var icon: Bitmap + + private var iconLength = 24.dpToPx(context) + + var color: Int = 0 + set(value) { + field = value + paint.color = value + } + + var iconColor: Int = 0 + set(value) { + field = value + icon = context.resources.getDrawable(R.drawable.ic_archive_black_24dp) + .apply { setTint(value) } + .toBitmap(iconLength, iconLength) + } + override fun onMove(recyclerView: RecyclerView?, viewHolder: RecyclerView.ViewHolder?, target: RecyclerView.ViewHolder?): Boolean { return false } + override fun onChildDraw(c: Canvas, recyclerView: RecyclerView?, viewHolder: RecyclerView.ViewHolder, dX: Float, dY: Float, actionState: Int, isCurrentlyActive: Boolean) { + if (actionState == ItemTouchHelper.ACTION_STATE_SWIPE) { + val itemView = viewHolder.itemView + + if (dX > 0) { + c.drawRect(itemView.left.toFloat(), itemView.top.toFloat(), dX, itemView.bottom.toFloat(), paint) + c.drawBitmap(icon, itemView.left.toFloat() + iconLength, + itemView.top.toFloat() + (itemView.bottom.toFloat() - itemView.top.toFloat() - icon.height) / 2, + paint) + } else if (dX < 0) { + c.drawRect(itemView.right.toFloat() + dX, itemView.top.toFloat(), itemView.right.toFloat(), itemView.bottom.toFloat(), paint) + c.drawBitmap(icon, itemView.right.toFloat() - iconLength - icon.width, + itemView.top.toFloat() + (itemView.bottom.toFloat() - itemView.top.toFloat() - icon.height) / 2, + paint) + } + + super.onChildDraw(c, recyclerView, viewHolder, dX, dY, actionState, isCurrentlyActive) + } + } + override fun onSwiped(viewHolder: RecyclerView.ViewHolder, direction: Int) { swipes.onNext(viewHolder.itemId) } diff --git a/presentation/src/main/java/feature/main/MainActivity.kt b/presentation/src/main/java/feature/main/MainActivity.kt index a1e378c9..77cbb1ff 100644 --- a/presentation/src/main/java/feature/main/MainActivity.kt +++ b/presentation/src/main/java/feature/main/MainActivity.kt @@ -133,14 +133,17 @@ class MainActivity : QkThemedActivity(), MainView { // Set the theme color tint to the progressbar and FAB colors.theme .doOnNext { color -> syncingProgress.indeterminateTintList = ColorStateList.valueOf(color) } + .doOnNext { color -> itemTouchCallback.color = color } .doOnNext { color -> compose.setBackgroundTint(color) } .autoDisposable(scope()) .subscribe() // Set the FAB compose icon color colors.textPrimaryOnTheme + .doOnNext { color -> compose.setTint(color) } + .doOnNext { color -> itemTouchCallback.iconColor = color} .autoDisposable(scope()) - .subscribe { color -> compose.setTint(color) } + .subscribe() // Set the hamburger icon color colors.textSecondary diff --git a/presentation/src/main/res/drawable/ic_archive_black_24dp.xml b/presentation/src/main/res/drawable/ic_archive_black_24dp.xml new file mode 100644 index 00000000..8b18a9d5 --- /dev/null +++ b/presentation/src/main/res/drawable/ic_archive_black_24dp.xml @@ -0,0 +1,9 @@ + + + diff --git a/presentation/src/main/res/drawable/ic_folder_black_24dp.xml b/presentation/src/main/res/drawable/ic_folder_black_24dp.xml deleted file mode 100644 index 87ef8347..00000000 --- a/presentation/src/main/res/drawable/ic_folder_black_24dp.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - diff --git a/presentation/src/main/res/layout/conversation_info_activity.xml b/presentation/src/main/res/layout/conversation_info_activity.xml index 38130750..323d4eff 100644 --- a/presentation/src/main/res/layout/conversation_info_activity.xml +++ b/presentation/src/main/res/layout/conversation_info_activity.xml @@ -78,7 +78,7 @@ android:id="@+id/archive" android:layout_width="match_parent" android:layout_height="wrap_content" - app:icon="@drawable/ic_folder_black_24dp" + app:icon="@drawable/ic_archive_black_24dp" app:title="@string/info_archive" /> + android:src="@drawable/ic_archive_black_24dp" />