broadcast module and bottom nav module updated

wisdomrider · wisdomrider · commit 87579eb840f3 · 2020-04-07T20:45:48.000+05:45
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
diff --git a/app/src/main/java/org/wisdomrider/lazylibrarydemo/App.kt b/app/src/main/java/org/wisdomrider/lazylibrarydemo/App.kt
@@ -12,7 +12,7 @@ class App : LazyApp() {
         inject(RecycleModule::class.java)
         inject(MapModule::class.java)
         inject(BroadCastModule::class.java)
-        inject(BottomNavigationViewModule::class.java)
+        inject(BottomNavigationModule::class.java)
 
         api = inject(RetrofitModule::class.java)
             .buildRetrofit("https://jsonplaceholder.typicode.com", Api::class.java)
diff --git a/app/src/main/java/org/wisdomrider/lazylibrarydemo/MainActivity.kt b/app/src/main/java/org/wisdomrider/lazylibrarydemo/MainActivity.kt
@@ -1,15 +1,13 @@
 package org.wisdomrider.lazylibrarydemo
 
-import android.content.BroadcastReceiver
-import android.content.Context
 import android.content.Intent
 import android.os.Bundle
-import android.util.Log
 import android.view.Menu
 import android.view.MenuItem
 import org.wisdomrider.lazylibrary.LazyBase
-import org.wisdomrider.lazylibrary.modules.reciveLazyBroadCast
-import org.wisdomrider.lazylibrary.modules.sendLazyBoradcast
+import org.wisdomrider.lazylibrary.modules.receiveBroadcast
+import org.wisdomrider.lazylibrary.modules.sendBroadCast
+import org.wisdomrider.lazylibrary.modules.toast
 import org.wisdomrider.lazylibrarydemo.bottomnavigation.BottomNavigationView
 import org.wisdomrider.lazylibrarydemo.fetchdata.FetchindDataFromServer
 import org.wisdomrider.lazylibrarydemo.mapactivity.MapActivity
@@ -21,6 +19,7 @@ class MainActivity : LazyBase() {
         setContentView(R.layout.activity_main)
     }
 
+
     override fun onCreateOptionsMenu(menu: Menu?): Boolean {
         menuInflater.inflate(R.menu.example_menu, menu)
         return super.onCreateOptionsMenu(menu)
@@ -35,15 +34,15 @@ class MainActivity : LazyBase() {
                 openActivity(FetchindDataFromServer::class.java)
             }
             R.id.action_broad_cast_receiver -> {
-               // Receiving broad cast Example
-                reciveLazyBroadCast() { context: Context?, intent: Intent?,reciver: BroadcastReceiver? ->
-                    var msg = intent?.getStringExtra("key")
-                    Log.e("message", msg)
-                    unregisterReceiver(reciver)
+                // Receiving broad cast Example
+                receiveBroadcast { it, _ ->
+                    it!!.extras.getString("key").toast().lazy()
+                    true
                 }.lazy()
-                var intent = Intent()
-                intent.putExtra("key", "Hello broad cast")
-                sendLazyBoradcast(intent).lazy()
+                val intent = Intent()
+                intent.putExtra("key", "Hello broadCast !")
+                intent.sendBroadCast().lazy()
+
             }
 
             R.id.action_bottom_nav_view -> {
@@ -54,8 +53,5 @@ class MainActivity : LazyBase() {
         return super.onOptionsItemSelected(item)
     }
 
-    private fun <T> openActivity(java: Class<T>) {
-        var intent = Intent(this, java)
-        startActivity(intent)
-    }
+
 }
diff --git a/app/src/main/java/org/wisdomrider/lazylibrarydemo/bottomnavigation/BottomNavigationView.kt b/app/src/main/java/org/wisdomrider/lazylibrarydemo/bottomnavigation/BottomNavigationView.kt
@@ -1,17 +1,25 @@
 package org.wisdomrider.lazylibrarydemo.bottomnavigation
+
 import android.os.Bundle
 import kotlinx.android.synthetic.main.activity_bottom_navigation_view.*
 import org.wisdomrider.lazylibrary.LazyBase
-import org.wisdomrider.lazylibrary.modules.addBadge
-import org.wisdomrider.lazylibrary.modules.updateNumberOnBadge
+import org.wisdomrider.lazylibrary.modules.NavigationItem
+import org.wisdomrider.lazylibrary.modules.setBadges
 import org.wisdomrider.lazylibrarydemo.R
 
 class BottomNavigationView : LazyBase() {
+    lateinit var navs: ArrayList<NavigationItem>
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_bottom_navigation_view)
-        customBottomBar.addBadge(0).lazy()
-        // Now we can update badges from any where
-        customBottomBar.updateNumberOnBadge(3).lazy()
+        supportActionBar!!.title = "Bottom Navigation Module Example"
+        supportActionBar!!.setDisplayHomeAsUpEnabled(true)
+        navView.setBadges {
+            navs = it
+        }.lazy()
+
+        navs[0].setCount(2)
+
     }
-}
+}
+
diff --git a/app/src/main/java/org/wisdomrider/lazylibrarydemo/fetchdata/FetchindDataFromServer.kt b/app/src/main/java/org/wisdomrider/lazylibrarydemo/fetchdata/FetchindDataFromServer.kt
@@ -16,6 +16,8 @@ class FetchindDataFromServer : LazyBase() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_fetchind_data_from_server)
+        supportActionBar!!.title="Retrofit and Recycler Module Example"
+        supportActionBar!!.setDisplayHomeAsUpEnabled(true)
         var api = (application as App).api
         api.list()
             .get({
diff --git a/app/src/main/java/org/wisdomrider/lazylibrarydemo/mapactivity/MapActivity.kt b/app/src/main/java/org/wisdomrider/lazylibrarydemo/mapactivity/MapActivity.kt
@@ -10,11 +10,13 @@ import org.wisdomrider.lazylibrary.modules.createMapSync
 import org.wisdomrider.lazylibrary.modules.toast
 import org.wisdomrider.lazylibrarydemo.R
 
-class MapActivity : LazyBase () {
+class MapActivity : LazyBase() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_map)
+        supportActionBar!!.title = "Map Module Example"
+        supportActionBar!!.setDisplayHomeAsUpEnabled(true)
         this.createMapSync(R.id.map) {
             var lat = 27.712021
             var long = 85.312950
diff --git a/app/src/main/res/layout/activity_bottom_navigation_view.xml b/app/src/main/res/layout/activity_bottom_navigation_view.xml
@@ -21,7 +21,7 @@
             android:layout_height="match_parent">
         <com.google.android.material.bottomnavigation.BottomNavigationView
                 android:background="#ffffff"
-                android:id="@+id/customBottomBar"
+                android:id="@+id/navView"
                 app:menu= "@menu/bottom_nav_view"
                 android:layout_width="match_parent"
                 android:layout_height="62dp"
diff --git a/lazylibrary/src/main/java/org/wisdomrider/lazylibrary/LazyApp.kt b/lazylibrary/src/main/java/org/wisdomrider/lazylibrary/LazyApp.kt
@@ -10,19 +10,9 @@ const val LAZY_BROADCAST = "LAZY_BROADCAST"
 
 open class LazyApp : Application() {
 
-    var callIt: ((intent: Intent?) -> Unit)? = null
-    val filter = IntentFilter(LAZY_BROADCAST)
-    lateinit var receiver: BroadcastReceiver
     private var modules = ArrayList<LazyModule>()
 
 
-    override fun sendBroadcast(intent: Intent) {
-        intent.action = LAZY_BROADCAST
-        super.sendBroadcast(intent)
-    }
-
-
-
     protected fun <T> inject(module: Class<T>): T {
         try {
             val module = (module.newInstance() as LazyModule).setContext(this)
@@ -41,19 +31,6 @@ open class LazyApp : Application() {
         }
     }
 
-    override fun onCreate() {
-        super.onCreate()
-        val intentFilter = IntentFilter(
-            LAZY_BROADCAST
-        )
-        receiver = object : BroadcastReceiver() {
-            override fun onReceive(context: Context?, intent: Intent?) {
-                if (callIt == null) return
-                callIt!!(intent)
-            }
-        }
-        registerReceiver(receiver, intentFilter)
-    }
 }
 
 
diff --git a/lazylibrary/src/main/java/org/wisdomrider/lazylibrary/LazyBase.kt b/lazylibrary/src/main/java/org/wisdomrider/lazylibrary/LazyBase.kt
@@ -14,9 +14,7 @@ open class LazyBase : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         lazy = application as LazyApp
-        lazy.callIt = {
-            gotBroadcast(it)
-        }
+
     }
 
     fun <T> getModule(module: Class<T>): T {
@@ -40,8 +38,15 @@ open class LazyBase : AppCompatActivity() {
         return this.function(lazy.getModule(this.java))
     }
 
-    open fun gotBroadcast(intent: Intent?) {
-
+    fun <T> openActivity(java: Class<T>? = null, intent: Intent? = null) {
+        if (intent == null)
+            startActivity(Intent(this, java))
+        else
+            startActivity(intent)
+    }
+    override fun onSupportNavigateUp(): Boolean {
+        onBackPressed()
+        return true
     }
 }
 
diff --git a/lazylibrary/src/main/java/org/wisdomrider/lazylibrary/LazyModule.kt b/lazylibrary/src/main/java/org/wisdomrider/lazylibrary/LazyModule.kt
@@ -14,8 +14,13 @@ open class LazyModule {
     fun setContext(lazy: LazyApp): LazyModule {
         this.lazy = lazy
         this.context = lazy.applicationContext
+        this.onInit()
         return this
     }
 
+    open fun onInit() {
+
+    }
+
 
 }
diff --git a/lazylibrary/src/main/java/org/wisdomrider/lazylibrary/modules/BottomNavigationModule.kt b/lazylibrary/src/main/java/org/wisdomrider/lazylibrary/modules/BottomNavigationModule.kt
@@ -0,0 +1,50 @@
+package org.wisdomrider.lazylibrary.modules
+
+import android.view.LayoutInflater
+import android.view.View
+import android.widget.TextView
+import com.google.android.material.bottomnavigation.BottomNavigationItemView
+import com.google.android.material.bottomnavigation.BottomNavigationMenuView
+import com.google.android.material.bottomnavigation.BottomNavigationView
+import org.wisdomrider.lazylibrary.Functions
+import org.wisdomrider.lazylibrary.LazyModule
+import org.wisdomrider.lazylibrary.R
+
+class NavigationItem(var view: View) {
+
+    fun removeCount(): NavigationItem {
+        this.view.findViewById<TextView>(R.id.count).visibility = View.GONE
+        return this
+    }
+
+    fun setCount(count: Int, background: Int? = null, hideAtZero: Boolean = true) {
+        val item = view.findViewById<TextView>(R.id.count)
+        if (count == 0 && hideAtZero)
+            item.visibility = View.GONE
+        else {
+            item.visibility = View.VISIBLE
+            item.text = "$count"
+        }
+        if (background != null)
+            item.setBackgroundResource(background)
+    }
+}
+
+class BottomNavigationModule : LazyModule() {
+
+}
+
+
+fun BottomNavigationView.setBadges(func: (list: ArrayList<NavigationItem>) -> Unit): Functions<BottomNavigationModule> {
+    return Functions(BottomNavigationModule::class.java) { module ->
+        var items = (this.getChildAt(0) as BottomNavigationMenuView)
+        var list = ArrayList<NavigationItem>()
+        repeat(items.childCount) {
+            var badge = LayoutInflater
+                .from(module.context)
+                .inflate(R.layout.badge, items.getChildAt(it) as BottomNavigationItemView, true)
+            list.add(NavigationItem(badge).removeCount())
+        }
+        func(list)
+    }
+}
diff --git a/lazylibrary/src/main/java/org/wisdomrider/lazylibrary/modules/BottomNavigationViewModule.kt b/lazylibrary/src/main/java/org/wisdomrider/lazylibrary/modules/BottomNavigationViewModule.kt
diff --git a/lazylibrary/src/main/java/org/wisdomrider/lazylibrary/modules/BroadCastModule.kt b/lazylibrary/src/main/java/org/wisdomrider/lazylibrary/modules/BroadCastModule.kt
@@ -12,28 +12,32 @@ import org.wisdomrider.lazylibrary.LAZY_BROADCAST
 import org.wisdomrider.lazylibrary.LazyModule
 
 open class BroadCastModule : LazyModule() {
+
+    override fun onInit() {
+    }
+
 }
 
-fun FragmentActivity.sendLazyBoradcast(intent: Intent): Functions<BroadCastModule> {
+
+fun Intent.sendBroadCast(): Functions<BroadCastModule> {
     return Functions(BroadCastModule::class.java) {
-        intent.action = LAZY_BROADCAST
-        this.sendBroadcast(intent)
+        this.action = LAZY_BROADCAST
+        it.context.sendBroadcast(this)
     }
 }
 
-fun FragmentActivity.reciveLazyBroadCast (
-     functions: (context: Context?, intent: Intent?, reciver: BroadcastReceiver) -> Unit
+fun receiveBroadcast(
+    functions: (intent: Intent?, receiver: BroadcastReceiver) -> Boolean
 ): Functions<BroadCastModule> {
     return Functions(BroadCastModule::class.java) {
-        val intentFilter = IntentFilter(
-            LAZY_BROADCAST
-        )
+        val intentFilter = IntentFilter(LAZY_BROADCAST)
         var receiver = object : BroadcastReceiver() {
             override fun onReceive(context: Context?, intent: Intent?) {
-                functions(context, intent, this as BroadcastReceiver)
+                if (functions(intent, this))
+                    it.context.unregisterReceiver(this)
             }
 
         }
-        this.registerReceiver(receiver, intentFilter)
+        it.context.registerReceiver(receiver, intentFilter)
     }
 }
diff --git a/lazylibrary/src/main/java/org/wisdomrider/lazylibrary/modules/RetrofitModule.kt b/lazylibrary/src/main/java/org/wisdomrider/lazylibrary/modules/RetrofitModule.kt
@@ -27,6 +27,7 @@ class RetrofitModule : LazyModule() {
     }
 
 }
+
 fun <T> Call<T>.get(
     response: (response: Response<T>) -> Unit,
     failure: (t: Throwable) -> Unit
@@ -37,11 +38,7 @@ fun <T> Call<T>.get(
         }
 
         override fun onResponse(call: Call<T>, response: Response<T>) {
-            if (response.code() == 200) {
-                response(response)
-            } else {
-                failure(Exception("Response class is not 200 ${response.code()}"))
-            }
+            response(response)
         }
     })
 }
diff --git a/lazylibrary/src/main/res/layout/badge.xml b/lazylibrary/src/main/res/layout/badge.xml
diff --git a/lazylibrary/src/main/res/values/colors.xml b/lazylibrary/src/main/res/values/colors.xml

Original file line number	Diff line number	Diff line change
`@@ -14,8 +14,13 @@ open class LazyModule {`
`14`	`14`	`fun setContext(lazy: LazyApp): LazyModule {`
`15`	`15`	`this.lazy = lazy`
`16`	`16`	`this.context = lazy.applicationContext`
	`17`	`+ this.onInit()`
`17`	`18`	`return this`
`18`	`19`	`}`
`19`	`20`
	`21`	`+ open fun onInit() {`
	`22`	`+`
	`23`	`+ }`
	`24`	`+`
`20`	`25`
`21`	`26`	`}`