change weather location

rahulstech · rahulstech · commit 7cf0c070fd15 · 2024-12-30T21:38:27.000+05:30
diff --git a/app/src/main/java/rahulstech/android/weatherapp/activity/CitySearchActivity.kt b/app/src/main/java/rahulstech/android/weatherapp/activity/CitySearchActivity.kt
@@ -3,17 +3,23 @@ package rahulstech.android.weatherapp.activity
 import android.os.Bundle
 import android.text.Editable
 import android.text.TextWatcher
+import android.util.Log
+import android.view.View
 import android.widget.EditText
+import android.widget.Toast
 import androidx.appcompat.app.AppCompatActivity
 import androidx.lifecycle.ViewModelProvider
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import rahulstech.android.weatherapp.R
 import rahulstech.android.weatherapp.adapter.CitySearchResultAdapter
+import rahulstech.android.weatherapp.helper.OnRecyclerViewItemClickListener
+import rahulstech.android.weatherapp.helper.RecyclerViewItemClickHelper
+import rahulstech.android.weatherapp.setting.SettingsStorage
 import rahulstech.android.weatherapp.viewmodel.CitySearchViewModel
 import rahulstech.weather.repository.City
 
-class CitySearchActivity : AppCompatActivity() {
+class CitySearchActivity : AppCompatActivity(), OnRecyclerViewItemClickListener {
 
     private val TAG = CitySearchActivity::class.java.simpleName
 
@@ -33,10 +39,13 @@ class CitySearchActivity : AppCompatActivity() {
         searchResult = findViewById(R.id.search_result)
 
         val layoutManager = LinearLayoutManager(this, LinearLayoutManager.VERTICAL, false)
+        val itemClickHelper = RecyclerViewItemClickHelper(searchResult)
+        itemClickHelper.addOnRecyclerViewItemClickListener(this)
         citySearchResultAdapter = CitySearchResultAdapter(this)
 
         searchResult.layoutManager = layoutManager
         searchResult.adapter = citySearchResultAdapter
+        searchResult.addOnItemTouchListener(itemClickHelper)
 
         viewModel = ViewModelProvider(this).get(CitySearchViewModel::class.java)
         viewModel.citySearchResult.observe(this) { onCitiesFetched(it) }
@@ -47,12 +56,28 @@ class CitySearchActivity : AppCompatActivity() {
             override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {}
 
             override fun afterTextChanged(s: Editable?) {
-                viewModel.changeKeyword(s.toString())
+                val keyword = s.toString()
+                if (keyword.length < 3 ) {
+                    viewModel.changeKeyword(null)
+                }
+                else {
+                    viewModel.changeKeyword(keyword)
+                }
             }
         })
     }
 
     private fun onCitiesFetched(cities: List<City>) {
         citySearchResultAdapter.submitList(cities)
     }
+
+    override fun onClickItem(recyclerView: RecyclerView, itemView: View, adapterPosition: Int) {
+        val item = citySearchResultAdapter.currentList[adapterPosition]
+        val locationId = item.locationId
+        val location = "${item.name}, ${item.region}, ${item.country}"
+        Log.i(TAG, "selected location: id=$locationId location= $location")
+        SettingsStorage.get(this).setWeatherLocationId(locationId)
+        Toast.makeText(this, getString(R.string.message_current_location_changed, location), Toast.LENGTH_SHORT).show()
+        finish()
+    }
 }
diff --git a/app/src/main/java/rahulstech/android/weatherapp/activity/HomeActivity.kt b/app/src/main/java/rahulstech/android/weatherapp/activity/HomeActivity.kt
@@ -16,6 +16,7 @@ import rahulstech.android.weatherapp.adapter.HourlyForecastAdapter
 import rahulstech.android.weatherapp.getTemperatureCelsiusText
 import rahulstech.android.weatherapp.getWeatherConditionIcon
 import rahulstech.android.weatherapp.getWeatherConditionText
