From 54a9f7b2864ea2cbd6ac783f797c53fa85fe2403 Mon Sep 17 00:00:00 2001 From: tibbi Date: Thu, 27 Jan 2022 22:50:18 +0100 Subject: [PATCH] split clips adapter shown on keyboard and activity --- .../keyboard/adapters/ClipsKeyboardAdapter.kt | 54 +++++++++++++++++++ .../keyboard/views/MyKeyboardView.kt | 4 +- ...tem_clip.xml => item_clip_in_activity.xml} | 0 .../main/res/layout/item_clip_on_keyboard.xml | 18 +++++++ 4 files changed, 74 insertions(+), 2 deletions(-) create mode 100644 app/src/main/kotlin/com/simplemobiletools/keyboard/adapters/ClipsKeyboardAdapter.kt rename app/src/main/res/layout/{item_clip.xml => item_clip_in_activity.xml} (100%) create mode 100644 app/src/main/res/layout/item_clip_on_keyboard.xml diff --git a/app/src/main/kotlin/com/simplemobiletools/keyboard/adapters/ClipsKeyboardAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/keyboard/adapters/ClipsKeyboardAdapter.kt new file mode 100644 index 00000000..4e78716b --- /dev/null +++ b/app/src/main/kotlin/com/simplemobiletools/keyboard/adapters/ClipsKeyboardAdapter.kt @@ -0,0 +1,54 @@ +package com.simplemobiletools.keyboard.adapters + +import android.content.Context +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import androidx.recyclerview.widget.RecyclerView +import com.simplemobiletools.commons.extensions.removeUnderlines +import com.simplemobiletools.keyboard.R +import com.simplemobiletools.keyboard.extensions.config +import com.simplemobiletools.keyboard.models.Clip +import kotlinx.android.synthetic.main.item_clip_on_keyboard.view.* +import java.util.* + +class ClipsKeyboardAdapter(val context: Context, var clips: ArrayList, val itemClick: (clip: Clip) -> Unit) : + RecyclerView.Adapter() { + + private val layoutInflater = LayoutInflater.from(context) + private val baseConfig = context.config + private var textColor = baseConfig.textColor + + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolderr { + val view = layoutInflater.inflate(R.layout.item_clip_on_keyboard, parent, false) + return ViewHolderr(view) + } + + override fun onBindViewHolder(holder: ViewHolderr, position: Int) { + val item = clips[position] + holder.bindView(item) { itemView -> + setupView(itemView, item) + } + } + + override fun getItemCount() = clips.size + + private fun setupView(view: View, clip: Clip) { + view.clip_value.apply { + text = clip.value + removeUnderlines() + setTextColor(textColor) + } + } + + open inner class ViewHolderr(view: View) : RecyclerView.ViewHolder(view) { + fun bindView(clip: Clip, callback: (itemView: View) -> Unit): View { + return itemView.apply { + callback(this) + setOnClickListener { + itemClick.invoke(clip) + } + } + } + } +} diff --git a/app/src/main/kotlin/com/simplemobiletools/keyboard/views/MyKeyboardView.kt b/app/src/main/kotlin/com/simplemobiletools/keyboard/views/MyKeyboardView.kt index b9f40c91..d4b970ad 100644 --- a/app/src/main/kotlin/com/simplemobiletools/keyboard/views/MyKeyboardView.kt +++ b/app/src/main/kotlin/com/simplemobiletools/keyboard/views/MyKeyboardView.kt @@ -30,7 +30,7 @@ import com.simplemobiletools.commons.helpers.isPiePlus import com.simplemobiletools.keyboard.R import com.simplemobiletools.keyboard.activities.ManageClipboardItemsActivity import com.simplemobiletools.keyboard.activities.SettingsActivity -import com.simplemobiletools.keyboard.adapters.ClipsAdapter +import com.simplemobiletools.keyboard.adapters.ClipsKeyboardAdapter import com.simplemobiletools.keyboard.extensions.config import com.simplemobiletools.keyboard.helpers.* import com.simplemobiletools.keyboard.helpers.MyKeyboard.Companion.KEYCODE_DELETE @@ -1334,7 +1334,7 @@ class MyKeyboardView @JvmOverloads constructor(context: Context, attrs: Attribut clips_list.beVisibleIf(clips.isNotEmpty()) } - val adapter = ClipsAdapter(context, clips) { clip -> + val adapter = ClipsKeyboardAdapter(context, clips) { clip -> mOnKeyboardActionListener!!.onText(clip.value) vibrateIfNeeded() } diff --git a/app/src/main/res/layout/item_clip.xml b/app/src/main/res/layout/item_clip_in_activity.xml similarity index 100% rename from app/src/main/res/layout/item_clip.xml rename to app/src/main/res/layout/item_clip_in_activity.xml diff --git a/app/src/main/res/layout/item_clip_on_keyboard.xml b/app/src/main/res/layout/item_clip_on_keyboard.xml new file mode 100644 index 00000000..8f03b289 --- /dev/null +++ b/app/src/main/res/layout/item_clip_on_keyboard.xml @@ -0,0 +1,18 @@ + + + + + +