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

adding some code related to updating specific widgets only

Browse Source
This commit is contained in:
tibbi
2018-09-13 21:14:53 +02:00
parent 3bd04a6eb6
commit e9ebe65ea6
10 changed files with 85 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -25,10 +25,7 @@ import com.simplemobiletools.notes.BuildConfig
import com.simplemobiletools.notes.R
import com.simplemobiletools.notes.adapters.NotesPagerAdapter
import com.simplemobiletools.notes.dialogs.*
import com.simplemobiletools.notes.extensions.config
import com.simplemobiletools.notes.extensions.dbHelper
import com.simplemobiletools.notes.extensions.getTextSize
import com.simplemobiletools.notes.extensions.updateWidget
import com.simplemobiletools.notes.extensions.*
import com.simplemobiletools.notes.helpers.MIME_TEXT_PLAIN
import com.simplemobiletools.notes.helpers.OPEN_NOTE_ID
import com.simplemobiletools.notes.helpers.TYPE_NOTE
@ -40,7 +37,7 @@ import java.nio.charset.Charset
class MainActivity : SimpleActivity(), ViewPager.OnPageChangeListener {
private var mAdapter: NotesPagerAdapter? = null
lateinit var mCurrentNote: Note
private lateinit var mCurrentNote: Note
private var mNotes = ArrayList<Note>()
private var noteViewWithTextSelected: MyEditText? = null
@ -533,7 +530,7 @@ class MainActivity : SimpleActivity(), ViewPager.OnPageChangeListener {
updateSelectedNote(firstNoteId)
if (config.widgetNoteId == note.id) {
config.widgetNoteId = mCurrentNote.id
updateWidget()
updateNoteWidget(mCurrentNote.id)
}
invalidateOptionsMenu()
initViewPager()

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

@ -3,7 +3,6 @@ package com.simplemobiletools.notes.activities
import android.content.Intent
import android.content.res.Resources
import android.os.Bundle
import android.view.View
import com.simplemobiletools.commons.dialogs.RadioGroupDialog
import com.simplemobiletools.commons.extensions.*
import com.simplemobiletools.commons.helpers.IS_CUSTOMIZING_COLORS
@ -11,7 +10,7 @@ import com.simplemobiletools.commons.models.RadioItem
import com.simplemobiletools.notes.R
import com.simplemobiletools.notes.extensions.config
import com.simplemobiletools.notes.extensions.dbHelper
import com.simplemobiletools.notes.extensions.updateWidget
import com.simplemobiletools.notes.extensions.updateWidgets
import com.simplemobiletools.notes.helpers.*
import com.simplemobiletools.notes.models.Note
import kotlinx.android.synthetic.main.activity_settings.*
@ -45,7 +44,6 @@ class SettingsActivity : SimpleActivity() {
setupEnableLineWrap()
setupFontSize()
setupGravity()
setupWidgetNote()
setupCursorPlacement()
setupCustomizeWidgetColors()
updateTextColors(settings_scrollview)
@ -167,7 +165,7 @@ class SettingsActivity : SimpleActivity() {
RadioGroupDialog(this@SettingsActivity, items, config.fontSize) {
config.fontSize = it as Int
settings_font_size.text = getFontSizeText()
updateWidget()
updateWidgets()
}
}
}
@ -190,7 +188,7 @@ class SettingsActivity : SimpleActivity() {
RadioGroupDialog(this@SettingsActivity, items, config.gravity) {
config.gravity = it as Int
settings_gravity.text = getGravityText()
updateWidget()
updateWidgets()
}
}
}
@ -201,24 +199,6 @@ class SettingsActivity : SimpleActivity() {
else -> R.string.right
})
private fun setupWidgetNote() {
if (notes.size <= 1) {
settings_widget_note_holder.visibility = View.GONE
return
}
settings_widget_note.text = getCurrentWidgetNoteTitle(config.widgetNoteId, notes)
settings_widget_note_holder.setOnClickListener {
val items = notes.map { RadioItem(it.id, it.title) } as ArrayList
RadioGroupDialog(this@SettingsActivity, items, config.widgetNoteId) {
config.widgetNoteId = it as Int
settings_widget_note.text = getCurrentWidgetNoteTitle(it, notes)
updateWidget()
}
}
}
private fun setupCursorPlacement() {
settings_cursor_placement.isChecked = config.placeCursorToEnd
settings_cursor_placement_holder.setOnClickListener {
@ -227,9 +207,6 @@ class SettingsActivity : SimpleActivity() {
}
}
private fun getCurrentWidgetNoteTitle(currentNoteId: Int, notes: List<Note>) =
notes.firstOrNull { it.id == currentNoteId }?.title ?: ""
private fun setupCustomizeWidgetColors() {
settings_customize_widget_colors_holder.setOnClickListener {
Intent(this, WidgetConfigureActivity::class.java).apply {