Merge pull request #6 from timhuang1018/finalize-krop-api

task: display crop frame in different ratios
timhuang1018 · Sep 3, 2024 · 0251827 · 0251827
2 parents 0f81221 + 4e70309
commit 0251827
Show file tree

Hide file tree

Showing 35 changed files with 16 additions and 6 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -12,4 +12,15 @@ kotlin.mpp.enableCInteropCommonization=true
 
 
 #Compose targets '[jscanvas]' are experimental
-org.jetbrains.compose.experimental.jscanvas.enabled=true
+org.jetbrains.compose.experimental.jscanvas.enabled=true
+
+
+mavenCentralUsername=2GhIkQj4
+
+mavenCentralPassword=8fymgzqKQ/xcOjKfjfhY4E5E2t6AQq+RbXnWIueUj6Ys
+
+signing.keyId=BF12EE8C
+
+signing.password=timhuang1018
+
+signing.secretKeyRingFile=/Users/tim/secret_key.gpg
diff --git a/iosApp/iosApp.xcodeproj/project.pbxproj b/iosApp/iosApp.xcodeproj/project.pbxproj
@@ -175,7 +175,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "if [ \"YES\" = \"$OVERRIDE_KOTLIN_BUILD_IDE_SUPPORTED\" ]; then\n  echo \"Skipping Gradle build task invocation due to OVERRIDE_KOTLIN_BUILD_IDE_SUPPORTED environment variable set to \\\"YES\\\"\"\n  exit 0\nfi\ncd \"$SRCROOT/..\"\n./gradlew :composeApp:embedAndSignAppleFrameworkForXcode\n";
+			shellScript = "if [ \"YES\" = \"$OVERRIDE_KOTLIN_BUILD_IDE_SUPPORTED\" ]; then\n  echo \"Skipping Gradle build task invocation due to OVERRIDE_KOTLIN_BUILD_IDE_SUPPORTED environment variable set to \\\"YES\\\"\"\n  exit 0\nfi\ncd \"$SRCROOT/..\"\n./gradlew :sample-multiplatform:embedAndSignAppleFrameworkForXcode\n";
 		};
 /* End PBXShellScriptBuildPhase section */
 
@@ -390,4 +390,4 @@
 /* End XCConfigurationList section */
 	};
 	rootObject = 7555FF73242A565900829871 /* Project object */;
-}
+}
diff --git a/krop-core/build.gradle.kts b/krop-core/build.gradle.kts
@@ -12,7 +12,7 @@ plugins {
 }
 //for publishToMavenLocal, can check ~/.m2 to find build artifacts
 group = "io.keeppro"
