diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/pro/activities/WidgetConfigureActivity.kt b/app/src/main/kotlin/com/simplemobiletools/notes/pro/activities/WidgetConfigureActivity.kt
index d8e60e65..3426aba7 100644
--- a/app/src/main/kotlin/com/simplemobiletools/notes/pro/activities/WidgetConfigureActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/notes/pro/activities/WidgetConfigureActivity.kt
@@ -59,7 +59,11 @@ class WidgetConfigureActivity : SimpleActivity() {
config_bg_color.setOnClickListener { pickBackgroundColor() }
config_text_color.setOnClickListener { pickTextColor() }
notes_picker_value.setOnClickListener { showNoteSelector() }
+
+ val primaryColor = getProperPrimaryColor()
+ config_bg_seekbar.setColors(mTextColor, primaryColor, primaryColor)
notes_picker_holder.background = ColorDrawable(getProperBackgroundColor())
+
show_note_title_holder.setOnClickListener {
show_note_title.toggle()
handleNoteTitleDisplay()
@@ -229,17 +233,15 @@ class WidgetConfigureActivity : SimpleActivity() {
mBgColor = mBgColorWithoutTransparency.adjustAlpha(mBgAlpha)
text_note_view.setBackgroundColor(mBgColor)
checklist_note_view.setBackgroundColor(mBgColor)
- config_save.setBackgroundColor(mBgColor)
text_note_view_title.setBackgroundColor(mBgColor)
- config_bg_color.setFillWithStroke(mBgColor, Color.BLACK)
+ config_bg_color.setFillWithStroke(mBgColor, mBgColor)
}
private fun updateTextColor() {
- config_save.setTextColor(mTextColor)
text_note_view.setTextColor(mTextColor)
text_note_view_title.setTextColor(mTextColor)
(checklist_note_view.adapter as? ChecklistAdapter)?.updateTextColor(mTextColor)
- config_text_color.setFillWithStroke(mTextColor, Color.BLACK)
+ config_text_color.setFillWithStroke(mTextColor, mTextColor)
}
private fun pickBackgroundColor() {
diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/pro/databases/NotesDatabase.kt b/app/src/main/kotlin/com/simplemobiletools/notes/pro/databases/NotesDatabase.kt
index eb66529b..8b459dc8 100644
--- a/app/src/main/kotlin/com/simplemobiletools/notes/pro/databases/NotesDatabase.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/notes/pro/databases/NotesDatabase.kt
@@ -6,7 +6,6 @@ import androidx.room.Room
import androidx.room.RoomDatabase
import androidx.room.migration.Migration
import androidx.sqlite.db.SupportSQLiteDatabase
-import com.simplemobiletools.commons.helpers.DEFAULT_WIDGET_BG_COLOR
import com.simplemobiletools.commons.helpers.PROTECTION_NONE
import com.simplemobiletools.notes.pro.R
import com.simplemobiletools.notes.pro.helpers.DEFAULT_WIDGET_TEXT_COLOR
@@ -26,8 +25,10 @@ abstract class NotesDatabase : RoomDatabase() {
companion object {
private var db: NotesDatabase? = null
+ private var defaultWidgetBgColor = 0
fun getInstance(context: Context): NotesDatabase {
+ defaultWidgetBgColor = context.resources.getInteger(R.integer.default_widget_bg_color)
if (db == null) {
synchronized(NotesDatabase::class) {
if (db == null) {
@@ -64,7 +65,7 @@ abstract class NotesDatabase : RoomDatabase() {
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_bg_color INTEGER NOT NULL DEFAULT $defaultWidgetBgColor")
execSQL("ALTER TABLE widgets ADD COLUMN widget_text_color INTEGER NOT NULL DEFAULT $DEFAULT_WIDGET_TEXT_COLOR")
}
}
diff --git a/app/src/main/res/drawable-hdpi/img_widget_preview.png b/app/src/main/res/drawable-hdpi/img_widget_preview.png
deleted file mode 100644
index 0738e7d2..00000000
Binary files a/app/src/main/res/drawable-hdpi/img_widget_preview.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/img_widget_preview.png b/app/src/main/res/drawable-nodpi/img_widget_preview.png
similarity index 100%
rename from app/src/main/res/drawable-xxxhdpi/img_widget_preview.png
rename to app/src/main/res/drawable-nodpi/img_widget_preview.png
diff --git a/app/src/main/res/drawable-xhdpi/img_widget_preview.png b/app/src/main/res/drawable-xhdpi/img_widget_preview.png
deleted file mode 100644
index 448ed793..00000000
Binary files a/app/src/main/res/drawable-xhdpi/img_widget_preview.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/img_widget_preview.png b/app/src/main/res/drawable-xxhdpi/img_widget_preview.png
deleted file mode 100644
index 98f7ff59..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/img_widget_preview.png and /dev/null differ
diff --git a/app/src/main/res/layout/widget_config.xml b/app/src/main/res/layout/widget_config.xml
index 9148f332..2abf8975 100644
--- a/app/src/main/res/layout/widget_config.xml
+++ b/app/src/main/res/layout/widget_config.xml
@@ -96,7 +96,8 @@
android:id="@+id/config_bg_color"
android:layout_width="@dimen/widget_colorpicker_size"
android:layout_height="@dimen/widget_colorpicker_size"
- android:layout_above="@+id/config_text_color" />
+ android:layout_above="@+id/config_text_color"
+ android:layout_margin="@dimen/tiny_margin" />
+ android:background="@drawable/widget_config_seekbar_background">
-
+
+ android:layout_alignParentBottom="true"
+ android:layout_margin="@dimen/tiny_margin" />