Skip to content

Commit 94bada9

Browse files
fixed keypad sizing issue (Ivy-Apps#2771)
* fixed keypad sizing issue * Update AmountModal.kt * Update AmountModal.kt
1 parent f1a2221 commit 94bada9

File tree

1 file changed

+22
-21
lines changed
  • temp-legacy-code/src/main/java/com/ivy/legacy/legacy/ui/theme/modal/edit

1 file changed

+22
-21
lines changed

temp-legacy-code/src/main/java/com/ivy/legacy/legacy/ui/theme/modal/edit/AmountModal.kt

+22-21
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ fun BoxWithConstraintsScope.AmountModal(
160160
currency = currency
161161
)
162162

163-
Spacer(Modifier.height(56.dp))
163+
Spacer(Modifier.height(10.dp))
164164

165165
AmountInput(
166166
currency = currency,
@@ -322,9 +322,11 @@ fun AmountKeyboard(
322322
}
323323

324324
Row(
325-
modifier = Modifier.fillMaxWidth(),
325+
modifier = Modifier.fillMaxWidth()
326+
.padding(start = 16.dp, end = 16.dp),
326327
verticalAlignment = Alignment.CenterVertically,
327-
horizontalArrangement = Arrangement.Center
328+
horizontalArrangement = Arrangement.SpaceEvenly
329+
328330
) {
329331
CircleNumberButton(
330332
forCalculator = forCalculator,
@@ -355,12 +357,13 @@ fun AmountKeyboard(
355357
}
356358
}
357359

358-
Spacer(Modifier.height(16.dp))
360+
Spacer(Modifier.height(8.dp))
359361

360362
Row(
361-
modifier = Modifier.fillMaxWidth(),
363+
modifier = Modifier.fillMaxWidth()
364+
.padding(start = 16.dp, end = 16.dp),
362365
verticalAlignment = Alignment.CenterVertically,
363-
horizontalArrangement = Arrangement.Center
366+
horizontalArrangement = Arrangement.SpaceEvenly
364367
) {
365368
CircleNumberButton(
366369
forCalculator = forCalculator,
@@ -391,12 +394,13 @@ fun AmountKeyboard(
391394
}
392395
}
393396

394-
Spacer(Modifier.height(16.dp))
397+
Spacer(Modifier.height(8.dp))
395398

396399
Row(
397-
modifier = Modifier.fillMaxWidth(),
400+
modifier = Modifier.fillMaxWidth()
401+
.padding(start = 16.dp, end = 16.dp),
398402
verticalAlignment = Alignment.CenterVertically,
399-
horizontalArrangement = Arrangement.Center
403+
horizontalArrangement = Arrangement.SpaceEvenly
400404
) {
401405
CircleNumberButton(
402406
forCalculator = forCalculator,
@@ -405,15 +409,13 @@ fun AmountKeyboard(
405409
)
406410

407411
Spacer(Modifier.width(16.dp))
408-
409412
CircleNumberButton(
410413
forCalculator = forCalculator,
411414
value = "2",
412415
onNumberPressed = onNumberPressed
413416
)
414417

415418
Spacer(Modifier.width(16.dp))
416-
417419
CircleNumberButton(
418420
forCalculator = forCalculator,
419421
value = "3",
@@ -422,17 +424,17 @@ fun AmountKeyboard(
422424

423425
if (ThirdRowExtra != null) {
424426
Spacer(modifier = Modifier.width(16.dp))
425-
426427
ThirdRowExtra.invoke(this)
427428
}
428429
}
429430

430-
Spacer(Modifier.height(16.dp))
431+
Spacer(Modifier.height(8.dp))
431432

432433
Row(
433-
modifier = Modifier.fillMaxWidth(),
434+
modifier = Modifier.fillMaxWidth()
435+
.padding(start = 16.dp, end = 16.dp),
434436
verticalAlignment = Alignment.CenterVertically,
435-
horizontalArrangement = Arrangement.Center
437+
horizontalArrangement = Arrangement.SpaceEvenly
436438
) {
437439
KeypadCircleButton(
438440
text = localDecimalSeparator(),
@@ -457,15 +459,14 @@ fun AmountKeyboard(
457459

458460
IvyIcon(
459461
modifier = circleButtonModifier(onClick = onBackspace)
460-
.padding(all = 16.dp)
462+
.padding(all = 24.dp)
461463
.testTag("key_del"),
462464
icon = R.drawable.ic_backspace,
463465
tint = Red
464466
)
465467

466468
if (FourthRowExtra != null) {
467469
Spacer(modifier = Modifier.width(16.dp))
468-
469470
FourthRowExtra.invoke(this)
470471
}
471472
}
@@ -495,13 +496,13 @@ fun KeypadCircleButton(
495496
text: String,
496497
testTag: String,
497498
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,
500501
onClick: () -> Unit
501502
) {
502503
Text(
503504
modifier = circleButtonModifier(size = btnSize, onClick = onClick)
504-
.padding(top = 13.dp)
505+
.padding(top = 18.dp)
505506
.testTag(testTag),
506507
text = text,
507508
fontSize = fontSize,
@@ -517,7 +518,7 @@ fun KeypadCircleButton(
517518
@SuppressLint("ComposableModifierFactory", "ModifierFactoryExtensionFunction")
518519
@Composable
519520
private fun circleButtonModifier(
520-
size: Dp = 64.dp,
521+
size: Dp = 80.dp,
521522
onClick: () -> Unit
522523
): Modifier {
523524
return Modifier

0 commit comments

Comments
 (0)