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 SelectedTagScreen.kt and SelectedTagViewModel.kt #156

Merged
merged 1 commit into from
Apr 18, 2023
Merged

refactor SelectedTagScreen.kt and SelectedTagViewModel.kt #156

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
11 changes: 5 additions & 6 deletions app/src/main/java/com/jumrukovski/quotescompose/ui/screen/tags/selected/SelectedTagScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ import androidx.compose.ui.unit.dp
import androidx.lifecycle.compose.collectAsStateWithLifecycle
import com.jumrukovski.quotescompose.R
import com.jumrukovski.quotescompose.data.model.middleware.Quote
import com.jumrukovski.quotescompose.navigation.Screen
import com.jumrukovski.quotescompose.ui.common.component.TopBar
import com.jumrukovski.quotescompose.ui.common.component.EmptyDataCard
import com.jumrukovski.quotescompose.ui.common.component.ProgressBar
import com.jumrukovski.quotescompose.ui.common.component.SmallQuoteCard
import com.jumrukovski.quotescompose.ui.common.component.TopBar
import com.jumrukovski.quotescompose.ui.common.state.UIState
import com.jumrukovski.quotescompose.ui.theme.PrimaryBackgroundColor
import com.jumrukovski.quotescompose.ui.theme.QuotesComposeTheme
Expand All @@ -31,7 +31,7 @@ fun SelectedTagScreen(
) {
val tagItems by viewModel.uiState.collectAsStateWithLifecycle()

LaunchedEffect(key1 = Screen.WithArguments.SelectedTag.ARGUMENT_TAG_NAME) {
LaunchedEffect(key1 = tagName) {
viewModel.getQuotesForTag(tagName)
}

Expand All @@ -40,8 +40,7 @@ fun SelectedTagScreen(
topBar = {
TopBar(
title = stringResource(
id = R.string.screen_selected_tag_title,
tagName
id = R.string.screen_selected_tag_title, tagName
),
isBackButtonEnabled = true,
onNavigateBack = onNavigateBack
Expand Down Expand Up @@ -72,7 +71,7 @@ private fun Contents(
is UIState.Loading -> {
ProgressBar()
}
UIState.SuccessWithNoData -> ""
UIState.SuccessWithNoData -> EmptyDataCard(reason = stringResource(id = R.string.no_data))
is UIState.SuccessWithData -> {
LazyColumn(verticalArrangement = Arrangement.spacedBy(16.dp)) {
items(state.data) { quote ->
Expand Down
38 changes: 12 additions & 26 deletions ...c/main/java/com/jumrukovski/quotescompose/ui/screen/tags/selected/SelectedTagViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,22 +2,21 @@ package com.jumrukovski.quotescompose.ui.screen.tags.selected

import androidx.lifecycle.ViewModel
import androidx.lifecycle.viewModelScope
import com.jumrukovski.quotescompose.data.model.dto.QuotesResultsDTO
import com.jumrukovski.quotescompose.data.model.middleware.Quote
import com.jumrukovski.quotescompose.data.repository.RemoteRepository
import com.jumrukovski.quotescompose.data.network.ResponseResult
import com.jumrukovski.quotescompose.domain.usecase.GetQuotesForTagUseCase
import com.jumrukovski.quotescompose.ui.common.state.UIState
import dagger.hilt.android.lifecycle.HiltViewModel
import kotlinx.coroutines.flow.MutableStateFlow
import kotlinx.coroutines.flow.StateFlow
import kotlinx.coroutines.launch
import retrofit2.Response
import javax.inject.Inject

@HiltViewModel
class SelectedTagViewModel @Inject constructor(private val remoteRepository: RemoteRepository) : ViewModel() {
class SelectedTagViewModel @Inject constructor(private val getQuotesForTagUseCase: GetQuotesForTagUseCase) :
ViewModel() {

private val _uiState: MutableStateFlow<UIState<List<Quote>>> =
MutableStateFlow(UIState.Loading)
private val _uiState: MutableStateFlow<UIState<List<Quote>>> = MutableStateFlow(UIState.Loading)
val uiState: StateFlow<UIState<List<Quote>>> = _uiState

private var currentTag = ""
Expand All @@ -34,28 +33,15 @@ class SelectedTagViewModel @Inject constructor(private val remoteRepository: Rem
_uiState.value = UIState.Loading
}

_uiState.value = try {
val response: Response<QuotesResultsDTO> = remoteRepository.getQuotesForTag(tag)
when (response.isSuccessful) {
true -> {
response.body()?.let {
if (it.results.isNullOrEmpty()) {
UIState.SuccessWithNoData
} else {
UIState.SuccessWithData(it.results.map {
Quote(
it._id,
it.content,
it.author
)
})
}
} ?: UIState.SuccessWithNoData
with(getQuotesForTagUseCase(tag)) {
_uiState.value = when (this) {
is ResponseResult.Error -> UIState.Error(code)
is ResponseResult.Exception -> UIState.Exception(exception)
is ResponseResult.Success -> when (data.isEmpty()) {
true -> UIState.SuccessWithNoData
false -> UIState.SuccessWithData(data)
}
false -> UIState.Error(response.code())
}
} catch (e: java.lang.Exception) {
UIState.Exception(e)
}
}
}
Expand Down