Skip to content

Commit 720dff2

Browse files
committed
Move battery icon after status text and increase size
Position battery warning icon after "Reader connected" text. Increase icon size from 16dp to 20dp for better visibility.
1 parent 210585b commit 720dff2

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/home/toolbar/WooPosHomeFloatingToolbar.kt

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -351,14 +351,16 @@ private fun CardReaderStatusButton(
351351
) {
352352
Spacer(modifier = Modifier.width(WooPosSpacing.Medium.value))
353353
Circle(size = 14.dp, color = illustrationColor)
354-
if (state is WooPosCardReaderStatus.Connected) {
355-
BatteryWarningIcon(batteryState = state.batteryState)
356-
}
357354
Spacer(modifier = Modifier.width(WooPosSpacing.XSmall.value))
358355
ReaderStatusText(
359356
modifier = Modifier.animateContentSize(),
360357
title = title,
361358
)
359+
360+
if (state is WooPosCardReaderStatus.Connected) {
361+
BatteryWarningIcon(batteryState = state.batteryState)
362+
}
363+
362364
Spacer(modifier = Modifier.width(WooPosSpacing.Medium.value))
363365
}
364366
}
@@ -395,21 +397,19 @@ private fun BatteryWarningIcon(batteryState: WooPosHomeFloatingToolbarState.Batt
395397
when (batteryState) {
396398
WooPosHomeFloatingToolbarState.BatteryState.NOMINAL -> { }
397399
WooPosHomeFloatingToolbarState.BatteryState.LOW -> {
398-
Spacer(modifier = Modifier.width(WooPosSpacing.XSmall.value))
399400
Icon(
400401
imageVector = ImageVector.vectorResource(R.drawable.ic_woo_pos_battery_low),
401402
contentDescription = stringResource(R.string.woopos_battery_low),
402403
tint = WooPosTheme.colors.alert,
403-
modifier = Modifier.size(16.dp)
404+
modifier = Modifier.size(20.dp)
404405
)
405406
}
406407
WooPosHomeFloatingToolbarState.BatteryState.CRITICAL -> {
407-
Spacer(modifier = Modifier.width(WooPosSpacing.XSmall.value))
408408
Icon(
409409
imageVector = ImageVector.vectorResource(R.drawable.ic_woo_pos_battery_critical),
410410
contentDescription = stringResource(R.string.woopos_battery_critical),
411411
tint = MaterialTheme.colorScheme.error,
412-
modifier = Modifier.size(16.dp)
412+
modifier = Modifier.size(20.dp)
413413
)
414414
}
415415
}

0 commit comments

Comments
 (0)