+import rahulstech.android.weatherapp.setting.SettingsStorage
 import rahulstech.android.weatherapp.viewmodel.HomeViewModel
 import rahulstech.weather.repository.WeatherCondition
 import rahulstech.weather.repository.WeatherForecast
@@ -83,12 +84,15 @@ class HomeActivity : AppCompatActivity() {
         forecastHourly.layoutManager = layoutManager
         forecastHourly.adapter = hourlyForecastAdapter
 
-
-        // Delhi: 1112321
-        // Kandi: 1118644
         viewModel = ViewModelProvider(this).get(HomeViewModel::class.java)
         viewModel.weatherToday.observe(this) { onCurrentWeatherReportFetched(it) }
-        viewModel.setLocationId("1112321")
+    }
+
+    override fun onStart() {
+        super.onStart()
+
+        val weatherLocationId = SettingsStorage.get(this).getWeatherLocationId()
+        viewModel.setLocationId(weatherLocationId)
     }
 
     private fun onCurrentWeatherReportFetched(report: WeatherForecast?) {
diff --git a/app/src/main/java/rahulstech/android/weatherapp/helper/RecyclerViewItemClickHelper.kt b/app/src/main/java/rahulstech/android/weatherapp/helper/RecyclerViewItemClickHelper.kt
@@ -0,0 +1,44 @@
+package rahulstech.android.weatherapp.helper
+
+import android.view.GestureDetector
+import android.view.MotionEvent
+import android.view.View
+import androidx.recyclerview.widget.RecyclerView
+import java.lang.ref.WeakReference
+
+interface OnRecyclerViewItemClickListener {
+
+    fun onClickItem(recyclerView: RecyclerView, itemView: View, adapterPosition: Int)
+}
+
+class RecyclerViewItemClickHelper(private val recyclerView: RecyclerView) : RecyclerView.SimpleOnItemTouchListener() {
+
+    private val gestureListener = object : GestureDetector.SimpleOnGestureListener() {
+
+        override fun onSingleTapConfirmed(e: MotionEvent): Boolean = handleClick(e)
+    }
+
+    private val gestureDetector = GestureDetector(recyclerView.context, gestureListener)
+
+    private var clickListenerRef: WeakReference<OnRecyclerViewItemClickListener> = WeakReference<OnRecyclerViewItemClickListener>(null)
+
+    override fun onInterceptTouchEvent(rv: RecyclerView, e: MotionEvent): Boolean = gestureDetector.onTouchEvent(e)
+
+    fun addOnRecyclerViewItemClickListener(listener: OnRecyclerViewItemClickListener) {
+        clickListenerRef = WeakReference<OnRecyclerViewItemClickListener>(listener)
+    }
+
+    private fun handleClick(e: MotionEvent): Boolean {
+        val listener = clickListenerRef.get() ?: return false
+        val itemView: View = getItemViewUnderTouch(recyclerView, e) ?: return false
+        val adapterPosition = recyclerView.getChildAdapterPosition(itemView)
+        listener.onClickItem(recyclerView, itemView, adapterPosition)
+        return true
+    }
+
+    private fun getItemViewUnderTouch(recyclerView: RecyclerView, e: MotionEvent): View? {
+        val touchX = e.x
+        val touchY = e.y
+        return recyclerView.findChildViewUnder(touchX, touchY)
+    }
+}
diff --git a/app/src/main/java/rahulstech/android/weatherapp/setting/SettingsStorage.kt b/app/src/main/java/rahulstech/android/weatherapp/setting/SettingsStorage.kt
@@ -0,0 +1,34 @@
+package rahulstech.android.weatherapp.setting
+
+import android.content.Context
+import androidx.core.content.edit
+
+class SettingsStorage private constructor(private val context: Context) {
+
+    private val SHARED_PREFERENCE_NAME = "name.shared_preferences.weather"
+
+    private val KEY_WEATHER_LOCATION_ID = "weather_location_id"
+
+    private val DEFAULT_LOCATION_ID = "2801268"
+
+    private val sharedPreferences by lazy { context.getSharedPreferences(SHARED_PREFERENCE_NAME, Context.MODE_PRIVATE) }
+
+    private fun readString(key: String, defaultValue: String? = null): String? =
+        sharedPreferences.getString(key, defaultValue)
+
+    private fun writeString(key: String, value: String?) =
+        sharedPreferences.edit(true) { putString(key, value) }
+
+    fun setWeatherLocationId(locationId: String) {
+        writeString(KEY_WEATHER_LOCATION_ID, locationId)
+    }
+
+    fun getWeatherLocationId(): String {
+        return readString(KEY_WEATHER_LOCATION_ID, DEFAULT_LOCATION_ID) as String
+    }
+
+    companion object {
+
+        fun get(context: Context) = SettingsStorage(context)
+    }
+}
diff --git a/app/src/main/java/rahulstech/android/weatherapp/viewmodel/CitySearchViewModel.kt b/app/src/main/java/rahulstech/android/weatherapp/viewmodel/CitySearchViewModel.kt
@@ -13,11 +13,11 @@ class CitySearchViewModel(app: Application) : AndroidViewModel(app) {
 
     private val repo by lazy { WeatherRepository(BuildConfig.WEATHER_API_KEY) }
 
-    private val keywordLiveData = MutableLiveData<String>()
+    private val keywordLiveData = MutableLiveData<String?>()
 
     val citySearchResult: LiveData<List<City>> by lazy { keywordLiveData.switchMap { repo.searchCity(it) } }
 
-    fun changeKeyword(keyword: String)  {
+    fun changeKeyword(keyword: String?)  {
         keywordLiveData.value = keyword
     }
 }
diff --git a/app/src/main/res/layout/item_city_search_result.xml b/app/src/main/res/layout/item_city_search_result.xml
@@ -2,15 +2,17 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:orientation="vertical"
     android:gravity="start"
-    android:padding="8dp">
+    android:background="?attr/selectableItemBackground"
+    android:clickable="true">
 
     <TextView
         android:id="@+id/label_city"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_margin="4dp"
+        android:layout_margin="8dp"
         android:textAppearance="@style/TextAppearance.AppCompat.Headline" />
 
     <TextView
@@ -20,4 +22,9 @@
         android:layout_margin="4dp"
         android:textAppearance="@style/TextAppearance.AppCompat.Large" />
 
+    <com.google.android.material.divider.MaterialDivider
+        android:layout_width="match_parent"
+        android:layout_height="2dp"
+        app:lastItemDecorated="false" />
+
 </LinearLayout>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -24,4 +24,5 @@
     <string name="text_blizzard">Blizzard</string>
     <string name="text_search_city">Search city</string>
     <string name="text_load_more_cities">Load more cities...</string>
+    <string name="message_current_location_changed">location changed to %s</string>
 </resources>
diff --git a/backend/weather-api/src/main/java/com/weather/api/WeatherApi.kt b/backend/weather-api/src/main/java/com/weather/api/WeatherApi.kt
@@ -6,24 +6,12 @@ import retrofit2.http.Query
 
 interface WeatherApi {
 
-    @GET("astronomy.json")
-    suspend fun getAstronomyForDate(
-        @Query("q") q: String,
-        @Query("dt") dt: String
-    ): Response<Astronomy>
-
     @GET("forecast.json")
     suspend fun getForecast(
         @Query("q") q: String,
         @Query("days") days: Int
     ): Response<Forecast>
 
-
-    @GET("timezone.json")
-    fun getTimezone(
-        @Query("q") q: String
-    ): Response<Timezone>
-
     @GET("search.json")
     suspend fun searchCity(
         @Query("q") q: String
diff --git a/backend/weather-repository/build.gradle b/backend/weather-repository/build.gradle
@@ -35,4 +35,5 @@ dependencies {
 
     implementation libs.androidx.core.ktx
     implementation libs.androidx.appcompat
+    implementation libs.androidx.lifecycle.viewmode.ktx
 }
diff --git a/backend/weather-repository/src/main/java/rahulstech/weather/repository/WeatherRepository.kt b/backend/weather-repository/src/main/java/rahulstech/weather/repository/WeatherRepository.kt
@@ -3,6 +3,7 @@ package rahulstech.weather.repository
 import android.util.Log
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.asLiveData
 import com.weather.api.Location
 import com.weather.api.WeatherClient
 import kotlinx.coroutines.Dispatchers
@@ -30,7 +31,6 @@ class WeatherRepository(private val apiKey: String) {
     private val api by lazy { WeatherClient.getInstance(apiKey).api }
 
     fun getWeatherToday(locationId: String): LiveData<WeatherForecast?> {
-        val result = MutableLiveData<WeatherForecast?>()
         val mainFlow: Flow<WeatherForecast?> = flow {
             val response = api.getForecast("id:$locationId", 1)
             if (response.isSuccessful) {
@@ -81,13 +81,7 @@ class WeatherRepository(private val apiKey: String) {
                 Log.e(TAG, null,it)
             }
 
-         GlobalScope.launch {
-             mainFlow.collect {
-                 result.postValue(it)
-             }
-         }
-
-        return result
+        return mainFlow.asLiveData()
     }
 
     fun searchCity(keyword: String?): LiveData<List<City>> {
@@ -130,7 +124,7 @@ class WeatherRepository(private val apiKey: String) {
     }
 
     private fun convertLocationToCity(locationId: String, location: Location): City {
-        val zoneId = if (location.tz_id.isNullOrBlank()) ZoneId.systemDefault() else ZoneId.of(location.tz_id)
+        val zoneId = if (location.tz_id.isNullOrBlank()) null else ZoneId.of(location.tz_id)
         return City(
             0, locationId, location.name, location.region, location.country,
             location.lat, location.lon, zoneId
diff --git a/backend/weather-repository/src/main/java/rahulstech/weather/repository/models.kt b/backend/weather-repository/src/main/java/rahulstech/weather/repository/models.kt
@@ -10,7 +10,7 @@ data class City(
     val id: Long, val locationId: String,
     val name: String, val region: String, val country: String,
     val lat: Double, val lon: Double,
-    val timezone: ZoneId
+    val timezone: ZoneId?
 )
 
 data class HourlyWeather(val city: City, val datetime: LocalDateTime, val isDay: Boolean,

Original file line number	Diff line number	Diff line change
`@@ -13,11 +13,11 @@ class CitySearchViewModel(app: Application) : AndroidViewModel(app) {`
`13`	`13`
`14`	`14`	`private val repo by lazy { WeatherRepository(BuildConfig.WEATHER_API_KEY) }`
`15`	`15`
`16`		`- private val keywordLiveData = MutableLiveData<String>()`
	`16`	`+ private val keywordLiveData = MutableLiveData<String?>()`
`17`	`17`
`18`	`18`	`val citySearchResult: LiveData<List<City>> by lazy { keywordLiveData.switchMap { repo.searchCity(it) } }`
`19`	`19`
`20`		`- fun changeKeyword(keyword: String) {`
	`20`	`+ fun changeKeyword(keyword: String?) {`
`21`	`21`	`keywordLiveData.value = keyword`
`22`	`22`	`}`
`23`	`23`	`}`
Original file line number	Diff line number	Diff line change
`@@ -35,4 +35,5 @@ dependencies {`
`35`	`35`
`36`	`36`	`implementation libs.androidx.core.ktx`
`37`	`37`	`implementation libs.androidx.appcompat`
	`38`	`+ implementation libs.androidx.lifecycle.viewmode.ktx`
`38`	`39`	`}`