fenix/Simple-Notes
1
0
Fork 0
mirror of https://github.com/SimpleMobileTools/Simple-Notes.git synced 2025-04-13 15:02:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #463 from Aga-C/move-setting-to-sort-dialog

Browse Source 
Moved done checklist setting to the sorting dialog (#462)
This commit is contained in:
Tibor Kaputa 2021-10-12 11:52:42 +02:00 committed by GitHub
commit fd14f01f1f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 39 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/src/main/kotlin/com/simplemobiletools/notes/pro/activities/SettingsActivity.kt
View File

@ -38,7 +38,6 @@ class SettingsActivity : SimpleActivity() {
setupMonospacedFont()
setupShowKeyboard()
setupShowNotePicker()
setupMoveUndoneChecklistItems()
setupShowWordCount()
setupEnableLineWrap()
setupFontSize()
@ -133,14 +132,6 @@ class SettingsActivity : SimpleActivity() {
}
}
private fun setupMoveUndoneChecklistItems() {
settings_move_undone_checklist_items.isChecked = config.moveDoneChecklistItems
settings_move_undone_checklist_items_holder.setOnClickListener {
settings_move_undone_checklist_items.toggle()
config.moveDoneChecklistItems = settings_move_undone_checklist_items.isChecked
}
}
private fun setupShowWordCount() {
settings_show_word_count.isChecked = config.showWordCount
settings_show_word_count_holder.setOnClickListener {

3
app/src/main/kotlin/com/simplemobiletools/notes/pro/adapters/WidgetAdapter.kt
View File

@ -106,9 +106,6 @@ class WidgetAdapter(val context: Context, val intent: Intent) : RemoteViewsServi
// checklist title can be null only because of the glitch in upgrade to 6.6.0, remove this check in the future
checklistItems = checklistItems.filter { it.title != null }.toMutableList() as ArrayList<ChecklistItem>
if (context.config.moveDoneChecklistItems) {
checklistItems.sortBy { it.isDone }
}
}
}

12
app/src/main/kotlin/com/simplemobiletools/notes/pro/dialogs/SortChecklistDialog.kt
View File

@ -18,6 +18,7 @@ class SortChecklistDialog(private val activity: SimpleActivity, private val call
init {
setupSortRadio()
setupOrderRadio()
setupMoveUndoneChecklistItems()
AlertDialog.Builder(activity)
.setPositiveButton(R.string.ok) { _, _ -> dialogConfirmed() }
.setNegativeButton(R.string.cancel, null)
@ -48,6 +49,13 @@ class SortChecklistDialog(private val activity: SimpleActivity, private val call
orderBtn.isChecked = true
}
private fun setupMoveUndoneChecklistItems() {
view.settings_move_undone_checklist_items.isChecked = config.moveDoneChecklistItems
view.settings_move_undone_checklist_items_holder.setOnClickListener {
view.settings_move_undone_checklist_items.toggle()
}
}
private fun dialogConfirmed() {
val sortingRadio = view.sorting_dialog_radio_sorting
var sorting = when (sortingRadio.checkedRadioButtonId) {
@ -61,7 +69,9 @@ class SortChecklistDialog(private val activity: SimpleActivity, private val call
if (currSorting != sorting) {
config.sorting = sorting
callback()
}
config.moveDoneChecklistItems = view.settings_move_undone_checklist_items.isChecked
callback()
}
}

3
app/src/main/kotlin/com/simplemobiletools/notes/pro/fragments/ChecklistFragment.kt
View File

@ -160,6 +160,9 @@ class ChecklistFragment : NoteFragment(), ChecklistItemsListener {
updateUIVisibility()
ChecklistItem.sorting = requireContext().config.sorting
items.sort()
if (context?.config?.moveDoneChecklistItems == true) {
items.sortBy { it.isDone }
}
ChecklistAdapter(
activity = activity as SimpleActivity,
items = items,

23
app/src/main/res/layout/activity_settings.xml
View File

@ -346,29 +346,6 @@
</RelativeLayout>
<RelativeLayout
android:id="@+id/settings_move_undone_checklist_items_holder"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/medium_margin"
android:background="?attr/selectableItemBackground"
android:paddingStart="@dimen/normal_margin"
android:paddingTop="@dimen/activity_margin"
android:paddingEnd="@dimen/normal_margin"
android:paddingBottom="@dimen/activity_margin">
<com.simplemobiletools.commons.views.MySwitchCompat
android:id="@+id/settings_move_undone_checklist_items"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@null"
android:clickable="false"
android:paddingStart="@dimen/medium_margin"
android:text="@string/move_done_checklist_items"
app:switchPadding="@dimen/medium_margin" />
</RelativeLayout>
<com.simplemobiletools.commons.views.MyTextView
android:id="@+id/saving_label"
android:layout_width="wrap_content"

26
app/src/main/res/layout/dialog_sort_checklist.xml
View File

@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/dialog_holder"
android:layout_width="match_parent"
android:layout_height="match_parent"
@ -39,7 +40,8 @@
android:id="@+id/sorting_dialog_radio_order"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/medium_margin">
android:layout_marginTop="@dimen/medium_margin"
android:layout_marginBottom="@dimen/medium_margin">
<com.simplemobiletools.commons.views.MyCompatRadioButton
android:id="@+id/sorting_dialog_radio_ascending"
@ -59,4 +61,26 @@
android:text="@string/descending" />
</RadioGroup>
<include layout="@layout/divider" />
<RelativeLayout
android:id="@+id/settings_move_undone_checklist_items_holder"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/medium_margin"
android:background="?attr/selectableItemBackground"
android:paddingTop="@dimen/medium_margin"
android:paddingBottom="@dimen/medium_margin">
<com.simplemobiletools.commons.views.MyAppCompatCheckbox
android:id="@+id/settings_move_undone_checklist_items"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@null"
android:clickable="false"
android:text="@string/move_done_checklist_items"
app:switchPadding="@dimen/medium_margin" />
</RelativeLayout>
</LinearLayout>