Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

refactor UI state hierarchy #98

Draft
wants to merge 1 commit into
base: develop
Choose a base branch
from
Draft

refactor UI state hierarchy #98

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 43 additions & 9 deletions app/src/main/java/com/github/odaridavid/weatherapp/MainViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ class MainViewModel @Inject constructor(
private val logger: Logger
) : ViewModel() {

private val _state = MutableStateFlow(MainViewState())
private val _state: MutableStateFlow<MainViewState> = MutableStateFlow(MainViewState.Loading)
val state: StateFlow<MainViewState> = _state.asStateFlow()

private val _hasAppUpdate = MutableStateFlow(false)
Expand All @@ -27,11 +27,15 @@ class MainViewModel @Inject constructor(
fun processIntent(mainViewIntent: MainViewIntent) {
when (mainViewIntent) {
is MainViewIntent.GrantPermission -> {
setState { copy(isPermissionGranted = mainViewIntent.isGranted) }
setState {
toSuccessState().copy(isPermissionGranted = mainViewIntent.isGranted)
}
}

is MainViewIntent.CheckLocationSettings -> {
setState { copy(isLocationSettingEnabled = mainViewIntent.isEnabled) }
setState {
toSuccessState().copy(isLocationSettingEnabled = mainViewIntent.isEnabled)
}
}

is MainViewIntent.ReceiveLocation -> {
Expand All @@ -42,11 +46,14 @@ class MainViewModel @Inject constructor(
viewModelScope.launch {
settingsRepository.setDefaultLocation(defaultLocation)
}
setState { copy(defaultLocation = defaultLocation) }
setState {
toSuccessState().copy(defaultLocation = defaultLocation)
}
}

is MainViewIntent.LogException -> {
logger.logException(mainViewIntent.throwable)
setState { MainViewState.Error }
}

is MainViewIntent.UpdateApp -> {
Expand All @@ -62,13 +69,40 @@ class MainViewModel @Inject constructor(
_state.emit(stateReducer(state.value))
}
}

// TODO Fix default state on success
private fun MainViewState.toSuccessState(
isPermissionGranted: Boolean = false,
isLocationSettingEnabled: Boolean = false,
defaultLocation: DefaultLocation? = DefaultLocation(longitude = 0.0, latitude = 0.0),
): MainViewState.Success {
return when (this) {
is MainViewState.Success -> this.copy(
isPermissionGranted = if (this.isPermissionGranted != isPermissionGranted) isPermissionGranted else this.isPermissionGranted,
isLocationSettingEnabled = if (this.isLocationSettingEnabled != isLocationSettingEnabled) isLocationSettingEnabled else this.isLocationSettingEnabled,
defaultLocation = defaultLocation
)
is MainViewState.Loading, is MainViewState.Error -> MainViewState.Success(
isPermissionGranted = isPermissionGranted,
isLocationSettingEnabled = isLocationSettingEnabled,
defaultLocation = DefaultLocation(longitude = 0.0, latitude = 0.0)
)
}
}
}

data class MainViewState(
val isPermissionGranted: Boolean = false,
val isLocationSettingEnabled: Boolean = false,
val defaultLocation: DefaultLocation? = DefaultLocation(longitude = 0.0, latitude = 0.0)
)
sealed class MainViewState {

object Loading : MainViewState()
data class Success(
val isPermissionGranted: Boolean,
val isLocationSettingEnabled: Boolean,
val defaultLocation: DefaultLocation? = DefaultLocation(longitude = 0.0, latitude = 0.0)
) : MainViewState()

object Error : MainViewState()

}

sealed class MainViewIntent {

Expand Down
52 changes: 27 additions & 25 deletions app/src/main/java/com/github/odaridavid/weatherapp/ui/MainActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,9 @@ class MainActivity : ComponentActivity() {

WeatherAppTheme {
Surface(
modifier = Modifier.fillMaxSize().safeDrawingPadding(),
modifier = Modifier
.fillMaxSize()
.safeDrawingPadding(),
color = MaterialTheme.colorScheme.background
) {
val state = mainViewModel.state.collectAsState().value
Expand Down Expand Up @@ -131,33 +133,33 @@ class MainActivity : ComponentActivity() {
@SuppressLint("MissingPermission")
@Composable
private fun InitMainScreen(state: MainViewState) {
when {
state.isLocationSettingEnabled && state.isPermissionGranted -> {
fusedLocationProviderClient.lastLocation
.addOnSuccessListener { location: Location? ->
location?.run {
mainViewModel.processIntent(
MainViewIntent.ReceiveLocation(
longitude = location.longitude,
latitude = location.latitude
when (state) {
is MainViewState.Loading -> LoadingScreen()
is MainViewState.Error -> {
// TODO show error screen
}
is MainViewState.Success -> {
if (state.isLocationSettingEnabled && !state.isPermissionGranted) {
RequiresPermissionsScreen()
} else if (!state.isLocationSettingEnabled && !state.isPermissionGranted) {
EnableLocationSettingScreen()
} else {
fusedLocationProviderClient.lastLocation
.addOnSuccessListener { location: Location? ->
location?.run {
mainViewModel.processIntent(
MainViewIntent.ReceiveLocation(
longitude = location.longitude,
latitude = location.latitude
)
)
)
}
}.addOnFailureListener { exception ->
mainViewModel.processIntent(MainViewIntent.LogException(throwable = exception))
}
}.addOnFailureListener { exception ->
mainViewModel.processIntent(MainViewIntent.LogException(throwable = exception))
}
WeatherAppScreensConfig(navController = rememberNavController())
}

state.isLocationSettingEnabled && !state.isPermissionGranted -> {
RequiresPermissionsScreen()
}

!state.isLocationSettingEnabled && !state.isPermissionGranted -> {
EnableLocationSettingScreen()
WeatherAppScreensConfig(navController = rememberNavController())
}
}

else -> LoadingScreen()
}
}

Expand Down
82 changes: 42 additions & 40 deletions app/src/main/java/com/github/odaridavid/weatherapp/ui/home/HomeScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,48 +42,50 @@ fun HomeScreen(
) {
Column(modifier = Modifier.fillMaxSize()) {

LocalContext.current.getCityName(
latitude = state.defaultLocation.latitude,
longitude = state.defaultLocation.longitude
) { address ->
val cityName = address.locality
onCityNameReceived(cityName)
}

HomeTopBar(cityName = state.locationName, onSettingClicked)

if (state.isLoading) {
LoadingScreen()
}

if (state.errorMessageId != null) {
ErrorScreen(state.errorMessageId, onTryAgainClicked)
} else {
state.weather?.current?.let { currentWeather ->
CurrentWeatherWidget(currentWeather = currentWeather)
} ?: run {
EmptySectionWidget(
label = stringResource(id = R.string.home_title_currently),
weatherType = stringResource(id = R.string.home_weather_type_currently)
)
when (state) {
is HomeScreenViewState.Loading -> {
LoadingScreen()
}

state.weather?.hourly?.let { hourlyWeather ->
HourlyWeatherWidget(hourlyWeatherList = hourlyWeather)
} ?: run {
EmptySectionWidget(
label = stringResource(id = R.string.home_today_forecast_title),
weatherType = stringResource(id = R.string.home_weather_type_hourly)
)
is HomeScreenViewState.Error -> {
ErrorScreen(state.errorMessageId, onTryAgainClicked)
}

state.weather?.daily?.let { dailyWeather ->
DailyWeatherWidget(dailyWeatherList = dailyWeather)
} ?: run {
EmptySectionWidget(
label = stringResource(id = R.string.home_weekly_forecast_title),
weatherType = stringResource(id = R.string.home_weather_type_daily)
)
is HomeScreenViewState.Success -> {
LocalContext.current.getCityName(
latitude = state.defaultLocation.latitude,
longitude = state.defaultLocation.longitude
) { address ->
val cityName = address.locality
onCityNameReceived(cityName)
}

HomeTopBar(cityName = state.locationName, onSettingClicked)

state.weather.current?.let { currentWeather ->
CurrentWeatherWidget(currentWeather = currentWeather)
} ?: run {
EmptySectionWidget(
label = stringResource(id = R.string.home_title_currently),
weatherType = stringResource(id = R.string.home_weather_type_currently)
)
}

state.weather.hourly?.let { hourlyWeather ->
HourlyWeatherWidget(hourlyWeatherList = hourlyWeather)
} ?: run {
EmptySectionWidget(
label = stringResource(id = R.string.home_today_forecast_title),
weatherType = stringResource(id = R.string.home_weather_type_hourly)
)
}

state.weather.daily?.let { dailyWeather ->
DailyWeatherWidget(dailyWeatherList = dailyWeather)
} ?: run {
EmptySectionWidget(
label = stringResource(id = R.string.home_weekly_forecast_title),
weatherType = stringResource(id = R.string.home_weather_type_daily)
)
}
}
}
}
Expand Down
78 changes: 53 additions & 25 deletions app/src/main/java/com/github/odaridavid/weatherapp/ui/home/HomeViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ class HomeViewModel @Inject constructor(
private val settingsRepository: SettingsRepository
) : ViewModel() {

private val _state = MutableStateFlow(HomeScreenViewState(isLoading = true))
private val _state = MutableStateFlow(HomeScreenViewState.Loading as HomeScreenViewState)
val state: StateFlow<HomeScreenViewState> = _state.asStateFlow()

init {
Expand All @@ -37,12 +37,14 @@ class HomeViewModel @Inject constructor(
Triple(language, units, defaultLocation)
}.collect { (language, units, defaultLocation) ->
setState {
copy(
toSuccessState(
language = language,
units = units,
defaultLocation = defaultLocation
)
}.also { processIntent(HomeScreenIntent.LoadWeatherData) }
}

processIntent(HomeScreenIntent.LoadWeatherData)
}
}
}
Expand All @@ -52,16 +54,18 @@ class HomeViewModel @Inject constructor(
is HomeScreenIntent.LoadWeatherData -> {
viewModelScope.launch {
val result = weatherRepository.fetchWeatherData(
language = state.value.language.languageValue,
defaultLocation = state.value.defaultLocation,
units = state.value.units.value
language = (state.value as HomeScreenViewState.Success).language.languageValue,
defaultLocation = (state.value as HomeScreenViewState.Success).defaultLocation,
units = (state.value as HomeScreenViewState.Success).units.value
)
processResult(result)
}
}

is HomeScreenIntent.DisplayCityName -> {
setState { copy(locationName = homeScreenIntent.cityName) }
setState {
toSuccessState(locationName = homeScreenIntent.cityName)
}
}
}
}
Expand All @@ -71,20 +75,13 @@ class HomeViewModel @Inject constructor(
is Result.Success -> {
val weatherData = result.data
setState {
copy(
weather = weatherData,
isLoading = false,
errorMessageId = null
)
toSuccessState(weather = weatherData)
}
}

is Result.Error -> {
setState {
copy(
isLoading = false,
errorMessageId = result.errorType.toResourceId()
)
HomeScreenViewState.Error(errorMessageId = result.errorType.toResourceId())
}
}
}
Expand All @@ -95,14 +92,45 @@ class HomeViewModel @Inject constructor(
_state.emit(stateReducer(state.value))
}
}

// TODO Fix dissapeared name on the top bar
private fun HomeScreenViewState.toSuccessState(
weather: Weather? = null,
units: Units = Units.METRIC,
locationName: String = "",
language: SupportedLanguage = SupportedLanguage.ENGLISH,
defaultLocation: DefaultLocation = DefaultLocation(0.0, 0.0),
): HomeScreenViewState.Success {
return when (this) {
is HomeScreenViewState.Success -> this.copy(
units = if (this.units != units) units else this.units,
defaultLocation = if (this.defaultLocation != defaultLocation) defaultLocation else this.defaultLocation,
locationName = if (this.locationName != locationName) locationName else this.locationName,
language = if (this.language != language) language else this.language,
weather = weather ?: this.weather
)

is HomeScreenViewState.Loading, is HomeScreenViewState.Error -> HomeScreenViewState.Success(
units = units,
defaultLocation = defaultLocation,
locationName = locationName,
language = language,
weather = weather ?: Weather(null, null, null)
)
}
}
}

data class HomeScreenViewState(
val units: Units = Units.METRIC,
val defaultLocation: DefaultLocation = DefaultLocation(0.0, 0.0),
val locationName: String = "-",
val language: SupportedLanguage = SupportedLanguage.ENGLISH,
val weather: Weather? = null,
val isLoading: Boolean = false,
@StringRes val errorMessageId: Int? = null
)
sealed class HomeScreenViewState {
data class Success(
val units: Units,
val defaultLocation: DefaultLocation = DefaultLocation(0.0, 0.0),
val locationName: String,
val language: SupportedLanguage,
val weather: Weather
) : HomeScreenViewState()

object Loading : HomeScreenViewState()

data class Error(@StringRes val errorMessageId: Int) : HomeScreenViewState()
}
Loading