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

fix #358, allow creating a new note from the Open Note dialog

Browse Source
This commit is contained in:
tibbi 2020-09-19 16:23:56 +02:00
parent 4610bd4127
commit 50281671e4
3 changed files with 54 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/main/kotlin/com/simplemobiletools/notes/pro/activities/MainActivity.kt
View File

@ -914,8 +914,12 @@ class MainActivity : SimpleActivity() {
} }
private fun displayOpenNoteDialog() { private fun displayOpenNoteDialog() {
OpenNoteDialog(this) { OpenNoteDialog(this) { noteId, newNote ->
updateSelectedNote(it) if (newNote == null) {
updateSelectedNote(noteId)
} else {
addNewNote(newNote)
}
} }
} }

18
app/src/main/kotlin/com/simplemobiletools/notes/pro/dialogs/OpenNoteDialog.kt
View File

@ -16,7 +16,7 @@ import com.simplemobiletools.notes.pro.models.Note
import kotlinx.android.synthetic.main.dialog_open_note.view.* import kotlinx.android.synthetic.main.dialog_open_note.view.*
import kotlinx.android.synthetic.main.open_note_item.view.* import kotlinx.android.synthetic.main.open_note_item.view.*
class OpenNoteDialog(val activity: Activity, val callback: (checkedId: Long) -> Unit) { class OpenNoteDialog(val activity: Activity, val callback: (checkedId: Long, newNote: Note?) -> Unit) {
private var dialog: AlertDialog? = null private var dialog: AlertDialog? = null
init { init {
@ -24,6 +24,14 @@ class OpenNoteDialog(val activity: Activity, val callback: (checkedId: Long) ->
NotesHelper(activity).getNotes { NotesHelper(activity).getNotes {
initDialog(it, view) initDialog(it, view)
} }
view.dialog_open_note_new_radio.setOnClickListener {
view.dialog_open_note_new_radio.isChecked = false
NewNoteDialog(activity) {
callback(0, it)
dialog?.dismiss()
}
}
} }
private fun initDialog(notes: ArrayList<Note>, view: View) { private fun initDialog(notes: ArrayList<Note>, view: View) {
@ -37,7 +45,7 @@ class OpenNoteDialog(val activity: Activity, val callback: (checkedId: Long) ->
id = note.id!!.toInt() id = note.id!!.toInt()
setOnClickListener { setOnClickListener {
callback(note.id!!) callback(note.id!!, null)
dialog?.dismiss() dialog?.dismiss()
} }
} }
@ -53,8 +61,8 @@ class OpenNoteDialog(val activity: Activity, val callback: (checkedId: Long) ->
} }
dialog = AlertDialog.Builder(activity) dialog = AlertDialog.Builder(activity)
.create().apply { .create().apply {
activity.setupDialogStuff(view, this, R.string.open_note) activity.setupDialogStuff(view, this, R.string.open_note)
} }
} }
} }

40
app/src/main/res/layout/dialog_open_note.xml
View File

@ -4,11 +4,41 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"> android:layout_height="wrap_content">
<LinearLayout <RelativeLayout
android:id="@+id/dialog_open_note_linear" android:id="@+id/dialog_open_note_wrapper"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content">
android:layout_marginTop="@dimen/medium_margin"
android:orientation="vertical" />
<LinearLayout
android:id="@+id/dialog_open_note_linear"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/medium_margin"
android:orientation="vertical" />
<ImageView
android:id="@+id/dialog_open_note_divider"
android:layout_width="match_parent"
android:layout_height="1px"
android:layout_below="@+id/dialog_open_note_linear"
android:background="@color/divider_grey"
android:importantForAccessibility="no" />
<RadioGroup
android:id="@+id/dialog_open_note_create_new"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@+id/dialog_open_note_divider"
android:padding="@dimen/normal_margin">
<com.simplemobiletools.commons.views.MyCompatRadioButton
android:id="@+id/dialog_open_note_new_radio"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingTop="@dimen/normal_margin"
android:paddingBottom="@dimen/normal_margin"
android:text="@string/create_new_note" />
</RadioGroup>
</RelativeLayout>
</ScrollView> </ScrollView>