From a133144eeb6c6b499a5000ffe63837bf23182247 Mon Sep 17 00:00:00 2001
From: Goran Luketic <goran.luketic@cobeisfresh.com>
Date: Fri, 26 Jul 2019 11:10:15 +0200
Subject: [PATCH 1/2] added container activity that can contain multiple
 fragments

---
 app/src/main/AndroidManifest.xml              |  2 ++
 .../common/extensions/AndroidExtensions.kt    | 14 +++++++++++
 .../template/routing/AppNavigator.kt          | 15 ++++++++++++
 .../cobeisfresh/template/routing/Navigator.kt |  2 ++
 .../template/ui/weather/base/BaseActivity.kt  |  6 +++++
 .../ui/weather/base/ContainerActivity.kt      | 23 +++++++++++++++++++
 .../weather/presentation/WeatherViewModel.kt  | 12 +++++++++-
 .../ui/weather/view/WeatherActivity.kt        |  5 +++-
 .../ui/weather/view/WeatherDetailsFragment.kt | 17 ++++++++++++++
 .../main/res/layout/activity_container.xml    |  5 ++++
 app/src/main/res/layout/activity_weather.xml  | 14 +++++++++--
 .../res/layout/fragment_weather_details.xml   | 16 +++++++++++++
 12 files changed, 127 insertions(+), 4 deletions(-)
 create mode 100644 app/src/main/java/com/cobeisfresh/template/ui/weather/base/ContainerActivity.kt
 create mode 100644 app/src/main/java/com/cobeisfresh/template/ui/weather/view/WeatherDetailsFragment.kt
 create mode 100644 app/src/main/res/layout/activity_container.xml
 create mode 100644 app/src/main/res/layout/fragment_weather_details.xml

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 7724aab..2365fd2 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -22,6 +22,8 @@
         <category android:name="android.intent.category.LAUNCHER" />
       </intent-filter>
     </activity>
+    <activity android:name=".ui.weather.base.ContainerActivity" />
+
   </application>
 
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/java/com/cobeisfresh/template/common/extensions/AndroidExtensions.kt b/app/src/main/java/com/cobeisfresh/template/common/extensions/AndroidExtensions.kt
index d2bd62f..121c9cd 100644
--- a/app/src/main/java/com/cobeisfresh/template/common/extensions/AndroidExtensions.kt
+++ b/app/src/main/java/com/cobeisfresh/template/common/extensions/AndroidExtensions.kt
@@ -1,7 +1,10 @@
 package com.cobeisfresh.template.common.extensions
 
 import android.view.View
+import androidx.annotation.IdRes
 import androidx.annotation.StringRes
