Skip to content

Commit 5f23bf3

Browse files
fix: button arrow fix
1 parent 165d9bd commit 5f23bf3

File tree

2 files changed

+40
-23
lines changed
  • core/src/openedx/org/openedx/core/ui/theme
  • course/src/main/java/org/openedx/course/presentation/ui

2 files changed

+40
-23
lines changed

core/src/openedx/org/openedx/core/ui/theme/Colors.kt

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,25 +16,25 @@ val light_onSurface = Color.Black
1616
val light_onError = Color.White
1717
val light_onWarning = Color.White
1818
val light_onInfo = Color.White
19-
val light_info_variant = Color(0xFF3C68FF)
19+
val light_info_variant = light_primary
2020
val light_text_primary = Color(0xFF212121)
2121
val light_text_primary_variant = Color(0xFF3D4964)
2222
val light_text_primary_light = light_text_primary
2323
val light_text_secondary = Color(0xFFB3B3B3)
2424
val light_text_dark = Color(0xFF19212F)
25-
val light_text_accent = Color(0xFF3C68FF)
25+
val light_text_accent = light_primary
2626
val light_text_warning = Color(0xFF19212F)
2727
val light_text_field_background = Color(0xFFF7F7F8)
2828
val light_text_field_background_variant = Color.White
2929
val light_text_field_border = Color(0xFF97A5BB)
3030
val light_text_field_text = Color(0xFF3D4964)
3131
val light_text_field_hint = Color(0xFF97A5BB)
32-
val light_text_hyper_link = Color(0xFF3C68FF)
32+
val light_text_hyper_link = light_primary
3333

34-
val light_primary_button_background = Color(0xFF3C68FF)
34+
val light_primary_button_background = light_primary
3535
val light_primary_button_border = Color(0xFF97A5BB)
3636
val light_primary_button_text = Color.White
37-
val light_primary_button_bordered_text = Color(0xFF3C68FF)
37+
val light_primary_button_bordered_text = light_primary
3838

3939
val light_secondary_button_background = light_primary_button_background
4040
val light_secondary_button_text = light_primary_button_text
@@ -102,12 +102,12 @@ val dark_text_field_background_variant = Color(0xFF273346)
102102
val dark_text_field_border = Color(0xFF4E5A70)
103103
val dark_text_field_text = Color.White
104104
val dark_text_field_hint = Color(0xFF79889F)
105-
val dark_text_hyper_link = Color(0xFF5478F9)
105+
val dark_text_hyper_link = dark_primary
106106

107-
val dark_primary_button_background = Color(0xFF5478F9)
107+
val dark_primary_button_background = dark_primary
108108
val dark_primary_button_text = Color.White
109109
val dark_primary_button_border = Color(0xFF4E5A70)
110-
val dark_primary_button_bordered_text = Color(0xFF5478F9)
110+
val dark_primary_button_bordered_text = dark_primary
111111

112112
val dark_secondary_button_background = dark_primary_button_background
113113
val dark_secondary_button_text = dark_primary_button_text

course/src/main/java/org/openedx/course/presentation/ui/CourseUI.kt

Lines changed: 32 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ import androidx.compose.material.Snackbar
5151
import androidx.compose.material.Surface
5252
import androidx.compose.material.Text
5353
import androidx.compose.material.icons.Icons
54+
import androidx.compose.material.icons.automirrored.filled.ArrowBack
5455
import androidx.compose.material.icons.automirrored.filled.ArrowForward
5556
import androidx.compose.material.icons.automirrored.filled.KeyboardArrowRight
5657
import androidx.compose.material.icons.filled.Close
@@ -376,7 +377,7 @@ fun NavigationUnitsButtons(
376377
colors = ButtonDefaults.outlinedButtonColors(
377378
backgroundColor = MaterialTheme.appColors.background
378379
),
379-
border = BorderStroke(1.dp, MaterialTheme.appColors.primaryButtonBorder),
380+
border = BorderStroke(1.dp, MaterialTheme.appColors.textAccent),
380381
elevation = null,
381382
shape = MaterialTheme.appShapes.navigationButtonShape,
382383
onClick = onPrevClick,
@@ -385,18 +386,27 @@ fun NavigationUnitsButtons(
385386
verticalAlignment = Alignment.CenterVertically,
386387
horizontalArrangement = Arrangement.Center
387388
) {
389+
if (!isVerticalNavigation) {
390+
Icon(
391+
imageVector = Icons.AutoMirrored.Filled.ArrowBack,
392+
contentDescription = null,
393+
tint = MaterialTheme.appColors.textAccent
394+
)
395+
Spacer(Modifier.width(8.dp))
396+
}
388397
Text(
389398
text = stringResource(R.string.course_navigation_prev),
390-
color = MaterialTheme.appColors.primary,
399+
color = MaterialTheme.appColors.textAccent,
391400
style = MaterialTheme.appTypography.labelLarge
392401
)
393-
Spacer(Modifier.width(8.dp))
394-
Icon(
395-
modifier = Modifier.rotate(if (isVerticalNavigation) 0f else -90f),
396-
painter = painterResource(id = coreR.drawable.core_ic_up),
397-
contentDescription = null,
398-
tint = MaterialTheme.appColors.primary
399-
)
402+
if (isVerticalNavigation) {
403+
Spacer(Modifier.width(8.dp))
404+
Icon(
405+
painter = painterResource(id = coreR.drawable.core_ic_up),
406+
contentDescription = null,
407+
tint = MaterialTheme.appColors.textAccent
408+
)
409+
}
400410
}
401411
}
402412
Spacer(Modifier.width(16.dp))
@@ -422,12 +432,19 @@ fun NavigationUnitsButtons(
422432
style = MaterialTheme.appTypography.labelLarge
423433
)
424434
Spacer(Modifier.width(8.dp))
425-
Icon(
426-
modifier = Modifier.rotate(if (isVerticalNavigation || !hasNextBlock) 0f else -90f),
427-
painter = nextButtonIcon,
428-
contentDescription = null,
429-
tint = MaterialTheme.appColors.primaryButtonText
430-
)
435+
if (isVerticalNavigation || !hasNextBlock) {
436+
Icon(
437+
painter = nextButtonIcon,
438+
contentDescription = null,
439+
tint = MaterialTheme.appColors.primaryButtonText
440+
)
441+
} else {
442+
Icon(
443+
imageVector = Icons.AutoMirrored.Filled.ArrowForward,
444+
contentDescription = null,
445+
tint = MaterialTheme.appColors.primaryButtonText
446+
)
447+
}
431448
}
432449
}
433450
}

0 commit comments

Comments
 (0)