-version = "1.0.3"
+version = "1.0.0"
 
 kotlin {
     js(IR) {

diff --git a/krop-core/src/commonMain/kotlin/io/keeppro/Croppable.kt b/krop-core/src/commonMain/kotlin/io/keeppro/Croppable.kt
@@ -2,7 +2,6 @@ package io.keeppro
 
 import androidx.compose.animation.core.animateFloat
 import androidx.compose.animation.core.updateTransition
-import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.background
 import androidx.compose.foundation.border
 import androidx.compose.foundation.gestures.detectTapGestures

diff --git a/composeApp/build.gradle.kts → sample-multiplatform/build.gradle.kts b/composeApp/build.gradle.kts → sample-multiplatform/build.gradle.kts
diff --git a/...seApp/src/androidMain/AndroidManifest.xml → ...tform/src/androidMain/AndroidManifest.xml b/...seApp/src/androidMain/AndroidManifest.xml → ...tform/src/androidMain/AndroidManifest.xml
diff --git a/...in/kotlin/io/keeppro/krop/MainActivity.kt → ...in/kotlin/io/keeppro/krop/MainActivity.kt b/...in/kotlin/io/keeppro/krop/MainActivity.kt → ...in/kotlin/io/keeppro/krop/MainActivity.kt
diff --git a/...n/kotlin/io/keeppro/krop/Utils.android.kt → ...n/kotlin/io/keeppro/krop/Utils.android.kt b/...n/kotlin/io/keeppro/krop/Utils.android.kt → ...n/kotlin/io/keeppro/krop/Utils.android.kt
diff --git a/...s/drawable-v24/ic_launcher_foreground.xml → ...s/drawable-v24/ic_launcher_foreground.xml b/...s/drawable-v24/ic_launcher_foreground.xml → ...s/drawable-v24/ic_launcher_foreground.xml
diff --git a/...n/res/drawable/ic_launcher_background.xml → ...n/res/drawable/ic_launcher_background.xml b/...n/res/drawable/ic_launcher_background.xml → ...n/res/drawable/ic_launcher_background.xml
diff --git a/...ain/res/mipmap-anydpi-v26/ic_launcher.xml → ...ain/res/mipmap-anydpi-v26/ic_launcher.xml b/...ain/res/mipmap-anydpi-v26/ic_launcher.xml → ...ain/res/mipmap-anydpi-v26/ic_launcher.xml
diff --git a/...s/mipmap-anydpi-v26/ic_launcher_round.xml → ...s/mipmap-anydpi-v26/ic_launcher_round.xml b/...s/mipmap-anydpi-v26/ic_launcher_round.xml → ...s/mipmap-anydpi-v26/ic_launcher_round.xml
diff --git a/...droidMain/res/mipmap-hdpi/ic_launcher.png → ...droidMain/res/mipmap-hdpi/ic_launcher.png b/...droidMain/res/mipmap-hdpi/ic_launcher.png → ...droidMain/res/mipmap-hdpi/ic_launcher.png
diff --git a/...ain/res/mipmap-hdpi/ic_launcher_round.png → ...ain/res/mipmap-hdpi/ic_launcher_round.png b/...ain/res/mipmap-hdpi/ic_launcher_round.png → ...ain/res/mipmap-hdpi/ic_launcher_round.png
diff --git a/...droidMain/res/mipmap-mdpi/ic_launcher.png → ...droidMain/res/mipmap-mdpi/ic_launcher.png b/...droidMain/res/mipmap-mdpi/ic_launcher.png → ...droidMain/res/mipmap-mdpi/ic_launcher.png
diff --git a/...ain/res/mipmap-mdpi/ic_launcher_round.png → ...ain/res/mipmap-mdpi/ic_launcher_round.png b/...ain/res/mipmap-mdpi/ic_launcher_round.png → ...ain/res/mipmap-mdpi/ic_launcher_round.png
diff --git a/...roidMain/res/mipmap-xhdpi/ic_launcher.png → ...roidMain/res/mipmap-xhdpi/ic_launcher.png b/...roidMain/res/mipmap-xhdpi/ic_launcher.png → ...roidMain/res/mipmap-xhdpi/ic_launcher.png
diff --git a/...in/res/mipmap-xhdpi/ic_launcher_round.png → ...in/res/mipmap-xhdpi/ic_launcher_round.png b/...in/res/mipmap-xhdpi/ic_launcher_round.png → ...in/res/mipmap-xhdpi/ic_launcher_round.png
diff --git a/...oidMain/res/mipmap-xxhdpi/ic_launcher.png → ...oidMain/res/mipmap-xxhdpi/ic_launcher.png b/...oidMain/res/mipmap-xxhdpi/ic_launcher.png → ...oidMain/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/...n/res/mipmap-xxhdpi/ic_launcher_round.png → ...n/res/mipmap-xxhdpi/ic_launcher_round.png b/...n/res/mipmap-xxhdpi/ic_launcher_round.png → ...n/res/mipmap-xxhdpi/ic_launcher_round.png
diff --git a/...idMain/res/mipmap-xxxhdpi/ic_launcher.png → ...idMain/res/mipmap-xxxhdpi/ic_launcher.png b/...idMain/res/mipmap-xxxhdpi/ic_launcher.png → ...idMain/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/.../res/mipmap-xxxhdpi/ic_launcher_round.png → .../res/mipmap-xxxhdpi/ic_launcher_round.png b/.../res/mipmap-xxxhdpi/ic_launcher_round.png → .../res/mipmap-xxxhdpi/ic_launcher_round.png
diff --git a/...pp/src/androidMain/res/values/strings.xml → ...rm/src/androidMain/res/values/strings.xml b/...pp/src/androidMain/res/values/strings.xml → ...rm/src/androidMain/res/values/strings.xml
diff --git a/...ources/drawable/compose-multiplatform.xml → ...ources/drawable/compose-multiplatform.xml b/...ources/drawable/compose-multiplatform.xml → ...ources/drawable/compose-multiplatform.xml
diff --git a/...ommonMain/kotlin/io/keeppro/krop/Utils.kt → ...ommonMain/kotlin/io/keeppro/krop/Utils.kt b/...ommonMain/kotlin/io/keeppro/krop/Utils.kt → ...ommonMain/kotlin/io/keeppro/krop/Utils.kt
diff --git a/...esktopMain/kotlin/io/keeppro/krop/main.kt → ...esktopMain/kotlin/io/keeppro/krop/main.kt b/...esktopMain/kotlin/io/keeppro/krop/main.kt → ...esktopMain/kotlin/io/keeppro/krop/main.kt
diff --git a/...lin/io/keeppro/krop/MainViewController.kt → ...lin/io/keeppro/krop/MainViewController.kt b/...lin/io/keeppro/krop/MainViewController.kt → ...lin/io/keeppro/krop/MainViewController.kt
diff --git a/composeApp/src/jsMain/resources/index.html → ...iplatform/src/jsMain/resources/index.html b/composeApp/src/jsMain/resources/index.html → ...iplatform/src/jsMain/resources/index.html
diff --git a/composeApp/src/jsMain/resources/styles.css → ...iplatform/src/jsMain/resources/styles.css b/composeApp/src/jsMain/resources/styles.css → ...iplatform/src/jsMain/resources/styles.css
diff --git a/...otlin/io/keeppro/krop/Utils.nonAndroid.kt → ...otlin/io/keeppro/krop/Utils.nonAndroid.kt b/...otlin/io/keeppro/krop/Utils.nonAndroid.kt → ...otlin/io/keeppro/krop/Utils.nonAndroid.kt
diff --git a/...kotlin/io/keeppro/krop/Platform.wasmJs.kt → ...kotlin/io/keeppro/krop/Platform.wasmJs.kt b/...kotlin/io/keeppro/krop/Platform.wasmJs.kt → ...kotlin/io/keeppro/krop/Platform.wasmJs.kt
diff --git a/...wasmJsMain/kotlin/io/keeppro/krop/main.kt → ...wasmJsMain/kotlin/io/keeppro/krop/main.kt b/...wasmJsMain/kotlin/io/keeppro/krop/main.kt → ...wasmJsMain/kotlin/io/keeppro/krop/main.kt
diff --git a/...seApp/src/wasmJsMain/resources/index.html → ...tform/src/wasmJsMain/resources/index.html b/...seApp/src/wasmJsMain/resources/index.html → ...tform/src/wasmJsMain/resources/index.html
diff --git a/...seApp/src/wasmJsMain/resources/styles.css → ...tform/src/wasmJsMain/resources/styles.css b/...seApp/src/wasmJsMain/resources/styles.css → ...tform/src/wasmJsMain/resources/styles.css
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -28,5 +28,5 @@ dependencyResolutionManagement {
     }
 }
 
-include(":composeApp")
+include(":sample-multiplatform")
 include(":krop-core")