diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/pro/activities/WidgetConfigureActivity.kt b/app/src/main/kotlin/com/simplemobiletools/notes/pro/activities/WidgetConfigureActivity.kt index a54cacd0..e1528d49 100644 --- a/app/src/main/kotlin/com/simplemobiletools/notes/pro/activities/WidgetConfigureActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/notes/pro/activities/WidgetConfigureActivity.kt @@ -8,18 +8,22 @@ import android.graphics.drawable.ColorDrawable import android.os.Bundle import android.util.TypedValue import android.widget.RemoteViews +import com.google.gson.Gson +import com.google.gson.reflect.TypeToken import com.simplemobiletools.commons.dialogs.ColorPickerDialog import com.simplemobiletools.commons.dialogs.RadioGroupDialog import com.simplemobiletools.commons.extensions.* import com.simplemobiletools.commons.helpers.IS_CUSTOMIZING_COLORS import com.simplemobiletools.commons.models.RadioItem import com.simplemobiletools.notes.pro.R +import com.simplemobiletools.notes.pro.adapters.ChecklistAdapter import com.simplemobiletools.notes.pro.extensions.config import com.simplemobiletools.notes.pro.extensions.getTextSize import com.simplemobiletools.notes.pro.extensions.widgetsDB import com.simplemobiletools.notes.pro.helpers.MyWidgetProvider import com.simplemobiletools.notes.pro.helpers.NotesHelper import com.simplemobiletools.notes.pro.helpers.TYPE_CHECKLIST +import com.simplemobiletools.notes.pro.models.ChecklistItem import com.simplemobiletools.notes.pro.models.Note import com.simplemobiletools.notes.pro.models.Widget import kotlinx.android.synthetic.main.widget_config.* @@ -106,6 +110,21 @@ class WidgetConfigureActivity : SimpleActivity() { mCurrentNoteId = note.id!! notes_picker_value.text = note.title if (note.type == TYPE_CHECKLIST) { + val checklistItemType = object : TypeToken>() {}.type + val items = Gson().fromJson>(note.value, checklistItemType) ?: ArrayList(1) + items.apply { + if (isEmpty()) { + add(ChecklistItem(0, "Milk", true)) + add(ChecklistItem(1, "Butter", true)) + add(ChecklistItem(2, "Salt", false)) + add(ChecklistItem(3, "Water", false)) + add(ChecklistItem(4, "Meat", true)) + } + } + + ChecklistAdapter(this, items, null, checklist_note_view, false) {}.apply { + checklist_note_view.adapter = this + } text_note_view.beGone() checklist_note_view.beVisible() } else { diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/pro/adapters/ChecklistAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/notes/pro/adapters/ChecklistAdapter.kt index cfed72e1..19987c54 100644 --- a/app/src/main/kotlin/com/simplemobiletools/notes/pro/adapters/ChecklistAdapter.kt +++ b/app/src/main/kotlin/com/simplemobiletools/notes/pro/adapters/ChecklistAdapter.kt @@ -7,6 +7,7 @@ import android.view.View import android.view.ViewGroup import com.simplemobiletools.commons.activities.BaseSimpleActivity import com.simplemobiletools.commons.adapters.MyRecyclerViewAdapter +import com.simplemobiletools.commons.extensions.beVisibleIf import com.simplemobiletools.commons.extensions.getColoredDrawableWithColor import com.simplemobiletools.commons.views.MyRecyclerView import com.simplemobiletools.notes.pro.R @@ -16,7 +17,7 @@ import kotlinx.android.synthetic.main.item_checklist.view.* import java.util.* class ChecklistAdapter(activity: BaseSimpleActivity, var items: ArrayList, val listener: ChecklistItemsListener?, - recyclerView: MyRecyclerView, itemClick: (Any) -> Unit) : MyRecyclerViewAdapter(activity, recyclerView, null, itemClick) { + recyclerView: MyRecyclerView, val showIcons: Boolean, itemClick: (Any) -> Unit) : MyRecyclerViewAdapter(activity, recyclerView, null, itemClick) { private lateinit var crossDrawable: Drawable private lateinit var checkDrawable: Drawable @@ -111,6 +112,7 @@ class ChecklistAdapter(activity: BaseSimpleActivity, var items: ArrayList