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

Moved the checkbox into the dialog

Browse Source
This commit is contained in:
Agnieszka C 2023-01-11 15:25:46 +01:00
parent ba07d6b01d
commit 249eba4f59
4 changed files with 13 additions and 24 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

@ -50,7 +50,6 @@ class SettingsActivity : SimpleActivity() {
setupCursorPlacement() setupCursorPlacement()
setupIncognitoMode() setupIncognitoMode()
setupCustomizeWidgetColors() setupCustomizeWidgetColors()
setupAddNewChecklistItemsTop()
updateTextColors(settings_nested_scrollview) updateTextColors(settings_nested_scrollview)
arrayOf( arrayOf(
@ -258,12 +257,4 @@ class SettingsActivity : SimpleActivity() {
config.useIncognitoMode = settings_use_incognito_mode.isChecked config.useIncognitoMode = settings_use_incognito_mode.isChecked
} }
} }
private fun setupAddNewChecklistItemsTop() {
settings_add_checklist_top.isChecked = config.addNewChecklistItemsTop
settings_add_checklist_top_holder.setOnClickListener {
settings_add_checklist_top.toggle()
config.addNewChecklistItemsTop = settings_add_checklist_top.isChecked
}
}
} }

6
app/src/main/kotlin/com/simplemobiletools/notes/pro/dialogs/NewChecklistItemDialog.kt
View File

@ -9,8 +9,11 @@ import android.view.inputmethod.EditorInfo
import androidx.appcompat.widget.AppCompatEditText import androidx.appcompat.widget.AppCompatEditText
import com.simplemobiletools.commons.extensions.* import com.simplemobiletools.commons.extensions.*
import com.simplemobiletools.commons.helpers.DARK_GREY import com.simplemobiletools.commons.helpers.DARK_GREY
import com.simplemobiletools.commons.helpers.SORT_BY_CUSTOM
import com.simplemobiletools.notes.pro.R import com.simplemobiletools.notes.pro.R
import com.simplemobiletools.notes.pro.extensions.config
import kotlinx.android.synthetic.main.dialog_new_checklist_item.view.* import kotlinx.android.synthetic.main.dialog_new_checklist_item.view.*
import kotlinx.android.synthetic.main.dialog_new_checklist_item.view.dialog_holder
import kotlinx.android.synthetic.main.item_add_checklist.view.* import kotlinx.android.synthetic.main.item_add_checklist.view.*
class NewChecklistItemDialog(val activity: Activity, callback: (titles: ArrayList<String>) -> Unit) { class NewChecklistItemDialog(val activity: Activity, callback: (titles: ArrayList<String>) -> Unit) {
@ -31,6 +34,8 @@ class NewChecklistItemDialog(val activity: Activity, callback: (titles: ArrayLis
add_item.setOnClickListener { add_item.setOnClickListener {
addNewEditText() addNewEditText()
} }
settings_add_checklist_top.beVisibleIf(activity.config.sorting == SORT_BY_CUSTOM)
settings_add_checklist_top.isChecked = activity.config.addNewChecklistItemsTop
} }
activity.getAlertDialogBuilder() activity.getAlertDialogBuilder()
@ -40,6 +45,7 @@ class NewChecklistItemDialog(val activity: Activity, callback: (titles: ArrayLis
activity.setupDialogStuff(view, this, R.string.add_new_checklist_items) { alertDialog -> activity.setupDialogStuff(view, this, R.string.add_new_checklist_items) { alertDialog ->
alertDialog.showKeyboard(titles.first()) alertDialog.showKeyboard(titles.first())
alertDialog.getButton(BUTTON_POSITIVE).setOnClickListener { alertDialog.getButton(BUTTON_POSITIVE).setOnClickListener {
activity.config.addNewChecklistItemsTop = view.settings_add_checklist_top.isChecked
when { when {
titles.all { it.text!!.isEmpty() } -> activity.toast(R.string.empty_name) titles.all { it.text!!.isEmpty() } -> activity.toast(R.string.empty_name)
else -> { else -> {

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

@ -227,21 +227,6 @@
</RelativeLayout> </RelativeLayout>
<RelativeLayout
android:id="@+id/settings_add_checklist_top_holder"
style="@style/SettingsHolderCheckboxStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<com.simplemobiletools.commons.views.MyAppCompatCheckbox
android:id="@+id/settings_add_checklist_top"
style="@style/SettingsCheckboxStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/add_new_checklist_items_top" />
</RelativeLayout>
<RelativeLayout <RelativeLayout
android:id="@+id/settings_gravity_holder" android:id="@+id/settings_gravity_holder"
style="@style/SettingsHolderTextViewStyle" style="@style/SettingsHolderTextViewStyle"

7
app/src/main/res/layout/dialog_new_checklist_item.xml
View File

@ -32,5 +32,12 @@
android:paddingBottom="@dimen/medium_margin" android:paddingBottom="@dimen/medium_margin"
android:src="@drawable/ic_plus_vector" /> android:src="@drawable/ic_plus_vector" />
<com.simplemobiletools.commons.views.MyAppCompatCheckbox
android:id="@+id/settings_add_checklist_top"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/add_new_checklist_items_top"
android:visibility="gone" />
</LinearLayout> </LinearLayout>
</ScrollView> </ScrollView>