fenix/Simple-Notes
1
0
Fork 0
mirror of https://github.com/SimpleMobileTools/Simple-Notes.git synced 2025-03-23 03:50:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

lets store the widget text and background colors separately per widget

Browse Source
This commit is contained in:
tibbi 2019-08-19 23:11:21 +02:00
parent b71768a0dc
commit 93c6079fa9
4 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/kotlin/com/simplemobiletools/notes/pro/activities/WidgetConfigureActivity.kt
View File

@ -150,7 +150,7 @@ class WidgetConfigureActivity : SimpleActivity() {
views.setBackgroundColor(R.id.text_note_view, mBgColor) views.setBackgroundColor(R.id.text_note_view, mBgColor)
views.setBackgroundColor(R.id.checklist_note_view, mBgColor) views.setBackgroundColor(R.id.checklist_note_view, mBgColor)
AppWidgetManager.getInstance(this).updateAppWidget(mWidgetId, views) AppWidgetManager.getInstance(this).updateAppWidget(mWidgetId, views)
val widget = Widget(null, mWidgetId, mCurrentNoteId) val widget = Widget(null, mWidgetId, mCurrentNoteId, mBgColor, mTextColor)
ensureBackgroundThread { ensureBackgroundThread {
widgetsDB.insertOrUpdate(widget) widgetsDB.insertOrUpdate(widget)
} }

15
app/src/main/kotlin/com/simplemobiletools/notes/pro/databases/NotesDatabase.kt
View File

@ -4,8 +4,11 @@ import android.content.Context
import androidx.room.Database import androidx.room.Database
import androidx.room.Room import androidx.room.Room
import androidx.room.RoomDatabase import androidx.room.RoomDatabase
import androidx.room.migration.Migration
import androidx.sqlite.db.SupportSQLiteDatabase import androidx.sqlite.db.SupportSQLiteDatabase
import com.simplemobiletools.commons.helpers.DEFAULT_WIDGET_BG_COLOR
import com.simplemobiletools.notes.pro.R import com.simplemobiletools.notes.pro.R
import com.simplemobiletools.notes.pro.helpers.DEFAULT_WIDGET_TEXT_COLOR
import com.simplemobiletools.notes.pro.helpers.TYPE_TEXT import com.simplemobiletools.notes.pro.helpers.TYPE_TEXT
import com.simplemobiletools.notes.pro.interfaces.NotesDao import com.simplemobiletools.notes.pro.interfaces.NotesDao
import com.simplemobiletools.notes.pro.interfaces.WidgetsDao import com.simplemobiletools.notes.pro.interfaces.WidgetsDao
@ -13,7 +16,7 @@ import com.simplemobiletools.notes.pro.models.Note
import com.simplemobiletools.notes.pro.models.Widget import com.simplemobiletools.notes.pro.models.Widget
import java.util.concurrent.Executors import java.util.concurrent.Executors
@Database(entities = [Note::class, Widget::class], version = 1) @Database(entities = [Note::class, Widget::class], version = 2)
abstract class NotesDatabase : RoomDatabase() { abstract class NotesDatabase : RoomDatabase() {
abstract fun NotesDao(): NotesDao abstract fun NotesDao(): NotesDao
@ -34,6 +37,7 @@ abstract class NotesDatabase : RoomDatabase() {
insertFirstNote(context) insertFirstNote(context)
} }
}) })
.addMigrations(MIGRATION_1_2)
.build() .build()
db!!.openHelper.setWriteAheadLoggingEnabled(true) db!!.openHelper.setWriteAheadLoggingEnabled(true)
} }
@ -53,5 +57,14 @@ abstract class NotesDatabase : RoomDatabase() {
db!!.NotesDao().insertOrUpdate(note) db!!.NotesDao().insertOrUpdate(note)
} }
} }
private val MIGRATION_1_2 = object : Migration(1, 2) {
override fun migrate(database: SupportSQLiteDatabase) {
database.apply {
execSQL("ALTER TABLE widgets ADD COLUMN widget_bg_color INTEGER NOT NULL DEFAULT $DEFAULT_WIDGET_BG_COLOR")
execSQL("ALTER TABLE widgets ADD COLUMN widget_text_color INTEGER NOT NULL DEFAULT $DEFAULT_WIDGET_TEXT_COLOR")
}
}
}
} }
} }

3
app/src/main/kotlin/com/simplemobiletools/notes/pro/helpers/Constants.kt
View File

@ -1,8 +1,11 @@
package com.simplemobiletools.notes.pro.helpers package com.simplemobiletools.notes.pro.helpers
import android.graphics.Color
const val NOTE_ID = "note_id" const val NOTE_ID = "note_id"
const val OPEN_NOTE_ID = "open_note_id" const val OPEN_NOTE_ID = "open_note_id"
const val DONE_CHECKLIST_ITEM_ALPHA = 0.4f const val DONE_CHECKLIST_ITEM_ALPHA = 0.4f
val DEFAULT_WIDGET_TEXT_COLOR = Color.parseColor("#FFF57C00")
// shared preferences // shared preferences
const val CURRENT_NOTE_ID = "current_note_id" const val CURRENT_NOTE_ID = "current_note_id"

4
app/src/main/kotlin/com/simplemobiletools/notes/pro/models/Widget.kt
View File

@ -9,4 +9,6 @@ import androidx.room.PrimaryKey
data class Widget( data class Widget(
@PrimaryKey(autoGenerate = true) var id: Long?, @PrimaryKey(autoGenerate = true) var id: Long?,
@ColumnInfo(name = "widget_id") var widgetId: Int, @ColumnInfo(name = "widget_id") var widgetId: Int,
@ColumnInfo(name = "note_id") var noteId: Long) @ColumnInfo(name = "note_id") var noteId: Long,
@ColumnInfo(name = "widget_bg_color") var widgetBgColor: Int,
@ColumnInfo(name = "widget_text_color") var widgetTextColor: Int)