diff --git a/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/key/unittoicons/10x.kt b/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/key/unittoicons/10x.kt new file mode 100644 index 00000000..11ed4e61 --- /dev/null +++ b/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/key/unittoicons/10x.kt @@ -0,0 +1,116 @@ +package com.sadellie.unitto.core.ui.common.key.unittoicons + +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.key.UnittoIcons + +val @receiver:Suppress("UNUSED") UnittoIcons.Power10: ImageVector + get() { + if (_power10 != null) { + return _power10!! + } + _power10 = Builder(name = "_10x", defaultWidth = 274.0.dp, defaultHeight = 150.0.dp, + viewportWidth = 274.0f, viewportHeight = 150.0f).apply { + path(fill = SolidColor(Color(0xFF000000)), stroke = null, strokeLineWidth = 0.0f, + strokeLineCap = Butt, strokeLineJoin = Miter, strokeLineMiter = 4.0f, + pathFillType = NonZero) { + moveTo(106.364f, 113.658f) + verticalLineTo(122.634f) + horizontalLineTo(55.676f) + verticalLineTo(113.658f) + horizontalLineTo(75.938f) + verticalLineTo(49.176f) + curveTo(75.938f, 47.24f, 76.004f, 45.282f, 76.136f, 43.302f) + lineTo(59.306f, 57.756f) + curveTo(58.734f, 58.24f, 58.162f, 58.548f, 57.59f, 58.68f) + curveTo(57.018f, 58.768f, 56.49f, 58.768f, 56.006f, 58.68f) + curveTo(55.522f, 58.592f, 55.06f, 58.416f, 54.62f, 58.152f) + curveTo(54.224f, 57.888f, 53.916f, 57.602f, 53.696f, 57.294f) + lineTo(50.0f, 52.212f) + lineTo(78.182f, 27.858f) + horizontalLineTo(87.752f) + verticalLineTo(113.658f) + horizontalLineTo(106.364f) + close() + } + path(fill = SolidColor(Color(0xFF000000)), stroke = null, strokeLineWidth = 0.0f, + strokeLineCap = Butt, strokeLineJoin = Miter, strokeLineMiter = 4.0f, + pathFillType = NonZero) { + moveTo(185.706f, 75.378f) + curveTo(185.706f, 83.65f, 184.804f, 90.822f, 183.0f, 96.894f) + curveTo(181.24f, 102.922f, 178.82f, 107.916f, 175.74f, 111.876f) + curveTo(172.66f, 115.836f, 169.008f, 118.784f, 164.784f, 120.72f) + curveTo(160.604f, 122.656f, 156.116f, 123.624f, 151.32f, 123.624f) + curveTo(146.48f, 123.624f, 141.97f, 122.656f, 137.79f, 120.72f) + curveTo(133.654f, 118.784f, 130.046f, 115.836f, 126.966f, 111.876f) + curveTo(123.886f, 107.916f, 121.466f, 102.922f, 119.706f, 96.894f) + curveTo(117.946f, 90.822f, 117.066f, 83.65f, 117.066f, 75.378f) + curveTo(117.066f, 67.106f, 117.946f, 59.934f, 119.706f, 53.862f) + curveTo(121.466f, 47.79f, 123.886f, 42.774f, 126.966f, 38.814f) + curveTo(130.046f, 34.81f, 133.654f, 31.84f, 137.79f, 29.904f) + curveTo(141.97f, 27.968f, 146.48f, 27.0f, 151.32f, 27.0f) + curveTo(156.116f, 27.0f, 160.604f, 27.968f, 164.784f, 29.904f) + curveTo(169.008f, 31.84f, 172.66f, 34.81f, 175.74f, 38.814f) + curveTo(178.82f, 42.774f, 181.24f, 47.79f, 183.0f, 53.862f) + curveTo(184.804f, 59.934f, 185.706f, 67.106f, 185.706f, 75.378f) + close() + moveTo(173.496f, 75.378f) + curveTo(173.496f, 68.162f, 172.88f, 62.112f, 171.648f, 57.228f) + curveTo(170.46f, 52.3f, 168.832f, 48.34f, 166.764f, 45.348f) + curveTo(164.74f, 42.356f, 162.386f, 40.222f, 159.702f, 38.946f) + curveTo(157.018f, 37.626f, 154.224f, 36.966f, 151.32f, 36.966f) + curveTo(148.416f, 36.966f, 145.622f, 37.626f, 142.938f, 38.946f) + curveTo(140.254f, 40.222f, 137.9f, 42.356f, 135.876f, 45.348f) + curveTo(133.852f, 48.34f, 132.224f, 52.3f, 130.992f, 57.228f) + curveTo(129.804f, 62.112f, 129.21f, 68.162f, 129.21f, 75.378f) + curveTo(129.21f, 82.594f, 129.804f, 88.644f, 130.992f, 93.528f) + curveTo(132.224f, 98.412f, 133.852f, 102.35f, 135.876f, 105.342f) + curveTo(137.9f, 108.334f, 140.254f, 110.49f, 142.938f, 111.81f) + curveTo(145.622f, 113.086f, 148.416f, 113.724f, 151.32f, 113.724f) + curveTo(154.224f, 113.724f, 157.018f, 113.086f, 159.702f, 111.81f) + curveTo(162.386f, 110.49f, 164.74f, 108.334f, 166.764f, 105.342f) + curveTo(168.832f, 102.35f, 170.46f, 98.412f, 171.648f, 93.528f) + curveTo(172.88f, 88.644f, 173.496f, 82.594f, 173.496f, 75.378f) + close() + } + path(fill = SolidColor(Color(0xFF000000)), stroke = null, strokeLineWidth = 0.0f, + strokeLineCap = Butt, strokeLineJoin = Miter, strokeLineMiter = 4.0f, + pathFillType = NonZero) { + moveTo(223.073f, 62.244f) + horizontalLineTo(215.087f) + curveTo(214.471f, 62.244f, 213.965f, 62.09f, 213.569f, 61.782f) + curveTo(213.217f, 61.474f, 212.931f, 61.122f, 212.711f, 60.726f) + lineTo(205.451f, 48.78f) + curveTo(205.231f, 49.66f, 204.967f, 50.408f, 204.659f, 51.024f) + lineTo(198.389f, 60.726f) + curveTo(198.169f, 61.122f, 197.861f, 61.474f, 197.465f, 61.782f) + curveTo(197.113f, 62.09f, 196.651f, 62.244f, 196.079f, 62.244f) + horizontalLineTo(188.621f) + lineTo(200.237f, 44.622f) + lineTo(189.083f, 28.056f) + horizontalLineTo(197.135f) + curveTo(197.751f, 28.056f, 198.191f, 28.144f, 198.455f, 28.32f) + curveTo(198.763f, 28.496f, 199.027f, 28.782f, 199.247f, 29.178f) + lineTo(206.441f, 40.662f) + curveTo(206.573f, 40.222f, 206.705f, 39.804f, 206.837f, 39.408f) + curveTo(206.969f, 39.012f, 207.145f, 38.594f, 207.365f, 38.154f) + lineTo(213.041f, 29.31f) + curveTo(213.437f, 28.474f, 214.075f, 28.056f, 214.955f, 28.056f) + horizontalLineTo(222.611f) + lineTo(211.457f, 44.292f) + lineTo(223.073f, 62.244f) + close() + } + } + .build() + return _power10!! + } + +private var _power10: ImageVector? = null diff --git a/feature/calculator/src/main/java/com/sadellie/unitto/feature/calculator/components/CalculatorKeyboard.kt b/feature/calculator/src/main/java/com/sadellie/unitto/feature/calculator/components/CalculatorKeyboard.kt index 72c0d586..b879496b 100644 --- a/feature/calculator/src/main/java/com/sadellie/unitto/feature/calculator/components/CalculatorKeyboard.kt +++ b/feature/calculator/src/main/java/com/sadellie/unitto/feature/calculator/components/CalculatorKeyboard.kt @@ -96,6 +96,7 @@ import com.sadellie.unitto.core.ui.common.key.unittoicons.Multiply import com.sadellie.unitto.core.ui.common.key.unittoicons.Percent import com.sadellie.unitto.core.ui.common.key.unittoicons.Pi import com.sadellie.unitto.core.ui.common.key.unittoicons.Plus +import com.sadellie.unitto.core.ui.common.key.unittoicons.Power10 import com.sadellie.unitto.core.ui.common.key.unittoicons.Rad import com.sadellie.unitto.core.ui.common.key.unittoicons.RightBracket import com.sadellie.unitto.core.ui.common.key.unittoicons.Sin @@ -458,7 +459,7 @@ private fun AdditionalButtonsPortraitInverse( KeyboardButtonAdditional(modifier, UnittoIcons.Inv, allowVibration) { toggleInvMode() } KeyboardButtonAdditional(modifier, UnittoIcons.E, allowVibration) { addSymbol(Token.Const.e) } KeyboardButtonAdditional(modifier, UnittoIcons.Exp, allowVibration) { addSymbol(Token.Func.expBracket) } - KeyboardButtonAdditional(modifier, UnittoIcons.Log, allowVibration) { addSymbol(Token.Func.logBracket) } + KeyboardButtonAdditional(modifier, UnittoIcons.Power10, allowVibration) { addSymbol(Token.Digit._1 + Token.Digit._0 + Token.Operator.power) } } } } @@ -615,7 +616,7 @@ private fun AdditionalButtonsLandscapeInverse( KeyboardButtonAdditional(buttonModifier, UnittoIcons.Pi, allowVibration) { addSymbol(Token.Const.pi) } KeyboardButtonAdditional(buttonModifier, UnittoIcons.Factorial, allowVibration) { addSymbol(Token.Operator.factorial) } KeyboardButtonAdditional(buttonModifier, UnittoIcons.AcTan, allowVibration) { addSymbol(Token.Func.actanBracket) } - KeyboardButtonAdditional(buttonModifier, UnittoIcons.Log, allowVibration) { addSymbol(Token.Func.logBracket) } + KeyboardButtonAdditional(buttonModifier, UnittoIcons.Power10, allowVibration) { addSymbol(Token.Digit._1 + Token.Digit._0 + Token.Operator.power) } } }