From 334056852a82aeed10a34981b7e8fa491b3cda72 Mon Sep 17 00:00:00 2001 From: tibbi Date: Sun, 9 Dec 2018 10:40:50 +0100 Subject: [PATCH] adding a placeholder at empty checklists --- .../notes/pro/fragments/ChecklistFragment.kt | 40 +++++++++++++---- .../main/res/layout/fragment_checklist.xml | 44 ++++++++++++++++--- app/src/main/res/values-az/strings.xml | 1 + app/src/main/res/values-da/strings.xml | 1 + app/src/main/res/values-de/strings.xml | 1 + app/src/main/res/values-es/strings.xml | 1 + app/src/main/res/values-fr/strings.xml | 1 + app/src/main/res/values-gl/strings.xml | 1 + app/src/main/res/values-hr/strings.xml | 1 + app/src/main/res/values-hu/strings.xml | 1 + app/src/main/res/values-it/strings.xml | 1 + app/src/main/res/values-ja/strings.xml | 1 + app/src/main/res/values-lt/strings.xml | 1 + app/src/main/res/values-nl/strings.xml | 1 + app/src/main/res/values-pl/strings.xml | 1 + app/src/main/res/values-pt-rBR/strings.xml | 1 + app/src/main/res/values-pt/strings.xml | 1 + app/src/main/res/values-ru/strings.xml | 1 + app/src/main/res/values-sk/strings.xml | 1 + app/src/main/res/values-sv/strings.xml | 1 + app/src/main/res/values-tr/strings.xml | 1 + app/src/main/res/values-zh-rCN/strings.xml | 1 + app/src/main/res/values-zh-rTW/strings.xml | 1 + app/src/main/res/values/strings.xml | 1 + 24 files changed, 91 insertions(+), 15 deletions(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/pro/fragments/ChecklistFragment.kt b/app/src/main/kotlin/com/simplemobiletools/notes/pro/fragments/ChecklistFragment.kt index d27c5ca0..ce30c2f2 100644 --- a/app/src/main/kotlin/com/simplemobiletools/notes/pro/fragments/ChecklistFragment.kt +++ b/app/src/main/kotlin/com/simplemobiletools/notes/pro/fragments/ChecklistFragment.kt @@ -42,6 +42,7 @@ class ChecklistFragment : NoteFragment(), ChecklistItemsListener { val checklistItemType = object : TypeToken>() {}.type items = Gson().fromJson>(note!!.value, checklistItemType) ?: ArrayList(1) + context!!.updateTextColors(view.checklist_holder) setupFragment() } } @@ -56,22 +57,42 @@ class ChecklistFragment : NoteFragment(), ChecklistItemsListener { private fun setupFragment() { val plusIcon = resources.getColoredDrawableWithColor(R.drawable.ic_plus, if (context!!.isBlackAndWhiteTheme()) Color.BLACK else Color.WHITE) - view.checklist_fab.apply { - setImageDrawable(plusIcon) - background.applyColorFilter(context!!.getAdjustedPrimaryColor()) - setOnClickListener { - NewChecklistItemDialog(activity as SimpleActivity) { - val currentMaxId = items.maxBy { it.id }?.id ?: 0 - val checklistItem = ChecklistItem(currentMaxId + 1, it, false) - items.add(checklistItem) - saveNote() + view.apply { + checklist_fab.apply { + setImageDrawable(plusIcon) + background.applyColorFilter(context!!.getAdjustedPrimaryColor()) + setOnClickListener { + showNewItemDialog() + } + } + + fragment_placeholder_2.apply { + setTextColor(context!!.getAdjustedPrimaryColor()) + underlineText() + setOnClickListener { + showNewItemDialog() } } } setupAdapter() } + private fun showNewItemDialog() { + NewChecklistItemDialog(activity as SimpleActivity) { + val currentMaxId = items.maxBy { it.id }?.id ?: 0 + val checklistItem = ChecklistItem(currentMaxId + 1, it, false) + items.add(checklistItem) + saveNote() + } + } + private fun setupAdapter() { + view.apply { + fragment_placeholder.beVisibleIf(items.isEmpty()) + fragment_placeholder_2.beVisibleIf(items.isEmpty()) + checklist_list.beVisibleIf(items.isNotEmpty()) + } + ChecklistAdapter(activity as SimpleActivity, items, this, view.checklist_list) { val clickedNote = it as ChecklistItem clickedNote.isDone = !clickedNote.isDone @@ -101,5 +122,6 @@ class ChecklistFragment : NoteFragment(), ChecklistItemsListener { } override fun refreshItems() { + setupAdapter() } } diff --git a/app/src/main/res/layout/fragment_checklist.xml b/app/src/main/res/layout/fragment_checklist.xml index d7103778..c5e27725 100644 --- a/app/src/main/res/layout/fragment_checklist.xml +++ b/app/src/main/res/layout/fragment_checklist.xml @@ -6,13 +6,45 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - + android:layout_height="match_parent"> + + + + + + + Checklist Add a new checklist item + The checklist is empty Bütün qeydləri fayl şəklində çıxar diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index c131408d..decb5f17 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -51,6 +51,7 @@ Checklist Add a new checklist item + The checklist is empty Eksporter alle noter som filer diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index e1fe3182..7544bd45 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -51,6 +51,7 @@ Checklist Add a new checklist item + The checklist is empty Alle Notizen als Dateien exportieren diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 23416d9a..289e044d 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -51,6 +51,7 @@ Checklist Add a new checklist item + The checklist is empty Exportar todas las notas como archivos diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 07084b2f..d73f3373 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -51,6 +51,7 @@ Checklist Add a new checklist item + The checklist is empty Exporter toutes les notes en tant que fichiers diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml index 2b64fbc0..d7fa93b1 100644 --- a/app/src/main/res/values-gl/strings.xml +++ b/app/src/main/res/values-gl/strings.xml @@ -53,6 +53,7 @@ Checklist Add a new checklist item + The checklist is empty Exportar todas as notas como ficheiros diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml index 1a96ca75..f17a4cf8 100644 --- a/app/src/main/res/values-hr/strings.xml +++ b/app/src/main/res/values-hr/strings.xml @@ -51,6 +51,7 @@ Checklist Add a new checklist item + The checklist is empty Izvezi sve bilješke kao datoteke diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index f64274e2..a23fb32c 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -51,6 +51,7 @@ Checklist Add a new checklist item + The checklist is empty Export all notes as files diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 32b687b3..1bac22fe 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -51,6 +51,7 @@ Checklist Add a new checklist item + The checklist is empty Esporta le note come file diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index ebb68809..e9a8ddee 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -51,6 +51,7 @@ Checklist Add a new checklist item + The checklist is empty Export all notes as files diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml index 80c4a115..b29d2f99 100644 --- a/app/src/main/res/values-lt/strings.xml +++ b/app/src/main/res/values-lt/strings.xml @@ -51,6 +51,7 @@ Checklist Add a new checklist item + The checklist is empty Eksportuoti visus užrašus kaip bylas diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 1786c426..0df91adf 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -51,6 +51,7 @@ Checklist Add a new checklist item + The checklist is empty Export all notes as files diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index ecb9bc5c..ae2a1885 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -51,6 +51,7 @@ Checklist Add a new checklist item + The checklist is empty Eksportuj wszystkie notatki jako pliki diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index 7cfd4c1a..817b3de3 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -51,6 +51,7 @@ Checklist Add a new checklist item + The checklist is empty Exportar todas as notas como arquivo diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index 6f269342..6db77f57 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -51,6 +51,7 @@ Checklist Add a new checklist item + The checklist is empty Exportar todas as notas como ficheiros diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 23ddd8ce..ab5230fe 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -51,6 +51,7 @@ Checklist Add a new checklist item + The checklist is empty Экспортировать все заметки в файлы diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml index 87f2c329..416c8f95 100644 --- a/app/src/main/res/values-sk/strings.xml +++ b/app/src/main/res/values-sk/strings.xml @@ -51,6 +51,7 @@ Zoznam položiek Pridať do zoznamu novú položku + Zoznam položiek je prázdny Exportovať všetky poznámky ako súbory diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index 3fdd22a4..04cfe8ce 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -51,6 +51,7 @@ Checklist Add a new checklist item + The checklist is empty Exportera alla anteckningar som filer diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index 1096ac7f..bd43e3d0 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -51,6 +51,7 @@ Checklist Add a new checklist item + The checklist is empty Tüm notları dosya olarak dışa aktar diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 258a6067..0cb0c180 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -51,6 +51,7 @@ Checklist Add a new checklist item + The checklist is empty Export all notes as files diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 96fb5326..69012a88 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -51,6 +51,7 @@ 核對清單 新增新的核對清單項目 + The checklist is empty 將全部筆記匯出成檔案 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 19a438ba..977bfd59 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -51,6 +51,7 @@ Checklist Add a new checklist item + The checklist is empty Export all notes as files