|
@@ -792,7 +792,7 @@ fun Home(
|
|
|
) {
|
|
|
Column(
|
|
|
modifier = Modifier
|
|
|
- .background(Color.White),
|
|
|
+ .background(MaterialTheme.colorScheme.onBackground),
|
|
|
verticalArrangement = Arrangement.SpaceEvenly,
|
|
|
horizontalAlignment = Alignment.CenterHorizontally
|
|
|
) {
|
|
@@ -804,7 +804,9 @@ fun Home(
|
|
|
)
|
|
|
Text(
|
|
|
text = "Download",
|
|
|
- style = MaterialTheme.typography.customTypography.displayMedium,
|
|
|
+ style = MaterialTheme.typography.customTypography.displayMedium.copy(
|
|
|
+ color = MaterialTheme.colorScheme.onTertiary
|
|
|
+ ),
|
|
|
modifier = Modifier.alpha(0.6F)
|
|
|
)
|
|
|
Row(
|
|
@@ -813,11 +815,15 @@ fun Home(
|
|
|
) {
|
|
|
Text(
|
|
|
text = String.format(Locale.US, "%.2f", StringDown.value),
|
|
|
- style = MaterialTheme.typography.customTypography.displayLarge
|
|
|
+ style = MaterialTheme.typography.customTypography.displayLarge.copy(
|
|
|
+ color = MaterialTheme.colorScheme.primary
|
|
|
+ )
|
|
|
)
|
|
|
Text(
|
|
|
text = " ${StringDownUnit.value}",
|
|
|
- style = MaterialTheme.typography.customTypography2.labelSmall,
|
|
|
+ style = MaterialTheme.typography.customTypography2.labelSmall.copy(
|
|
|
+ color = MaterialTheme.colorScheme.primary
|
|
|
+ ),
|
|
|
modifier = Modifier.alpha(0.5F)
|
|
|
)
|
|
|
}
|
|
@@ -833,19 +839,21 @@ fun Home(
|
|
|
) {
|
|
|
Column(
|
|
|
modifier = Modifier
|
|
|
- .background(Color.White),
|
|
|
+ .background(MaterialTheme.colorScheme.onBackground),
|
|
|
verticalArrangement = Arrangement.SpaceEvenly,
|
|
|
horizontalAlignment = Alignment.CenterHorizontally
|
|
|
) {
|
|
|
Image(
|
|
|
painter = painterResource(id = R.drawable.yellowarrow3x),
|
|
|
- contentDescription = "Green Arrow",
|
|
|
+ contentDescription = "Yellow Arrow",
|
|
|
modifier = Modifier
|
|
|
.size(30.dp)
|
|
|
)
|
|
|
Text(
|
|
|
text = "Upload",
|
|
|
- style = MaterialTheme.typography.customTypography.displayMedium,
|
|
|
+ style = MaterialTheme.typography.customTypography.displayMedium.copy(
|
|
|
+ color = MaterialTheme.colorScheme.onTertiary
|
|
|
+ ),
|
|
|
modifier = Modifier.alpha(0.6F)
|
|
|
)
|
|
|
Row(
|
|
@@ -854,12 +862,15 @@ fun Home(
|
|
|
) {
|
|
|
Text(
|
|
|
text = String.format(Locale.US,"%.2f", StringUp.value),
|
|
|
- style = MaterialTheme.typography.customTypography.displayLarge
|
|
|
-
|
|
|
+ style = MaterialTheme.typography.customTypography.displayLarge.copy(
|
|
|
+ color = MaterialTheme.colorScheme.primary
|
|
|
+ )
|
|
|
)
|
|
|
Text(
|
|
|
text = " ${StringUpUnit.value}",
|
|
|
- style = MaterialTheme.typography.customTypography2.labelSmall,
|
|
|
+ style = MaterialTheme.typography.customTypography2.labelSmall.copy(
|
|
|
+ color = MaterialTheme.colorScheme.primary
|
|
|
+ ),
|
|
|
modifier = Modifier.alpha(0.5F)
|
|
|
)
|
|
|
}
|
|
@@ -867,6 +878,14 @@ fun Home(
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
+
|
|
|
+ Box(
|
|
|
+ modifier = Modifier
|
|
|
+ .padding(top = 10.dp)
|
|
|
+
|
|
|
+ ) {
|
|
|
+
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
}
|