@@ -160,7 +160,7 @@ fun BoxWithConstraintsScope.AmountModal(
160
160
currency = currency
161
161
)
162
162
163
- Spacer (Modifier .height(56 .dp))
163
+ Spacer (Modifier .height(10 .dp))
164
164
165
165
AmountInput (
166
166
currency = currency,
@@ -322,9 +322,11 @@ fun AmountKeyboard(
322
322
}
323
323
324
324
Row (
325
- modifier = Modifier .fillMaxWidth(),
325
+ modifier = Modifier .fillMaxWidth()
326
+ .padding(start = 16 .dp, end = 16 .dp),
326
327
verticalAlignment = Alignment .CenterVertically ,
327
- horizontalArrangement = Arrangement .Center
328
+ horizontalArrangement = Arrangement .SpaceEvenly
329
+
328
330
) {
329
331
CircleNumberButton (
330
332
forCalculator = forCalculator,
@@ -355,12 +357,13 @@ fun AmountKeyboard(
355
357
}
356
358
}
357
359
358
- Spacer (Modifier .height(16 .dp))
360
+ Spacer (Modifier .height(8 .dp))
359
361
360
362
Row (
361
- modifier = Modifier .fillMaxWidth(),
363
+ modifier = Modifier .fillMaxWidth()
364
+ .padding(start = 16 .dp, end = 16 .dp),
362
365
verticalAlignment = Alignment .CenterVertically ,
363
- horizontalArrangement = Arrangement .Center
366
+ horizontalArrangement = Arrangement .SpaceEvenly
364
367
) {
365
368
CircleNumberButton (
366
369
forCalculator = forCalculator,
@@ -391,12 +394,13 @@ fun AmountKeyboard(
391
394
}
392
395
}
393
396
394
- Spacer (Modifier .height(16 .dp))
397
+ Spacer (Modifier .height(8 .dp))
395
398
396
399
Row (
397
- modifier = Modifier .fillMaxWidth(),
400
+ modifier = Modifier .fillMaxWidth()
401
+ .padding(start = 16 .dp, end = 16 .dp),
398
402
verticalAlignment = Alignment .CenterVertically ,
399
- horizontalArrangement = Arrangement .Center
403
+ horizontalArrangement = Arrangement .SpaceEvenly
400
404
) {
401
405
CircleNumberButton (
402
406
forCalculator = forCalculator,
@@ -405,15 +409,13 @@ fun AmountKeyboard(
405
409
)
406
410
407
411
Spacer (Modifier .width(16 .dp))
408
-
409
412
CircleNumberButton (
410
413
forCalculator = forCalculator,
411
414
value = " 2" ,
412
415
onNumberPressed = onNumberPressed
413
416
)
414
417
415
418
Spacer (Modifier .width(16 .dp))
416
-
417
419
CircleNumberButton (
418
420
forCalculator = forCalculator,
419
421
value = " 3" ,
@@ -422,17 +424,17 @@ fun AmountKeyboard(
422
424
423
425
if (ThirdRowExtra != null ) {
424
426
Spacer (modifier = Modifier .width(16 .dp))
425
-
426
427
ThirdRowExtra .invoke(this )
427
428
}
428
429
}
429
430
430
- Spacer (Modifier .height(16 .dp))
431
+ Spacer (Modifier .height(8 .dp))
431
432
432
433
Row (
433
- modifier = Modifier .fillMaxWidth(),
434
+ modifier = Modifier .fillMaxWidth()
435
+ .padding(start = 16 .dp, end = 16 .dp),
434
436
verticalAlignment = Alignment .CenterVertically ,
435
- horizontalArrangement = Arrangement .Center
437
+ horizontalArrangement = Arrangement .SpaceEvenly
436
438
) {
437
439
KeypadCircleButton (
438
440
text = localDecimalSeparator(),
@@ -457,15 +459,14 @@ fun AmountKeyboard(
457
459
458
460
IvyIcon (
459
461
modifier = circleButtonModifier(onClick = onBackspace)
460
- .padding(all = 16 .dp)
462
+ .padding(all = 24 .dp)
461
463
.testTag(" key_del" ),
462
464
icon = R .drawable.ic_backspace,
463
465
tint = Red
464
466
)
465
467
466
468
if (FourthRowExtra != null ) {
467
469
Spacer (modifier = Modifier .width(16 .dp))
468
-
469
470
FourthRowExtra .invoke(this )
470
471
}
471
472
}
@@ -495,13 +496,13 @@ fun KeypadCircleButton(
495
496
text : String ,
496
497
testTag : String ,
497
498
textColor : Color = UI .colors.pureInverse,
498
- fontSize : TextUnit = 24 .sp,
499
- btnSize : Dp = 64 .dp,
499
+ fontSize : TextUnit = 32 .sp,
500
+ btnSize : Dp = 80 .dp,
500
501
onClick : () -> Unit
501
502
) {
502
503
Text (
503
504
modifier = circleButtonModifier(size = btnSize, onClick = onClick)
504
- .padding(top = 13 .dp)
505
+ .padding(top = 18 .dp)
505
506
.testTag(testTag),
506
507
text = text,
507
508
fontSize = fontSize,
@@ -517,7 +518,7 @@ fun KeypadCircleButton(
517
518
@SuppressLint(" ComposableModifierFactory" , " ModifierFactoryExtensionFunction" )
518
519
@Composable
519
520
private fun circleButtonModifier (
520
- size : Dp = 64 .dp,
521
+ size : Dp = 80 .dp,
521
522
onClick : () -> Unit
522
523
): Modifier {
523
524
return Modifier
0 commit comments