Skip to content

Commit

Permalink
Merge pull request Kaaveh#189 from hadi-norouzi/feature/market_detail…
Browse files Browse the repository at this point in the history
…_skeleton

Update market detail loading with skeleton animation
  • Loading branch information
Kaaveh authored Nov 13, 2023
2 parents 7cb467d + 192fe72 commit e18d16a
Show file tree
Hide file tree
Showing 2 changed files with 129 additions and 2 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,115 @@
package ir.composenews.marketdetail

import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.shape.CircleShape
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.material3.Divider
import androidx.compose.runtime.Composable
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.clip
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.unit.dp
import ir.composenews.designsystem.component.QuadLineChart
import ir.composenews.designsystem.component.shimmerEffect

@Composable
fun MarketDetailLoadingView() {
Box(modifier = Modifier.fillMaxSize()) {
Column(
modifier = Modifier.fillMaxSize(),
) {
Row(
modifier = Modifier.fillMaxWidth(),
) {
Row(
modifier = Modifier
.padding(16.dp)
.fillMaxWidth(),
horizontalArrangement = Arrangement.spacedBy(8.dp),
verticalAlignment = Alignment.CenterVertically,
) {
Box(
modifier = Modifier
.size(48.dp)
.clip(CircleShape)
.shimmerEffect(),
)
Column(
modifier = Modifier.weight(1F),
) {
Box(
modifier = Modifier
.fillMaxWidth(0.5f)
.clip(RoundedCornerShape(4.dp))
.height(20.dp)
.shimmerEffect(),
)
Spacer(modifier = Modifier.height(16.dp))
Box(
modifier = Modifier
.fillMaxWidth(0.2f)
.clip(RoundedCornerShape(4.dp))
.height(12.dp)
.shimmerEffect(),
)
}
}
}

QuadLineChart(data = listOf())
Row(
modifier = Modifier
.padding(16.dp)
.fillMaxWidth(),
horizontalArrangement = Arrangement.SpaceBetween,
) {
Box(
modifier = Modifier
.fillMaxWidth(0.3f)
.clip(RoundedCornerShape(4.dp))
.height(24.dp)
.shimmerEffect(),
)
}
Divider(color = Color.Gray)
Row(
modifier = Modifier
.padding(16.dp)
.padding(top = 8.dp),
) {
repeat(4) {
Column(
horizontalAlignment = Alignment.CenterHorizontally,
modifier = Modifier.weight(1f),
) {
Box(
modifier = Modifier
.fillMaxWidth(0.6f)
.clip(RoundedCornerShape(4.dp))
.height(20.dp)
.shimmerEffect(),
)
Spacer(modifier = Modifier.height(16.dp))
Box(
modifier = Modifier
.fillMaxWidth(0.3f)
.clip(RoundedCornerShape(4.dp))
.height(16.dp)
.shimmerEffect(),
)
}
}
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,15 @@ import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.rememberScrollState
import androidx.compose.foundation.shape.CircleShape
import androidx.compose.foundation.verticalScroll
import androidx.compose.material3.Divider
import androidx.compose.material3.FloatingActionButton
import androidx.compose.material3.MaterialTheme
Expand Down Expand Up @@ -54,7 +58,12 @@ fun MarketDetailRoute(
}
}

BaseRoute(baseViewModel = viewModel) {
BaseRoute(
baseViewModel = viewModel,
shimmerView = {
MarketDetailLoadingView()
},
) {
MarketDetailScreen(
marketDetailState = state,
onFavoriteClick = {
Expand All @@ -71,7 +80,9 @@ private fun MarketDetailScreen(
) {
Box(modifier = Modifier.fillMaxSize()) {
Column(
modifier = Modifier.fillMaxSize(),
modifier = Modifier
.fillMaxSize()
.verticalScroll(rememberScrollState()),
) {
Row(
modifier = Modifier.fillMaxWidth(),
Expand Down Expand Up @@ -108,6 +119,7 @@ private fun MarketDetailScreen(
QuadLineChart(data = marketDetailState.marketChart.prices)
MarketData()
MarketDetail(marketDetailState)
Spacer(modifier = Modifier.height(80.dp))
}

FloatingActionButton(
Expand Down

0 comments on commit e18d16a

Please sign in to comment.