diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..b63da45 --- /dev/null +++ b/.gitignore @@ -0,0 +1,42 @@ +.gradle +build/ +!gradle/wrapper/gradle-wrapper.jar +!**/src/main/**/build/ +!**/src/test/**/build/ + +### IntelliJ IDEA ### +.idea/modules.xml +.idea/jarRepositories.xml +.idea/compiler.xml +.idea/libraries/ +*.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/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 0000000..26d3352 --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,3 @@ +# Default ignored files +/shelf/ +/workspace.xml diff --git a/build.gradle.kts b/build.gradle.kts new file mode 100644 index 0000000..6931e0b --- /dev/null +++ b/build.gradle.kts @@ -0,0 +1,65 @@ +import org.jetbrains.compose.desktop.application.dsl.TargetFormat + +plugins { + kotlin("jvm") + id("org.jetbrains.compose") + kotlin("plugin.serialization") version "1.9.0" +} + +group = "org.cookiestudios" +version = "1.0-SNAPSHOT" + + + +repositories { + mavenCentral() + maven("https://maven.pkg.jetbrains.space/public/p/compose/dev") + google() +} + +dependencies { + // Note, if you develop a library, you should use compose.desktop.common. + // compose.desktop.currentOs should be used in launcher-sourceSet + // (in a separate module for demo project and in testMain). + // With compose.desktop.common you will also lose @Preview functionality + implementation(compose.desktop.currentOs) + implementation(compose.material3) + implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.5.1") +} + +compose.desktop { + java { + sourceCompatibility = JavaVersion.VERSION_20 + targetCompatibility = JavaVersion.VERSION_20 + } + tasks.withType().configureEach { + kotlinOptions { + jvmTarget = "20" + } + } + application { + javaHome = "C:\\Program Files\\Java\\jdk-20" + mainClass = "QuickLaunchMainKt" + nativeDistributions { + targetFormats(TargetFormat.Dmg, TargetFormat.Msi, TargetFormat.Deb, TargetFormat.Exe) + packageName = "QuickLaunch" + packageVersion = "4.0.0" + macOS { + iconFile.set(project.file("src/main/resources/icon.icns")) + } + windows { + iconFile.set(project.file("src/main/resources/icon.ico")) + } + linux { + iconFile.set(project.file("src/main/resources/icon.png")) + } + } + + + dependencies { + implementation(compose.material3) + implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.5.1") + //implementation(compose.materialIconsExtended) + } + } +} diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 0000000..a20c49e --- /dev/null +++ b/gradle.properties @@ -0,0 +1,5 @@ +org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8 +kotlin.code.style=official +kotlin.version=1.9.0 +compose.version=1.5.0 +org.gradle.java.home=C:\\Program Files\\Java\\jdk-20 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..59bc51a --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,5 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.1-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..c31af63 --- /dev/null +++ b/settings.gradle.kts @@ -0,0 +1,13 @@ +pluginManagement { + repositories { + gradlePluginPortal() + maven("https://maven.pkg.jetbrains.space/public/p/compose/dev") + } + + plugins { + kotlin("jvm").version(extra["kotlin.version"] as String) + id("org.jetbrains.compose").version(extra["compose.version"] as String) + } +} + +rootProject.name = "QuickLaunchCompose" diff --git a/src/main/kotlin/QuickLaunchMain.kt b/src/main/kotlin/QuickLaunchMain.kt new file mode 100644 index 0000000..949193c --- /dev/null +++ b/src/main/kotlin/QuickLaunchMain.kt @@ -0,0 +1,177 @@ +import androidx.compose.animation.* +import androidx.compose.animation.core.Spring +import androidx.compose.animation.core.spring +import androidx.compose.foundation.background +import androidx.compose.foundation.clickable +import androidx.compose.foundation.interaction.MutableInteractionSource +import androidx.compose.foundation.layout.* +import androidx.compose.material.icons.Icons +import androidx.compose.material3.* +import androidx.compose.runtime.* +import androidx.compose.ui.Alignment +import androidx.compose.ui.BiasAlignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.focus.FocusRequester +import androidx.compose.ui.focus.focusRequester +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.graphics.painter.BitmapPainter +import androidx.compose.ui.input.key.* +import androidx.compose.ui.res.loadImageBitmap +import androidx.compose.ui.res.useResource +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.unit.DpSize +import androidx.compose.ui.unit.dp +import androidx.compose.ui.window.* +import notifications.NotificationCenter +import theme.Minimize +import theme.QuickLaunchTheme +import viewModel.QuickLaunchInputCoordinator +import viewModel.ShortCutHandler +import windows.ShortcutEditWindow + + +@Composable +fun App( + minimize: () -> Unit, + openShortcuts: () -> Unit +) { + LaunchedEffect(Unit) { + QuickLaunchInputCoordinator.uiEvents.collect { event -> + when (event) { + is QuickLaunchInputCoordinator.QLUiEvent.HelpEvent -> { + + } + + is QuickLaunchInputCoordinator.QLUiEvent.OpenShortcutWindowEvent -> { + openShortcuts() + } + } + } + } + val notification by NotificationCenter.message.collectAsState("") + Column( + verticalArrangement = Arrangement.SpaceAround, + modifier = Modifier.background(color = Color(0f, 0f, 0f, 0.8f)) + ) { + Row(modifier = Modifier.fillMaxWidth()) { + val text = remember { mutableStateOf("") } + val focusRequester = remember { FocusRequester() } + TextField( + colors = TextFieldDefaults.colors( + focusedContainerColor = Color.Transparent, + unfocusedContainerColor = Color.Transparent, + focusedIndicatorColor = Color.Transparent, + unfocusedIndicatorColor = Color.Transparent + ), + textStyle = MaterialTheme.typography.displayMedium.copy( + fontWeight = FontWeight(200) + ), + modifier = Modifier.focusRequester(focusRequester).fillMaxHeight(0.7f).fillMaxWidth(0.925f).onKeyEvent { + if (it.type == KeyEventType.KeyUp && it.key == Key.Enter) { + QuickLaunchInputCoordinator.enter(text.value) + text.value = "" + return@onKeyEvent true + } + return@onKeyEvent false + }, + value = text.value, + onValueChange = { + text.value = it + }, + maxLines = 1 + ) + LaunchedEffect(Unit) { + focusRequester.requestFocus() + } + Box( + modifier = Modifier + .padding(0.dp) + .background(Color.Transparent) + .width(30.dp) + .height(30.dp) + .clickable( + indication = null, + interactionSource = remember { MutableInteractionSource() } + ) { minimize() }, + contentAlignment = Alignment.Center + ) { + Icon( + imageVector = Icons.Default.Minimize, + "minimize", + tint = Color.White, + modifier = Modifier.fillMaxSize() + ) + } + } + val expanded by remember { derivedStateOf { notification.isNotEmpty() } } + AnimatedVisibility( + visible = expanded, + enter = expandVertically( + spring( + stiffness = Spring.StiffnessLow, + dampingRatio = Spring.DampingRatioHighBouncy + ) + ) + ) { + AnimatedContent( + targetState = notification, + transitionSpec = { + fadeIn() + slideInHorizontally() togetherWith fadeOut() + slideOutHorizontally( + targetOffsetX = { it / 2 }, + ) + } + ) { + Text( + it, + color = Color.Yellow, + modifier = Modifier.padding(start = 16.dp, bottom = 8.dp, top = 4.dp) + ) + } + + + } + } + +} + + +fun main() { + application { + val windowState = + rememberWindowState(position = WindowPosition(BiasAlignment(0f, -0.4f)), size = DpSize(400.dp, 104.dp)) + + QuickLaunchTheme { + Window( + icon = BitmapPainter(useResource("icon.png", ::loadImageBitmap)), + transparent = true, + undecorated = true, + resizable = false, + title = "QuickLaunch", + state = windowState, + onCloseRequest = ::exitApplication + ) { + val openHelpWindow = remember { mutableStateOf(false) } + App( + minimize = { windowState.isMinimized = true }, + openShortcuts = { openHelpWindow.value = true } + ) + if (openHelpWindow.value) { + DialogWindow( + title = "Edit shortcuts", + onCloseRequest = { + openHelpWindow.value = false + ShortCutHandler.persistToStorage() + }, + state = rememberDialogState( + size = DpSize(800.dp, 600.dp), + position = WindowPosition(Alignment.Center) + ) + ) { + ShortcutEditWindow() + } + } + } + } + } +} + diff --git a/src/main/kotlin/notifications/NotificationCenter.kt b/src/main/kotlin/notifications/NotificationCenter.kt new file mode 100644 index 0000000..d7e6b49 --- /dev/null +++ b/src/main/kotlin/notifications/NotificationCenter.kt @@ -0,0 +1,44 @@ +package notifications + +import kotlinx.coroutines.CoroutineScope +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.delay +import kotlinx.coroutines.flow.* +import java.util.concurrent.BlockingQueue +import java.util.concurrent.LinkedBlockingQueue + +object NotificationCenter { + + private val queue : BlockingQueue = LinkedBlockingQueue() + + val message: Flow = flow { + while (true) { + val notification = queue.take() + emit(notification.message) + delay(notification.duration.ms) + emit("") + } + }.flowOn(Dispatchers.IO) + + + fun addNotification(message: String, duration: NotificationDuration){ + if (message.isNotEmpty()) { + queue.put( + Notification( + message, + duration + ) + ) + } + } +} + +private data class Notification( + val message: String, + val duration: NotificationDuration +) + +enum class NotificationDuration(val ms : Long) { + SHORT(3000L), + LONG(5000L) +} \ No newline at end of file diff --git a/src/main/kotlin/theme/Color.kt b/src/main/kotlin/theme/Color.kt new file mode 100644 index 0000000..8094af5 --- /dev/null +++ b/src/main/kotlin/theme/Color.kt @@ -0,0 +1,67 @@ +package theme +import androidx.compose.ui.graphics.Color + +val md_theme_light_primary = Color(0xFF006D3E) +val md_theme_light_onPrimary = Color(0xFFFFFFFF) +val md_theme_light_primaryContainer = Color(0xFF96F7B8) +val md_theme_light_onPrimaryContainer = Color(0xFF00210F) +val md_theme_light_secondary = Color(0xFF4F6354) +val md_theme_light_onSecondary = Color(0xFFFFFFFF) +val md_theme_light_secondaryContainer = Color(0xFFD1E8D5) +val md_theme_light_onSecondaryContainer = Color(0xFF0C1F13) +val md_theme_light_tertiary = Color(0xFF3B6470) +val md_theme_light_onTertiary = Color(0xFFFFFFFF) +val md_theme_light_tertiaryContainer = Color(0xFFBEEAF7) +val md_theme_light_onTertiaryContainer = Color(0xFF001F26) +val md_theme_light_error = Color(0xFFBA1A1A) +val md_theme_light_errorContainer = Color(0xFFFFDAD6) +val md_theme_light_onError = Color(0xFFFFFFFF) +val md_theme_light_onErrorContainer = Color(0xFF410002) +val md_theme_light_background = Color(0xFFFBFDF8) +val md_theme_light_onBackground = Color(0xFF191C1A) +val md_theme_light_surface = Color(0xFFFBFDF8) +val md_theme_light_onSurface = Color(0xFF191C1A) +val md_theme_light_surfaceVariant = Color(0xFFDCE5DB) +val md_theme_light_onSurfaceVariant = Color(0xFF414942) +val md_theme_light_outline = Color(0xFF717971) +val md_theme_light_inverseOnSurface = Color(0xFFF0F1EC) +val md_theme_light_inverseSurface = Color(0xFF2E312E) +val md_theme_light_inversePrimary = Color(0xFF7ADA9D) +val md_theme_light_shadow = Color(0xFF000000) +val md_theme_light_surfaceTint = Color(0xFF006D3E) +val md_theme_light_outlineVariant = Color(0xFFC0C9C0) +val md_theme_light_scrim = Color(0xFF000000) + +val md_theme_dark_primary = Color(0xFF7ADA9D) +val md_theme_dark_onPrimary = Color(0xFF00391E) +val md_theme_dark_primaryContainer = Color(0xFF00522D) +val md_theme_dark_onPrimaryContainer = Color(0xFF96F7B8) +val md_theme_dark_secondary = Color(0xFFB6CCB9) +val md_theme_dark_onSecondary = Color(0xFF213527) +val md_theme_dark_secondaryContainer = Color(0xFF384B3D) +val md_theme_dark_onSecondaryContainer = Color(0xFFD1E8D5) +val md_theme_dark_tertiary = Color(0xFFA3CDDB) +val md_theme_dark_onTertiary = Color(0xFF023640) +val md_theme_dark_tertiaryContainer = Color(0xFF214C57) +val md_theme_dark_onTertiaryContainer = Color(0xFFBEEAF7) +val md_theme_dark_error = Color(0xFFFFB4AB) +val md_theme_dark_errorContainer = Color(0xFF93000A) +val md_theme_dark_onError = Color(0xFF690005) +val md_theme_dark_onErrorContainer = Color(0xFFFFDAD6) +val md_theme_dark_background = Color(0xFF191C1A) +val md_theme_dark_onBackground = Color(0xFFE1E3DE) +val md_theme_dark_surface = Color(0xFF191C1A) +val md_theme_dark_onSurface = Color(0xFFE1E3DE) +val md_theme_dark_surfaceVariant = Color(0xFF414942) +val md_theme_dark_onSurfaceVariant = Color(0xFFC0C9C0) +val md_theme_dark_outline = Color(0xFF8A938B) +val md_theme_dark_inverseOnSurface = Color(0xFF191C1A) +val md_theme_dark_inverseSurface = Color(0xFFE1E3DE) +val md_theme_dark_inversePrimary = Color(0xFF006D3E) +val md_theme_dark_shadow = Color(0xFF000000) +val md_theme_dark_surfaceTint = Color(0xFF7ADA9D) +val md_theme_dark_outlineVariant = Color(0xFF414942) +val md_theme_dark_scrim = Color(0xFF000000) + + +val seed = Color(0xFF006D3E) diff --git a/src/main/kotlin/theme/QLIcons.kt b/src/main/kotlin/theme/QLIcons.kt new file mode 100644 index 0000000..d4fb995 --- /dev/null +++ b/src/main/kotlin/theme/QLIcons.kt @@ -0,0 +1,25 @@ +package theme + +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.materialIcon +import androidx.compose.material.icons.materialPath +import androidx.compose.ui.graphics.vector.ImageVector + +public val Icons.Filled.Minimize: ImageVector + get() { + if (_minimize != null) { + return _minimize!! + } + _minimize = materialIcon(name = "Filled.Minimize") { + materialPath { + moveTo(6.0f, 10.0f) + horizontalLineToRelative(12.0f) + verticalLineToRelative(2.0f) + horizontalLineTo(6.0f) + close() + } + } + return _minimize!! + } + +private var _minimize: ImageVector? = null \ No newline at end of file diff --git a/src/main/kotlin/theme/QuickLaunchTheme.kt b/src/main/kotlin/theme/QuickLaunchTheme.kt new file mode 100644 index 0000000..79ff00b --- /dev/null +++ b/src/main/kotlin/theme/QuickLaunchTheme.kt @@ -0,0 +1,91 @@ +package theme + +import androidx.compose.foundation.isSystemInDarkTheme +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.darkColorScheme +import androidx.compose.material3.lightColorScheme + +import androidx.compose.runtime.Composable + + +private val LightColors = lightColorScheme( + primary = md_theme_light_primary, + onPrimary = md_theme_light_onPrimary, + primaryContainer = md_theme_light_primaryContainer, + onPrimaryContainer = md_theme_light_onPrimaryContainer, + secondary = md_theme_light_secondary, + onSecondary = md_theme_light_onSecondary, + secondaryContainer = md_theme_light_secondaryContainer, + onSecondaryContainer = md_theme_light_onSecondaryContainer, + tertiary = md_theme_light_tertiary, + onTertiary = md_theme_light_onTertiary, + tertiaryContainer = md_theme_light_tertiaryContainer, + onTertiaryContainer = md_theme_light_onTertiaryContainer, + error = md_theme_light_error, + errorContainer = md_theme_light_errorContainer, + onError = md_theme_light_onError, + onErrorContainer = md_theme_light_onErrorContainer, + background = md_theme_light_background, + onBackground = md_theme_light_onBackground, + surface = md_theme_light_surface, + onSurface = md_theme_light_onSurface, + surfaceVariant = md_theme_light_surfaceVariant, + onSurfaceVariant = md_theme_light_onSurfaceVariant, + outline = md_theme_light_outline, + inverseOnSurface = md_theme_light_inverseOnSurface, + inverseSurface = md_theme_light_inverseSurface, + inversePrimary = md_theme_light_inversePrimary, + surfaceTint = md_theme_light_surfaceTint, + outlineVariant = md_theme_light_outlineVariant, + scrim = md_theme_light_scrim, +) + + +private val DarkColors = darkColorScheme( + primary = md_theme_dark_primary, + onPrimary = md_theme_dark_onPrimary, + primaryContainer = md_theme_dark_primaryContainer, + onPrimaryContainer = md_theme_dark_onPrimaryContainer, + secondary = md_theme_dark_secondary, + onSecondary = md_theme_dark_onSecondary, + secondaryContainer = md_theme_dark_secondaryContainer, + onSecondaryContainer = md_theme_dark_onSecondaryContainer, + tertiary = md_theme_dark_tertiary, + onTertiary = md_theme_dark_onTertiary, + tertiaryContainer = md_theme_dark_tertiaryContainer, + onTertiaryContainer = md_theme_dark_onTertiaryContainer, + error = md_theme_dark_error, + errorContainer = md_theme_dark_errorContainer, + onError = md_theme_dark_onError, + onErrorContainer = md_theme_dark_onErrorContainer, + background = md_theme_dark_background, + onBackground = md_theme_dark_onBackground, + surface = md_theme_dark_surface, + onSurface = md_theme_dark_onSurface, + surfaceVariant = md_theme_dark_surfaceVariant, + onSurfaceVariant = md_theme_dark_onSurfaceVariant, + outline = md_theme_dark_outline, + inverseOnSurface = md_theme_dark_inverseOnSurface, + inverseSurface = md_theme_dark_inverseSurface, + inversePrimary = md_theme_dark_inversePrimary, + surfaceTint = md_theme_dark_surfaceTint, + outlineVariant = md_theme_dark_outlineVariant, + scrim = md_theme_dark_scrim, +) + +@Composable +fun QuickLaunchTheme( + useDarkTheme: Boolean = isSystemInDarkTheme(), + content: @Composable() () -> Unit +) { + val colors = if (!useDarkTheme) { + LightColors + } else { + DarkColors + } + + MaterialTheme( + colorScheme = colors, + content = content + ) +} \ No newline at end of file diff --git a/src/main/kotlin/viewModel/QuickLaunchInputCoordinator.kt b/src/main/kotlin/viewModel/QuickLaunchInputCoordinator.kt new file mode 100644 index 0000000..0ab81c2 --- /dev/null +++ b/src/main/kotlin/viewModel/QuickLaunchInputCoordinator.kt @@ -0,0 +1,53 @@ +package viewModel + +import kotlinx.coroutines.channels.BufferOverflow +import kotlinx.coroutines.flow.Flow +import kotlinx.coroutines.flow.MutableSharedFlow +import notifications.NotificationCenter +import notifications.NotificationDuration +import kotlin.system.exitProcess + +object QuickLaunchInputCoordinator { + + private val _uiEvents = MutableSharedFlow(extraBufferCapacity = 1, onBufferOverflow = BufferOverflow.DROP_LATEST) + val uiEvents : Flow = _uiEvents + + fun enter(userInput: String) { + if (userInput.isNotEmpty()) { + if (userInput.startsWith("/")) { + command(userInput.substring(1)) + } else { + shortCut(userInput) + } + } + } + + + private fun command(cmd: String) { + when(cmd){ + "x" -> { + exitProcess(0) + } + "v" -> { + NotificationCenter.addNotification("version c1.0", NotificationDuration.SHORT) + } + "s" -> { + _uiEvents.tryEmit(QLUiEvent.OpenShortcutWindowEvent) + } + else -> { + _uiEvents.tryEmit(QLUiEvent.HelpEvent) + } + } + + } + + private fun shortCut(shortCut: String) { + ShortCutHandler.executeShortcut(shortCut) + } + + + sealed class QLUiEvent { + object OpenShortcutWindowEvent : QLUiEvent() + object HelpEvent : QLUiEvent() + } +} \ No newline at end of file diff --git a/src/main/kotlin/viewModel/ShortCutHandler.kt b/src/main/kotlin/viewModel/ShortCutHandler.kt new file mode 100644 index 0000000..827a8fb --- /dev/null +++ b/src/main/kotlin/viewModel/ShortCutHandler.kt @@ -0,0 +1,80 @@ +package viewModel + +import kotlinx.coroutines.flow.MutableStateFlow +import kotlinx.coroutines.flow.StateFlow +import kotlinx.serialization.SerializationException +import kotlinx.serialization.encodeToString +import kotlinx.serialization.json.Json +import java.io.* + +object ShortCutHandler { + private val currentPath: File = + File(System.getProperty("user.home"), ".QuickLaunch") + private val shortcutsFile = File(currentPath,"shortcuts.json") + private val _shortcuts = MutableStateFlow>(emptyMap()) + val shortcuts: StateFlow> = _shortcuts + + + init { + if (!currentPath.exists()){ //TODO this is for config somewhere else maybe + currentPath.mkdir() + } + readFromStorage() +// BufferedReader(FileReader(File("C:\\Users\\Paul\\AppData\\Roaming\\QuickLaunch\\File.txt"))).use { +// _shortcuts.value = buildMap { +// var line = it.readLine() +// while (line != null){ +// put(line, it.readLine()) +// line = it.readLine() +// } +// } +// } +// persistToStorage() + } + + fun addShortcut(short: String, path: String) { + _shortcuts.value = buildMap { + putAll(shortcuts.value) + put(short, path) + } + } + + fun removeShortcut(short: String) { + _shortcuts.value = buildMap { + putAll(shortcuts.value.filterNot { entry -> entry.key == short }) + } + } + + fun executeShortcut(short: String) { + shortcuts.value[short]?.let { + ProcessBuilder(it.split(";")).start() + } + } + + fun persistToStorage() { + _shortcuts.value = buildMap { + putAll(shortcuts.value.filter { entry -> entry.key.isNotEmpty() }) + } + BufferedWriter(FileWriter(shortcutsFile)).use { + it.write( + Json.Default.encodeToString(shortcuts.value) + ) + } + } + + private fun readFromStorage() { + println(shortcutsFile.path) + if (!shortcutsFile.exists()) { + shortcutsFile.createNewFile() + } else { + try { + BufferedReader(FileReader(shortcutsFile)).use { + _shortcuts.value = Json.Default.decodeFromString(it.readText()) + } + } catch (j : SerializationException){ + println("Empty configuration") + } + } + + } +} diff --git a/src/main/kotlin/windows/ShortcutEditDialogWindow.kt b/src/main/kotlin/windows/ShortcutEditDialogWindow.kt new file mode 100644 index 0000000..760aa43 --- /dev/null +++ b/src/main/kotlin/windows/ShortcutEditDialogWindow.kt @@ -0,0 +1,103 @@ +package windows + +import androidx.compose.animation.animateContentSize +import androidx.compose.desktop.ui.tooling.preview.Preview +import androidx.compose.foundation.background +import androidx.compose.foundation.clickable +import androidx.compose.foundation.interaction.MutableInteractionSource +import androidx.compose.foundation.layout.* +import androidx.compose.foundation.lazy.LazyColumn +import androidx.compose.foundation.lazy.items +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.filled.Add +import androidx.compose.material.icons.filled.Delete +import androidx.compose.material3.* +import androidx.compose.runtime.* +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.unit.dp +import viewModel.ShortCutHandler + +@Preview +@Composable +fun ShortcutEditWindow() { + Scaffold( + floatingActionButton = { AddFab() } + ) { + val entries by ShortCutHandler.shortcuts.collectAsState() + LazyColumn( + verticalArrangement = Arrangement.spacedBy(8.dp), + modifier = Modifier.padding(8.dp).animateContentSize() + ) { + items(entries.toList()) { + ShortcutRow(it) + } + } + } +} + + +@Composable +fun ShortcutRow(entry: Pair) { + Row( + modifier = Modifier.fillMaxWidth(), + verticalAlignment = Alignment.CenterVertically, + horizontalArrangement = Arrangement.SpaceEvenly + ) { + val shState = remember(entry.first) { mutableStateOf(entry.first) } + val cmdState = remember(entry.second) { mutableStateOf(entry.second) } + TextField( + textStyle = MaterialTheme.typography.bodyMedium, + singleLine = true, + modifier = Modifier.fillMaxWidth(0.1f), + value = shState.value, + onValueChange = { + ShortCutHandler.removeShortcut(shState.value) + ShortCutHandler.addShortcut(it, cmdState.value) + } + ) + + TextField( + textStyle = MaterialTheme.typography.bodyMedium, + singleLine = true, + modifier = Modifier.fillMaxWidth(0.85f), + value = cmdState.value, + onValueChange = { + ShortCutHandler.addShortcut(shState.value, it) + }, + ) + Box( + modifier = Modifier.width(30.dp).height(30.dp).clickable ( + indication = null, + interactionSource = remember { MutableInteractionSource() } + ) { + ShortCutHandler.removeShortcut(shState.value) + } + ) { + Icon( + Icons.Default.Delete, + "remove", + modifier = Modifier.fillMaxSize() + ) + } + + } +} + +@Preview +@Composable +fun AddFab() { + Surface ( + shadowElevation = 6.dp, + color = FloatingActionButtonDefaults.containerColor, + shape = FloatingActionButtonDefaults.shape, + modifier = Modifier.clickable( + indication = null, + interactionSource = remember { MutableInteractionSource() } + ){ + ShortCutHandler.addShortcut("", "") + } + ) { + Icon(Icons.Default.Add, "add", modifier = Modifier.width(56.dp).height(56.dp).padding(12.dp)) + } +} \ No newline at end of file diff --git a/src/main/resources/icon.ico b/src/main/resources/icon.ico new file mode 100644 index 0000000..769c031 Binary files /dev/null and b/src/main/resources/icon.ico differ diff --git a/src/main/resources/icon.png b/src/main/resources/icon.png new file mode 100644 index 0000000..c169fda Binary files /dev/null and b/src/main/resources/icon.png differ