Make DataBinding optional

app/build.gradle

@@ -109,9 +109,10 @@ dependencies {
     implementation project(":marvel-api")
     implementation project(":imageloading")
     implementation project(":imageloading-glide")
-    implementation project(":mvvm")
-    implementation project(":mvvm-navigation")
-    implementation project(":mvvm-navigation-dagger")
+
+    implementation "com.arthurivanets.mvvm:mvvm-core:1.4.1"
+    implementation "com.arthurivanets.mvvm:mvvm-navigation:1.4.1"
+    implementation "com.arthurivanets.mvvm:mvvm-navigation-dagger:1.4.1"
 
     testImplementation unitTestingDependencies
     androidTestImplementation instrumentationTestingDependencies

app/src/main/java/com/arthurivanets/sample/adapters/base/BaseViewPagerAdapter.kt

@@ -20,23 +20,23 @@ import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentManager
 import androidx.fragment.app.FragmentPagerAdapter
 import com.arthurivanets.mvvm.markers.CanHandleBackPressEvents
-import com.arthurivanets.sample.ui.base.BaseFragment
+import com.arthurivanets.sample.ui.base.BaseMvvmFragment
 
 /**
  *
  */
 abstract class BaseViewPagerAdapter(fragmentManager : FragmentManager) : FragmentPagerAdapter(fragmentManager, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT), CanHandleBackPressEvents {
 
 
-    private val fragmentList = ArrayList<BaseFragment<*, *>>()
+    private val fragmentList = ArrayList<BaseMvvmFragment<*, *>>()
 
 
-    fun addFragment(fragment : BaseFragment<*, *>) {
+    fun addFragment(fragment : BaseMvvmFragment<*, *>) {
         fragmentList.add(fragment)
     }
 
 
-    fun getFragment(position : Int) : BaseFragment<*, *>? {
+    fun getFragment(position : Int) : BaseMvvmFragment<*, *>? {
         return (if((position >= 0) && (position < fragmentList.size)) fragmentList[position] else null)
     }
 

app/src/main/java/com/arthurivanets/sample/di/modules/ActivityBuilder.kt

@@ -16,7 +16,6 @@
 
 package com.arthurivanets.sample.di.modules
 
-import com.arthurivanets.sample.di.modules.activities.HostModule
 import com.arthurivanets.sample.ui.host.HostActivity
 import dagger.Module
 import dagger.android.ContributesAndroidInjector
@@ -25,7 +24,7 @@ import dagger.android.ContributesAndroidInjector
 abstract class ActivityBuilder {
 
 
-    @ContributesAndroidInjector(modules = [HostModule::class])
+    @ContributesAndroidInjector
     abstract fun bindHostActivity() : HostActivity
 
 

app/src/main/java/com/arthurivanets/sample/di/modules/FragmentBuilder.kt

@@ -18,7 +18,6 @@ package com.arthurivanets.sample.di.modules
 
 import com.arthurivanets.sample.di.modules.fragments.CharactersModule
 import com.arthurivanets.sample.di.modules.fragments.ComicsModule
-import com.arthurivanets.sample.di.modules.fragments.DashboardModule
 import com.arthurivanets.sample.di.modules.fragments.EventsModule
 import com.arthurivanets.sample.ui.characters.info.CharacterInfoFragment
 import com.arthurivanets.sample.ui.characters.list.CharactersFragment
@@ -34,7 +33,7 @@ import dagger.android.ContributesAndroidInjector
 abstract class FragmentBuilder {
 
 
-    @ContributesAndroidInjector(modules = [DashboardModule::class])
+    @ContributesAndroidInjector
     abstract fun buildDashboardFragment() : DashboardFragment
 
 

app/src/main/java/com/arthurivanets/sample/di/modules/general/UtilitiesModule.kt

@@ -18,6 +18,7 @@ package com.arthurivanets.sample.di.modules.general
 
 import com.arthurivanets.sample.imageloading.ImageLoader
 import com.arthurivanets.sample.imageloading.glide.GlideImageLoader
+import com.arthurivanets.sample.ui.base.StubViewModel
 import dagger.Module
 import dagger.Provides
 
@@ -29,6 +30,12 @@ class UtilitiesModule {
     fun provideImageLoader() : ImageLoader {
         return GlideImageLoader()
     }
+
+
+    @Provides
+    fun provideStubViewModel() : StubViewModel {
+        return StubViewModel()
+    }
 
 
 }

app/src/main/java/com/arthurivanets/sample/ui/base/BaseActivity.kt

@@ -1,31 +1,13 @@
-/*
- * Copyright 2018 Arthur Ivanets, [email protected]
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
 package com.arthurivanets.sample.ui.base
 
 import androidx.annotation.LayoutRes
 import androidx.databinding.ViewDataBinding
-import com.arthurivanets.mvvm.BR
-import com.arthurivanets.mvvm.BaseViewModel
-import com.arthurivanets.mvvm.navigation.dagger.MvvmActivity
 
-abstract class BaseActivity<VDB : ViewDataBinding, VM : BaseViewModel>(@LayoutRes layoutId : Int) : MvvmActivity<VDB, VM>(layoutId) {
+abstract class BaseActivity(@LayoutRes layoutId : Int) : BaseMvvmActivity<ViewDataBinding, StubViewModel>(layoutId) {
 
 
-    override val bindingVariable = BR.viewModel
+    override val bindingVariable = 0
+    override val isDataBindingEnabled = false
 
 
 }

app/src/main/java/com/arthurivanets/sample/ui/base/BaseFragment.kt

@@ -1,31 +1,13 @@
-/*
- * Copyright 2018 Arthur Ivanets, [email protected]
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
 package com.arthurivanets.sample.ui.base
 
 import androidx.annotation.LayoutRes
 import androidx.databinding.ViewDataBinding
-import com.arthurivanets.mvvm.BaseViewModel
-import com.arthurivanets.mvvm.navigation.dagger.MvvmFragment
-import com.arthurivanets.sample.BR
 
-abstract class BaseFragment<VDB : ViewDataBinding, VM : BaseViewModel>(@LayoutRes layoutId : Int) : MvvmFragment<VDB, VM>(layoutId) {
+abstract class BaseFragment(@LayoutRes layoutId : Int) : BaseMvvmFragment<ViewDataBinding, StubViewModel>(layoutId) {
 
 
-    override val bindingVariable = BR.viewModel
+    override val bindingVariable = 0
+    override val isDataBindingEnabled = false
 
 
 }

app/src/main/java/com/arthurivanets/sample/ui/dashboard/DashboardViewModel.kt → app/src/main/java/com/arthurivanets/sample/ui/base/BaseMvvmActivity.kt

@@ -14,8 +14,18 @@
  * limitations under the License.
  */
 
-package com.arthurivanets.sample.ui.dashboard
+package com.arthurivanets.sample.ui.base
 
-import com.arthurivanets.mvvm.AbstractViewModel
+import androidx.annotation.LayoutRes
+import androidx.databinding.ViewDataBinding
+import com.arthurivanets.mvvm.BR
+import com.arthurivanets.mvvm.BaseViewModel
+import com.arthurivanets.mvvm.navigation.dagger.MvvmActivity
 
-class DashboardViewModel : AbstractViewModel()
+abstract class BaseMvvmActivity<VDB : ViewDataBinding, VM : BaseViewModel>(@LayoutRes layoutId : Int) : MvvmActivity<VDB, VM>(layoutId) {
+
+
+    override val bindingVariable = BR.viewModel
+
+
+}

app/src/main/java/com/arthurivanets/sample/ui/host/HostActivityViewModel.kt → app/src/main/java/com/arthurivanets/sample/ui/base/BaseMvvmFragment.kt

@@ -14,8 +14,18 @@
  * limitations under the License.
  */
 
-package com.arthurivanets.sample.ui.host
+package com.arthurivanets.sample.ui.base
 
-import com.arthurivanets.mvvm.AbstractViewModel
+import androidx.annotation.LayoutRes
+import androidx.databinding.ViewDataBinding
+import com.arthurivanets.mvvm.BaseViewModel
+import com.arthurivanets.mvvm.navigation.dagger.MvvmFragment
+import com.arthurivanets.sample.BR
 
-class HostActivityViewModel : AbstractViewModel()
+abstract class BaseMvvmFragment<VDB : ViewDataBinding, VM : BaseViewModel>(@LayoutRes layoutId : Int) : MvvmFragment<VDB, VM>(layoutId) {
+
+
+    override val bindingVariable = BR.viewModel
+
+
+}

app/src/main/java/com/arthurivanets/sample/ui/base/StubViewModel.kt

@@ -0,0 +1,6 @@
+package com.arthurivanets.sample.ui.base
+
+import com.arthurivanets.mvvm.AbstractViewModel
+
+class StubViewModel : AbstractViewModel() {
+}

app/src/main/java/com/arthurivanets/sample/ui/characters/info/CharacterInfoFragment.kt

@@ -40,7 +40,7 @@ import com.arthurivanets.sample.domain.entities.Character
 import com.arthurivanets.sample.domain.entities.Comics
 import com.arthurivanets.sample.domain.entities.Image
 import com.arthurivanets.sample.imageloading.ImageLoader
-import com.arthurivanets.sample.ui.base.BaseFragment
+import com.arthurivanets.sample.ui.base.BaseMvvmFragment
 import com.arthurivanets.sample.ui.base.GeneralViewStates
 import com.arthurivanets.sample.ui.base.MarvelRoutes
 import com.arthurivanets.sample.ui.util.extensions.onItemClick
@@ -54,7 +54,7 @@ import kotlinx.android.synthetic.main.view_item_empty_view.*
 import kotlinx.android.synthetic.main.view_progress_bar_horizontal.*
 import javax.inject.Inject
 
-class CharacterInfoFragment : BaseFragment<FragmentCharacterInfoBinding, CharacterInfoViewModel>(R.layout.fragment_character_info) {
+class CharacterInfoFragment : BaseMvvmFragment<FragmentCharacterInfoBinding, CharacterInfoViewModel>(R.layout.fragment_character_info) {
 
 
     private val args by navArgs<CharacterInfoFragmentArgs>()

app/src/main/java/com/arthurivanets/sample/ui/characters/list/CharactersFragment.kt

@@ -30,7 +30,7 @@ import com.arthurivanets.sample.adapters.characters.CharacterItemViewHolder
 import com.arthurivanets.sample.adapters.characters.CharacterItemsRecyclerViewAdapter
 import com.arthurivanets.sample.databinding.FragmentCharactersBinding
 import com.arthurivanets.sample.domain.entities.Character
-import com.arthurivanets.sample.ui.base.BaseFragment
+import com.arthurivanets.sample.ui.base.BaseMvvmFragment
 import com.arthurivanets.sample.ui.base.GeneralViewStates
 import com.arthurivanets.sample.ui.base.MarvelRoutes
 import com.arthurivanets.sample.ui.characters.CHARACTERS_COLUMN_COUNT
@@ -43,7 +43,7 @@ import kotlinx.android.synthetic.main.fragment_characters.*
 import kotlinx.android.synthetic.main.view_progress_bar_circular.*
 import javax.inject.Inject
 
-class CharactersFragment : BaseFragment<FragmentCharactersBinding, CharactersViewModel>(R.layout.fragment_characters), CanScrollToTop {
+class CharactersFragment : BaseMvvmFragment<FragmentCharactersBinding, CharactersViewModel>(R.layout.fragment_characters), CanScrollToTop {
 
 
     @Inject

app/src/main/java/com/arthurivanets/sample/ui/comics/info/ComicsInfoFragment.kt

@@ -40,7 +40,7 @@ import com.arthurivanets.sample.domain.entities.Character
 import com.arthurivanets.sample.domain.entities.Comics
 import com.arthurivanets.sample.domain.entities.Image
 import com.arthurivanets.sample.imageloading.ImageLoader
-import com.arthurivanets.sample.ui.base.BaseFragment
+import com.arthurivanets.sample.ui.base.BaseMvvmFragment
 import com.arthurivanets.sample.ui.base.GeneralViewStates
 import com.arthurivanets.sample.ui.base.MarvelRoutes
 import com.arthurivanets.sample.ui.util.extensions.onItemClick
@@ -54,7 +54,7 @@ import kotlinx.android.synthetic.main.view_item_empty_view.*
 import kotlinx.android.synthetic.main.view_progress_bar_horizontal.*
 import javax.inject.Inject
 
-class ComicsInfoFragment : BaseFragment<FragmentComicsInfoBinding, ComicsInfoViewModel>(R.layout.fragment_comics_info) {
+class ComicsInfoFragment : BaseMvvmFragment<FragmentComicsInfoBinding, ComicsInfoViewModel>(R.layout.fragment_comics_info) {
 
 
     private val args by navArgs<ComicsInfoFragmentArgs>()

app/src/main/java/com/arthurivanets/sample/ui/comics/list/ComicsFragment.kt

@@ -30,7 +30,7 @@ import com.arthurivanets.sample.adapters.comics.ComicsItemViewHolder
 import com.arthurivanets.sample.adapters.comics.ComicsItemsRecyclerViewAdapter
 import com.arthurivanets.sample.databinding.FragmentComicsBinding
 import com.arthurivanets.sample.domain.entities.Comics
-import com.arthurivanets.sample.ui.base.BaseFragment
+import com.arthurivanets.sample.ui.base.BaseMvvmFragment
 import com.arthurivanets.sample.ui.base.GeneralViewStates
 import com.arthurivanets.sample.ui.base.MarvelRoutes
 import com.arthurivanets.sample.ui.comics.COMICS_COLUMN_COUNT
@@ -43,7 +43,7 @@ import kotlinx.android.synthetic.main.fragment_comics.*
 import kotlinx.android.synthetic.main.view_progress_bar_circular.*
 import javax.inject.Inject
 
-class ComicsFragment : BaseFragment<FragmentComicsBinding, ComicsViewModel>(R.layout.fragment_comics), CanScrollToTop {
+class ComicsFragment : BaseMvvmFragment<FragmentComicsBinding, ComicsViewModel>(R.layout.fragment_comics), CanScrollToTop {
 
 
     @Inject

app/src/main/java/com/arthurivanets/sample/ui/dashboard/DashboardFragment.kt

@@ -24,7 +24,6 @@ import com.arthurivanets.commons.ktx.statusBarSize
 import com.arthurivanets.commons.ktx.updatePadding
 import com.arthurivanets.sample.R
 import com.arthurivanets.sample.adapters.dashboard.DashboardViewPagerAdapter
-import com.arthurivanets.sample.databinding.FragmentDashboardBinding
 import com.arthurivanets.sample.ui.base.BaseFragment
 import com.arthurivanets.sample.ui.characters.list.CharactersFragment
 import com.arthurivanets.sample.ui.comics.list.ComicsFragment
@@ -34,7 +33,7 @@ import com.arthurivanets.sample.ui.util.extensions.isEmpty
 import kotlinx.android.synthetic.main.fragment_dashboard.*
 import kotlinx.android.synthetic.main.view_toolbar.*
 
-class DashboardFragment : BaseFragment<FragmentDashboardBinding, DashboardViewModel>(R.layout.fragment_dashboard) {
+class DashboardFragment : BaseFragment(R.layout.fragment_dashboard) {
 
 
     private lateinit var pagerAdapter : DashboardViewPagerAdapter