From 2ddbc496d56fd9dfe0245efb9d991014f0ef2666 Mon Sep 17 00:00:00 2001 From: Sad Ellie Date: Wed, 14 Feb 2024 22:02:42 +0300 Subject: [PATCH] Code clean up --- .../com/sadellie/unitto/core/ui/Formatter.kt | 18 --- .../core/ui/common/icons/iconpack/Down.kt | 60 -------- .../core/ui/common/icons/iconpack/Enter.kt | 62 -------- .../core/ui/common/icons/iconpack/Pop.kt | 137 ------------------ .../core/ui/common/icons/iconpack/Swap.kt | 71 --------- .../core/ui/common/icons/iconpack/Unary.kt | 75 ---------- .../core/ui/common/icons/iconpack/Up.kt | 60 -------- .../calculator/components/HistoryList.kt | 3 +- .../feature/converter/components/ChipsRow.kt | 3 +- .../settings/bouncingemoji/BouncingEmoji.kt | 7 +- 10 files changed, 8 insertions(+), 488 deletions(-) delete mode 100644 core/ui/src/main/java/com/sadellie/unitto/core/ui/Formatter.kt delete mode 100644 core/ui/src/main/java/com/sadellie/unitto/core/ui/common/icons/iconpack/Down.kt delete mode 100644 core/ui/src/main/java/com/sadellie/unitto/core/ui/common/icons/iconpack/Enter.kt delete mode 100644 core/ui/src/main/java/com/sadellie/unitto/core/ui/common/icons/iconpack/Pop.kt delete mode 100644 core/ui/src/main/java/com/sadellie/unitto/core/ui/common/icons/iconpack/Swap.kt delete mode 100644 core/ui/src/main/java/com/sadellie/unitto/core/ui/common/icons/iconpack/Unary.kt delete mode 100644 core/ui/src/main/java/com/sadellie/unitto/core/ui/common/icons/iconpack/Up.kt diff --git a/core/ui/src/main/java/com/sadellie/unitto/core/ui/Formatter.kt b/core/ui/src/main/java/com/sadellie/unitto/core/ui/Formatter.kt deleted file mode 100644 index 7ea14dce..00000000 --- a/core/ui/src/main/java/com/sadellie/unitto/core/ui/Formatter.kt +++ /dev/null @@ -1,18 +0,0 @@ -/* - * Unitto is a calculator for Android - * Copyright (c) 2024 Elshan Agaev - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - diff --git a/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/icons/iconpack/Down.kt b/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/icons/iconpack/Down.kt deleted file mode 100644 index 11769bb2..00000000 --- a/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/icons/iconpack/Down.kt +++ /dev/null @@ -1,60 +0,0 @@ -/* - * Unitto is a calculator for Android - * Copyright (c) 2024 Elshan Agaev - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.sadellie.unitto.core.ui.common.icons.iconpack - -import androidx.compose.ui.graphics.Color -import androidx.compose.ui.graphics.PathFillType.Companion.NonZero -import androidx.compose.ui.graphics.SolidColor -import androidx.compose.ui.graphics.StrokeCap.Companion.Butt -import androidx.compose.ui.graphics.StrokeJoin.Companion.Miter -import androidx.compose.ui.graphics.vector.ImageVector -import androidx.compose.ui.graphics.vector.ImageVector.Builder -import androidx.compose.ui.graphics.vector.path -import androidx.compose.ui.unit.dp -import com.sadellie.unitto.core.ui.common.icons.IconPack - -@Suppress("UnusedReceiverParameter") -val IconPack.Down: ImageVector - get() { - if (_down != null) { - return _down!! - } - _down = Builder(name = "Down", defaultWidth = 24.0.dp, defaultHeight = 24.0.dp, - viewportWidth = 24.0f, viewportHeight = 24.0f).apply { - path(fill = SolidColor(Color(0xFF1C1B1F)), stroke = null, strokeLineWidth = 0.0f, - strokeLineCap = Butt, strokeLineJoin = Miter, strokeLineMiter = 4.0f, - pathFillType = NonZero) { - moveTo(11.5453f, 8.5322f) - verticalLineTo(14.0663f) - lineTo(8.9999f, 11.5208f) - lineTo(8.3635f, 12.1686f) - lineTo(11.9999f, 15.8049f) - lineTo(15.6363f, 12.1686f) - lineTo(14.9999f, 11.5208f) - lineTo(12.4544f, 14.0663f) - verticalLineTo(8.5322f) - horizontalLineTo(11.5453f) - close() - } - } - .build() - return _down!! - } - -private var _down: ImageVector? = null diff --git a/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/icons/iconpack/Enter.kt b/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/icons/iconpack/Enter.kt deleted file mode 100644 index 5f39492f..00000000 --- a/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/icons/iconpack/Enter.kt +++ /dev/null @@ -1,62 +0,0 @@ -/* - * Unitto is a calculator for Android - * Copyright (c) 2024 Elshan Agaev - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.sadellie.unitto.core.ui.common.icons.iconpack - -import androidx.compose.ui.graphics.Color -import androidx.compose.ui.graphics.PathFillType.Companion.NonZero -import androidx.compose.ui.graphics.SolidColor -import androidx.compose.ui.graphics.StrokeCap.Companion.Butt -import androidx.compose.ui.graphics.StrokeJoin.Companion.Miter -import androidx.compose.ui.graphics.vector.ImageVector -import androidx.compose.ui.graphics.vector.ImageVector.Builder -import androidx.compose.ui.graphics.vector.path -import androidx.compose.ui.unit.dp -import com.sadellie.unitto.core.ui.common.icons.IconPack - -@Suppress("UnusedReceiverParameter") -val IconPack.Enter: ImageVector - get() { - if (_enter != null) { - return _enter!! - } - _enter = Builder(name = "Enter", defaultWidth = 24.0.dp, defaultHeight = 24.0.dp, - viewportWidth = 24.0f, viewportHeight = 24.0f).apply { - path(fill = SolidColor(Color(0xFF1C1B1F)), stroke = null, strokeLineWidth = 0.0f, - strokeLineCap = Butt, strokeLineJoin = Miter, strokeLineMiter = 4.0f, - pathFillType = NonZero) { - moveTo(15.2085f, 8.5322f) - lineTo(15.2085f, 13.6659f) - lineTo(10.4277f, 13.6659f) - lineTo(11.9679f, 15.1953f) - lineTo(11.3582f, 15.8049f) - lineTo(8.7914f, 13.2381f) - lineTo(11.3689f, 10.6605f) - lineTo(11.9679f, 11.2702f) - lineTo(10.4277f, 12.8103f) - lineTo(14.3529f, 12.8103f) - lineTo(14.3529f, 8.5322f) - lineTo(15.2085f, 8.5322f) - close() - } - } - .build() - return _enter!! - } - -private var _enter: ImageVector? = null diff --git a/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/icons/iconpack/Pop.kt b/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/icons/iconpack/Pop.kt deleted file mode 100644 index 736139f7..00000000 --- a/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/icons/iconpack/Pop.kt +++ /dev/null @@ -1,137 +0,0 @@ -/* - * Unitto is a calculator for Android - * Copyright (c) 2024 Elshan Agaev - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.sadellie.unitto.core.ui.common.icons.iconpack - -import androidx.compose.ui.graphics.Color -import androidx.compose.ui.graphics.PathFillType.Companion.NonZero -import androidx.compose.ui.graphics.SolidColor -import androidx.compose.ui.graphics.StrokeCap.Companion.Butt -import androidx.compose.ui.graphics.StrokeJoin.Companion.Miter -import androidx.compose.ui.graphics.vector.ImageVector -import androidx.compose.ui.graphics.vector.ImageVector.Builder -import androidx.compose.ui.graphics.vector.path -import androidx.compose.ui.unit.dp -import com.sadellie.unitto.core.ui.common.icons.IconPack - -@Suppress("UnusedReceiverParameter") -val IconPack.Pop: ImageVector - get() { - if (_pop != null) { - return _pop!! - } - _pop = Builder(name = "Pop", defaultWidth = 24.0.dp, defaultHeight = 24.0.dp, viewportWidth - = 24.0f, viewportHeight = 24.0f).apply { - path(fill = SolidColor(Color(0xFF000000)), stroke = null, strokeLineWidth = 0.0f, - strokeLineCap = Butt, strokeLineJoin = Miter, strokeLineMiter = 4.0f, - pathFillType = NonZero) { - moveTo(5.2202f, 12.2187f) - curveTo(5.4969f, 12.2187f, 5.7402f, 12.182f, 5.9502f, 12.1087f) - curveTo(6.1636f, 12.0354f, 6.3419f, 11.9337f, 6.4852f, 11.8037f) - curveTo(6.6319f, 11.6704f, 6.7419f, 11.512f, 6.8152f, 11.3287f) - curveTo(6.8886f, 11.1454f, 6.9252f, 10.9437f, 6.9252f, 10.7237f) - curveTo(6.9252f, 10.267f, 6.7836f, 9.9104f, 6.5002f, 9.6537f) - curveTo(6.2202f, 9.397f, 5.7936f, 9.2687f, 5.2202f, 9.2687f) - horizontalLineTo(4.0702f) - verticalLineTo(12.2187f) - horizontalLineTo(5.2202f) - close() - moveTo(5.2202f, 8.5037f) - curveTo(5.6736f, 8.5037f, 6.0669f, 8.557f, 6.4002f, 8.6637f) - curveTo(6.7369f, 8.767f, 7.0152f, 8.9154f, 7.2352f, 9.1087f) - curveTo(7.4552f, 9.302f, 7.6186f, 9.5354f, 7.7252f, 9.8087f) - curveTo(7.8352f, 10.082f, 7.8902f, 10.387f, 7.8902f, 10.7237f) - curveTo(7.8902f, 11.057f, 7.8319f, 11.362f, 7.7152f, 11.6387f) - curveTo(7.5986f, 11.9154f, 7.4269f, 12.1537f, 7.2002f, 12.3537f) - curveTo(6.9769f, 12.5537f, 6.6986f, 12.7104f, 6.3652f, 12.8237f) - curveTo(6.0352f, 12.9337f, 5.6536f, 12.9887f, 5.2202f, 12.9887f) - horizontalLineTo(4.0702f) - verticalLineTo(15.6687f) - horizontalLineTo(3.1052f) - verticalLineTo(8.5037f) - horizontalLineTo(5.2202f) - close() - moveTo(15.5311f, 12.0887f) - curveTo(15.5311f, 12.6254f, 15.4461f, 13.1187f, 15.2761f, 13.5687f) - curveTo(15.1061f, 14.0154f, 14.8661f, 14.4004f, 14.5561f, 14.7237f) - curveTo(14.2461f, 15.047f, 13.8728f, 15.2987f, 13.4361f, 15.4787f) - curveTo(13.0028f, 15.6554f, 12.5228f, 15.7437f, 11.9961f, 15.7437f) - curveTo(11.4694f, 15.7437f, 10.9894f, 15.6554f, 10.5561f, 15.4787f) - curveTo(10.1228f, 15.2987f, 9.7511f, 15.047f, 9.4411f, 14.7237f) - curveTo(9.1311f, 14.4004f, 8.8911f, 14.0154f, 8.7211f, 13.5687f) - curveTo(8.5511f, 13.1187f, 8.4661f, 12.6254f, 8.4661f, 12.0887f) - curveTo(8.4661f, 11.552f, 8.5511f, 11.0604f, 8.7211f, 10.6137f) - curveTo(8.8911f, 10.1637f, 9.1311f, 9.777f, 9.4411f, 9.4537f) - curveTo(9.7511f, 9.127f, 10.1228f, 8.8737f, 10.5561f, 8.6937f) - curveTo(10.9894f, 8.5137f, 11.4694f, 8.4237f, 11.9961f, 8.4237f) - curveTo(12.5228f, 8.4237f, 13.0028f, 8.5137f, 13.4361f, 8.6937f) - curveTo(13.8728f, 8.8737f, 14.2461f, 9.127f, 14.5561f, 9.4537f) - curveTo(14.8661f, 9.777f, 15.1061f, 10.1637f, 15.2761f, 10.6137f) - curveTo(15.4461f, 11.0604f, 15.5311f, 11.552f, 15.5311f, 12.0887f) - close() - moveTo(14.5361f, 12.0887f) - curveTo(14.5361f, 11.6487f, 14.4761f, 11.2537f, 14.3561f, 10.9037f) - curveTo(14.2361f, 10.5537f, 14.0661f, 10.2587f, 13.8461f, 10.0187f) - curveTo(13.6261f, 9.7754f, 13.3594f, 9.5887f, 13.0461f, 9.4587f) - curveTo(12.7328f, 9.3287f, 12.3828f, 9.2637f, 11.9961f, 9.2637f) - curveTo(11.6128f, 9.2637f, 11.2644f, 9.3287f, 10.9511f, 9.4587f) - curveTo(10.6378f, 9.5887f, 10.3694f, 9.7754f, 10.1461f, 10.0187f) - curveTo(9.9261f, 10.2587f, 9.7561f, 10.5537f, 9.6361f, 10.9037f) - curveTo(9.5161f, 11.2537f, 9.4561f, 11.6487f, 9.4561f, 12.0887f) - curveTo(9.4561f, 12.5287f, 9.5161f, 12.9237f, 9.6361f, 13.2737f) - curveTo(9.7561f, 13.6204f, 9.9261f, 13.9154f, 10.1461f, 14.1587f) - curveTo(10.3694f, 14.3987f, 10.6378f, 14.5837f, 10.9511f, 14.7137f) - curveTo(11.2644f, 14.8404f, 11.6128f, 14.9037f, 11.9961f, 14.9037f) - curveTo(12.3828f, 14.9037f, 12.7328f, 14.8404f, 13.0461f, 14.7137f) - curveTo(13.3594f, 14.5837f, 13.6261f, 14.3987f, 13.8461f, 14.1587f) - curveTo(14.0661f, 13.9154f, 14.2361f, 13.6204f, 14.3561f, 13.2737f) - curveTo(14.4761f, 12.9237f, 14.5361f, 12.5287f, 14.5361f, 12.0887f) - close() - moveTo(18.8339f, 12.2187f) - curveTo(19.1106f, 12.2187f, 19.3539f, 12.182f, 19.5639f, 12.1087f) - curveTo(19.7772f, 12.0354f, 19.9556f, 11.9337f, 20.0989f, 11.8037f) - curveTo(20.2456f, 11.6704f, 20.3556f, 11.512f, 20.4289f, 11.3287f) - curveTo(20.5022f, 11.1454f, 20.5389f, 10.9437f, 20.5389f, 10.7237f) - curveTo(20.5389f, 10.267f, 20.3972f, 9.9104f, 20.1139f, 9.6537f) - curveTo(19.8339f, 9.397f, 19.4072f, 9.2687f, 18.8339f, 9.2687f) - horizontalLineTo(17.6839f) - verticalLineTo(12.2187f) - horizontalLineTo(18.8339f) - close() - moveTo(18.8339f, 8.5037f) - curveTo(19.2872f, 8.5037f, 19.6806f, 8.557f, 20.0139f, 8.6637f) - curveTo(20.3506f, 8.767f, 20.6289f, 8.9154f, 20.8489f, 9.1087f) - curveTo(21.0689f, 9.302f, 21.2322f, 9.5354f, 21.3389f, 9.8087f) - curveTo(21.4489f, 10.082f, 21.5039f, 10.387f, 21.5039f, 10.7237f) - curveTo(21.5039f, 11.057f, 21.4456f, 11.362f, 21.3289f, 11.6387f) - curveTo(21.2122f, 11.9154f, 21.0406f, 12.1537f, 20.8139f, 12.3537f) - curveTo(20.5906f, 12.5537f, 20.3122f, 12.7104f, 19.9789f, 12.8237f) - curveTo(19.6489f, 12.9337f, 19.2672f, 12.9887f, 18.8339f, 12.9887f) - horizontalLineTo(17.6839f) - verticalLineTo(15.6687f) - horizontalLineTo(16.7189f) - verticalLineTo(8.5037f) - horizontalLineTo(18.8339f) - close() - } - } - .build() - return _pop!! - } - -private var _pop: ImageVector? = null diff --git a/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/icons/iconpack/Swap.kt b/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/icons/iconpack/Swap.kt deleted file mode 100644 index ed6b9b9f..00000000 --- a/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/icons/iconpack/Swap.kt +++ /dev/null @@ -1,71 +0,0 @@ -/* - * Unitto is a calculator for Android - * Copyright (c) 2024 Elshan Agaev - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.sadellie.unitto.core.ui.common.icons.iconpack - -import androidx.compose.ui.graphics.Color -import androidx.compose.ui.graphics.PathFillType.Companion.NonZero -import androidx.compose.ui.graphics.SolidColor -import androidx.compose.ui.graphics.StrokeCap.Companion.Butt -import androidx.compose.ui.graphics.StrokeJoin.Companion.Miter -import androidx.compose.ui.graphics.vector.ImageVector -import androidx.compose.ui.graphics.vector.ImageVector.Builder -import androidx.compose.ui.graphics.vector.path -import androidx.compose.ui.unit.dp -import com.sadellie.unitto.core.ui.common.icons.IconPack - -@Suppress("UnusedReceiverParameter") -val IconPack.Swap: ImageVector - get() { - if (_swap != null) { - return _swap!! - } - _swap = Builder(name = "Swap", defaultWidth = 24.0.dp, defaultHeight = 24.0.dp, - viewportWidth = 24.0f, viewportHeight = 24.0f).apply { - path(fill = SolidColor(Color(0xFF1C1B1F)), stroke = null, strokeLineWidth = 0.0f, - strokeLineCap = Butt, strokeLineJoin = Miter, strokeLineMiter = 4.0f, - pathFillType = NonZero) { - moveTo(10.5454f, 12.5325f) - verticalLineTo(9.9234f) - lineTo(9.609f, 10.8597f) - lineTo(9.0908f, 10.3507f) - lineTo(10.909f, 8.5325f) - lineTo(12.7272f, 10.3507f) - lineTo(12.209f, 10.8597f) - lineTo(11.2726f, 9.9234f) - verticalLineTo(12.5325f) - horizontalLineTo(10.5454f) - close() - moveTo(13.0908f, 15.8052f) - lineTo(11.2726f, 13.987f) - lineTo(11.7908f, 13.4779f) - lineTo(12.7272f, 14.4143f) - verticalLineTo(11.8052f) - horizontalLineTo(13.4545f) - verticalLineTo(14.4143f) - lineTo(14.3908f, 13.4779f) - lineTo(14.909f, 13.987f) - lineTo(13.0908f, 15.8052f) - close() - } - } - .build() - return _swap!! - } - -private var _swap: ImageVector? = null diff --git a/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/icons/iconpack/Unary.kt b/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/icons/iconpack/Unary.kt deleted file mode 100644 index 4a931c44..00000000 --- a/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/icons/iconpack/Unary.kt +++ /dev/null @@ -1,75 +0,0 @@ -/* - * Unitto is a calculator for Android - * Copyright (c) 2024 Elshan Agaev - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.sadellie.unitto.core.ui.common.icons.iconpack - -import androidx.compose.ui.graphics.Color -import androidx.compose.ui.graphics.PathFillType.Companion.NonZero -import androidx.compose.ui.graphics.SolidColor -import androidx.compose.ui.graphics.StrokeCap.Companion.Butt -import androidx.compose.ui.graphics.StrokeJoin.Companion.Miter -import androidx.compose.ui.graphics.vector.ImageVector -import androidx.compose.ui.graphics.vector.ImageVector.Builder -import androidx.compose.ui.graphics.vector.path -import androidx.compose.ui.unit.dp -import com.sadellie.unitto.core.ui.common.icons.IconPack - -@Suppress("UnusedReceiverParameter") -val IconPack.Unary: ImageVector - get() { - if (_unary != null) { - return _unary!! - } - _unary = Builder(name = "Unary", defaultWidth = 24.0.dp, defaultHeight = 24.0.dp, - viewportWidth = 24.0f, viewportHeight = 24.0f).apply { - path(fill = SolidColor(Color(0xFF000000)), stroke = null, strokeLineWidth = 0.0f, - strokeLineCap = Butt, strokeLineJoin = Miter, strokeLineMiter = 4.0f, - pathFillType = NonZero) { - moveTo(9.0454f, 11.1177f) - horizontalLineTo(14.9545f) - verticalLineTo(11.8933f) - horizontalLineTo(9.0454f) - verticalLineTo(11.1177f) - close() - } - path(fill = SolidColor(Color(0xFF000000)), stroke = null, strokeLineWidth = 0.0f, - strokeLineCap = Butt, strokeLineJoin = Miter, strokeLineMiter = 4.0f, - pathFillType = NonZero) { - moveTo(12.4431f, 8.5325f) - lineTo(12.4431f, 14.4416f) - horizontalLineTo(11.6676f) - lineTo(11.6676f, 8.5325f) - lineTo(12.4431f, 8.5325f) - close() - } - path(fill = SolidColor(Color(0xFF000000)), stroke = null, strokeLineWidth = 0.0f, - strokeLineCap = Butt, strokeLineJoin = Miter, strokeLineMiter = 4.0f, - pathFillType = NonZero) { - moveTo(9.0454f, 15.1234f) - horizontalLineTo(14.9545f) - verticalLineTo(15.8052f) - horizontalLineTo(9.0454f) - verticalLineTo(15.1234f) - close() - } - } - .build() - return _unary!! - } - -private var _unary: ImageVector? = null diff --git a/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/icons/iconpack/Up.kt b/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/icons/iconpack/Up.kt deleted file mode 100644 index e2197970..00000000 --- a/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/icons/iconpack/Up.kt +++ /dev/null @@ -1,60 +0,0 @@ -/* - * Unitto is a calculator for Android - * Copyright (c) 2024 Elshan Agaev - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.sadellie.unitto.core.ui.common.icons.iconpack - -import androidx.compose.ui.graphics.Color -import androidx.compose.ui.graphics.PathFillType.Companion.NonZero -import androidx.compose.ui.graphics.SolidColor -import androidx.compose.ui.graphics.StrokeCap.Companion.Butt -import androidx.compose.ui.graphics.StrokeJoin.Companion.Miter -import androidx.compose.ui.graphics.vector.ImageVector -import androidx.compose.ui.graphics.vector.ImageVector.Builder -import androidx.compose.ui.graphics.vector.path -import androidx.compose.ui.unit.dp -import com.sadellie.unitto.core.ui.common.icons.IconPack - -@Suppress("UnusedReceiverParameter") -val IconPack.Up: ImageVector - get() { - if (_up != null) { - return _up!! - } - _up = Builder(name = "Up", defaultWidth = 24.0.dp, defaultHeight = 24.0.dp, viewportWidth = - 24.0f, viewportHeight = 24.0f).apply { - path(fill = SolidColor(Color(0xFF1C1B1F)), stroke = null, strokeLineWidth = 0.0f, - strokeLineCap = Butt, strokeLineJoin = Miter, strokeLineMiter = 4.0f, - pathFillType = NonZero) { - moveTo(11.5453f, 15.8052f) - verticalLineTo(10.2711f) - lineTo(8.9999f, 12.8166f) - lineTo(8.3635f, 12.1688f) - lineTo(11.9999f, 8.5325f) - lineTo(15.6363f, 12.1688f) - lineTo(14.9999f, 12.8166f) - lineTo(12.4544f, 10.2711f) - verticalLineTo(15.8052f) - horizontalLineTo(11.5453f) - close() - } - } - .build() - return _up!! - } - -private var _up: ImageVector? = null diff --git a/feature/calculator/src/main/java/com/sadellie/unitto/feature/calculator/components/HistoryList.kt b/feature/calculator/src/main/java/com/sadellie/unitto/feature/calculator/components/HistoryList.kt index 39ced770..edfbcb37 100644 --- a/feature/calculator/src/main/java/com/sadellie/unitto/feature/calculator/components/HistoryList.kt +++ b/feature/calculator/src/main/java/com/sadellie/unitto/feature/calculator/components/HistoryList.kt @@ -65,7 +65,8 @@ internal fun HistoryList( showDeleteButtons: Boolean, ) { Crossfade( - targetState = historyItems.isEmpty() + targetState = historyItems.isEmpty(), + label = "History list", ) { emptyList -> if (emptyList) { HistoryListPlaceholder( diff --git a/feature/converter/src/main/java/com/sadellie/unitto/feature/converter/components/ChipsRow.kt b/feature/converter/src/main/java/com/sadellie/unitto/feature/converter/components/ChipsRow.kt index 9b21b646..7f3e4251 100644 --- a/feature/converter/src/main/java/com/sadellie/unitto/feature/converter/components/ChipsRow.kt +++ b/feature/converter/src/main/java/com/sadellie/unitto/feature/converter/components/ChipsRow.kt @@ -74,7 +74,8 @@ internal fun ChipsRow( transitionSpec = { expandVertically(expandFrom = Alignment.Top) { it } + fadeIn() togetherWith shrinkVertically(shrinkTowards = Alignment.Top) { it } + fadeOut() - } + }, + label = "Expand chips row", ) { isExpanded -> FlexRow( modifier = modifier, diff --git a/feature/settings/src/main/java/com/sadellie/unitto/feature/settings/bouncingemoji/BouncingEmoji.kt b/feature/settings/src/main/java/com/sadellie/unitto/feature/settings/bouncingemoji/BouncingEmoji.kt index 4bbb2706..5e0d6817 100644 --- a/feature/settings/src/main/java/com/sadellie/unitto/feature/settings/bouncingemoji/BouncingEmoji.kt +++ b/feature/settings/src/main/java/com/sadellie/unitto/feature/settings/bouncingemoji/BouncingEmoji.kt @@ -110,8 +110,8 @@ private fun BouncingEmojiScreen( var x by rememberSaveable { mutableFloatStateOf((width - ballSizePx) * initialX) } var y by rememberSaveable { mutableFloatStateOf((height - ballSizePx) * initialY) } - val animatedX = animateFloatAsState(x) - val animatedY = animateFloatAsState(y) + val animatedX = animateFloatAsState(x, label = "X position") + val animatedY = animateFloatAsState(y, label = "Y position") var xSpeed by rememberSaveable { mutableFloatStateOf(10f) } var ySpeed by rememberSaveable { mutableFloatStateOf(10f) } @@ -204,7 +204,8 @@ private fun AnimatedText( transitionSpec = { slideInVertically { height -> height } + fadeIn() togetherWith slideOutVertically { height -> -height } + fadeOut() - } + }, + label = "Text animation", ) { Text( text = it,