+import androidx.fragment.app.Fragment
+import androidx.fragment.app.FragmentActivity
 import androidx.lifecycle.LifecycleOwner
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.Observer
@@ -24,4 +27,15 @@ fun View.gone() {
 
 inline fun View.onClick(crossinline onClick: () -> Unit) {
   setOnClickListener { onClick() }
+}
+
+fun FragmentActivity.showFragment(fragment: Fragment, @IdRes container: Int, addToBackStack: Boolean = false) {
+  supportFragmentManager.beginTransaction()
+      .apply {
+        if (addToBackStack) {
+          addToBackStack(fragment.tag)
+        }
+      }
+      .replace(container, fragment)
+      .commitAllowingStateLoss()
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/cobeisfresh/template/routing/AppNavigator.kt b/app/src/main/java/com/cobeisfresh/template/routing/AppNavigator.kt
index 0a402a4..5f34030 100644
--- a/app/src/main/java/com/cobeisfresh/template/routing/AppNavigator.kt
+++ b/app/src/main/java/com/cobeisfresh/template/routing/AppNavigator.kt
@@ -3,13 +3,28 @@ package com.cobeisfresh.template.routing
 import android.content.Intent
 import androidx.appcompat.app.AppCompatActivity
 import com.cobeisfresh.template.ui.weather.base.BaseActivity
+import com.cobeisfresh.template.ui.weather.base.ContainerActivity
 import com.cobeisfresh.template.ui.weather.view.WeatherActivity
+import java.io.Serializable
 
 class AppNavigator(private val activity: AppCompatActivity) : Navigator {
   
+  companion object {
+    const val SCREEN_TYPE = "screen_type"
+  }
+  
   override fun showWeather() = navigateTo(getIntent<WeatherActivity>())
   
+  override fun showWeatherDetails() = navigateTo(getIntent<ContainerActivity>().apply {
+    putExtra(SCREEN_TYPE, ScreenType.WEATHER_DETAILS)
+  })
+  
   private fun navigateTo(intent: Intent) = activity.startActivity(intent)
   
   private inline fun <reified T : BaseActivity> getIntent() = Intent(activity, T::class.java)
+  
+}
+
+enum class ScreenType : Serializable {
+  WEATHER_DETAILS
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/cobeisfresh/template/routing/Navigator.kt b/app/src/main/java/com/cobeisfresh/template/routing/Navigator.kt
index 8ffd98b..958e8ef 100644
--- a/app/src/main/java/com/cobeisfresh/template/routing/Navigator.kt
+++ b/app/src/main/java/com/cobeisfresh/template/routing/Navigator.kt
@@ -3,4 +3,6 @@ package com.cobeisfresh.template.routing
 interface Navigator {
   
   fun showWeather()
+  
+  fun showWeatherDetails()
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/cobeisfresh/template/ui/weather/base/BaseActivity.kt b/app/src/main/java/com/cobeisfresh/template/ui/weather/base/BaseActivity.kt
index 86588f0..cef5596 100644
--- a/app/src/main/java/com/cobeisfresh/template/ui/weather/base/BaseActivity.kt
+++ b/app/src/main/java/com/cobeisfresh/template/ui/weather/base/BaseActivity.kt
@@ -4,8 +4,10 @@ import android.view.View
 import android.widget.ProgressBar
 import androidx.annotation.StringRes
 import androidx.appcompat.app.AppCompatActivity
+import androidx.fragment.app.Fragment
 import com.cobeisfresh.template.common.EMPTY_STRING
 import com.cobeisfresh.template.common.extensions.gone
+import com.cobeisfresh.template.common.extensions.showFragment
 import com.cobeisfresh.template.common.extensions.snackbar
 import com.cobeisfresh.template.common.extensions.visible
 import com.cobeisfresh.template.routing.AppNavigator
@@ -23,4 +25,8 @@ abstract class BaseActivity : AppCompatActivity() {
   fun showLoading(progressBar: ProgressBar) = progressBar.visible()
   
   fun hideLoading(progressBar: ProgressBar) = progressBar.gone()
+  
+  fun addFragment(fragment: Fragment, containerId: Int, addToBackStack: Boolean = false) {
+    showFragment(fragment, containerId, addToBackStack)
+  }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/cobeisfresh/template/ui/weather/base/ContainerActivity.kt b/app/src/main/java/com/cobeisfresh/template/ui/weather/base/ContainerActivity.kt
new file mode 100644
index 0000000..b182fc3
--- /dev/null
+++ b/app/src/main/java/com/cobeisfresh/template/ui/weather/base/ContainerActivity.kt
@@ -0,0 +1,23 @@
+package com.cobeisfresh.template.ui.weather.base
+
+import android.os.Bundle
+import com.cobeisfresh.template.R
+import com.cobeisfresh.template.common.extensions.showFragment
+import com.cobeisfresh.template.routing.AppNavigator
+import com.cobeisfresh.template.routing.ScreenType
+import com.cobeisfresh.template.ui.weather.view.WeatherDetailsFragment
+
+/**
+ * Activity that shows fragment inside container. ScreenType is sent through bundle
+ */
+class ContainerActivity : BaseActivity() {
+  
+  override fun onCreate(savedInstanceState: Bundle?) {
+    super.onCreate(savedInstanceState)
+    setContentView(R.layout.activity_container)
+    when (intent.getSerializableExtra(AppNavigator.SCREEN_TYPE)) {
+      ScreenType.WEATHER_DETAILS -> addFragment(WeatherDetailsFragment.newInstance(), R.id.fragmentContainer)
+      else -> finish()
+    }
+  }
+}
diff --git a/app/src/main/java/com/cobeisfresh/template/ui/weather/presentation/WeatherViewModel.kt b/app/src/main/java/com/cobeisfresh/template/ui/weather/presentation/WeatherViewModel.kt
index ee0a975..841d8cb 100644
--- a/app/src/main/java/com/cobeisfresh/template/ui/weather/presentation/WeatherViewModel.kt
+++ b/app/src/main/java/com/cobeisfresh/template/ui/weather/presentation/WeatherViewModel.kt
@@ -5,6 +5,8 @@ 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.weather.base.NavigatorViewModel
 import com.cobeisfresh.template.ui.weather.base.ViewState
 import com.example.domain.interaction.weather.GetWeatherUseCase
 import com.example.domain.model.WeatherInfo
@@ -14,7 +16,7 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 
-class WeatherViewModel(private val getWeather: GetWeatherUseCase) : ViewModel() {
+class WeatherViewModel(private val getWeather: GetWeatherUseCase) : NavigatorViewModel() {
   
   // we make this private and provide only immutable live data to observers so they can't change anything
   private val _weatherLiveData = MutableLiveData<ViewState<WeatherInfo>>()
@@ -29,4 +31,12 @@ class WeatherViewModel(private val getWeather: GetWeatherUseCase) : ViewModel()
           .onFailure { _weatherLiveData.postValue(ViewState.error(it.throwable)) }
     }
   }
+  
+  fun showWeatherDetails() {
+    appNavigator.showWeatherDetails()
+  }
+  
+  override fun initAppNavigator(appNavigator: AppNavigator) {
+    this.appNavigator = appNavigator
+  }
 }
diff --git a/app/src/main/java/com/cobeisfresh/template/ui/weather/view/WeatherActivity.kt b/app/src/main/java/com/cobeisfresh/template/ui/weather/view/WeatherActivity.kt
index e0f5516..ff245e3 100644
--- a/app/src/main/java/com/cobeisfresh/template/ui/weather/view/WeatherActivity.kt
+++ b/app/src/main/java/com/cobeisfresh/template/ui/weather/view/WeatherActivity.kt
@@ -8,6 +8,7 @@ import com.cobeisfresh.template.R
 import com.cobeisfresh.template.common.convertKelvinToCelsius
 import com.cobeisfresh.template.common.extensions.onClick
 import com.cobeisfresh.template.common.extensions.subscribe
+import com.cobeisfresh.template.routing.AppNavigator
 import com.cobeisfresh.template.ui.weather.base.BaseActivity
 import com.cobeisfresh.template.ui.weather.base.ViewState
 import com.cobeisfresh.template.ui.weather.base.ViewState.Status.*
@@ -23,7 +24,7 @@ class WeatherActivity : BaseActivity() {
   override fun onCreate(savedInstanceState: Bundle?) {
     super.onCreate(savedInstanceState)
     setContentView(R.layout.activity_weather)
-    
+    viewModel.initAppNavigator(appNavigator)
     viewModel.getWeatherForLocation()
     subscribeToData()
     
@@ -32,6 +33,8 @@ class WeatherActivity : BaseActivity() {
       imm.hideSoftInputFromWindow(weatherActivityContainer.windowToken, InputMethodManager.HIDE_NOT_ALWAYS)
       viewModel.getWeatherForLocation(cityInput.text.toString())
     }
+    
+    showWeatherDetails.onClick { viewModel.showWeatherDetails() }
   }
   
   private fun subscribeToData() = with(viewModel) {
diff --git a/app/src/main/java/com/cobeisfresh/template/ui/weather/view/WeatherDetailsFragment.kt b/app/src/main/java/com/cobeisfresh/template/ui/weather/view/WeatherDetailsFragment.kt
new file mode 100644
index 0000000..ab0efec
--- /dev/null
+++ b/app/src/main/java/com/cobeisfresh/template/ui/weather/view/WeatherDetailsFragment.kt
@@ -0,0 +1,17 @@
+package com.cobeisfresh.template.ui.weather.view
+
+import com.cobeisfresh.template.R
+import com.cobeisfresh.template.ui.weather.base.BaseFragment
+
+class WeatherDetailsFragment: BaseFragment() {
+  
+  override fun viewReady() {
+  
+  }
+  
+  override fun getLayout() = R.layout.fragment_weather_details
+  
+  companion object{
+     fun newInstance() = WeatherDetailsFragment()
+  }
+}
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_container.xml b/app/src/main/res/layout/activity_container.xml
new file mode 100644
index 0000000..5034785
--- /dev/null
+++ b/app/src/main/res/layout/activity_container.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+  android:id="@+id/fragmentContainer"
+  android:layout_width="match_parent"
+  android:layout_height="match_parent" />
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_weather.xml b/app/src/main/res/layout/activity_weather.xml
index 1e8e174..6d31d7f 100644
--- a/app/src/main/res/layout/activity_weather.xml
+++ b/app/src/main/res/layout/activity_weather.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout
-  xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
   xmlns:app="http://schemas.android.com/apk/res-auto"
   xmlns:tools="http://schemas.android.com/tools"
   android:id="@+id/weatherActivityContainer"
@@ -64,4 +63,15 @@
     app:layout_constraintStart_toStartOf="parent"
     app:layout_constraintTop_toBottomOf="@id/cityInput" />
 
+  <Button
+    android:id="@+id/showWeatherDetails"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:layout_marginTop="20dp"
+    android:text="Show details"
+    android:textAllCaps="false"
+    app:layout_constraintEnd_toEndOf="parent"
+    app:layout_constraintStart_toStartOf="parent"
+    app:layout_constraintTop_toBottomOf="@id/getWeather" />
+
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_weather_details.xml b/app/src/main/res/layout/fragment_weather_details.xml
new file mode 100644
index 0000000..0e79fb2
--- /dev/null
+++ b/app/src/main/res/layout/fragment_weather_details.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+  android:layout_width="match_parent"
+  android:layout_height="match_parent"
+  xmlns:app="http://schemas.android.com/apk/res-auto">
+
+
+  <TextView
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    app:layout_constraintTop_toTopOf="parent"
+    app:layout_constraintBottom_toBottomOf="parent"
+    app:layout_constraintEnd_toEndOf="parent"
+    app:layout_constraintStart_toStartOf="parent"
+    android:text="Weather details"/>
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file

From 9e8f374fcb6bf37027765b270b9c9b575e5624cc Mon Sep 17 00:00:00 2001
From: Goran Luketic <goran.luketic@cobeisfresh.com>
Date: Fri, 26 Jul 2019 14:39:36 +0200
Subject: [PATCH 2/2] routing with fragments inside activity

---
 app/src/main/AndroidManifest.xml              |  4 +-
 .../common/extensions/AndroidExtensions.kt    | 11 ++++
 .../com/cobeisfresh/template/di/AppModule.kt  |  2 +
 .../template/di/PresentationModule.kt         |  2 +
 .../template/routing/AppFragmentNavigator.kt  | 14 +++++
 .../template/routing/AppNavigator.kt          | 19 +++---
 .../template/routing/FragmentNavigator.kt     |  9 +++
 .../cobeisfresh/template/routing/Navigator.kt |  1 -
 .../ui/{weather => }/base/BaseActivity.kt     | 11 ++--
 .../template/ui/base/BaseFragment.kt          | 54 ++++++++++++++++
 .../{weather => }/base/NavigatorViewModel.kt  |  2 +-
 .../ui/{weather => }/base/ViewState.kt        |  4 +-
 .../template/ui/weather/base/BaseFragment.kt  | 23 -------
 .../ui/weather/base/ContainerActivity.kt      | 23 -------
 .../weather/presentation/WeatherViewModel.kt  | 14 +----
 .../ui/weather/view/WeatherActivity.kt        | 63 -------------------
 .../view/activities/WeatherActivity.kt        | 20 ++++++
 .../{ => fragments}/WeatherDetailsFragment.kt |  8 +--
 .../weather/view/fragments/WeatherFragment.kt | 60 ++++++++++++++++++
 .../welcome/presentation/WelcomeViewModel.kt  | 15 +++++
 .../ui/welcome/view/WelcomeActivity.kt        | 24 +++++++
 app/src/main/res/layout/activity_welcome.xml  | 27 ++++++++
 ...ivity_weather.xml => fragment_weather.xml} |  2 +-
 23 files changed, 266 insertions(+), 146 deletions(-)
 create mode 100644 app/src/main/java/com/cobeisfresh/template/routing/AppFragmentNavigator.kt
 create mode 100644 app/src/main/java/com/cobeisfresh/template/routing/FragmentNavigator.kt
 rename app/src/main/java/com/cobeisfresh/template/ui/{weather => }/base/BaseActivity.kt (78%)
 create mode 100644 app/src/main/java/com/cobeisfresh/template/ui/base/BaseFragment.kt
 rename app/src/main/java/com/cobeisfresh/template/ui/{weather => }/base/NavigatorViewModel.kt (90%)
 rename app/src/main/java/com/cobeisfresh/template/ui/{weather => }/base/ViewState.kt (80%)
 delete mode 100644 app/src/main/java/com/cobeisfresh/template/ui/weather/base/BaseFragment.kt
 delete mode 100644 app/src/main/java/com/cobeisfresh/template/ui/weather/base/ContainerActivity.kt
 delete mode 100644 app/src/main/java/com/cobeisfresh/template/ui/weather/view/WeatherActivity.kt
 create mode 100644 app/src/main/java/com/cobeisfresh/template/ui/weather/view/activities/WeatherActivity.kt
 rename app/src/main/java/com/cobeisfresh/template/ui/weather/view/{ => fragments}/WeatherDetailsFragment.kt (61%)
 create mode 100644 app/src/main/java/com/cobeisfresh/template/ui/weather/view/fragments/WeatherFragment.kt
 create mode 100644 app/src/main/java/com/cobeisfresh/template/ui/welcome/presentation/WelcomeViewModel.kt
 create mode 100644 app/src/main/java/com/cobeisfresh/template/ui/welcome/view/WelcomeActivity.kt
 create mode 100644 app/src/main/res/layout/activity_welcome.xml
 rename app/src/main/res/layout/{activity_weather.xml => fragment_weather.xml} (97%)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 2365fd2..9882c5f 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -15,14 +15,14 @@
     android:theme="@style/AppTheme"
     android:usesCleartextTraffic="true"
     tools:ignore="AllowBackup,GoogleAppIndexingWarning">
-    <activity android:name=".ui.weather.view.WeatherActivity">
+    <activity android:name=".ui.welcome.view.WelcomeActivity">
       <intent-filter>
         <action android:name="android.intent.action.MAIN" />
 
         <category android:name="android.intent.category.LAUNCHER" />
       </intent-filter>
     </activity>
-    <activity android:name=".ui.weather.base.ContainerActivity" />
+    <activity android:name=".ui.weather.view.activities.WeatherActivity" />
 
   </application>
 
diff --git a/app/src/main/java/com/cobeisfresh/template/common/extensions/AndroidExtensions.kt b/app/src/main/java/com/cobeisfresh/template/common/extensions/AndroidExtensions.kt
index 121c9cd..25600c7 100644
--- a/app/src/main/java/com/cobeisfresh/template/common/extensions/AndroidExtensions.kt
+++ b/app/src/main/java/com/cobeisfresh/template/common/extensions/AndroidExtensions.kt
@@ -1,6 +1,8 @@
 package com.cobeisfresh.template.common.extensions
 
+import android.content.Context
 import android.view.View
+import android.view.inputmethod.InputMethodManager
 import androidx.annotation.IdRes
 import androidx.annotation.StringRes
 import androidx.fragment.app.Fragment
@@ -25,6 +27,11 @@ fun View.gone() {
   visibility = View.GONE
 }
 
+fun View.hideKeyboard() {
+  val imm = context.getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager
+  imm.hideSoftInputFromWindow(windowToken, InputMethodManager.HIDE_NOT_ALWAYS)
+}
+
 inline fun View.onClick(crossinline onClick: () -> Unit) {
   setOnClickListener { onClick() }
 }
@@ -38,4 +45,8 @@ fun FragmentActivity.showFragment(fragment: Fragment, @IdRes container: Int, add
       }
       .replace(container, fragment)
       .commitAllowingStateLoss()
+}
+
+fun FragmentActivity.goBack(){
+  supportFragmentManager.popBackStack()
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/cobeisfresh/template/di/AppModule.kt b/app/src/main/java/com/cobeisfresh/template/di/AppModule.kt
index 14fe548..802bbc1 100644
--- a/app/src/main/java/com/cobeisfresh/template/di/AppModule.kt
+++ b/app/src/main/java/com/cobeisfresh/template/di/AppModule.kt
@@ -1,9 +1,11 @@
 package com.cobeisfresh.template.di
 
 import androidx.appcompat.app.AppCompatActivity
+import com.cobeisfresh.template.routing.AppFragmentNavigator
 import com.cobeisfresh.template.routing.AppNavigator
 import org.koin.dsl.module
 
 val appModule = module {
   single { (activity: AppCompatActivity) -> AppNavigator(activity) }
+  single { AppFragmentNavigator() }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/cobeisfresh/template/di/PresentationModule.kt b/app/src/main/java/com/cobeisfresh/template/di/PresentationModule.kt
index d68acf2..62f40f4 100644
--- a/app/src/main/java/com/cobeisfresh/template/di/PresentationModule.kt
+++ b/app/src/main/java/com/cobeisfresh/template/di/PresentationModule.kt
@@ -1,9 +1,11 @@
 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.dsl.module
 
 val presentationModule = module {
   viewModel { WeatherViewModel(get()) }
+  viewModel { WelcomeViewModel()}
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/cobeisfresh/template/routing/AppFragmentNavigator.kt b/app/src/main/java/com/cobeisfresh/template/routing/AppFragmentNavigator.kt
new file mode 100644
index 0000000..36fb413
--- /dev/null
+++ b/app/src/main/java/com/cobeisfresh/template/routing/AppFragmentNavigator.kt
@@ -0,0 +1,14 @@
+package com.cobeisfresh.template.routing
+
+import androidx.fragment.app.FragmentActivity
+import com.cobeisfresh.template.R
+import com.cobeisfresh.template.common.extensions.showFragment
+import com.cobeisfresh.template.ui.weather.view.fragments.WeatherDetailsFragment
+
+class AppFragmentNavigator : FragmentNavigator {
+  
+  override fun showWeatherDetails(fragmentActivity: FragmentActivity) =
+      fragmentActivity.showFragment(WeatherDetailsFragment.newInstance(), R.id.fragmentContainer, true)
+  
+}
+
diff --git a/app/src/main/java/com/cobeisfresh/template/routing/AppNavigator.kt b/app/src/main/java/com/cobeisfresh/template/routing/AppNavigator.kt
index 5f34030..4df8ef6 100644
--- a/app/src/main/java/com/cobeisfresh/template/routing/AppNavigator.kt
+++ b/app/src/main/java/com/cobeisfresh/template/routing/AppNavigator.kt
@@ -2,9 +2,12 @@ package com.cobeisfresh.template.routing
 
 import android.content.Intent
 import androidx.appcompat.app.AppCompatActivity
-import com.cobeisfresh.template.ui.weather.base.BaseActivity
-import com.cobeisfresh.template.ui.weather.base.ContainerActivity
-import com.cobeisfresh.template.ui.weather.view.WeatherActivity
+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 {
@@ -13,10 +16,8 @@ class AppNavigator(private val activity: AppCompatActivity) : Navigator {
     const val SCREEN_TYPE = "screen_type"
   }
   
-  override fun showWeather() = navigateTo(getIntent<WeatherActivity>())
-  
-  override fun showWeatherDetails() = navigateTo(getIntent<ContainerActivity>().apply {
-    putExtra(SCREEN_TYPE, ScreenType.WEATHER_DETAILS)
+  override fun showWeather() = navigateTo(getIntent<WeatherActivity>().apply {
+    putExtra(SCREEN_TYPE, ScreenType.WEATHER)
   })
   
   private fun navigateTo(intent: Intent) = activity.startActivity(intent)
@@ -26,5 +27,5 @@ class AppNavigator(private val activity: AppCompatActivity) : Navigator {
 }
 
 enum class ScreenType : Serializable {
-  WEATHER_DETAILS
-}
\ No newline at end of file
+  WEATHER
+}
diff --git a/app/src/main/java/com/cobeisfresh/template/routing/FragmentNavigator.kt b/app/src/main/java/com/cobeisfresh/template/routing/FragmentNavigator.kt
new file mode 100644
index 0000000..eb2c74b
--- /dev/null
+++ b/app/src/main/java/com/cobeisfresh/template/routing/FragmentNavigator.kt
@@ -0,0 +1,9 @@
+package com.cobeisfresh.template.routing
+
+import androidx.fragment.app.FragmentActivity
+
+interface FragmentNavigator {
+  
+  fun showWeatherDetails(fragmentActivity: FragmentActivity)
+  
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/cobeisfresh/template/routing/Navigator.kt b/app/src/main/java/com/cobeisfresh/template/routing/Navigator.kt
index 958e8ef..7dc4ffd 100644
--- a/app/src/main/java/com/cobeisfresh/template/routing/Navigator.kt
+++ b/app/src/main/java/com/cobeisfresh/template/routing/Navigator.kt
@@ -4,5 +4,4 @@ interface Navigator {
   
   fun showWeather()
   
-  fun showWeatherDetails()
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/cobeisfresh/template/ui/weather/base/BaseActivity.kt b/app/src/main/java/com/cobeisfresh/template/ui/base/BaseActivity.kt
similarity index 78%
rename from app/src/main/java/com/cobeisfresh/template/ui/weather/base/BaseActivity.kt
rename to app/src/main/java/com/cobeisfresh/template/ui/base/BaseActivity.kt
index cef5596..81693d5 100644
--- a/app/src/main/java/com/cobeisfresh/template/ui/weather/base/BaseActivity.kt
+++ b/app/src/main/java/com/cobeisfresh/template/ui/base/BaseActivity.kt
@@ -1,4 +1,4 @@
-package com.cobeisfresh.template.ui.weather.base
+package com.cobeisfresh.template.ui.base
 
 import android.view.View
 import android.widget.ProgressBar
@@ -6,10 +6,7 @@ import androidx.annotation.StringRes
 import androidx.appcompat.app.AppCompatActivity
 import androidx.fragment.app.Fragment
 import com.cobeisfresh.template.common.EMPTY_STRING
-import com.cobeisfresh.template.common.extensions.gone
-import com.cobeisfresh.template.common.extensions.showFragment
-import com.cobeisfresh.template.common.extensions.snackbar
-import com.cobeisfresh.template.common.extensions.visible
+import com.cobeisfresh.template.common.extensions.*
 import com.cobeisfresh.template.routing.AppNavigator
 import org.koin.android.ext.android.inject
 import org.koin.core.parameter.parametersOf
@@ -29,4 +26,8 @@ abstract class BaseActivity : AppCompatActivity() {
   fun addFragment(fragment: Fragment, containerId: Int, addToBackStack: Boolean = false) {
     showFragment(fragment, containerId, addToBackStack)
   }
+  
+  override fun onBackPressed() {
+    if (supportFragmentManager.backStackEntryCount <= 1) finish() else goBack()
+  }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/cobeisfresh/template/ui/base/BaseFragment.kt b/app/src/main/java/com/cobeisfresh/template/ui/base/BaseFragment.kt
new file mode 100644
index 0000000..5b6914d
--- /dev/null
+++ b/app/src/main/java/com/cobeisfresh/template/ui/base/BaseFragment.kt
@@ -0,0 +1,54 @@
+package com.cobeisfresh.template.ui.base
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.ProgressBar
+import androidx.annotation.StringRes
+import androidx.fragment.app.Fragment
+import com.cobeisfresh.template.common.EMPTY_STRING
+import com.cobeisfresh.template.common.extensions.gone
+import com.cobeisfresh.template.common.extensions.snackbar
+import com.cobeisfresh.template.common.extensions.visible
+import com.cobeisfresh.template.routing.AppFragmentNavigator
+import com.cobeisfresh.template.routing.AppNavigator
+import org.koin.android.ext.android.inject
+import org.koin.core.parameter.parametersOf
+
+abstract class BaseFragment : Fragment() {
+  
+  protected val appFragmentNavigator: AppFragmentNavigator by inject()
+  
+  override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+    return inflater.inflate(getLayout(), container, false)
+  }
+  
+  override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+    super.onViewCreated(view, savedInstanceState)
+    viewReady()
+  }
+  
+  protected fun onBackPressed() = (activity as BaseActivity).onBackPressed()
+  
+  abstract fun viewReady()
+  
+  abstract fun getLayout(): Int
+  
+  
+  open fun showError(@StringRes errorMessage: Int, rootView: View) {
+    (activity as BaseActivity).showError(errorMessage, rootView)
+  }
+  
+  open fun showError(errorMessage: String?, rootView: View) {
+    (activity as BaseActivity).showError(errorMessage, rootView)
+  }
+  
+  open fun showLoading(progressBar: ProgressBar) {
+    (activity as BaseActivity).showLoading(progressBar)
+  }
+  
+  open fun hideLoading(progressBar: ProgressBar) {
+    (activity as BaseActivity).hideLoading(progressBar)
+  }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/cobeisfresh/template/ui/weather/base/NavigatorViewModel.kt b/app/src/main/java/com/cobeisfresh/template/ui/base/NavigatorViewModel.kt
similarity index 90%
rename from app/src/main/java/com/cobeisfresh/template/ui/weather/base/NavigatorViewModel.kt
rename to app/src/main/java/com/cobeisfresh/template/ui/base/NavigatorViewModel.kt
index c5bea36..aeb993c 100644
--- a/app/src/main/java/com/cobeisfresh/template/ui/weather/base/NavigatorViewModel.kt
+++ b/app/src/main/java/com/cobeisfresh/template/ui/base/NavigatorViewModel.kt
@@ -1,4 +1,4 @@
-package com.cobeisfresh.template.ui.weather.base
+package com.cobeisfresh.template.ui.base
 
 import androidx.lifecycle.ViewModel
 import com.cobeisfresh.template.routing.AppNavigator
diff --git a/app/src/main/java/com/cobeisfresh/template/ui/weather/base/ViewState.kt b/app/src/main/java/com/cobeisfresh/template/ui/base/ViewState.kt
similarity index 80%
rename from app/src/main/java/com/cobeisfresh/template/ui/weather/base/ViewState.kt
rename to app/src/main/java/com/cobeisfresh/template/ui/base/ViewState.kt
index b519540..1446506 100644
--- a/app/src/main/java/com/cobeisfresh/template/ui/weather/base/ViewState.kt
+++ b/app/src/main/java/com/cobeisfresh/template/ui/base/ViewState.kt
@@ -1,6 +1,6 @@
-package com.cobeisfresh.template.ui.weather.base
+package com.cobeisfresh.template.ui.base
 
-import com.cobeisfresh.template.ui.weather.base.ViewState.Status.*
+import com.cobeisfresh.template.ui.base.ViewState.Status.*
 
 data class ViewState<T>(val status: Status, val data: T?, val error: Throwable?) {
   
diff --git a/app/src/main/java/com/cobeisfresh/template/ui/weather/base/BaseFragment.kt b/app/src/main/java/com/cobeisfresh/template/ui/weather/base/BaseFragment.kt
deleted file mode 100644
index b0b916f..0000000
--- a/app/src/main/java/com/cobeisfresh/template/ui/weather/base/BaseFragment.kt
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.cobeisfresh.template.ui.weather.base
-
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.fragment.app.Fragment
-
-abstract class BaseFragment : Fragment() {
-  
-  override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-    return inflater.inflate(getLayout(), container, false)
-  }
-  
-  override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-    super.onViewCreated(view, savedInstanceState)
-    viewReady()
-  }
-  
-  abstract fun viewReady()
-  
-  abstract fun getLayout(): Int
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/cobeisfresh/template/ui/weather/base/ContainerActivity.kt b/app/src/main/java/com/cobeisfresh/template/ui/weather/base/ContainerActivity.kt
deleted file mode 100644
index b182fc3..0000000
--- a/app/src/main/java/com/cobeisfresh/template/ui/weather/base/ContainerActivity.kt
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.cobeisfresh.template.ui.weather.base
-
-import android.os.Bundle
-import com.cobeisfresh.template.R
-import com.cobeisfresh.template.common.extensions.showFragment
-import com.cobeisfresh.template.routing.AppNavigator
-import com.cobeisfresh.template.routing.ScreenType
-import com.cobeisfresh.template.ui.weather.view.WeatherDetailsFragment
-
-/**
- * Activity that shows fragment inside container. ScreenType is sent through bundle
- */
-class ContainerActivity : BaseActivity() {
-  
-  override fun onCreate(savedInstanceState: Bundle?) {
-    super.onCreate(savedInstanceState)
-    setContentView(R.layout.activity_container)
-    when (intent.getSerializableExtra(AppNavigator.SCREEN_TYPE)) {
-      ScreenType.WEATHER_DETAILS -> addFragment(WeatherDetailsFragment.newInstance(), R.id.fragmentContainer)
-      else -> finish()
-    }
-  }
-}
diff --git a/app/src/main/java/com/cobeisfresh/template/ui/weather/presentation/WeatherViewModel.kt b/app/src/main/java/com/cobeisfresh/template/ui/weather/presentation/WeatherViewModel.kt
index 841d8cb..72d2d50 100644
--- a/app/src/main/java/com/cobeisfresh/template/ui/weather/presentation/WeatherViewModel.kt
+++ b/app/src/main/java/com/cobeisfresh/template/ui/weather/presentation/WeatherViewModel.kt
@@ -6,8 +6,8 @@ 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.weather.base.NavigatorViewModel
-import com.cobeisfresh.template.ui.weather.base.ViewState
+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
 import com.example.domain.model.onFailure
@@ -16,7 +16,7 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 
-class WeatherViewModel(private val getWeather: GetWeatherUseCase) : NavigatorViewModel() {
+class WeatherViewModel(private val getWeather: GetWeatherUseCase) : ViewModel() {
   
   // we make this private and provide only immutable live data to observers so they can't change anything
   private val _weatherLiveData = MutableLiveData<ViewState<WeatherInfo>>()
@@ -31,12 +31,4 @@ class WeatherViewModel(private val getWeather: GetWeatherUseCase) : NavigatorVie
           .onFailure { _weatherLiveData.postValue(ViewState.error(it.throwable)) }
     }
   }
-  
-  fun showWeatherDetails() {
-    appNavigator.showWeatherDetails()
-  }
-  
-  override fun initAppNavigator(appNavigator: AppNavigator) {
-    this.appNavigator = appNavigator
-  }
 }
diff --git a/app/src/main/java/com/cobeisfresh/template/ui/weather/view/WeatherActivity.kt b/app/src/main/java/com/cobeisfresh/template/ui/weather/view/WeatherActivity.kt
deleted file mode 100644
index ff245e3..0000000
--- a/app/src/main/java/com/cobeisfresh/template/ui/weather/view/WeatherActivity.kt
+++ /dev/null
@@ -1,63 +0,0 @@
-package com.cobeisfresh.template.ui.weather.view
-
-import android.content.Context
-import android.os.Bundle
-import android.view.inputmethod.InputMethodManager
-import androidx.lifecycle.Observer
-import com.cobeisfresh.template.R
-import com.cobeisfresh.template.common.convertKelvinToCelsius
-import com.cobeisfresh.template.common.extensions.onClick
-import com.cobeisfresh.template.common.extensions.subscribe
-import com.cobeisfresh.template.routing.AppNavigator
-import com.cobeisfresh.template.ui.weather.base.BaseActivity
-import com.cobeisfresh.template.ui.weather.base.ViewState
-import com.cobeisfresh.template.ui.weather.base.ViewState.Status.*
-import com.cobeisfresh.template.ui.weather.presentation.WeatherViewModel
-import com.example.domain.model.WeatherInfo
-import kotlinx.android.synthetic.main.activity_weather.*
-import org.koin.android.viewmodel.ext.android.viewModel
-
-class WeatherActivity : BaseActivity() {
-  
-  private val viewModel: WeatherViewModel by viewModel()
-  
-  override fun onCreate(savedInstanceState: Bundle?) {
-    super.onCreate(savedInstanceState)
-    setContentView(R.layout.activity_weather)
-    viewModel.initAppNavigator(appNavigator)
-    viewModel.getWeatherForLocation()
-    subscribeToData()
-    
-    getWeather.onClick {
-      val imm = getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager
-      imm.hideSoftInputFromWindow(weatherActivityContainer.windowToken, InputMethodManager.HIDE_NOT_ALWAYS)
-      viewModel.getWeatherForLocation(cityInput.text.toString())
-    }
-    
-    showWeatherDetails.onClick { viewModel.showWeatherDetails() }
-  }
-  
-  private fun subscribeToData() = with(viewModel) {
-    weatherLiveData.subscribe(this@WeatherActivity, ::handleViewState)
-  }
-  
-  private fun handleViewState(viewState: ViewState<WeatherInfo>) {
-    with(viewState) {
-      when (status) {
-        LOADING -> showLoading(weatherLoadingProgress)
-        SUCCESS -> data?.run(::showWeatherData)
-        ERROR -> {
-          hideLoading(weatherLoadingProgress)
-          showError(error?.message, weatherActivityContainer)
-        }
-      }
-    }
-  }
-  
-  private fun showWeatherData(weatherInfo: WeatherInfo) {
-    hideLoading(weatherLoadingProgress)
-    temperature.text = convertKelvinToCelsius(weatherInfo.temperature)
-    pressure.text = weatherInfo.pressure.toString()
-    humidity.text = weatherInfo.humidity.toString()
-  }
-}
diff --git a/app/src/main/java/com/cobeisfresh/template/ui/weather/view/activities/WeatherActivity.kt b/app/src/main/java/com/cobeisfresh/template/ui/weather/view/activities/WeatherActivity.kt
new file mode 100644
index 0000000..809f652
--- /dev/null
+++ b/app/src/main/java/com/cobeisfresh/template/ui/weather/view/activities/WeatherActivity.kt
@@ -0,0 +1,20 @@
+package com.cobeisfresh.template.ui.weather.view.activities
+
+import android.os.Bundle
+import com.cobeisfresh.template.R
+import com.cobeisfresh.template.routing.AppNavigator
+import com.cobeisfresh.template.routing.ScreenType
+import com.cobeisfresh.template.ui.base.BaseActivity
+import com.cobeisfresh.template.ui.weather.view.fragments.WeatherFragment
+
+class WeatherActivity : BaseActivity() {
+  
+  override fun onCreate(savedInstanceState: Bundle?) {
+    super.onCreate(savedInstanceState)
+    setContentView(R.layout.activity_container)
+    when (intent.getSerializableExtra(AppNavigator.SCREEN_TYPE)) {
+      ScreenType.WEATHER -> addFragment(WeatherFragment.newInstance(), R.id.fragmentContainer, true)
+      else -> finish()
+    }
+  }
+}
diff --git a/app/src/main/java/com/cobeisfresh/template/ui/weather/view/WeatherDetailsFragment.kt b/app/src/main/java/com/cobeisfresh/template/ui/weather/view/fragments/WeatherDetailsFragment.kt
similarity index 61%
rename from app/src/main/java/com/cobeisfresh/template/ui/weather/view/WeatherDetailsFragment.kt
rename to app/src/main/java/com/cobeisfresh/template/ui/weather/view/fragments/WeatherDetailsFragment.kt
index ab0efec..eb05207 100644
--- a/app/src/main/java/com/cobeisfresh/template/ui/weather/view/WeatherDetailsFragment.kt
+++ b/app/src/main/java/com/cobeisfresh/template/ui/weather/view/fragments/WeatherDetailsFragment.kt
@@ -1,13 +1,11 @@
-package com.cobeisfresh.template.ui.weather.view
+package com.cobeisfresh.template.ui.weather.view.fragments
 
 import com.cobeisfresh.template.R
-import com.cobeisfresh.template.ui.weather.base.BaseFragment
+import com.cobeisfresh.template.ui.base.BaseFragment
 
 class WeatherDetailsFragment: BaseFragment() {
   
-  override fun viewReady() {
-  
-  }
+  override fun viewReady() {}
   
   override fun getLayout() = R.layout.fragment_weather_details
   
diff --git a/app/src/main/java/com/cobeisfresh/template/ui/weather/view/fragments/WeatherFragment.kt b/app/src/main/java/com/cobeisfresh/template/ui/weather/view/fragments/WeatherFragment.kt
new file mode 100644
index 0000000..75626fb
--- /dev/null
+++ b/app/src/main/java/com/cobeisfresh/template/ui/weather/view/fragments/WeatherFragment.kt
@@ -0,0 +1,60 @@
+package com.cobeisfresh.template.ui.weather.view.fragments
+
+import com.cobeisfresh.template.R
+import com.cobeisfresh.template.common.convertKelvinToCelsius
+import com.cobeisfresh.template.common.extensions.hideKeyboard
+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.weather.presentation.WeatherViewModel
+import com.example.domain.model.WeatherInfo
+import kotlinx.android.synthetic.main.fragment_weather.*
+import org.koin.android.viewmodel.ext.android.viewModel
+
+class WeatherFragment : BaseFragment() {
+  
+  private val viewModel: WeatherViewModel by viewModel()
+  
+  override fun viewReady() {
+    viewModel.getWeatherForLocation()
+    subscribeToData()
+    getWeather.onClick {
+      weatherActivityContainer.hideKeyboard()
+      viewModel.getWeatherForLocation(cityInput.text.toString())
+    }
+    
+    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 -> {
+          hideLoading(weatherLoadingProgress)
+          showError(error?.message, weatherActivityContainer)
+        }
+      }
+    }
+  }
+  
+  private fun showWeatherData(weatherInfo: WeatherInfo) {
+    hideLoading(weatherLoadingProgress)
+    temperature.text = convertKelvinToCelsius(weatherInfo.temperature)
+    pressure.text = weatherInfo.pressure.toString()
+    humidity.text = weatherInfo.humidity.toString()
+  }
+  
+  companion object {
+    fun newInstance() = WeatherFragment()
+  }
+}
+
diff --git a/app/src/main/java/com/cobeisfresh/template/ui/welcome/presentation/WelcomeViewModel.kt b/app/src/main/java/com/cobeisfresh/template/ui/welcome/presentation/WelcomeViewModel.kt
new file mode 100644
index 0000000..5a66b43
--- /dev/null
+++ b/app/src/main/java/com/cobeisfresh/template/ui/welcome/presentation/WelcomeViewModel.kt
@@ -0,0 +1,15 @@
+package com.cobeisfresh.template.ui.welcome.presentation
+
+import com.cobeisfresh.template.routing.AppNavigator
+import com.cobeisfresh.template.ui.base.NavigatorViewModel
+
+class WelcomeViewModel : NavigatorViewModel() {
+  
+  fun proceedToNextScreen() {
+    appNavigator.showWeather()
+  }
+  
+  override fun initAppNavigator(appNavigator: AppNavigator) {
+    this.appNavigator = appNavigator
+  }
+}
diff --git a/app/src/main/java/com/cobeisfresh/template/ui/welcome/view/WelcomeActivity.kt b/app/src/main/java/com/cobeisfresh/template/ui/welcome/view/WelcomeActivity.kt
new file mode 100644
index 0000000..9b14287
--- /dev/null
+++ b/app/src/main/java/com/cobeisfresh/template/ui/welcome/view/WelcomeActivity.kt
@@ -0,0 +1,24 @@
+package com.cobeisfresh.template.ui.welcome.view
+
+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()
+      finish()
+    }
+  }
+}
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_welcome.xml b/app/src/main/res/layout/activity_welcome.xml
new file mode 100644
index 0000000..b7c32bf
--- /dev/null
+++ b/app/src/main/res/layout/activity_welcome.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+  android:layout_width="match_parent"
+  android:layout_height="match_parent"
+  xmlns:app="http://schemas.android.com/apk/res-auto">
+
+
+  <TextView
+    android:id="@+id/welcomeMessage"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    app:layout_constraintTop_toTopOf="parent"
+    app:layout_constraintBottom_toBottomOf="parent"
+    app:layout_constraintEnd_toEndOf="parent"
+    app:layout_constraintStart_toStartOf="parent"
+    android:text="Welcome"/>
+
+  <Button
+    android:id="@+id/nextScreen"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:layout_marginTop="12dp"
+    app:layout_constraintStart_toStartOf="parent"
+    app:layout_constraintEnd_toEndOf="parent"
+    app:layout_constraintTop_toBottomOf="@id/welcomeMessage"
+    android:text="Next"/>
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_weather.xml b/app/src/main/res/layout/fragment_weather.xml
similarity index 97%
rename from app/src/main/res/layout/activity_weather.xml
rename to app/src/main/res/layout/fragment_weather.xml
index 6d31d7f..7826c03 100644
--- a/app/src/main/res/layout/activity_weather.xml
+++ b/app/src/main/res/layout/fragment_weather.xml
@@ -5,7 +5,7 @@
   android:id="@+id/weatherActivityContainer"
   android:layout_width="match_parent"
   android:layout_height="match_parent"
-  tools:context=".ui.weather.view.WeatherActivity">
+  tools:context=".ui.weather.view.activities.WeatherActivity">
 
   <ProgressBar
     android:id="@+id/weatherLoadingProgress"