diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..9956913 --- /dev/null +++ b/.gitignore @@ -0,0 +1,40 @@ +.gradle +build/ +!gradle/wrapper/gradle-wrapper.jar +!**/src/main/**/build/ +!**/src/test/**/build/ +local.properties + +### IntelliJ IDEA ### +.idea +*.iws +*.iml +*.ipr +out/ +!**/src/main/**/out/ +!**/src/test/**/out/ + +### Eclipse ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache +bin/ +!**/src/main/**/bin/ +!**/src/test/**/bin/ + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ + +### VS Code ### +.vscode/ + +### Mac OS ### +.DS_Store \ No newline at end of file diff --git a/LICENSE.txt b/LICENSE.txt new file mode 100644 index 0000000..ab28faa --- /dev/null +++ b/LICENSE.txt @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) 2024 iamcalledrob + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. \ No newline at end of file diff --git a/README.md b/README.md new file mode 100644 index 0000000..74e50f1 --- /dev/null +++ b/README.md @@ -0,0 +1,38 @@ +# smoothRoundedCornerShape + +## Introduction +Kotlin Multiplatform library that provides `SmoothRoundedCornerShape` -- which works just like `RoundedCornerShape`, +but takes an additional `smoothing` parameter. + +The `smoothing` value approximately maps to Figma's corner smoothing setting as a fraction, for example +`smoothing: 0.6f` is roughly equivalent to Figma's `Corner smoothing: 60%` + + +There is no path/smoothing logic contained in this library, it's just a lightweight binding on top of [androidx.graphics.shapes](https://developer.android.com/reference/kotlin/androidx/graphics/shapes/package-summary) + +## Installation +Add the [jitpack](https://jitpack.io/) repository to your build file: +```kotlin +repositories { + maven { url 'https://jitpack.io' } +} +``` + +Then add as a module dependency: +```kotlin +dependencies { + implementation("com.github.iamcalledrob:smoothRoundedCornerShape:1.0.0") +} +``` + +## Usage +Use in place of `RoundedCornerShape` for example: +```kotlin +val shape = SmoothRoundedCornerShape(smoothing = 0.6f, radius = 10.dp) +Box(Modifier.background(Color.Red, shape = shape).width(128.dp).height(64.dp)) +``` + + +## Notes +Currently only builds desktop (jvm) and android targets, since only those have been tested. Feel free to make a PR for +other platforms. \ No newline at end of file diff --git a/build.gradle.kts b/build.gradle.kts new file mode 100644 index 0000000..48b98fc --- /dev/null +++ b/build.gradle.kts @@ -0,0 +1,50 @@ +plugins { + kotlin("multiplatform") version "1.9.23" + id("org.jetbrains.compose") version "1.6.11" + id("com.android.library") version "8.2.0" + id("maven-publish") +} + +group = "com.github.iamcalledrob" +version = "1.0.0" + +repositories { + mavenCentral() + google() +} + + +kotlin { + jvmToolchain(17) + + jvm("desktop") + + androidTarget { + publishLibraryVariants("release", "debug") + } + + sourceSets { + commonMain { + dependencies { + implementation("androidx.graphics:graphics-shapes:1.0.1") + + implementation(compose.runtime) + implementation(compose.foundation) + implementation(compose.ui) + } + } + } +} + +android { + namespace = "com.github.iamcalledrob.smoothRoundedCornerShape" + compileSdk = 34 +} + +publishing { + publications { + create("maven") { + from(components["kotlin"]) + } + } +} \ No newline at end of file diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 0000000..07673db --- /dev/null +++ b/gradle.properties @@ -0,0 +1,2 @@ +kotlin.code.style=official +android.useAndroidX=true \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..249e583 Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..80fdc2c --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,6 @@ +#Thu Sep 05 13:18:42 BST 2024 +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100644 index 0000000..1b6c787 --- /dev/null +++ b/gradlew @@ -0,0 +1,234 @@ +#!/bin/sh + +# +# Copyright © 2015-2021 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +############################################################################## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# +############################################################################## + +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit + +APP_NAME="Gradle" +APP_BASE_NAME=${0##*/} + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + +# Collect all arguments for the java command; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..107acd3 --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,89 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto execute + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/settings.gradle.kts b/settings.gradle.kts new file mode 100644 index 0000000..7878258 --- /dev/null +++ b/settings.gradle.kts @@ -0,0 +1,14 @@ +rootProject.name = "smooth-rounded-corner-shape" + +pluginManagement { + repositories { + google() + gradlePluginPortal() + mavenCentral() + } +} + +plugins { + id("org.gradle.toolchains.foojay-resolver-convention") version "0.5.0" +} + diff --git a/src/androidMain/kotlin/com/github/iamcalledrob/smoothRoundedCornerShape/RoundedPolygon.toComposePath.android.kt b/src/androidMain/kotlin/com/github/iamcalledrob/smoothRoundedCornerShape/RoundedPolygon.toComposePath.android.kt new file mode 100644 index 0000000..72e2c1f --- /dev/null +++ b/src/androidMain/kotlin/com/github/iamcalledrob/smoothRoundedCornerShape/RoundedPolygon.toComposePath.android.kt @@ -0,0 +1,7 @@ +package com.github.iamcalledrob.smoothRoundedCornerShape + +import androidx.compose.ui.graphics.asComposePath +import androidx.graphics.shapes.RoundedPolygon +import androidx.graphics.shapes.toPath + +actual fun RoundedPolygon.toComposePath() = toPath().asComposePath() \ No newline at end of file diff --git a/src/commonMain/kotlin/com/github/iamcalledrob/smoothRoundedCornerShape/RoundedPolygon.toComposePath.kt b/src/commonMain/kotlin/com/github/iamcalledrob/smoothRoundedCornerShape/RoundedPolygon.toComposePath.kt new file mode 100644 index 0000000..28df35e --- /dev/null +++ b/src/commonMain/kotlin/com/github/iamcalledrob/smoothRoundedCornerShape/RoundedPolygon.toComposePath.kt @@ -0,0 +1,6 @@ +package com.github.iamcalledrob.smoothRoundedCornerShape + +import androidx.compose.ui.graphics.Path +import androidx.graphics.shapes.RoundedPolygon + +expect fun RoundedPolygon.toComposePath(): Path \ No newline at end of file diff --git a/src/commonMain/kotlin/com/github/iamcalledrob/smoothRoundedCornerShape/SmoothRoundedCornerShape.kt b/src/commonMain/kotlin/com/github/iamcalledrob/smoothRoundedCornerShape/SmoothRoundedCornerShape.kt new file mode 100644 index 0000000..cbedc0a --- /dev/null +++ b/src/commonMain/kotlin/com/github/iamcalledrob/smoothRoundedCornerShape/SmoothRoundedCornerShape.kt @@ -0,0 +1,82 @@ +package com.github.iamcalledrob.smoothRoundedCornerShape + +import androidx.compose.foundation.shape.CornerBasedShape +import androidx.compose.foundation.shape.CornerSize +import androidx.compose.ui.geometry.Size +import androidx.compose.ui.graphics.Outline +import androidx.compose.ui.unit.Dp +import androidx.compose.ui.unit.LayoutDirection +import androidx.graphics.shapes.CornerRounding +import androidx.graphics.shapes.RoundedPolygon + +class SmoothRoundedCornerShape( + val smoothing: Float = DefaultSmoothing, + topStart: CornerSize, + topEnd: CornerSize, + bottomEnd: CornerSize, + bottomStart: CornerSize +) : CornerBasedShape( + topStart = topStart, + topEnd = topEnd, + bottomEnd = bottomEnd, + bottomStart = bottomStart, +) { + + constructor(smoothing: Float = DefaultSmoothing, radius: Dp) : this(smoothing, CornerSize(radius)) + constructor(smoothing: Float = DefaultSmoothing, percent: Int) : this(smoothing, CornerSize(percent)) + constructor(smoothing: Float = DefaultSmoothing, corner: CornerSize) : this( + smoothing = smoothing, + topStart = corner, + topEnd = corner, + bottomEnd = corner, + bottomStart = corner + ) + + override fun copy( + topStart: CornerSize, + topEnd: CornerSize, + bottomEnd: CornerSize, + bottomStart: CornerSize + ) = SmoothRoundedCornerShape( + smoothing = smoothing, + topStart = topStart, + topEnd = topEnd, + bottomEnd = bottomEnd, + bottomStart = bottomStart, + ) + + override fun createOutline( + size: Size, + topStart: Float, + topEnd: Float, + bottomEnd: Float, + bottomStart: Float, + layoutDirection: LayoutDirection + ): Outline { + val topLeft = if (layoutDirection == LayoutDirection.Ltr) topStart else topEnd + val topRight = if (layoutDirection == LayoutDirection.Ltr) topEnd else topStart + val bottomLeft = if (layoutDirection == LayoutDirection.Ltr) bottomStart else bottomEnd + val bottomRight = if (layoutDirection == LayoutDirection.Ltr) bottomEnd else bottomStart + + val polygon = RoundedPolygon( + vertices = floatArrayOf( + 0f, 0f, // topLeft + size.width, 0f, // topRight + size.width, size.height, // bottomRight + 0f, size.height // bottomLeft + ), + perVertexRounding = listOf( + CornerRounding(radius = topLeft, smoothing = smoothing), + CornerRounding(radius = topRight, smoothing = smoothing), + CornerRounding(radius = bottomRight, smoothing = smoothing), + CornerRounding(radius = bottomLeft, smoothing = smoothing), + ) + ) + + return Outline.Generic(polygon.toComposePath()) + } +} + +const val DefaultSmoothing = 0.6f + + diff --git a/src/desktopMain/kotlin/com/github/iamcalledrob/smoothRoundedCornerShape/RoundedPolygon.toComposePath.desktop.kt b/src/desktopMain/kotlin/com/github/iamcalledrob/smoothRoundedCornerShape/RoundedPolygon.toComposePath.desktop.kt new file mode 100644 index 0000000..e157021 --- /dev/null +++ b/src/desktopMain/kotlin/com/github/iamcalledrob/smoothRoundedCornerShape/RoundedPolygon.toComposePath.desktop.kt @@ -0,0 +1,30 @@ +package com.github.iamcalledrob.smoothRoundedCornerShape + +import androidx.compose.ui.graphics.Path +import androidx.graphics.shapes.Cubic +import androidx.graphics.shapes.RoundedPolygon + +actual fun RoundedPolygon.toComposePath() = + Path().apply { pathFromCubics(this, cubics) } + + +private fun pathFromCubics(path: Path, cubics: List) { + var first = true + path.rewind() + for (element in cubics) { + val cubic = element + if (first) { + path.moveTo(cubic.anchor0X, cubic.anchor0Y) + first = false + } + path.cubicTo( + cubic.control0X, + cubic.control0Y, + cubic.control1X, + cubic.control1Y, + cubic.anchor1X, + cubic.anchor1Y + ) + } + path.close() +} \ No newline at end of file