Add + shorthand operator to add preference items

Maxr1998 · Sep 7, 2020 · c1a04d9 · c1a04d9
1 parent 20ec9a4
commit c1a04d9
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 5 deletions.
diff --git a/library/src/main/java/de/Maxr1998/modernpreferences/Preferences.kt b/library/src/main/java/de/Maxr1998/modernpreferences/Preferences.kt
@@ -457,5 +457,14 @@ class PreferenceScreen private constructor(builder: Builder) : Preference(builde
 
     fun interface Appendable {
         fun addPreferenceItem(p: Preference)
+
+        operator fun plusAssign(p: Preference) {
+            addPreferenceItem(p)
+        }
+
+        operator fun <T : Preference> T.unaryPlus(): T {
+            addPreferenceItem(this)
+            return this
+        }
     }
 }
diff --git a/library/src/main/java/de/Maxr1998/modernpreferences/preferences/CollapsePreference.kt b/library/src/main/java/de/Maxr1998/modernpreferences/preferences/CollapsePreference.kt
@@ -39,11 +39,11 @@ class CollapsePreference(screen: PreferenceScreen.Builder, key: String) : Prefer
     }
 
     override fun addPreferenceItem(p: Preference) {
-        checkNotNull(screen) {
+        val screen = checkNotNull(screen) {
             "Don't call clearContext before you've finished all addPreferenceItem operations!"
         }
-        screen!!.addPreferenceItem(p)
-        preferences.add(p.apply { visible = false })
+        screen += p
+        preferences += p.apply { visible = false }
     }
 
     fun clearContext() {

diff --git a/testapp/src/main/java/de/Maxr1998/modernpreferences/example/Common.kt b/testapp/src/main/java/de/Maxr1998/modernpreferences/example/Common.kt
@@ -114,10 +114,10 @@ object Common {
                     true
                 }
             }
-            addPreferenceItem(TestDialog().apply {
+            +TestDialog().apply {
                 title = "Show dialog"
                 iconRes = R.drawable.ic_info_24dp
-            })
+            }
             expandText("expand-text") {
                 title = "Expandable text"
                 text = "This is an example implementation of ModernAndroidPreferences, check out " +