Refactor: create initView method

Author: vvban

app/src/main/java/com/bannanguy/task1androidapp/ui/cityDetail/CityDetailActivity.kt

@@ -25,9 +25,7 @@ class CityDetailActivity : AppCompatActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        binding = CityDetailActivityBinding.inflate(layoutInflater)
-        val view = binding.root
-        setContentView(view)
+        initView()
 
         setOnClickListener()
 
@@ -38,6 +36,25 @@ class CityDetailActivity : AppCompatActivity() {
         loadWeatherData()
     }
 
+    private fun initView() {
+        binding = CityDetailActivityBinding.inflate(layoutInflater)
+        val view = binding.root
+        setContentView(view)
+    }
+
+    private fun setOnClickListener() {
+        binding.backButton.setOnClickListener {
+            finish()
+        }
+    }
+
+    private fun readCurrentCityId() {
+        val bundle: Bundle? = intent.extras
+        if (bundle != null) {
+            currentCityId = bundle.getLong(CITY_ID)
+        }
+    }
+
     private fun observeData() {
         cityDetailViewModel.observeLiveData().observe(this) {
             it?.let {
@@ -61,19 +78,6 @@ class CityDetailActivity : AppCompatActivity() {
 
     }
 
-    private fun setOnClickListener() {
-        binding.backButton.setOnClickListener {
-            finish()
-        }
-    }
-
-    private fun readCurrentCityId() {
-        val bundle: Bundle? = intent.extras
-        if (bundle != null) {
-            currentCityId = bundle.getLong(CITY_ID)
-        }
-    }
-
     private fun initRetrofitClient(cacheDir: File) {
         retrofitWeatherClient = RetrofitClientFactory.createBySingleton(
             "weatherapi",

app/src/main/java/com/bannanguy/task1androidapp/ui/cityDetail/CityDetailViewModel.kt

@@ -57,6 +57,7 @@ class CityDetailViewModel(
     fun observeLiveData() : LiveData<CityDetailWeatherInfo> {
         return cityDetailInfoLiveData
     }
+
 }
 
 class CityDetailViewModelFactory(private val context: Context) : ViewModelProvider.Factory {
@@ -70,4 +71,5 @@ class CityDetailViewModelFactory(private val context: Context) : ViewModelProvid
         }
         throw IllegalArgumentException("Unknown ViewModel class")
     }
+
 }

app/src/main/java/com/bannanguy/task1androidapp/ui/cityList/CitiesListActivity.kt

@@ -36,9 +36,7 @@ class CitiesListActivity : AppCompatActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        binding = CityListActivityBinding.inflate(layoutInflater)
-        val view = binding.root
-        setContentView(view)
+        initView()
 
         retrieveData(savedInstanceState)
 
@@ -47,6 +45,7 @@ class CitiesListActivity : AppCompatActivity() {
 
         observeData()
         initRetrofitClient(cacheDir)
+
         if (fistPageIsLoaded) {
             fistPageIsLoaded = false
             loadCitiesIntoListWithPagination()
@@ -65,6 +64,12 @@ class CitiesListActivity : AppCompatActivity() {
         outState.putBoolean(fistPageIsLoadedValue, fistPageIsLoaded)
     }
 
+    private fun initView() {
+        binding = CityListActivityBinding.inflate(layoutInflater)
+        val view = binding.root
+        setContentView(view)
+    }
+
     private fun retrieveData(savedInstanceState: Bundle?) {
         if (savedInstanceState != null) {
             numberOfItem = savedInstanceState.getInt(numberOfItemValue)

app/src/main/java/com/bannanguy/task1androidapp/ui/cityList/CitiesListViewModel.kt

@@ -14,14 +14,9 @@ class CitiesListViewModel : ViewModel() {
         MutableLiveData<List<CityWeatherInfo>>()
     }
 
-    val currentListOfCityWeatherInfo: MutableList<CityWeatherInfo> =
+    private val currentListOfCityWeatherInfo: MutableList<CityWeatherInfo> =
         ArrayList<CityWeatherInfo>(0).toMutableList()
 
-    fun clearCitiesList() {
-        currentListOfCityWeatherInfo.clear()
-    }
-
-    // FIXME: on change orientation cities have duplicates!
     fun addCitiesToList(
         retrofitClient: RetrofitClient,
         listOfCities: List<CityData>
@@ -84,4 +79,5 @@ class CitiesListViewModelFactory(private val context: Context) : ViewModelProvid
         }
         throw IllegalArgumentException("Unknown ViewModel class")
     }
+
 }