From 8c77eae5c3654fa1afe494b91c3149393f598374 Mon Sep 17 00:00:00 2001 From: darthpaul Date: Wed, 29 Sep 2021 17:01:45 +0100 Subject: [PATCH 1/8] Dynamically add checklist items --- .../pro/dialogs/NewChecklistItemDialog.kt | 75 ++++++++++++++----- .../res/layout/dialog_new_checklist_item.xml | 50 ++++++------- .../main/res/layout/item_add_checklist.xml | 32 ++++++++ app/src/main/res/values/dimens.xml | 1 + 4 files changed, 111 insertions(+), 47 deletions(-) create mode 100644 app/src/main/res/layout/item_add_checklist.xml diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/pro/dialogs/NewChecklistItemDialog.kt b/app/src/main/kotlin/com/simplemobiletools/notes/pro/dialogs/NewChecklistItemDialog.kt index da1183e0..93e1c739 100644 --- a/app/src/main/kotlin/com/simplemobiletools/notes/pro/dialogs/NewChecklistItemDialog.kt +++ b/app/src/main/kotlin/com/simplemobiletools/notes/pro/dialogs/NewChecklistItemDialog.kt @@ -2,38 +2,73 @@ package com.simplemobiletools.notes.pro.dialogs import android.app.Activity import android.content.DialogInterface.BUTTON_POSITIVE +import android.view.KeyEvent +import android.view.View +import android.view.ViewGroup +import android.view.inputmethod.EditorInfo +import android.widget.EditText import androidx.appcompat.app.AlertDialog import com.simplemobiletools.commons.extensions.setupDialogStuff import com.simplemobiletools.commons.extensions.showKeyboard import com.simplemobiletools.commons.extensions.toast -import com.simplemobiletools.commons.extensions.value import com.simplemobiletools.notes.pro.R -import kotlinx.android.synthetic.main.dialog_new_checklist_item.view.* +import kotlinx.android.synthetic.main.dialog_new_checklist_item.view.add_item +import kotlinx.android.synthetic.main.dialog_new_checklist_item.view.checklist_holder +import kotlinx.android.synthetic.main.dialog_new_checklist_item.view.dialog_holder +import kotlinx.android.synthetic.main.item_add_checklist.view.delete_item +import kotlinx.android.synthetic.main.item_add_checklist.view.title_edit_text class NewChecklistItemDialog(val activity: Activity, callback: (titles: ArrayList) -> Unit) { - init { - val view = activity.layoutInflater.inflate(R.layout.dialog_new_checklist_item, null) + private val titles = mutableListOf() + private val view: ViewGroup = activity.layoutInflater.inflate(R.layout.dialog_new_checklist_item, null) as ViewGroup + init { + addNewEditText() + view.add_item.setOnClickListener { + addNewEditText() + } AlertDialog.Builder(activity) - .setPositiveButton(R.string.ok, null) - .setNegativeButton(R.string.cancel, null) - .create().apply { - activity.setupDialogStuff(view, this, R.string.add_new_checklist_items) { - showKeyboard(view.checklist_item_title_1) - getButton(BUTTON_POSITIVE).setOnClickListener { - val title1 = view.checklist_item_title_1.value - val title2 = view.checklist_item_title_2.value - val title3 = view.checklist_item_title_3.value - when { - title1.isEmpty() && title2.isEmpty() && title3.isEmpty() -> activity.toast(R.string.empty_name) - else -> { - val titles = arrayListOf(title1, title2, title3).filter { it.isNotEmpty() }.toMutableList() as ArrayList - callback(titles) - dismiss() - } + .setPositiveButton(R.string.ok, null) + .setNegativeButton(R.string.cancel, null) + .create().apply { + activity.setupDialogStuff(view, this, R.string.add_new_checklist_items, cancelOnTouchOutside = false) { + activity.showKeyboard(titles.first()) + getButton(BUTTON_POSITIVE).setOnClickListener { + when { + titles.all { it.text.isEmpty() } -> activity.toast(R.string.empty_name) + else -> { + val titles = titles.map { it.text.toString() }.filter { it.isNotEmpty() }.toMutableList() as ArrayList + callback(titles) + dismiss() } } } } + } + } + + private fun addNewEditText() { + activity.layoutInflater.inflate(R.layout.item_add_checklist, null).apply { + title_edit_text.setOnEditorActionListener { _, actionId, _ -> + if (actionId == EditorInfo.IME_ACTION_NEXT || actionId == EditorInfo.IME_ACTION_DONE || actionId == KeyEvent.KEYCODE_ENTER) { + addNewEditText() + true + } else { + false + } + } + + val currentIndex = titles.size + delete_item.setOnClickListener { + view.checklist_holder.removeViewAt(currentIndex) + titles.removeAt(currentIndex) + } + titles.add(title_edit_text) + view.checklist_holder.addView(this) + view.dialog_holder.post { + view.dialog_holder.fullScroll(View.FOCUS_DOWN) + activity.showKeyboard(title_edit_text) + } + } } } diff --git a/app/src/main/res/layout/dialog_new_checklist_item.xml b/app/src/main/res/layout/dialog_new_checklist_item.xml index e8be88db..0eb1723a 100644 --- a/app/src/main/res/layout/dialog_new_checklist_item.xml +++ b/app/src/main/res/layout/dialog_new_checklist_item.xml @@ -1,41 +1,37 @@ - - + android:orientation="vertical"> - + - + - + + + diff --git a/app/src/main/res/layout/item_add_checklist.xml b/app/src/main/res/layout/item_add_checklist.xml new file mode 100644 index 00000000..83d60bdf --- /dev/null +++ b/app/src/main/res/layout/item_add_checklist.xml @@ -0,0 +1,32 @@ + + + + + + + + diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml index 1a0e9740..b671d69a 100644 --- a/app/src/main/res/values/dimens.xml +++ b/app/src/main/res/values/dimens.xml @@ -1,3 +1,4 @@ 56dp + 36dp From 12e21a02824205d4dc50383c7a20eacd4f2ecb53 Mon Sep 17 00:00:00 2001 From: darthpaul Date: Sun, 3 Oct 2021 15:08:14 +0100 Subject: [PATCH 2/8] Remove delete icon from checklist item --- .../pro/dialogs/NewChecklistItemDialog.kt | 7 ---- .../main/res/layout/item_add_checklist.xml | 37 ++++--------------- 2 files changed, 7 insertions(+), 37 deletions(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/pro/dialogs/NewChecklistItemDialog.kt b/app/src/main/kotlin/com/simplemobiletools/notes/pro/dialogs/NewChecklistItemDialog.kt index 93e1c739..290ccf65 100644 --- a/app/src/main/kotlin/com/simplemobiletools/notes/pro/dialogs/NewChecklistItemDialog.kt +++ b/app/src/main/kotlin/com/simplemobiletools/notes/pro/dialogs/NewChecklistItemDialog.kt @@ -15,7 +15,6 @@ import com.simplemobiletools.notes.pro.R import kotlinx.android.synthetic.main.dialog_new_checklist_item.view.add_item import kotlinx.android.synthetic.main.dialog_new_checklist_item.view.checklist_holder import kotlinx.android.synthetic.main.dialog_new_checklist_item.view.dialog_holder -import kotlinx.android.synthetic.main.item_add_checklist.view.delete_item import kotlinx.android.synthetic.main.item_add_checklist.view.title_edit_text class NewChecklistItemDialog(val activity: Activity, callback: (titles: ArrayList) -> Unit) { @@ -57,12 +56,6 @@ class NewChecklistItemDialog(val activity: Activity, callback: (titles: ArrayLis false } } - - val currentIndex = titles.size - delete_item.setOnClickListener { - view.checklist_holder.removeViewAt(currentIndex) - titles.removeAt(currentIndex) - } titles.add(title_edit_text) view.checklist_holder.addView(this) view.dialog_holder.post { diff --git a/app/src/main/res/layout/item_add_checklist.xml b/app/src/main/res/layout/item_add_checklist.xml index 83d60bdf..4dfd72db 100644 --- a/app/src/main/res/layout/item_add_checklist.xml +++ b/app/src/main/res/layout/item_add_checklist.xml @@ -1,32 +1,9 @@ - - - - - - - + android:layout_height="wrap_content" + android:inputType="textCapSentences" + android:maxLength="500" + android:textCursorDrawable="@null" + android:textSize="@dimen/normal_text_size" /> From 57f65ad5c48a694a969d51c00fe6709d7433d744 Mon Sep 17 00:00:00 2001 From: darthpaul Date: Sun, 3 Oct 2021 15:19:36 +0100 Subject: [PATCH 3/8] Remove delete icon size dimen --- app/src/main/res/values/dimens.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml index b671d69a..1a0e9740 100644 --- a/app/src/main/res/values/dimens.xml +++ b/app/src/main/res/values/dimens.xml @@ -1,4 +1,3 @@ 56dp - 36dp From 579cf0feaada07f27c3539afe61f9d946dd095b5 Mon Sep 17 00:00:00 2001 From: darthpaul Date: Tue, 5 Oct 2021 20:06:48 +0100 Subject: [PATCH 4/8] Change button to add new checklist item --- .../res/layout/dialog_new_checklist_item.xml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/app/src/main/res/layout/dialog_new_checklist_item.xml b/app/src/main/res/layout/dialog_new_checklist_item.xml index 0eb1723a..2206ae88 100644 --- a/app/src/main/res/layout/dialog_new_checklist_item.xml +++ b/app/src/main/res/layout/dialog_new_checklist_item.xml @@ -4,7 +4,6 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:fillViewport="true" - android:orientation="vertical" android:paddingStart="@dimen/activity_margin" android:paddingTop="@dimen/activity_margin" android:paddingEnd="@dimen/activity_margin"> @@ -20,17 +19,18 @@ android:layout_height="wrap_content" android:orientation="vertical" /> - + android:layout_marginBottom="@dimen/medium_margin" + android:background="@drawable/button_background" + android:paddingStart="@dimen/activity_margin" + android:paddingTop="@dimen/medium_margin" + android:paddingEnd="@dimen/activity_margin" + android:paddingBottom="@dimen/medium_margin" + android:src="@drawable/ic_plus_vector" /> From 2fdd2cc84507c6e31be1f35ac47dd291cb11b7c5 Mon Sep 17 00:00:00 2001 From: darthpaul Date: Tue, 5 Oct 2021 20:07:48 +0100 Subject: [PATCH 5/8] Update text colors, make keyboard ADJUST_RESIZE --- .../notes/pro/dialogs/NewChecklistItemDialog.kt | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/pro/dialogs/NewChecklistItemDialog.kt b/app/src/main/kotlin/com/simplemobiletools/notes/pro/dialogs/NewChecklistItemDialog.kt index 290ccf65..0324eee9 100644 --- a/app/src/main/kotlin/com/simplemobiletools/notes/pro/dialogs/NewChecklistItemDialog.kt +++ b/app/src/main/kotlin/com/simplemobiletools/notes/pro/dialogs/NewChecklistItemDialog.kt @@ -5,13 +5,13 @@ import android.content.DialogInterface.BUTTON_POSITIVE import android.view.KeyEvent import android.view.View import android.view.ViewGroup +import android.view.WindowManager import android.view.inputmethod.EditorInfo import android.widget.EditText import androidx.appcompat.app.AlertDialog -import com.simplemobiletools.commons.extensions.setupDialogStuff -import com.simplemobiletools.commons.extensions.showKeyboard -import com.simplemobiletools.commons.extensions.toast +import com.simplemobiletools.commons.extensions.* import com.simplemobiletools.notes.pro.R +import com.simplemobiletools.notes.pro.extensions.config import kotlinx.android.synthetic.main.dialog_new_checklist_item.view.add_item import kotlinx.android.synthetic.main.dialog_new_checklist_item.view.checklist_holder import kotlinx.android.synthetic.main.dialog_new_checklist_item.view.dialog_holder @@ -19,10 +19,13 @@ import kotlinx.android.synthetic.main.item_add_checklist.view.title_edit_text class NewChecklistItemDialog(val activity: Activity, callback: (titles: ArrayList) -> Unit) { private val titles = mutableListOf() + private val textColor = activity.config.textColor private val view: ViewGroup = activity.layoutInflater.inflate(R.layout.dialog_new_checklist_item, null) as ViewGroup init { addNewEditText() + view.add_item.applyColorFilter(activity.getAdjustedPrimaryColor()) + view.add_item.background.applyColorFilter(textColor) view.add_item.setOnClickListener { addNewEditText() } @@ -32,6 +35,7 @@ class NewChecklistItemDialog(val activity: Activity, callback: (titles: ArrayLis .create().apply { activity.setupDialogStuff(view, this, R.string.add_new_checklist_items, cancelOnTouchOutside = false) { activity.showKeyboard(titles.first()) + window?.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE) getButton(BUTTON_POSITIVE).setOnClickListener { when { titles.all { it.text.isEmpty() } -> activity.toast(R.string.empty_name) @@ -58,6 +62,7 @@ class NewChecklistItemDialog(val activity: Activity, callback: (titles: ArrayLis } titles.add(title_edit_text) view.checklist_holder.addView(this) + activity.updateTextColors(view.checklist_holder) view.dialog_holder.post { view.dialog_holder.fullScroll(View.FOCUS_DOWN) activity.showKeyboard(title_edit_text) From e050635adca849aee7d5f3f16e206a142cfe3b46 Mon Sep 17 00:00:00 2001 From: Tibor Kaputa Date: Wed, 6 Oct 2021 22:12:26 +0200 Subject: [PATCH 6/8] Allow closing the dialog by clicking outside of it --- .../notes/pro/dialogs/NewChecklistItemDialog.kt | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/pro/dialogs/NewChecklistItemDialog.kt b/app/src/main/kotlin/com/simplemobiletools/notes/pro/dialogs/NewChecklistItemDialog.kt index 0324eee9..6af3028e 100644 --- a/app/src/main/kotlin/com/simplemobiletools/notes/pro/dialogs/NewChecklistItemDialog.kt +++ b/app/src/main/kotlin/com/simplemobiletools/notes/pro/dialogs/NewChecklistItemDialog.kt @@ -12,10 +12,8 @@ import androidx.appcompat.app.AlertDialog import com.simplemobiletools.commons.extensions.* import com.simplemobiletools.notes.pro.R import com.simplemobiletools.notes.pro.extensions.config -import kotlinx.android.synthetic.main.dialog_new_checklist_item.view.add_item -import kotlinx.android.synthetic.main.dialog_new_checklist_item.view.checklist_holder -import kotlinx.android.synthetic.main.dialog_new_checklist_item.view.dialog_holder -import kotlinx.android.synthetic.main.item_add_checklist.view.title_edit_text +import kotlinx.android.synthetic.main.dialog_new_checklist_item.view.* +import kotlinx.android.synthetic.main.item_add_checklist.view.* class NewChecklistItemDialog(val activity: Activity, callback: (titles: ArrayList) -> Unit) { private val titles = mutableListOf() @@ -33,7 +31,7 @@ class NewChecklistItemDialog(val activity: Activity, callback: (titles: ArrayLis .setPositiveButton(R.string.ok, null) .setNegativeButton(R.string.cancel, null) .create().apply { - activity.setupDialogStuff(view, this, R.string.add_new_checklist_items, cancelOnTouchOutside = false) { + activity.setupDialogStuff(view, this, R.string.add_new_checklist_items) { activity.showKeyboard(titles.first()) window?.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE) getButton(BUTTON_POSITIVE).setOnClickListener { From 059ba847758dab4bb514f2241ae8cc40720219fc Mon Sep 17 00:00:00 2001 From: darthpaul Date: Wed, 6 Oct 2021 23:43:50 +0100 Subject: [PATCH 7/8] show keyboard when checklist dialog opens --- .../notes/pro/dialogs/NewChecklistItemDialog.kt | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/pro/dialogs/NewChecklistItemDialog.kt b/app/src/main/kotlin/com/simplemobiletools/notes/pro/dialogs/NewChecklistItemDialog.kt index 0324eee9..374eeeea 100644 --- a/app/src/main/kotlin/com/simplemobiletools/notes/pro/dialogs/NewChecklistItemDialog.kt +++ b/app/src/main/kotlin/com/simplemobiletools/notes/pro/dialogs/NewChecklistItemDialog.kt @@ -5,7 +5,6 @@ import android.content.DialogInterface.BUTTON_POSITIVE import android.view.KeyEvent import android.view.View import android.view.ViewGroup -import android.view.WindowManager import android.view.inputmethod.EditorInfo import android.widget.EditText import androidx.appcompat.app.AlertDialog @@ -34,8 +33,7 @@ class NewChecklistItemDialog(val activity: Activity, callback: (titles: ArrayLis .setNegativeButton(R.string.cancel, null) .create().apply { activity.setupDialogStuff(view, this, R.string.add_new_checklist_items, cancelOnTouchOutside = false) { - activity.showKeyboard(titles.first()) - window?.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE) + showKeyboard(titles.first()) getButton(BUTTON_POSITIVE).setOnClickListener { when { titles.all { it.text.isEmpty() } -> activity.toast(R.string.empty_name) From ba8e9e6a29b3342acb0ce4257eb0c1b9f19a1aa1 Mon Sep 17 00:00:00 2001 From: darthpaul Date: Wed, 6 Oct 2021 23:44:22 +0100 Subject: [PATCH 8/8] dismiss checklist dialog on touch outside --- .../notes/pro/dialogs/NewChecklistItemDialog.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/pro/dialogs/NewChecklistItemDialog.kt b/app/src/main/kotlin/com/simplemobiletools/notes/pro/dialogs/NewChecklistItemDialog.kt index 374eeeea..e74d772f 100644 --- a/app/src/main/kotlin/com/simplemobiletools/notes/pro/dialogs/NewChecklistItemDialog.kt +++ b/app/src/main/kotlin/com/simplemobiletools/notes/pro/dialogs/NewChecklistItemDialog.kt @@ -32,7 +32,7 @@ class NewChecklistItemDialog(val activity: Activity, callback: (titles: ArrayLis .setPositiveButton(R.string.ok, null) .setNegativeButton(R.string.cancel, null) .create().apply { - activity.setupDialogStuff(view, this, R.string.add_new_checklist_items, cancelOnTouchOutside = false) { + activity.setupDialogStuff(view, this, R.string.add_new_checklist_items) { showKeyboard(titles.first()) getButton(BUTTON_POSITIVE).setOnClickListener { when {