diff options
| author | Allan Wang <me@allanwang.ca> | 2018-09-26 14:56:44 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-26 14:56:44 -0400 |
| commit | 438affb07ae106e490884fafa3c2dd825e7649a4 (patch) | |
| tree | b94e182bf4d083af049120a6b5f94f82c4595318 /app/src/main/kotlin/com/pitchedapps/frost/views/Keywords.kt | |
| parent | c5e769deabeb80d7257b85c5c3d802cf46e6b191 (diff) | |
| download | frost-438affb07ae106e490884fafa3c2dd825e7649a4.tar.gz frost-438affb07ae106e490884fafa3c2dd825e7649a4.tar.bz2 frost-438affb07ae106e490884fafa3c2dd825e7649a4.zip | |
Cleanup (#1087)
* Feature/download manager (#855)
* Add initial github release check
* Create update service
* Clean old manager directory
* Update kau
* Update updateActivity snippet
* Add back gradle keys
* Remove update service functionality
* Update changelog
* Misc (#865)
* Clean up git code
* Update download link
* Update theme
* Reorder settings, resolvees #856
* Do not log undeliverable exception
* Handle potential lack of webview
* Set notification epoch default to now, resolves #857
* Fix notification epoch time init
* Update changelog
* Update theme
* Add slack url, resolves #880
* Prepare for image update
* Fix view full image (#882)
* Test including full photo viewer
* Test cookie in glide
* Fix parser and add redirects to view full image
* Update changelog
* Fix compilation and add new keys
* Update all versions
* Fix signing configs
* Fix exoplayer api update
* Change string usage
* Test scss on travis
* Test with node_js flag
* Add back css
* Update versions and fix video view
Diffstat (limited to 'app/src/main/kotlin/com/pitchedapps/frost/views/Keywords.kt')
| -rw-r--r-- | app/src/main/kotlin/com/pitchedapps/frost/views/Keywords.kt | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/views/Keywords.kt b/app/src/main/kotlin/com/pitchedapps/frost/views/Keywords.kt index d005e58a..8092133b 100644 --- a/app/src/main/kotlin/com/pitchedapps/frost/views/Keywords.kt +++ b/app/src/main/kotlin/com/pitchedapps/frost/views/Keywords.kt @@ -10,7 +10,6 @@ import android.support.v7.widget.RecyclerView import android.util.AttributeSet import android.view.View import android.widget.ImageView -import ca.allanwang.kau.kpref.StringSet import ca.allanwang.kau.utils.bindView import ca.allanwang.kau.utils.string import ca.allanwang.kau.utils.tint @@ -42,10 +41,10 @@ class Keywords @JvmOverloads constructor( editText.tint(Prefs.textColor) addIcon.setImageDrawable(GoogleMaterial.Icon.gmd_add.keywordDrawable(context)) addIcon.setOnClickListener { - if (editText.text.isEmpty()) editText.error = context.string(R.string.empty_keyword) + if (editText.text.isNullOrEmpty()) editText.error = context.string(R.string.empty_keyword) else { adapter.add(0, KeywordItem(editText.text.toString())) - editText.text.clear() + editText.text?.clear() } } adapter.add(Prefs.notificationKeywords.map { KeywordItem(it) }) @@ -61,11 +60,9 @@ class Keywords @JvmOverloads constructor( } fun save() { - val keywords = adapter.adapterItems.map { it.keyword } - Prefs.notificationKeywords = StringSet(keywords) + Prefs.notificationKeywords = adapter.adapterItems.mapTo(mutableSetOf()) { it.keyword } } - } private fun IIcon.keywordDrawable(context: Context): Drawable = toDrawable(context, 20, Prefs.textColor) |