From 35859df762fab830f3df34dcf9aabfaef099a884 Mon Sep 17 00:00:00 2001 From: thunderbiscuit Date: Tue, 11 Jul 2023 15:24:01 -0400 Subject: [PATCH 1/3] UI: Clean up the UI for selected/completed chapters in carousel --- .../ui/chapters/ChaptersRootScreen.kt | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/com/goldenraven/padawanwallet/ui/chapters/ChaptersRootScreen.kt b/app/src/main/java/com/goldenraven/padawanwallet/ui/chapters/ChaptersRootScreen.kt index f85a4317..089cb4e9 100644 --- a/app/src/main/java/com/goldenraven/padawanwallet/ui/chapters/ChaptersRootScreen.kt +++ b/app/src/main/java/com/goldenraven/padawanwallet/ui/chapters/ChaptersRootScreen.kt @@ -15,6 +15,7 @@ import androidx.compose.ui.draw.drawBehind import androidx.compose.ui.geometry.Offset import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.StrokeCap +import androidx.compose.ui.graphics.drawscope.Stroke import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.TextStyle @@ -95,7 +96,7 @@ fun ChapterHomeTitle() { } } -@OptIn(ExperimentalPagerApi::class, ExperimentalMaterial3Api::class) +@OptIn(ExperimentalPagerApi::class) @Composable fun SectionsCarousel( viewModel: ChaptersViewModel @@ -176,12 +177,13 @@ fun SectionsCarousel( @Composable fun LessonCircle(lessonNumber: Int, completed: Boolean, selected: Boolean, selectedChapter: MutableState) { - val completedColor = if (completed) Color(0xffffc847) else Color(0xefffffff) + val completedColor = if (completed) Color(0xffffc847) else Color(0xffababab) Text( text = lessonNumber.toString(), style = TextStyle( - color = completedColor, + // color = completedColor, + color = Color(0xff000000), fontSize = 28.sp, fontWeight = FontWeight.SemiBold, ), @@ -190,11 +192,12 @@ fun LessonCircle(lessonNumber: Int, completed: Boolean, selected: Boolean, selec .drawBehind { drawCircle( color = completedColor, - radius = if (selected) 102f else 86f, + radius = 86f, ) drawCircle( - color = Color(0xff000000), - radius = 64f + color = if (selected) Color(0xff000000) else Color(0x00ffffff), + radius = 88f, + style = Stroke(width = 10f) ) } .clickable { From 3a05da4df8eda2723ea17e620175ab335e47777d Mon Sep 17 00:00:00 2001 From: thunderbiscuit Date: Tue, 11 Jul 2023 15:35:02 -0400 Subject: [PATCH 2/3] UI: Remove diagram in chapter 3 --- .../com/goldenraven/padawanwallet/data/chapters/ChapterData.kt | 1 - 1 file changed, 1 deletion(-) diff --git a/app/src/main/java/com/goldenraven/padawanwallet/data/chapters/ChapterData.kt b/app/src/main/java/com/goldenraven/padawanwallet/data/chapters/ChapterData.kt index ffaf13c6..28135207 100644 --- a/app/src/main/java/com/goldenraven/padawanwallet/data/chapters/ChapterData.kt +++ b/app/src/main/java/com/goldenraven/padawanwallet/data/chapters/ChapterData.kt @@ -83,7 +83,6 @@ val chapter3: List = listOf( ChapterElement(ElementType.TITLE, R.string.C3_title), ChapterElement(ElementType.BODY, R.string.t3_p1), ChapterElement(ElementType.BODY, R.string.t3_p2), - ChapterElement(ElementType.RESOURCE, R.drawable.placeholder_image), ), ) From 1e15d9f6d3d9def3ba2c171fc8c58d31b53ecf33 Mon Sep 17 00:00:00 2001 From: thunderbiscuit Date: Tue, 11 Jul 2023 15:41:09 -0400 Subject: [PATCH 3/3] UI: Remove diagram in chapter 8 --- .../com/goldenraven/padawanwallet/data/chapters/ChapterData.kt | 1 - 1 file changed, 1 deletion(-) diff --git a/app/src/main/java/com/goldenraven/padawanwallet/data/chapters/ChapterData.kt b/app/src/main/java/com/goldenraven/padawanwallet/data/chapters/ChapterData.kt index 28135207..e7fe9fdd 100644 --- a/app/src/main/java/com/goldenraven/padawanwallet/data/chapters/ChapterData.kt +++ b/app/src/main/java/com/goldenraven/padawanwallet/data/chapters/ChapterData.kt @@ -185,7 +185,6 @@ val chapter8: List = listOf( ChapterElement(ElementType.TITLE, R.string.C8_title), ChapterElement(ElementType.BODY, R.string.C8_p1), ChapterElement(ElementType.BODY, R.string.C8_p2), - ChapterElement(ElementType.RESOURCE, R.drawable.placeholder_image), ChapterElement(ElementType.BODY, R.string.C8_p3), ChapterElement(ElementType.BODY, R.string.C8_p4), ChapterElement(ElementType.BODY, R.string.C8_p5),