[v1.0.1] Upgrade to v1.0.1 (#2)

* [v1.0.1] Fix bug in version 1.0.1

* [v1.0.1] Change README.md

Author: hide-your-code

.idea/deploymentTargetDropDown.xml

@@ -20,20 +20,25 @@ I want to say thanks for those people to help me to make this app.
     ```kotlin
     BASE_URL=https://api.openweathermap.org/data/2.5/
     API_KEY=API_KEY // Fill your open weather api key in here
-    MAPS_API_KEY= GOOGLE_MAPS_API_KEY // Fill your google maps api key in here
+    MAPS_API_KEY=GOOGLE_MAPS_API_KEY // Fill your google maps api key in here
     ```
 
 ## :camera: Screenshots
 
 | Light mode | Dark mode |
 | :---: | :---: |
 | ![Home Light](image/home_light.png "Home Light") | ![Home Dark](image/home_dark.png "Home Dark") |
+| ![Seven Days Light](image/seven_days_light.png "Seven Days Light") | ![Seven Days Light](image/seven_days_dark.png "Seven Days Light") |
 | ![Search By Map Light](image/search_by_map_light.png "Search By Map Light") | ![Search By Map Dark](image/search_by_map_dark.png "Search By Map Dark") |
+| ![Drawer Light](image/drawer_light.png "Drawer Light") | ![Drawer Dark](image/drawer_dark.png "Drawer Dark") |
+| ![Search By Text Light](image/search_by_text_light.png "Search By Text Light") | ![Search By Text Dark](image/search_by_text_dark.png "Search By Text Dark") |
 
 ## :blue_book: Features
 
-- Show the current weather by location.
+- Show the current weather by location or name.
+- Show the seven days weather by location or name.
 - Choice the location you want by using Google Map.
+- Search location by address name by using Google Places.
 - Support dark mode.
 - Support dynamic material from Android 13 and above.
 - Support English and Vietnamese.

README.md

@@ -21,7 +21,7 @@ android {
         minSdk = 21
         targetSdkPreview = "Tiramisu"
         versionCode = 1
-        versionName = "1.0.0"
+        versionName = "1.0.1"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables {

app/build.gradle.kts

@@ -29,6 +29,7 @@
             android:exported="true"
             android:screenOrientation="sensorPortrait"
             android:theme="@style/Theme.Weapose"
+            android:windowSoftInputMode="adjustResize"
             tools:ignore="LockedOrientationActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />

app/src/main/AndroidManifest.xml

@@ -5,6 +5,7 @@ import android.content.Context
 import android.location.Address
 import android.location.Geocoder
 import android.os.Build
+import androidx.compose.ui.text.intl.Locale
 import com.google.android.gms.location.LocationRequest
 import com.google.android.gms.location.LocationServices
 import com.google.android.gms.maps.model.LatLng
@@ -78,7 +79,13 @@ class LocationRepositoryImpl @Inject constructor(
                     message = context.getString(R.string.error_message_current_address_is_not_found)
                 )
 
-                val geo = Geocoder(context, Locale.ENGLISH)
+                val getSystemLocale = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+                    context.resources.configuration.locales[0]
+                } else {
+                    context.resources.configuration.locale
+                }
+
+                val geo = Geocoder(context, getSystemLocale)
                 if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
                     geo.getFromLocation(latLng.latitude, latLng.longitude, 1) { listAddress ->
                         if (listAddress.isEmpty()) {
@@ -107,7 +114,13 @@ class LocationRepositoryImpl @Inject constructor(
                 message = context.getString(R.string.error_message_current_address_is_not_found)
             )
 
-            val geo = Geocoder(context, Locale.ENGLISH)
+            val getSystemLocale = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+                context.resources.configuration.locales[0]
+            } else {
+                context.resources.configuration.locale
+            }
+
+            val geo = Geocoder(context, getSystemLocale)
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
                 geo.getFromLocationName(text, 1) { listAddress ->
                     if (listAddress.isEmpty()) {
@@ -135,7 +148,13 @@ class LocationRepositoryImpl @Inject constructor(
                 -1, context.getString(R.string.error_message_address_is_not_found)
             )
 
-            val geo = Geocoder(context, Locale.ENGLISH)
+            val getSystemLocale = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+                context.resources.configuration.locales[0]
+            } else {
+                context.resources.configuration.locale
+            }
+
+            val geo = Geocoder(context, getSystemLocale)
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
                 geo.getFromLocation(latLng.latitude, latLng.longitude, 1) { listAddress ->
                     if (listAddress.isEmpty()) {

app/src/main/java/com/minhdtm/example/weapose/data/repositories/LocationRepositoryImpl.kt

@@ -0,0 +1,15 @@
+package com.minhdtm.example.weapose.presentation.broadcast
+
+import android.content.BroadcastReceiver
+import android.content.Context
+import android.content.Intent
+import androidx.compose.ui.text.intl.Locale
+
+class LocaleChangeBroadcast constructor(
+    private val onChangeLocale: (Locale) -> Unit,
+) : BroadcastReceiver() {
+    override fun onReceive(p0: Context?, p1: Intent?) {
+        val locale = Locale.current
+        onChangeLocale.invoke(locale)
+    }
+}

app/src/main/java/com/minhdtm/example/weapose/presentation/broadcast/LocaleChangeBroadcast.kt

@@ -6,7 +6,6 @@ import com.minhdtm.example.weapose.data.model.Daily
 import com.minhdtm.example.weapose.presentation.utils.Constants
 import com.minhdtm.example.weapose.presentation.utils.toDateTime
 import com.minhdtm.example.weapose.presentation.utils.toIcon
-import com.minhdtm.example.weapose.presentation.utils.toUVIndexAttention
 import javax.inject.Inject
 
 data class DayWeatherViewData(
@@ -17,7 +16,7 @@ data class DayWeatherViewData(
     val minTemp: Double,
     val windSpeed: String,
     val humidity: Int,
-    val uvIndex: String,
+    val uvIndex: Double,
     val sunrise: String,
     val sunset: String,
 ) : ViewData()
@@ -35,7 +34,7 @@ class SevenWeatherViewDataMapper @Inject constructor() : DataModelMapper<Daily,
         val minTemp = model.temp?.min ?: 0.0
         val windSpeed = String.format("%.1f", model.windSpeed?.times(3.6) ?: 0.0)
         val humidity = model.humidity ?: 0
-        val uvIndex = "${model.uvi?.toUVIndexAttention()}, ${model.uvi ?: 0.0}"
+        val uvIndex = model.uvi ?: 0.0
         val sunrise = model.sunrise?.times(1000)?.toDateTime(Constants.DateFormat.HH_mm) ?: ""
         val sunset = model.sunset?.times(1000)?.toDateTime(Constants.DateFormat.HH_mm) ?: ""
 

app/src/main/java/com/minhdtm/example/weapose/presentation/model/DayWeatherViewData.kt

@@ -1,18 +1,22 @@
 package com.minhdtm.example.weapose.presentation.ui
 
 import android.annotation.SuppressLint
+import android.content.Intent
+import android.content.IntentFilter
 import androidx.compose.animation.ExperimentalAnimationApi
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.gestures.detectTapGestures
 import androidx.compose.foundation.isSystemInDarkTheme
 import androidx.compose.foundation.layout.*
 import androidx.compose.material3.*
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.DisposableEffect
 import androidx.compose.runtime.SideEffect
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.input.pointer.pointerInput
+import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalFocusManager
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
@@ -21,6 +25,7 @@ import com.google.accompanist.navigation.animation.AnimatedNavHost
 import com.google.accompanist.systemuicontroller.rememberSystemUiController
 import com.minhdtm.example.weapose.BuildConfig
 import com.minhdtm.example.weapose.R
+import com.minhdtm.example.weapose.presentation.broadcast.LocaleChangeBroadcast
 import com.minhdtm.example.weapose.presentation.component.NavigationDrawerLabel
 
 @SuppressLint("UnusedMaterial3ScaffoldPaddingParameter")
@@ -31,13 +36,24 @@ fun WeatherApp(appState: WeatherAppState = rememberWeatherAppState()) {
     val darkIcons = isSystemInDarkTheme()
 
     val localFocusManager = LocalFocusManager.current
+    val localContext = LocalContext.current
 
     SideEffect {
         if (!appState.isCustomDarkMode) {
             systemUiController.setSystemBarsColor(color = Color.Transparent, darkIcons = !darkIcons)
         }
     }
 
+    DisposableEffect(true) {
+        val broadcast = LocaleChangeBroadcast(appState::onLocaleChange)
+
+        localContext.registerReceiver(broadcast, IntentFilter(Intent.ACTION_LOCALE_CHANGED))
+
+        onDispose {
+            localContext.unregisterReceiver(broadcast)
+        }
+    }
+
     ModalNavigationDrawer(
         drawerState = appState.drawer,
         modifier = Modifier.pointerInput(Unit) {

app/src/main/java/com/minhdtm/example/weapose/presentation/ui/WeatherApp.kt

@@ -13,6 +13,7 @@ import androidx.compose.material3.*
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
+import androidx.compose.ui.text.intl.Locale
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.navigation.*
 import androidx.navigation.compose.currentBackStackEntryAsState
@@ -28,7 +29,10 @@ import com.minhdtm.example.weapose.presentation.ui.settings.Settings
 import com.minhdtm.example.weapose.presentation.ui.sevendaysweather.SevenDaysWeather
 import com.minhdtm.example.weapose.presentation.utils.Constants
 import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.channels.Channel
+import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.receiveAsFlow
 import kotlinx.coroutines.launch
 
 sealed class Screen(val route: String) {
@@ -256,6 +260,9 @@ class WeatherAppState(
             return route in listScreenCustomizeDarkMode
         }
 
+    private val _localeChange = Channel<Locale>()
+    val localChange: Flow<Locale> = _localeChange.receiveAsFlow()
+
     fun currentDestinationIs(route: String): Boolean = controller.currentBackStackEntry?.destination?.route == route
 
     fun <T> getDataFromNextScreen(key: String, defaultValue: T): StateFlow<T>? =
@@ -265,6 +272,12 @@ class WeatherAppState(
         controller.currentBackStackEntry?.savedStateHandle?.remove<T>(key)
     }
 
+    fun onLocaleChange(locale: Locale) {
+        coroutineScope.launch {
+            _localeChange.send(locale)
+        }
+    }
+
     fun openDrawer() {
         coroutineScope.launch {
             drawer.open()
@@ -295,7 +308,6 @@ class WeatherAppState(
             }
             controller.popBackStack(route = popToRoute, inclusive = false)
         }
-
     }
 
     fun navigateToCurrentWeather() {

app/src/main/java/com/minhdtm/example/weapose/presentation/ui/WeatherAppState.kt

@@ -27,6 +27,7 @@ import androidx.compose.ui.layout.LastBaseline
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.tooling.preview.Devices.NEXUS_5
 import androidx.compose.ui.tooling.preview.Devices.PIXEL_4_XL
 import androidx.compose.ui.tooling.preview.Preview
@@ -92,6 +93,13 @@ fun CurrentWeather(
         }
     }
 
+    // Locale change
+    LaunchedEffect(true) {
+        appState.localChange.collectLatest {
+            viewModel.onRefreshCurrentWeather(false)
+        }
+    }
+
     // Get event
     LaunchedEffect(true) {
         viewModel.event.collectLatest { event ->
@@ -339,7 +347,7 @@ fun CurrentWeatherAppBar(
         modifier = modifier,
         title = {
             if (title.isNotBlank()) {
-                Text(text = title)
+                Text(text = title, maxLines = 1, overflow = TextOverflow.Visible)
             }
         },
         navigationIcon = {
@@ -370,6 +378,8 @@ fun CurrentWeatherAppBar(
                     Text(
                         text = city ?: stringResource(id = R.string.unknown_address),
                         style = MaterialTheme.typography.titleLarge,
+                        maxLines = 1,
+                        overflow = TextOverflow.Ellipsis,
                     )
                 }
             }