diff --git a/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/key/unittoicons/Exponent.kt b/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/key/unittoicons/Exponent.kt index 81e47d70..2dea4da7 100644 --- a/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/key/unittoicons/Exponent.kt +++ b/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/key/unittoicons/Exponent.kt @@ -16,31 +16,31 @@ val @receiver:Suppress("UNUSED") UnittoIcons.Exponent: ImageVector if (_exponent != null) { return _exponent!! } - _exponent = Builder(name = "Exponent", defaultWidth = 274.0.dp, defaultHeight = 150.0.dp, - viewportWidth = 274.0f, viewportHeight = 150.0f).apply { + _exponent = Builder(name = "Exponent", defaultWidth = 150.0.dp, defaultHeight = 150.0.dp, + viewportWidth = 150.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(165.667f, 80.456f) - horizontalLineTo(157.347f) - curveTo(156.622f, 80.456f, 155.982f, 80.264f, 155.427f, 79.88f) - curveTo(154.915f, 79.453f, 154.51f, 78.92f, 154.211f, 78.28f) - lineTo(139.491f, 49.928f) - curveTo(138.382f, 47.667f, 137.528f, 45.597f, 136.931f, 43.72f) - curveTo(136.632f, 44.701f, 136.291f, 45.704f, 135.907f, 46.728f) - curveTo(135.523f, 47.752f, 135.096f, 48.819f, 134.627f, 49.928f) - lineTo(120.355f, 78.28f) - curveTo(120.099f, 78.877f, 119.694f, 79.389f, 119.139f, 79.816f) - curveTo(118.584f, 80.243f, 117.88f, 80.456f, 117.027f, 80.456f) - horizontalLineTo(108.323f) - lineTo(133.155f, 33.288f) - horizontalLineTo(140.515f) - lineTo(165.667f, 80.456f) + strokeLineCap = Butt, strokeLineJoin = Miter, strokeLineMiter = 4.0f, + pathFillType = NonZero) { + moveTo(103.667f, 80.456f) + horizontalLineTo(95.347f) + curveTo(94.622f, 80.456f, 93.982f, 80.264f, 93.427f, 79.88f) + curveTo(92.915f, 79.453f, 92.51f, 78.92f, 92.211f, 78.28f) + lineTo(77.491f, 49.928f) + curveTo(76.382f, 47.667f, 75.528f, 45.597f, 74.931f, 43.72f) + curveTo(74.632f, 44.701f, 74.291f, 45.704f, 73.907f, 46.728f) + curveTo(73.523f, 47.752f, 73.096f, 48.819f, 72.627f, 49.928f) + lineTo(58.355f, 78.28f) + curveTo(58.099f, 78.877f, 57.694f, 79.389f, 57.139f, 79.816f) + curveTo(56.584f, 80.243f, 55.88f, 80.456f, 55.027f, 80.456f) + horizontalLineTo(46.323f) + lineTo(71.155f, 33.288f) + horizontalLineTo(78.515f) + lineTo(103.667f, 80.456f) close() } } - .build() + .build() return _exponent!! } -private var _exponent: ImageVector? = null +private var _exponent: ImageVector? = null \ No newline at end of file diff --git a/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/key/unittoicons/ExponentWide.kt b/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/key/unittoicons/ExponentWide.kt new file mode 100644 index 00000000..6a728827 --- /dev/null +++ b/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/key/unittoicons/ExponentWide.kt @@ -0,0 +1,46 @@ +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.ExponentWide: ImageVector + get() { + if (_exponent != null) { + return _exponent!! + } + _exponent = Builder(name = "Exponent", 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(165.667f, 80.456f) + horizontalLineTo(157.347f) + curveTo(156.622f, 80.456f, 155.982f, 80.264f, 155.427f, 79.88f) + curveTo(154.915f, 79.453f, 154.51f, 78.92f, 154.211f, 78.28f) + lineTo(139.491f, 49.928f) + curveTo(138.382f, 47.667f, 137.528f, 45.597f, 136.931f, 43.72f) + curveTo(136.632f, 44.701f, 136.291f, 45.704f, 135.907f, 46.728f) + curveTo(135.523f, 47.752f, 135.096f, 48.819f, 134.627f, 49.928f) + lineTo(120.355f, 78.28f) + curveTo(120.099f, 78.877f, 119.694f, 79.389f, 119.139f, 79.816f) + curveTo(118.584f, 80.243f, 117.88f, 80.456f, 117.027f, 80.456f) + horizontalLineTo(108.323f) + lineTo(133.155f, 33.288f) + horizontalLineTo(140.515f) + lineTo(165.667f, 80.456f) + close() + } + } + .build() + return _exponent!! + } + +private var _exponent: ImageVector? = null diff --git a/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/key/unittoicons/SquareRoot.kt b/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/key/unittoicons/SquareRoot.kt index d2e16745..4f816a3c 100644 --- a/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/key/unittoicons/SquareRoot.kt +++ b/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/key/unittoicons/SquareRoot.kt @@ -16,36 +16,36 @@ val @receiver:Suppress("UNUSED") UnittoIcons.SquareRoot: ImageVector if (_squareRoot != null) { return _squareRoot!! } - _squareRoot = Builder(name = "Squareroot", defaultWidth = 274.0.dp, defaultHeight = - 150.0.dp, viewportWidth = 274.0f, viewportHeight = 150.0f).apply { + _squareRoot = Builder(name = "SquareRoot", defaultWidth = 150.0.dp, defaultHeight = + 150.0.dp, viewportWidth = 150.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(176.106f, 15.432f) - lineTo(140.714f, 125.0f) - horizontalLineTo(131.114f) - lineTo(115.114f, 82.568f) - horizontalLineTo(104.17f) - curveTo(102.975f, 82.568f, 101.93f, 82.227f, 101.034f, 81.544f) - curveTo(100.18f, 80.819f, 99.754f, 79.581f, 99.754f, 77.832f) + strokeLineCap = Butt, strokeLineJoin = Miter, strokeLineMiter = 4.0f, + pathFillType = NonZero) { + moveTo(114.106f, 15.432f) + lineTo(78.714f, 125.0f) + horizontalLineTo(69.114f) + lineTo(53.113f, 82.568f) + horizontalLineTo(42.169f) + curveTo(40.975f, 82.568f, 39.93f, 82.227f, 39.034f, 81.544f) + curveTo(38.18f, 80.819f, 37.754f, 79.581f, 37.754f, 77.832f) verticalLineTo(74.184f) - horizontalLineTo(121.194f) - curveTo(122.175f, 74.184f, 122.964f, 74.419f, 123.562f, 74.888f) - curveTo(124.159f, 75.357f, 124.564f, 75.912f, 124.778f, 76.552f) - lineTo(134.314f, 102.856f) - curveTo(134.783f, 104.264f, 135.146f, 105.672f, 135.402f, 107.08f) - curveTo(135.7f, 108.488f, 135.956f, 109.917f, 136.17f, 111.368f) - curveTo(136.383f, 110.216f, 136.596f, 109.064f, 136.81f, 107.912f) - curveTo(137.066f, 106.717f, 137.364f, 105.501f, 137.706f, 104.264f) - lineTo(165.418f, 17.8f) - curveTo(165.631f, 17.117f, 166.036f, 16.563f, 166.634f, 16.136f) - curveTo(167.231f, 15.667f, 167.935f, 15.432f, 168.746f, 15.432f) - horizontalLineTo(176.106f) + horizontalLineTo(59.194f) + curveTo(60.175f, 74.184f, 60.964f, 74.419f, 61.562f, 74.888f) + curveTo(62.159f, 75.357f, 62.564f, 75.912f, 62.778f, 76.552f) + lineTo(72.313f, 102.856f) + curveTo(72.783f, 104.264f, 73.146f, 105.672f, 73.401f, 107.08f) + curveTo(73.7f, 108.488f, 73.956f, 109.917f, 74.17f, 111.368f) + curveTo(74.383f, 110.216f, 74.596f, 109.064f, 74.81f, 107.912f) + curveTo(75.065f, 106.717f, 75.364f, 105.501f, 75.705f, 104.264f) + lineTo(103.418f, 17.8f) + curveTo(103.631f, 17.117f, 104.036f, 16.563f, 104.634f, 16.136f) + curveTo(105.231f, 15.667f, 105.935f, 15.432f, 106.746f, 15.432f) + horizontalLineTo(114.106f) close() } } - .build() + .build() return _squareRoot!! } -private var _squareRoot: ImageVector? = null +private var _squareRoot: ImageVector? = null \ No newline at end of file diff --git a/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/key/unittoicons/SquareRootWide.kt b/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/key/unittoicons/SquareRootWide.kt new file mode 100644 index 00000000..bd24c3f3 --- /dev/null +++ b/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/key/unittoicons/SquareRootWide.kt @@ -0,0 +1,51 @@ +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.SquareRootWide: ImageVector + get() { + if (_squareRoot != null) { + return _squareRoot!! + } + _squareRoot = Builder(name = "Squareroot", 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(176.106f, 15.432f) + lineTo(140.714f, 125.0f) + horizontalLineTo(131.114f) + lineTo(115.114f, 82.568f) + horizontalLineTo(104.17f) + curveTo(102.975f, 82.568f, 101.93f, 82.227f, 101.034f, 81.544f) + curveTo(100.18f, 80.819f, 99.754f, 79.581f, 99.754f, 77.832f) + verticalLineTo(74.184f) + horizontalLineTo(121.194f) + curveTo(122.175f, 74.184f, 122.964f, 74.419f, 123.562f, 74.888f) + curveTo(124.159f, 75.357f, 124.564f, 75.912f, 124.778f, 76.552f) + lineTo(134.314f, 102.856f) + curveTo(134.783f, 104.264f, 135.146f, 105.672f, 135.402f, 107.08f) + curveTo(135.7f, 108.488f, 135.956f, 109.917f, 136.17f, 111.368f) + curveTo(136.383f, 110.216f, 136.596f, 109.064f, 136.81f, 107.912f) + curveTo(137.066f, 106.717f, 137.364f, 105.501f, 137.706f, 104.264f) + lineTo(165.418f, 17.8f) + curveTo(165.631f, 17.117f, 166.036f, 16.563f, 166.634f, 16.136f) + curveTo(167.231f, 15.667f, 167.935f, 15.432f, 168.746f, 15.432f) + horizontalLineTo(176.106f) + close() + } + } + .build() + return _squareRoot!! + } + +private var _squareRoot: 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 456a9364..37af7526 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 @@ -66,7 +66,7 @@ import com.sadellie.unitto.core.ui.common.key.unittoicons.Dot import com.sadellie.unitto.core.ui.common.key.unittoicons.E import com.sadellie.unitto.core.ui.common.key.unittoicons.Equal import com.sadellie.unitto.core.ui.common.key.unittoicons.Exp -import com.sadellie.unitto.core.ui.common.key.unittoicons.Exponent +import com.sadellie.unitto.core.ui.common.key.unittoicons.ExponentWide import com.sadellie.unitto.core.ui.common.key.unittoicons.Factorial import com.sadellie.unitto.core.ui.common.key.unittoicons.Inv import com.sadellie.unitto.core.ui.common.key.unittoicons.Key0 @@ -91,7 +91,7 @@ import com.sadellie.unitto.core.ui.common.key.unittoicons.Plus 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 -import com.sadellie.unitto.core.ui.common.key.unittoicons.SquareRoot +import com.sadellie.unitto.core.ui.common.key.unittoicons.SquareRootWide import com.sadellie.unitto.core.ui.common.key.unittoicons.Tan import com.sadellie.unitto.feature.calculator.AngleMode @@ -247,9 +247,9 @@ private fun AdditionalButtonsPortrait( ) { Column { Row(horizontalArrangement = Arrangement.spacedBy(2.dp)) { - KeyboardButtonAdditional(modifier, UnittoIcons.SquareRoot, allowVibration) { addSymbol(Token.sqrt) } + KeyboardButtonAdditional(modifier, UnittoIcons.SquareRootWide, allowVibration) { addSymbol(Token.sqrt) } KeyboardButtonAdditional(modifier, UnittoIcons.Pi, allowVibration) { addSymbol(Token.pi) } - KeyboardButtonAdditional(modifier, UnittoIcons.Exponent, allowVibration) { addSymbol(Token.exponent) } + KeyboardButtonAdditional(modifier, UnittoIcons.ExponentWide, allowVibration) { addSymbol(Token.exponent) } KeyboardButtonAdditional(modifier, UnittoIcons.Factorial, allowVibration) { addSymbol(Token.factorial) } } AnimatedVisibility(showAdditional) { @@ -285,7 +285,7 @@ private fun AdditionalButtonsPortraitInverse( Row(horizontalArrangement = Arrangement.spacedBy(2.dp)) { KeyboardButtonAdditional(modifier, UnittoIcons.Modulo, allowVibration) { addSymbol(Token.modulo) } KeyboardButtonAdditional(modifier, UnittoIcons.Pi, allowVibration) { addSymbol(Token.pi) } - KeyboardButtonAdditional(modifier, UnittoIcons.Exponent, allowVibration) { addSymbol(Token.exponent) } + KeyboardButtonAdditional(modifier, UnittoIcons.ExponentWide, allowVibration) { addSymbol(Token.exponent) } KeyboardButtonAdditional(modifier, UnittoIcons.Factorial, allowVibration) { addSymbol(Token.factorial) } } AnimatedVisibility(showAdditional) { @@ -405,8 +405,8 @@ private fun AdditionalButtonsLandscape( } Column(modifier) { - KeyboardButtonAdditional(buttonModifier, UnittoIcons.SquareRoot, allowVibration) { addSymbol(Token.sqrt) } - KeyboardButtonAdditional(buttonModifier, UnittoIcons.Exponent, allowVibration) { addSymbol(Token.exponent) } + KeyboardButtonAdditional(buttonModifier, UnittoIcons.SquareRootWide, allowVibration) { addSymbol(Token.sqrt) } + KeyboardButtonAdditional(buttonModifier, UnittoIcons.ExponentWide, allowVibration) { addSymbol(Token.exponent) } KeyboardButtonAdditional(buttonModifier, UnittoIcons.Cos, allowVibration) { addSymbol(Token.cos) } KeyboardButtonAdditional(buttonModifier, UnittoIcons.Ln, allowVibration) { addSymbol(Token.ln) } } @@ -438,7 +438,7 @@ private fun AdditionalButtonsLandscapeInverse( Column(modifier) { KeyboardButtonAdditional(buttonModifier, UnittoIcons.Modulo, allowVibration) { addSymbol(Token.modulo) } - KeyboardButtonAdditional(buttonModifier, UnittoIcons.Exponent, allowVibration) { addSymbol(Token.exponent) } + KeyboardButtonAdditional(buttonModifier, UnittoIcons.ExponentWide, allowVibration) { addSymbol(Token.exponent) } KeyboardButtonAdditional(buttonModifier, UnittoIcons.ArCos, allowVibration) { addSymbol(Token.arCos) } KeyboardButtonAdditional(buttonModifier, UnittoIcons.Exp, allowVibration) { addSymbol(Token.exp) } }