move the widget note picker in settings

This commit is contained in:
tibbi
2016-11-26 20:49:54 +01:00
parent 6e1a530da1
commit 133161cd66
12 changed files with 57 additions and 75 deletions

View File

@ -16,7 +16,6 @@ import com.simplemobiletools.notes.databases.DBHelper
import com.simplemobiletools.notes.dialogs.NewNoteDialog
import com.simplemobiletools.notes.dialogs.OpenNoteDialog
import com.simplemobiletools.notes.dialogs.RenameNoteDialog
import com.simplemobiletools.notes.dialogs.WidgetNoteDialog
import com.simplemobiletools.notes.extensions.dpToPx
import com.simplemobiletools.notes.models.Note
import kotlinx.android.synthetic.main.activity_main.*
@ -43,7 +42,7 @@ class MainActivity : SimpleActivity(), ViewPager.OnPageChangeListener {
}
fun initViewPager() {
mNotes = mDb.getNotes().sortedBy(Note::title)
mNotes = mDb.getNotes()
mCurrentNote = mNotes[0]
var itemIndex = 0
for (i in 0..mNotes.count() - 1) {
@ -103,10 +102,6 @@ class MainActivity : SimpleActivity(), ViewPager.OnPageChangeListener {
shareText()
true
}
R.id.change_widget_note -> {
showWidgetNotePicker()
true
}
R.id.delete_note -> {
displayDeleteNotePrompt()
true
@ -123,10 +118,6 @@ class MainActivity : SimpleActivity(), ViewPager.OnPageChangeListener {
}
}
private fun showWidgetNotePicker() {
WidgetNoteDialog(this)
}
private fun displayRenameDialog() {
RenameNoteDialog(this, mDb, mCurrentNote) {
mCurrentNote = it

View File

@ -5,6 +5,8 @@ import android.support.v4.app.TaskStackBuilder
import android.view.View
import android.widget.AdapterView
import com.simplemobiletools.notes.R
import com.simplemobiletools.notes.databases.DBHelper
import com.simplemobiletools.notes.extensions.updateWidget
import kotlinx.android.synthetic.main.activity_settings.*
class SettingsActivity : SimpleActivity() {
@ -14,6 +16,7 @@ class SettingsActivity : SimpleActivity() {
setupDarkTheme()
setupFontSize()
setupWidgetNote()
}
private fun setupDarkTheme() {
@ -37,6 +40,26 @@ class SettingsActivity : SimpleActivity() {
}
}
private fun setupWidgetNote() {
val notes = DBHelper.newInstance(this).getNotes()
if (notes.size <= 1) {
settings_widget_note_holder.visibility = View.GONE
return
}
settings_widget_note.setSelection(config.fontSize)
settings_widget_note.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
override fun onItemSelected(parent: AdapterView<*>?, view: View?, position: Int, id: Long) {
val note = notes[settings_widget_note.selectedItemPosition]
config.widgetNoteId = note.id
updateWidget()
}
override fun onNothingSelected(parent: AdapterView<*>?) {
}
}
}
private fun restartActivity() {
TaskStackBuilder.create(applicationContext).addNextIntentWithParentStack(intent).startActivities()
}