Merge pull request #9 from developer-kaczmarek/feature/increase_max_count_of_banknotes

developer-kaczmarek · web-flow · commit a49079980d0c · 2022-11-11T21:33:57.000+06:00
Добавлена поддержка пятизначных значений количества купюр
diff --git a/app/build.gradle b/app/build.gradle
@@ -13,8 +13,8 @@ android {
         applicationId "kaczmarek.moneycalculator"
         minSdk min_sdk_version
         targetSdk target_sdk_version
-        versionCode 5
-        versionName "3.0"
+        versionCode 6
+        versionName "3.1"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables {
diff --git a/app/src/main/kotlin/kaczmarek/moneycalculator/calculator/ui/CalculatorUi.kt b/app/src/main/kotlin/kaczmarek/moneycalculator/calculator/ui/CalculatorUi.kt
@@ -1,5 +1,7 @@
 package kaczmarek.moneycalculator.calculator.ui
 
+import AutoResizeText
+import FontSizeRange
 import androidx.compose.foundation.*
 import androidx.compose.foundation.interaction.MutableInteractionSource
 import androidx.compose.foundation.layout.*
@@ -25,6 +27,7 @@ import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
 import kaczmarek.moneycalculator.R
 import kaczmarek.moneycalculator.core.theme.AppTheme
 import kaczmarek.moneycalculator.core.utils.resolve
@@ -140,7 +143,7 @@ fun BanknoteCard(
             } else {
                 BorderStroke(1.dp, MaterialTheme.colors.onBackground)
             },
-            backgroundColor = MaterialTheme.colors.background
+            backgroundColor = MaterialTheme.colors.background,
         ) {
             Column {
                 Text(
@@ -150,50 +153,58 @@ fun BanknoteCard(
                     text = item.name.resolve(),
                     textAlign = TextAlign.Center,
                     style = MaterialTheme.typography.body1,
-                    color = MaterialTheme.colors.onBackground
+                    color = MaterialTheme.colors.onBackground,
                 )
-                Row(modifier = Modifier.fillMaxWidth()) {
-                    Column {
-                        Text(
-                            modifier = Modifier
-                                .background(MaterialTheme.colors.surface)
-                                .padding(vertical = 10.dp)
-                                .padding(start = 10.dp),
-                            text = "шт",
-                            color = MaterialTheme.colors.onSurface,
-                            style = MaterialTheme.typography.body1
-                        )
-                        Text(
-                            modifier = Modifier
-                                .padding(vertical = 10.dp)
-                                .padding(start = 10.dp),
-                            text = "₽",
-                            style = MaterialTheme.typography.body1,
-                            fontWeight = FontWeight.Bold,
-                            color = MaterialTheme.colors.onBackground
-                        )
-                    }
-                    Column {
-                        Text(
-                            modifier = Modifier
-                                .fillMaxWidth()
-                                .background(MaterialTheme.colors.surface)
-                                .padding(10.dp),
-                            text = item.count,
-                            textAlign = TextAlign.End,
-                            style = MaterialTheme.typography.body1
-                        )
-                        Text(
-                            modifier = Modifier
-                                .fillMaxWidth()
-                                .padding(10.dp),
-                            text = item.amount,
-                            textAlign = TextAlign.End,
-                            style = MaterialTheme.typography.body1,
-                            fontWeight = FontWeight.Bold,
-                            color = MaterialTheme.colors.onBackground
-                        )
-                    }
+                Row(
+                    modifier = Modifier
+                        .fillMaxWidth()
+                        .background(MaterialTheme.colors.surface)
+                        .padding(10.dp),
+                    verticalAlignment = Alignment.CenterVertically,
+                ) {
+                    Text(
+                        modifier = Modifier.width(30.dp),
+                        text = "шт",
+                        color = MaterialTheme.colors.onSurface,
+                        style = MaterialTheme.typography.body1,
+                    )
+                    Text(
+                        modifier = Modifier
+                            .fillMaxWidth()
+                            .weight(1.0f),
+                        text = item.count,
+                        textAlign = TextAlign.End,
+                        style = MaterialTheme.typography.body1,
+                    )
+                }
+                Row(
+                    modifier = Modifier
+                        .fillMaxWidth()
+                        .padding(10.dp),
+                    verticalAlignment = Alignment.CenterVertically,
+                ) {
+                    Text(
+                        modifier = Modifier.width(30.dp),
+                        text = "₽",
+                        style = MaterialTheme.typography.body1,
+                        fontWeight = FontWeight.Bold,
+                        color = MaterialTheme.colors.onBackground,
+                    )
+                    AutoResizeText(
+                        modifier = Modifier
+                            .fillMaxWidth()
+                            .weight(1.0f),
+                        text = item.amount,
+                        textAlign = TextAlign.End,
+                        style = MaterialTheme.typography.body1,
+                        fontWeight = FontWeight.Bold,
+                        color = MaterialTheme.colors.onBackground,
+                        fontSizeRange = FontSizeRange(
+                            min = 12.sp,
+                            max = 18.sp,
+                        ),
+                        maxLines = 1,
+                    )
                 }
             }
         }
diff --git a/app/src/main/kotlin/kaczmarek/moneycalculator/calculator/ui/RealCalculatorComponent.kt b/app/src/main/kotlin/kaczmarek/moneycalculator/calculator/ui/RealCalculatorComponent.kt
@@ -82,7 +82,7 @@ class RealCalculatorComponent(
                                         amount = (banknote.denomination * digit.toInt()).toFormattedAmount()
                                     )
                                 }
-                                index == selectedBanknoteIndex && banknote.count.count() < 3 -> {
+                                index == selectedBanknoteIndex && banknote.count.count() < 5 -> {
                                     val digits = banknote.count + digit
                                     it[index] = banknote.copy(
                                         count = digits,
diff --git a/app/src/main/kotlin/kaczmarek/moneycalculator/core/utils/BanknoteUtils.kt b/app/src/main/kotlin/kaczmarek/moneycalculator/core/utils/BanknoteUtils.kt
@@ -3,16 +3,23 @@ package kaczmarek.moneycalculator.core.utils
 import java.text.DecimalFormat
 import java.text.DecimalFormatSymbols
 import java.util.*
+import kotlin.math.floor
 
 fun Double.toFormattedAmount(): String {
     val separator = DecimalFormatSymbols(Locale.getDefault()).apply {
         groupingSeparator = ' '
         decimalSeparator = '.'
     }
-    val decimalFormat = DecimalFormat().apply {
+
+    val currentPattern = if (this.isInteger()) "#.##" else "0.00"
+    val decimalFormat = DecimalFormat(currentPattern).apply {
         isGroupingUsed = true
         groupingSize = 3
         decimalFormatSymbols = separator
     }
     return decimalFormat.format(this)
+}
+
+fun Double.isInteger(): Boolean {
+    return floor(this) == this
 }
diff --git a/app/src/main/kotlin/kaczmarek/moneycalculator/core/widgets/AutoResizeText.kt b/app/src/main/kotlin/kaczmarek/moneycalculator/core/widgets/AutoResizeText.kt
@@ -0,0 +1,92 @@
+import androidx.compose.material.LocalTextStyle
+import androidx.compose.material.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.drawWithContent
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.text.TextStyle
+import androidx.compose.ui.text.font.FontFamily
+import androidx.compose.ui.text.font.FontStyle
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.text.style.TextDecoration
+import androidx.compose.ui.text.style.TextOverflow
+import androidx.compose.ui.unit.TextUnit
+import androidx.compose.ui.unit.sp
+
+@Composable
+fun AutoResizeText(
+    text: String,
+    fontSizeRange: FontSizeRange,
+    modifier: Modifier = Modifier,
+    color: Color = Color.Unspecified,
+    fontStyle: FontStyle? = null,
+    fontWeight: FontWeight? = null,
+    fontFamily: FontFamily? = null,
+    letterSpacing: TextUnit = TextUnit.Unspecified,
+    textDecoration: TextDecoration? = null,
+    textAlign: TextAlign? = null,
+    lineHeight: TextUnit = TextUnit.Unspecified,
+    overflow: TextOverflow = TextOverflow.Clip,
+    softWrap: Boolean = true,
+    maxLines: Int = Int.MAX_VALUE,
+    style: TextStyle = LocalTextStyle.current,
+) {
+    var fontSizeValue by remember { mutableStateOf(fontSizeRange.max.value) }
+    var readyToDraw by remember { mutableStateOf(false) }
+    var changedText by remember { mutableStateOf("") }
+
+    Text(
+        text = text,
+        color = color,
+        maxLines = maxLines,
+        fontStyle = fontStyle,
+        fontWeight = fontWeight,
+        fontFamily = fontFamily,
+        letterSpacing = letterSpacing,
+        textDecoration = textDecoration,
+        textAlign = textAlign,
+        lineHeight = lineHeight,
+        overflow = overflow,
+        softWrap = softWrap,
+        style = style,
+        fontSize = fontSizeValue.sp,
+        onTextLayout = {
+            if (it.hasVisualOverflow) {
+                changedText = text
+                val nextFontSizeValue = fontSizeValue - fontSizeRange.step.value
+                if (nextFontSizeValue <= fontSizeRange.min.value) {
+                    fontSizeValue = fontSizeRange.min.value
+                    readyToDraw = true
+                } else {
+                    fontSizeValue = nextFontSizeValue
+                }
+            } else {
+                if (changedText != text) {
+                    fontSizeValue = fontSizeRange.max.value
+                }
+                readyToDraw = true
+            }
+        },
+        modifier = modifier.drawWithContent { if (readyToDraw) drawContent() }
+    )
+}
+
+data class FontSizeRange(
+    val min: TextUnit,
+    val max: TextUnit,
+    val step: TextUnit = DEFAULT_TEXT_STEP,
+) {
+    init {
+        require(min < max) { "min should be less than max, $this" }
+        require(step.value > 0) { "step should be greater than 0, $this" }
+    }
+
+    companion object {
+        private val DEFAULT_TEXT_STEP = 1.sp
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,7 @@ class RealCalculatorComponent(`
`82`	`82`	`amount = (banknote.denomination * digit.toInt()).toFormattedAmount()`
`83`	`83`	`)`
`84`	`84`	`}`
`85`		`- index == selectedBanknoteIndex && banknote.count.count() < 3 -> {`
	`85`	`+ index == selectedBanknoteIndex && banknote.count.count() < 5 -> {`
`86`	`86`	`val digits = banknote.count + digit`
`87`	`87`	`it[index] = banknote.copy(`
`88`	`88`	`count = digits,`