feat: remove usage of context receivers (#26)

* Remove usage of context receivers * Update Gradle files * Update sample app
Ezard · Apr 9, 2023 · f0085ce · f0085ce
1 parent 46835f3
commit f0085ce
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 12 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -22,7 +22,6 @@ android {
     }
     kotlinOptions {
         jvmTarget = "1.8"
-        freeCompilerArgs = listOf("-Xcontext-receivers")
     }
     @Suppress("UnstableApiUsage")
     buildFeatures {

diff --git a/app/src/main/java/io/ezard/manuscript/app/ManuscriptExample.kt b/app/src/main/java/io/ezard/manuscript/app/ManuscriptExample.kt
@@ -19,13 +19,13 @@ fun ButtonManuscript() {
 
         // set up 1 or more variants of the component
         Variant(name = "Red") {
-            RedButton(text = text, onClick = { onClick.trigger() })
+            RedButton(text = text, onClick = onClick::trigger)
         }
         Variant(name = "Green") {
-            GreenButton(text = text, onClick = { onClick.trigger() })
+            GreenButton(text = text, onClick = onClick::trigger)
         }
         Variant(name = "Blue") {
-            BlueButton(text = text, onClick = { onClick.trigger() })
+            BlueButton(text = text, onClick = onClick::trigger)
         }
     }
 }
diff --git a/manuscript/build.gradle.kts b/manuscript/build.gradle.kts
@@ -22,7 +22,6 @@ android {
     }
     kotlinOptions {
         jvmTarget = "11"
-        freeCompilerArgs = listOf("-Xcontext-receivers")
     }
     @Suppress("UnstableApiUsage")
     buildFeatures {

diff --git a/manuscript/src/main/kotlin/io/ezard/manuscript/actions/Action.kt b/manuscript/src/main/kotlin/io/ezard/manuscript/actions/Action.kt
@@ -26,7 +26,6 @@ class Action(
     /**
      * Trigger an instance of this action to appear in the "Actions" section of Manuscript's bottom sheet
      */
-    context(ManuscriptScope)
     fun trigger() {
         onTrigger(this)
     }
@@ -41,9 +40,8 @@ class Action(
  *
  * @sample [io.ezard.manuscript.actions.ActionSample]
  */
-context(ManuscriptScope)
 @Composable
-fun action(name: String): Action {
+fun ManuscriptScope.action(name: String): Action {
     val data = LocalManuscriptData.current
     return Action(name = name, onTrigger = data::triggerAction)
 }

diff --git a/manuscript/src/main/kotlin/io/ezard/manuscript/controls/Control.kt b/manuscript/src/main/kotlin/io/ezard/manuscript/controls/Control.kt
@@ -134,9 +134,8 @@ private fun CustomControlSample() {
  *
  * @sample [io.ezard.manuscript.controls.ControlSample]
  */
-context(ManuscriptScope)
 @Composable
-fun <T> control(name: String, defaultValue: T): Control<T> {
+fun <T> ManuscriptScope.control(name: String, defaultValue: T): Control<T> {
     val state = remember { mutableStateOf(defaultValue) }
     val data = LocalManuscriptData.current
     return remember {

diff --git a/manuscript/src/main/kotlin/io/ezard/manuscript/variant/Variant.kt b/manuscript/src/main/kotlin/io/ezard/manuscript/variant/Variant.kt
@@ -24,9 +24,8 @@ internal class Variant(
  *
  * @sample [io.ezard.manuscript.variant.VariantSample]
  */
-context(ManuscriptScope)
 @Composable
-fun Variant(name: String, block: @Composable () -> Unit) {
+fun ManuscriptScope.Variant(name: String, block: @Composable () -> Unit) {
     LocalManuscriptData.current.registerVariant(name, block)
 }