refactor

README.md

@@ -13,15 +13,14 @@ allprojects {
 }
 
 dependencies {
-      implementation 'com.github.ibrahimsn98:android-live-broadcasts:1.0'
+      implementation 'com.github.ibrahimsn98:android-live-broadcasts:1.1'
 }
 ```
 
 ## Usage
 ```kotlin
-LiveBroadcasts.init().subscribe(context, arrayOf(Intent.ACTION_TIME_TICK)).observe(this, Observer {
-	if (it != null)
-		Log.d("MainActivity", it.action)
+LiveBroadcast(this, arrayOf(Intent.ACTION_TIME_TICK)).observe(this, Observer {
+    Log.d("MainActivity", it.action)
 })
 ```
 
@@ -49,7 +48,4 @@ License
 	LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 	OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 	SOFTWARE.
-	© 2018 Git
-
-
-> Follow me on Twitter [@ibrahimsn98](https://twitter.com/ibrahimsn98)
+	© 2018 Git

app/src/main/java/me/ibrahimsn/livebroadcasts/MainActivity.kt

@@ -6,17 +6,16 @@ import android.os.Bundle
 import android.util.Log
 import androidx.lifecycle.Observer
 import kotlinx.android.synthetic.main.activity_main.*
-import me.ibrahimsn.lib.LiveBroadcasts
+import me.ibrahimsn.lib.LiveBroadcast
 
 class MainActivity : AppCompatActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_main)
 
-        LiveBroadcasts.init().subscribe(this, arrayOf(Intent.ACTION_TIME_TICK)).observe(this, Observer {
-            if (it != null)
-                Log.d("MainActivity", it.action)
+        LiveBroadcast(this, arrayOf(Intent.ACTION_TIME_TICK)).observe(this, Observer {
+            Log.d("MainActivity", it.action)
         })
 
         textView.setOnClickListener {

app/src/main/java/me/ibrahimsn/livebroadcasts/SecondActivity.kt

@@ -5,17 +5,16 @@ import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
 import android.util.Log
 import androidx.lifecycle.Observer
-import me.ibrahimsn.lib.LiveBroadcasts
+import me.ibrahimsn.lib.LiveBroadcast
 
 class SecondActivity : AppCompatActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_second)
 
-        LiveBroadcasts.init().subscribe(this, arrayOf(Intent.ACTION_TIME_TICK)).observe(this, Observer {
-            if (it != null)
-                Log.d("MainActivity", it.action)
+        LiveBroadcast(this, arrayOf(Intent.ACTION_TIME_TICK)).observe(this, Observer {
+            Log.d("SecondActivity", it.action)
         })
     }
 }

build.gradle

@@ -8,7 +8,7 @@ buildscript {
 
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.4.2'
+        classpath 'com.android.tools.build:gradle:3.6.3'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Tue Jul 23 16:27:22 EET 2019
+#Sat May 16 18:34:51 EET 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip

lib/src/main/java/me/ibrahimsn/lib/LiveBroadcast.kt

@@ -4,50 +4,34 @@ import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
 import android.content.IntentFilter
-import androidx.lifecycle.MutableLiveData
-import io.reactivex.Observable
-import io.reactivex.android.schedulers.AndroidSchedulers
-import io.reactivex.disposables.Disposable
-import io.reactivex.observers.DisposableObserver
-import io.reactivex.schedulers.Schedulers
+import androidx.lifecycle.LiveData
 
-class LiveBroadcast(private val receiver: BroadcastReceiver,
-                    private val context: Context,
-                    private val updates: Observable<Intent>,
-                    private val filters: Array<String>) : MutableLiveData<Intent>() {
+class LiveBroadcast(
+    private val context: Context,
+    private val filters: Array<String>
+) : LiveData<Intent>() {
 
-    private var disposable: Disposable? = null
+    private val intentFilter = IntentFilter().apply {
+        for (filter in filters) addAction(filter)
+    }
 
     override fun onActive() {
         super.onActive()
+        context.registerReceiver(broadcastReceiver, intentFilter)
+    }
 
-        disposable = updates.subscribeOn(Schedulers.io())
-            .observeOn(AndroidSchedulers.mainThread()).subscribeWith(object: DisposableObserver<Intent>() {
-                override fun onComplete() {
-
-                }
-
-                override fun onNext(t: Intent) {
-                    postValue(t)
-                }
-
-                override fun onError(e: Throwable) {
-
-                }
-            })
-
-        context.registerReceiver(receiver, IntentFilter().apply {
-            for (filter in filters)
-                this.addAction(filter)
-        })
+    private val broadcastReceiver = object: BroadcastReceiver() {
+        override fun onReceive(context: Context?, intent: Intent?) {
+            postValue(intent)
+        }
     }
 
     override fun onInactive() {
         super.onInactive()
-        disposable?.dispose()
-
         try {
-            context.unregisterReceiver(receiver)
-        } catch (e: IllegalArgumentException) {}
+            context.unregisterReceiver(broadcastReceiver)
+        } catch (e: IllegalArgumentException) {
+            e.printStackTrace()
+        }
     }
-}
+}