Handle navigation inside activity

app/build.gradle

@@ -47,7 +47,7 @@ dependencies {
 
     //di
     implementation "org.koin:koin-android:$koinVersion"
-    implementation "org.koin:koin-android-viewmodel:$koinVersion"
+    implementation "org.koin:koin-androidx-viewmodel:$koinVersion"
 
     //arhitecture components
     implementation "android.arch.lifecycle:viewmodel:$architectureComponents"

app/src/main/java/com/cobeisfresh/template/di/PresentationModule.kt

@@ -2,10 +2,10 @@ package com.cobeisfresh.template.di
 
 import com.cobeisfresh.template.ui.weather.presentation.WeatherViewModel
 import com.cobeisfresh.template.ui.welcome.presentation.WelcomeViewModel
-import org.koin.android.viewmodel.dsl.viewModel
+import org.koin.androidx.viewmodel.dsl.viewModel
 import org.koin.dsl.module
 
 val presentationModule = module {
   viewModel { WeatherViewModel(get()) }
-  viewModel { WelcomeViewModel()}
+  viewModel { WelcomeViewModel() }
 }

app/src/main/java/com/cobeisfresh/template/routing/AppNavigator.kt

@@ -2,12 +2,8 @@ package com.cobeisfresh.template.routing
 
 import android.content.Intent
 import androidx.appcompat.app.AppCompatActivity
-import androidx.fragment.app.FragmentActivity
-import com.cobeisfresh.template.R
-import com.cobeisfresh.template.common.extensions.showFragment
 import com.cobeisfresh.template.ui.base.BaseActivity
 import com.cobeisfresh.template.ui.weather.view.activities.WeatherActivity
-import com.cobeisfresh.template.ui.weather.view.fragments.WeatherDetailsFragment
 import java.io.Serializable
 
 class AppNavigator(private val activity: AppCompatActivity) : Navigator {
@@ -16,14 +12,13 @@ class AppNavigator(private val activity: AppCompatActivity) : Navigator {
     const val SCREEN_TYPE = "screen_type"
   }
 
-  override fun showWeather() = navigateTo(getIntent<WeatherActivity>().apply {
+  override fun showWeatherActivity() = navigateTo(getIntent<WeatherActivity>().apply {
     putExtra(SCREEN_TYPE, ScreenType.WEATHER)
   })
 
   private fun navigateTo(intent: Intent) = activity.startActivity(intent)
 
   private inline fun <reified T : BaseActivity> getIntent() = Intent(activity, T::class.java)
-
 }
 
 enum class ScreenType : Serializable {

app/src/main/java/com/cobeisfresh/template/routing/Navigator.kt

@@ -2,6 +2,6 @@ package com.cobeisfresh.template.routing
 
 interface Navigator {
 
-  fun showWeather()
+  fun showWeatherActivity()
 
 }

app/src/main/java/com/cobeisfresh/template/ui/weather/presentation/WeatherViewModel.kt

@@ -5,8 +5,6 @@ import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.cobeisfresh.template.common.DEFAULT_CITY_NAME
-import com.cobeisfresh.template.routing.AppNavigator
-import com.cobeisfresh.template.ui.base.NavigatorViewModel
 import com.cobeisfresh.template.ui.base.ViewState
 import com.example.domain.interaction.weather.GetWeatherUseCase
 import com.example.domain.model.WeatherInfo

app/src/main/java/com/cobeisfresh/template/ui/weather/view/fragments/WeatherDetailsFragment.kt

@@ -3,13 +3,13 @@ package com.cobeisfresh.template.ui.weather.view.fragments
 import com.cobeisfresh.template.R
 import com.cobeisfresh.template.ui.base.BaseFragment
 
-class WeatherDetailsFragment: BaseFragment() {
+class WeatherDetailsFragment : BaseFragment() {
 
   override fun viewReady() {}
 
   override fun getLayout() = R.layout.fragment_weather_details
 
-  companion object{
-     fun newInstance() = WeatherDetailsFragment()
+  companion object {
+    fun newInstance() = WeatherDetailsFragment()
   }
 }

app/src/main/java/com/cobeisfresh/template/ui/weather/view/fragments/WeatherFragment.kt

@@ -7,18 +7,23 @@ import com.cobeisfresh.template.common.extensions.onClick
 import com.cobeisfresh.template.common.extensions.subscribe
 import com.cobeisfresh.template.ui.base.BaseFragment
 import com.cobeisfresh.template.ui.base.ViewState
+import com.cobeisfresh.template.ui.base.ViewState.Status
+import com.cobeisfresh.template.ui.base.ViewState.Status.*
 import com.cobeisfresh.template.ui.weather.presentation.WeatherViewModel
 import com.example.domain.model.WeatherInfo
 import kotlinx.android.synthetic.main.fragment_weather.*
-import org.koin.android.viewmodel.ext.android.viewModel
+import org.koin.androidx.viewmodel.ext.android.viewModel
 
 class WeatherFragment : BaseFragment() {
 
   private val viewModel: WeatherViewModel by viewModel()
 
+  override fun getLayout() = R.layout.fragment_weather
+
   override fun viewReady() {
     viewModel.getWeatherForLocation()
     subscribeToData()
+
     getWeather.onClick {
       weatherActivityContainer.hideKeyboard()
       viewModel.getWeatherForLocation(cityInput.text.toString())
@@ -27,18 +32,16 @@ class WeatherFragment : BaseFragment() {
     showWeatherDetails.onClick { activity?.run { appFragmentNavigator.showWeatherDetails(this) } }
   }
 
-  override fun getLayout() = R.layout.fragment_weather
-
   private fun subscribeToData() {
     viewModel.weatherLiveData.subscribe(this, ::handleViewState)
   }
 
   private fun handleViewState(viewState: ViewState<WeatherInfo>) {
     with(viewState) {
       when (status) {
-        ViewState.Status.LOADING -> showLoading(weatherLoadingProgress)
-        ViewState.Status.SUCCESS -> data?.run(::showWeatherData)
-        ViewState.Status.ERROR -> {
+        LOADING -> showLoading(weatherLoadingProgress)
+        SUCCESS -> data?.run(::showWeatherData)
+        ERROR -> {
           hideLoading(weatherLoadingProgress)
           showError(error?.message, weatherActivityContainer)
         }

app/src/main/java/com/cobeisfresh/template/ui/welcome/presentation/WelcomeViewModel.kt

@@ -1,15 +1,7 @@
 package com.cobeisfresh.template.ui.welcome.presentation
 
-import com.cobeisfresh.template.routing.AppNavigator
-import com.cobeisfresh.template.ui.base.NavigatorViewModel
+import androidx.lifecycle.ViewModel
+
+class WelcomeViewModel : ViewModel() {
 
-class WelcomeViewModel : NavigatorViewModel() {
-
-  fun proceedToNextScreen() {
-    appNavigator.showWeather()
-  }
-
-  override fun initAppNavigator(appNavigator: AppNavigator) {
-    this.appNavigator = appNavigator
-  }
 }

app/src/main/java/com/cobeisfresh/template/ui/welcome/view/WelcomeActivity.kt

@@ -4,20 +4,16 @@ import android.os.Bundle
 import com.cobeisfresh.template.R
 import com.cobeisfresh.template.common.extensions.onClick
 import com.cobeisfresh.template.ui.base.BaseActivity
-import com.cobeisfresh.template.ui.welcome.presentation.WelcomeViewModel
 import kotlinx.android.synthetic.main.activity_welcome.*
-import org.koin.android.viewmodel.ext.android.viewModel
 
 class WelcomeActivity : BaseActivity() {
 
-  private val viewModel by viewModel<WelcomeViewModel>()
-
   override fun onCreate(savedInstanceState: Bundle?) {
     super.onCreate(savedInstanceState)
     setContentView(R.layout.activity_welcome)
-    viewModel.initAppNavigator(appNavigator)
+
     nextScreen.onClick {
-      viewModel.proceedToNextScreen()
+      appNavigator.showWeatherActivity()
       finish()
     }
   }

data/build.gradle

@@ -52,5 +52,5 @@ dependencies {
 
     //di
     implementation "org.koin:koin-android:$koinVersion"
-    implementation "org.koin:koin-android-viewmodel:$koinVersion"
+    implementation "org.koin:koin-androidx-viewmodel:$koinVersion"
 }

domain/build.gradle

@@ -47,5 +47,5 @@ dependencies {
 
     //di
     implementation "org.koin:koin-android:$koinVersion"
-    implementation "org.koin:koin-android-viewmodel:$koinVersion"
+    implementation "org.koin:koin-androidx-viewmodel:$koinVersion"
 }