Skip to content

Commit 7f7898f

Browse files
Merge pull request #356 from PermanentOrg/feature/VSP-1577
Implemented checklist completed page + Error page + Refactoring
2 parents 4de192a + 153d679 commit 7f7898f

16 files changed

+550
-277
lines changed

app/src/main/java/org/permanent/permanent/ui/composeComponents/AnimatedSnackbar.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ fun AnimatedSnackbar(
7878
verticalAlignment = Alignment.Top, modifier = Modifier.fillMaxWidth().padding(16.dp)
7979
) {
8080
Image(
81-
painter = painterResource(id = if (isForError) R.drawable.ic_error_cercle else R.drawable.ic_check_circle_green),
81+
painter = painterResource(id = if (isForError) R.drawable.ic_error_circle_full else R.drawable.ic_check_circle_green),
8282
contentDescription = "error",
8383
colorFilter = ColorFilter.tint(
8484
if (isForError) colorResource(id = R.color.error500) else colorResource(

app/src/main/java/org/permanent/permanent/ui/composeComponents/CenteredTextAndIconButton.kt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ import androidx.compose.ui.res.stringResource
2525
import androidx.compose.ui.text.font.Font
2626
import androidx.compose.ui.text.font.FontFamily
2727
import androidx.compose.ui.tooling.preview.Preview
28+
import androidx.compose.ui.unit.Dp
2829
import androidx.compose.ui.unit.TextUnit
2930
import androidx.compose.ui.unit.dp
3031
import androidx.compose.ui.unit.sp
@@ -37,6 +38,7 @@ fun CenteredTextAndIconButton(
3738
fontSize: TextUnit = 16.sp,
3839
icon: Painter? = painterResource(id = R.drawable.ic_arrow_next_rounded_primary),
3940
iconAlignment: ButtonIconAlignment = ButtonIconAlignment.END,
41+
iconSize: Dp = 16.dp,
4042
enabled: Boolean = true,
4143
disabledColor: Color = colorResource(id = R.color.whiteSuperTransparent),
4244
onButtonClick: () -> Unit
@@ -64,7 +66,7 @@ fun CenteredTextAndIconButton(
6466
painter = icon,
6567
colorFilter = ColorFilter.tint(if (buttonColor == ButtonColor.LIGHT) primaryColor else Color.White),
6668
contentDescription = "Back",
67-
modifier = Modifier.size(16.dp)
69+
modifier = Modifier.size(iconSize)
6870
)
6971

7072
Spacer(modifier = Modifier.width(16.dp))
@@ -84,7 +86,7 @@ fun CenteredTextAndIconButton(
8486
painter = icon,
8587
colorFilter = ColorFilter.tint(if (buttonColor == ButtonColor.LIGHT) primaryColor else Color.White),
8688
contentDescription = "Next",
87-
modifier = Modifier.size(16.dp)
89+
modifier = Modifier.size(iconSize)
8890
)
8991
}
9092
}

0 commit comments

Comments
 (0)