Tweak on registering of localbroadcast receiver

nekocode · May 31, 2019 · 0232f7c · 0232f7c
1 parent 23ef3fa
commit 0232f7c
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 11 deletions.
diff --git a/README.md b/README.md
@@ -21,19 +21,19 @@ The template project imports the [Meepo](https://github.com/nekocode/Meepo) libr
 // Navigate to a new activity
 activityRouter.gotoXxxActivity(this)
 
-// Broadcast something
+// Broadcast action
 broadcastRouter.tellSomeSth(this)
 
 // Register broadcast receiver
-registerLocalReceiver({ _, intent ->
+registerLocalReceiver(BroadcastRouter.Action1, BroadcastRouter.Action2) { _, intent ->
     val action = (intent ?: return@registerLocalReceiver).action
             ?: return@registerLocalReceiver
     when (action) {
         BroadcastRouter.Action1 -> {
             // Do sth
         }
     }
-}, BroadcastRouter.Action1, BroadcastRouter.Action2)
+}
 ```
 
 Sending a network request in this project is also simple:

diff --git a/app/src/main/java/cn/nekocode/gank/GankApplication.kt b/app/src/main/java/cn/nekocode/gank/GankApplication.kt
@@ -57,8 +57,8 @@ val Context.broadcastRouter get() = (this.applicationContext as GankApplication)
 val Context.gankIoService get() = (this.applicationContext as GankApplication).gankIoService
 
 fun Context.registerLocalReceiver(
-    receiver: BroadcastReceiver.(Context?, Intent?) -> Unit,
-    intentFilter: IntentFilter
+    intentFilter: IntentFilter,
+    receiver: BroadcastReceiver.(Context?, Intent?) -> Unit
 ) {
     LocalBroadcastManager.getInstance(this)
         .registerReceiver(object : BroadcastReceiver() {
@@ -69,12 +69,12 @@ fun Context.registerLocalReceiver(
 }
 
 fun Context.registerLocalReceiver(
-    receiver: BroadcastReceiver.(Context?, Intent?) -> Unit,
-    vararg actions: String
+    vararg actions: String,
+    receiver: BroadcastReceiver.(Context?, Intent?) -> Unit
 ) {
     val intentFilter = IntentFilter()
     actions.forEach {
         intentFilter.addAction(it)
     }
-    registerLocalReceiver(receiver, intentFilter)
+    registerLocalReceiver(intentFilter, receiver)
 }
diff --git a/app/src/main/java/cn/nekocode/gank/ui/home/MainActivity.kt b/app/src/main/java/cn/nekocode/gank/ui/home/MainActivity.kt
@@ -41,7 +41,7 @@ class MainActivity : BaseActivity() {
         }
 
         // Register local broadcast receiver
-        registerLocalReceiver({ _, intent ->
+        registerLocalReceiver(BroadcastRouter.FETCH_SUC) { _, intent ->
             val action = (intent ?: return@registerLocalReceiver).action
                 ?: return@registerLocalReceiver
             when (action) {
@@ -50,8 +50,7 @@ class MainActivity : BaseActivity() {
                     fetchBtn.isEnabled = false
                 }
             }
-
-        }, BroadcastRouter.FETCH_SUC)
+        }
     }
 
     override fun onSaveInstanceState(outState: Bundle) {