Skip to content

Commit

Permalink
[fix] rounded corners progress indicator
Browse files Browse the repository at this point in the history
  • Loading branch information
rustamsafarovrs committed Jun 25, 2024
1 parent ec4032a commit 56e1a29
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 7 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ package tj.rsdevteam.inmuslim.config

object BuildVars {

val BUILD_TYPE = BuildType.TEST
val BUILD_TYPE = BuildType.PROD

val BASE_URL: String = when (BUILD_TYPE) {
BuildType.TEST -> {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.StrokeCap
import androidx.compose.ui.unit.dp
import tj.rsdevteam.inmuslim.ui.theme.InmuslimTypography

Expand All @@ -34,11 +35,11 @@ fun PrimaryButton(text: String, onClick: () -> Unit) {
}

@Composable
fun ProgressBar() {
fun ProgressIndicator() {
Box(
modifier = Modifier.fillMaxSize(),
contentAlignment = Alignment.Center
) {
CircularProgressIndicator()
CircularProgressIndicator(strokeCap = StrokeCap.Round)
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ import androidx.hilt.navigation.compose.hiltViewModel
import tj.rsdevteam.inmuslim.R
import tj.rsdevteam.inmuslim.data.models.Timing
import tj.rsdevteam.inmuslim.ui.common.ErrorDialog
import tj.rsdevteam.inmuslim.ui.common.ProgressBar
import tj.rsdevteam.inmuslim.ui.common.ProgressIndicator
import tj.rsdevteam.inmuslim.ui.theme.InmuslimShapes
import tj.rsdevteam.inmuslim.ui.theme.InmuslimTheme
import tj.rsdevteam.inmuslim.ui.theme.InmuslimTypography
Expand Down Expand Up @@ -73,7 +73,7 @@ fun HomeScreen(
) { paddingValues ->
ErrorDialog(viewModel.dialogState.value)
if (viewModel.showLoading.value) {
ProgressBar()
ProgressIndicator()
}
Column(
modifier = Modifier
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import tj.rsdevteam.inmuslim.R
import tj.rsdevteam.inmuslim.data.models.Region
import tj.rsdevteam.inmuslim.ui.common.ErrorDialog
import tj.rsdevteam.inmuslim.ui.common.PrimaryButton
import tj.rsdevteam.inmuslim.ui.common.ProgressBar
import tj.rsdevteam.inmuslim.ui.common.ProgressIndicator
import tj.rsdevteam.inmuslim.ui.theme.InmuslimTypography

/**
Expand Down Expand Up @@ -59,7 +59,7 @@ fun RegionScreen(viewModel: RegionViewModel = hiltViewModel(), onSelected: () ->
ErrorDialog(dialogState = viewModel.dialogState.value)
Column {
if (viewModel.showLoading.value) {
ProgressBar()
ProgressIndicator()
} else {
Spacer(modifier = Modifier.height(30.dp))
Text(
Expand Down

0 comments on commit 56e1a29

Please sign in to comment.