fenix/Simple-Notes
1
0
Fork 0
mirror of https://github.com/SimpleMobileTools/Simple-Notes.git synced 2025-04-04 18:51:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

do not show the widget note picker if we are just customizing the colors

Browse Source
This commit is contained in:
tibbi 2018-09-13 23:07:39 +02:00
parent 10a4695062
commit cc01f380f8
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -29,8 +29,9 @@ class WidgetConfigureActivity : SimpleActivity() {
private var mBgColor = 0 private var mBgColor = 0
private var mBgColorWithoutTransparency = 0 private var mBgColorWithoutTransparency = 0
private var mTextColor = 0 private var mTextColor = 0
private var mNotes = ArrayList<Note>()
private var mCurrentNoteId = 0 private var mCurrentNoteId = 0
private var mIsCustomizingColors = false
private var mNotes = ArrayList<Note>()
public override fun onCreate(savedInstanceState: Bundle?) { public override fun onCreate(savedInstanceState: Bundle?) {
useDynamicTheme = false useDynamicTheme = false
@ -39,10 +40,9 @@ class WidgetConfigureActivity : SimpleActivity() {
setContentView(R.layout.widget_config) setContentView(R.layout.widget_config)
initVariables() initVariables()
val isCustomizingColors = intent.extras?.getBoolean(IS_CUSTOMIZING_COLORS) ?: false
mWidgetId = intent.extras?.getInt(AppWidgetManager.EXTRA_APPWIDGET_ID) ?: AppWidgetManager.INVALID_APPWIDGET_ID mWidgetId = intent.extras?.getInt(AppWidgetManager.EXTRA_APPWIDGET_ID) ?: AppWidgetManager.INVALID_APPWIDGET_ID
if (mWidgetId == AppWidgetManager.INVALID_APPWIDGET_ID && !isCustomizingColors) { if (mWidgetId == AppWidgetManager.INVALID_APPWIDGET_ID && !mIsCustomizingColors) {
finish() finish()
} }
@ -78,7 +78,8 @@ class WidgetConfigureActivity : SimpleActivity() {
mTextColor = config.widgetTextColor mTextColor = config.widgetTextColor
updateTextColor() updateTextColor()
mNotes = dbHelper.getNotes() mNotes = dbHelper.getNotes()
notes_picker_holder.beVisibleIf(mNotes.size > 1) mIsCustomizingColors = intent.extras?.getBoolean(IS_CUSTOMIZING_COLORS) ?: false
notes_picker_holder.beVisibleIf(mNotes.size > 1 && !mIsCustomizingColors)
updateCurrentNote(mNotes.first()) updateCurrentNote(mNotes.first())
} }
@ -97,7 +98,7 @@ class WidgetConfigureActivity : SimpleActivity() {
private fun updateCurrentNote(note: Note) { private fun updateCurrentNote(note: Note) {
mCurrentNoteId = note.id mCurrentNoteId = note.id
notes_picker_value.text = note.title notes_picker_value.text = note.title
val sampleValue = if (note.value.isEmpty()) getString(R.string.widget_config) else note.value val sampleValue = if (note.value.isEmpty() || mIsCustomizingColors) getString(R.string.widget_config) else note.value
notes_view.text = sampleValue notes_view.text = sampleValue
} }