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

use the new radiogroup dialog at setting current widget note

Browse Source
This commit is contained in:
tibbi 2017-03-10 21:19:07 +01:00
parent 05ea84c743
commit 4720ba6a4b
3 changed files with 32 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/build.gradle
View File

@ -32,7 +32,7 @@ android {
}
dependencies {
compile 'com.simplemobiletools:commons:2.9.6'
compile 'com.simplemobiletools:commons:2.9.8'
compile 'com.facebook.stetho:stetho:1.4.1'
compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
}

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

@ -1,9 +1,8 @@
package com.simplemobiletools.notes.activities
import android.content.res.Resources
import android.os.Bundle
import android.view.View
import android.widget.AdapterView
import android.widget.ArrayAdapter
import com.simplemobiletools.commons.dialogs.RadioGroupDialog
import com.simplemobiletools.commons.extensions.updateTextColors
import com.simplemobiletools.commons.models.RadioItem
@ -15,9 +14,12 @@ import com.simplemobiletools.notes.models.Note
import kotlinx.android.synthetic.main.activity_settings.*
class SettingsActivity : SimpleActivity() {
lateinit var res: Resources
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
setContentView(R.layout.activity_settings)
res = resources
}
override fun onResume() {
@ -57,11 +59,11 @@ class SettingsActivity : SimpleActivity() {
private fun setupFontSize() {
settings_font_size.text = getFontSizeText()
settings_font_size_holder.setOnClickListener {
val items = arrayOf(
RadioItem(0, R.string.small),
RadioItem(1, R.string.normal),
RadioItem(2, R.string.large),
RadioItem(3, R.string.extra_large))
val items = arrayListOf(
RadioItem(0, res.getString(R.string.small)),
RadioItem(1, res.getString(R.string.normal)),
RadioItem(2, res.getString(R.string.large)),
RadioItem(3, res.getString(R.string.extra_large)))
RadioGroupDialog(this@SettingsActivity, items, config.fontSize) {
config.fontSize = it
@ -81,10 +83,10 @@ class SettingsActivity : SimpleActivity() {
private fun setupGravity() {
settings_gravity.text = getGravityText()
settings_gravity_holder.setOnClickListener {
val items = arrayOf(
RadioItem(0, R.string.left),
RadioItem(1, R.string.center),
RadioItem(2, R.string.right))
val items = arrayListOf(
RadioItem(0, res.getString(R.string.left)),
RadioItem(1, res.getString(R.string.center)),
RadioItem(2, res.getString(R.string.right)))
RadioGroupDialog(this@SettingsActivity, items, config.gravity) {
config.gravity = it
@ -107,36 +109,19 @@ class SettingsActivity : SimpleActivity() {
return
}
val adapter = getSpinnerAdapter(notes)
settings_widget_note.adapter = adapter
settings_widget_note.text = getCurrentWidgetNoteTitle(config.widgetNoteId, notes)
settings_widget_note_holder.setOnClickListener {
val items = notes.map { RadioItem(it.id, it.title) } as ArrayList
val noteIndex = getNoteIndexWithId(config.widgetNoteId, notes)
settings_widget_note.setSelection(noteIndex)
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
RadioGroupDialog(this@SettingsActivity, items, config.widgetNoteId) {
config.widgetNoteId = it
settings_widget_note.text = getCurrentWidgetNoteTitle(it, notes)
updateWidget()
}
override fun onNothingSelected(parent: AdapterView<*>?) {
}
}
}
private fun getNoteIndexWithId(id: Int, notes: List<Note>): Int {
for (i in 0..notes.count() - 1) {
if (notes[i].id == id) {
return i
}
}
return 0
}
private fun getSpinnerAdapter(notes: List<Note>): ArrayAdapter<String> {
val titles = notes.map(Note::title)
val adapter = ArrayAdapter<String>(this, android.R.layout.simple_spinner_item, titles)
adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item)
return adapter
private fun getCurrentWidgetNoteTitle(currentNoteId: Int, notes: List<Note>): String {
return notes.firstOrNull { it.id == currentNoteId }?.title ?: ""
}
}

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

@ -146,7 +146,10 @@
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/medium_margin"
android:background="?attr/selectableItemBackground"
android:padding="@dimen/activity_margin">
android:paddingBottom="@dimen/bigger_margin"
android:paddingLeft="@dimen/activity_margin"
android:paddingRight="@dimen/activity_margin"
android:paddingTop="@dimen/bigger_margin">
<com.simplemobiletools.commons.views.MyTextView
android:id="@+id/settings_widget_note_label"
@ -159,12 +162,16 @@
android:paddingRight="@dimen/medium_margin"
android:text="@string/widget_note"/>
<com.simplemobiletools.commons.views.MyAppCompatSpinner
<com.simplemobiletools.commons.views.MyTextView
android:id="@+id/settings_widget_note"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
android:layout_alignParentRight="true"/>
android:layout_alignParentRight="true"
android:layout_marginEnd="@dimen/medium_margin"
android:layout_marginRight="@dimen/medium_margin"
android:background="@null"
android:clickable="false"/>
</RelativeLayout>
</LinearLayout>