Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ internal fun TransactionsScene(
)
}
) {
if (transactions.isEmpty() && !loading) {
if (transactions.isEmpty()) {
val hasFilters = chainsFilter.isNotEmpty() || typeFilter.isNotEmpty()
val type = if (hasFilters) {
EmptyContentType.SearchActivity { onClearChainsFilter(); onClearTypesFilter() }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ import com.gemwallet.android.cases.nft.NftError
import com.gemwallet.android.ui.R
import com.gemwallet.android.ui.components.empty.EmptyContentType
import com.gemwallet.android.ui.components.empty.EmptyContentView
import com.gemwallet.android.ui.components.progress.CircularProgressIndicator20
import com.gemwallet.android.ui.components.screen.Scene
import com.gemwallet.android.ui.models.actions.CancelAction
import com.gemwallet.android.ui.models.actions.NftAssetIdAction
Expand Down Expand Up @@ -77,16 +76,15 @@ fun NftListScene(
},
onClose = if (cancelAction == null) null else { { cancelAction() } } // TODO: Replace to action in scene
) {
val isRefreshing = isLoading && !items.isEmpty()
PullToRefreshBox(
modifier = Modifier.fillMaxSize(),
isRefreshing = isRefreshing,
isRefreshing = isLoading,
onRefresh = viewModel::refresh,
state = pullToRefreshState,
indicator = {
Indicator( // TODO: Out to view library
modifier = Modifier.align(Alignment.TopCenter),
isRefreshing = isRefreshing,
isRefreshing = isLoading,
state = pullToRefreshState,
containerColor = MaterialTheme.colorScheme.background
)
Expand All @@ -112,14 +110,7 @@ fun NftListScene(
return@PullToRefreshBox
}

if (isLoading && items.isEmpty()) {
Box(modifier = Modifier.fillMaxSize()) {
CircularProgressIndicator20(modifier = Modifier.align(Alignment.Center))
}
return@PullToRefreshBox
}

if (!isLoading && items.isEmpty()) {
if (items.isEmpty()) {
LazyColumn(modifier = Modifier.fillMaxSize()) {
item {
EmptyContentView(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.clip
import androidx.compose.ui.graphics.painter.Painter
import androidx.compose.ui.graphics.vector.ImageVector
import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.text.style.TextAlign
import com.gemwallet.android.ui.theme.largeIconSize
import com.gemwallet.android.ui.theme.listItemIconSize
Expand Down Expand Up @@ -88,6 +89,7 @@ fun EmptyStateView(
} else {
MaterialTheme.typography.bodyMedium
},
fontWeight = FontWeight.Medium,
textAlign = TextAlign.Center,
)

Expand Down