Merge branch 'development' into FixedSearch

Author: pallav12

app/build.gradle

@@ -140,6 +140,11 @@ dependencies {
     implementation "com.jakewharton:butterknife:${rootConfiguration.butterKnifeVersion}"
     kapt "com.jakewharton:butterknife-compiler:${rootConfiguration.butterKnifeVersion}"
 
+    //koin
+    implementation "org.koin:koin-android-scope:${rootConfiguration.koinVersion}"
+    implementation "org.koin:koin-android:${rootConfiguration.koinVersion}"
+    testImplementation "org.koin:koin-test:${rootConfiguration.koinVersion}"
+
     //For Picasso
     implementation "com.squareup.picasso:picasso:${rootConfiguration.picassoVersion}"
 

app/config.gradle

@@ -26,4 +26,5 @@ ext {
     playServiceAuthVersion='16.0.1'
     shimmerVersion = "0.5.0"
     stethoVersion = "1.5.1"
+    koinVersion = "2.0.1"
 }

app/src/main/java/org/fossasia/susi/ai/MainApplication.kt

@@ -8,6 +8,9 @@ import com.facebook.stetho.Stetho
 import com.squareup.leakcanary.LeakCanary
 import io.realm.Realm
 import io.realm.RealmConfiguration
+import org.fossasia.susi.ai.di.modules
+import org.koin.android.ext.koin.androidContext
+import org.koin.core.context.startKoin
 import timber.log.Timber
 
 class MainApplication : Application() {
@@ -24,6 +27,10 @@ class MainApplication : Application() {
 
     override fun onCreate() {
         super.onCreate()
+        startKoin {
+            androidContext(this@MainApplication)
+            modules(listOf(modules))
+        }
 
         if (LeakCanary.isInAnalyzerProcess(this)) {
             // This process is dedicated to LeakCanary for heap analysis.

app/src/main/java/org/fossasia/susi/ai/device/connecteddevices/ConnectedDeviceFragment.kt

@@ -20,11 +20,13 @@ import org.fossasia.susi.ai.device.connecteddevices.adapters.ConnectedDevicesAda
 import org.fossasia.susi.ai.device.connecteddevices.contract.IConnectedDevicePresenter
 import org.fossasia.susi.ai.device.connecteddevices.contract.IConnectedDeviceView
 import org.fossasia.susi.ai.rest.responses.susi.Device
+import org.koin.android.ext.android.inject
+import org.koin.core.parameter.parametersOf
 
 class ConnectedDeviceFragment : Fragment(), IConnectedDeviceView {
 
     private lateinit var connectedDeviceRecyclerView: RecyclerView
-    private lateinit var connectedDevicePresenter: IConnectedDevicePresenter
+    private val connectedDevicePresenter: IConnectedDevicePresenter by inject { parametersOf(this) }
     private var connectedDevicesAdapter: RecyclerView.Adapter<*>? = null
     private val connectedDeviceList: ArrayList<Device> = ArrayList()
     private val macIdList: MutableList<String> = ArrayList()
@@ -45,8 +47,6 @@ class ConnectedDeviceFragment : Fragment(), IConnectedDeviceView {
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        connectedDevicePresenter = ConnectedDevicePresenter(this)
-        connectedDevicePresenter.onAttach(this)
         getDeviceList()
 
         refresh_device_layout.setOnRefreshListener {

app/src/main/java/org/fossasia/susi/ai/device/connecteddevices/ConnectedDevicePresenter.kt

@@ -8,15 +8,13 @@ import org.fossasia.susi.ai.rest.responses.susi.ConnectedDevicesResponse
 import retrofit2.Response
 import timber.log.Timber
 
-class ConnectedDevicePresenter(val connectedDeviceFragment: ConnectedDeviceFragment) :
+class ConnectedDevicePresenter(private val connectedDeviceView: IConnectedDeviceView) :
         IConnectedDevicePresenter,
         IRoomModel.onConnectedDeviceFetchingFinishedListener {
 
     private val roomModel: RoomModel = RoomModel()
-    private var connectedDeviceView: IConnectedDeviceView? = null
 
     override fun onAttach(connectedDeviceView: IConnectedDeviceView) {
-        this.connectedDeviceView = connectedDeviceView
     }
 
     override fun getDevices() {

app/src/main/java/org/fossasia/susi/ai/device/viewdevice/ViewDeviceFragment.kt

@@ -32,10 +32,13 @@ import org.fossasia.susi.ai.dataclasses.AddDeviceQuery
 import org.fossasia.susi.ai.device.DeviceActivity.Companion.DEVICE_DETAILS
 import org.fossasia.susi.ai.device.DeviceActivity.Companion.MAC_ID
 import org.fossasia.susi.ai.device.viewdevice.adapters.ShowRoomsAdapter
+import org.fossasia.susi.ai.device.viewdevice.contract.IViewDevicePresenter
 import org.fossasia.susi.ai.device.viewdevice.contract.IViewDeviceView
 import org.fossasia.susi.ai.helper.Constant
 import org.fossasia.susi.ai.helper.PrefManager
 import org.fossasia.susi.ai.rest.responses.susi.Device
+import org.koin.android.ext.android.inject
+import org.koin.core.parameter.parametersOf
 
 class ViewDeviceFragment : Fragment(), IViewDeviceView {
 
@@ -49,7 +52,7 @@ class ViewDeviceFragment : Fragment(), IViewDeviceView {
     private lateinit var availableRoomsRecyclerView: RecyclerView
     private var availableRoomsAdapter: RecyclerView.Adapter<*>? = null
     private var roomNameSelected: String? = null
-    private lateinit var viewDevicePresenter: ViewDevicePresenter
+    private val viewDevicePresenter: IViewDevicePresenter by inject { parametersOf(this) }
     private lateinit var progressDialog: ProgressDialog
 
     override fun onCreateView(
@@ -75,7 +78,6 @@ class ViewDeviceFragment : Fragment(), IViewDeviceView {
         realm = Realm.getDefaultInstance()
         progressDialog = ProgressDialog(context)
 
-        viewDevicePresenter = ViewDevicePresenter()
         viewDevicePresenter.onAttach(this, macId, device, requireContext())
 
         initialSetUp()

app/src/main/java/org/fossasia/susi/ai/device/viewdevice/ViewDevicePresenter.kt

@@ -15,9 +15,8 @@ import org.fossasia.susi.ai.rest.responses.susi.GetAddDeviceResponse
 import retrofit2.Response
 import timber.log.Timber
 
-class ViewDevicePresenter : IViewDevicePresenter, IRoomModel.onAddDeviceListener {
+class ViewDevicePresenter(private val viewDeviceView: IViewDeviceView) : IViewDevicePresenter, IRoomModel.onAddDeviceListener {
 
-    private lateinit var viewDeviceView: IViewDeviceView
     private var macId: String? = null
     private var device: Device? = null
     private lateinit var realm: Realm
@@ -26,7 +25,6 @@ class ViewDevicePresenter : IViewDevicePresenter, IRoomModel.onAddDeviceListener
     private lateinit var utilModel: UtilModel
 
     override fun onAttach(viewDeviceView: IViewDeviceView, macId: String?, device: Device?, context: Context) {
-        this.viewDeviceView = viewDeviceView
         this.macId = macId
         this.device = device
         this.context = context

app/src/main/java/org/fossasia/susi/ai/di/Modules.kt

@@ -0,0 +1,22 @@
+package org.fossasia.susi.ai.di
+
+import org.fossasia.susi.ai.device.connecteddevices.ConnectedDevicePresenter
+import org.fossasia.susi.ai.device.connecteddevices.contract.IConnectedDevicePresenter
+import org.fossasia.susi.ai.device.connecteddevices.contract.IConnectedDeviceView
+import org.fossasia.susi.ai.device.viewdevice.ViewDevicePresenter
+import org.fossasia.susi.ai.device.viewdevice.contract.IViewDevicePresenter
+import org.fossasia.susi.ai.device.viewdevice.contract.IViewDeviceView
+import org.fossasia.susi.ai.skills.groupwiseskills.GroupWiseSkillsPresenter
+import org.fossasia.susi.ai.skills.groupwiseskills.contract.IGroupWiseSkillsPresenter
+import org.fossasia.susi.ai.skills.groupwiseskills.contract.IGroupWiseSkillsView
+import org.koin.core.module.Module
+import org.koin.dsl.module
+
+val modules: Module = module(override = true) {
+
+    factory<IGroupWiseSkillsPresenter> { (view: IGroupWiseSkillsView) -> GroupWiseSkillsPresenter(view) }
+
+    factory<IConnectedDevicePresenter> { (view: IConnectedDeviceView) -> ConnectedDevicePresenter(view) }
+
+    factory<IViewDevicePresenter> { (view: IViewDeviceView) -> ViewDevicePresenter(view) }
+}

app/src/main/java/org/fossasia/susi/ai/skills/groupwiseskills/GroupWiseSkillsFragment.kt

@@ -13,7 +13,6 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.Toast
 import com.facebook.shimmer.ShimmerFrameLayout
-import kotlin.collections.ArrayList
 import kotlinx.android.synthetic.main.fragment_group_wise_skill_listing.*
 import org.fossasia.susi.ai.R
 import org.fossasia.susi.ai.dataclasses.GroupWiseSkills
@@ -26,6 +25,8 @@ import org.fossasia.susi.ai.skills.groupwiseskills.adapters.recycleradapters.Ski
 import org.fossasia.susi.ai.skills.groupwiseskills.contract.IGroupWiseSkillsPresenter
 import org.fossasia.susi.ai.skills.groupwiseskills.contract.IGroupWiseSkillsView
 import org.fossasia.susi.ai.skills.skillSearch.SearchSkillFragment
+import org.koin.android.ext.android.inject
+import org.koin.core.parameter.parametersOf
 import timber.log.Timber
 
 /**
@@ -34,7 +35,7 @@ import timber.log.Timber
  */
 class GroupWiseSkillsFragment : Fragment(), IGroupWiseSkillsView, SwipeRefreshLayout.OnRefreshListener {
     private lateinit var skillAdapterSnapHelper: SnapHelper
-    private lateinit var groupWiseSkillsPresenter: IGroupWiseSkillsPresenter
+    private val groupWiseSkillsPresenter: IGroupWiseSkillsPresenter by inject { parametersOf(this) }
     private var skills = GroupWiseSkills("", ArrayList())
     private lateinit var skillsAdapter: SkillsListAdapter
     private lateinit var skillCallback: SkillFragmentCallback
@@ -67,8 +68,6 @@ class GroupWiseSkillsFragment : Fragment(), IGroupWiseSkillsView, SwipeRefreshLa
     @NonNull
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         activity?.title = this.skills.group
-        groupWiseSkillsPresenter = GroupWiseSkillsPresenter(this)
-        groupWiseSkillsPresenter.onAttach(this)
         swipeRefreshLayout.setOnRefreshListener(this)
         setUPAdapter()
         groupWiseSkillsPresenter.getSkills(swipeRefreshLayout.isRefreshing, skills.group)

app/src/main/java/org/fossasia/susi/ai/skills/groupwiseskills/GroupWiseSkillsPresenter.kt

@@ -19,14 +19,12 @@ import timber.log.Timber
  *
  * Created by arundhati24 on 16/07/2018.
  */
-class GroupWiseSkillsPresenter(val groupWiseSkillsFragment: GroupWiseSkillsFragment) : IGroupWiseSkillsPresenter,
+class GroupWiseSkillsPresenter(private val groupWiseSkillsView: IGroupWiseSkillsView) : IGroupWiseSkillsPresenter,
         IGroupWiseSkillsModel.OnFetchSkillsFinishedListener {
     private var groupWiseSkillsModel: IGroupWiseSkillsModel = GroupWiseSkillsModel()
-    private var groupWiseSkillsView: IGroupWiseSkillsView? = null
     private var skills = GroupWiseSkills("", ArrayList())
 
     override fun onAttach(groupWiseSkillsView: IGroupWiseSkillsView) {
-        this.groupWiseSkillsView = groupWiseSkillsView
     }
 
     override fun getSkills(swipeToRefreshActive: Boolean, group: String) {
@@ -60,6 +58,5 @@ class GroupWiseSkillsPresenter(val groupWiseSkillsFragment: GroupWiseSkillsFragm
 
     override fun onDetach() {
         groupWiseSkillsModel.cancelFetch()
-        groupWiseSkillsView = null
     }
 }