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 new file mode 100644 index 00000000..fe452486 --- /dev/null +++ b/app/src/main/kotlin/com/simplemobiletools/notes/pro/dialogs/NewChecklistItemDialog.kt @@ -0,0 +1,36 @@ +package com.simplemobiletools.notes.pro.dialogs + +import android.app.Activity +import android.content.DialogInterface.BUTTON_POSITIVE +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.* + +class NewChecklistItemDialog(val activity: Activity, callback: (title: String) -> Unit) { + init { + val view = activity.layoutInflater.inflate(R.layout.dialog_new_checklist_item, null) + + AlertDialog.Builder(activity) + .setPositiveButton(R.string.ok, null) + .setNegativeButton(R.string.cancel, null) + .create().apply { + activity.setupDialogStuff(view, this, R.string.add_new_checklist_item) { + showKeyboard(view.checklist_item_title) + getButton(BUTTON_POSITIVE).setOnClickListener { + val title = view.checklist_item_title.value + when { + title.isEmpty() -> activity.toast(R.string.no_title) + else -> { + callback(title) + dismiss() + } + } + } + } + } + } +} diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/pro/dialogs/NewNoteDialog.kt b/app/src/main/kotlin/com/simplemobiletools/notes/pro/dialogs/NewNoteDialog.kt index 627489b9..a1979614 100644 --- a/app/src/main/kotlin/com/simplemobiletools/notes/pro/dialogs/NewNoteDialog.kt +++ b/app/src/main/kotlin/com/simplemobiletools/notes/pro/dialogs/NewNoteDialog.kt @@ -23,9 +23,9 @@ class NewNoteDialog(val activity: Activity, callback: (note: Note) -> Unit) { .setNegativeButton(R.string.cancel, null) .create().apply { activity.setupDialogStuff(view, this, R.string.new_note) { - showKeyboard(view.note_name) + showKeyboard(view.note_title) getButton(BUTTON_POSITIVE).setOnClickListener { - val title = view.note_name.value + val title = view.note_title.value Thread { when { title.isEmpty() -> activity.toast(R.string.no_title) diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/pro/dialogs/RenameNoteDialog.kt b/app/src/main/kotlin/com/simplemobiletools/notes/pro/dialogs/RenameNoteDialog.kt index 938b0624..4654a7b2 100644 --- a/app/src/main/kotlin/com/simplemobiletools/notes/pro/dialogs/RenameNoteDialog.kt +++ b/app/src/main/kotlin/com/simplemobiletools/notes/pro/dialogs/RenameNoteDialog.kt @@ -15,16 +15,16 @@ class RenameNoteDialog(val activity: SimpleActivity, val note: Note, val callbac init { val view = activity.layoutInflater.inflate(R.layout.dialog_rename_note, null) - view.note_name.setText(note.title) + view.note_title.setText(note.title) AlertDialog.Builder(activity) .setPositiveButton(R.string.ok, null) .setNegativeButton(R.string.cancel, null) .create().apply { activity.setupDialogStuff(view, this, R.string.rename_note) { - showKeyboard(view.note_name) + showKeyboard(view.note_title) getButton(BUTTON_POSITIVE).setOnClickListener { - val title = view.note_name.value + val title = view.note_title.value Thread { newTitleConfirmed(title, this) }.start() 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 562d4a05..8c93872b 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 @@ -10,14 +10,18 @@ import com.simplemobiletools.commons.extensions.getAdjustedPrimaryColor import com.simplemobiletools.commons.extensions.getColoredDrawableWithColor import com.simplemobiletools.commons.extensions.isBlackAndWhiteTheme import com.simplemobiletools.notes.pro.R +import com.simplemobiletools.notes.pro.activities.SimpleActivity +import com.simplemobiletools.notes.pro.dialogs.NewChecklistItemDialog import com.simplemobiletools.notes.pro.helpers.NOTE_ID import com.simplemobiletools.notes.pro.helpers.NotesHelper +import com.simplemobiletools.notes.pro.models.ChecklistItem import com.simplemobiletools.notes.pro.models.Note import kotlinx.android.synthetic.main.fragment_checklist.view.* class ChecklistFragment : NoteFragment() { private var noteId = 0L private var note: Note? = null + private var items = ArrayList() lateinit var view: ViewGroup @@ -44,7 +48,10 @@ class ChecklistFragment : NoteFragment() { setImageDrawable(plusIcon) background.applyColorFilter(context!!.getAdjustedPrimaryColor()) setOnClickListener { - + NewChecklistItemDialog(activity as SimpleActivity) { + val checklistItem = ChecklistItem(it, false) + items.add(checklistItem) + } } } } diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/pro/models/ChecklistItem.kt b/app/src/main/kotlin/com/simplemobiletools/notes/pro/models/ChecklistItem.kt new file mode 100644 index 00000000..14739f2f --- /dev/null +++ b/app/src/main/kotlin/com/simplemobiletools/notes/pro/models/ChecklistItem.kt @@ -0,0 +1,3 @@ +package com.simplemobiletools.notes.pro.models + +data class ChecklistItem(val title: String, val isDone: Boolean) diff --git a/app/src/main/res/layout/dialog_new_checklist_item.xml b/app/src/main/res/layout/dialog_new_checklist_item.xml new file mode 100644 index 00000000..568bb066 --- /dev/null +++ b/app/src/main/res/layout/dialog_new_checklist_item.xml @@ -0,0 +1,21 @@ + + + + + + diff --git a/app/src/main/res/layout/dialog_new_note.xml b/app/src/main/res/layout/dialog_new_note.xml index 1f614e11..1c77391d 100644 --- a/app/src/main/res/layout/dialog_new_note.xml +++ b/app/src/main/res/layout/dialog_new_note.xml @@ -10,7 +10,7 @@ android:paddingRight="@dimen/activity_margin"> Cız sarğısını göstər Use Incognito mode of keyboards - + Checklist + Add a new checklist item 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 c0a582e8..5aaac93a 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -46,8 +46,9 @@ Aktiver tekstombrydning Use Incognito mode of keyboards - + Checklist + Add a new checklist item 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 4f277300..e095f2a6 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -46,8 +46,9 @@ Zeilenumbruch aktivieren Use Incognito mode of keyboards - + Checklist + Add a new checklist item 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 83263179..3a9bf390 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -46,8 +46,9 @@ Activar ajuste de línea Use Incognito mode of keyboards - + Checklist + Add a new checklist item 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 f59fa426..e683f5f5 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -46,8 +46,9 @@ Activer le retour à la ligne Use Incognito mode of keyboards - + Checklist + Add a new checklist item 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 296e76a1..4aa1d8c0 100644 --- a/app/src/main/res/values-gl/strings.xml +++ b/app/src/main/res/values-gl/strings.xml @@ -48,8 +48,9 @@ Habilitar sangrado de liña Use Incognito mode of keyboards - + Checklist + Add a new checklist item 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 ee5652de..cc52b1cd 100644 --- a/app/src/main/res/values-hr/strings.xml +++ b/app/src/main/res/values-hr/strings.xml @@ -46,8 +46,9 @@ Omogući omotavanje linije Use Incognito mode of keyboards - + Checklist + Add a new checklist item 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 22213d94..7174380c 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -46,8 +46,9 @@ Enable line wrap Use Incognito mode of keyboards - + Checklist + Add a new checklist item 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 16045206..da31fd9f 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -46,8 +46,9 @@ Abilita a capo automatico Usa la modalità incognito per le tastiere - + Checklist + Add a new checklist item 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 b60e4cb5..78bc632f 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -46,8 +46,9 @@ Enable line wrap Use Incognito mode of keyboards - + Checklist + Add a new checklist item 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 607d1eff..f714c5ba 100644 --- a/app/src/main/res/values-lt/strings.xml +++ b/app/src/main/res/values-lt/strings.xml @@ -46,8 +46,9 @@ naudoti eilutės perkėlimą Use Incognito mode of keyboards - + Checklist + Add a new checklist item 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 10654316..aeeb0ac6 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -46,8 +46,9 @@ Enable line wrap Use Incognito mode of keyboards - + Checklist + Add a new checklist item 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 578067fc..1d59563a 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -46,8 +46,9 @@ Zawijanie linii Use Incognito mode of keyboards - + Checklist + Add a new checklist item 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 d51f1f44..77c88a44 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -46,8 +46,9 @@ Ativar quebra de linha Use Incognito mode of keyboards - + Checklist + Add a new checklist item 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 547cf90b..15885e06 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -46,8 +46,9 @@ Ativar quebra de linha Utilizar modo incógnito no teclado - + Checklist + Add a new checklist item 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 5c4d2626..1b929499 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -46,8 +46,9 @@ Переносить строки Use Incognito mode of keyboards - + Checklist + Add a new checklist item Экспортировать все заметки в файлы diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml index 9c3203d6..835043ba 100644 --- a/app/src/main/res/values-sk/strings.xml +++ b/app/src/main/res/values-sk/strings.xml @@ -46,8 +46,9 @@ Povoliť zalamovanie riadkov Použiť Inkognito mód klávesníc - - Zoznam vecí + + Zoznam položiek + Pridať do zoznamu novú položku 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 db1c153e..6e94f99a 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -46,8 +46,9 @@ Aktivera radbrytning Använd tangentbordets inkognitoläge - + Checklist + Add a new checklist item 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 50f2dd8d..b50fd72e 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -46,8 +46,9 @@ Sözcük kaydırmayı etkinleştir Klavyelerin Gizli modunu kullan - + Checklist + Add a new checklist item 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 6f9846e0..25ea1f33 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -46,8 +46,9 @@ Enable line wrap Use Incognito mode of keyboards - + Checklist + Add a new checklist item 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 f50e365a..336b1fe0 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -46,8 +46,9 @@ 自動換行 使用無痕模式的鍵盤 - + Checklist + Add a new checklist item 將全部筆記匯出成檔案 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index e7a60ef6..ab920dc5 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -46,8 +46,9 @@ Enable line wrap Use Incognito mode of keyboards - + Checklist + Add a new checklist item Export all notes as files