diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/activities/MainActivity.kt b/app/src/main/kotlin/com/simplemobiletools/notes/activities/MainActivity.kt index dc493a53..68df905d 100644 --- a/app/src/main/kotlin/com/simplemobiletools/notes/activities/MainActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/notes/activities/MainActivity.kt @@ -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 diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/activities/SettingsActivity.kt b/app/src/main/kotlin/com/simplemobiletools/notes/activities/SettingsActivity.kt index 4b6df09d..6ab1e6c1 100644 --- a/app/src/main/kotlin/com/simplemobiletools/notes/activities/SettingsActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/notes/activities/SettingsActivity.kt @@ -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() } diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/dialogs/WidgetNoteDialog.kt b/app/src/main/kotlin/com/simplemobiletools/notes/dialogs/WidgetNoteDialog.kt deleted file mode 100644 index 83476021..00000000 --- a/app/src/main/kotlin/com/simplemobiletools/notes/dialogs/WidgetNoteDialog.kt +++ /dev/null @@ -1,47 +0,0 @@ -package com.simplemobiletools.notes.dialogs - -import android.app.Activity -import android.app.AlertDialog -import android.view.ViewGroup -import android.widget.RadioButton -import android.widget.RadioGroup -import com.simplemobiletools.notes.Config -import com.simplemobiletools.notes.R -import com.simplemobiletools.notes.databases.DBHelper -import kotlinx.android.synthetic.main.dialog_radio_group.view.* - -class WidgetNoteDialog(val activity: Activity) : RadioGroup.OnCheckedChangeListener { - val dialog: AlertDialog? - var mConfig: Config - - init { - mConfig = Config.newInstance(activity) - val view = activity.layoutInflater.inflate(R.layout.dialog_radio_group, null) - val radioGroup = view.dialog_radio_group - radioGroup.setOnCheckedChangeListener(this) - - val db = DBHelper.newInstance(activity) - val notes = db.getNotes() - notes.forEach { - val radioButton = activity.layoutInflater.inflate(R.layout.radio_button, null) as RadioButton - radioButton.apply { - text = it.title - isChecked = it.id == mConfig.widgetNoteId - id = it.id - } - radioGroup.addView(radioButton, RadioGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT)) - } - - dialog = AlertDialog.Builder(activity) - .setTitle(activity.resources.getString(R.string.pick_a_note_for_widget)) - .setView(view) - .create() - - dialog?.show() - } - - override fun onCheckedChanged(group: RadioGroup, checkedId: Int) { - mConfig.widgetNoteId = checkedId - dialog?.dismiss() - } -} diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml index 615c58a3..141b8f4b 100644 --- a/app/src/main/res/layout/activity_settings.xml +++ b/app/src/main/res/layout/activity_settings.xml @@ -63,5 +63,31 @@ android:entries="@array/font_sizes"/> + + + + + + + + diff --git a/app/src/main/res/menu/menu.xml b/app/src/main/res/menu/menu.xml index b3051b81..da773e0f 100644 --- a/app/src/main/res/menu/menu.xml +++ b/app/src/main/res/menu/menu.xml @@ -21,10 +21,6 @@ android:icon="@mipmap/delete" android:title="@string/delete_note" app:showAsAction="never"/> - Notiz löschen Bist du sicher, dass du Notiz \"%1$s\" löschen willst? Notiz auswählen - Wechsel Notiz des Widgets - Wähle Notiz für das Widget Umbennen Notiz umbennen Hauptnotiz @@ -27,6 +25,7 @@ Einstellungen Dunkles Thema Schriftgröße + Note used in widget Klein Normal Groß diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index cdb9e39d..5b62595f 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -17,8 +17,6 @@ Eliminar nota ¿Está seguro de querer eliminar la nota \"%1$s\"? Seleccione una nota - Cambiar nota del widget - Seleccione una nota para el widget Renombrar Renombrar nota Nota principal @@ -27,6 +25,7 @@ Opciones Tema oscuro Tamaño de fuente + Note used in widget Pequeña Normal Grande diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 2ff90cf7..3ea5993a 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -17,8 +17,6 @@ Delete note Are you sure you want to delete note \"%1$s\"? Pick a note - Change widget\'s note - Pick a note for the widget Rename Rename note General note @@ -27,6 +25,7 @@ Impostazioni Tema scuro Note font size + Note used in widget Small Normal Large diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 5a421063..4ed141ed 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -17,8 +17,6 @@ メモを削除 メモ \"%1$s\" を削除してもよろしいですか? メモを選択 - ウィジェットのメモを変更 - ウィジェットのメモを選択 Rename Rename note General note @@ -27,6 +25,7 @@ 設定 ダークテーマ メモのフォントサイズ + Note used in widget 小 通常 大 diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml index 047993e4..0a183497 100644 --- a/app/src/main/res/values-pt-rPT/strings.xml +++ b/app/src/main/res/values-pt-rPT/strings.xml @@ -17,8 +17,6 @@ Apagar nota Deseja mesmo apagar a nota \"%1$s\"? Selecione uma nota - Alterar nota do widget - Escolha uma nota para o widget Renomear Renomear nota Nota genérica @@ -27,6 +25,7 @@ Definições Tema escuro Tamanho do texto da nota + Note used in widget Pequeno Normal Grande diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index 98f066c3..af65fbdf 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -17,8 +17,6 @@ Delete note Are you sure you want to delete note \"%1$s\"? Pick a note - Change widget\'s note - Pick a note for the widget Rename Rename note General note @@ -27,6 +25,7 @@ Inställningar Mörkt tema Note font size + Note used in widget Small Normal Large diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 7b9378c8..32361725 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -17,8 +17,6 @@ Delete note Are you sure you want to delete note \"%1$s\"? Pick a note - Change widget\'s note - Pick a note for the widget Rename Rename note General note @@ -27,6 +25,7 @@ Settings Dark theme Note font size + Note used in widget Small Normal Large