diff --git a/.gitignore b/.gitignore index b4661f0..242ecd5 100644 --- a/.gitignore +++ b/.gitignore @@ -6,105 +6,27 @@ # Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider # Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839 -# User-specific stuff -.idea/**/workspace.xml -.idea/**/tasks.xml -.idea/**/usage.statistics.xml -.idea/**/dictionaries -.idea/**/shelf - -# Generated files -.idea/**/contentModel.xml - -# Sensitive or high-churn files -.idea/**/dataSources/ -.idea/**/dataSources.ids -.idea/**/dataSources.local.xml -.idea/**/sqlDataSources.xml -.idea/**/dynamic.xml -.idea/**/uiDesigner.xml -.idea/**/dbnavigator.xml - -# Gradle -.idea/**/gradle.xml -.idea/**/libraries - -# Gradle and Maven with auto-import -# When using Gradle or Maven with auto-import, you should exclude module files, -# since they will be recreated, and may cause churn. Uncomment if using -# auto-import. -# .idea/artifacts -# .idea/compiler.xml -# .idea/jarRepositories.xml -# .idea/modules.xml -# .idea/*.iml -# .idea/modules -# *.iml -# *.ipr +# Don't track anything in .idea folder +.idea/ # CMake cmake-build-*/ -# Mongo Explorer plugin -.idea/**/mongoSettings.xml - # File-based project format *.iws # IntelliJ out/ -# mpeltonen/sbt-idea plugin -.idea_modules/ - # JIRA plugin atlassian-ide-plugin.xml -# Cursive Clojure plugin -.idea/replstate.xml - # Crashlytics plugin (for Android Studio and IntelliJ) com_crashlytics_export_strings.xml crashlytics.properties crashlytics-build.properties fabric.properties -# Editor-based Rest Client -.idea/httpRequests - -# Android studio 3.1+ serialized cache file -.idea/caches/build_file_checksums.ser - -### Intellij Patch ### -# Comment Reason: https://github.com/joeblau/gitignore.io/issues/186#issuecomment-215987721 - -# *.iml -# modules.xml -# .idea/misc.xml -# *.ipr - -# Sonarlint plugin -# https://plugins.jetbrains.com/plugin/7973-sonarlint -.idea/**/sonarlint/ - -# SonarQube Plugin -# https://plugins.jetbrains.com/plugin/7238-sonarqube-community-plugin -.idea/**/sonarIssues.xml - -# Markdown Navigator plugin -# https://plugins.jetbrains.com/plugin/7896-markdown-navigator-enhanced -.idea/**/markdown-navigator.xml -.idea/**/markdown-navigator-enh.xml -.idea/**/markdown-navigator/ - -# Cache file creation bug -# See https://youtrack.jetbrains.com/issue/JBR-2257 -.idea/$CACHE_FILE$ - -# CodeStream plugin -# https://plugins.jetbrains.com/plugin/12206-codestream -.idea/codestream.xml - ### Kotlin ### # Compiled class file *.class @@ -152,3 +74,5 @@ gradle-app.setting # End of https://www.toptal.com/developers/gitignore/api/kotlin,intellij,gradle build gpm.json +/kotlin-js-store/ +/.kotlin/ diff --git a/.idea/.gitignore b/.idea/.gitignore deleted file mode 100644 index 26d3352..0000000 --- a/.idea/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -# Default ignored files -/shelf/ -/workspace.xml diff --git a/.idea/compiler.xml b/.idea/compiler.xml deleted file mode 100644 index ac216bc..0000000 --- a/.idea/compiler.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml deleted file mode 100644 index 422f989..0000000 --- a/.idea/inspectionProfiles/Project_Default.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - \ No newline at end of file diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml deleted file mode 100644 index e68360d..0000000 --- a/.idea/jarRepositories.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml deleted file mode 100644 index 1b578d5..0000000 --- a/.idea/misc.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml deleted file mode 100644 index 797acea..0000000 --- a/.idea/runConfigurations.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml deleted file mode 100644 index 94a25f7..0000000 --- a/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/build.gradle.kts b/build.gradle.kts index 1fff0be..abdce86 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,35 +1,52 @@ -import org.jetbrains.compose.compose +@file:OptIn(ExperimentalWasmDsl::class) + import org.jetbrains.compose.desktop.application.dsl.TargetFormat -import org.jetbrains.kotlin.gradle.tasks.KotlinCompile +import org.jetbrains.kotlin.gradle.ExperimentalWasmDsl +import org.jetbrains.kotlin.gradle.plugin.mpp.apple.XCFramework plugins { - kotlin("jvm") version "1.5.21" - id("org.jetbrains.compose") version "0.5.0-build270" + alias(libs.plugins.kotlinMultiplatform) + alias(libs.plugins.composeMultiplatform) + alias(libs.plugins.composeCompiler) } group = "com.theapache64" version = "1.0.1" -repositories { - jcenter() - mavenCentral() - maven { url = uri("https://maven.pkg.jetbrains.space/public/p/compose/dev") } -} +kotlin { + val xcf = XCFramework() + val targets = listOf(macosX64(), macosArm64()) + targets.forEach { target -> + target.binaries.framework { + isStatic = true + xcf.add(this) + } + target.binaries.executable { + entryPoint = "com.theapache64.klokk.main" + } + } -dependencies { - testImplementation(kotlin("test-junit5")) - testImplementation("org.junit.jupiter:junit-jupiter-api:5.6.0") - testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.6.0") - implementation(compose.desktop.currentOs) - implementation(compose.materialIconsExtended) -} + listOf(js(), wasmJs()).forEach { + it.browser() + it.binaries.executable() + } -tasks.test { - useJUnitPlatform() -} + jvm() + + sourceSets { + commonMain.dependencies { + implementation(compose.ui) + implementation(compose.runtime) + implementation(compose.material) + implementation(compose.materialIconsExtended) + implementation(libs.kotlinx.datetime) + } -tasks.withType() { - kotlinOptions.jvmTarget = "11" + jvmMain.dependencies { + implementation(compose.desktop.currentOs) + implementation(libs.kotlin.coroutines.swing) + } + } } compose.desktop { diff --git a/gradle.properties b/gradle.properties index 2aa9043..ca418bd 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,2 +1,4 @@ kotlin.code.style=official -org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=1024m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 \ No newline at end of file +org.gradle.jvmargs=-Xmx2048m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 + +org.jetbrains.compose.experimental.macos.enabled=true \ No newline at end of file diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml new file mode 100644 index 0000000..19f4ba7 --- /dev/null +++ b/gradle/libs.versions.toml @@ -0,0 +1,15 @@ +[versions] +kotlin = "2.2.20" +kotlin-coroutines = "1.10.2" +kotlinx-datetime = "0.7.1" + +compose = "1.9.0-rc02" + +[libraries] +kotlin-coroutines-swing = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-swing", version.ref = "kotlin-coroutines" } +kotlinx-datetime = { module = "org.jetbrains.kotlinx:kotlinx-datetime", version.ref = "kotlinx-datetime" } + +[plugins] +kotlinMultiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" } +composeMultiplatform = { id = "org.jetbrains.compose", version.ref = "compose" } +composeCompiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" } \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index e708b1c..8bdaf60 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 4d9ca16..96801c9 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip +distributionUrl=https://services.gradle.org/distributions/gradle-9.0.0-bin.zip +networkTimeout=10000 +validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index 4f906e0..ef07e01 100755 --- a/gradlew +++ b/gradlew @@ -1,7 +1,7 @@ -#!/usr/bin/env sh +#!/bin/sh # -# Copyright 2015 the original author or authors. +# Copyright © 2015 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. @@ -15,81 +15,115 @@ # See the License for the specific language governing permissions and # limitations under the License. # +# SPDX-License-Identifier: Apache-2.0 +# ############################################################################## -## -## Gradle start up script for UN*X -## +# +# 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/HEAD/platforms/jvm/plugins-application/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 -PRG="$0" -# Need this for relative symlinks. -while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi +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 -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null -APP_NAME="Gradle" -APP_BASE_NAME=`basename "$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"' +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" +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 - ;; - MINGW* ) - msys=true - ;; - NONSTOP* ) - nonstop=true - ;; +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 +CLASSPATH="\\\"\\\"" # 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" + JAVACMD=$JAVA_HOME/jre/sh/java else - JAVACMD="$JAVA_HOME/bin/java" + JAVACMD=$JAVA_HOME/bin/java fi if [ ! -x "$JAVACMD" ] ; then die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME @@ -98,88 +132,120 @@ 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. + JAVACMD=java + if ! command -v java >/dev/null 2>&1 + then + 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 fi # Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" - fi +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac fi -# For Darwin, add options to specify how the application appears in the dock -if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" -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" = "true" -o "$msys" = "true" ] ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - - JAVACMD=`cygpath --unix "$JAVACMD"` - - # We build the pattern for arguments to be converted via cygpath - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi +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 - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" + 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 - i=`expr $i + 1` + # 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 - case $i in - 0) set -- ;; - 1) set -- "$args0" ;; - 2) set -- "$args0" "$args1" ;; - 3) set -- "$args0" "$args1" "$args2" ;; - 4) set -- "$args0" "$args1" "$args2" "$args3" ;; - 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; - esac fi -# Escape application args -save () { - for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done - echo " " -} -APP_ARGS=`save "$@"` -# Collect all arguments for the java command, following the shell quoting and substitution rules -eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" +# 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"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# 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 index 107acd3..db3a6ac 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -13,8 +13,10 @@ @rem See the License for the specific language governing permissions and @rem limitations under the License. @rem +@rem SPDX-License-Identifier: Apache-2.0 +@rem -@if "%DEBUG%" == "" @echo off +@if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem @rem Gradle startup script for Windows @@ -25,7 +27,8 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% @@ -40,13 +43,13 @@ if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto execute +if %ERRORLEVEL% equ 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. +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 goto fail @@ -56,32 +59,34 @@ 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. +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 goto fail :execute @rem Setup the command line -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar +set CLASSPATH= @rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* :end @rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd +if %ERRORLEVEL% equ 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 +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% :mainEnd if "%OS%"=="Windows_NT" endlocal diff --git a/settings.gradle.kts b/settings.gradle.kts index 6a66c09..2056943 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -2,9 +2,6 @@ pluginManagement { repositories { gradlePluginPortal() mavenCentral() - maven { url = uri("https://maven.pkg.jetbrains.space/public/p/compose/dev") } } - } rootProject.name = "klokk" - diff --git a/src/appleMain/kotlin/com/theapache64/klokk/main.kt b/src/appleMain/kotlin/com/theapache64/klokk/main.kt new file mode 100644 index 0000000..39c4644 --- /dev/null +++ b/src/appleMain/kotlin/com/theapache64/klokk/main.kt @@ -0,0 +1,18 @@ +package com.theapache64.klokk + +import androidx.compose.ui.unit.DpSize +import androidx.compose.ui.unit.dp +import androidx.compose.ui.window.Window +import platform.AppKit.NSApp + +fun main() { + Window( + title = "Klokk", size = DpSize( + width = (CLOCKS_CONTAINER_WIDTH + PADDING).dp, + height = (CLOCKS_CONTAINER_HEIGHT + PADDING + 40).dp + + ) + ) { KlokkApp() } + + NSApp?.run() +} \ No newline at end of file diff --git a/src/commonMain/kotlin/com/theapache64/klokk/Configs.kt b/src/commonMain/kotlin/com/theapache64/klokk/Configs.kt new file mode 100644 index 0000000..e193bf0 --- /dev/null +++ b/src/commonMain/kotlin/com/theapache64/klokk/Configs.kt @@ -0,0 +1,13 @@ +package com.theapache64.klokk + +import com.theapache64.klokk.theme.Black + +const val COLUMNS = 15 +const val ROWS = 8 +const val PADDING = 100 +const val CLOCK_SIZE = 60 +const val CLOCKS_CONTAINER_WIDTH = CLOCK_SIZE * COLUMNS +const val CLOCKS_CONTAINER_HEIGHT = CLOCK_SIZE * ROWS +const val ENJOY_TIME_IN_MILLIS = 1500L +const val IS_DEBUG = true +internal val BACKGROUND_COLOR = Black \ No newline at end of file diff --git a/src/commonMain/kotlin/com/theapache64/klokk/Klokk.kt b/src/commonMain/kotlin/com/theapache64/klokk/Klokk.kt new file mode 100644 index 0000000..847e7dd --- /dev/null +++ b/src/commonMain/kotlin/com/theapache64/klokk/Klokk.kt @@ -0,0 +1,163 @@ +package com.theapache64.klokk + +import androidx.compose.foundation.background +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.requiredSize +import androidx.compose.runtime.Composable +import androidx.compose.runtime.LaunchedEffect +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.rememberCoroutineScope +import androidx.compose.runtime.setValue +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.unit.dp +import com.theapache64.klokk.composable.BottomToolBar +import com.theapache64.klokk.composable.Clock +import com.theapache64.klokk.movement.alphabet.TextMatrixGenerator +import com.theapache64.klokk.movement.core.Movement +import com.theapache64.klokk.theme.KlokkTheme +import kotlinx.coroutines.cancel +import kotlinx.coroutines.delay +import kotlinx.coroutines.launch + +@Composable +fun KlokkApp() { + /** + * To control the infinite animation loop + */ + val infiniteLoopScope = rememberCoroutineScope() + + // To hold and control movement transition + var activeMovement by remember { mutableStateOf(Movement.StandBy) } + + // To control the auto playing animation + var shouldPlayAutoAnim by remember { mutableStateOf(true) } + + var textInput by remember { mutableStateOf("") } + + // Generating degree matrix using the active movement + val degreeMatrix = activeMovement.getMatrixGenerator().getVerifiedMatrix() + + KlokkTheme { + Column( + modifier = Modifier + .fillMaxSize() + .background(BACKGROUND_COLOR), + horizontalAlignment = Alignment.CenterHorizontally, + verticalArrangement = Arrangement.Center + ) { + + // Building clock matrix + repeat(ROWS) { i -> + Row { + repeat(COLUMNS) { j -> + val clockData = degreeMatrix[i][j] + Clock( + needleOneDegree = clockData.degreeOne, + needleTwoDegree = clockData.degreeTwo, + durationInMillis = activeMovement.durationInMillis, + modifier = Modifier.requiredSize(CLOCK_SIZE.dp) + ) + } + } + } + + // The animation loop + LaunchedEffect(shouldPlayAutoAnim) { + println("Animation loop created and started -> will run? $shouldPlayAutoAnim") + val defaultWaitTime = activeMovement.durationInMillis.toLong() + ENJOY_TIME_IN_MILLIS + val mediumDelay = defaultWaitTime - ENJOY_TIME_IN_MILLIS + + while (shouldPlayAutoAnim) { + delay(ENJOY_TIME_IN_MILLIS) + + activeMovement = Movement.Trance(Movement.Trance.To.SQUARE) // Show square + delay(defaultWaitTime) + + activeMovement = Movement.Trance(to = Movement.Trance.To.FLOWER) // Then flower + delay(mediumDelay) // flower doesn't have enjoy time + + activeMovement = Movement.Trance(to = Movement.Trance.To.STAR) // To star, through circle (auto) + delay(mediumDelay) + + activeMovement = Movement.Trance(to = Movement.Trance.To.FLY) // then fly + delay(defaultWaitTime) + + activeMovement = Movement.Wave(Movement.Wave.State.START) + delay(mediumDelay) + + activeMovement = Movement.Wave(Movement.Wave.State.END) + delay(mediumDelay) + + // Ripple + activeMovement = Movement.Ripple(to = Movement.Ripple.To.START) // then ripple start + delay(defaultWaitTime) + + activeMovement = Movement.Ripple(to = Movement.Ripple.To.END) // then ripple end + delay(defaultWaitTime) + + // Time table + activeMovement = Movement.Ripple(to = Movement.Ripple.To.TIME_TABLE) // then ripple start + delay(defaultWaitTime) + + // Ripple again + activeMovement = Movement.Ripple(to = Movement.Ripple.To.START) // then ripple start + delay(defaultWaitTime) + + activeMovement = Movement.Ripple(to = Movement.Ripple.To.END) // then ripple end + delay(defaultWaitTime) + + activeMovement = Movement.Time() // then show time + delay(defaultWaitTime) + } + + } + + BottomToolBar( + activeMovement = activeMovement, + isAnimPlaying = shouldPlayAutoAnim, + + // TODO :WIP + textInput = textInput, + onTextInputChanged = { newInput -> + if (newInput.length <= TextMatrixGenerator.MAX_CHARS) { + textInput = newInput.trim().uppercase() + + if (textInput.isEmpty()) { + // no text + shouldPlayAutoAnim = true + activeMovement = Movement.StandBy + } else { + // has some text + shouldPlayAutoAnim = false + activeMovement = Movement.Text(textInput) + } + } + }, + + onShowTimeClicked = { + shouldPlayAutoAnim = false // stop auto play + infiniteLoopScope.launch { + while (true) { + activeMovement = Movement.Time() // then show time + delay(activeMovement.durationInMillis.toLong()) + } + } + }, + onPlayClicked = { + shouldPlayAutoAnim = true + infiniteLoopScope.cancel() + }, + onStopClicked = { + shouldPlayAutoAnim = false + activeMovement = Movement.StandBy + } + ) + } + } +} \ No newline at end of file diff --git a/src/main/kotlin/com/theapache64/klokk/composable/BottomToolBar.kt b/src/commonMain/kotlin/com/theapache64/klokk/composable/BottomToolBar.kt similarity index 100% rename from src/main/kotlin/com/theapache64/klokk/composable/BottomToolBar.kt rename to src/commonMain/kotlin/com/theapache64/klokk/composable/BottomToolBar.kt diff --git a/src/main/kotlin/com/theapache64/klokk/composable/Clock.kt b/src/commonMain/kotlin/com/theapache64/klokk/composable/Clock.kt similarity index 59% rename from src/main/kotlin/com/theapache64/klokk/composable/Clock.kt rename to src/commonMain/kotlin/com/theapache64/klokk/composable/Clock.kt index f873fe1..0aaf206 100644 --- a/src/main/kotlin/com/theapache64/klokk/composable/Clock.kt +++ b/src/commonMain/kotlin/com/theapache64/klokk/composable/Clock.kt @@ -4,21 +4,14 @@ import androidx.compose.animation.core.Easing import androidx.compose.animation.core.LinearEasing import androidx.compose.animation.core.animateFloatAsState import androidx.compose.animation.core.tween -import androidx.compose.desktop.Window import androidx.compose.foundation.Canvas -import androidx.compose.foundation.background -import androidx.compose.foundation.layout.Box -import androidx.compose.foundation.layout.fillMaxSize -import androidx.compose.foundation.layout.size -import androidx.compose.material.Button -import androidx.compose.material.Text -import androidx.compose.runtime.* +import androidx.compose.runtime.Composable +import androidx.compose.runtime.getValue import androidx.compose.ui.Modifier import androidx.compose.ui.geometry.Offset import androidx.compose.ui.graphics.Color -import androidx.compose.ui.unit.dp -import com.theapache64.klokk.model.ClockData import com.theapache64.klokk.theme.CodGray +import kotlin.math.PI import kotlin.math.cos import kotlin.math.sin @@ -36,8 +29,8 @@ fun Clock( modifier: Modifier = Modifier, ) { - val needleOneRadian = (needleOneDegree * Math.PI / 180).toFloat() - val needleTwoRadian = (needleTwoDegree * Math.PI / 180).toFloat() + val needleOneRadian = (needleOneDegree * PI / 180).toFloat() + val needleTwoRadian = (needleTwoDegree * PI / 180).toFloat() val animationSpec = tween(durationMillis = durationInMillis, easing = easing, delayMillis = delay) val needleOneDegreeAnim by animateFloatAsState( @@ -100,41 +93,47 @@ fun Clock( } - -// Preview -fun main(args: Array) { - Window { - var needleOneDegree by remember { mutableStateOf(135f) } - var needleTwoDegree by remember { mutableStateOf(225f) } - - - val scope = rememberCoroutineScope() - - Box( - modifier = Modifier.fillMaxSize().background(Color.Black) - ) { - - Clock( - needleOneDegree = needleOneDegree, - needleTwoDegree = needleTwoDegree, - modifier = Modifier.size(600.dp), - durationInMillis = 2000 - ) - - Button( - onClick = { - needleOneDegree = 110f - needleTwoDegree = 170f - - /* scope.launch { - delay(5000) - needleOneDegree = (0..360).random().toFloat() - needleTwoDegree = (0..360).random().toFloat() - }*/ - } - ) { - Text(text = "Animate") - } - } - } -} +// +//// Preview +//fun main() = application { +// val windowState = rememberWindowState(size = DpSize(800.dp, 800.dp)) +// Window( +// onCloseRequest = ::exitApplication, +// title = "Klokk", +// state = windowState, +// ) { +// var needleOneDegree by remember { mutableStateOf(135f) } +// var needleTwoDegree by remember { mutableStateOf(225f) } +// +// +// val scope = rememberCoroutineScope() +// +// Box( +// modifier = Modifier.fillMaxSize().background(Color.Black) +// ) { +// +// Clock( +// needleOneDegree = needleOneDegree, +// needleTwoDegree = needleTwoDegree, +// modifier = Modifier.size(600.dp), +// durationInMillis = 2000 +// ) +// +// Button( +// onClick = { +// needleOneDegree = 110f +// needleTwoDegree = 170f +// +// /* scope.launch { +// delay(5000) +// needleOneDegree = (0..360).random().toFloat() +// needleTwoDegree = (0..360).random().toFloat() +// }*/ +// } +// ) { +// Text(text = "Animate") +// } +// } +// } +//} +// diff --git a/src/main/kotlin/com/theapache64/klokk/model/ClockData.kt b/src/commonMain/kotlin/com/theapache64/klokk/model/ClockData.kt similarity index 100% rename from src/main/kotlin/com/theapache64/klokk/model/ClockData.kt rename to src/commonMain/kotlin/com/theapache64/klokk/model/ClockData.kt diff --git a/src/main/kotlin/com/theapache64/klokk/movement/StandByMatrixGenerator.kt b/src/commonMain/kotlin/com/theapache64/klokk/movement/StandByMatrixGenerator.kt similarity index 99% rename from src/main/kotlin/com/theapache64/klokk/movement/StandByMatrixGenerator.kt rename to src/commonMain/kotlin/com/theapache64/klokk/movement/StandByMatrixGenerator.kt index d2f6926..d541ef3 100644 --- a/src/main/kotlin/com/theapache64/klokk/movement/StandByMatrixGenerator.kt +++ b/src/commonMain/kotlin/com/theapache64/klokk/movement/StandByMatrixGenerator.kt @@ -43,5 +43,4 @@ class StandByMatrixGenerator(data: Movement.StandBy) : MatrixGenerator> { return getStandByMatrix(data) } - } \ No newline at end of file diff --git a/src/main/kotlin/com/theapache64/klokk/movement/TranceMatrixGenerator.kt b/src/commonMain/kotlin/com/theapache64/klokk/movement/TranceMatrixGenerator.kt similarity index 100% rename from src/main/kotlin/com/theapache64/klokk/movement/TranceMatrixGenerator.kt rename to src/commonMain/kotlin/com/theapache64/klokk/movement/TranceMatrixGenerator.kt diff --git a/src/main/kotlin/com/theapache64/klokk/movement/alphabet/AMatrix.kt b/src/commonMain/kotlin/com/theapache64/klokk/movement/alphabet/AMatrix.kt similarity index 100% rename from src/main/kotlin/com/theapache64/klokk/movement/alphabet/AMatrix.kt rename to src/commonMain/kotlin/com/theapache64/klokk/movement/alphabet/AMatrix.kt diff --git a/src/main/kotlin/com/theapache64/klokk/movement/alphabet/AlphabetMatrix.kt b/src/commonMain/kotlin/com/theapache64/klokk/movement/alphabet/AlphabetMatrix.kt similarity index 100% rename from src/main/kotlin/com/theapache64/klokk/movement/alphabet/AlphabetMatrix.kt rename to src/commonMain/kotlin/com/theapache64/klokk/movement/alphabet/AlphabetMatrix.kt diff --git a/src/main/kotlin/com/theapache64/klokk/movement/alphabet/TextMatrixGenerator.kt b/src/commonMain/kotlin/com/theapache64/klokk/movement/alphabet/TextMatrixGenerator.kt similarity index 100% rename from src/main/kotlin/com/theapache64/klokk/movement/alphabet/TextMatrixGenerator.kt rename to src/commonMain/kotlin/com/theapache64/klokk/movement/alphabet/TextMatrixGenerator.kt diff --git a/src/main/kotlin/com/theapache64/klokk/movement/core/BaseMatrix.kt b/src/commonMain/kotlin/com/theapache64/klokk/movement/core/BaseMatrix.kt similarity index 100% rename from src/main/kotlin/com/theapache64/klokk/movement/core/BaseMatrix.kt rename to src/commonMain/kotlin/com/theapache64/klokk/movement/core/BaseMatrix.kt diff --git a/src/main/kotlin/com/theapache64/klokk/movement/core/MatrixGenerator.kt b/src/commonMain/kotlin/com/theapache64/klokk/movement/core/MatrixGenerator.kt similarity index 99% rename from src/main/kotlin/com/theapache64/klokk/movement/core/MatrixGenerator.kt rename to src/commonMain/kotlin/com/theapache64/klokk/movement/core/MatrixGenerator.kt index 7fc4eaa..7fae39b 100644 --- a/src/main/kotlin/com/theapache64/klokk/movement/core/MatrixGenerator.kt +++ b/src/commonMain/kotlin/com/theapache64/klokk/movement/core/MatrixGenerator.kt @@ -52,6 +52,4 @@ abstract class MatrixGenerator( fun getVerifiedMatrix(): List> { return verifyIntegrityAndReturn(generateMatrix()) } - - } \ No newline at end of file diff --git a/src/main/kotlin/com/theapache64/klokk/movement/core/Movement.kt b/src/commonMain/kotlin/com/theapache64/klokk/movement/core/Movement.kt similarity index 87% rename from src/main/kotlin/com/theapache64/klokk/movement/core/Movement.kt rename to src/commonMain/kotlin/com/theapache64/klokk/movement/core/Movement.kt index 9693189..ec59739 100644 --- a/src/main/kotlin/com/theapache64/klokk/movement/core/Movement.kt +++ b/src/commonMain/kotlin/com/theapache64/klokk/movement/core/Movement.kt @@ -6,7 +6,13 @@ import com.theapache64.klokk.movement.alphabet.TextMatrixGenerator import com.theapache64.klokk.movement.ripple.RippleMatrixGenerator import com.theapache64.klokk.movement.snake.WaveMatrixGenerator import com.theapache64.klokk.movement.time.TimeMatrixGenerator -import java.util.* +import kotlinx.datetime.LocalDateTime +import kotlinx.datetime.LocalTime +import kotlinx.datetime.TimeZone +import kotlinx.datetime.toLocalDateTime +import kotlin.time.Clock +import kotlin.time.ExperimentalTime +import kotlin.time.Instant /** * Dynamic animation can't be supported until this fixed -> https://issuetracker.google.com/issues/183220315 @@ -69,8 +75,9 @@ sealed class Movement( /** * To show time */ + @OptIn(ExperimentalTime::class) data class Time( - val date: Date = Date(), + val localDateTime: LocalDateTime = Clock.System.now().toLocalDateTime(TimeZone.currentSystemDefault()), ) : Movement(durationInMillis = DEFAULT_ANIMATION_DURATION) { override fun getMatrixGenerator(): MatrixGenerator