From 835168ef0a43d468c541997e5a1bed42c77e9cc6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ensar=20Saraj=C4=8Di=C4=87?= Date: Tue, 1 Aug 2023 08:20:20 +0200 Subject: [PATCH] Add fab for OpenNoteDialog --- .../notes/pro/adapters/OpenNoteAdapter.kt | 56 +++---------------- .../notes/pro/dialogs/OpenNoteDialog.kt | 16 +++--- app/src/main/res/layout/dialog_open_note.xml | 25 ++++++--- app/src/main/res/values/dimens.xml | 2 + 4 files changed, 35 insertions(+), 64 deletions(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/pro/adapters/OpenNoteAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/notes/pro/adapters/OpenNoteAdapter.kt index 92b85bce..0e0be36e 100644 --- a/app/src/main/kotlin/com/simplemobiletools/notes/pro/adapters/OpenNoteAdapter.kt +++ b/app/src/main/kotlin/com/simplemobiletools/notes/pro/adapters/OpenNoteAdapter.kt @@ -11,7 +11,6 @@ import com.google.gson.Gson import com.google.gson.reflect.TypeToken import com.simplemobiletools.commons.activities.BaseSimpleActivity import com.simplemobiletools.commons.adapters.MyRecyclerViewAdapter -import com.simplemobiletools.commons.extensions.applyColorFilter import com.simplemobiletools.commons.extensions.beGoneIf import com.simplemobiletools.commons.extensions.getColoredDrawableWithColor import com.simplemobiletools.commons.extensions.isBlackAndWhiteTheme @@ -23,9 +22,6 @@ import com.simplemobiletools.notes.pro.extensions.config import com.simplemobiletools.notes.pro.models.ChecklistItem import com.simplemobiletools.notes.pro.models.Note import com.simplemobiletools.notes.pro.models.NoteType -import kotlinx.android.synthetic.main.open_new_note_item.view.open_new_note_icon -import kotlinx.android.synthetic.main.open_new_note_item.view.open_new_note_item_holder -import kotlinx.android.synthetic.main.open_new_note_item.view.open_new_note_item_title import kotlinx.android.synthetic.main.open_note_item.view.open_note_item_holder import kotlinx.android.synthetic.main.open_note_item.view.open_note_item_text import kotlinx.android.synthetic.main.open_note_item.view.open_note_item_title @@ -34,12 +30,6 @@ class OpenNoteAdapter( activity: BaseSimpleActivity, var items: List, recyclerView: MyRecyclerView, itemClick: (Any) -> Unit ) : MyRecyclerViewAdapter(activity, recyclerView, itemClick) { - private companion object { - const val NEW_NOTE_ID = -1 - const val VIEW_TYPE_NOTE = 0 - const val VIEW_TYPE_NEW_NOTE = 1 - } - override fun getActionMenuId() = 0 override fun actionItemPressed(id: Int) {} @@ -48,13 +38,9 @@ class OpenNoteAdapter( override fun getIsItemSelectable(position: Int) = false - override fun getItemSelectionKey(position: Int) = items.getOrNull(position)?.id?.toInt() ?: NEW_NOTE_ID + override fun getItemSelectionKey(position: Int) = items.getOrNull(position)?.id?.toInt() - override fun getItemKeyPosition(key: Int) = if (key == NEW_NOTE_ID) { - items.size - } else { - items.indexOfFirst { it.id?.toInt() == key } - } + override fun getItemKeyPosition(key: Int) = items.indexOfFirst { it.id?.toInt() == key } override fun onActionModeCreated() {} @@ -62,36 +48,19 @@ class OpenNoteAdapter( override fun prepareActionMode(menu: Menu) {} - override fun getItemViewType(position: Int): Int = if (position == items.size) { - VIEW_TYPE_NEW_NOTE - } else { - VIEW_TYPE_NOTE - } - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder { - val layout = if (viewType == VIEW_TYPE_NEW_NOTE) { - R.layout.open_new_note_item - } else { - R.layout.open_note_item - } - return createViewHolder(layout, parent) + return createViewHolder(R.layout.open_note_item, parent) } override fun onBindViewHolder(holder: ViewHolder, position: Int) { - if (position == items.size) { - holder.bindView(NEW_NOTE_ID, true, false) { itemView, layoutPosition -> - setupNewNoteView(itemView) - } - } else { - val item = items[position] - holder.bindView(item, true, false) { itemView, layoutPosition -> - setupView(itemView, item) - } + val item = items[position] + holder.bindView(item, true, false) { itemView, layoutPosition -> + setupView(itemView, item) } bindViewHolder(holder) } - override fun getItemCount() = items.size + 1 + override fun getItemCount() = items.size private fun setupView(view: View, note: Note) { view.apply { @@ -109,17 +78,6 @@ class OpenNoteAdapter( } } - private fun setupNewNoteView(view: View) { - view.apply { - setupCard(open_new_note_item_holder) - open_new_note_item_title.apply { - setText(R.string.create_new_note) - setTextColor(properPrimaryColor) - } - open_new_note_icon.applyColorFilter(properPrimaryColor) - } - } - private fun View.setupCard(holder: View) { if (context.isBlackAndWhiteTheme()) { holder.setBackgroundResource(R.drawable.black_dialog_background) diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/pro/dialogs/OpenNoteDialog.kt b/app/src/main/kotlin/com/simplemobiletools/notes/pro/dialogs/OpenNoteDialog.kt index a131b96a..b32e069a 100644 --- a/app/src/main/kotlin/com/simplemobiletools/notes/pro/dialogs/OpenNoteDialog.kt +++ b/app/src/main/kotlin/com/simplemobiletools/notes/pro/dialogs/OpenNoteDialog.kt @@ -12,6 +12,7 @@ import com.simplemobiletools.notes.pro.adapters.OpenNoteAdapter import com.simplemobiletools.notes.pro.helpers.NotesHelper import com.simplemobiletools.notes.pro.models.Note import kotlinx.android.synthetic.main.dialog_open_note.view.dialog_open_note_list +import kotlinx.android.synthetic.main.dialog_open_note.view.new_note_fab class OpenNoteDialog(val activity: BaseSimpleActivity, val callback: (checkedId: Long, newNote: Note?) -> Unit) { private var dialog: AlertDialog? = null @@ -29,14 +30,15 @@ class OpenNoteDialog(val activity: BaseSimpleActivity, val callback: (checkedId: private fun initDialog(notes: List, view: View) { view.dialog_open_note_list.adapter = OpenNoteAdapter(activity, notes, view.dialog_open_note_list) { - if (it is Note) { - callback(it.id!!, null) + it as Note + callback(it.id!!, null) + dialog?.dismiss() + } + + view.new_note_fab.setOnClickListener { + NewNoteDialog(activity, setChecklistAsDefault = false) { + callback(0, it) dialog?.dismiss() - } else { - NewNoteDialog(activity, setChecklistAsDefault = false) { - callback(0, it) - dialog?.dismiss() - } } } diff --git a/app/src/main/res/layout/dialog_open_note.xml b/app/src/main/res/layout/dialog_open_note.xml index 7faee625..59dbcc0e 100644 --- a/app/src/main/res/layout/dialog_open_note.xml +++ b/app/src/main/res/layout/dialog_open_note.xml @@ -1,26 +1,35 @@ - + android:minHeight="@dimen/min_open_note_popup_height" + app:layout_constraintHeight_max="@dimen/max_open_note_popup_height"> + + - + + + + diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml index 195c26d6..387b5ed0 100644 --- a/app/src/main/res/values/dimens.xml +++ b/app/src/main/res/values/dimens.xml @@ -2,4 +2,6 @@ 56dp 150dp 300dp + 500dp + 200dp