49 Commits

Author SHA1 Message Date
zach ad23da4eda initial commit, primitive loading of QML code outside of shell directory 2026-05-25 13:32:06 +02:00
zach 06ebc4ffbf remove irrelevant settings options plus bugfixes 2026-05-25 11:51:16 +02:00
zach f2f9fa1302 fix opening links on non-uwsm and disable file watcher when shell is installed 2026-05-25 11:01:01 +02:00
zach b4020438f9 Merge pull request 'Tune transparency scale impact on luminance scaling' (#98) from fix/transparency-luminance-scaling into main
Reviewed-on: #98
Reviewed-by: AramJonghu <2+aramjonghu@noreply.git.zach-dev.cc>
2026-05-24 22:37:03 +02:00
zach 184ab20d11 Merge branch 'main' into fix/transparency-luminance-scaling
Lint & Format (JS/TS) / lint-format (pull_request) Successful in 12s
Python / lint-format (pull_request) Successful in 26s
Python / test (pull_request) Successful in 42s
Lint & Format (Rust) / lint-format (pull_request) Successful in 1m45s
2026-05-24 22:36:52 +02:00
zach 5097e30a77 fix anchors used in Layouts 2026-05-24 19:33:06 +02:00
zach ef71ae8afd button to install colorscheme and wallpaper to greeter in settings 2026-05-24 19:28:02 +02:00
AramJonghu 6533533936 Merge branch 'main' into fix/transparency-luminance-scaling
Lint & Format (JS/TS) / lint-format (pull_request) Successful in 12s
Python / lint-format (pull_request) Successful in 23s
Python / test (pull_request) Successful in 51s
Lint & Format (Rust) / lint-format (pull_request) Successful in 1m47s
2026-05-24 18:53:39 +02:00
zach 9688072e93 record.py 2026-05-24 18:48:03 +02:00
AramJonghu 9c36f0de5b pycache in cache removal 2026-05-24 18:28:32 +02:00
zach 9ca46967d9 Merge pull request 'hotfix(cli): replace raw subprocess tracebacks with styled error messages and fix restart race condition' (#96) from hotfix-restart-race-condition into main
Reviewed-on: #96
Reviewed-by: zach <zach@brohn.se>
2026-05-24 18:23:43 +02:00
zach 16e84ca998 fixed region selection for recording, plus cache file cleanup
Lint & Format (JS/TS) / lint-format (pull_request) Successful in 12s
Lint & Format (Python) / lint-format (pull_request) Successful in 18s
Lint & Format (Rust) / lint-format (pull_request) Successful in 1m34s
2026-05-24 18:21:37 +02:00
AramJonghu c30128cf95 check every 50ms -> 250ms for restart
Lint & Format (JS/TS) / lint-format (pull_request) Successful in 11s
Python / lint-format (pull_request) Successful in 30s
Python / test (pull_request) Successful in 46s
Lint & Format (Rust) / lint-format (pull_request) Successful in 1m44s
2026-05-24 18:03:32 +02:00
zach ba9926af18 Increased floor and decreased ceiling of offset for brightening darker colors in dark mode/darkening brighter colors in light mode
Lint & Format (JS/TS) / lint-format (pull_request) Successful in 13s
Python / lint-format (pull_request) Successful in 28s
Python / test (pull_request) Successful in 43s
Lint & Format (Rust) / lint-format (pull_request) Successful in 1m45s
2026-05-24 11:40:44 +02:00
AramJonghu 78fcf33b3a refactor(cli): clean shell start/restart, drop redundant ipc check
Lint & Format (JS/TS) / lint-format (pull_request) Successful in 11s
Python / lint-format (pull_request) Successful in 24s
Python / test (pull_request) Successful in 48s
Lint & Format (Rust) / lint-format (pull_request) Successful in 1m44s
2026-05-24 03:09:19 +02:00
AramJonghu 5e9b373405 tests did not match changed code logic
Lint & Format (JS/TS) / lint-format (pull_request) Successful in 11s
Python / lint-format (pull_request) Successful in 25s
Python / test (pull_request) Successful in 50s
Lint & Format (Rust) / lint-format (pull_request) Successful in 1m46s
2026-05-23 20:54:35 +02:00
AramJonghu b49165e7ea minor typer adjustments to use typer in error/exception throws
Lint & Format (JS/TS) / lint-format (pull_request) Successful in 14s
Python / lint-format (pull_request) Successful in 34s
Python / test (pull_request) Failing after 53s
Lint & Format (Rust) / lint-format (pull_request) Successful in 1m48s
2026-05-23 20:48:51 +02:00
AramJonghu d0cda51639 wait for instance to fully terminate before restart 2026-05-23 20:31:48 +02:00
zach ad57764636 Merge pull request '#73 dynamic color scheme presets from .txt palettes + shell restart command' (#92) from 73-colorscheme-options into main
Reviewed-on: #92
2026-05-23 20:15:30 +02:00
zach 96afbdb30b Settings UI for color scheme presets
Lint & Format (JS/TS) / lint-format (pull_request) Successful in 12s
Python / lint-format (pull_request) Successful in 25s
Python / test (pull_request) Successful in 53s
Lint & Format (Rust) / lint-format (pull_request) Successful in 1m52s
2026-05-23 20:14:12 +02:00
AramJonghu 5df46160f6 documentation in README.md added
Lint & Format (JS/TS) / lint-format (pull_request) Successful in 12s
Python / lint-format (pull_request) Successful in 23s
Python / test (pull_request) Successful in 50s
Lint & Format (Rust) / lint-format (pull_request) Successful in 1m50s
2026-05-23 17:53:16 +02:00
AramJonghu d118c02e75 README: document scheme CLI and shell subcommands 2026-05-23 17:52:06 +02:00
AramJonghu 21ed178bbc scheme: add --json flag to list-presets, --accent flag, drop :accent from preset spec
Lint & Format (JS/TS) / lint-format (pull_request) Successful in 13s
Python / lint-format (pull_request) Successful in 25s
Python / test (pull_request) Successful in 44s
Lint & Format (Rust) / lint-format (pull_request) Successful in 1m48s
- list-presets --json outputs structured JSON with variants,
  modes, accents, and default_accent for accent-aware schemes
- --accent flag replaces :accent shorthand in preset string
- Validate --accent against variant's available accents
- resolve_preset returns tuple[str, str] (scheme + variant only)
- Update tests for new signature
2026-05-23 17:42:58 +02:00
AramJonghu 2934d863ca --accent removed. Accidental inclusion
Lint & Format (JS/TS) / lint-format (pull_request) Successful in 12s
Python / lint-format (pull_request) Successful in 22s
Python / test (pull_request) Successful in 46s
Lint & Format (Rust) / lint-format (pull_request) Successful in 1m46s
2026-05-23 00:51:14 +02:00
AramJonghu 7c29921a6b removal of plans package/directory (we have project board now)
Lint & Format (JS/TS) / lint-format (pull_request) Successful in 11s
Python / lint-format (pull_request) Successful in 22s
Python / test (pull_request) Successful in 49s
Lint & Format (Rust) / lint-format (pull_request) Successful in 1m45s
2026-05-23 00:42:25 +02:00
AramJonghu 0309fde3aa format check and lint resolved
Lint & Format (JS/TS) / lint-format (pull_request) Successful in 11s
Python / lint-format (pull_request) Successful in 19s
Python / test (pull_request) Successful in 46s
Lint & Format (Rust) / lint-format (pull_request) Successful in 1m50s
2026-05-22 23:26:33 +02:00
AramJonghu f147969f37 added workflow running python tests
Lint & Format (JS/TS) / lint-format (pull_request) Successful in 11s
Python / lint-format (pull_request) Failing after 24s
Python / test (pull_request) Successful in 50s
Lint & Format (Rust) / lint-format (pull_request) Successful in 1m48s
2026-05-22 22:56:03 +02:00
AramJonghu 90a1954658 cache 2026-05-22 22:53:36 +02:00
AramJonghu 2b550763e7 ruff unused import 2026-05-22 22:46:02 +02:00
AramJonghu 3037cfab53 cache 2026-05-22 22:38:56 +02:00
AramJonghu 5f92b6f6de shell: add restart command, fix call None arg, add tests 2026-05-22 22:38:35 +02:00
AramJonghu 67ae693d0c Color preset schemes now exposed for use.
- Catppuccin txt colors extracted from dankmaterialyou and created txt
  files for each.
- Preset is now an option and are exposed.
- Tests test presets, might add workflow to run tests.
2026-05-22 22:32:31 +02:00
zach fd620e7487 prep for replay 2026-05-22 20:42:51 +02:00
zach 0ec426e0f0 Record module added to sidebar, file list and buttons. Region recording is broken 2026-05-22 12:51:06 +02:00
zach ec5e6d3995 add typer command 2026-05-22 11:06:17 +02:00
zach 41a129bb90 init commit 2026-05-22 11:04:54 +02:00
Inorishio 8c48ddbbe7 Merge branch 'main' of git.zach-dev.cc:zach/z-bar-qt 2026-05-21 23:58:49 +02:00
Inorishio 625d766719 added escape to lock + greeter 2026-05-21 23:58:24 +02:00
zach 88526b9e98 show notif icon true by default 2026-05-21 23:43:27 +02:00
zach a0d56b965c toggle to show notif icon on lockscreen 2026-05-21 23:29:49 +02:00
zach 2342edcf66 apply button, wheel doesn't zoom 2026-05-21 23:12:01 +02:00
zach 9e75b593f4 scale slider for crop tool 2026-05-21 19:14:29 +02:00
zach 4663c7d683 better wallpaper preview positioning 2026-05-21 17:55:31 +02:00
zach 80683800eb crop region now restores correctly 2026-05-21 16:52:12 +02:00
zach 57836f974c remove residue test files 2026-05-21 15:52:43 +02:00
zach 8dbb88e136 crop region now correct 2026-05-21 15:51:42 +02:00
zach 06c402c050 better crop region handling, but coordinate math is wrong 2026-05-20 23:16:55 +02:00
zach e425a1701b small fix for wallpaper grid 2026-05-20 14:34:11 +02:00
zach 41666d0150 Merge pull request 'hyprland lua support' (#91) from hypr-plugin into main
Reviewed-on: #91
2026-05-20 14:08:30 +02:00
144 changed files with 10094 additions and 2033 deletions
+32 -1
View File
@@ -1,4 +1,4 @@
name: Lint & Format (Python) name: Python
on: on:
pull_request: pull_request:
@@ -32,3 +32,34 @@ jobs:
run: | run: |
. .venv/bin/activate . .venv/bin/activate
ruff check . ruff check .
test:
runs-on: alpine
container: node:26-alpine
steps:
- name: Checkout
uses: actions/checkout@v4
- name: Install tools
run: |
apk add --no-cache \
git \
python3 \
py3-pip \
py3-pillow \
build-base
python3 -m venv .venv
. .venv/bin/activate
pip install --no-cache-dir \
typer \
pillow \
materialyoucolor \
jinja2 \
pytest
- name: Test
run: |
. .venv/bin/activate
cd cli
python -m pytest tests/ -v
+8 -1
View File
@@ -31,6 +31,13 @@ if("shell" IN_LIST ENABLE_MODULES)
foreach(dir assets scripts Components Config Modules Daemons Drawers Effects Helpers Paths) foreach(dir assets scripts Components Config Modules Daemons Drawers Effects Helpers Paths)
install(DIRECTORY ${dir} DESTINATION "${INSTALL_QSCONFDIR}") install(DIRECTORY ${dir} DESTINATION "${INSTALL_QSCONFDIR}")
endforeach() endforeach()
install(FILES shell.qml DESTINATION "${INSTALL_QSCONFDIR}")
# Disable watching for changes
file(READ shell.qml SHELL_QML)
string(REPLACE "settings.watchFiles: true" "settings.watchFiles: false" SHELL_QML "${SHELL_QML}")
file(WRITE "${CMAKE_BINARY_DIR}/qml/shell.qml" "${SHELL_QML}")
install(FILES "${CMAKE_BINARY_DIR}/qml/shell.qml" DESTINATION "${INSTALL_QSCONFDIR}")
# Greeter
install(DIRECTORY Greeter/ DESTINATION "${INSTALL_GREETERCONFDIR}") install(DIRECTORY Greeter/ DESTINATION "${INSTALL_GREETERCONFDIR}")
endif() endif()
+16 -2
View File
@@ -8,20 +8,34 @@ Item {
id: root id: root
property alias active: splitButton.active property alias active: splitButton.active
property alias buttonAlias: splitButton
property bool enabled: true property bool enabled: true
property alias expanded: splitButton.expanded property alias expanded: splitButton.expanded
property int expandedZ: 100 property int expandedZ: 100
required property string label required property string label
property alias menuItems: splitButton.menuItems property alias menuItems: splitButton.menuItems
property bool shouldBeActive: true
property alias type: splitButton.type property alias type: splitButton.type
signal selected(item: MenuItem) signal selected(item: MenuItem)
Layout.fillWidth: true anchors.left: parent.left
Layout.preferredHeight: row.implicitHeight + Appearance.padding.smaller * 2 anchors.right: parent.right
clip: false clip: false
implicitHeight: row.implicitHeight + Appearance.padding.smaller * 2
opacity: shouldBeActive ? 1 : 0
scale: shouldBeActive ? 1 : 0.8
z: root.expanded ? expandedZ : -1 z: root.expanded ? expandedZ : -1
Behavior on opacity {
Anim {
}
}
Behavior on scale {
Anim {
}
}
RowLayout { RowLayout {
id: row id: row
+1
View File
@@ -15,6 +15,7 @@ Text {
color: DynamicColors.palette.m3onSurface color: DynamicColors.palette.m3onSurface
font.family: Appearance.font.family.sans font.family: Appearance.font.family.sans
font.pointSize: Appearance.font.size.normal font.pointSize: Appearance.font.size.normal
linkColor: DynamicColors.palette.m3onPrimaryFixedVariant
renderType: Text.NativeRendering renderType: Text.NativeRendering
textFormat: Text.PlainText textFormat: Text.PlainText
+8
View File
@@ -1,5 +1,13 @@
import Quickshell.Io import Quickshell.Io
JsonObject { JsonObject {
property Presets presets: Presets {
}
property string schemeType: "vibrant" property string schemeType: "vibrant"
component Presets: JsonObject {
property string accent: ""
property string name: ""
property string variant: ""
}
} }
+19 -2
View File
@@ -22,6 +22,7 @@ Singleton {
property alias notifs: adapter.notifs property alias notifs: adapter.notifs
property alias osd: adapter.osd property alias osd: adapter.osd
property alias overview: adapter.overview property alias overview: adapter.overview
property alias plugins: adapter.plugins
property bool recentlySaved: false property bool recentlySaved: false
property alias screenshot: adapter.screenshot property alias screenshot: adapter.screenshot
property alias services: adapter.services property alias services: adapter.services
@@ -115,7 +116,12 @@ Singleton {
function serializeColors(): var { function serializeColors(): var {
return { return {
schemeType: colors.schemeType schemeType: colors.schemeType,
presets: {
name: colors.presets.name,
variant: colors.presets.variant,
accent: colors.presets.accent
}
}; };
} }
@@ -135,7 +141,8 @@ Singleton {
launcher: serializeLauncher(), launcher: serializeLauncher(),
colors: serializeColors(), colors: serializeColors(),
dock: serializeDock(), dock: serializeDock(),
screenshot: serializeScreenshot() screenshot: serializeScreenshot(),
plugins: serializePlugins()
}; };
} }
@@ -242,6 +249,7 @@ Singleton {
recolorLogo: lock.recolorLogo, recolorLogo: lock.recolorLogo,
enableFprint: lock.enableFprint, enableFprint: lock.enableFprint,
showNotifContent: lock.showNotifContent, showNotifContent: lock.showNotifContent,
showNotifIcon: lock.showNotifIcon,
maxFprintTries: lock.maxFprintTries, maxFprintTries: lock.maxFprintTries,
blurAmount: lock.blurAmount, blurAmount: lock.blurAmount,
sizes: { sizes: {
@@ -283,6 +291,13 @@ Singleton {
}; };
} }
function serializePlugins(): var {
return {
enabled: plugins.enabled,
entries: plugins.entries
};
}
function serializeScreenshot(): var { function serializeScreenshot(): var {
return { return {
enable_pp: screenshot.enable_pp, enable_pp: screenshot.enable_pp,
@@ -452,6 +467,8 @@ Singleton {
} }
property Overview overview: Overview { property Overview overview: Overview {
} }
property PluginConfig plugins: PluginConfig {
}
property Screenshot screenshot: Screenshot { property Screenshot screenshot: Screenshot {
} }
property Services services: Services { property Services services: Services {
+3 -2
View File
@@ -30,9 +30,10 @@ Singleton {
readonly property alias wallLuminance: analyser.luminance readonly property alias wallLuminance: analyser.luminance
function alterColor(c: color, a: real, layer: int): color { function alterColor(c: color, a: real, layer: int): color {
const luminance = getLuminance(c); const initLuminance = getLuminance(c);
const luminance = Math.max(initLuminance, 0.001);
const offset = (!light || layer == 1 ? 1 : -layer / 2) * (light ? 0.2 : 0.3) * (1 - transparency.base) * (1 + wallLuminance * (light ? (layer == 1 ? 3 : 1) : 2.5)); const offset = (!light || layer == 1 ? 1 : -layer / 2) * (light ? 0.2 : 0.3) * (0.2 + 0.3 * (1 - transparency.base)) * (1 + wallLuminance * (light ? (layer == 1 ? 3 : 1) : 2.5));
const scale = (luminance + offset) / luminance; const scale = (luminance + offset) / luminance;
const r = Math.max(0, Math.min(1, c.r * scale)); const r = Math.max(0, Math.min(1, c.r * scale));
const g = Math.max(0, Math.min(1, c.g * scale)); const g = Math.max(0, Math.min(1, c.g * scale));
+1
View File
@@ -6,6 +6,7 @@ JsonObject {
property int maxFprintTries: 3 property int maxFprintTries: 3
property bool recolorLogo: false property bool recolorLogo: false
property bool showNotifContent: false property bool showNotifContent: false
property bool showNotifIcon: true
property Sizes sizes: Sizes { property Sizes sizes: Sizes {
} }
+11
View File
@@ -0,0 +1,11 @@
import Quickshell.Io
JsonObject {
property bool enabled: false
property list<var> entries: [
{
id: "Plugin",
enabled: false
},
]
}
+18
View File
@@ -0,0 +1,18 @@
pragma Singleton
import Quickshell
import ZShell.Models
Singleton {
id: root
property alias plugins: plugins.entries
FileSystemModel {
id: plugins
nameFilters: ["*.qml"]
path: Quickshell.env("HOME") + "/.config/zshell"
recursive: false
}
}
+17
View File
@@ -0,0 +1,17 @@
import Quickshell
import QtQuick
import ZShell.Models
import qs.Config
Repeater {
model: FetchPlugins.plugins
LazyLoader {
required property FileSystemEntry modelData
activeAsync: Config.plugins.entries.some(p => {
return p.id === modelData.baseName && p.enabled;
})
source: modelData.path
}
}
+20 -20
View File
@@ -16,27 +16,14 @@ Scope {
property bool launching: false property bool launching: false
property string promptMessage: "" property string promptMessage: ""
readonly property var selectedSession: sessionIndex >= 0 ? sessions[sessionIndex] : null readonly property var selectedSession: sessionIndex >= 0 ? sessions[sessionIndex] : null
readonly property var selectedUser: Users.selectedUser
property int sessionIndex: sessions.length > 0 ? 0 : -1 property int sessionIndex: sessions.length > 0 ? 0 : -1
property var sessions: [] property var sessions: []
readonly property string userFace: selectedUser ? selectedUser.face : ""
readonly property string username: Users.selectedUsername
// User handling - now uses the Users singleton // User handling - now uses the Users singleton
readonly property var users: Users.users readonly property var users: Users.users
readonly property var selectedUser: Users.selectedUser
readonly property string username: Users.selectedUsername
readonly property string userFace: selectedUser ? selectedUser.face : ""
// User selection functions (delegate to Users singleton)
function selectUser(username: string): bool {
return Users.selectUser(username);
}
function selectNextUser(): void {
Users.selectNext();
}
function selectPreviousUser(): void {
Users.selectPrevious();
}
signal flashMsg signal flashMsg
@@ -58,11 +45,11 @@ Scope {
event.accepted = true; event.accepted = true;
return; return;
} } else if (event.key === Qt.Key_Escape) {
buffer = "";
if (event.text && !/[\r\n]/.test(event.text)) { } else if (" abcdefghijklmnopqrstuvwxyz1234567890`~!@#$%^&*()-_=+[{]}\\|;:'\",<.>/?".includes(event.text.toLowerCase())) {
// No illegal characters (you are insane if you use unicode in your password)
buffer += event.text; buffer += event.text;
event.accepted = true;
} }
} }
@@ -81,6 +68,19 @@ Scope {
Greetd.launch(selectedSession.command, [], true); Greetd.launch(selectedSession.command, [], true);
} }
function selectNextUser(): void {
Users.selectNext();
}
function selectPreviousUser(): void {
Users.selectPrevious();
}
// User selection functions (delegate to Users singleton)
function selectUser(username: string): bool {
return Users.selectUser(username);
}
function submit(): void { function submit(): void {
errorMessage = ""; errorMessage = "";
+63
View File
@@ -0,0 +1,63 @@
// FetchPresets.qml
pragma Singleton
import QtQuick
import Quickshell
import Quickshell.Io
Singleton {
id: root
property var parsedPresets: ({})
readonly property var presets: parsedPresets
property bool ready: false
function accents(presetName, variantName) {
const variant = parsedPresets[presetName]?.variants?.[variantName];
return variant?.accents ?? [];
}
function defaultAccent(presetName, variantName) {
const variant = parsedPresets[presetName]?.variants?.[variantName];
return variant?.default_accent ?? "";
}
function modes(presetName, variantName) {
const variant = parsedPresets[presetName]?.variants?.[variantName];
return variant?.modes ?? [];
}
function presetNames() {
return Object.keys(parsedPresets);
}
function variantNames(presetName) {
const preset = parsedPresets[presetName];
if (!preset || !preset.variants)
return [];
return Object.keys(preset.variants);
}
Process {
command: ["zshell-cli", "scheme", "list-presets", "--json"]
running: true
stdout: StdioCollector {
onStreamFinished: {
try {
const parsed = JSON.parse(text);
root.parsedPresets = parsed.presets ?? {};
root.ready = true;
} catch (e) {
console.error("Failed to parse presets JSON:", e);
}
}
}
}
}
+1 -1
View File
@@ -12,7 +12,7 @@ Singleton {
readonly property int darkEnd: Config.general.color.scheduleDarkEnd readonly property int darkEnd: Config.general.color.scheduleDarkEnd
readonly property int darkStart: Config.general.color.scheduleDarkStart readonly property int darkStart: Config.general.color.scheduleDarkStart
readonly property bool enabled: Config.general.color.scheduleDark readonly property bool enabled: Config.general.color.scheduleDark && Config.general.color.schemeGeneration
function applyDarkMode() { function applyDarkMode() {
Quickshell.execDetached(["zshell-cli", "scheme", "generate", "--mode", "dark"]); Quickshell.execDetached(["zshell-cli", "scheme", "generate", "--mode", "dark"]);
+82 -41
View File
@@ -1,41 +1,82 @@
// pragma Singleton pragma Singleton
//
// import Quickshell import Quickshell
// import QtQuick import Quickshell.Io
// import QtQuick
// Singleton {
// id: root Singleton {
// id: root
// function start(extraArgs = []): void {
// needsStart = true; readonly property alias elapsed: props.elapsed
// startArgs = extraArgs; property bool needsPause
// checkProc.running = true; property bool needsStart
// } property bool needsStop
// readonly property alias paused: props.paused
// PersistentProperties { readonly property alias running: props.running
// id: props property list<string> startArgs
//
// property real elapsed: 0 function start(extraArgs = []): void {
// property bool paused: false needsStart = true;
// property bool running: false startArgs = extraArgs;
// checkProc.running = true;
// reloadableId: "recorder" }
// }
// function stop(): void {
// Process { needsStop = true;
// id: checkProc checkProc.running = true;
// }
// command: ["pidof", "gpu-screen-recorder"]
// running: true function togglePause(): void {
// needsPause = true;
// onExited: code => { checkProc.running = true;
// props.running = code === 0; }
//
// if (code === 0) { PersistentProperties {
// if (root.needsStop) { id: props
// Quickshell.execDetached(["zshell-cli"]);
// } property real elapsed: 0
// } property bool paused: false
// } property bool running: false
// }
// } reloadableId: "recorder"
}
Process {
id: checkProc
command: ["pidof", "gpu-screen-recorder"]
running: true
onExited: code => {
props.running = code === 0;
if (code === 0) {
if (root.needsStop) {
Quickshell.execDetached(["zshell-cli", "record", "record"]);
props.running = false;
props.paused = false;
} else if (root.needsPause) {
Quickshell.execDetached(["zshell-cli", "record", "record", "-p"]);
props.paused = !props.paused;
}
} else if (root.needsStart) {
Quickshell.execDetached(["zshell-cli", "record", "record", ...root.startArgs]);
props.running = true;
props.paused = false;
props.elapsed = 0;
}
root.needsStart = false;
root.needsStop = false;
root.needsPause = false;
}
}
Connections {
function onSecondsChanged(): void {
props.elapsed++;
}
target: Time // qmllint disable incompatible-type
}
}
+1 -1
View File
@@ -1,7 +1,7 @@
import Quickshell
import "../scripts/fzf.js" as Fzf import "../scripts/fzf.js" as Fzf
import "../scripts/fuzzysort.js" as Fuzzy import "../scripts/fuzzysort.js" as Fuzzy
import QtQuick import QtQuick
import Quickshell
Singleton { Singleton {
property var extraOpts: ({}) property var extraOpts: ({})
+14
View File
@@ -6,7 +6,21 @@ import Quickshell.Services.UPower
Singleton { Singleton {
id: root id: root
readonly property real batteryPercent: UPower.displayDevice.percentage
readonly property list<UPowerDevice> devices: UPower.devices.values readonly property list<UPowerDevice> devices: UPower.devices.values
readonly property UPowerDevice displayDevice: UPower.displayDevice readonly property UPowerDevice displayDevice: UPower.displayDevice
readonly property bool onBattery: UPower.onBattery readonly property bool onBattery: UPower.onBattery
// property bool toastShown
//
// Connections {
// target: UPower
//
// function onPercentageChanged(): {
// if (root.batteryPercent >= 0.2 && toastShown)
// return;
//
// root.toastShown = true;
// Toaster.toast(qsTr("Battery "))
// }
// }
} }
+50
View File
@@ -1,7 +1,9 @@
pragma Singleton pragma Singleton
pragma ComponentBehavior: Bound
import Quickshell import Quickshell
import Quickshell.Io import Quickshell.Io
import QtQuick
import ZShell.Models import ZShell.Models
import qs.Config import qs.Config
import qs.Modules import qs.Modules
@@ -12,11 +14,17 @@ Searcher {
id: root id: root
property string actualCurrent: WallpaperPath.currentWallpaperPath property string actualCurrent: WallpaperPath.currentWallpaperPath
property alias crops: adapter.monitorCrops
readonly property string current: showPreview ? previewPath : actualCurrent readonly property string current: showPreview ? previewPath : actualCurrent
property alias monitorCrops: monitorCrops
property string previewPath property string previewPath
property bool recentlyChanged property bool recentlyChanged
property bool showPreview: false property bool showPreview: false
function getCrop(screen: string): var {
return root.crops[screen];
}
function preview(path: string): void { function preview(path: string): void {
previewPath = path; previewPath = path;
if (Config.general.color.schemeGeneration) if (Config.general.color.schemeGeneration)
@@ -24,9 +32,35 @@ Searcher {
showPreview = true; showPreview = true;
} }
function setCrop(screen: string, rect: rect, scaledRect: rect, zoom: real): void {
let updated = Object.assign({}, root.crops);
if (zoom <= 0)
zoom = 1.0;
else if (zoom > 5.0)
zoom = 5.0;
updated[screen] = {
x: rect.x,
y: rect.y,
width: rect.width,
height: rect.height,
scaledX: scaledRect.x,
scaledY: scaledRect.y,
scaledWidth: scaledRect.width,
scaledHeight: scaledRect.height,
zoom: zoom
};
root.crops = updated;
monitorCrops.writeAdapter();
monitorCrops.reload();
}
function setWallpaper(path: string): void { function setWallpaper(path: string): void {
actualCurrent = path; actualCurrent = path;
WallpaperPath.currentWallpaperPath = path; WallpaperPath.currentWallpaperPath = path;
Quickshell.screens.forEach(n => setCrop(n.name, Qt.rect(0, 0, 0, 0), Qt.rect(0, 0, 0, 0), 1.0));
Quickshell.execDetached(["zshell-cli", "wallpaper", "lockscreen", "--input-image", `${root.actualCurrent}`, "--output-path", `${Paths.state}/lockscreen_bg.png`, "--blur-amount", `${Config.lock.blurAmount}`]); Quickshell.execDetached(["zshell-cli", "wallpaper", "lockscreen", "--input-image", `${root.actualCurrent}`, "--output-path", `${Paths.state}/lockscreen_bg.png`, "--blur-amount", `${Config.lock.blurAmount}`]);
if (Config.general.color.schemeGeneration) if (Config.general.color.schemeGeneration)
Quickshell.execDetached(["zshell-cli", "scheme", "generate", "--image-path", `${root.actualCurrent}`, "--scheme", `${Config.colors.schemeType}`, "--mode", `${Config.general.color.mode}`]); Quickshell.execDetached(["zshell-cli", "scheme", "generate", "--image-path", `${root.actualCurrent}`, "--scheme", `${Config.colors.schemeType}`, "--mode", `${Config.general.color.mode}`]);
@@ -53,6 +87,22 @@ Searcher {
target: "wallpaper" target: "wallpaper"
} }
FileView {
id: monitorCrops
path: `${Paths.state}/wallpaper-crops.json`
watchChanges: true
onAdapterUpdated: writeAdapter()
onFileChanged: reload()
JsonAdapter {
id: adapter
property var monitorCrops: ({})
}
}
FileSystemModel { FileSystemModel {
id: wallpapers id: wallpapers
+1
View File
@@ -58,6 +58,7 @@ CustomRect {
fillMode: Image.PreserveAspectCrop fillMode: Image.PreserveAspectCrop
height: Config.notifs.sizes.image height: Config.notifs.sizes.image
source: Qt.resolvedUrl(root.image) source: Qt.resolvedUrl(root.image)
visible: Config.lock.showNotifIcon
width: Config.notifs.sizes.image width: Config.notifs.sizes.image
} }
} }
+2
View File
@@ -30,6 +30,8 @@ Scope {
} else { } else {
buffer = buffer.slice(0, -1); buffer = buffer.slice(0, -1);
} }
} else if (event.key === Qt.Key_Escape) {
buffer = "";
} else if (" abcdefghijklmnopqrstuvwxyz1234567890`~!@#$%^&*()-_=+[{]}\\|;:'\",<.>/?".includes(event.text.toLowerCase())) { } else if (" abcdefghijklmnopqrstuvwxyz1234567890`~!@#$%^&*()-_=+[{]}\\|;:'\",<.>/?".includes(event.text.toLowerCase())) {
// No illegal characters (you are insane if you use unicode in your password) // No illegal characters (you are insane if you use unicode in your password)
buffer += event.text; buffer += event.text;
+4 -1
View File
@@ -136,7 +136,10 @@ CustomRect {
wrapMode: Text.WordWrap wrapMode: Text.WordWrap
onLinkActivated: link => { onLinkActivated: link => {
Quickshell.execDetached(["app2unit", "-O", "--", link]); if (Config.launcher.uwsm)
Quickshell.execDetached(["app2unit", "-O", "--", link]);
else
Quickshell.execDetached(["xdg-open", link]);
root.visibilities.sidebar = false; root.visibilities.sidebar = false;
} }
} }
@@ -0,0 +1,290 @@
pragma ComponentBehavior: Bound
import Quickshell
import QtQuick
import QtQuick.Layouts
import qs.Components
import qs.Config
import qs.Helpers
CustomRect {
id: root
required property var props
required property PersistentProperties visibilities
Layout.fillWidth: true
color: DynamicColors.tPalette.m3surfaceContainer
implicitHeight: layout.implicitHeight + layout.anchors.margins * 2
radius: Appearance.rounding.smallest
ColumnLayout {
id: layout
anchors.fill: parent
anchors.margins: Appearance.padding.large
spacing: Appearance.spacing.normal
RowLayout {
spacing: Appearance.spacing.normal
z: 1
CustomRect {
color: Recorder.running ? DynamicColors.palette.m3secondary : DynamicColors.palette.m3secondaryContainer
implicitHeight: {
const h = icon.implicitHeight + Appearance.padding.smaller * 2;
return h - (h % 2);
}
implicitWidth: implicitHeight
radius: Appearance.rounding.full
MaterialIcon {
id: icon
anchors.centerIn: parent
anchors.horizontalCenterOffset: -0.5
anchors.verticalCenterOffset: 1.5
color: Recorder.running ? DynamicColors.palette.m3onSecondary : DynamicColors.palette.m3onSecondaryContainer
font.pointSize: Appearance.font.size.large
text: "screen_record"
}
}
ColumnLayout {
Layout.fillWidth: true
spacing: 0
CustomText {
Layout.fillWidth: true
elide: Text.ElideRight
font.pointSize: Appearance.font.size.normal
text: qsTr("Screen Recorder")
}
CustomText {
Layout.fillWidth: true
color: DynamicColors.palette.m3onSurfaceVariant
elide: Text.ElideRight
font.pointSize: Appearance.font.size.small
text: Recorder.paused ? qsTr("Recording paused") : Recorder.running ? qsTr("Recording running") : qsTr("Recording off")
}
}
CustomSplitButton {
active: menuItems.find(m => root.props.recordingMode === m.icon + m.text) ?? menuItems[0]
disabled: Recorder.running
menuItems: [
MenuItem {
activeText: qsTr("Fullscreen")
icon: "fullscreen"
text: qsTr("Record fullscreen")
onClicked: Recorder.start()
},
MenuItem {
activeText: qsTr("Region")
icon: "screenshot_region"
text: qsTr("Record region")
onClicked: Recorder.start(["-r"])
},
MenuItem {
activeText: qsTr("Fullscreen")
icon: "select_to_speak"
text: qsTr("Record fullscreen with sound")
onClicked: Recorder.start(["-s"])
},
MenuItem {
activeText: qsTr("Region")
icon: "volume_up"
text: qsTr("Record region with sound")
onClicked: Recorder.start(["-s", "-r"])
}
]
menu.onItemSelected: item => root.props.recordingMode = item.icon + item.text
}
}
Loader {
id: listOrControls
property bool running: Recorder.running
Layout.fillWidth: true
Layout.preferredHeight: implicitHeight
asynchronous: true
sourceComponent: running ? recordingControls : recordingList
Behavior on Layout.preferredHeight {
id: locHeightAnim
enabled: false
Anim {
}
}
Behavior on running {
SequentialAnimation {
ParallelAnimation {
Anim {
duration: Appearance.anim.durations.small
easing: Appearance.anim.curves.standardAccel
property: "scale"
target: listOrControls
to: 0.7
}
Anim {
duration: Appearance.anim.durations.small
easing: Appearance.anim.curves.standardAccel
property: "opacity"
target: listOrControls
to: 0
}
}
PropertyAction {
property: "enabled"
target: locHeightAnim
value: true
}
PropertyAction {
}
PropertyAction {
property: "enabled"
target: locHeightAnim
value: false
}
ParallelAnimation {
Anim {
duration: Appearance.anim.durations.small
easing: Appearance.anim.curves.standardDecel
property: "scale"
target: listOrControls
to: 1
}
Anim {
duration: Appearance.anim.durations.small
easing: Appearance.anim.curves.standardDecel
property: "opacity"
target: listOrControls
to: 1
}
}
}
}
}
}
Component {
id: recordingList
RecordingList {
props: root.props
visibilities: root.visibilities
}
}
Component {
id: recordingControls
RowLayout {
spacing: Appearance.spacing.normal
CustomRect {
color: Recorder.paused ? DynamicColors.palette.m3tertiary : DynamicColors.palette.m3error
implicitHeight: recText.implicitHeight + Appearance.padding.smaller * 2
implicitWidth: recText.implicitWidth + Appearance.padding.normal * 2
radius: Appearance.rounding.full
Behavior on implicitWidth {
Anim {
}
}
SequentialAnimation on opacity {
alwaysRunToEnd: true
loops: Animation.Infinite
running: !Recorder.paused
Anim {
duration: Appearance.anim.durations.large
easing: Appearance.anim.curves.emphasizedAccel
from: 1
to: 0
}
Anim {
duration: Appearance.anim.durations.extraLarge
easing: Appearance.anim.curves.emphasizedDecel
from: 0
to: 1
}
}
CustomText {
id: recText
anchors.centerIn: parent
animate: true
color: Recorder.paused ? DynamicColors.palette.m3onTertiary : DynamicColors.palette.m3onError
font.family: Appearance.font.family.mono
text: Recorder.paused ? "PAUSED" : "REC"
}
}
CustomText {
font.pointSize: Appearance.font.size.normal
text: {
const elapsed = Recorder.elapsed;
const hours = Math.floor(elapsed / 3600);
const mins = Math.floor((elapsed % 3600) / 60);
const secs = Math.floor(elapsed % 60).toString().padStart(2, "0");
let time;
if (hours > 0)
time = `${hours}:${mins.toString().padStart(2, "0")}:${secs}`;
else
time = `${mins}:${secs}`;
return qsTr("Recording for %1").arg(time);
}
}
Item {
Layout.fillWidth: true
}
IconButton {
checked: Recorder.paused
font.pointSize: Appearance.font.size.large
icon: Recorder.paused ? "play_arrow" : "pause"
label.animate: true
toggle: true
type: IconButton.Tonal
onClicked: {
Recorder.togglePause();
internalChecked = Recorder.paused;
}
}
IconButton {
font.pointSize: Appearance.font.size.large
icon: "stop"
inactiveColour: DynamicColors.palette.m3error
inactiveOnColour: DynamicColors.palette.m3onError
onClicked: Recorder.stop()
}
}
}
}
@@ -0,0 +1,226 @@
pragma ComponentBehavior: Bound
import QtQuick
import QtQuick.Layouts
import Quickshell
import Quickshell.Widgets
import ZShell.Models
import qs.Components
import qs.Helpers
import qs.Paths
import qs.Config
ColumnLayout {
id: root
required property var props
required property PersistentProperties visibilities
spacing: 0
WrapperMouseArea {
Layout.fillWidth: true
cursorShape: Qt.PointingHandCursor
onClicked: root.props.recordingListExpanded = !root.props.recordingListExpanded
RowLayout {
spacing: Appearance.spacing.smaller
MaterialIcon {
Layout.alignment: Qt.AlignVCenter
font.pointSize: Appearance.font.size.large
text: "list"
}
CustomText {
Layout.alignment: Qt.AlignVCenter
Layout.fillWidth: true
font.pointSize: Appearance.font.size.normal
text: qsTr("Recordings")
}
IconButton {
icon: root.props.recordingListExpanded ? "unfold_less" : "unfold_more"
label.animate: true
type: IconButton.Text
onClicked: root.props.recordingListExpanded = !root.props.recordingListExpanded
}
}
}
CustomListView {
id: list
Layout.fillWidth: true
Layout.rightMargin: -Appearance.spacing.small
clip: true
implicitHeight: (Appearance.font.size.larger + Appearance.padding.small) * (root.props.recordingListExpanded ? 10 : 3)
CustomScrollBar.vertical: CustomScrollBar {
flickable: list
}
add: Transition {
Anim {
from: 0
property: "opacity"
to: 1
}
Anim {
from: 0.5
property: "scale"
to: 1
}
}
delegate: RowLayout {
id: recording
property string baseName
required property FileSystemEntry modelData
anchors.left: list.contentItem.left
anchors.right: list.contentItem.right
anchors.rightMargin: Appearance.spacing.small
spacing: Appearance.spacing.small / 2
Component.onCompleted: baseName = modelData.baseName
CustomText {
Layout.fillWidth: true
Layout.rightMargin: Appearance.spacing.small / 2
color: DynamicColors.palette.m3onSurfaceVariant
elide: Text.ElideRight
text: {
const time = recording.baseName;
const matches = time.match(/^recording_(\d{4})(\d{2})(\d{2})_(\d{2})-(\d{2})-(\d{2})/);
if (!matches)
return time;
const date = new Date(...matches.slice(1));
date.setMonth(date.getMonth() - 1);
return qsTr("Recording at %1").arg(Qt.formatDateTime(date, Qt.locale()));
}
}
IconButton {
icon: "play_arrow"
type: IconButton.Text
onClicked: {
root.visibilities.sidebar = false;
Quickshell.execDetached(["app2unit", "--", ...Config.general.apps.playback, recording.modelData.path]);
}
}
IconButton {
icon: "folder"
type: IconButton.Text
onClicked: {
root.visibilities.sidebar = false;
Quickshell.execDetached(["app2unit", "--", ...Config.general.apps.explorer, recording.modelData.path]);
}
}
}
displaced: Transition {
Anim {
properties: "opacity,scale"
to: 1
}
Anim {
property: "y"
}
}
Behavior on implicitHeight {
Anim {
}
}
model: FileSystemModel {
nameFilters: ["recording_*.mp4"]
path: Paths.recsdir
sortReverse: true
}
remove: Transition {
Anim {
property: "opacity"
to: 0
}
Anim {
property: "scale"
to: 0.5
}
}
Loader {
active: opacity > 0
anchors.centerIn: parent
asynchronous: true
opacity: list.count === 0 ? 1 : 0
Behavior on opacity {
Anim {
}
}
sourceComponent: ColumnLayout {
spacing: Appearance.spacing.small
MaterialIcon {
Layout.alignment: Qt.AlignHCenter
Layout.preferredHeight: root.props.recordingListExpanded ? implicitHeight : 0
color: DynamicColors.palette.m3outline
font.pointSize: Appearance.font.size.extraLarge
opacity: root.props.recordingListExpanded ? 1 : 0
scale: root.props.recordingListExpanded ? 1 : 0
text: "scan_delete"
Behavior on Layout.preferredHeight {
Anim {
}
}
Behavior on opacity {
Anim {
}
}
Behavior on scale {
Anim {
}
}
}
RowLayout {
spacing: Appearance.spacing.smaller
MaterialIcon {
Layout.alignment: Qt.AlignHCenter
Layout.preferredWidth: !root.props.recordingListExpanded ? implicitWidth : 0
color: DynamicColors.palette.m3outline
opacity: !root.props.recordingListExpanded ? 1 : 0
scale: !root.props.recordingListExpanded ? 1 : 0
text: "scan_delete"
Behavior on Layout.preferredWidth {
Anim {
}
}
Behavior on opacity {
Anim {
}
}
Behavior on scale {
Anim {
}
}
}
CustomText {
color: DynamicColors.palette.m3outline
text: qsTr("No recordings found")
}
}
}
}
}
}
@@ -1,13 +1,14 @@
import qs.Modules.Notifications.Sidebar.Utils.Cards import Quickshell
import qs.Config
import QtQuick import QtQuick
import QtQuick.Layouts import QtQuick.Layouts
import qs.Modules.Notifications.Sidebar.Utils.Cards
import qs.Config
Item { Item {
id: root id: root
required property Item popouts required property Item popouts
required property var props required property PersistentProperties props
required property var visibilities required property var visibilities
implicitHeight: layout.implicitHeight implicitHeight: layout.implicitHeight
@@ -22,6 +23,12 @@ Item {
IdleInhibit { IdleInhibit {
} }
Record {
props: root.props
visibilities: root.visibilities
z: 1
}
Toggles { Toggles {
popouts: root.popouts popouts: root.popouts
visibilities: root.visibilities visibilities: root.visibilities
+8 -6
View File
@@ -100,12 +100,14 @@ Item {
icon: `brightness_${(Math.round(value * 6) + 1)}` icon: `brightness_${(Math.round(value * 6) + 1)}`
value: root.brightness value: root.brightness
onMoved: { onPressedChanged: {
if (Config.osd.allMonBrightness) { if (!pressed) {
root.monitor?.setBrightness(value); if (Config.osd.allMonBrightness) {
} else { for (const mon of Brightness.monitors) {
for (const mon of Brightness.monitors) { mon.setBrightness(value);
mon.setBrightness(value); }
} else {
root.monitor?.setBrightness(value);
} }
} }
} }
+6
View File
@@ -116,6 +116,12 @@ Item {
key: "updates" key: "updates"
name: "Updates" name: "Updates"
} }
ListElement {
icon: "extension"
key: "plugins"
name: "Extensions"
}
} }
CustomClippingRect { CustomClippingRect {
@@ -1,3 +1,4 @@
import QtQuick
import qs.Modules.Settings.Controls import qs.Modules.Settings.Controls
import qs.Config import qs.Config
@@ -80,6 +81,7 @@ SettingsPage {
name: "Sans family" name: "Sans family"
object: Config.appearance.font.family object: Config.appearance.font.family
setting: "sans" setting: "sans"
stringList: Qt.fontFamilies()
} }
Separator { Separator {
@@ -89,6 +91,7 @@ SettingsPage {
name: "Monospace family" name: "Monospace family"
object: Config.appearance.font.family object: Config.appearance.font.family
setting: "mono" setting: "mono"
stringList: Qt.fontFamilies()
} }
} }
+3 -3
View File
@@ -1,3 +1,4 @@
import Quickshell
import QtQuick.Layouts import QtQuick.Layouts
import qs.Modules.Settings.Controls import qs.Modules.Settings.Controls
import qs.Config import qs.Config
@@ -5,6 +6,8 @@ import qs.Config
SettingsPage { SettingsPage {
id: root id: root
required property ShellScreen screen
SettingsSection { SettingsSection {
sectionId: "Wallpaper" sectionId: "Wallpaper"
@@ -33,8 +36,6 @@ SettingsPage {
} }
WallpaperCropper { WallpaperCropper {
Layout.fillWidth: true
Layout.preferredHeight: 600
} }
} }
@@ -42,7 +43,6 @@ SettingsPage {
sectionId: "Wallpapers" sectionId: "Wallpapers"
WallpaperGrid { WallpaperGrid {
Layout.fillWidth: true
} }
} }
} }
+111 -111
View File
@@ -19,8 +19,8 @@ SettingsPage {
} }
SettingSpinBox { SettingSpinBox {
name: "Media update interval"
min: 0 min: 0
name: "Media update interval"
object: Config.dashboard object: Config.dashboard
setting: "mediaUpdateInterval" setting: "mediaUpdateInterval"
step: 50 step: 50
@@ -30,8 +30,8 @@ SettingsPage {
} }
SettingSpinBox { SettingSpinBox {
name: "Resource update interval"
min: 0 min: 0
name: "Resource update interval"
object: Config.dashboard object: Config.dashboard
setting: "resourceUpdateInterval" setting: "resourceUpdateInterval"
step: 50 step: 50
@@ -41,8 +41,8 @@ SettingsPage {
} }
SettingSpinBox { SettingSpinBox {
name: "Drag threshold"
min: 0 min: 0
name: "Drag threshold"
object: Config.dashboard object: Config.dashboard
setting: "dragThreshold" setting: "dragThreshold"
} }
@@ -107,112 +107,112 @@ SettingsPage {
} }
} }
SettingsSection { // SettingsSection {
sectionId: "Layout Sizes" // sectionId: "Layout Sizes"
//
SettingsHeader { // SettingsHeader {
name: "Layout Sizes" // name: "Layout Sizes"
} // }
//
SettingReadOnly { // SettingReadOnly {
name: "Tab indicator height" // name: "Tab indicator height"
value: String(Config.dashboard.sizes.tabIndicatorHeight) // value: String(Config.dashboard.sizes.tabIndicatorHeight)
} // }
//
Separator { // Separator {
} // }
//
SettingReadOnly { // SettingReadOnly {
name: "Tab indicator spacing" // name: "Tab indicator spacing"
value: String(Config.dashboard.sizes.tabIndicatorSpacing) // value: String(Config.dashboard.sizes.tabIndicatorSpacing)
} // }
//
Separator { // Separator {
} // }
//
SettingReadOnly { // SettingReadOnly {
name: "Info width" // name: "Info width"
value: String(Config.dashboard.sizes.infoWidth) // value: String(Config.dashboard.sizes.infoWidth)
} // }
//
Separator { // Separator {
} // }
//
SettingReadOnly { // SettingReadOnly {
name: "Info icon size" // name: "Info icon size"
value: String(Config.dashboard.sizes.infoIconSize) // value: String(Config.dashboard.sizes.infoIconSize)
} // }
//
Separator { // Separator {
} // }
//
SettingReadOnly { // SettingReadOnly {
name: "Date time width" // name: "Date time width"
value: String(Config.dashboard.sizes.dateTimeWidth) // value: String(Config.dashboard.sizes.dateTimeWidth)
} // }
//
Separator { // Separator {
} // }
//
SettingReadOnly { // SettingReadOnly {
name: "Media width" // name: "Media width"
value: String(Config.dashboard.sizes.mediaWidth) // value: String(Config.dashboard.sizes.mediaWidth)
} // }
//
Separator { // Separator {
} // }
//
SettingReadOnly { // SettingReadOnly {
name: "Media progress sweep" // name: "Media progress sweep"
value: String(Config.dashboard.sizes.mediaProgressSweep) // value: String(Config.dashboard.sizes.mediaProgressSweep)
} // }
//
Separator { // Separator {
} // }
//
SettingReadOnly { // SettingReadOnly {
name: "Media progress thickness" // name: "Media progress thickness"
value: String(Config.dashboard.sizes.mediaProgressThickness) // value: String(Config.dashboard.sizes.mediaProgressThickness)
} // }
//
Separator { // Separator {
} // }
//
SettingReadOnly { // SettingReadOnly {
name: "Resource progress thickness" // name: "Resource progress thickness"
value: String(Config.dashboard.sizes.resourceProgessThickness) // value: String(Config.dashboard.sizes.resourceProgessThickness)
} // }
//
Separator { // Separator {
} // }
//
SettingReadOnly { // SettingReadOnly {
name: "Weather width" // name: "Weather width"
value: String(Config.dashboard.sizes.weatherWidth) // value: String(Config.dashboard.sizes.weatherWidth)
} // }
//
Separator { // Separator {
} // }
//
SettingReadOnly { // SettingReadOnly {
name: "Media cover art size" // name: "Media cover art size"
value: String(Config.dashboard.sizes.mediaCoverArtSize) // value: String(Config.dashboard.sizes.mediaCoverArtSize)
} // }
//
Separator { // Separator {
} // }
//
SettingReadOnly { // SettingReadOnly {
name: "Media visualiser size" // name: "Media visualiser size"
value: String(Config.dashboard.sizes.mediaVisualiserSize) // value: String(Config.dashboard.sizes.mediaVisualiserSize)
} // }
//
Separator { // Separator {
} // }
//
SettingReadOnly { // SettingReadOnly {
name: "Resource size" // name: "Resource size"
value: String(Config.dashboard.sizes.resourceSize) // value: String(Config.dashboard.sizes.resourceSize)
} // }
} // }
} }
+52
View File
@@ -1,4 +1,6 @@
import Quickshell import Quickshell
import QtQuick
import QtQuick.Layouts
import qs.Modules.Settings.Controls import qs.Modules.Settings.Controls
import qs.Config import qs.Config
import qs.Components import qs.Components
@@ -67,6 +69,7 @@ SettingsPage {
CustomSplitButtonRow { CustomSplitButtonRow {
active: Config.general.color.mode === "light" ? menuItems[0] : menuItems[1] active: Config.general.color.mode === "light" ? menuItems[0] : menuItems[1]
buttonAlias.disabled: !Config.general.color.schemeGeneration
label: qsTr("Scheme mode") label: qsTr("Scheme mode")
menuItems: [ menuItems: [
@@ -100,6 +103,7 @@ SettingsPage {
id: schemeType id: schemeType
active: root.schemeTypeItem(menuItems, Config.colors.schemeType) active: root.schemeTypeItem(menuItems, Config.colors.schemeType)
buttonAlias.disabled: !Config.general.color.schemeGeneration
label: qsTr("Scheme type") label: qsTr("Scheme type")
z: 2 z: 2
@@ -169,21 +173,69 @@ SettingsPage {
} }
Separator { Separator {
shouldBeActive: Config.general.color.schemeGeneration ? 0 : 1
}
SchemesListView {
name: "Color scheme presets"
object: Config.colors.presets
setting: "name"
shouldBeActive: Config.general.color.schemeGeneration ? 0 : 1
stringList: FetchPresets.presetNames()
}
Separator {
shouldBeActive: Config.colors.presets.name !== "" && !Config.general.color.schemeGeneration
}
SchemesListView {
name: "Preset variant"
object: Config.colors.presets
setting: "variant"
shouldBeActive: Config.colors.presets.name !== "" && !Config.general.color.schemeGeneration
stringList: FetchPresets.variantNames(Config.colors.presets.name)
onOptionSet: item => {
Quickshell.execDetached(["zshell-cli", "scheme", "generate", "--preset", `${Config.colors.presets.name.toLowerCase()}:${item}`]);
}
}
Separator {
shouldBeActive: Config.colors.presets.variant !== "" && FetchPresets.accents(Config.colors.presets.name, Config.colors.presets.variant).length > 0 && !Config.general.color.schemeGeneration
}
SchemesListView {
name: "Preset accent"
object: Config.colors.presets
setting: "accent"
shouldBeActive: Config.colors.presets.variant !== "" && FetchPresets.accents(Config.colors.presets.name, Config.colors.presets.variant).length > 0 && !Config.general.color.schemeGeneration
stringList: FetchPresets.accents(Config.colors.presets.name, Config.colors.presets.variant)
onOptionSet: item => {
Quickshell.execDetached(["zshell-cli", "scheme", "generate", "--preset", `${Config.colors.presets.name.toLowerCase()}:${Config.colors.presets.variant}`, "--accent", `${item}`]);
}
}
Separator {
shouldBeActive: Config.general.color.schemeGeneration ? 1 : 0
} }
SettingSwitch { SettingSwitch {
name: "Smart color scheme" name: "Smart color scheme"
object: Config.general.color object: Config.general.color
setting: "smart" setting: "smart"
shouldBeActive: Config.general.color.schemeGeneration ? 1 : 0
} }
Separator { Separator {
shouldBeActive: Config.general.color.schemeGeneration ? 1 : 0
} }
SettingSpinner { SettingSpinner {
name: "Schedule dark mode" name: "Schedule dark mode"
object: Config.general.color object: Config.general.color
settings: ["scheduleDarkStart", "scheduleDarkEnd", "scheduleDark"] settings: ["scheduleDarkStart", "scheduleDarkEnd", "scheduleDark"]
shouldBeActive: Config.general.color.schemeGeneration ? 1 : 0
} }
Separator { Separator {
@@ -50,6 +50,15 @@ SettingsPage {
Separator { Separator {
} }
SettingSwitch {
name: "Show notification icon"
object: Config.lock
setting: "showNotifIcon"
}
Separator {
}
SettingSpinBox { SettingSpinBox {
min: 0 min: 0
name: "Blur amount" name: "Blur amount"
@@ -94,6 +103,18 @@ SettingsPage {
} }
} }
SettingsSection {
sectionId: "Greeter"
SettingsHeader {
name: "Greeter"
}
SettingsIconButton {
name: "Install wallpaper and color scheme to greeter"
}
}
SettingsSection { SettingsSection {
sectionId: "Idle" sectionId: "Idle"
@@ -9,6 +9,8 @@ import qs.Modules.Settings.Controls
ColumnLayout { ColumnLayout {
id: root id: root
property bool shouldBeActive: true
function addTimeoutEntry() { function addTimeoutEntry() {
let list = [...Config.general.idle.timeouts]; let list = [...Config.general.idle.timeouts];
@@ -40,8 +42,26 @@ ColumnLayout {
Config.save(); Config.save();
} }
Layout.fillWidth: true anchors.left: parent.left
anchors.right: parent.right
height: shouldBeActive ? implicitHeight : 0
opacity: shouldBeActive ? 1 : 0
scale: shouldBeActive ? 1 : 0.8
spacing: Appearance.spacing.smaller spacing: Appearance.spacing.smaller
visible: opacity > 0
Behavior on opacity {
Anim {
}
}
Behavior on scale {
Anim {
}
}
Behavior on y {
Anim {
}
}
Settings { Settings {
name: "Idle Monitors" name: "Idle Monitors"
@@ -52,6 +72,8 @@ ColumnLayout {
SettingList { SettingList {
Layout.fillWidth: true Layout.fillWidth: true
anchors.left: undefined
anchors.right: undefined
onAddActiveActionRequested: { onAddActiveActionRequested: {
root.updateTimeoutEntry(index, "activeAction", ""); root.updateTimeoutEntry(index, "activeAction", "");
+18
View File
@@ -0,0 +1,18 @@
import qs.Modules.Settings.Controls
import qs.Config
SettingsPage {
SettingsSection {
sectionId: "Plugins"
SettingsHeader {
name: "Plugins"
}
SettingBarEntryList {
name: "Enable or disable plugins"
object: Config.plugins
setting: "entries"
}
}
}
+97 -97
View File
@@ -19,8 +19,8 @@ SettingsPage {
} }
SettingSpinBox { SettingSpinBox {
name: "Max toasts"
min: 1 min: 1
name: "Max toasts"
object: Config.utilities object: Config.utilities
setting: "maxToasts" setting: "maxToasts"
} }
@@ -29,8 +29,8 @@ SettingsPage {
} }
SettingSpinBox { SettingSpinBox {
name: "Panel width"
min: 1 min: 1
name: "Panel width"
object: Config.utilities.sizes object: Config.utilities.sizes
setting: "width" setting: "width"
} }
@@ -39,8 +39,8 @@ SettingsPage {
} }
SettingSpinBox { SettingSpinBox {
name: "Toast width"
min: 1 min: 1
name: "Toast width"
object: Config.utilities.sizes object: Config.utilities.sizes
setting: "toastWidth" setting: "toastWidth"
} }
@@ -77,100 +77,100 @@ SettingsPage {
setting: "gameModeChanged" setting: "gameModeChanged"
} }
Separator { // Separator {
} // }
//
SettingSwitch { // SettingSwitch {
name: "Do not disturb changed" // name: "Do not disturb changed"
object: Config.utilities.toasts // object: Config.utilities.toasts
setting: "dndChanged" // setting: "dndChanged"
} // }
//
Separator { // Separator {
} // }
//
SettingSwitch { // SettingSwitch {
name: "Audio output changed" // name: "Audio output changed"
object: Config.utilities.toasts // object: Config.utilities.toasts
setting: "audioOutputChanged" // setting: "audioOutputChanged"
} // }
//
Separator { // Separator {
} // }
//
SettingSwitch { // SettingSwitch {
name: "Audio input changed" // name: "Audio input changed"
object: Config.utilities.toasts // object: Config.utilities.toasts
setting: "audioInputChanged" // setting: "audioInputChanged"
} // }
//
Separator { // Separator {
} // }
//
SettingSwitch { // SettingSwitch {
name: "Caps lock changed" // name: "Caps lock changed"
object: Config.utilities.toasts // object: Config.utilities.toasts
setting: "capsLockChanged" // setting: "capsLockChanged"
} // }
//
Separator { // Separator {
} // }
//
SettingSwitch { // SettingSwitch {
name: "Num lock changed" // name: "Num lock changed"
object: Config.utilities.toasts // object: Config.utilities.toasts
setting: "numLockChanged" // setting: "numLockChanged"
} // }
//
Separator { // Separator {
} // }
//
SettingSwitch { // SettingSwitch {
name: "Keyboard layout changed" // name: "Keyboard layout changed"
object: Config.utilities.toasts // object: Config.utilities.toasts
setting: "kbLayoutChanged" // setting: "kbLayoutChanged"
} // }
//
Separator { // Separator {
} // }
//
SettingSwitch { // SettingSwitch {
name: "VPN changed" // name: "VPN changed"
object: Config.utilities.toasts // object: Config.utilities.toasts
setting: "vpnChanged" // setting: "vpnChanged"
} // }
//
Separator { // Separator {
} // }
//
SettingSwitch { // SettingSwitch {
name: "Now playing" // name: "Now playing"
object: Config.utilities.toasts // object: Config.utilities.toasts
setting: "nowPlaying" // setting: "nowPlaying"
} // }
} }
SettingsSection { // SettingsSection {
sectionId: "VPN" // sectionId: "VPN"
//
SettingsHeader { // SettingsHeader {
name: "VPN" // name: "VPN"
} // }
//
SettingSwitch { // SettingSwitch {
name: "Enable VPN integration" // name: "Enable VPN integration"
object: Config.utilities.vpn // object: Config.utilities.vpn
setting: "enabled" // setting: "enabled"
} // }
//
Separator { // Separator {
} // }
//
SettingStringList { // SettingStringList {
name: "Provider" // name: "Provider"
addLabel: qsTr("Add VPN provider") // addLabel: qsTr("Add VPN provider")
object: Config.utilities.vpn // object: Config.utilities.vpn
setting: "provider" // setting: "provider"
} // }
} // }
} }
+13 -2
View File
@@ -1,3 +1,5 @@
pragma ComponentBehavior: Bound
import Quickshell import Quickshell
import Quickshell.Widgets import Quickshell.Widgets
import QtQuick import QtQuick
@@ -20,7 +22,6 @@ Item {
required property PersistentProperties visibilities required property PersistentProperties visibilities
function scrollToSetting(section: string, settingName: string) { function scrollToSetting(section: string, settingName: string) {
// Wait for the StackView transition to complete, then scroll
root.pendingSection = section; root.pendingSection = section;
root.pendingSetting = settingName; root.pendingSetting = settingName;
scrollTimer.restart(); scrollTimer.restart();
@@ -78,6 +79,8 @@ Item {
stack.push(screenshot); stack.push(screenshot);
else if (currentCategory === "updates") else if (currentCategory === "updates")
stack.push(updates); stack.push(updates);
else if (currentCategory === "plugins")
stack.push(plugins);
} }
target: root target: root
@@ -133,7 +136,7 @@ Item {
anchors.right: parent.right anchors.right: parent.right
anchors.top: searchBar.bottom anchors.top: searchBar.bottom
anchors.topMargin: Appearance.spacing.smaller anchors.topMargin: Appearance.spacing.smaller
color: DynamicColors.tPalette.m3surfaceContainer color: DynamicColors.tPalette.m3surfaceContainerLowest
radius: Appearance.rounding.normal radius: Appearance.rounding.normal
StackView { StackView {
@@ -157,6 +160,7 @@ Item {
id: background id: background
Cat.Background { Cat.Background {
screen: root.screen
} }
} }
@@ -243,4 +247,11 @@ Item {
Cat.SystemUpdates { Cat.SystemUpdates {
} }
} }
Component {
id: plugins
Cat.Plugins {
}
}
} }
@@ -0,0 +1,161 @@
pragma ComponentBehavior: Bound
import Quickshell
import QtQuick
import QtQuick.Layouts
import qs.Config
import qs.Components
Item {
id: root
required property string name
required property var object
property alias row: row
required property string setting
property bool shouldBeActive: true
required property list<var> stringList
signal optionSet(option: string)
anchors.left: parent.left
anchors.right: parent.right
implicitHeight: shouldBeActive ? row.height : 0
opacity: shouldBeActive ? 1 : 0
scale: shouldBeActive ? 1 : 0.8
visible: opacity > 0
Behavior on opacity {
Anim {
}
}
Behavior on scale {
Anim {
}
}
Behavior on y {
Anim {
}
}
RowLayout {
id: row
anchors.left: parent.left
anchors.margins: Appearance.padding.small
anchors.right: parent.right
anchors.verticalCenter: parent.verticalCenter
CustomText {
id: text
Layout.fillWidth: true
font.pointSize: Appearance.font.size.larger
text: root.name
}
CustomClippingRect {
Layout.preferredHeight: 42 * 6 + Appearance.padding.normal * 2 + Appearance.spacing.small * 5
Layout.preferredWidth: 500
color: DynamicColors.tPalette.m3surfaceContainer
radius: (21 + Appearance.padding.normal) * Appearance.rounding.scale
CustomRect {
id: searchBox
anchors.left: parent.left
anchors.margins: Appearance.padding.normal
anchors.right: parent.right
anchors.top: parent.top
color: DynamicColors.tPalette.m3surfaceContainer
implicitHeight: 42
radius: Appearance.rounding.full
MaterialIcon {
id: searchIcon
anchors.bottom: parent.bottom
anchors.left: parent.left
anchors.leftMargin: Appearance.padding.large
anchors.top: parent.top
font.pointSize: Appearance.font.size.large
text: "search"
verticalAlignment: Text.AlignVCenter
}
CustomTextField {
id: textSearch
anchors.left: searchIcon.right
anchors.leftMargin: Appearance.spacing.small
anchors.right: parent.right
anchors.rightMargin: Appearance.spacing.normal
anchors.verticalCenter: parent.verticalCenter
placeholderText: "Search..."
}
}
CustomClippingRect {
anchors.bottom: parent.bottom
anchors.left: parent.left
anchors.margins: Appearance.padding.normal
anchors.right: parent.right
anchors.top: searchBox.bottom
bottomLeftRadius: 21
bottomRightRadius: 21
CustomListView {
anchors.fill: parent
clip: true
spacing: Appearance.spacing.small
delegate: CustomRect {
id: delegate
required property string modelData
anchors.left: parent.left
anchors.right: parent.right
implicitHeight: 42
radius: Appearance.rounding.smallest
CustomText {
anchors.fill: parent
anchors.leftMargin: Appearance.padding.normal
text: modelData
verticalAlignment: Text.AlignVCenter
}
MaterialIcon {
anchors.fill: parent
anchors.rightMargin: Appearance.padding.normal
color: DynamicColors.palette.m3primary
font.pointSize: Appearance.font.size.large
horizontalAlignment: Text.AlignRight
text: "check_circle"
verticalAlignment: Text.AlignVCenter
visible: root.object[root.setting] === delegate.modelData
}
StateLayer {
onClicked: {
root.object[root.setting] = delegate.modelData;
root.optionSet(delegate.modelData);
Config.save();
}
}
}
model: ScriptModel {
values: {
const values = root.stringList;
const search = textSearch.text;
var regex = new RegExp(search, "i");
return values.filter(n => regex.test(n));
}
}
}
}
}
}
}
+21 -2
View File
@@ -6,7 +6,26 @@ import qs.Config
CustomRect { CustomRect {
id: root id: root
Layout.fillWidth: true property bool shouldBeActive: true
Layout.preferredHeight: 1
anchors.left: parent.left
anchors.right: parent.right
color: DynamicColors.tPalette.m3outlineVariant color: DynamicColors.tPalette.m3outlineVariant
implicitHeight: shouldBeActive ? 1 : 0
opacity: shouldBeActive ? 1 : 0
scale: shouldBeActive ? 1 : 0.8
visible: opacity > 0
Behavior on opacity {
Anim {
}
}
Behavior on scale {
Anim {
}
}
Behavior on y {
Anim {
}
}
} }
@@ -13,6 +13,7 @@ ColumnLayout {
required property string name required property string name
required property var object required property var object
required property string setting required property string setting
property bool shouldBeActive: true
function addAction() { function addAction() {
const list = [...root.object[root.setting]]; const list = [...root.object[root.setting]];
@@ -44,8 +45,26 @@ ColumnLayout {
Config.save(); Config.save();
} }
Layout.fillWidth: true anchors.left: parent.left
anchors.right: parent.right
height: shouldBeActive ? implicitHeight : 0
opacity: shouldBeActive ? 1 : 0
scale: shouldBeActive ? 1 : 0.8
spacing: Appearance.spacing.smaller spacing: Appearance.spacing.smaller
visible: opacity > 0
Behavior on opacity {
Anim {
}
}
Behavior on scale {
Anim {
}
}
Behavior on y {
Anim {
}
}
Rectangle { Rectangle {
anchors.fill: parent anchors.fill: parent
@@ -108,6 +127,9 @@ ColumnLayout {
} }
Separator { Separator {
Layout.fillWidth: true
anchors.left: undefined
anchors.right: undefined
} }
RowLayout { RowLayout {
@@ -188,6 +210,8 @@ ColumnLayout {
StringListEditor { StringListEditor {
Layout.fillWidth: true Layout.fillWidth: true
addLabel: qsTr("Add command argument") addLabel: qsTr("Add command argument")
anchors.left: undefined
anchors.right: undefined
values: [...(modelData.command ?? [])] values: [...(modelData.command ?? [])]
onListEdited: function (values) { onListEdited: function (values) {
@@ -196,6 +220,9 @@ ColumnLayout {
} }
Separator { Separator {
Layout.fillWidth: true
anchors.left: undefined
anchors.right: undefined
} }
RowLayout { RowLayout {
@@ -214,6 +241,9 @@ ColumnLayout {
} }
Separator { Separator {
Layout.fillWidth: true
anchors.left: undefined
anchors.right: undefined
} }
RowLayout { RowLayout {
+139 -108
View File
@@ -6,13 +6,14 @@ import qs.Components
import qs.Config import qs.Config
import qs.Helpers import qs.Helpers
ColumnLayout { CustomRect {
id: root id: root
readonly property bool highlighted: SettingsHighlight.highlightedSetting === name readonly property bool highlighted: SettingsHighlight.highlightedSetting === name
required property string name required property string name
required property var object required property var object
required property string setting required property string setting
property bool shouldBeActive: true
function addAlias() { function addAlias() {
const list = [...root.object[root.setting]]; const list = [...root.object[root.setting]];
@@ -40,8 +41,25 @@ ColumnLayout {
Config.save(); Config.save();
} }
Layout.fillWidth: true anchors.left: parent.left
spacing: Appearance.spacing.smaller anchors.right: parent.right
height: shouldBeActive ? layout.implicitHeight : 0
opacity: shouldBeActive ? 1 : 0
scale: shouldBeActive ? 1 : 0.8
visible: opacity > 0
Behavior on opacity {
Anim {
}
}
Behavior on scale {
Anim {
}
}
Behavior on y {
Anim {
}
}
Rectangle { Rectangle {
anchors.fill: parent anchors.fill: parent
@@ -58,115 +76,128 @@ ColumnLayout {
} }
} }
CustomText { ColumnLayout {
Layout.fillWidth: true id: layout
font.pointSize: Appearance.font.size.larger
text: root.name
}
Repeater { anchors.left: parent.left
model: [...root.object[root.setting]] anchors.right: parent.right
anchors.verticalCenter: parent.verticalCenter
Item { spacing: Appearance.spacing.smaller
required property int index
required property var modelData
Layout.fillWidth: true
Layout.preferredHeight: layout.implicitHeight + Appearance.padding.smaller * 2
CustomRect {
anchors.left: parent.left
anchors.right: parent.right
anchors.top: parent.top
anchors.topMargin: -(Appearance.spacing.smaller / 2)
color: DynamicColors.tPalette.m3outlineVariant
implicitHeight: 1
visible: index !== 0
}
ColumnLayout {
id: layout
anchors.left: parent.left
anchors.margins: Appearance.padding.small
anchors.right: parent.right
anchors.verticalCenter: parent.verticalCenter
spacing: Appearance.spacing.small
RowLayout {
Layout.fillWidth: true
CustomText {
Layout.fillWidth: true
text: qsTr("From")
}
CustomRect {
Layout.fillWidth: true
Layout.preferredHeight: 33
color: DynamicColors.tPalette.m3surfaceContainerHigh
radius: Appearance.rounding.full
CustomTextField {
anchors.fill: parent
anchors.leftMargin: Appearance.padding.normal
anchors.rightMargin: Appearance.padding.normal
text: modelData.from ?? ""
onEditingFinished: root.updateAlias(index, "from", text)
}
}
IconButton {
font.pointSize: Appearance.font.size.large
icon: "delete"
type: IconButton.Tonal
onClicked: root.removeAlias(index)
}
}
RowLayout {
Layout.fillWidth: true
CustomText {
Layout.fillWidth: true
text: qsTr("To")
}
CustomRect {
Layout.fillWidth: true
Layout.preferredHeight: 33
color: DynamicColors.tPalette.m3surface
radius: Appearance.rounding.small
CustomTextField {
anchors.fill: parent
anchors.leftMargin: Appearance.padding.normal
anchors.rightMargin: Appearance.padding.normal
text: modelData.to ?? ""
onEditingFinished: root.updateAlias(index, "to", text)
}
}
}
}
}
}
RowLayout {
Layout.fillWidth: true
IconButton {
font.pointSize: Appearance.font.size.large
icon: "add"
onClicked: root.addAlias()
}
CustomText { CustomText {
Layout.fillWidth: true Layout.fillWidth: true
text: qsTr("Add alias") font.pointSize: Appearance.font.size.larger
text: root.name
}
Repeater {
model: [...root.object[root.setting]]
Item {
required property int index
required property var modelData
Layout.fillWidth: true
Layout.preferredHeight: layout.implicitHeight + Appearance.padding.smaller * 2
CustomRect {
anchors.left: parent.left
anchors.right: parent.right
anchors.top: parent.top
anchors.topMargin: -(Appearance.spacing.smaller / 2)
color: DynamicColors.tPalette.m3outlineVariant
implicitHeight: 1
visible: index !== 0
}
ColumnLayout {
id: layout
anchors.left: parent.left
anchors.margins: Appearance.padding.small
anchors.right: parent.right
anchors.verticalCenter: parent.verticalCenter
spacing: Appearance.spacing.small
RowLayout {
Layout.fillWidth: true
CustomText {
Layout.fillWidth: true
text: qsTr("From")
}
CustomRect {
Layout.preferredHeight: 33
Layout.preferredWidth: Math.max(Math.min(fromTextField.contentWidth + Appearance.padding.large * 2, 550), 50)
color: DynamicColors.tPalette.m3surfaceContainerHigh
radius: Appearance.rounding.full
CustomTextField {
id: fromTextField
anchors.centerIn: parent
horizontalAlignment: Text.AlignHCenter
implicitWidth: Math.min(contentWidth + Appearance.padding.normal * 2, 550)
text: modelData.from ?? ""
onEditingFinished: root.updateAlias(index, "from", text)
}
}
IconButton {
font.pointSize: Appearance.font.size.large
icon: "delete"
type: IconButton.Tonal
onClicked: root.removeAlias(index)
}
}
RowLayout {
Layout.fillWidth: true
CustomText {
Layout.fillWidth: true
text: qsTr("To")
}
CustomRect {
Layout.preferredHeight: 33
Layout.preferredWidth: Math.max(Math.min(toTextField.contentWidth + Appearance.padding.large * 2, 550), 50)
color: DynamicColors.tPalette.m3surfaceContainerHigh
radius: Appearance.rounding.full
CustomTextField {
id: toTextField
anchors.centerIn: parent
horizontalAlignment: Text.AlignHCenter
implicitWidth: Math.min(contentWidth + Appearance.padding.normal * 2, 550)
text: modelData.to ?? ""
onEditingFinished: root.updateAlias(index, "to", text)
}
}
}
}
}
}
RowLayout {
Layout.fillWidth: true
IconButton {
font.pointSize: Appearance.font.size.large
icon: "add"
onClicked: root.addAlias()
}
CustomText {
Layout.fillWidth: true
text: qsTr("Add alias")
}
} }
} }
} }
@@ -25,6 +25,7 @@ Item {
required property var object required property var object
property var pendingCommitEntries: [] property var pendingCommitEntries: []
required property string setting required property string setting
property bool shouldBeActive: true
property int uidCounter: 0 property int uidCounter: 0
property var visualEntries: [] property var visualEntries: []
@@ -146,8 +147,25 @@ Item {
Config.save(); Config.save();
} }
Layout.fillWidth: true anchors.left: parent.left
implicitHeight: layout.implicitHeight anchors.right: parent.right
implicitHeight: shouldBeActive ? layout.implicitHeight : 0
opacity: shouldBeActive ? 1 : 0
scale: shouldBeActive ? 1 : 0.8
visible: opacity > 0
Behavior on opacity {
Anim {
}
}
Behavior on scale {
Anim {
}
}
Behavior on y {
Anim {
}
}
Component.onCompleted: root.rebuildVisualEntries() Component.onCompleted: root.rebuildVisualEntries()
@@ -11,6 +11,7 @@ Item {
required property string name required property string name
required property var object required property var object
required property list<string> settings required property list<string> settings
property bool shouldBeActive: true
function commitChoice(choice: int, setting: string): void { function commitChoice(choice: int, setting: string): void {
root.object[setting] = choice; root.object[setting] = choice;
@@ -32,8 +33,25 @@ Item {
return Qt.formatTime(d, "h AP"); return Qt.formatTime(d, "h AP");
} }
Layout.fillWidth: true anchors.left: parent.left
Layout.preferredHeight: row.implicitHeight + Appearance.padding.smaller * 2 anchors.right: parent.right
implicitHeight: shouldBeActive ? row.implicitHeight + Appearance.padding.smaller * 2 : 0
opacity: shouldBeActive ? 1 : 0
scale: shouldBeActive ? 1 : 0.8
visible: opacity > 0
Behavior on opacity {
Anim {
}
}
Behavior on scale {
Anim {
}
}
Behavior on y {
Anim {
}
}
Rectangle { Rectangle {
anchors.fill: parent anchors.fill: parent
+20 -2
View File
@@ -11,6 +11,7 @@ Item {
required property string name required property string name
required property var object required property var object
required property string setting required property string setting
property bool shouldBeActive: true
function formattedValue(): string { function formattedValue(): string {
const value = root.object[root.setting]; const value = root.object[root.setting];
@@ -21,8 +22,25 @@ Item {
return String(value); return String(value);
} }
Layout.fillWidth: true anchors.left: parent.left
Layout.preferredHeight: row.implicitHeight + Appearance.padding.smaller * 2 anchors.right: parent.right
implicitHeight: shouldBeActive ? row.implicitHeight + Appearance.padding.smaller * 2 : 0
opacity: shouldBeActive ? 1 : 0
scale: shouldBeActive ? 1 : 0.8
visible: opacity > 0
Behavior on opacity {
Anim {
}
}
Behavior on scale {
Anim {
}
}
Behavior on y {
Anim {
}
}
Rectangle { Rectangle {
anchors.fill: parent anchors.fill: parent
+26 -2
View File
@@ -8,13 +8,31 @@ Item {
required property int index required property int index
required property var modelData required property var modelData
property bool shouldBeActive: true
signal addActiveActionRequested signal addActiveActionRequested
signal deleteRequested(int index) signal deleteRequested(int index)
signal fieldEdited(string key, var value) signal fieldEdited(string key, var value)
Layout.fillWidth: true anchors.left: parent.left
Layout.preferredHeight: row.implicitHeight + Appearance.padding.smaller * 2 anchors.right: parent.right
implicitHeight: shouldBeActive ? row.implicitHeight + Appearance.padding.smaller * 2 : 0
opacity: shouldBeActive ? 1 : 0
scale: shouldBeActive ? 1 : 0.8
visible: opacity > 0
Behavior on opacity {
Anim {
}
}
Behavior on scale {
Anim {
}
}
Behavior on y {
Anim {
}
}
CustomRect { CustomRect {
anchors.left: parent.left anchors.left: parent.left
@@ -176,6 +194,9 @@ Item {
} }
Separator { Separator {
Layout.fillWidth: true
anchors.left: undefined
anchors.right: undefined
} }
RowLayout { RowLayout {
@@ -207,6 +228,9 @@ Item {
} }
Separator { Separator {
Layout.fillWidth: true
anchors.left: undefined
anchors.right: undefined
} }
Item { Item {
+27 -4
View File
@@ -11,10 +11,32 @@ Item {
required property string name required property string name
required property var object required property var object
property alias row: row
required property string setting required property string setting
property bool shouldBeActive: true
required property list<var> stringList
Layout.fillWidth: true signal optionSet
Layout.preferredHeight: row.height
anchors.left: parent.left
anchors.right: parent.right
implicitHeight: shouldBeActive ? row.height : 0
opacity: shouldBeActive ? 1 : 0
scale: shouldBeActive ? 1 : 0.8
visible: opacity > 0
Behavior on opacity {
Anim {
}
}
Behavior on scale {
Anim {
}
}
Behavior on y {
Anim {
}
}
RowLayout { RowLayout {
id: row id: row
@@ -120,17 +142,18 @@ Item {
StateLayer { StateLayer {
onClicked: { onClicked: {
root.object[root.setting] = fontDelegate.modelData; root.object[root.setting] = fontDelegate.modelData;
root.optionSet();
Config.save(); Config.save();
} }
} }
} }
model: ScriptModel { model: ScriptModel {
values: { values: {
const fonts = Qt.fontFamilies(); const values = root.stringList;
const search = fontSearch.text; const search = fontSearch.text;
var regex = new RegExp(search, "i"); var regex = new RegExp(search, "i");
return fonts.filter(n => regex.test(n)); return values.filter(n => regex.test(n));
} }
} }
} }
+20 -2
View File
@@ -9,10 +9,28 @@ Item {
readonly property bool highlighted: SettingsHighlight.highlightedSetting === name readonly property bool highlighted: SettingsHighlight.highlightedSetting === name
required property string name required property string name
property bool shouldBeActive: true
required property string value required property string value
Layout.fillWidth: true anchors.left: parent.left
Layout.preferredHeight: row.implicitHeight + Appearance.padding.smaller * 2 anchors.right: parent.right
implicitHeight: shouldBeActive ? row.implicitHeight + Appearance.padding.smaller * 2 : 0
opacity: shouldBeActive ? 1 : 0
scale: shouldBeActive ? 1 : 0.8
visible: opacity > 0
Behavior on opacity {
Anim {
}
}
Behavior on scale {
Anim {
}
}
Behavior on y {
Anim {
}
}
Rectangle { Rectangle {
anchors.fill: parent anchors.fill: parent
+20 -2
View File
@@ -13,10 +13,28 @@ Item {
required property string name required property string name
required property var object required property var object
required property string setting required property string setting
property bool shouldBeActive: true
property real step: 1 property real step: 1
Layout.fillWidth: true anchors.left: parent.left
Layout.preferredHeight: row.implicitHeight + Appearance.padding.smaller * 2 anchors.right: parent.right
implicitHeight: shouldBeActive ? row.implicitHeight + Appearance.padding.smaller * 2 : 0
opacity: shouldBeActive ? 1 : 0
scale: shouldBeActive ? 1 : 0.8
visible: opacity > 0
Behavior on opacity {
Anim {
}
}
Behavior on scale {
Anim {
}
}
Behavior on y {
Anim {
}
}
Rectangle { Rectangle {
anchors.fill: parent anchors.fill: parent
+20 -2
View File
@@ -11,6 +11,7 @@ Item {
required property string name required property string name
required property var object required property var object
required property list<string> settings required property list<string> settings
property bool shouldBeActive: true
function commitChoice(choice: int, setting: string): void { function commitChoice(choice: int, setting: string): void {
root.object[setting] = choice; root.object[setting] = choice;
@@ -32,8 +33,25 @@ Item {
return Qt.formatTime(d, "h AP"); return Qt.formatTime(d, "h AP");
} }
Layout.fillWidth: true anchors.left: parent.left
Layout.preferredHeight: row.implicitHeight + Appearance.padding.smaller * 2 anchors.right: parent.right
implicitHeight: shouldBeActive ? row.implicitHeight + Appearance.padding.smaller * 2 : 0
opacity: shouldBeActive ? 1 : 0
scale: shouldBeActive ? 1 : 0.8
visible: opacity > 0
Behavior on opacity {
Anim {
}
}
Behavior on scale {
Anim {
}
}
Behavior on y {
Anim {
}
}
Rectangle { Rectangle {
anchors.fill: parent anchors.fill: parent
@@ -12,9 +12,27 @@ Item {
required property string name required property string name
required property var object required property var object
required property string setting required property string setting
property bool shouldBeActive: true
Layout.fillWidth: true anchors.left: parent.left
Layout.preferredHeight: layout.implicitHeight anchors.right: parent.right
implicitHeight: shouldBeActive ? layout.implicitHeight : 0
opacity: shouldBeActive ? 1 : 0
scale: shouldBeActive ? 1 : 0.8
visible: opacity > 0
Behavior on opacity {
Anim {
}
}
Behavior on scale {
Anim {
}
}
Behavior on y {
Anim {
}
}
Rectangle { Rectangle {
anchors.fill: parent anchors.fill: parent
@@ -46,6 +64,9 @@ Item {
StringListEditor { StringListEditor {
Layout.fillWidth: true Layout.fillWidth: true
addLabel: root.addLabel addLabel: root.addLabel
anchors.left: undefined
anchors.right: undefined
anchors.verticalCenter: undefined
values: [...(root.object[root.setting] ?? [])] values: [...(root.object[root.setting] ?? [])]
onListEdited: function (values) { onListEdited: function (values) {
+20 -2
View File
@@ -11,9 +11,27 @@ Item {
required property string name required property string name
required property var object required property var object
required property string setting required property string setting
property bool shouldBeActive: true
Layout.fillWidth: true anchors.left: parent.left
Layout.preferredHeight: row.implicitHeight + Appearance.padding.smaller * 2 anchors.right: parent.right
implicitHeight: shouldBeActive ? row.implicitHeight + Appearance.padding.smaller * 2 : 0
opacity: shouldBeActive ? 1 : 0
scale: shouldBeActive ? 1 : 0.8
visible: opacity > 0
Behavior on opacity {
Anim {
}
}
Behavior on scale {
Anim {
}
}
Behavior on y {
Anim {
}
}
Rectangle { Rectangle {
anchors.fill: parent anchors.fill: parent
+6 -2
View File
@@ -7,9 +7,13 @@ CustomRect {
id: root id: root
required property string name required property string name
property bool shouldBeActive: true
Layout.preferredHeight: 60 implicitHeight: 60
Layout.preferredWidth: 200 implicitWidth: 200
opacity: shouldBeActive ? 1 : 0
scale: shouldBeActive ? 1 : 0.8
visible: opacity > 0
CustomText { CustomText {
anchors.fill: parent anchors.fill: parent
@@ -0,0 +1,83 @@
import Quickshell
import QtQuick
import QtQuick.Layouts
import qs.Paths
import qs.Components
import qs.Config
import qs.Helpers
Item {
id: root
property alias button: iButton
readonly property bool highlighted: SettingsHighlight.highlightedSetting === name
required property string name
property bool shouldBeActive: true
anchors.left: parent.left
anchors.right: parent.right
implicitHeight: shouldBeActive ? row.implicitHeight + Appearance.padding.smaller * 2 : 0
opacity: shouldBeActive ? 1 : 0
scale: shouldBeActive ? 1 : 0.8
visible: opacity > 0
Behavior on opacity {
Anim {
}
}
Behavior on scale {
Anim {
}
}
Behavior on y {
Anim {
}
}
Rectangle {
anchors.fill: parent
anchors.margins: -Appearance.padding.smaller
color: DynamicColors.palette.m3primaryContainer
opacity: root.highlighted ? 0.5 : 0
radius: Appearance.rounding.small
Behavior on opacity {
Anim {
duration: Appearance.anim.durations.normal
}
}
}
RowLayout {
id: row
anchors.left: parent.left
anchors.margins: Appearance.padding.small
anchors.right: parent.right
anchors.verticalCenter: parent.verticalCenter
CustomText {
id: text
Layout.alignment: Qt.AlignLeft | Qt.AlignVCenter
Layout.fillWidth: true
font.pointSize: Appearance.font.size.larger
text: root.name
}
IconButton {
id: iButton
Layout.alignment: Qt.AlignRight | Qt.AlignVCenter
icon: "download"
onClicked: {
const lockBg = `${Paths.state}/lockscreen_bg.png`;
const scheme = `${Paths.state}/scheme.json`;
const face = `${Paths.home}/.face`;
const destination = "/etc/zshell-greeter/images";
Quickshell.execDetached(["pkexec", "sh", "-c", `mkdir -p ${destination}; cp ${lockBg} ${destination}; cp ${scheme} /etc/zshell-greeter; cp ${face} ${destination}`]);
}
}
}
}
+7 -1
View File
@@ -60,12 +60,18 @@ CustomClippingRect {
} }
} }
ColumnLayout { Column {
id: clayout id: clayout
anchors.left: parent.left anchors.left: parent.left
anchors.right: parent.right anchors.right: parent.right
spacing: Appearance.spacing.small spacing: Appearance.spacing.small
// move: Transition {
// Anim {
// properties: "y"
// }
// }
} }
} }
} }
+25 -4
View File
@@ -10,18 +10,39 @@ CustomRect {
property real contentPadding: Appearance.padding.large property real contentPadding: Appearance.padding.large
property string sectionId: "" property string sectionId: ""
Layout.fillWidth: true anchors.left: parent.left
Layout.preferredHeight: layout.implicitHeight + contentPadding * 2 anchors.right: parent.right
color: DynamicColors.tPalette.m3surfaceContainer color: DynamicColors.tPalette.m3surfaceContainer
implicitHeight: layout.height + contentPadding * 2
radius: Appearance.rounding.normal - Appearance.padding.smaller radius: Appearance.rounding.normal - Appearance.padding.smaller
ColumnLayout { Behavior on implicitHeight {
Anim {
}
}
Behavior on y {
Anim {
}
}
Column {
id: layout id: layout
anchors.left: parent.left anchors.left: parent.left
anchors.margins: root.contentPadding anchors.margins: root.contentPadding
anchors.right: parent.right anchors.right: parent.right
anchors.verticalCenter: parent.verticalCenter anchors.top: parent.top
// anchors.verticalCenter: parent.verticalCenter
spacing: Appearance.spacing.normal spacing: Appearance.spacing.normal
Behavior on height {
Anim {
}
}
move: Transition {
Anim {
properties: "y"
}
}
} }
} }
@@ -12,12 +12,29 @@ CustomRect {
property alias expanded: menu.expanded property alias expanded: menu.expanded
property alias label: label property alias label: label
property alias menu: menu property alias menu: menu
property bool shouldBeActive: true
property alias text: label.text property alias text: label.text
color: enabled ? DynamicColors.palette.m3primary : DynamicColors.layer(DynamicColors.palette.m3surfaceContainerHigh, 2) color: enabled ? DynamicColors.palette.m3primary : DynamicColors.layer(DynamicColors.palette.m3surfaceContainerHigh, 2)
opacity: shouldBeActive ? 1 : 0
radius: Appearance.rounding.full radius: Appearance.rounding.full
scale: shouldBeActive ? 1 : 0.8
visible: opacity > 0
z: expanded ? 100 : 0 z: expanded ? 100 : 0
Behavior on opacity {
Anim {
}
}
Behavior on scale {
Anim {
}
}
Behavior on y {
Anim {
}
}
CustomText { CustomText {
id: label id: label
+20 -1
View File
@@ -9,6 +9,7 @@ ColumnLayout {
id: root id: root
property string addLabel: qsTr("Add entry") property string addLabel: qsTr("Add entry")
property bool shouldBeActive: true
property var values: [] property var values: []
signal listEdited(var values) signal listEdited(var values)
@@ -31,8 +32,26 @@ ColumnLayout {
root.listEdited(list); root.listEdited(list);
} }
Layout.fillWidth: true anchors.left: parent.left
anchors.right: parent.right
height: shouldBeActive ? implicitHeight : 0
opacity: shouldBeActive ? 1 : 0
scale: shouldBeActive ? 1 : 0.8
spacing: Appearance.spacing.smaller spacing: Appearance.spacing.smaller
visible: opacity > 0
Behavior on opacity {
Anim {
}
}
Behavior on scale {
Anim {
}
}
Behavior on y {
Anim {
}
}
Repeater { Repeater {
model: [...root.values] model: [...root.values]
+248 -83
View File
@@ -1,113 +1,278 @@
pragma ComponentBehavior: Bound
import QtQuick import QtQuick
import QtQuick.Layouts import QtQuick.Layouts
import QtQuick.Controls
import Quickshell import Quickshell
import Quickshell.Hyprland
import ZShell.Internal
import qs.Config import qs.Config
import qs.Components import qs.Components
import qs.Helpers import qs.Helpers
Item { Item {
id: root id: wrapper
Image { property bool changesMade: false
id: imageView property bool shouldBeActive: true
property real displayH: paintedHeight signal requestCrop
property real displayW: paintedWidth
property real displayX: (width - paintedWidth) * 0.5
property real displayY: (height - paintedHeight) * 0.5
property real scaleX: sourceW / displayW
property real scaleY: sourceH / displayH
property real sourceH: Quickshell.screens[0].height
property real sourceW: Quickshell.screens[0].width
anchors.fill: parent anchors.left: parent.left
fillMode: Image.PreserveAspectFit anchors.right: parent.right
smooth: true implicitHeight: shouldBeActive ? 400 : 0
source: Wallpapers.current opacity: shouldBeActive ? 1 : 0
scale: shouldBeActive ? 1 : 0.8
visible: opacity > 0
Behavior on opacity {
Anim {
}
}
Behavior on scale {
Anim {
}
}
Behavior on y {
Anim {
}
} }
Item { IconButton {
id: overlay anchors.margins: Appearance.padding.normal
anchors.right: parent.right
anchors.top: parent.top
icon: "check"
opacity: wrapper.changesMade ? 1 : 0
scale: wrapper.changesMade ? 1 : 0
z: 2
clip: true Behavior on opacity {
height: imageView.displayH Anim {
width: imageView.displayW }
x: imageView.displayX }
y: imageView.displayY Behavior on scale {
Anim {
CustomRect {
id: cropRect
property real aspectRatio: Quickshell.screens[0].width / Quickshell.screens[0].height
readonly property rect sourceRect: Qt.rect(x * imageView.scaleX, y * imageView.scaleY, width * imageView.scaleX, height * imageView.scaleY)
property real zoom: Config.background.zoom
function clampToBounds() {
x = Math.max(0, Math.min(x, overlay.width - width));
y = Math.max(0, Math.min(y, overlay.height - height));
} }
border.color: DynamicColors.palette.m3primary
border.width: 2
color: DynamicColors.tPalette.m3primary
height: width / aspectRatio
radius: Appearance.rounding.small
visible: imageView.status === Image.Ready
width: Math.min(overlay.width / zoom, overlay.height * aspectRatio / zoom)
x: Config.background.sourceClipX / imageView.scaleX
y: Config.background.sourceClipY / imageView.scaleY
} }
MouseArea { onClicked: {
function updateCrop(mouseX, mouseY) { wrapper.requestCrop();
let nx = mouseX - cropRect.width * 0.5; wrapper.changesMade = false;
let ny = mouseY - cropRect.height * 0.5; }
}
nx = Math.max(0, Math.min(nx, overlay.width - cropRect.width)); RowLayout {
id: root
ny = Math.max(0, Math.min(ny, overlay.height - cropRect.height)); anchors.fill: parent
spacing: Appearance.spacing.normal
cropRect.x = nx; Repeater {
cropRect.y = ny; model: ScriptModel {
values: [...Quickshell.screens].sort((a, b) => {
return a.x - b.x;
})
} }
anchors.fill: parent Item {
hoverEnabled: true id: delegate
preventStealing: true
onPositionChanged: mouse => { required property ShellScreen modelData
if (pressed)
updateCrop(mouse.x, mouse.y);
}
onPressed: mouse => {
updateCrop(mouse.x, mouse.y);
}
onReleased: {
Wallpapers.recentlyChanged = false;
Config.background.sourceClipX = cropRect.sourceRect.x;
Config.background.sourceClipY = cropRect.sourceRect.y;
Config.background.sourceClipW = cropRect.sourceRect.width;
Config.background.sourceClipH = cropRect.sourceRect.height;
Config.save();
}
onWheel: wheel => {
let oldCenterX = cropRect.x + cropRect.width * 0.5;
let oldCenterY = cropRect.y + cropRect.height * 0.5;
if (wheel.angleDelta.y > 0) function applyCrop(): void {
cropRect.zoom *= 1.1; const croprect = cropRect.mapToItem(scaledImg, 0, 0, cropRect.width, cropRect.height);
else const upscaledRect = Qt.rect((croprect.x - cropRect.imageX) / scaledImg.paintedWidth, (croprect.y - cropRect.imageY) / scaledImg.paintedHeight, croprect.width / scaledImg.paintedWidth, croprect.height / scaledImg.paintedHeight);
cropRect.zoom /= 1.1; Wallpapers.setCrop(delegate.modelData.name, upscaledRect, croprect, cropRect.zoom);
}
cropRect.zoom = Math.max(1.0, Math.min(cropRect.zoom, 10.0)); function zoomClipRect(zoom: real): void {
Config.background.zoom = cropRect.zoom; let oldCenterX = cropRect.x + cropRect.width * 0.5;
let oldCenterY = cropRect.y + cropRect.height * 0.5;
cropRect.x = oldCenterX - cropRect.width * 0.5; cropRect.zoom = zoom;
cropRect.y = oldCenterY - cropRect.height * 0.5;
cropRect.clampToBounds(); cropRect.x = oldCenterX - cropRect.width * 0.5;
cropRect.y = oldCenterY - cropRect.height * 0.5;
cropRect.clampToBounds();
}
Layout.fillHeight: true
Layout.fillWidth: true
Connections {
function onRequestCrop(): void {
delegate.applyCrop();
}
target: wrapper
}
RowLayout {
id: sliderLayout
anchors.bottom: parent.bottom
anchors.left: parent.left
anchors.right: parent.right
implicitHeight: 30
spacing: Appearance.spacing.large
CustomText {
text: qsTr("Crop scale")
}
CustomSlider {
id: zoomSlider
Layout.fillWidth: true
Layout.preferredHeight: 10
from: 1.0
to: 5.0
value: cropRect.zoom
onMoved: {
delegate.zoomClipRect(value);
wrapper.changesMade = true;
}
}
}
CachingImage {
id: scaledImg
property var displayData
property real monitorScale: 1.0
anchors.bottom: sliderLayout.top
anchors.bottomMargin: Appearance.spacing.normal
anchors.left: parent.left
anchors.right: parent.right
anchors.top: parent.top
asynchronous: true
fillMode: Image.PreserveAspectFit
// retainWhileLoading: true
source: Wallpapers.current
sourceSize.height: parent.height
sourceSize.width: parent.width
onPaintedWidthChanged: {
if (paintedWidth > 0) {
scaledImg.displayData = Wallpapers.getCrop(delegate.modelData.name);
cropRect.zoom = Wallpapers.getCrop(delegate.modelData.name).zoom;
cropRect.restoreFromData();
}
}
onSourceChanged: cropRect.clampToBounds()
onStatusChanged: if (scaledImg.status == Image.Ready)
cropRect.clampToBounds()
CustomText {
id: monitorId
anchors.centerIn: parent
color: Qt.alpha(DynamicColors.palette.m3surface, 0.85)
font.pointSize: Appearance.font.size.large * 4
style: Text.Outline
styleColor: DynamicColors.palette.m3onSurface
text: delegate.modelData.name
}
CustomRect {
id: cropRect
property real aspectRatio: delegate.modelData.width / delegate.modelData.height
readonly property real baseHeight: baseWidth / aspectRatio
readonly property real baseWidth: {
let fittedHeight = scaledImg.paintedHeight;
let fittedWidth = fittedHeight * aspectRatio;
if (fittedWidth > scaledImg.paintedWidth) {
fittedWidth = scaledImg.paintedWidth;
fittedHeight = fittedWidth / aspectRatio;
}
return fittedWidth;
}
readonly property real imageX: (scaledImg.width - scaledImg.paintedWidth) / 2
readonly property real imageY: (scaledImg.height - scaledImg.paintedHeight) / 2
property real imgAspectRatio: scaledImg.paintedWidth / scaledImg.paintedHeight
property real zoom: scaledImg.displayData.zoom
function centerInImage() {
x = imageX + (scaledImg.paintedWidth - width) / 2;
y = imageY + (scaledImg.paintedHeight - height) / 2;
}
function clampToBounds() {
x = Math.max(imageX, Math.min(x, imageX + scaledImg.paintedWidth - width));
y = Math.max(imageY, Math.min(y, imageY + scaledImg.paintedHeight - height));
}
function restoreFromData() {
let data = scaledImg.displayData;
if (data && data.scaledX !== 0 || data.scaledY !== 0 || data.scaledWidth !== 0 || data.scaledHeight !== 0) {
x = data.scaledX;
y = data.scaledY;
clampToBounds();
} else {
zoom = 1.0;
centerInImage();
}
}
border.color: DynamicColors.palette.m3primary
border.width: 2
height: baseHeight / zoom
opacity: 1
width: baseWidth / zoom
Behavior on opacity {
Anim {
}
}
Component.onCompleted: clampToBounds()
onHeightChanged: clampToBounds()
onWidthChanged: clampToBounds()
}
MouseArea {
id: mouse
function updateCrop(mouseX, mouseY) {
let nx = mouseX - cropRect.width * 0.5;
let ny = mouseY - cropRect.height * 0.5;
nx = Math.max(cropRect.imageX, Math.min(nx, cropRect.imageX + scaledImg.paintedWidth - cropRect.width));
ny = Math.max(cropRect.imageY, Math.min(ny, cropRect.imageY + scaledImg.paintedHeight - cropRect.height));
cropRect.x = nx;
cropRect.y = ny;
}
anchors.fill: parent
hoverEnabled: true
preventStealing: true
onPositionChanged: mouse => {
if (pressed) {
updateCrop(mouse.x, mouse.y);
wrapper.changesMade = true;
}
}
onPressed: mouse => {
updateCrop(mouse.x, mouse.y);
wrapper.changesMade = true;
}
onReleased: {
wrapper.changesMade = true;
}
}
}
} }
} }
} }
+54 -42
View File
@@ -12,37 +12,30 @@ GridView {
readonly property int columnsCount: Math.max(1, Math.floor(width / minCellWidth)) readonly property int columnsCount: Math.max(1, Math.floor(width / minCellWidth))
readonly property int minCellWidth: 200 + Appearance.spacing.normal readonly property int minCellWidth: 200 + Appearance.spacing.normal
property bool shouldBeActive: true
Layout.preferredHeight: contentHeight anchors.left: parent.left
anchors.right: parent.right
cellHeight: 140 + Appearance.spacing.normal cellHeight: 140 + Appearance.spacing.normal
cellWidth: width / columnsCount cellWidth: width / columnsCount
clip: true clip: true
implicitHeight: shouldBeActive ? contentHeight : 0
interactive: false interactive: false
model: Wallpapers.list model: Wallpapers.list
opacity: shouldBeActive ? 1 : 0
scale: shouldBeActive ? 1 : 0.8
visible: opacity > 0
delegate: Item { delegate: Item {
required property int index required property int index
readonly property bool isCurrent: modelData && modelData.path === Wallpapers.actualCurrent readonly property bool isCurrent: modelData && modelData.path === Wallpapers.actualCurrent
readonly property real itemMargin: Appearance.spacing.normal / 2 readonly property real itemMargin: Appearance.spacing.normal
readonly property real itemRadius: Appearance.rounding.normal readonly property real itemRadius: Appearance.rounding.small
required property var modelData required property var modelData
height: root.cellHeight height: root.cellHeight
width: root.cellWidth width: root.cellWidth
StateLayer {
function onClicked(): void {
Wallpapers.setWallpaper(modelData.path);
}
anchors.bottomMargin: itemMargin
anchors.fill: parent
anchors.leftMargin: itemMargin
anchors.rightMargin: itemMargin
anchors.topMargin: itemMargin
radius: itemRadius
}
CustomClippingRect { CustomClippingRect {
id: image id: image
@@ -53,8 +46,6 @@ GridView {
anchors.topMargin: itemMargin anchors.topMargin: itemMargin
antialiasing: true antialiasing: true
color: DynamicColors.tPalette.m3surfaceContainer color: DynamicColors.tPalette.m3surfaceContainer
layer.enabled: true
layer.smooth: true
radius: itemRadius radius: itemRadius
CachingImage { CachingImage {
@@ -100,6 +91,33 @@ GridView {
} }
} }
Rectangle {
anchors.fill: parent
antialiasing: true
border.color: DynamicColors.palette.m3primary
border.width: isCurrent ? 2 : 0
color: "transparent"
radius: itemRadius + 2
smooth: true
Behavior on border.width {
NumberAnimation {
duration: 150
easing.type: Easing.OutQuad
}
}
MaterialIcon {
anchors.margins: Appearance.padding.small
anchors.right: parent.right
anchors.top: parent.top
color: DynamicColors.palette.m3primary
font.pointSize: Appearance.font.size.large
text: "check_circle"
visible: isCurrent
}
}
Timer { Timer {
id: fallbackTimer id: fallbackTimer
@@ -112,35 +130,29 @@ GridView {
} }
} }
Rectangle { StateLayer {
function onClicked(): void {
Wallpapers.setWallpaper(modelData.path);
}
anchors.bottomMargin: itemMargin anchors.bottomMargin: itemMargin
anchors.fill: parent anchors.fill: parent
anchors.leftMargin: itemMargin anchors.leftMargin: itemMargin
anchors.rightMargin: itemMargin anchors.rightMargin: itemMargin
anchors.topMargin: itemMargin anchors.topMargin: itemMargin
antialiasing: true radius: itemRadius
border.color: DynamicColors.palette.m3primary }
border.width: isCurrent ? 2 : 0 }
color: "transparent" Behavior on opacity {
radius: itemRadius - border.width Anim {
smooth: true }
}
Behavior on border.width { Behavior on scale {
NumberAnimation { Anim {
duration: 150 }
easing.type: Easing.OutQuad }
} Behavior on y {
} Anim {
MaterialIcon {
anchors.margins: Appearance.padding.small
anchors.right: parent.right
anchors.top: parent.top
color: DynamicColors.palette.m3primary
font.pointSize: Appearance.font.size.large
text: "check_circle"
visible: isCurrent
}
} }
} }
} }
+1
View File
@@ -1,5 +1,6 @@
import QtQuick.Layouts import QtQuick.Layouts
import QtQuick import QtQuick
import QtQuick.VectorImage
import Quickshell import Quickshell
import Quickshell.Services.SystemTray import Quickshell.Services.SystemTray
import qs.Modules import qs.Modules
+56 -13
View File
@@ -1,6 +1,7 @@
pragma ComponentBehavior: Bound pragma ComponentBehavior: Bound
import Quickshell import Quickshell
import Quickshell.Hyprland
import QtQuick import QtQuick
import qs.Components import qs.Components
import qs.Helpers import qs.Helpers
@@ -12,31 +13,73 @@ Item {
required property ShellScreen screen required property ShellScreen screen
property string source: Wallpapers.current property string source: Wallpapers.current
function refreshData(): void {
Hyprland.refreshMonitors();
const scale = Hyprland.monitorFor(root.screen).scale;
if (scale > 0 && img.resScale !== scale) {
img.resScale = scale;
img.sourceSize.width = root.screen.width * scale;
}
const displayData = Wallpapers.getCrop(root.screen.name);
const displayRect = Qt.rect(img.sourceSize.width * displayData.x, img.implicitHeight * displayData.y, img.sourceSize.width * displayData.width, img.implicitHeight * displayData.height);
img.anchors.fill = null;
img.zoom = displayData.zoom;
img.x = -(displayRect.x * displayData.zoom / img.resScale);
img.y = -(displayRect.y * displayData.zoom / img.resScale);
}
anchors.fill: parent anchors.fill: parent
Image { Image {
id: img id: img
anchors.fill: parent property int displayH
property int displayW
property real resScale
property real zoom: 1.0
asynchronous: true asynchronous: true
fillMode: Image.PreserveAspectCrop fillMode: Image.PreserveAspectCrop
height: implicitHeight * zoom / resScale
opacity: 1 opacity: 1
retainWhileLoading: true retainWhileLoading: true
source: root.source source: root.source
sourceClipRect: Wallpapers.recentlyChanged ? null : Qt.rect(Config.background.sourceClipX, Config.background.sourceClipY, Config.background.sourceClipW, Config.background.sourceClipH) sourceSize.width: root.screen.width * resScale
sourceSize.height: root.screen.height width: implicitWidth * zoom / resScale
sourceSize.width: root.screen.width
onSourceChanged: { Behavior on height {
if (Wallpapers.recentlyChanged) { Anim {
Config.background.sourceClipH = 0;
Config.background.sourceClipW = 0;
Config.background.sourceClipY = 0;
Config.background.sourceClipX = 0;
Config.background.zoom = 1.0;
Config.save();
} }
Wallpapers.recentlyChanged = true; }
Behavior on width {
Anim {
}
}
Behavior on x {
Anim {
}
}
Behavior on y {
Anim {
}
}
onStatusChanged: {
if (img.status == Image.Ready) {
root.refreshData();
}
}
Connections {
function onAdapterUpdated(): void {
root.refreshData();
}
function onLoaded(): void {
root.refreshData();
}
target: Wallpapers.monitorCrops
} }
} }
} }
+302 -311
View File
@@ -7,473 +7,464 @@
namespace ZShell::models { namespace ZShell::models {
FileSystemEntry::FileSystemEntry(const QString& path, const QString& relativePath, QObject* parent) FileSystemEntry::FileSystemEntry(const QString& path, const QString& relativePath, QObject* parent)
: QObject(parent) : QObject(parent)
, m_fileInfo(path) , m_fileInfo(path)
, m_path(path) , m_path(path)
, m_relativePath(relativePath) , m_relativePath(relativePath)
, m_isImageInitialised(false) , m_isImageInitialised(false)
, m_mimeTypeInitialised(false) {} , m_mimeTypeInitialised(false) {
}
QString FileSystemEntry::path() const { QString FileSystemEntry::path() const {
return m_path; return m_path;
}; };
QString FileSystemEntry::relativePath() const { QString FileSystemEntry::relativePath() const {
return m_relativePath; return m_relativePath;
}; };
QString FileSystemEntry::name() const { QString FileSystemEntry::name() const {
return m_fileInfo.fileName(); return m_fileInfo.fileName();
}; };
QString FileSystemEntry::baseName() const { QString FileSystemEntry::baseName() const {
return m_fileInfo.baseName(); return m_fileInfo.baseName();
}; };
QString FileSystemEntry::parentDir() const { QString FileSystemEntry::parentDir() const {
return m_fileInfo.absolutePath(); return m_fileInfo.absolutePath();
}; };
QString FileSystemEntry::suffix() const { QString FileSystemEntry::suffix() const {
return m_fileInfo.completeSuffix(); return m_fileInfo.completeSuffix();
}; };
qint64 FileSystemEntry::size() const { qint64 FileSystemEntry::size() const {
return m_fileInfo.size(); return m_fileInfo.size();
}; };
bool FileSystemEntry::isDir() const { bool FileSystemEntry::isDir() const {
return m_fileInfo.isDir(); return m_fileInfo.isDir();
}; };
bool FileSystemEntry::isImage() const { bool FileSystemEntry::isImage() const {
if (!m_isImageInitialised) { if (!m_isImageInitialised) {
QImageReader reader(m_path); QImageReader reader(m_path);
m_isImage = reader.canRead(); m_isImage = reader.canRead();
m_isImageInitialised = true; m_isImageInitialised = true;
} }
return m_isImage; return m_isImage;
} }
QString FileSystemEntry::mimeType() const { QString FileSystemEntry::mimeType() const {
if (!m_mimeTypeInitialised) { if (!m_mimeTypeInitialised) {
const QMimeDatabase db; static const QMimeDatabase s_db;
m_mimeType = db.mimeTypeForFile(m_path).name(); m_mimeType = s_db.mimeTypeForFile(m_path).name();
m_mimeTypeInitialised = true; m_mimeTypeInitialised = true;
} }
return m_mimeType; return m_mimeType;
} }
void FileSystemEntry::updateRelativePath(const QDir& dir) { void FileSystemEntry::updateRelativePath(const QDir& dir) {
const auto relPath = dir.relativeFilePath(m_path); const auto relPath = dir.relativeFilePath(m_path);
if (m_relativePath != relPath) { if (m_relativePath != relPath) {
m_relativePath = relPath; m_relativePath = relPath;
emit relativePathChanged(); emit relativePathChanged();
} }
} }
FileSystemModel::FileSystemModel(QObject* parent) FileSystemModel::FileSystemModel(QObject* parent)
: QAbstractListModel(parent) : QAbstractListModel(parent)
, m_recursive(false) , m_recursive(false)
, m_watchChanges(true) , m_watchChanges(true)
, m_showHidden(false) , m_showHidden(false)
, m_filter(NoFilter) { , m_filter(NoFilter) {
connect(&m_watcher, &QFileSystemWatcher::directoryChanged, this, &FileSystemModel::watchDirIfRecursive); connect(&m_watcher, &QFileSystemWatcher::directoryChanged, this, &FileSystemModel::watchDirIfRecursive);
connect(&m_watcher, &QFileSystemWatcher::directoryChanged, this, &FileSystemModel::updateEntriesForDir); connect(&m_watcher, &QFileSystemWatcher::directoryChanged, this, &FileSystemModel::updateEntriesForDir);
} }
int FileSystemModel::rowCount(const QModelIndex& parent) const { int FileSystemModel::rowCount(const QModelIndex& parent) const {
if (parent != QModelIndex()) { if (parent != QModelIndex()) {
return 0; return 0;
} }
return static_cast<int>(m_entries.size()); return static_cast<int>(m_entries.size());
} }
QVariant FileSystemModel::data(const QModelIndex& index, int role) const { QVariant FileSystemModel::data(const QModelIndex& index, int role) const {
if (role != Qt::UserRole || !index.isValid() || index.row() >= m_entries.size()) { if (role != Qt::UserRole || !index.isValid() || index.row() >= m_entries.size()) {
return QVariant(); return QVariant();
} }
return QVariant::fromValue(m_entries.at(index.row())); return QVariant::fromValue(m_entries.at(index.row()));
} }
QHash<int, QByteArray> FileSystemModel::roleNames() const { QHash<int, QByteArray> FileSystemModel::roleNames() const {
return { { Qt::UserRole, "modelData" } }; return { { Qt::UserRole, "modelData" } };
} }
QString FileSystemModel::path() const { QString FileSystemModel::path() const {
return m_path; return m_path;
} }
void FileSystemModel::setPath(const QString& path) { void FileSystemModel::setPath(const QString& path) {
if (m_path == path) { if (m_path == path) {
return; return;
} }
m_path = path; m_path = path;
emit pathChanged(); emit pathChanged();
m_dir.setPath(m_path); m_dir.setPath(m_path);
for (const auto& entry : std::as_const(m_entries)) { for (const auto& entry : std::as_const(m_entries)) {
entry->updateRelativePath(m_dir); entry->updateRelativePath(m_dir);
} }
update(); update();
} }
bool FileSystemModel::recursive() const { bool FileSystemModel::recursive() const {
return m_recursive; return m_recursive;
} }
void FileSystemModel::setRecursive(bool recursive) { void FileSystemModel::setRecursive(bool recursive) {
if (m_recursive == recursive) { if (m_recursive == recursive) {
return; return;
} }
m_recursive = recursive; m_recursive = recursive;
emit recursiveChanged(); emit recursiveChanged();
update(); update();
} }
bool FileSystemModel::watchChanges() const { bool FileSystemModel::watchChanges() const {
return m_watchChanges; return m_watchChanges;
} }
void FileSystemModel::setWatchChanges(bool watchChanges) { void FileSystemModel::setWatchChanges(bool watchChanges) {
if (m_watchChanges == watchChanges) { if (m_watchChanges == watchChanges) {
return; return;
} }
m_watchChanges = watchChanges; m_watchChanges = watchChanges;
emit watchChangesChanged(); emit watchChangesChanged();
update(); update();
} }
bool FileSystemModel::showHidden() const { bool FileSystemModel::showHidden() const {
return m_showHidden; return m_showHidden;
} }
void FileSystemModel::setShowHidden(bool showHidden) { void FileSystemModel::setShowHidden(bool showHidden) {
if (m_showHidden == showHidden) { if (m_showHidden == showHidden) {
return; return;
} }
m_showHidden = showHidden; m_showHidden = showHidden;
emit showHiddenChanged(); emit showHiddenChanged();
update(); update();
} }
bool FileSystemModel::sortReverse() const { bool FileSystemModel::sortReverse() const {
return m_sortReverse; return m_sortReverse;
} }
void FileSystemModel::setSortReverse(bool sortReverse) { void FileSystemModel::setSortReverse(bool sortReverse) {
if (m_sortReverse == sortReverse) { if (m_sortReverse == sortReverse) {
return; return;
} }
m_sortReverse = sortReverse; m_sortReverse = sortReverse;
emit sortReverseChanged(); emit sortReverseChanged();
update(); update();
} }
FileSystemModel::Filter FileSystemModel::filter() const { FileSystemModel::Filter FileSystemModel::filter() const {
return m_filter; return m_filter;
} }
void FileSystemModel::setFilter(Filter filter) { void FileSystemModel::setFilter(Filter filter) {
if (m_filter == filter) { if (m_filter == filter) {
return; return;
} }
m_filter = filter; m_filter = filter;
emit filterChanged(); emit filterChanged();
update(); update();
} }
QStringList FileSystemModel::nameFilters() const { QStringList FileSystemModel::nameFilters() const {
return m_nameFilters; return m_nameFilters;
} }
void FileSystemModel::setNameFilters(const QStringList& nameFilters) { void FileSystemModel::setNameFilters(const QStringList& nameFilters) {
if (m_nameFilters == nameFilters) { if (m_nameFilters == nameFilters) {
return; return;
} }
m_nameFilters = nameFilters; m_nameFilters = nameFilters;
emit nameFiltersChanged(); emit nameFiltersChanged();
update(); update();
} }
QQmlListProperty<FileSystemEntry> FileSystemModel::entries() { QQmlListProperty<FileSystemEntry> FileSystemModel::entries() {
return QQmlListProperty<FileSystemEntry>(this, &m_entries); return QQmlListProperty<FileSystemEntry>(this, &m_entries);
} }
void FileSystemModel::watchDirIfRecursive(const QString& path) { void FileSystemModel::watchDirIfRecursive(const QString& path) {
if (m_recursive && m_watchChanges) { if (m_recursive && m_watchChanges) {
const auto currentDir = m_dir; const auto currentDir = m_dir;
const bool showHidden = m_showHidden; const bool showHidden = m_showHidden;
const auto future = QtConcurrent::run([showHidden, path]() { auto future = QtConcurrent::run([showHidden, path]() {
QDir::Filters filters = QDir::Dirs | QDir::NoDotAndDotDot; QDir::Filters filters = QDir::Dirs | QDir::NoDotAndDotDot;
if (showHidden) { if (showHidden) {
filters |= QDir::Hidden; filters |= QDir::Hidden;
} }
QDirIterator iter(path, filters, QDirIterator::Subdirectories); QDirIterator iter(path, filters, QDirIterator::Subdirectories);
QStringList dirs; QStringList dirs;
while (iter.hasNext()) { while (iter.hasNext()) {
dirs << iter.next(); dirs << iter.next();
} }
return dirs; return dirs;
}); });
const auto watcher = new QFutureWatcher<QStringList>(this); future.then(this, [currentDir, showHidden, this](const QStringList& paths) {
connect(watcher, &QFutureWatcher<QStringList>::finished, this, [currentDir, showHidden, watcher, this]() { if (currentDir == m_dir && showHidden == m_showHidden && !paths.isEmpty()) {
const auto paths = watcher->result(); // Ignore if dir or showHidden has changed
if (currentDir == m_dir && showHidden == m_showHidden && !paths.isEmpty()) { m_watcher.addPaths(paths);
// Ignore if dir or showHidden has changed }
m_watcher.addPaths(paths); });
} }
watcher->deleteLater();
});
watcher->setFuture(future);
}
} }
void FileSystemModel::update() { void FileSystemModel::update() {
updateWatcher(); updateWatcher();
updateEntries(); updateEntries();
} }
void FileSystemModel::updateWatcher() { void FileSystemModel::updateWatcher() {
if (!m_watcher.directories().isEmpty()) { if (!m_watcher.directories().isEmpty()) {
m_watcher.removePaths(m_watcher.directories()); m_watcher.removePaths(m_watcher.directories());
} }
if (!m_watchChanges || m_path.isEmpty()) { if (!m_watchChanges || m_path.isEmpty()) {
return; return;
} }
m_watcher.addPath(m_path); m_watcher.addPath(m_path);
watchDirIfRecursive(m_path); watchDirIfRecursive(m_path);
} }
void FileSystemModel::updateEntries() { void FileSystemModel::updateEntries() {
if (m_path.isEmpty()) { if (m_path.isEmpty()) {
if (!m_entries.isEmpty()) { if (!m_entries.isEmpty()) {
beginResetModel(); beginResetModel();
qDeleteAll(m_entries); qDeleteAll(m_entries);
m_entries.clear(); m_entries.clear();
endResetModel(); endResetModel();
emit entriesChanged(); emit entriesChanged();
} }
return; return;
} }
for (auto& future : m_futures) { for (auto& future : m_futures) {
future.cancel(); future.cancel();
} }
m_futures.clear(); m_futures.clear();
updateEntriesForDir(m_path); updateEntriesForDir(m_path);
} }
void FileSystemModel::updateEntriesForDir(const QString& dir) { void FileSystemModel::updateEntriesForDir(const QString& dir) {
const auto recursive = m_recursive; const auto recursive = m_recursive;
const auto showHidden = m_showHidden; const auto showHidden = m_showHidden;
const auto filter = m_filter; const auto filter = m_filter;
const auto nameFilters = m_nameFilters; const auto nameFilters = m_nameFilters;
QSet<QString> oldPaths; QSet<QString> oldPaths;
for (const auto& entry : std::as_const(m_entries)) { for (const auto& entry : std::as_const(m_entries)) {
oldPaths << entry->path(); oldPaths << entry->path();
} }
const auto future = QtConcurrent::run([=](QPromise<QPair<QSet<QString>, QSet<QString>>>& promise) { auto future = QtConcurrent::run([=](QPromise<QPair<QSet<QString>, QSet<QString> > >& promise) {
const auto flags = recursive ? QDirIterator::Subdirectories : QDirIterator::NoIteratorFlags; const auto flags = recursive ? QDirIterator::Subdirectories : QDirIterator::NoIteratorFlags;
std::optional<QDirIterator> iter; std::optional<QDirIterator> iter;
if (filter == Images) { if (filter == Images) {
QStringList extraNameFilters = nameFilters; QStringList extraNameFilters = nameFilters;
const auto formats = QImageReader::supportedImageFormats(); const auto formats = QImageReader::supportedImageFormats();
for (const auto& format : formats) { for (const auto& format : formats) {
extraNameFilters << "*." + format; extraNameFilters << "*." + format;
} }
QDir::Filters filters = QDir::Files; QDir::Filters filters = QDir::Files;
if (showHidden) { if (showHidden) {
filters |= QDir::Hidden; filters |= QDir::Hidden;
} }
iter.emplace(dir, extraNameFilters, filters, flags); iter.emplace(dir, extraNameFilters, filters, flags);
} else { } else {
QDir::Filters filters; QDir::Filters filters;
if (filter == Files) { if (filter == Files) {
filters = QDir::Files; filters = QDir::Files;
} else if (filter == Dirs) { } else if (filter == Dirs) {
filters = QDir::Dirs | QDir::NoDotAndDotDot; filters = QDir::Dirs | QDir::NoDotAndDotDot;
} else { } else {
filters = QDir::Dirs | QDir::Files | QDir::NoDotAndDotDot; filters = QDir::Dirs | QDir::Files | QDir::NoDotAndDotDot;
} }
if (showHidden) { if (showHidden) {
filters |= QDir::Hidden; filters |= QDir::Hidden;
} }
if (nameFilters.isEmpty()) { if (nameFilters.isEmpty()) {
iter.emplace(dir, filters, flags); iter.emplace(dir, filters, flags);
} else { } else {
iter.emplace(dir, nameFilters, filters, flags); iter.emplace(dir, nameFilters, filters, flags);
} }
} }
QSet<QString> newPaths; QSet<QString> newPaths;
while (iter->hasNext()) { while (iter->hasNext()) {
if (promise.isCanceled()) { if (promise.isCanceled()) {
return; return;
} }
QString path = iter->next(); QString path = iter->next();
if (filter == Images) { if (filter == Images) {
QImageReader reader(path); QImageReader reader(path);
if (!reader.canRead()) { if (!reader.canRead()) {
continue; continue;
} }
} }
newPaths.insert(path); newPaths.insert(path);
} }
if (promise.isCanceled() || newPaths == oldPaths) { if (promise.isCanceled()) {
return; return;
} }
promise.addResult(qMakePair(oldPaths - newPaths, newPaths - oldPaths)); promise.addResult(qMakePair(oldPaths - newPaths, newPaths - oldPaths));
}); });
if (m_futures.contains(dir)) { if (m_futures.contains(dir)) {
m_futures[dir].cancel(); m_futures[dir].cancel();
} }
m_futures.insert(dir, future); m_futures.insert(dir, future);
const auto watcher = new QFutureWatcher<QPair<QSet<QString>, QSet<QString>>>(this); future
.then(this,
connect(watcher, &QFutureWatcher<QPair<QSet<QString>, QSet<QString>>>::finished, this, [dir, watcher, this]() { [dir, this](QPair<QSet<QString>, QSet<QString> > result) {
m_futures.remove(dir); m_futures.remove(dir);
if (!result.first.isEmpty() || !result.second.isEmpty()) {
if (!watcher->future().isResultReadyAt(0)) { applyChanges(result.first, result.second);
watcher->deleteLater(); }
return; })
} .onCanceled(this, [dir, this]() {
m_futures.remove(dir);
const auto result = watcher->result(); });
applyChanges(result.first, result.second);
watcher->deleteLater();
});
watcher->setFuture(future);
} }
void FileSystemModel::applyChanges(const QSet<QString>& removedPaths, const QSet<QString>& addedPaths) { void FileSystemModel::applyChanges(const QSet<QString>& removedPaths, const QSet<QString>& addedPaths) {
QList<int> removedIndices; QList<int> removedIndices;
for (int i = 0; i < m_entries.size(); ++i) { for (int i = 0; i < m_entries.size(); ++i) {
if (removedPaths.contains(m_entries[i]->path())) { if (removedPaths.contains(m_entries[i]->path())) {
removedIndices << i; removedIndices << i;
} }
} }
std::sort(removedIndices.begin(), removedIndices.end(), std::greater<int>()); std::sort(removedIndices.begin(), removedIndices.end(), std::greater<int>());
// Batch remove old entries // Batch remove old entries
int start = -1; int start = -1;
int end = -1; int end = -1;
for (int idx : std::as_const(removedIndices)) { for (int idx : std::as_const(removedIndices)) {
if (start == -1) { if (start == -1) {
start = idx; start = idx;
end = idx; end = idx;
} else if (idx == end - 1) { } else if (idx == end - 1) {
end = idx; end = idx;
} else { } else {
beginRemoveRows(QModelIndex(), end, start); beginRemoveRows(QModelIndex(), end, start);
for (int i = start; i >= end; --i) { for (int i = start; i >= end; --i) {
m_entries.takeAt(i)->deleteLater(); m_entries.takeAt(i)->deleteLater();
} }
endRemoveRows(); endRemoveRows();
start = idx; start = idx;
end = idx; end = idx;
} }
} }
if (start != -1) { if (start != -1) {
beginRemoveRows(QModelIndex(), end, start); beginRemoveRows(QModelIndex(), end, start);
for (int i = start; i >= end; --i) { for (int i = start; i >= end; --i) {
m_entries.takeAt(i)->deleteLater(); m_entries.takeAt(i)->deleteLater();
} }
endRemoveRows(); endRemoveRows();
} }
// Create new entries // Create new entries
QList<FileSystemEntry*> newEntries; QList<FileSystemEntry*> newEntries;
for (const auto& path : addedPaths) { for (const auto& path : addedPaths) {
newEntries << new FileSystemEntry(path, m_dir.relativeFilePath(path), this); newEntries << new FileSystemEntry(path, m_dir.relativeFilePath(path), this);
} }
std::sort(newEntries.begin(), newEntries.end(), [this](const FileSystemEntry* a, const FileSystemEntry* b) { std::sort(newEntries.begin(), newEntries.end(), [this](const FileSystemEntry* a, const FileSystemEntry* b) {
return compareEntries(a, b); return compareEntries(a, b);
}); });
// Batch insert new entries // Batch insert new entries
int insertStart = -1; int insertStart = -1;
QList<FileSystemEntry*> batchItems; QList<FileSystemEntry*> batchItems;
for (const auto& entry : std::as_const(newEntries)) { for (const auto& entry : std::as_const(newEntries)) {
const auto it = std::lower_bound( const auto it = std::lower_bound(
m_entries.begin(), m_entries.end(), entry, [this](const FileSystemEntry* a, const FileSystemEntry* b) { m_entries.begin(), m_entries.end(), entry, [this](const FileSystemEntry* a, const FileSystemEntry* b) {
return compareEntries(a, b); return compareEntries(a, b);
}); });
const auto row = static_cast<int>(it - m_entries.begin()); const auto row = static_cast<int>(it - m_entries.begin());
if (insertStart == -1) { if (insertStart == -1) {
insertStart = row; insertStart = row;
batchItems << entry; batchItems << entry;
} else if (row == insertStart + batchItems.size()) { } else if (row == insertStart + batchItems.size()) {
batchItems << entry; batchItems << entry;
} else { } else {
beginInsertRows(QModelIndex(), insertStart, insertStart + static_cast<int>(batchItems.size()) - 1); beginInsertRows(QModelIndex(), insertStart, insertStart + static_cast<int>(batchItems.size()) - 1);
for (int i = 0; i < batchItems.size(); ++i) { for (int i = 0; i < batchItems.size(); ++i) {
m_entries.insert(insertStart + i, batchItems[i]); m_entries.insert(insertStart + i, batchItems[i]);
} }
endInsertRows(); endInsertRows();
insertStart = row; insertStart = row;
batchItems.clear(); batchItems.clear();
batchItems << entry; batchItems << entry;
} }
} }
if (!batchItems.isEmpty()) { if (!batchItems.isEmpty()) {
beginInsertRows(QModelIndex(), insertStart, insertStart + static_cast<int>(batchItems.size()) - 1); beginInsertRows(QModelIndex(), insertStart, insertStart + static_cast<int>(batchItems.size()) - 1);
for (int i = 0; i < batchItems.size(); ++i) { for (int i = 0; i < batchItems.size(); ++i) {
m_entries.insert(insertStart + i, batchItems[i]); m_entries.insert(insertStart + i, batchItems[i]);
} }
endInsertRows(); endInsertRows();
} }
emit entriesChanged(); emit entriesChanged();
} }
bool FileSystemModel::compareEntries(const FileSystemEntry* a, const FileSystemEntry* b) const { bool FileSystemModel::compareEntries(const FileSystemEntry* a, const FileSystemEntry* b) const {
if (a->isDir() != b->isDir()) { if (a->isDir() != b->isDir()) {
return m_sortReverse ^ a->isDir(); return m_sortReverse ^ a->isDir();
} }
const auto cmp = a->relativePath().localeAwareCompare(b->relativePath()); const auto cmp = a->relativePath().localeAwareCompare(b->relativePath());
return m_sortReverse ? cmp > 0 : cmp < 0; return m_sortReverse ? cmp > 0 : cmp < 0;
} }
} // namespace ZShell::models } // namespace ZShell::models
+95 -95
View File
@@ -13,136 +13,136 @@
namespace ZShell::models { namespace ZShell::models {
class FileSystemEntry : public QObject { class FileSystemEntry : public QObject {
Q_OBJECT Q_OBJECT
QML_ELEMENT QML_ELEMENT
QML_UNCREATABLE("FileSystemEntry instances can only be retrieved from a FileSystemModel") QML_UNCREATABLE("FileSystemEntry instances can only be retrieved from a FileSystemModel")
Q_PROPERTY(QString path READ path CONSTANT) Q_PROPERTY(QString path READ path CONSTANT)
Q_PROPERTY(QString relativePath READ relativePath NOTIFY relativePathChanged) Q_PROPERTY(QString relativePath READ relativePath NOTIFY relativePathChanged)
Q_PROPERTY(QString name READ name CONSTANT) Q_PROPERTY(QString name READ name CONSTANT)
Q_PROPERTY(QString baseName READ baseName CONSTANT) Q_PROPERTY(QString baseName READ baseName CONSTANT)
Q_PROPERTY(QString parentDir READ parentDir CONSTANT) Q_PROPERTY(QString parentDir READ parentDir CONSTANT)
Q_PROPERTY(QString suffix READ suffix CONSTANT) Q_PROPERTY(QString suffix READ suffix CONSTANT)
Q_PROPERTY(qint64 size READ size CONSTANT) Q_PROPERTY(qint64 size READ size CONSTANT)
Q_PROPERTY(bool isDir READ isDir CONSTANT) Q_PROPERTY(bool isDir READ isDir CONSTANT)
Q_PROPERTY(bool isImage READ isImage CONSTANT) Q_PROPERTY(bool isImage READ isImage CONSTANT)
Q_PROPERTY(QString mimeType READ mimeType CONSTANT) Q_PROPERTY(QString mimeType READ mimeType CONSTANT)
public: public:
explicit FileSystemEntry(const QString& path, const QString& relativePath, QObject* parent = nullptr); explicit FileSystemEntry(const QString& path, const QString& relativePath, QObject* parent = nullptr);
[[nodiscard]] QString path() const; [[nodiscard]] QString path() const;
[[nodiscard]] QString relativePath() const; [[nodiscard]] QString relativePath() const;
[[nodiscard]] QString name() const; [[nodiscard]] QString name() const;
[[nodiscard]] QString baseName() const; [[nodiscard]] QString baseName() const;
[[nodiscard]] QString parentDir() const; [[nodiscard]] QString parentDir() const;
[[nodiscard]] QString suffix() const; [[nodiscard]] QString suffix() const;
[[nodiscard]] qint64 size() const; [[nodiscard]] qint64 size() const;
[[nodiscard]] bool isDir() const; [[nodiscard]] bool isDir() const;
[[nodiscard]] bool isImage() const; [[nodiscard]] bool isImage() const;
[[nodiscard]] QString mimeType() const; [[nodiscard]] QString mimeType() const;
void updateRelativePath(const QDir& dir); void updateRelativePath(const QDir& dir);
signals: signals:
void relativePathChanged(); void relativePathChanged();
private: private:
const QFileInfo m_fileInfo; const QFileInfo m_fileInfo;
const QString m_path; const QString m_path;
QString m_relativePath; QString m_relativePath;
mutable bool m_isImage; mutable bool m_isImage;
mutable bool m_isImageInitialised; mutable bool m_isImageInitialised;
mutable QString m_mimeType; mutable QString m_mimeType;
mutable bool m_mimeTypeInitialised; mutable bool m_mimeTypeInitialised;
}; };
class FileSystemModel : public QAbstractListModel { class FileSystemModel : public QAbstractListModel {
Q_OBJECT Q_OBJECT
QML_ELEMENT QML_ELEMENT
Q_PROPERTY(QString path READ path WRITE setPath NOTIFY pathChanged) Q_PROPERTY(QString path READ path WRITE setPath NOTIFY pathChanged)
Q_PROPERTY(bool recursive READ recursive WRITE setRecursive NOTIFY recursiveChanged) Q_PROPERTY(bool recursive READ recursive WRITE setRecursive NOTIFY recursiveChanged)
Q_PROPERTY(bool watchChanges READ watchChanges WRITE setWatchChanges NOTIFY watchChangesChanged) Q_PROPERTY(bool watchChanges READ watchChanges WRITE setWatchChanges NOTIFY watchChangesChanged)
Q_PROPERTY(bool showHidden READ showHidden WRITE setShowHidden NOTIFY showHiddenChanged) Q_PROPERTY(bool showHidden READ showHidden WRITE setShowHidden NOTIFY showHiddenChanged)
Q_PROPERTY(bool sortReverse READ sortReverse WRITE setSortReverse NOTIFY sortReverseChanged) Q_PROPERTY(bool sortReverse READ sortReverse WRITE setSortReverse NOTIFY sortReverseChanged)
Q_PROPERTY(Filter filter READ filter WRITE setFilter NOTIFY filterChanged) Q_PROPERTY(Filter filter READ filter WRITE setFilter NOTIFY filterChanged)
Q_PROPERTY(QStringList nameFilters READ nameFilters WRITE setNameFilters NOTIFY nameFiltersChanged) Q_PROPERTY(QStringList nameFilters READ nameFilters WRITE setNameFilters NOTIFY nameFiltersChanged)
Q_PROPERTY(QQmlListProperty<ZShell::models::FileSystemEntry> entries READ entries NOTIFY entriesChanged) Q_PROPERTY(QQmlListProperty<ZShell::models::FileSystemEntry> entries READ entries NOTIFY entriesChanged)
public: public:
enum Filter { enum Filter {
NoFilter, NoFilter,
Images, Images,
Files, Files,
Dirs Dirs
}; };
Q_ENUM(Filter) Q_ENUM(Filter)
explicit FileSystemModel(QObject* parent = nullptr); explicit FileSystemModel(QObject* parent = nullptr);
int rowCount(const QModelIndex& parent = QModelIndex()) const override; int rowCount(const QModelIndex& parent = QModelIndex()) const override;
QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const override; QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const override;
QHash<int, QByteArray> roleNames() const override; QHash<int, QByteArray> roleNames() const override;
[[nodiscard]] QString path() const; [[nodiscard]] QString path() const;
void setPath(const QString& path); void setPath(const QString& path);
[[nodiscard]] bool recursive() const; [[nodiscard]] bool recursive() const;
void setRecursive(bool recursive); void setRecursive(bool recursive);
[[nodiscard]] bool watchChanges() const; [[nodiscard]] bool watchChanges() const;
void setWatchChanges(bool watchChanges); void setWatchChanges(bool watchChanges);
[[nodiscard]] bool showHidden() const; [[nodiscard]] bool showHidden() const;
void setShowHidden(bool showHidden); void setShowHidden(bool showHidden);
[[nodiscard]] bool sortReverse() const; [[nodiscard]] bool sortReverse() const;
void setSortReverse(bool sortReverse); void setSortReverse(bool sortReverse);
[[nodiscard]] Filter filter() const; [[nodiscard]] Filter filter() const;
void setFilter(Filter filter); void setFilter(Filter filter);
[[nodiscard]] QStringList nameFilters() const; [[nodiscard]] QStringList nameFilters() const;
void setNameFilters(const QStringList& nameFilters); void setNameFilters(const QStringList& nameFilters);
[[nodiscard]] QQmlListProperty<FileSystemEntry> entries(); [[nodiscard]] QQmlListProperty<FileSystemEntry> entries();
signals: signals:
void pathChanged(); void pathChanged();
void recursiveChanged(); void recursiveChanged();
void watchChangesChanged(); void watchChangesChanged();
void showHiddenChanged(); void showHiddenChanged();
void sortReverseChanged(); void sortReverseChanged();
void filterChanged(); void filterChanged();
void nameFiltersChanged(); void nameFiltersChanged();
void entriesChanged(); void entriesChanged();
private: private:
QDir m_dir; QDir m_dir;
QFileSystemWatcher m_watcher; QFileSystemWatcher m_watcher;
QList<FileSystemEntry*> m_entries; QList<FileSystemEntry*> m_entries;
QHash<QString, QFuture<QPair<QSet<QString>, QSet<QString>>>> m_futures; QHash<QString, QFuture<QPair<QSet<QString>, QSet<QString> > > > m_futures;
QString m_path; QString m_path;
bool m_recursive; bool m_recursive;
bool m_watchChanges; bool m_watchChanges;
bool m_showHidden; bool m_showHidden;
bool m_sortReverse; bool m_sortReverse = false;
Filter m_filter; Filter m_filter;
QStringList m_nameFilters; QStringList m_nameFilters;
void watchDirIfRecursive(const QString& path); void watchDirIfRecursive(const QString& path);
void update(); void update();
void updateWatcher(); void updateWatcher();
void updateEntries(); void updateEntries();
void updateEntriesForDir(const QString& dir); void updateEntriesForDir(const QString& dir);
void applyChanges(const QSet<QString>& removedPaths, const QSet<QString>& addedPaths); void applyChanges(const QSet<QString>& removedPaths, const QSet<QString>& addedPaths);
[[nodiscard]] bool compareEntries(const FileSystemEntry* a, const FileSystemEntry* b) const; [[nodiscard]] bool compareEntries(const FileSystemEntry* a, const FileSystemEntry* b) const;
}; };
} // namespace ZShell::models } // namespace ZShell::models
+49 -5
View File
@@ -216,12 +216,56 @@ Action-driven flows (`>` prefix by default) include calculator, wallpaper picker
`zshell-cli` provides these subcommands: `zshell-cli` provides these subcommands:
- `shell` - start/kill/log/IPC calls ### `shell` — daemon management
- `screenshot` - open area picker (`start`, `start-freeze`)
- `wallpaper` - set wallpaper + generate lockscreen blur image
- `scheme` - generate and apply dynamic/preset color schemes
Note: `cli/src/zshell/subcommands/scheme.py` uses Jinja2 templating for `~/.config/zshell/templates` rendering. | Command | Description |
|---------|-------------|
| `start` | Start the shell daemon (pass `--no-daemon` to run in foreground) |
| `kill` | Kill the running shell daemon |
| `restart` | Kill then restart the daemon |
| `lock` | Lock the session via IPC |
| `show` | Show the shell window via IPC |
| `log` | Print daemon logs |
### `scheme` — color scheme generation
```
Usage: zshell-cli scheme generate [--preset <scheme>:<variant>] [--accent <accent>]
[--mode <dark|light>] [--image-path <path>]
Generate a color scheme from a wallpaper image (Material You) or from
a built-in preset.
Preset selection:
--preset <scheme>:<variant> Pick a built-in scheme (e.g. catppuccin:mocha)
--accent <name> Accent color for schemes that support it
(catppuccin accepts: blue, green, mauve,
peach, pink, red, rosewater, etc.)
--mode <dark|light> Override variant mode
If variant has both dark and light modes, the mode is auto-detected from
the current system or config preference.
List all available presets:
zshell-cli scheme list-presets # human-readable
zshell-cli scheme list-presets --json # machine-readable (QML UI)
Examples:
zshell-cli scheme generate --preset gruvbox:medium
zshell-cli scheme generate --preset catppuccin:mocha --accent green
zshell-cli scheme generate --preset everforest:medium --mode light
```
Note: Template rendering (Jinja2) applies generated colors to `~/.config/zshell/templates/*`.
### `screenshot` — area picker
- `start` — open interactive area picker
- `start-freeze` — freeze screen then pick
### `wallpaper` — wallpaper management
- Set wallpaper and generate lockscreen blur background
## Greeter ## Greeter
+5
View File
@@ -9,6 +9,7 @@ version = "0.1.0"
dependencies = [ dependencies = [
"typer", "typer",
"pillow", "pillow",
"jinja2",
"materialyoucolor" "materialyoucolor"
] ]
@@ -25,3 +26,7 @@ only-include = [
[tool.ruff] [tool.ruff]
line-length = 120 line-length = 120
[tool.pytest.ini_options]
testpaths = ["tests"]
pythonpath = ["src"]
+2 -1
View File
@@ -1,6 +1,6 @@
from __future__ import annotations from __future__ import annotations
import typer import typer
from zshell.subcommands import shell, scheme, screenshot, wallpaper from zshell.subcommands import shell, scheme, screenshot, wallpaper, record
app = typer.Typer() app = typer.Typer()
@@ -8,6 +8,7 @@ app.add_typer(shell.app, name="shell")
app.add_typer(scheme.app, name="scheme") app.add_typer(scheme.app, name="scheme")
app.add_typer(screenshot.app, name="screenshot") app.add_typer(screenshot.app, name="screenshot")
app.add_typer(wallpaper.app, name="wallpaper") app.add_typer(wallpaper.app, name="wallpaper")
app.add_typer(record.app, name="record")
# app.add_typer(preset.app, name="preset") # app.add_typer(preset.app, name="preset")
@@ -1,544 +0,0 @@
_data = {
"id": "catppuccin",
"name": "Catppuccin",
"version": "1.0.0",
"author": "Catppuccin Org",
"description": "Soothing pastel theme for the high-spirited!",
"dark": {},
"light": {},
"variants": {
"type": "multi",
"defaults": {
"dark": {"m3flavor": "mocha", "m3accent": "mauve"},
"light": {"m3flavor": "latte", "m3accent": "mauve"},
},
"flavors": [
{
"id": "latte",
"name": "Latte",
"light": {
"m3surface": "#ccd0da",
"m3surfaceText": "#4c4f69",
"m3surfaceVariant": "#eff1f5",
"m3surfaceVariantText": "#6c6f85",
"m3background": "#eff1f5",
"m3backgroundText": "#4c4f69",
"m3outline": "#9ca0b0",
"m3surfaceContainer": "#eff1f5",
"m3surfaceContainerHigh": "#e6e9ef",
"m3surfaceContainerHighest": "#dce0e8",
"m3error": "#d20f39",
"m3warning": "#fe640b",
"m3info": "#1e66f5",
},
},
{
"id": "frappe",
"name": "Frappé",
"dark": {
"m3surface": "#414559",
"m3surfaceText": "#c6d0f5",
"m3surfaceVariant": "#303446",
"m3surfaceVariantText": "#a5adce",
"m3background": "#303446",
"m3backgroundText": "#c6d0f5",
"m3outline": "#737994",
"m3surfaceContainer": "#303446",
"m3surfaceContainerHigh": "#292c3c",
"m3surfaceContainerHighest": "#232634",
"m3error": "#e78284",
"m3warning": "#ef9f76",
"m3info": "#8caaee",
},
},
{
"id": "macchiato",
"name": "Macchiato",
"dark": {
"m3surface": "#363a4f",
"m3surfaceText": "#cad3f5",
"m3surfaceVariant": "#24273a",
"m3surfaceVariantText": "#a5adcb",
"m3background": "#24273a",
"m3backgroundText": "#cad3f5",
"m3outline": "#6e738d",
"m3surfaceContainer": "#24273a",
"m3surfaceContainerHigh": "#1e2030",
"m3surfaceContainerHighest": "#181926",
"m3error": "#ed8796",
"m3warning": "#f5a97f",
"m3info": "#8aadf4",
},
},
{
"id": "mocha",
"name": "Mocha",
"dark": {
"m3surface": "#313244",
"m3surfaceText": "#cdd6f4",
"m3surfaceVariant": "#1e1e2e",
"m3surfaceVariantText": "#a6adc8",
"m3background": "#1e1e2e",
"m3backgroundText": "#cdd6f4",
"m3outline": "#6c7086",
"m3surfaceContainer": "#1e1e2e",
"m3surfaceContainerHigh": "#181825",
"m3surfaceContainerHighest": "#11111b",
"m3error": "#f38ba8",
"m3warning": "#fab387",
"m3info": "#89b4fa",
},
},
],
"accents": [
{
"id": "rosewater",
"name": "Rosewater",
"latte": {
"m3primary": "#dc8a78",
"m3primaryText": "#eff1f5",
"m3primaryContainer": "#e1a99d",
"m3secondary": "#d8c7c4",
"m3surfaceTint": "#e1a99d",
},
"frappe": {
"m3primary": "#f2d5cf",
"m3primaryText": "#303446",
"m3primaryContainer": "#b8a5a6",
"m3secondary": "#a2748b",
"m3surfaceTint": "#b8a5a6",
},
"macchiato": {
"m3primary": "#f4dbd6",
"m3primaryText": "#24273a",
"m3primaryContainer": "#b6a6a7",
"m3secondary": "#9f6f8d",
"m3surfaceTint": "#b6a6a7",
},
"mocha": {
"m3primary": "#f5e0dc",
"m3primaryText": "#1e1e2e",
"m3primaryContainer": "#b5a6a8",
"m3secondary": "#9d6d87",
"m3surfaceTint": "#b5a6a8",
},
},
{
"id": "flamingo",
"name": "Flamingo",
"latte": {
"m3primary": "#dd7878",
"m3primaryText": "#eff1f5",
"m3primaryContainer": "#e29c9d",
"m3secondary": "#d7c3c4",
"m3surfaceTint": "#e29c9d",
},
"frappe": {
"m3primary": "#eebebe",
"m3primaryText": "#303446",
"m3primaryContainer": "#b5949a",
"m3secondary": "#9d6b80",
"m3surfaceTint": "#b5949a",
},
"macchiato": {
"m3primary": "#f0c6c6",
"m3primaryText": "#24273a",
"m3primaryContainer": "#b3979c",
"m3secondary": "#996780",
"m3surfaceTint": "#b3979c",
},
"mocha": {
"m3primary": "#f2cdcd",
"m3primaryText": "#1e1e2e",
"m3primaryContainer": "#b3999e",
"m3secondary": "#98667c",
"m3surfaceTint": "#b3999e",
},
},
{
"id": "pink",
"name": "Pink",
"latte": {
"m3primary": "#ea76cb",
"m3primaryText": "#eff1f5",
"m3primaryContainer": "#eb9bd7",
"m3secondary": "#d9c7d5",
"m3surfaceTint": "#eb9bd7",
},
"frappe": {
"m3primary": "#f4b8e4",
"m3primaryText": "#303446",
"m3primaryContainer": "#b990b5",
"m3secondary": "#996e9e",
"m3surfaceTint": "#b990b5",
},
"macchiato": {
"m3primary": "#f5bde6",
"m3primaryText": "#24273a",
"m3primaryContainer": "#b791b2",
"m3secondary": "#95689a",
"m3surfaceTint": "#b791b2",
},
"mocha": {
"m3primary": "#f5c2e7",
"m3primaryText": "#1e1e2e",
"m3primaryContainer": "#b591b0",
"m3secondary": "#966597",
"m3surfaceTint": "#b591b0",
},
},
{
"id": "mauve",
"name": "Mauve",
"latte": {
"m3primary": "#8839ef",
"m3primaryText": "#eff1f5",
"m3primaryContainer": "#a670f1",
"m3secondary": "#c2b8d0",
"m3surfaceTint": "#a670f1",
},
"frappe": {
"m3primary": "#ca9ee6",
"m3primaryText": "#303446",
"m3primaryContainer": "#9c7eb6",
"m3secondary": "#7d6799",
"m3surfaceTint": "#9c7eb6",
},
"macchiato": {
"m3primary": "#c6a0f6",
"m3primaryText": "#24273a",
"m3primaryContainer": "#967cbe",
"m3secondary": "#766597",
"m3surfaceTint": "#967cbe",
},
"mocha": {
"m3primary": "#cba6f7",
"m3primaryText": "#1e1e2e",
"m3primaryContainer": "#977ebb",
"m3secondary": "#756294",
"m3surfaceTint": "#977ebb",
},
},
{
"id": "red",
"name": "Red",
"latte": {
"m3primary": "#d20f39",
"m3primaryText": "#eff1f5",
"m3primaryContainer": "#da5371",
"m3secondary": "#c0a0a8",
"m3surfaceTint": "#da5371",
},
"frappe": {
"m3primary": "#e78284",
"m3primaryText": "#303446",
"m3primaryContainer": "#b06a72",
"m3secondary": "#8b5d66",
"m3surfaceTint": "#b06a72",
},
"macchiato": {
"m3primary": "#ed8796",
"m3primaryText": "#24273a",
"m3primaryContainer": "#b16b7a",
"m3secondary": "#865a69",
"m3surfaceTint": "#b16b7a",
},
"mocha": {
"m3primary": "#f38ba8",
"m3primaryText": "#1e1e2e",
"m3primaryContainer": "#b46b84",
"m3secondary": "#85596b",
"m3surfaceTint": "#b46b84",
},
},
{
"id": "maroon",
"name": "Maroon",
"latte": {
"m3primary": "#e64553",
"m3primaryText": "#eff1f5",
"m3primaryContainer": "#e87883",
"m3secondary": "#cfb7ba",
"m3surfaceTint": "#e87883",
},
"frappe": {
"m3primary": "#ea999c",
"m3primaryText": "#303446",
"m3primaryContainer": "#b27a83",
"m3secondary": "#92626f",
"m3surfaceTint": "#b27a83",
},
"macchiato": {
"m3primary": "#ee99a0",
"m3primaryText": "#24273a",
"m3primaryContainer": "#b27781",
"m3secondary": "#8c5e6c",
"m3surfaceTint": "#b27781",
},
"mocha": {
"m3primary": "#eba0ac",
"m3primaryText": "#1e1e2e",
"m3primaryContainer": "#ae7987",
"m3secondary": "#895b6c",
"m3surfaceTint": "#ae7987",
},
},
{
"id": "peach",
"name": "Peach",
"latte": {
"m3primary": "#fe640b",
"m3primaryText": "#eff1f5",
"m3primaryContainer": "#f98e51",
"m3secondary": "#c9b7ad",
"m3surfaceTint": "#f98e51",
},
"frappe": {
"m3primary": "#ef9f76",
"m3primaryText": "#303446",
"m3primaryContainer": "#b67f68",
"m3secondary": "#8f6a5f",
"m3surfaceTint": "#b67f68",
},
"macchiato": {
"m3primary": "#f5a97f",
"m3primaryText": "#24273a",
"m3primaryContainer": "#b7836a",
"m3secondary": "#8c695e",
"m3surfaceTint": "#b7836a",
},
"mocha": {
"m3primary": "#fab387",
"m3primaryText": "#1e1e2e",
"m3primaryContainer": "#b8876d",
"m3secondary": "#8b6a5d",
"m3surfaceTint": "#b8876d",
},
},
{
"id": "yellow",
"name": "Yellow",
"latte": {
"m3primary": "#df8e1d",
"m3primaryText": "#eff1f5",
"m3primaryContainer": "#e4ac5d",
"m3secondary": "#c6baaa",
"m3surfaceTint": "#e4ac5d",
},
"frappe": {
"m3primary": "#e5c890",
"m3primaryText": "#303446",
"m3primaryContainer": "#af9b7a",
"m3secondary": "#948062",
"m3surfaceTint": "#af9b7a",
},
"macchiato": {
"m3primary": "#eed49f",
"m3primaryText": "#24273a",
"m3primaryContainer": "#b2a181",
"m3secondary": "#947e62",
"m3surfaceTint": "#b2a181",
},
"mocha": {
"m3primary": "#f9e2af",
"m3primaryText": "#1e1e2e",
"m3primaryContainer": "#b8a889",
"m3secondary": "#978265",
"m3surfaceTint": "#b8a889",
},
},
{
"id": "green",
"name": "Green",
"latte": {
"m3primary": "#40a02b",
"m3primaryText": "#eff1f5",
"m3primaryContainer": "#74b867",
"m3secondary": "#9fbd9b",
"m3surfaceTint": "#74b867",
},
"frappe": {
"m3primary": "#a6d189",
"m3primaryText": "#303446",
"m3primaryContainer": "#83a275",
"m3secondary": "#648e5e",
"m3surfaceTint": "#83a275",
},
"macchiato": {
"m3primary": "#a6da95",
"m3primaryText": "#24273a",
"m3primaryContainer": "#80a57a",
"m3secondary": "#5c8a61",
"m3surfaceTint": "#80a57a",
},
"mocha": {
"m3primary": "#a6e3a1",
"m3primaryText": "#1e1e2e",
"m3primaryContainer": "#7ea87f",
"m3secondary": "#5b8964",
"m3surfaceTint": "#7ea87f",
},
},
{
"id": "teal",
"name": "Teal",
"latte": {
"m3primary": "#179299",
"m3primaryText": "#eff1f5",
"m3primaryContainer": "#57aeb4",
"m3secondary": "#93b4b7",
"m3surfaceTint": "#57aeb4",
},
"frappe": {
"m3primary": "#81c8be",
"m3primaryText": "#303446",
"m3primaryContainer": "#699b9a",
"m3secondary": "#588084",
"m3surfaceTint": "#699b9a",
},
"macchiato": {
"m3primary": "#8bd5ca",
"m3primaryText": "#24273a",
"m3primaryContainer": "#6da29f",
"m3secondary": "#577e83",
"m3surfaceTint": "#6da29f",
},
"mocha": {
"m3primary": "#94e2d5",
"m3primaryText": "#1e1e2e",
"m3primaryContainer": "#71a8a4",
"m3secondary": "#588284",
"m3surfaceTint": "#71a8a4",
},
},
{
"id": "sky",
"name": "Sky",
"latte": {
"m3primary": "#04a5e5",
"m3primaryText": "#eff1f5",
"m3primaryContainer": "#4abcea",
"m3secondary": "#a4b9c2",
"m3surfaceTint": "#4abcea",
},
"frappe": {
"m3primary": "#99d1db",
"m3primaryText": "#303446",
"m3primaryContainer": "#79a2af",
"m3secondary": "#628494",
"m3surfaceTint": "#79a2af",
},
"macchiato": {
"m3primary": "#91d7e3",
"m3primaryText": "#24273a",
"m3primaryContainer": "#71a3b0",
"m3secondary": "#5e7e8c",
"m3surfaceTint": "#71a3b0",
},
"mocha": {
"m3primary": "#89dceb",
"m3primaryText": "#1e1e2e",
"m3primaryContainer": "#69a3b3",
"m3secondary": "#5a7b88",
"m3surfaceTint": "#69a3b3",
},
},
{
"id": "sapphire",
"name": "Sapphire",
"latte": {
"m3primary": "#209fb5",
"m3primaryText": "#eff1f5",
"m3primaryContainer": "#5db8c8",
"m3secondary": "#9eb9be",
"m3surfaceTint": "#5db8c8",
},
"frappe": {
"m3primary": "#85c1dc",
"m3primaryText": "#303446",
"m3primaryContainer": "#6b96af",
"m3secondary": "#5e7b8e",
"m3surfaceTint": "#6b96af",
},
"macchiato": {
"m3primary": "#7dc4e4",
"m3primaryText": "#24273a",
"m3primaryContainer": "#6396b1",
"m3secondary": "#5a7486",
"m3surfaceTint": "#6396b1",
},
"mocha": {
"m3primary": "#74c7ec",
"m3primaryText": "#1e1e2e",
"m3primaryContainer": "#5a95b4",
"m3secondary": "#567080",
"m3surfaceTint": "#5a95b4",
},
},
{
"id": "blue",
"name": "Blue",
"latte": {
"m3primary": "#1e66f5",
"m3primaryText": "#eff1f5",
"m3primaryContainer": "#5c90f5",
"m3secondary": "#b1bacb",
"m3surfaceTint": "#5c90f5",
},
"frappe": {
"m3primary": "#8caaee",
"m3primaryText": "#303446",
"m3primaryContainer": "#7086bc",
"m3secondary": "#637195",
"m3surfaceTint": "#7086bc",
},
"macchiato": {
"m3primary": "#8aadf4",
"m3primaryText": "#24273a",
"m3primaryContainer": "#6c85bc",
"m3secondary": "#5f6d8f",
"m3surfaceTint": "#6c85bc",
},
"mocha": {
"m3primary": "#89b4fa",
"m3primaryText": "#1e1e2e",
"m3primaryContainer": "#6987bd",
"m3secondary": "#5d6c8b",
"m3surfaceTint": "#6987bd",
},
},
{
"id": "lavender",
"name": "Lavender",
"latte": {
"m3primary": "#7287fd",
"m3primaryText": "#eff1f5",
"m3primaryContainer": "#97a7fb",
"m3secondary": "#cdcfdd",
"m3surfaceTint": "#97a7fb",
},
"frappe": {
"m3primary": "#babbf1",
"m3primaryText": "#303446",
"m3primaryContainer": "#9192be",
"m3secondary": "#7175a1",
"m3surfaceTint": "#9192be",
},
"macchiato": {
"m3primary": "#b7bdf8",
"m3primaryText": "#24273a",
"m3primaryContainer": "#8b91bf",
"m3secondary": "#6b709d",
"m3surfaceTint": "#8b91bf",
},
"mocha": {
"m3primary": "#b4befe",
"m3primaryText": "#1e1e2e",
"m3primaryContainer": "#878ec0",
"m3secondary": "#676d99",
"m3surfaceTint": "#878ec0",
},
},
],
},
}
@@ -0,0 +1,110 @@
primary_paletteKeyColor ca9ee6
secondary_paletteKeyColor 7d6799
tertiary_paletteKeyColor f4b8e4
neutral_paletteKeyColor 414559
neutral_variant_paletteKeyColor 303446
background 303446
onBackground c6d0f5
surface 414559
surfaceDim 414559
surfaceBright 55596f
surfaceContainerLowest 292c3c
surfaceContainerLow 363a50
surfaceContainer 303446
surfaceContainerHigh 292c3c
surfaceContainerHighest 232634
onSurface c6d0f5
surfaceVariant 303446
onSurfaceVariant a5adce
inverseSurface c6d0f5
inverseOnSurface 414559
outline 737994
outlineVariant 51576d
shadow 000000
scrim 000000
surfaceTint 7086bc
primary 8caaee
onPrimary 303446
primaryContainer 7086bc
onPrimaryContainer ffffff
inversePrimary 6c4f94
secondary 637195
onSecondary ffffff
secondaryContainer 544874
onSecondaryContainer cbbae8
tertiary f4b8e4
onTertiary 4e1e44
tertiaryContainer bb7da9
onTertiaryContainer 000000
error e78284
onError 4a0019
errorContainer 8c2643
onErrorContainer ffb3c6
primaryFixed e8d4ff
primaryFixedDim ca9ee6
onPrimaryFixed 2a1040
onPrimaryFixedVariant 544874
secondaryFixed e2d4ff
secondaryFixedDim 7d6799
onSecondaryFixed 1a0a28
onSecondaryFixedVariant 3a2850
tertiaryFixed ffd7f5
tertiaryFixedDim f4b8e4
onTertiaryFixed 330832
onTertiaryFixedVariant 653661
term0 414559
term1 e78284
term2 a6d189
term3 e5c890
term4 8caaee
term5 f4b8e4
term6 81c8be
term7 c6d0f5
term8 51576d
term9 e78284
term10 a6d189
term11 e5c890
term12 8caaee
term13 f4b8e4
term14 81c8be
term15 a5adce
rosewater f2d5cf
flamingo eebebe
pink f4b8e4
mauve ca9ee6
red e78284
maroon ea999c
peach ef9f76
yellow e5c890
green a6d189
teal 81c8be
sky 99d1db
sapphire 85c1dc
blue 8caaee
lavender babbf1
klink 6685d1
klinkSelection 6585d1
kvisited 7276dd
kvisitedSelection 7276dd
knegative 8e70ff
knegativeSelection 8e70ff
kneutral c794ff
kneutralSelection c794ff
kpositive 54afff
kpositiveSelection 54afff
text c6d0f5
subtext1 a5adce
subtext0 7a7f9e
overlay2 737994
overlay1 585b70
overlay0 45475a
surface2 414559
surface1 363a50
surface0 303446
base 303446
mantle 292c3c
crust 232634
success a6d189
onSuccess 303446
successContainer 3b5e3b
onSuccessContainer b6f0b1
@@ -1,87 +1,87 @@
primary_paletteKeyColor 6674ac primary_paletteKeyColor ca9ee6
secondary_paletteKeyColor 71768e secondary_paletteKeyColor 7d6799
tertiary_paletteKeyColor 9a6593 tertiary_paletteKeyColor f4b8e4
neutral_paletteKeyColor 77767b neutral_paletteKeyColor 414559
neutral_variant_paletteKeyColor 757680 neutral_variant_paletteKeyColor 303446
background 131317 background 303446
onBackground e4e1e7 onBackground c6d0f5
surface 131317 surface 414559
surfaceDim 131317 surfaceDim 414559
surfaceBright 39393d surfaceBright 55596f
surfaceContainerLowest 0d0e12 surfaceContainerLowest 292c3c
surfaceContainerLow 1b1b1f surfaceContainerLow 363a50
surfaceContainer 1f1f23 surfaceContainer 303446
surfaceContainerHigh 292a2e surfaceContainerHigh 292c3c
surfaceContainerHighest 343438 surfaceContainerHighest 232634
onSurface e4e1e7 onSurface c6d0f5
surfaceVariant 45464f surfaceVariant 303446
onSurfaceVariant c6c5d1 onSurfaceVariant a5adce
inverseSurface e4e1e7 inverseSurface c6d0f5
inverseOnSurface 303034 inverseOnSurface 414559
outline 8f909a outline 737994
outlineVariant 45464f outlineVariant 51576d
shadow 000000 shadow 000000
scrim 000000 scrim 000000
surfaceTint b7c4ff surfaceTint 9c7eb6
primary b7c4ff primary ca9ee6
onPrimary 1e2d60 onPrimary 303446
primaryContainer 6674ac primaryContainer 9c7eb6
onPrimaryContainer ffffff onPrimaryContainer ffffff
inversePrimary 4e5c92 inversePrimary 6c4f94
secondary c1c5e0 secondary 7d6799
onSecondary 2a2f44 onSecondary ffffff
secondaryContainer 41465c secondaryContainer 544874
onSecondaryContainer afb4ce onSecondaryContainer cbbae8
tertiary f1b3e6 tertiary f4b8e4
onTertiary 4c1f49 onTertiary 4e1e44
tertiaryContainer b67fae tertiaryContainer bb7da9
onTertiaryContainer 000000 onTertiaryContainer 000000
error ffb4ab error e78284
onError 690005 onError 4a0019
errorContainer 93000a errorContainer 8c2643
onErrorContainer ffdad6 onErrorContainer ffb3c6
primaryFixed dce1ff primaryFixed e8d4ff
primaryFixedDim b7c4ff primaryFixedDim ca9ee6
onPrimaryFixed 05164b onPrimaryFixed 2a1040
onPrimaryFixedVariant 364478 onPrimaryFixedVariant 544874
secondaryFixed dde1fd secondaryFixed e2d4ff
secondaryFixedDim c1c5e0 secondaryFixedDim 7d6799
onSecondaryFixed 151b2e onSecondaryFixed 1a0a28
onSecondaryFixedVariant 41465c onSecondaryFixedVariant 3a2850
tertiaryFixed ffd7f5 tertiaryFixed ffd7f5
tertiaryFixedDim f1b3e6 tertiaryFixedDim f4b8e4
onTertiaryFixed 330832 onTertiaryFixed 330832
onTertiaryFixedVariant 653661 onTertiaryFixedVariant 653661
term0 353434 term0 414559
term1 9a7bff term1 e78284
term2 44def5 term2 a6d189
term3 ffdcf2 term3 e5c890
term4 92acd6 term4 8caaee
term5 a9a2ed term5 f4b8e4
term6 9dceff term6 81c8be
term7 e8d3de term7 c6d0f5
term8 ac9fa9 term8 51576d
term9 b299ff term9 e78284
term10 89ecff term10 a6d189
term11 fff0f6 term11 e5c890
term12 b1c2db term12 8caaee
term13 c1b7f7 term13 f4b8e4
term14 bae0ff term14 81c8be
term15 ffffff term15 a5adce
rosewater f5eff9 rosewater f2d5cf
flamingo e5def4 flamingo eebebe
pink dcd9ff pink f4b8e4
mauve b5bbff mauve ca9ee6
red b5a9ff red e78284
maroon c1b7ef maroon ea999c
peach e0c2f9 peach ef9f76
yellow ffecf3 yellow e5c890
green c8e3ff green a6d189
teal cee1ff teal 81c8be
sky cadcff sky 99d1db
sapphire aec7ff sapphire 85c1dc
blue a6baff blue 8caaee
lavender bfcaff lavender babbf1
klink 6685d1 klink 6685d1
klinkSelection 6585d1 klinkSelection 6585d1
kvisited 7276dd kvisited 7276dd
@@ -92,19 +92,19 @@ kneutral c794ff
kneutralSelection c794ff kneutralSelection c794ff
kpositive 54afff kpositive 54afff
kpositiveSelection 54afff kpositiveSelection 54afff
text e4e1e7 text c6d0f5
subtext1 c6c5d1 subtext1 a5adce
subtext0 8f909a subtext0 7a7f9e
overlay2 7d7d86 overlay2 737994
overlay1 6a6a72 overlay1 585b70
overlay0 585960 overlay0 45475a
surface2 48484e surface2 414559
surface1 37373d surface1 363a50
surface0 25252a surface0 303446
base 131317 base 303446
mantle 131317 mantle 292c3c
crust 121216 crust 232634
success B5CCBA success a6d189
onSuccess 213528 onSuccess 303446
successContainer 374B3E successContainer 3b5e3b
onSuccessContainer D1E9D6 onSuccessContainer b6f0b1
@@ -0,0 +1,110 @@
primary_paletteKeyColor ca9ee6
secondary_paletteKeyColor 7d6799
tertiary_paletteKeyColor f4b8e4
neutral_paletteKeyColor 414559
neutral_variant_paletteKeyColor 303446
background 303446
onBackground c6d0f5
surface 414559
surfaceDim 414559
surfaceBright 55596f
surfaceContainerLowest 292c3c
surfaceContainerLow 363a50
surfaceContainer 303446
surfaceContainerHigh 292c3c
surfaceContainerHighest 232634
onSurface c6d0f5
surfaceVariant 303446
onSurfaceVariant a5adce
inverseSurface c6d0f5
inverseOnSurface 414559
outline 737994
outlineVariant 51576d
shadow 000000
scrim 000000
surfaceTint b5949a
primary eebebe
onPrimary 303446
primaryContainer b5949a
onPrimaryContainer ffffff
inversePrimary 6c4f94
secondary 9d6b80
onSecondary ffffff
secondaryContainer 544874
onSecondaryContainer cbbae8
tertiary f4b8e4
onTertiary 4e1e44
tertiaryContainer bb7da9
onTertiaryContainer 000000
error e78284
onError 4a0019
errorContainer 8c2643
onErrorContainer ffb3c6
primaryFixed e8d4ff
primaryFixedDim ca9ee6
onPrimaryFixed 2a1040
onPrimaryFixedVariant 544874
secondaryFixed e2d4ff
secondaryFixedDim 7d6799
onSecondaryFixed 1a0a28
onSecondaryFixedVariant 3a2850
tertiaryFixed ffd7f5
tertiaryFixedDim f4b8e4
onTertiaryFixed 330832
onTertiaryFixedVariant 653661
term0 414559
term1 e78284
term2 a6d189
term3 e5c890
term4 8caaee
term5 f4b8e4
term6 81c8be
term7 c6d0f5
term8 51576d
term9 e78284
term10 a6d189
term11 e5c890
term12 8caaee
term13 f4b8e4
term14 81c8be
term15 a5adce
rosewater f2d5cf
flamingo eebebe
pink f4b8e4
mauve ca9ee6
red e78284
maroon ea999c
peach ef9f76
yellow e5c890
green a6d189
teal 81c8be
sky 99d1db
sapphire 85c1dc
blue 8caaee
lavender babbf1
klink 6685d1
klinkSelection 6585d1
kvisited 7276dd
kvisitedSelection 7276dd
knegative 8e70ff
knegativeSelection 8e70ff
kneutral c794ff
kneutralSelection c794ff
kpositive 54afff
kpositiveSelection 54afff
text c6d0f5
subtext1 a5adce
subtext0 7a7f9e
overlay2 737994
overlay1 585b70
overlay0 45475a
surface2 414559
surface1 363a50
surface0 303446
base 303446
mantle 292c3c
crust 232634
success a6d189
onSuccess 303446
successContainer 3b5e3b
onSuccessContainer b6f0b1
@@ -0,0 +1,110 @@
primary_paletteKeyColor ca9ee6
secondary_paletteKeyColor 7d6799
tertiary_paletteKeyColor f4b8e4
neutral_paletteKeyColor 414559
neutral_variant_paletteKeyColor 303446
background 303446
onBackground c6d0f5
surface 414559
surfaceDim 414559
surfaceBright 55596f
surfaceContainerLowest 292c3c
surfaceContainerLow 363a50
surfaceContainer 303446
surfaceContainerHigh 292c3c
surfaceContainerHighest 232634
onSurface c6d0f5
surfaceVariant 303446
onSurfaceVariant a5adce
inverseSurface c6d0f5
inverseOnSurface 414559
outline 737994
outlineVariant 51576d
shadow 000000
scrim 000000
surfaceTint 83a275
primary a6d189
onPrimary 303446
primaryContainer 83a275
onPrimaryContainer ffffff
inversePrimary 6c4f94
secondary 648e5e
onSecondary ffffff
secondaryContainer 544874
onSecondaryContainer cbbae8
tertiary f4b8e4
onTertiary 4e1e44
tertiaryContainer bb7da9
onTertiaryContainer 000000
error e78284
onError 4a0019
errorContainer 8c2643
onErrorContainer ffb3c6
primaryFixed e8d4ff
primaryFixedDim ca9ee6
onPrimaryFixed 2a1040
onPrimaryFixedVariant 544874
secondaryFixed e2d4ff
secondaryFixedDim 7d6799
onSecondaryFixed 1a0a28
onSecondaryFixedVariant 3a2850
tertiaryFixed ffd7f5
tertiaryFixedDim f4b8e4
onTertiaryFixed 330832
onTertiaryFixedVariant 653661
term0 414559
term1 e78284
term2 a6d189
term3 e5c890
term4 8caaee
term5 f4b8e4
term6 81c8be
term7 c6d0f5
term8 51576d
term9 e78284
term10 a6d189
term11 e5c890
term12 8caaee
term13 f4b8e4
term14 81c8be
term15 a5adce
rosewater f2d5cf
flamingo eebebe
pink f4b8e4
mauve ca9ee6
red e78284
maroon ea999c
peach ef9f76
yellow e5c890
green a6d189
teal 81c8be
sky 99d1db
sapphire 85c1dc
blue 8caaee
lavender babbf1
klink 6685d1
klinkSelection 6585d1
kvisited 7276dd
kvisitedSelection 7276dd
knegative 8e70ff
knegativeSelection 8e70ff
kneutral c794ff
kneutralSelection c794ff
kpositive 54afff
kpositiveSelection 54afff
text c6d0f5
subtext1 a5adce
subtext0 7a7f9e
overlay2 737994
overlay1 585b70
overlay0 45475a
surface2 414559
surface1 363a50
surface0 303446
base 303446
mantle 292c3c
crust 232634
success a6d189
onSuccess 303446
successContainer 3b5e3b
onSuccessContainer b6f0b1
@@ -0,0 +1,110 @@
primary_paletteKeyColor ca9ee6
secondary_paletteKeyColor 7d6799
tertiary_paletteKeyColor f4b8e4
neutral_paletteKeyColor 414559
neutral_variant_paletteKeyColor 303446
background 303446
onBackground c6d0f5
surface 414559
surfaceDim 414559
surfaceBright 55596f
surfaceContainerLowest 292c3c
surfaceContainerLow 363a50
surfaceContainer 303446
surfaceContainerHigh 292c3c
surfaceContainerHighest 232634
onSurface c6d0f5
surfaceVariant 303446
onSurfaceVariant a5adce
inverseSurface c6d0f5
inverseOnSurface 414559
outline 737994
outlineVariant 51576d
shadow 000000
scrim 000000
surfaceTint 9192be
primary babbf1
onPrimary 303446
primaryContainer 9192be
onPrimaryContainer ffffff
inversePrimary 6c4f94
secondary 7175a1
onSecondary ffffff
secondaryContainer 544874
onSecondaryContainer cbbae8
tertiary f4b8e4
onTertiary 4e1e44
tertiaryContainer bb7da9
onTertiaryContainer 000000
error e78284
onError 4a0019
errorContainer 8c2643
onErrorContainer ffb3c6
primaryFixed e8d4ff
primaryFixedDim ca9ee6
onPrimaryFixed 2a1040
onPrimaryFixedVariant 544874
secondaryFixed e2d4ff
secondaryFixedDim 7d6799
onSecondaryFixed 1a0a28
onSecondaryFixedVariant 3a2850
tertiaryFixed ffd7f5
tertiaryFixedDim f4b8e4
onTertiaryFixed 330832
onTertiaryFixedVariant 653661
term0 414559
term1 e78284
term2 a6d189
term3 e5c890
term4 8caaee
term5 f4b8e4
term6 81c8be
term7 c6d0f5
term8 51576d
term9 e78284
term10 a6d189
term11 e5c890
term12 8caaee
term13 f4b8e4
term14 81c8be
term15 a5adce
rosewater f2d5cf
flamingo eebebe
pink f4b8e4
mauve ca9ee6
red e78284
maroon ea999c
peach ef9f76
yellow e5c890
green a6d189
teal 81c8be
sky 99d1db
sapphire 85c1dc
blue 8caaee
lavender babbf1
klink 6685d1
klinkSelection 6585d1
kvisited 7276dd
kvisitedSelection 7276dd
knegative 8e70ff
knegativeSelection 8e70ff
kneutral c794ff
kneutralSelection c794ff
kpositive 54afff
kpositiveSelection 54afff
text c6d0f5
subtext1 a5adce
subtext0 7a7f9e
overlay2 737994
overlay1 585b70
overlay0 45475a
surface2 414559
surface1 363a50
surface0 303446
base 303446
mantle 292c3c
crust 232634
success a6d189
onSuccess 303446
successContainer 3b5e3b
onSuccessContainer b6f0b1
@@ -0,0 +1,110 @@
primary_paletteKeyColor ca9ee6
secondary_paletteKeyColor 7d6799
tertiary_paletteKeyColor f4b8e4
neutral_paletteKeyColor 414559
neutral_variant_paletteKeyColor 303446
background 303446
onBackground c6d0f5
surface 414559
surfaceDim 414559
surfaceBright 55596f
surfaceContainerLowest 292c3c
surfaceContainerLow 363a50
surfaceContainer 303446
surfaceContainerHigh 292c3c
surfaceContainerHighest 232634
onSurface c6d0f5
surfaceVariant 303446
onSurfaceVariant a5adce
inverseSurface c6d0f5
inverseOnSurface 414559
outline 737994
outlineVariant 51576d
shadow 000000
scrim 000000
surfaceTint b27a83
primary ea999c
onPrimary 303446
primaryContainer b27a83
onPrimaryContainer ffffff
inversePrimary 6c4f94
secondary 92626f
onSecondary ffffff
secondaryContainer 544874
onSecondaryContainer cbbae8
tertiary f4b8e4
onTertiary 4e1e44
tertiaryContainer bb7da9
onTertiaryContainer 000000
error e78284
onError 4a0019
errorContainer 8c2643
onErrorContainer ffb3c6
primaryFixed e8d4ff
primaryFixedDim ca9ee6
onPrimaryFixed 2a1040
onPrimaryFixedVariant 544874
secondaryFixed e2d4ff
secondaryFixedDim 7d6799
onSecondaryFixed 1a0a28
onSecondaryFixedVariant 3a2850
tertiaryFixed ffd7f5
tertiaryFixedDim f4b8e4
onTertiaryFixed 330832
onTertiaryFixedVariant 653661
term0 414559
term1 e78284
term2 a6d189
term3 e5c890
term4 8caaee
term5 f4b8e4
term6 81c8be
term7 c6d0f5
term8 51576d
term9 e78284
term10 a6d189
term11 e5c890
term12 8caaee
term13 f4b8e4
term14 81c8be
term15 a5adce
rosewater f2d5cf
flamingo eebebe
pink f4b8e4
mauve ca9ee6
red e78284
maroon ea999c
peach ef9f76
yellow e5c890
green a6d189
teal 81c8be
sky 99d1db
sapphire 85c1dc
blue 8caaee
lavender babbf1
klink 6685d1
klinkSelection 6585d1
kvisited 7276dd
kvisitedSelection 7276dd
knegative 8e70ff
knegativeSelection 8e70ff
kneutral c794ff
kneutralSelection c794ff
kpositive 54afff
kpositiveSelection 54afff
text c6d0f5
subtext1 a5adce
subtext0 7a7f9e
overlay2 737994
overlay1 585b70
overlay0 45475a
surface2 414559
surface1 363a50
surface0 303446
base 303446
mantle 292c3c
crust 232634
success a6d189
onSuccess 303446
successContainer 3b5e3b
onSuccessContainer b6f0b1
@@ -0,0 +1,110 @@
primary_paletteKeyColor ca9ee6
secondary_paletteKeyColor 7d6799
tertiary_paletteKeyColor f4b8e4
neutral_paletteKeyColor 414559
neutral_variant_paletteKeyColor 303446
background 303446
onBackground c6d0f5
surface 414559
surfaceDim 414559
surfaceBright 55596f
surfaceContainerLowest 292c3c
surfaceContainerLow 363a50
surfaceContainer 303446
surfaceContainerHigh 292c3c
surfaceContainerHighest 232634
onSurface c6d0f5
surfaceVariant 303446
onSurfaceVariant a5adce
inverseSurface c6d0f5
inverseOnSurface 414559
outline 737994
outlineVariant 51576d
shadow 000000
scrim 000000
surfaceTint 9c7eb6
primary ca9ee6
onPrimary 303446
primaryContainer 9c7eb6
onPrimaryContainer ffffff
inversePrimary 6c4f94
secondary 7d6799
onSecondary ffffff
secondaryContainer 544874
onSecondaryContainer cbbae8
tertiary f4b8e4
onTertiary 4e1e44
tertiaryContainer bb7da9
onTertiaryContainer 000000
error e78284
onError 4a0019
errorContainer 8c2643
onErrorContainer ffb3c6
primaryFixed e8d4ff
primaryFixedDim ca9ee6
onPrimaryFixed 2a1040
onPrimaryFixedVariant 544874
secondaryFixed e2d4ff
secondaryFixedDim 7d6799
onSecondaryFixed 1a0a28
onSecondaryFixedVariant 3a2850
tertiaryFixed ffd7f5
tertiaryFixedDim f4b8e4
onTertiaryFixed 330832
onTertiaryFixedVariant 653661
term0 414559
term1 e78284
term2 a6d189
term3 e5c890
term4 8caaee
term5 f4b8e4
term6 81c8be
term7 c6d0f5
term8 51576d
term9 e78284
term10 a6d189
term11 e5c890
term12 8caaee
term13 f4b8e4
term14 81c8be
term15 a5adce
rosewater f2d5cf
flamingo eebebe
pink f4b8e4
mauve ca9ee6
red e78284
maroon ea999c
peach ef9f76
yellow e5c890
green a6d189
teal 81c8be
sky 99d1db
sapphire 85c1dc
blue 8caaee
lavender babbf1
klink 6685d1
klinkSelection 6585d1
kvisited 7276dd
kvisitedSelection 7276dd
knegative 8e70ff
knegativeSelection 8e70ff
kneutral c794ff
kneutralSelection c794ff
kpositive 54afff
kpositiveSelection 54afff
text c6d0f5
subtext1 a5adce
subtext0 7a7f9e
overlay2 737994
overlay1 585b70
overlay0 45475a
surface2 414559
surface1 363a50
surface0 303446
base 303446
mantle 292c3c
crust 232634
success a6d189
onSuccess 303446
successContainer 3b5e3b
onSuccessContainer b6f0b1
@@ -0,0 +1,110 @@
primary_paletteKeyColor ca9ee6
secondary_paletteKeyColor 7d6799
tertiary_paletteKeyColor f4b8e4
neutral_paletteKeyColor 414559
neutral_variant_paletteKeyColor 303446
background 303446
onBackground c6d0f5
surface 414559
surfaceDim 414559
surfaceBright 55596f
surfaceContainerLowest 292c3c
surfaceContainerLow 363a50
surfaceContainer 303446
surfaceContainerHigh 292c3c
surfaceContainerHighest 232634
onSurface c6d0f5
surfaceVariant 303446
onSurfaceVariant a5adce
inverseSurface c6d0f5
inverseOnSurface 414559
outline 737994
outlineVariant 51576d
shadow 000000
scrim 000000
surfaceTint b67f68
primary ef9f76
onPrimary 303446
primaryContainer b67f68
onPrimaryContainer ffffff
inversePrimary 6c4f94
secondary 8f6a5f
onSecondary ffffff
secondaryContainer 544874
onSecondaryContainer cbbae8
tertiary f4b8e4
onTertiary 4e1e44
tertiaryContainer bb7da9
onTertiaryContainer 000000
error e78284
onError 4a0019
errorContainer 8c2643
onErrorContainer ffb3c6
primaryFixed e8d4ff
primaryFixedDim ca9ee6
onPrimaryFixed 2a1040
onPrimaryFixedVariant 544874
secondaryFixed e2d4ff
secondaryFixedDim 7d6799
onSecondaryFixed 1a0a28
onSecondaryFixedVariant 3a2850
tertiaryFixed ffd7f5
tertiaryFixedDim f4b8e4
onTertiaryFixed 330832
onTertiaryFixedVariant 653661
term0 414559
term1 e78284
term2 a6d189
term3 e5c890
term4 8caaee
term5 f4b8e4
term6 81c8be
term7 c6d0f5
term8 51576d
term9 e78284
term10 a6d189
term11 e5c890
term12 8caaee
term13 f4b8e4
term14 81c8be
term15 a5adce
rosewater f2d5cf
flamingo eebebe
pink f4b8e4
mauve ca9ee6
red e78284
maroon ea999c
peach ef9f76
yellow e5c890
green a6d189
teal 81c8be
sky 99d1db
sapphire 85c1dc
blue 8caaee
lavender babbf1
klink 6685d1
klinkSelection 6585d1
kvisited 7276dd
kvisitedSelection 7276dd
knegative 8e70ff
knegativeSelection 8e70ff
kneutral c794ff
kneutralSelection c794ff
kpositive 54afff
kpositiveSelection 54afff
text c6d0f5
subtext1 a5adce
subtext0 7a7f9e
overlay2 737994
overlay1 585b70
overlay0 45475a
surface2 414559
surface1 363a50
surface0 303446
base 303446
mantle 292c3c
crust 232634
success a6d189
onSuccess 303446
successContainer 3b5e3b
onSuccessContainer b6f0b1
@@ -0,0 +1,110 @@
primary_paletteKeyColor ca9ee6
secondary_paletteKeyColor 7d6799
tertiary_paletteKeyColor f4b8e4
neutral_paletteKeyColor 414559
neutral_variant_paletteKeyColor 303446
background 303446
onBackground c6d0f5
surface 414559
surfaceDim 414559
surfaceBright 55596f
surfaceContainerLowest 292c3c
surfaceContainerLow 363a50
surfaceContainer 303446
surfaceContainerHigh 292c3c
surfaceContainerHighest 232634
onSurface c6d0f5
surfaceVariant 303446
onSurfaceVariant a5adce
inverseSurface c6d0f5
inverseOnSurface 414559
outline 737994
outlineVariant 51576d
shadow 000000
scrim 000000
surfaceTint b990b5
primary f4b8e4
onPrimary 303446
primaryContainer b990b5
onPrimaryContainer ffffff
inversePrimary 6c4f94
secondary 996e9e
onSecondary ffffff
secondaryContainer 544874
onSecondaryContainer cbbae8
tertiary f4b8e4
onTertiary 4e1e44
tertiaryContainer bb7da9
onTertiaryContainer 000000
error e78284
onError 4a0019
errorContainer 8c2643
onErrorContainer ffb3c6
primaryFixed e8d4ff
primaryFixedDim ca9ee6
onPrimaryFixed 2a1040
onPrimaryFixedVariant 544874
secondaryFixed e2d4ff
secondaryFixedDim 7d6799
onSecondaryFixed 1a0a28
onSecondaryFixedVariant 3a2850
tertiaryFixed ffd7f5
tertiaryFixedDim f4b8e4
onTertiaryFixed 330832
onTertiaryFixedVariant 653661
term0 414559
term1 e78284
term2 a6d189
term3 e5c890
term4 8caaee
term5 f4b8e4
term6 81c8be
term7 c6d0f5
term8 51576d
term9 e78284
term10 a6d189
term11 e5c890
term12 8caaee
term13 f4b8e4
term14 81c8be
term15 a5adce
rosewater f2d5cf
flamingo eebebe
pink f4b8e4
mauve ca9ee6
red e78284
maroon ea999c
peach ef9f76
yellow e5c890
green a6d189
teal 81c8be
sky 99d1db
sapphire 85c1dc
blue 8caaee
lavender babbf1
klink 6685d1
klinkSelection 6585d1
kvisited 7276dd
kvisitedSelection 7276dd
knegative 8e70ff
knegativeSelection 8e70ff
kneutral c794ff
kneutralSelection c794ff
kpositive 54afff
kpositiveSelection 54afff
text c6d0f5
subtext1 a5adce
subtext0 7a7f9e
overlay2 737994
overlay1 585b70
overlay0 45475a
surface2 414559
surface1 363a50
surface0 303446
base 303446
mantle 292c3c
crust 232634
success a6d189
onSuccess 303446
successContainer 3b5e3b
onSuccessContainer b6f0b1
@@ -0,0 +1,110 @@
primary_paletteKeyColor ca9ee6
secondary_paletteKeyColor 7d6799
tertiary_paletteKeyColor f4b8e4
neutral_paletteKeyColor 414559
neutral_variant_paletteKeyColor 303446
background 303446
onBackground c6d0f5
surface 414559
surfaceDim 414559
surfaceBright 55596f
surfaceContainerLowest 292c3c
surfaceContainerLow 363a50
surfaceContainer 303446
surfaceContainerHigh 292c3c
surfaceContainerHighest 232634
onSurface c6d0f5
surfaceVariant 303446
onSurfaceVariant a5adce
inverseSurface c6d0f5
inverseOnSurface 414559
outline 737994
outlineVariant 51576d
shadow 000000
scrim 000000
surfaceTint b06a72
primary e78284
onPrimary 303446
primaryContainer b06a72
onPrimaryContainer ffffff
inversePrimary 6c4f94
secondary 8b5d66
onSecondary ffffff
secondaryContainer 544874
onSecondaryContainer cbbae8
tertiary f4b8e4
onTertiary 4e1e44
tertiaryContainer bb7da9
onTertiaryContainer 000000
error e78284
onError 4a0019
errorContainer 8c2643
onErrorContainer ffb3c6
primaryFixed e8d4ff
primaryFixedDim ca9ee6
onPrimaryFixed 2a1040
onPrimaryFixedVariant 544874
secondaryFixed e2d4ff
secondaryFixedDim 7d6799
onSecondaryFixed 1a0a28
onSecondaryFixedVariant 3a2850
tertiaryFixed ffd7f5
tertiaryFixedDim f4b8e4
onTertiaryFixed 330832
onTertiaryFixedVariant 653661
term0 414559
term1 e78284
term2 a6d189
term3 e5c890
term4 8caaee
term5 f4b8e4
term6 81c8be
term7 c6d0f5
term8 51576d
term9 e78284
term10 a6d189
term11 e5c890
term12 8caaee
term13 f4b8e4
term14 81c8be
term15 a5adce
rosewater f2d5cf
flamingo eebebe
pink f4b8e4
mauve ca9ee6
red e78284
maroon ea999c
peach ef9f76
yellow e5c890
green a6d189
teal 81c8be
sky 99d1db
sapphire 85c1dc
blue 8caaee
lavender babbf1
klink 6685d1
klinkSelection 6585d1
kvisited 7276dd
kvisitedSelection 7276dd
knegative 8e70ff
knegativeSelection 8e70ff
kneutral c794ff
kneutralSelection c794ff
kpositive 54afff
kpositiveSelection 54afff
text c6d0f5
subtext1 a5adce
subtext0 7a7f9e
overlay2 737994
overlay1 585b70
overlay0 45475a
surface2 414559
surface1 363a50
surface0 303446
base 303446
mantle 292c3c
crust 232634
success a6d189
onSuccess 303446
successContainer 3b5e3b
onSuccessContainer b6f0b1
@@ -0,0 +1,110 @@
primary_paletteKeyColor ca9ee6
secondary_paletteKeyColor 7d6799
tertiary_paletteKeyColor f4b8e4
neutral_paletteKeyColor 414559
neutral_variant_paletteKeyColor 303446
background 303446
onBackground c6d0f5
surface 414559
surfaceDim 414559
surfaceBright 55596f
surfaceContainerLowest 292c3c
surfaceContainerLow 363a50
surfaceContainer 303446
surfaceContainerHigh 292c3c
surfaceContainerHighest 232634
onSurface c6d0f5
surfaceVariant 303446
onSurfaceVariant a5adce
inverseSurface c6d0f5
inverseOnSurface 414559
outline 737994
outlineVariant 51576d
shadow 000000
scrim 000000
surfaceTint b8a5a6
primary f2d5cf
onPrimary 303446
primaryContainer b8a5a6
onPrimaryContainer ffffff
inversePrimary 6c4f94
secondary a2748b
onSecondary ffffff
secondaryContainer 544874
onSecondaryContainer cbbae8
tertiary f4b8e4
onTertiary 4e1e44
tertiaryContainer bb7da9
onTertiaryContainer 000000
error e78284
onError 4a0019
errorContainer 8c2643
onErrorContainer ffb3c6
primaryFixed e8d4ff
primaryFixedDim ca9ee6
onPrimaryFixed 2a1040
onPrimaryFixedVariant 544874
secondaryFixed e2d4ff
secondaryFixedDim 7d6799
onSecondaryFixed 1a0a28
onSecondaryFixedVariant 3a2850
tertiaryFixed ffd7f5
tertiaryFixedDim f4b8e4
onTertiaryFixed 330832
onTertiaryFixedVariant 653661
term0 414559
term1 e78284
term2 a6d189
term3 e5c890
term4 8caaee
term5 f4b8e4
term6 81c8be
term7 c6d0f5
term8 51576d
term9 e78284
term10 a6d189
term11 e5c890
term12 8caaee
term13 f4b8e4
term14 81c8be
term15 a5adce
rosewater f2d5cf
flamingo eebebe
pink f4b8e4
mauve ca9ee6
red e78284
maroon ea999c
peach ef9f76
yellow e5c890
green a6d189
teal 81c8be
sky 99d1db
sapphire 85c1dc
blue 8caaee
lavender babbf1
klink 6685d1
klinkSelection 6585d1
kvisited 7276dd
kvisitedSelection 7276dd
knegative 8e70ff
knegativeSelection 8e70ff
kneutral c794ff
kneutralSelection c794ff
kpositive 54afff
kpositiveSelection 54afff
text c6d0f5
subtext1 a5adce
subtext0 7a7f9e
overlay2 737994
overlay1 585b70
overlay0 45475a
surface2 414559
surface1 363a50
surface0 303446
base 303446
mantle 292c3c
crust 232634
success a6d189
onSuccess 303446
successContainer 3b5e3b
onSuccessContainer b6f0b1
@@ -0,0 +1,110 @@
primary_paletteKeyColor ca9ee6
secondary_paletteKeyColor 7d6799
tertiary_paletteKeyColor f4b8e4
neutral_paletteKeyColor 414559
neutral_variant_paletteKeyColor 303446
background 303446
onBackground c6d0f5
surface 414559
surfaceDim 414559
surfaceBright 55596f
surfaceContainerLowest 292c3c
surfaceContainerLow 363a50
surfaceContainer 303446
surfaceContainerHigh 292c3c
surfaceContainerHighest 232634
onSurface c6d0f5
surfaceVariant 303446
onSurfaceVariant a5adce
inverseSurface c6d0f5
inverseOnSurface 414559
outline 737994
outlineVariant 51576d
shadow 000000
scrim 000000
surfaceTint 6b96af
primary 85c1dc
onPrimary 303446
primaryContainer 6b96af
onPrimaryContainer ffffff
inversePrimary 6c4f94
secondary 5e7b8e
onSecondary ffffff
secondaryContainer 544874
onSecondaryContainer cbbae8
tertiary f4b8e4
onTertiary 4e1e44
tertiaryContainer bb7da9
onTertiaryContainer 000000
error e78284
onError 4a0019
errorContainer 8c2643
onErrorContainer ffb3c6
primaryFixed e8d4ff
primaryFixedDim ca9ee6
onPrimaryFixed 2a1040
onPrimaryFixedVariant 544874
secondaryFixed e2d4ff
secondaryFixedDim 7d6799
onSecondaryFixed 1a0a28
onSecondaryFixedVariant 3a2850
tertiaryFixed ffd7f5
tertiaryFixedDim f4b8e4
onTertiaryFixed 330832
onTertiaryFixedVariant 653661
term0 414559
term1 e78284
term2 a6d189
term3 e5c890
term4 8caaee
term5 f4b8e4
term6 81c8be
term7 c6d0f5
term8 51576d
term9 e78284
term10 a6d189
term11 e5c890
term12 8caaee
term13 f4b8e4
term14 81c8be
term15 a5adce
rosewater f2d5cf
flamingo eebebe
pink f4b8e4
mauve ca9ee6
red e78284
maroon ea999c
peach ef9f76
yellow e5c890
green a6d189
teal 81c8be
sky 99d1db
sapphire 85c1dc
blue 8caaee
lavender babbf1
klink 6685d1
klinkSelection 6585d1
kvisited 7276dd
kvisitedSelection 7276dd
knegative 8e70ff
knegativeSelection 8e70ff
kneutral c794ff
kneutralSelection c794ff
kpositive 54afff
kpositiveSelection 54afff
text c6d0f5
subtext1 a5adce
subtext0 7a7f9e
overlay2 737994
overlay1 585b70
overlay0 45475a
surface2 414559
surface1 363a50
surface0 303446
base 303446
mantle 292c3c
crust 232634
success a6d189
onSuccess 303446
successContainer 3b5e3b
onSuccessContainer b6f0b1
@@ -0,0 +1,110 @@
primary_paletteKeyColor ca9ee6
secondary_paletteKeyColor 7d6799
tertiary_paletteKeyColor f4b8e4
neutral_paletteKeyColor 414559
neutral_variant_paletteKeyColor 303446
background 303446
onBackground c6d0f5
surface 414559
surfaceDim 414559
surfaceBright 55596f
surfaceContainerLowest 292c3c
surfaceContainerLow 363a50
surfaceContainer 303446
surfaceContainerHigh 292c3c
surfaceContainerHighest 232634
onSurface c6d0f5
surfaceVariant 303446
onSurfaceVariant a5adce
inverseSurface c6d0f5
inverseOnSurface 414559
outline 737994
outlineVariant 51576d
shadow 000000
scrim 000000
surfaceTint 79a2af
primary 99d1db
onPrimary 303446
primaryContainer 79a2af
onPrimaryContainer ffffff
inversePrimary 6c4f94
secondary 628494
onSecondary ffffff
secondaryContainer 544874
onSecondaryContainer cbbae8
tertiary f4b8e4
onTertiary 4e1e44
tertiaryContainer bb7da9
onTertiaryContainer 000000
error e78284
onError 4a0019
errorContainer 8c2643
onErrorContainer ffb3c6
primaryFixed e8d4ff
primaryFixedDim ca9ee6
onPrimaryFixed 2a1040
onPrimaryFixedVariant 544874
secondaryFixed e2d4ff
secondaryFixedDim 7d6799
onSecondaryFixed 1a0a28
onSecondaryFixedVariant 3a2850
tertiaryFixed ffd7f5
tertiaryFixedDim f4b8e4
onTertiaryFixed 330832
onTertiaryFixedVariant 653661
term0 414559
term1 e78284
term2 a6d189
term3 e5c890
term4 8caaee
term5 f4b8e4
term6 81c8be
term7 c6d0f5
term8 51576d
term9 e78284
term10 a6d189
term11 e5c890
term12 8caaee
term13 f4b8e4
term14 81c8be
term15 a5adce
rosewater f2d5cf
flamingo eebebe
pink f4b8e4
mauve ca9ee6
red e78284
maroon ea999c
peach ef9f76
yellow e5c890
green a6d189
teal 81c8be
sky 99d1db
sapphire 85c1dc
blue 8caaee
lavender babbf1
klink 6685d1
klinkSelection 6585d1
kvisited 7276dd
kvisitedSelection 7276dd
knegative 8e70ff
knegativeSelection 8e70ff
kneutral c794ff
kneutralSelection c794ff
kpositive 54afff
kpositiveSelection 54afff
text c6d0f5
subtext1 a5adce
subtext0 7a7f9e
overlay2 737994
overlay1 585b70
overlay0 45475a
surface2 414559
surface1 363a50
surface0 303446
base 303446
mantle 292c3c
crust 232634
success a6d189
onSuccess 303446
successContainer 3b5e3b
onSuccessContainer b6f0b1
@@ -0,0 +1,110 @@
primary_paletteKeyColor ca9ee6
secondary_paletteKeyColor 7d6799
tertiary_paletteKeyColor f4b8e4
neutral_paletteKeyColor 414559
neutral_variant_paletteKeyColor 303446
background 303446
onBackground c6d0f5
surface 414559
surfaceDim 414559
surfaceBright 55596f
surfaceContainerLowest 292c3c
surfaceContainerLow 363a50
surfaceContainer 303446
surfaceContainerHigh 292c3c
surfaceContainerHighest 232634
onSurface c6d0f5
surfaceVariant 303446
onSurfaceVariant a5adce
inverseSurface c6d0f5
inverseOnSurface 414559
outline 737994
outlineVariant 51576d
shadow 000000
scrim 000000
surfaceTint 699b9a
primary 81c8be
onPrimary 303446
primaryContainer 699b9a
onPrimaryContainer ffffff
inversePrimary 6c4f94
secondary 588084
onSecondary ffffff
secondaryContainer 544874
onSecondaryContainer cbbae8
tertiary f4b8e4
onTertiary 4e1e44
tertiaryContainer bb7da9
onTertiaryContainer 000000
error e78284
onError 4a0019
errorContainer 8c2643
onErrorContainer ffb3c6
primaryFixed e8d4ff
primaryFixedDim ca9ee6
onPrimaryFixed 2a1040
onPrimaryFixedVariant 544874
secondaryFixed e2d4ff
secondaryFixedDim 7d6799
onSecondaryFixed 1a0a28
onSecondaryFixedVariant 3a2850
tertiaryFixed ffd7f5
tertiaryFixedDim f4b8e4
onTertiaryFixed 330832
onTertiaryFixedVariant 653661
term0 414559
term1 e78284
term2 a6d189
term3 e5c890
term4 8caaee
term5 f4b8e4
term6 81c8be
term7 c6d0f5
term8 51576d
term9 e78284
term10 a6d189
term11 e5c890
term12 8caaee
term13 f4b8e4
term14 81c8be
term15 a5adce
rosewater f2d5cf
flamingo eebebe
pink f4b8e4
mauve ca9ee6
red e78284
maroon ea999c
peach ef9f76
yellow e5c890
green a6d189
teal 81c8be
sky 99d1db
sapphire 85c1dc
blue 8caaee
lavender babbf1
klink 6685d1
klinkSelection 6585d1
kvisited 7276dd
kvisitedSelection 7276dd
knegative 8e70ff
knegativeSelection 8e70ff
kneutral c794ff
kneutralSelection c794ff
kpositive 54afff
kpositiveSelection 54afff
text c6d0f5
subtext1 a5adce
subtext0 7a7f9e
overlay2 737994
overlay1 585b70
overlay0 45475a
surface2 414559
surface1 363a50
surface0 303446
base 303446
mantle 292c3c
crust 232634
success a6d189
onSuccess 303446
successContainer 3b5e3b
onSuccessContainer b6f0b1
@@ -0,0 +1,110 @@
primary_paletteKeyColor ca9ee6
secondary_paletteKeyColor 7d6799
tertiary_paletteKeyColor f4b8e4
neutral_paletteKeyColor 414559
neutral_variant_paletteKeyColor 303446
background 303446
onBackground c6d0f5
surface 414559
surfaceDim 414559
surfaceBright 55596f
surfaceContainerLowest 292c3c
surfaceContainerLow 363a50
surfaceContainer 303446
surfaceContainerHigh 292c3c
surfaceContainerHighest 232634
onSurface c6d0f5
surfaceVariant 303446
onSurfaceVariant a5adce
inverseSurface c6d0f5
inverseOnSurface 414559
outline 737994
outlineVariant 51576d
shadow 000000
scrim 000000
surfaceTint af9b7a
primary e5c890
onPrimary 303446
primaryContainer af9b7a
onPrimaryContainer ffffff
inversePrimary 6c4f94
secondary 948062
onSecondary ffffff
secondaryContainer 544874
onSecondaryContainer cbbae8
tertiary f4b8e4
onTertiary 4e1e44
tertiaryContainer bb7da9
onTertiaryContainer 000000
error e78284
onError 4a0019
errorContainer 8c2643
onErrorContainer ffb3c6
primaryFixed e8d4ff
primaryFixedDim ca9ee6
onPrimaryFixed 2a1040
onPrimaryFixedVariant 544874
secondaryFixed e2d4ff
secondaryFixedDim 7d6799
onSecondaryFixed 1a0a28
onSecondaryFixedVariant 3a2850
tertiaryFixed ffd7f5
tertiaryFixedDim f4b8e4
onTertiaryFixed 330832
onTertiaryFixedVariant 653661
term0 414559
term1 e78284
term2 a6d189
term3 e5c890
term4 8caaee
term5 f4b8e4
term6 81c8be
term7 c6d0f5
term8 51576d
term9 e78284
term10 a6d189
term11 e5c890
term12 8caaee
term13 f4b8e4
term14 81c8be
term15 a5adce
rosewater f2d5cf
flamingo eebebe
pink f4b8e4
mauve ca9ee6
red e78284
maroon ea999c
peach ef9f76
yellow e5c890
green a6d189
teal 81c8be
sky 99d1db
sapphire 85c1dc
blue 8caaee
lavender babbf1
klink 6685d1
klinkSelection 6585d1
kvisited 7276dd
kvisitedSelection 7276dd
knegative 8e70ff
knegativeSelection 8e70ff
kneutral c794ff
kneutralSelection c794ff
kpositive 54afff
kpositiveSelection 54afff
text c6d0f5
subtext1 a5adce
subtext0 7a7f9e
overlay2 737994
overlay1 585b70
overlay0 45475a
surface2 414559
surface1 363a50
surface0 303446
base 303446
mantle 292c3c
crust 232634
success a6d189
onSuccess 303446
successContainer 3b5e3b
onSuccessContainer b6f0b1
@@ -0,0 +1,110 @@
primary_paletteKeyColor 8839ef
secondary_paletteKeyColor c2b8d0
tertiary_paletteKeyColor ea76cb
neutral_paletteKeyColor 9ca0b0
neutral_variant_paletteKeyColor e6e9ef
background eff1f5
onBackground 4c4f69
surface ccd0da
surfaceDim ccd0da
surfaceBright eff1f5
surfaceContainerLowest ffffff
surfaceContainerLow f5f6f9
surfaceContainer eff1f5
surfaceContainerHigh e6e9ef
surfaceContainerHighest dce0e8
onSurface 4c4f69
surfaceVariant eff1f5
onSurfaceVariant 6c6f85
inverseSurface 4c4f69
inverseOnSurface ccd0da
outline 9ca0b0
outlineVariant acb0be
shadow 000000
scrim 000000
surfaceTint 5c90f5
primary 1e66f5
onPrimary eff1f5
primaryContainer 5c90f5
onPrimaryContainer 2a1040
inversePrimary 6c4f94
secondary b1bacb
onSecondary 4c4f69
secondaryContainer e6d4ff
onSecondaryContainer 544874
tertiary ea76cb
onTertiary eff1f5
tertiaryContainer ea76cb
onTertiaryContainer 4e1e44
error d20f39
onError eff1f5
errorContainer ffdad6
onErrorContainer 93000a
primaryFixed e8d4ff
primaryFixedDim a670f1
onPrimaryFixed ffffff
onPrimaryFixedVariant 544874
secondaryFixed f0e4ff
secondaryFixedDim c2b8d0
onSecondaryFixed 4c4f69
onSecondaryFixedVariant 3a2850
tertiaryFixed ffd7f0
tertiaryFixedDim ea76cb
onTertiaryFixed 4c4f69
onTertiaryFixedVariant 4e1e44
term0 5c5f77
term1 d20f39
term2 40a02b
term3 df8e1d
term4 1e66f5
term5 ea76cb
term6 179299
term7 acb0be
term8 6c6f85
term9 d20f39
term10 40a02b
term11 df8e1d
term12 1e66f5
term13 ea76cb
term14 179299
term15 4c4f69
rosewater dc8a78
flamingo dd7878
pink ea76cb
mauve 8839ef
red d20f39
maroon e64553
peach fe640b
yellow df8e1d
green 40a02b
teal 179299
sky 04a5e5
sapphire 209fb5
blue 1e66f5
lavender 7287fd
klink 2e8fc3
klinkSelection 308fc4
kvisited 2584d6
kvisitedSelection 2984d7
knegative 607eff
knegativeSelection 607eff
kneutral c794ff
kneutralSelection c794ff
kpositive 00b8de
kpositiveSelection 00b8df
text 4c4f69
subtext1 6c6f85
subtext0 9ca0b0
overlay2 acb0be
overlay1 bcc0cc
overlay0 ccd0da
surface2 dce0e8
surface1 e6e9ef
surface0 eff1f5
base eff1f5
mantle e6e9ef
crust dce0e8
success 40a02b
onSuccess eff1f5
successContainer d1e8d5
onSuccessContainer 0c1f13
@@ -0,0 +1,110 @@
primary_paletteKeyColor 8839ef
secondary_paletteKeyColor c2b8d0
tertiary_paletteKeyColor ea76cb
neutral_paletteKeyColor 9ca0b0
neutral_variant_paletteKeyColor e6e9ef
background eff1f5
onBackground 4c4f69
surface ccd0da
surfaceDim ccd0da
surfaceBright eff1f5
surfaceContainerLowest ffffff
surfaceContainerLow f5f6f9
surfaceContainer eff1f5
surfaceContainerHigh e6e9ef
surfaceContainerHighest dce0e8
onSurface 4c4f69
surfaceVariant eff1f5
onSurfaceVariant 6c6f85
inverseSurface 4c4f69
inverseOnSurface ccd0da
outline 9ca0b0
outlineVariant acb0be
shadow 000000
scrim 000000
surfaceTint e29c9d
primary dd7878
onPrimary eff1f5
primaryContainer e29c9d
onPrimaryContainer 2a1040
inversePrimary 6c4f94
secondary d7c3c4
onSecondary 4c4f69
secondaryContainer e6d4ff
onSecondaryContainer 544874
tertiary ea76cb
onTertiary eff1f5
tertiaryContainer ea76cb
onTertiaryContainer 4e1e44
error d20f39
onError eff1f5
errorContainer ffdad6
onErrorContainer 93000a
primaryFixed e8d4ff
primaryFixedDim a670f1
onPrimaryFixed ffffff
onPrimaryFixedVariant 544874
secondaryFixed f0e4ff
secondaryFixedDim c2b8d0
onSecondaryFixed 4c4f69
onSecondaryFixedVariant 3a2850
tertiaryFixed ffd7f0
tertiaryFixedDim ea76cb
onTertiaryFixed 4c4f69
onTertiaryFixedVariant 4e1e44
term0 5c5f77
term1 d20f39
term2 40a02b
term3 df8e1d
term4 1e66f5
term5 ea76cb
term6 179299
term7 acb0be
term8 6c6f85
term9 d20f39
term10 40a02b
term11 df8e1d
term12 1e66f5
term13 ea76cb
term14 179299
term15 4c4f69
rosewater dc8a78
flamingo dd7878
pink ea76cb
mauve 8839ef
red d20f39
maroon e64553
peach fe640b
yellow df8e1d
green 40a02b
teal 179299
sky 04a5e5
sapphire 209fb5
blue 1e66f5
lavender 7287fd
klink 2e8fc3
klinkSelection 308fc4
kvisited 2584d6
kvisitedSelection 2984d7
knegative 607eff
knegativeSelection 607eff
kneutral c794ff
kneutralSelection c794ff
kpositive 00b8de
kpositiveSelection 00b8df
text 4c4f69
subtext1 6c6f85
subtext0 9ca0b0
overlay2 acb0be
overlay1 bcc0cc
overlay0 ccd0da
surface2 dce0e8
surface1 e6e9ef
surface0 eff1f5
base eff1f5
mantle e6e9ef
crust dce0e8
success 40a02b
onSuccess eff1f5
successContainer d1e8d5
onSuccessContainer 0c1f13
@@ -0,0 +1,110 @@
primary_paletteKeyColor 8839ef
secondary_paletteKeyColor c2b8d0
tertiary_paletteKeyColor ea76cb
neutral_paletteKeyColor 9ca0b0
neutral_variant_paletteKeyColor e6e9ef
background eff1f5
onBackground 4c4f69
surface ccd0da
surfaceDim ccd0da
surfaceBright eff1f5
surfaceContainerLowest ffffff
surfaceContainerLow f5f6f9
surfaceContainer eff1f5
surfaceContainerHigh e6e9ef
surfaceContainerHighest dce0e8
onSurface 4c4f69
surfaceVariant eff1f5
onSurfaceVariant 6c6f85
inverseSurface 4c4f69
inverseOnSurface ccd0da
outline 9ca0b0
outlineVariant acb0be
shadow 000000
scrim 000000
surfaceTint 74b867
primary 40a02b
onPrimary eff1f5
primaryContainer 74b867
onPrimaryContainer 2a1040
inversePrimary 6c4f94
secondary 9fbd9b
onSecondary 4c4f69
secondaryContainer e6d4ff
onSecondaryContainer 544874
tertiary ea76cb
onTertiary eff1f5
tertiaryContainer ea76cb
onTertiaryContainer 4e1e44
error d20f39
onError eff1f5
errorContainer ffdad6
onErrorContainer 93000a
primaryFixed e8d4ff
primaryFixedDim a670f1
onPrimaryFixed ffffff
onPrimaryFixedVariant 544874
secondaryFixed f0e4ff
secondaryFixedDim c2b8d0
onSecondaryFixed 4c4f69
onSecondaryFixedVariant 3a2850
tertiaryFixed ffd7f0
tertiaryFixedDim ea76cb
onTertiaryFixed 4c4f69
onTertiaryFixedVariant 4e1e44
term0 5c5f77
term1 d20f39
term2 40a02b
term3 df8e1d
term4 1e66f5
term5 ea76cb
term6 179299
term7 acb0be
term8 6c6f85
term9 d20f39
term10 40a02b
term11 df8e1d
term12 1e66f5
term13 ea76cb
term14 179299
term15 4c4f69
rosewater dc8a78
flamingo dd7878
pink ea76cb
mauve 8839ef
red d20f39
maroon e64553
peach fe640b
yellow df8e1d
green 40a02b
teal 179299
sky 04a5e5
sapphire 209fb5
blue 1e66f5
lavender 7287fd
klink 2e8fc3
klinkSelection 308fc4
kvisited 2584d6
kvisitedSelection 2984d7
knegative 607eff
knegativeSelection 607eff
kneutral c794ff
kneutralSelection c794ff
kpositive 00b8de
kpositiveSelection 00b8df
text 4c4f69
subtext1 6c6f85
subtext0 9ca0b0
overlay2 acb0be
overlay1 bcc0cc
overlay0 ccd0da
surface2 dce0e8
surface1 e6e9ef
surface0 eff1f5
base eff1f5
mantle e6e9ef
crust dce0e8
success 40a02b
onSuccess eff1f5
successContainer d1e8d5
onSuccessContainer 0c1f13
@@ -0,0 +1,110 @@
primary_paletteKeyColor 8839ef
secondary_paletteKeyColor c2b8d0
tertiary_paletteKeyColor ea76cb
neutral_paletteKeyColor 9ca0b0
neutral_variant_paletteKeyColor e6e9ef
background eff1f5
onBackground 4c4f69
surface ccd0da
surfaceDim ccd0da
surfaceBright eff1f5
surfaceContainerLowest ffffff
surfaceContainerLow f5f6f9
surfaceContainer eff1f5
surfaceContainerHigh e6e9ef
surfaceContainerHighest dce0e8
onSurface 4c4f69
surfaceVariant eff1f5
onSurfaceVariant 6c6f85
inverseSurface 4c4f69
inverseOnSurface ccd0da
outline 9ca0b0
outlineVariant acb0be
shadow 000000
scrim 000000
surfaceTint 97a7fb
primary 7287fd
onPrimary eff1f5
primaryContainer 97a7fb
onPrimaryContainer 2a1040
inversePrimary 6c4f94
secondary cdcfdd
onSecondary 4c4f69
secondaryContainer e6d4ff
onSecondaryContainer 544874
tertiary ea76cb
onTertiary eff1f5
tertiaryContainer ea76cb
onTertiaryContainer 4e1e44
error d20f39
onError eff1f5
errorContainer ffdad6
onErrorContainer 93000a
primaryFixed e8d4ff
primaryFixedDim a670f1
onPrimaryFixed ffffff
onPrimaryFixedVariant 544874
secondaryFixed f0e4ff
secondaryFixedDim c2b8d0
onSecondaryFixed 4c4f69
onSecondaryFixedVariant 3a2850
tertiaryFixed ffd7f0
tertiaryFixedDim ea76cb
onTertiaryFixed 4c4f69
onTertiaryFixedVariant 4e1e44
term0 5c5f77
term1 d20f39
term2 40a02b
term3 df8e1d
term4 1e66f5
term5 ea76cb
term6 179299
term7 acb0be
term8 6c6f85
term9 d20f39
term10 40a02b
term11 df8e1d
term12 1e66f5
term13 ea76cb
term14 179299
term15 4c4f69
rosewater dc8a78
flamingo dd7878
pink ea76cb
mauve 8839ef
red d20f39
maroon e64553
peach fe640b
yellow df8e1d
green 40a02b
teal 179299
sky 04a5e5
sapphire 209fb5
blue 1e66f5
lavender 7287fd
klink 2e8fc3
klinkSelection 308fc4
kvisited 2584d6
kvisitedSelection 2984d7
knegative 607eff
knegativeSelection 607eff
kneutral c794ff
kneutralSelection c794ff
kpositive 00b8de
kpositiveSelection 00b8df
text 4c4f69
subtext1 6c6f85
subtext0 9ca0b0
overlay2 acb0be
overlay1 bcc0cc
overlay0 ccd0da
surface2 dce0e8
surface1 e6e9ef
surface0 eff1f5
base eff1f5
mantle e6e9ef
crust dce0e8
success 40a02b
onSuccess eff1f5
successContainer d1e8d5
onSuccessContainer 0c1f13
@@ -1,87 +1,87 @@
primary_paletteKeyColor 417da2 primary_paletteKeyColor 8839ef
secondary_paletteKeyColor 657a8a secondary_paletteKeyColor c2b8d0
tertiary_paletteKeyColor 92689d tertiary_paletteKeyColor ea76cb
neutral_paletteKeyColor 75777a neutral_paletteKeyColor 9ca0b0
neutral_variant_paletteKeyColor 71787f neutral_variant_paletteKeyColor e6e9ef
background f8f9fc background eff1f5
onBackground 191c1e onBackground 4c4f69
surface f8f9fc surface ccd0da
surfaceDim d9dadd surfaceDim ccd0da
surfaceBright f8f9fc surfaceBright eff1f5
surfaceContainerLowest ffffff surfaceContainerLowest ffffff
surfaceContainerLow f2f3f7 surfaceContainerLow f5f6f9
surfaceContainer edeef1 surfaceContainer eff1f5
surfaceContainerHigh e7e8eb surfaceContainerHigh e6e9ef
surfaceContainerHighest e1e2e6 surfaceContainerHighest dce0e8
onSurface 191c1e onSurface 4c4f69
surfaceVariant dce3eb surfaceVariant eff1f5
onSurfaceVariant 41484e onSurfaceVariant 6c6f85
inverseSurface 2e3133 inverseSurface 4c4f69
inverseOnSurface eff1f4 inverseOnSurface ccd0da
outline 6e757c outline 9ca0b0
outlineVariant c0c7ce outlineVariant acb0be
shadow 000000 shadow 000000
scrim 000000 scrim 000000
surfaceTint 236488 surfaceTint a670f1
primary 3e7b9f primary 8839ef
onPrimary ffffff onPrimary eff1f5
primaryContainer 417da2 primaryContainer a670f1
onPrimaryContainer 00060c onPrimaryContainer 2a1040
inversePrimary 93cdf6 inversePrimary 6c4f94
secondary 4c6170 secondary c2b8d0
onSecondary ffffff onSecondary 4c4f69
secondaryContainer cfe5f8 secondaryContainer e6d4ff
onSecondaryContainer 526776 onSecondaryContainer 544874
tertiary 8f659a tertiary ea76cb
onTertiary ffffff onTertiary eff1f5
tertiaryContainer 8f659a tertiaryContainer ea76cb
onTertiaryContainer ffffff onTertiaryContainer 4e1e44
error ba1a1a error d20f39
onError ffffff onError eff1f5
errorContainer ffdad6 errorContainer ffdad6
onErrorContainer 93000a onErrorContainer 93000a
primaryFixed c7e7ff primaryFixed e8d4ff
primaryFixedDim 93cdf6 primaryFixedDim a670f1
onPrimaryFixed 001e2e onPrimaryFixed ffffff
onPrimaryFixedVariant 004c6d onPrimaryFixedVariant 544874
secondaryFixed cfe5f8 secondaryFixed f0e4ff
secondaryFixedDim b4c9db secondaryFixedDim c2b8d0
onSecondaryFixed 071e2b onSecondaryFixed 4c4f69
onSecondaryFixedVariant 354958 onSecondaryFixedVariant 3a2850
tertiaryFixed fad7ff tertiaryFixed ffd7f0
tertiaryFixedDim e6b6f1 tertiaryFixedDim ea76cb
onTertiaryFixed 2e0a3b onTertiaryFixed 4c4f69
onTertiaryFixedVariant 5e3869 onTertiaryFixedVariant 4e1e44
term0 9a9b9b term0 5c5f77
term1 005bcc term1 d20f39
term2 008ca5 term2 40a02b
term3 7e61b0 term3 df8e1d
term4 009993 term4 1e66f5
term5 006ac4 term5 ea76cb
term6 3389ae term6 179299
term7 202225 term7 acb0be
term8 0f0f0f term8 6c6f85
term9 0071fa term9 d20f39
term10 00afce term10 40a02b
term11 9a7cce term11 df8e1d
term12 3fbdb6 term12 1e66f5
term13 1e85ec term13 ea76cb
term14 59a9d1 term14 179299
term15 27282b term15 4c4f69
rosewater 7d76b1 rosewater dc8a78
flamingo 6470bd flamingo dd7878
pink 057ee6 pink ea76cb
mauve 005791 mauve 8839ef
red 003ee0 red d20f39
maroon 2751f9 maroon e64553
peach 8a4dff peach fe640b
yellow 008f68 yellow df8e1d
green 007991 green 40a02b
teal 007195 teal 179299
sky 0082b6 sky 04a5e5
sapphire 037ba6 sapphire 209fb5
blue 005e90 blue 1e66f5
lavender 0077b7 lavender 7287fd
klink 2e8fc3 klink 2e8fc3
klinkSelection 308fc4 klinkSelection 308fc4
kvisited 2584d6 kvisited 2584d6
@@ -92,19 +92,19 @@ kneutral c794ff
kneutralSelection c794ff kneutralSelection c794ff
kpositive 00b8de kpositive 00b8de
kpositiveSelection 00b8df kpositiveSelection 00b8df
text 191c1e text 4c4f69
subtext1 41484e subtext1 6c6f85
subtext0 6e757c subtext0 9ca0b0
overlay2 7f858b overlay2 acb0be
overlay1 91979d overlay1 bcc0cc
overlay0 a4a8ae overlay0 ccd0da
surface2 b7babf surface2 dce0e8
surface1 cbced2 surface1 e6e9ef
surface0 e1e3e7 surface0 eff1f5
base f8f9fc base eff1f5
mantle eff1f4 mantle e6e9ef
crust e9ebef crust dce0e8
success 4F6354 success 40a02b
onSuccess FFFFFF onSuccess eff1f5
successContainer D1E8D5 successContainer d1e8d5
onSuccessContainer 0C1F13 onSuccessContainer 0c1f13
@@ -0,0 +1,110 @@
primary_paletteKeyColor 8839ef
secondary_paletteKeyColor c2b8d0
tertiary_paletteKeyColor ea76cb
neutral_paletteKeyColor 9ca0b0
neutral_variant_paletteKeyColor e6e9ef
background eff1f5
onBackground 4c4f69
surface ccd0da
surfaceDim ccd0da
surfaceBright eff1f5
surfaceContainerLowest ffffff
surfaceContainerLow f5f6f9
surfaceContainer eff1f5
surfaceContainerHigh e6e9ef
surfaceContainerHighest dce0e8
onSurface 4c4f69
surfaceVariant eff1f5
onSurfaceVariant 6c6f85
inverseSurface 4c4f69
inverseOnSurface ccd0da
outline 9ca0b0
outlineVariant acb0be
shadow 000000
scrim 000000
surfaceTint e87883
primary e64553
onPrimary eff1f5
primaryContainer e87883
onPrimaryContainer 2a1040
inversePrimary 6c4f94
secondary cfb7ba
onSecondary 4c4f69
secondaryContainer e6d4ff
onSecondaryContainer 544874
tertiary ea76cb
onTertiary eff1f5
tertiaryContainer ea76cb
onTertiaryContainer 4e1e44
error d20f39
onError eff1f5
errorContainer ffdad6
onErrorContainer 93000a
primaryFixed e8d4ff
primaryFixedDim a670f1
onPrimaryFixed ffffff
onPrimaryFixedVariant 544874
secondaryFixed f0e4ff
secondaryFixedDim c2b8d0
onSecondaryFixed 4c4f69
onSecondaryFixedVariant 3a2850
tertiaryFixed ffd7f0
tertiaryFixedDim ea76cb
onTertiaryFixed 4c4f69
onTertiaryFixedVariant 4e1e44
term0 5c5f77
term1 d20f39
term2 40a02b
term3 df8e1d
term4 1e66f5
term5 ea76cb
term6 179299
term7 acb0be
term8 6c6f85
term9 d20f39
term10 40a02b
term11 df8e1d
term12 1e66f5
term13 ea76cb
term14 179299
term15 4c4f69
rosewater dc8a78
flamingo dd7878
pink ea76cb
mauve 8839ef
red d20f39
maroon e64553
peach fe640b
yellow df8e1d
green 40a02b
teal 179299
sky 04a5e5
sapphire 209fb5
blue 1e66f5
lavender 7287fd
klink 2e8fc3
klinkSelection 308fc4
kvisited 2584d6
kvisitedSelection 2984d7
knegative 607eff
knegativeSelection 607eff
kneutral c794ff
kneutralSelection c794ff
kpositive 00b8de
kpositiveSelection 00b8df
text 4c4f69
subtext1 6c6f85
subtext0 9ca0b0
overlay2 acb0be
overlay1 bcc0cc
overlay0 ccd0da
surface2 dce0e8
surface1 e6e9ef
surface0 eff1f5
base eff1f5
mantle e6e9ef
crust dce0e8
success 40a02b
onSuccess eff1f5
successContainer d1e8d5
onSuccessContainer 0c1f13
@@ -0,0 +1,110 @@
primary_paletteKeyColor 8839ef
secondary_paletteKeyColor c2b8d0
tertiary_paletteKeyColor ea76cb
neutral_paletteKeyColor 9ca0b0
neutral_variant_paletteKeyColor e6e9ef
background eff1f5
onBackground 4c4f69
surface ccd0da
surfaceDim ccd0da
surfaceBright eff1f5
surfaceContainerLowest ffffff
surfaceContainerLow f5f6f9
surfaceContainer eff1f5
surfaceContainerHigh e6e9ef
surfaceContainerHighest dce0e8
onSurface 4c4f69
surfaceVariant eff1f5
onSurfaceVariant 6c6f85
inverseSurface 4c4f69
inverseOnSurface ccd0da
outline 9ca0b0
outlineVariant acb0be
shadow 000000
scrim 000000
surfaceTint a670f1
primary 8839ef
onPrimary eff1f5
primaryContainer a670f1
onPrimaryContainer 2a1040
inversePrimary 6c4f94
secondary c2b8d0
onSecondary 4c4f69
secondaryContainer e6d4ff
onSecondaryContainer 544874
tertiary ea76cb
onTertiary eff1f5
tertiaryContainer ea76cb
onTertiaryContainer 4e1e44
error d20f39
onError eff1f5
errorContainer ffdad6
onErrorContainer 93000a
primaryFixed e8d4ff
primaryFixedDim a670f1
onPrimaryFixed ffffff
onPrimaryFixedVariant 544874
secondaryFixed f0e4ff
secondaryFixedDim c2b8d0
onSecondaryFixed 4c4f69
onSecondaryFixedVariant 3a2850
tertiaryFixed ffd7f0
tertiaryFixedDim ea76cb
onTertiaryFixed 4c4f69
onTertiaryFixedVariant 4e1e44
term0 5c5f77
term1 d20f39
term2 40a02b
term3 df8e1d
term4 1e66f5
term5 ea76cb
term6 179299
term7 acb0be
term8 6c6f85
term9 d20f39
term10 40a02b
term11 df8e1d
term12 1e66f5
term13 ea76cb
term14 179299
term15 4c4f69
rosewater dc8a78
flamingo dd7878
pink ea76cb
mauve 8839ef
red d20f39
maroon e64553
peach fe640b
yellow df8e1d
green 40a02b
teal 179299
sky 04a5e5
sapphire 209fb5
blue 1e66f5
lavender 7287fd
klink 2e8fc3
klinkSelection 308fc4
kvisited 2584d6
kvisitedSelection 2984d7
knegative 607eff
knegativeSelection 607eff
kneutral c794ff
kneutralSelection c794ff
kpositive 00b8de
kpositiveSelection 00b8df
text 4c4f69
subtext1 6c6f85
subtext0 9ca0b0
overlay2 acb0be
overlay1 bcc0cc
overlay0 ccd0da
surface2 dce0e8
surface1 e6e9ef
surface0 eff1f5
base eff1f5
mantle e6e9ef
crust dce0e8
success 40a02b
onSuccess eff1f5
successContainer d1e8d5
onSuccessContainer 0c1f13
@@ -0,0 +1,110 @@
primary_paletteKeyColor 8839ef
secondary_paletteKeyColor c2b8d0
tertiary_paletteKeyColor ea76cb
neutral_paletteKeyColor 9ca0b0
neutral_variant_paletteKeyColor e6e9ef
background eff1f5
onBackground 4c4f69
surface ccd0da
surfaceDim ccd0da
surfaceBright eff1f5
surfaceContainerLowest ffffff
surfaceContainerLow f5f6f9
surfaceContainer eff1f5
surfaceContainerHigh e6e9ef
surfaceContainerHighest dce0e8
onSurface 4c4f69
surfaceVariant eff1f5
onSurfaceVariant 6c6f85
inverseSurface 4c4f69
inverseOnSurface ccd0da
outline 9ca0b0
outlineVariant acb0be
shadow 000000
scrim 000000
surfaceTint f98e51
primary fe640b
onPrimary eff1f5
primaryContainer f98e51
onPrimaryContainer 2a1040
inversePrimary 6c4f94
secondary c9b7ad
onSecondary 4c4f69
secondaryContainer e6d4ff
onSecondaryContainer 544874
tertiary ea76cb
onTertiary eff1f5
tertiaryContainer ea76cb
onTertiaryContainer 4e1e44
error d20f39
onError eff1f5
errorContainer ffdad6
onErrorContainer 93000a
primaryFixed e8d4ff
primaryFixedDim a670f1
onPrimaryFixed ffffff
onPrimaryFixedVariant 544874
secondaryFixed f0e4ff
secondaryFixedDim c2b8d0
onSecondaryFixed 4c4f69
onSecondaryFixedVariant 3a2850
tertiaryFixed ffd7f0
tertiaryFixedDim ea76cb
onTertiaryFixed 4c4f69
onTertiaryFixedVariant 4e1e44
term0 5c5f77
term1 d20f39
term2 40a02b
term3 df8e1d
term4 1e66f5
term5 ea76cb
term6 179299
term7 acb0be
term8 6c6f85
term9 d20f39
term10 40a02b
term11 df8e1d
term12 1e66f5
term13 ea76cb
term14 179299
term15 4c4f69
rosewater dc8a78
flamingo dd7878
pink ea76cb
mauve 8839ef
red d20f39
maroon e64553
peach fe640b
yellow df8e1d
green 40a02b
teal 179299
sky 04a5e5
sapphire 209fb5
blue 1e66f5
lavender 7287fd
klink 2e8fc3
klinkSelection 308fc4
kvisited 2584d6
kvisitedSelection 2984d7
knegative 607eff
knegativeSelection 607eff
kneutral c794ff
kneutralSelection c794ff
kpositive 00b8de
kpositiveSelection 00b8df
text 4c4f69
subtext1 6c6f85
subtext0 9ca0b0
overlay2 acb0be
overlay1 bcc0cc
overlay0 ccd0da
surface2 dce0e8
surface1 e6e9ef
surface0 eff1f5
base eff1f5
mantle e6e9ef
crust dce0e8
success 40a02b
onSuccess eff1f5
successContainer d1e8d5
onSuccessContainer 0c1f13
@@ -0,0 +1,110 @@
primary_paletteKeyColor 8839ef
secondary_paletteKeyColor c2b8d0
tertiary_paletteKeyColor ea76cb
neutral_paletteKeyColor 9ca0b0
neutral_variant_paletteKeyColor e6e9ef
background eff1f5
onBackground 4c4f69
surface ccd0da
surfaceDim ccd0da
surfaceBright eff1f5
surfaceContainerLowest ffffff
surfaceContainerLow f5f6f9
surfaceContainer eff1f5
surfaceContainerHigh e6e9ef
surfaceContainerHighest dce0e8
onSurface 4c4f69
surfaceVariant eff1f5
onSurfaceVariant 6c6f85
inverseSurface 4c4f69
inverseOnSurface ccd0da
outline 9ca0b0
outlineVariant acb0be
shadow 000000
scrim 000000
surfaceTint eb9bd7
primary ea76cb
onPrimary eff1f5
primaryContainer eb9bd7
onPrimaryContainer 2a1040
inversePrimary 6c4f94
secondary d9c7d5
onSecondary 4c4f69
secondaryContainer e6d4ff
onSecondaryContainer 544874
tertiary ea76cb
onTertiary eff1f5
tertiaryContainer ea76cb
onTertiaryContainer 4e1e44
error d20f39
onError eff1f5
errorContainer ffdad6
onErrorContainer 93000a
primaryFixed e8d4ff
primaryFixedDim a670f1
onPrimaryFixed ffffff
onPrimaryFixedVariant 544874
secondaryFixed f0e4ff
secondaryFixedDim c2b8d0
onSecondaryFixed 4c4f69
onSecondaryFixedVariant 3a2850
tertiaryFixed ffd7f0
tertiaryFixedDim ea76cb
onTertiaryFixed 4c4f69
onTertiaryFixedVariant 4e1e44
term0 5c5f77
term1 d20f39
term2 40a02b
term3 df8e1d
term4 1e66f5
term5 ea76cb
term6 179299
term7 acb0be
term8 6c6f85
term9 d20f39
term10 40a02b
term11 df8e1d
term12 1e66f5
term13 ea76cb
term14 179299
term15 4c4f69
rosewater dc8a78
flamingo dd7878
pink ea76cb
mauve 8839ef
red d20f39
maroon e64553
peach fe640b
yellow df8e1d
green 40a02b
teal 179299
sky 04a5e5
sapphire 209fb5
blue 1e66f5
lavender 7287fd
klink 2e8fc3
klinkSelection 308fc4
kvisited 2584d6
kvisitedSelection 2984d7
knegative 607eff
knegativeSelection 607eff
kneutral c794ff
kneutralSelection c794ff
kpositive 00b8de
kpositiveSelection 00b8df
text 4c4f69
subtext1 6c6f85
subtext0 9ca0b0
overlay2 acb0be
overlay1 bcc0cc
overlay0 ccd0da
surface2 dce0e8
surface1 e6e9ef
surface0 eff1f5
base eff1f5
mantle e6e9ef
crust dce0e8
success 40a02b
onSuccess eff1f5
successContainer d1e8d5
onSuccessContainer 0c1f13
@@ -0,0 +1,110 @@
primary_paletteKeyColor 8839ef
secondary_paletteKeyColor c2b8d0
tertiary_paletteKeyColor ea76cb
neutral_paletteKeyColor 9ca0b0
neutral_variant_paletteKeyColor e6e9ef
background eff1f5
onBackground 4c4f69
surface ccd0da
surfaceDim ccd0da
surfaceBright eff1f5
surfaceContainerLowest ffffff
surfaceContainerLow f5f6f9
surfaceContainer eff1f5
surfaceContainerHigh e6e9ef
surfaceContainerHighest dce0e8
onSurface 4c4f69
surfaceVariant eff1f5
onSurfaceVariant 6c6f85
inverseSurface 4c4f69
inverseOnSurface ccd0da
outline 9ca0b0
outlineVariant acb0be
shadow 000000
scrim 000000
surfaceTint da5371
primary d20f39
onPrimary eff1f5
primaryContainer da5371
onPrimaryContainer 2a1040
inversePrimary 6c4f94
secondary c0a0a8
onSecondary 4c4f69
secondaryContainer e6d4ff
onSecondaryContainer 544874
tertiary ea76cb
onTertiary eff1f5
tertiaryContainer ea76cb
onTertiaryContainer 4e1e44
error d20f39
onError eff1f5
errorContainer ffdad6
onErrorContainer 93000a
primaryFixed e8d4ff
primaryFixedDim a670f1
onPrimaryFixed ffffff
onPrimaryFixedVariant 544874
secondaryFixed f0e4ff
secondaryFixedDim c2b8d0
onSecondaryFixed 4c4f69
onSecondaryFixedVariant 3a2850
tertiaryFixed ffd7f0
tertiaryFixedDim ea76cb
onTertiaryFixed 4c4f69
onTertiaryFixedVariant 4e1e44
term0 5c5f77
term1 d20f39
term2 40a02b
term3 df8e1d
term4 1e66f5
term5 ea76cb
term6 179299
term7 acb0be
term8 6c6f85
term9 d20f39
term10 40a02b
term11 df8e1d
term12 1e66f5
term13 ea76cb
term14 179299
term15 4c4f69
rosewater dc8a78
flamingo dd7878
pink ea76cb
mauve 8839ef
red d20f39
maroon e64553
peach fe640b
yellow df8e1d
green 40a02b
teal 179299
sky 04a5e5
sapphire 209fb5
blue 1e66f5
lavender 7287fd
klink 2e8fc3
klinkSelection 308fc4
kvisited 2584d6
kvisitedSelection 2984d7
knegative 607eff
knegativeSelection 607eff
kneutral c794ff
kneutralSelection c794ff
kpositive 00b8de
kpositiveSelection 00b8df
text 4c4f69
subtext1 6c6f85
subtext0 9ca0b0
overlay2 acb0be
overlay1 bcc0cc
overlay0 ccd0da
surface2 dce0e8
surface1 e6e9ef
surface0 eff1f5
base eff1f5
mantle e6e9ef
crust dce0e8
success 40a02b
onSuccess eff1f5
successContainer d1e8d5
onSuccessContainer 0c1f13
@@ -0,0 +1,110 @@
primary_paletteKeyColor 8839ef
secondary_paletteKeyColor c2b8d0
tertiary_paletteKeyColor ea76cb
neutral_paletteKeyColor 9ca0b0
neutral_variant_paletteKeyColor e6e9ef
background eff1f5
onBackground 4c4f69
surface ccd0da
surfaceDim ccd0da
surfaceBright eff1f5
surfaceContainerLowest ffffff
surfaceContainerLow f5f6f9
surfaceContainer eff1f5
surfaceContainerHigh e6e9ef
surfaceContainerHighest dce0e8
onSurface 4c4f69
surfaceVariant eff1f5
onSurfaceVariant 6c6f85
inverseSurface 4c4f69
inverseOnSurface ccd0da
outline 9ca0b0
outlineVariant acb0be
shadow 000000
scrim 000000
surfaceTint e1a99d
primary dc8a78
onPrimary eff1f5
primaryContainer e1a99d
onPrimaryContainer 2a1040
inversePrimary 6c4f94
secondary d8c7c4
onSecondary 4c4f69
secondaryContainer e6d4ff
onSecondaryContainer 544874
tertiary ea76cb
onTertiary eff1f5
tertiaryContainer ea76cb
onTertiaryContainer 4e1e44
error d20f39
onError eff1f5
errorContainer ffdad6
onErrorContainer 93000a
primaryFixed e8d4ff
primaryFixedDim a670f1
onPrimaryFixed ffffff
onPrimaryFixedVariant 544874
secondaryFixed f0e4ff
secondaryFixedDim c2b8d0
onSecondaryFixed 4c4f69
onSecondaryFixedVariant 3a2850
tertiaryFixed ffd7f0
tertiaryFixedDim ea76cb
onTertiaryFixed 4c4f69
onTertiaryFixedVariant 4e1e44
term0 5c5f77
term1 d20f39
term2 40a02b
term3 df8e1d
term4 1e66f5
term5 ea76cb
term6 179299
term7 acb0be
term8 6c6f85
term9 d20f39
term10 40a02b
term11 df8e1d
term12 1e66f5
term13 ea76cb
term14 179299
term15 4c4f69
rosewater dc8a78
flamingo dd7878
pink ea76cb
mauve 8839ef
red d20f39
maroon e64553
peach fe640b
yellow df8e1d
green 40a02b
teal 179299
sky 04a5e5
sapphire 209fb5
blue 1e66f5
lavender 7287fd
klink 2e8fc3
klinkSelection 308fc4
kvisited 2584d6
kvisitedSelection 2984d7
knegative 607eff
knegativeSelection 607eff
kneutral c794ff
kneutralSelection c794ff
kpositive 00b8de
kpositiveSelection 00b8df
text 4c4f69
subtext1 6c6f85
subtext0 9ca0b0
overlay2 acb0be
overlay1 bcc0cc
overlay0 ccd0da
surface2 dce0e8
surface1 e6e9ef
surface0 eff1f5
base eff1f5
mantle e6e9ef
crust dce0e8
success 40a02b
onSuccess eff1f5
successContainer d1e8d5
onSuccessContainer 0c1f13
@@ -0,0 +1,110 @@
primary_paletteKeyColor 8839ef
secondary_paletteKeyColor c2b8d0
tertiary_paletteKeyColor ea76cb
neutral_paletteKeyColor 9ca0b0
neutral_variant_paletteKeyColor e6e9ef
background eff1f5
onBackground 4c4f69
surface ccd0da
surfaceDim ccd0da
surfaceBright eff1f5
surfaceContainerLowest ffffff
surfaceContainerLow f5f6f9
surfaceContainer eff1f5
surfaceContainerHigh e6e9ef
surfaceContainerHighest dce0e8
onSurface 4c4f69
surfaceVariant eff1f5
onSurfaceVariant 6c6f85
inverseSurface 4c4f69
inverseOnSurface ccd0da
outline 9ca0b0
outlineVariant acb0be
shadow 000000
scrim 000000
surfaceTint 5db8c8
primary 209fb5
onPrimary eff1f5
primaryContainer 5db8c8
onPrimaryContainer 2a1040
inversePrimary 6c4f94
secondary 9eb9be
onSecondary 4c4f69
secondaryContainer e6d4ff
onSecondaryContainer 544874
tertiary ea76cb
onTertiary eff1f5
tertiaryContainer ea76cb
onTertiaryContainer 4e1e44
error d20f39
onError eff1f5
errorContainer ffdad6
onErrorContainer 93000a
primaryFixed e8d4ff
primaryFixedDim a670f1
onPrimaryFixed ffffff
onPrimaryFixedVariant 544874
secondaryFixed f0e4ff
secondaryFixedDim c2b8d0
onSecondaryFixed 4c4f69
onSecondaryFixedVariant 3a2850
tertiaryFixed ffd7f0
tertiaryFixedDim ea76cb
onTertiaryFixed 4c4f69
onTertiaryFixedVariant 4e1e44
term0 5c5f77
term1 d20f39
term2 40a02b
term3 df8e1d
term4 1e66f5
term5 ea76cb
term6 179299
term7 acb0be
term8 6c6f85
term9 d20f39
term10 40a02b
term11 df8e1d
term12 1e66f5
term13 ea76cb
term14 179299
term15 4c4f69
rosewater dc8a78
flamingo dd7878
pink ea76cb
mauve 8839ef
red d20f39
maroon e64553
peach fe640b
yellow df8e1d
green 40a02b
teal 179299
sky 04a5e5
sapphire 209fb5
blue 1e66f5
lavender 7287fd
klink 2e8fc3
klinkSelection 308fc4
kvisited 2584d6
kvisitedSelection 2984d7
knegative 607eff
knegativeSelection 607eff
kneutral c794ff
kneutralSelection c794ff
kpositive 00b8de
kpositiveSelection 00b8df
text 4c4f69
subtext1 6c6f85
subtext0 9ca0b0
overlay2 acb0be
overlay1 bcc0cc
overlay0 ccd0da
surface2 dce0e8
surface1 e6e9ef
surface0 eff1f5
base eff1f5
mantle e6e9ef
crust dce0e8
success 40a02b
onSuccess eff1f5
successContainer d1e8d5
onSuccessContainer 0c1f13
@@ -0,0 +1,110 @@
primary_paletteKeyColor 8839ef
secondary_paletteKeyColor c2b8d0
tertiary_paletteKeyColor ea76cb
neutral_paletteKeyColor 9ca0b0
neutral_variant_paletteKeyColor e6e9ef
background eff1f5
onBackground 4c4f69
surface ccd0da
surfaceDim ccd0da
surfaceBright eff1f5
surfaceContainerLowest ffffff
surfaceContainerLow f5f6f9
surfaceContainer eff1f5
surfaceContainerHigh e6e9ef
surfaceContainerHighest dce0e8
onSurface 4c4f69
surfaceVariant eff1f5
onSurfaceVariant 6c6f85
inverseSurface 4c4f69
inverseOnSurface ccd0da
outline 9ca0b0
outlineVariant acb0be
shadow 000000
scrim 000000
surfaceTint 4abcea
primary 04a5e5
onPrimary eff1f5
primaryContainer 4abcea
onPrimaryContainer 2a1040
inversePrimary 6c4f94
secondary a4b9c2
onSecondary 4c4f69
secondaryContainer e6d4ff
onSecondaryContainer 544874
tertiary ea76cb
onTertiary eff1f5
tertiaryContainer ea76cb
onTertiaryContainer 4e1e44
error d20f39
onError eff1f5
errorContainer ffdad6
onErrorContainer 93000a
primaryFixed e8d4ff
primaryFixedDim a670f1
onPrimaryFixed ffffff
onPrimaryFixedVariant 544874
secondaryFixed f0e4ff
secondaryFixedDim c2b8d0
onSecondaryFixed 4c4f69
onSecondaryFixedVariant 3a2850
tertiaryFixed ffd7f0
tertiaryFixedDim ea76cb
onTertiaryFixed 4c4f69
onTertiaryFixedVariant 4e1e44
term0 5c5f77
term1 d20f39
term2 40a02b
term3 df8e1d
term4 1e66f5
term5 ea76cb
term6 179299
term7 acb0be
term8 6c6f85
term9 d20f39
term10 40a02b
term11 df8e1d
term12 1e66f5
term13 ea76cb
term14 179299
term15 4c4f69
rosewater dc8a78
flamingo dd7878
pink ea76cb
mauve 8839ef
red d20f39
maroon e64553
peach fe640b
yellow df8e1d
green 40a02b
teal 179299
sky 04a5e5
sapphire 209fb5
blue 1e66f5
lavender 7287fd
klink 2e8fc3
klinkSelection 308fc4
kvisited 2584d6
kvisitedSelection 2984d7
knegative 607eff
knegativeSelection 607eff
kneutral c794ff
kneutralSelection c794ff
kpositive 00b8de
kpositiveSelection 00b8df
text 4c4f69
subtext1 6c6f85
subtext0 9ca0b0
overlay2 acb0be
overlay1 bcc0cc
overlay0 ccd0da
surface2 dce0e8
surface1 e6e9ef
surface0 eff1f5
base eff1f5
mantle e6e9ef
crust dce0e8
success 40a02b
onSuccess eff1f5
successContainer d1e8d5
onSuccessContainer 0c1f13
@@ -0,0 +1,110 @@
primary_paletteKeyColor 8839ef
secondary_paletteKeyColor c2b8d0
tertiary_paletteKeyColor ea76cb
neutral_paletteKeyColor 9ca0b0
neutral_variant_paletteKeyColor e6e9ef
background eff1f5
onBackground 4c4f69
surface ccd0da
surfaceDim ccd0da
surfaceBright eff1f5
surfaceContainerLowest ffffff
surfaceContainerLow f5f6f9
surfaceContainer eff1f5
surfaceContainerHigh e6e9ef
surfaceContainerHighest dce0e8
onSurface 4c4f69
surfaceVariant eff1f5
onSurfaceVariant 6c6f85
inverseSurface 4c4f69
inverseOnSurface ccd0da
outline 9ca0b0
outlineVariant acb0be
shadow 000000
scrim 000000
surfaceTint 57aeb4
primary 179299
onPrimary eff1f5
primaryContainer 57aeb4
onPrimaryContainer 2a1040
inversePrimary 6c4f94
secondary 93b4b7
onSecondary 4c4f69
secondaryContainer e6d4ff
onSecondaryContainer 544874
tertiary ea76cb
onTertiary eff1f5
tertiaryContainer ea76cb
onTertiaryContainer 4e1e44
error d20f39
onError eff1f5
errorContainer ffdad6
onErrorContainer 93000a
primaryFixed e8d4ff
primaryFixedDim a670f1
onPrimaryFixed ffffff
onPrimaryFixedVariant 544874
secondaryFixed f0e4ff
secondaryFixedDim c2b8d0
onSecondaryFixed 4c4f69
onSecondaryFixedVariant 3a2850
tertiaryFixed ffd7f0
tertiaryFixedDim ea76cb
onTertiaryFixed 4c4f69
onTertiaryFixedVariant 4e1e44
term0 5c5f77
term1 d20f39
term2 40a02b
term3 df8e1d
term4 1e66f5
term5 ea76cb
term6 179299
term7 acb0be
term8 6c6f85
term9 d20f39
term10 40a02b
term11 df8e1d
term12 1e66f5
term13 ea76cb
term14 179299
term15 4c4f69
rosewater dc8a78
flamingo dd7878
pink ea76cb
mauve 8839ef
red d20f39
maroon e64553
peach fe640b
yellow df8e1d
green 40a02b
teal 179299
sky 04a5e5
sapphire 209fb5
blue 1e66f5
lavender 7287fd
klink 2e8fc3
klinkSelection 308fc4
kvisited 2584d6
kvisitedSelection 2984d7
knegative 607eff
knegativeSelection 607eff
kneutral c794ff
kneutralSelection c794ff
kpositive 00b8de
kpositiveSelection 00b8df
text 4c4f69
subtext1 6c6f85
subtext0 9ca0b0
overlay2 acb0be
overlay1 bcc0cc
overlay0 ccd0da
surface2 dce0e8
surface1 e6e9ef
surface0 eff1f5
base eff1f5
mantle e6e9ef
crust dce0e8
success 40a02b
onSuccess eff1f5
successContainer d1e8d5
onSuccessContainer 0c1f13
@@ -0,0 +1,110 @@
primary_paletteKeyColor 8839ef
secondary_paletteKeyColor c2b8d0
tertiary_paletteKeyColor ea76cb
neutral_paletteKeyColor 9ca0b0
neutral_variant_paletteKeyColor e6e9ef
background eff1f5
onBackground 4c4f69
surface ccd0da
surfaceDim ccd0da
surfaceBright eff1f5
surfaceContainerLowest ffffff
surfaceContainerLow f5f6f9
surfaceContainer eff1f5
surfaceContainerHigh e6e9ef
surfaceContainerHighest dce0e8
onSurface 4c4f69
surfaceVariant eff1f5
onSurfaceVariant 6c6f85
inverseSurface 4c4f69
inverseOnSurface ccd0da
outline 9ca0b0
outlineVariant acb0be
shadow 000000
scrim 000000
surfaceTint e4ac5d
primary df8e1d
onPrimary eff1f5
primaryContainer e4ac5d
onPrimaryContainer 2a1040
inversePrimary 6c4f94
secondary c6baaa
onSecondary 4c4f69
secondaryContainer e6d4ff
onSecondaryContainer 544874
tertiary ea76cb
onTertiary eff1f5
tertiaryContainer ea76cb
onTertiaryContainer 4e1e44
error d20f39
onError eff1f5
errorContainer ffdad6
onErrorContainer 93000a
primaryFixed e8d4ff
primaryFixedDim a670f1
onPrimaryFixed ffffff
onPrimaryFixedVariant 544874
secondaryFixed f0e4ff
secondaryFixedDim c2b8d0
onSecondaryFixed 4c4f69
onSecondaryFixedVariant 3a2850
tertiaryFixed ffd7f0
tertiaryFixedDim ea76cb
onTertiaryFixed 4c4f69
onTertiaryFixedVariant 4e1e44
term0 5c5f77
term1 d20f39
term2 40a02b
term3 df8e1d
term4 1e66f5
term5 ea76cb
term6 179299
term7 acb0be
term8 6c6f85
term9 d20f39
term10 40a02b
term11 df8e1d
term12 1e66f5
term13 ea76cb
term14 179299
term15 4c4f69
rosewater dc8a78
flamingo dd7878
pink ea76cb
mauve 8839ef
red d20f39
maroon e64553
peach fe640b
yellow df8e1d
green 40a02b
teal 179299
sky 04a5e5
sapphire 209fb5
blue 1e66f5
lavender 7287fd
klink 2e8fc3
klinkSelection 308fc4
kvisited 2584d6
kvisitedSelection 2984d7
knegative 607eff
knegativeSelection 607eff
kneutral c794ff
kneutralSelection c794ff
kpositive 00b8de
kpositiveSelection 00b8df
text 4c4f69
subtext1 6c6f85
subtext0 9ca0b0
overlay2 acb0be
overlay1 bcc0cc
overlay0 ccd0da
surface2 dce0e8
surface1 e6e9ef
surface0 eff1f5
base eff1f5
mantle e6e9ef
crust dce0e8
success 40a02b
onSuccess eff1f5
successContainer d1e8d5
onSuccessContainer 0c1f13
@@ -0,0 +1,110 @@
primary_paletteKeyColor c6a0f6
secondary_paletteKeyColor 766597
tertiary_paletteKeyColor f5bde6
neutral_paletteKeyColor 363a4f
neutral_variant_paletteKeyColor 24273a
background 24273a
onBackground cad3f5
surface 363a4f
surfaceDim 363a4f
surfaceBright 4a4e63
surfaceContainerLowest 1e2030
surfaceContainerLow 2a2e43
surfaceContainer 24273a
surfaceContainerHigh 1e2030
surfaceContainerHighest 181926
onSurface cad3f5
surfaceVariant 24273a
onSurfaceVariant a5adcb
inverseSurface cad3f5
inverseOnSurface 363a4f
outline 6e738d
outlineVariant 494d64
shadow 000000
scrim 000000
surfaceTint 6c85bc
primary 8aadf4
onPrimary 24273a
primaryContainer 6c85bc
onPrimaryContainer ffffff
inversePrimary 6c4f94
secondary 5f6d8f
onSecondary ffffff
secondaryContainer 544874
onSecondaryContainer cbbae8
tertiary f5bde6
onTertiary 4e1e44
tertiaryContainer bb7da9
onTertiaryContainer 000000
error ed8796
onError 4a0019
errorContainer 8c2643
onErrorContainer ffb3c6
primaryFixed e8d4ff
primaryFixedDim c6a0f6
onPrimaryFixed 2a1040
onPrimaryFixedVariant 544874
secondaryFixed e2d4ff
secondaryFixedDim 766597
onSecondaryFixed 1a0a28
onSecondaryFixedVariant 3a2850
tertiaryFixed ffd7f4
tertiaryFixedDim f5bde6
onTertiaryFixed 340831
onTertiaryFixedVariant 66365f
term0 363a4f
term1 ed8796
term2 a6da95
term3 eed49f
term4 8aadf4
term5 f5bde6
term6 8bd5ca
term7 cad3f5
term8 494d64
term9 ed8796
term10 a6da95
term11 eed49f
term12 8aadf4
term13 f5bde6
term14 8bd5ca
term15 a5adcb
rosewater f4dbd6
flamingo f0c6c6
pink f5bde6
mauve c6a0f6
red ed8796
maroon ee99a0
peach f5a97f
yellow eed49f
green a6da95
teal 8bd5ca
sky 91d7e3
sapphire 7dc4e4
blue 8aadf4
lavender b7bdf8
klink 7382d2
klinkSelection 7382d2
kvisited 8172da
kvisitedSelection 8172da
knegative a167ff
knegativeSelection a167ff
kneutral ca92ff
kneutralSelection c992ff
kpositive 60adff
kpositiveSelection 60adff
text cad3f5
subtext1 a5adcb
subtext0 7a7f9e
overlay2 6e738d
overlay1 585b70
overlay0 45475a
surface2 363a4f
surface1 2a2e43
surface0 24273a
base 24273a
mantle 1e2030
crust 181926
success a6da95
onSuccess 24273a
successContainer 3b5e3b
onSuccessContainer b6f0b1
@@ -1,110 +1,110 @@
primary_paletteKeyColor 6a73ac primary_paletteKeyColor c6a0f6
secondary_paletteKeyColor 72758e secondary_paletteKeyColor 766597
tertiary_paletteKeyColor 9b6592 tertiary_paletteKeyColor f5bde6
neutral_paletteKeyColor 77767b neutral_paletteKeyColor 363a4f
neutral_variant_paletteKeyColor 767680 neutral_variant_paletteKeyColor 24273a
background 131317 background 24273a
onBackground e4e1e7 onBackground cad3f5
surface 131317 surface 363a4f
surfaceDim 131317 surfaceDim 363a4f
surfaceBright 39393d surfaceBright 4a4e63
surfaceContainerLowest 0e0e12 surfaceContainerLowest 1e2030
surfaceContainerLow 1b1b1f surfaceContainerLow 2a2e43
surfaceContainer 1f1f23 surfaceContainer 24273a
surfaceContainerHigh 2a2a2e surfaceContainerHigh 1e2030
surfaceContainerHighest 353438 surfaceContainerHighest 181926
onSurface e4e1e7 onSurface cad3f5
surfaceVariant 46464f surfaceVariant 24273a
onSurfaceVariant c6c5d1 onSurfaceVariant a5adcb
inverseSurface e4e1e7 inverseSurface cad3f5
inverseOnSurface 303034 inverseOnSurface 363a4f
outline 90909a outline 6e738d
outlineVariant 46464f outlineVariant 494d64
shadow 000000 shadow 000000
scrim 000000 scrim 000000
surfaceTint bac3ff surfaceTint 967cbe
primary bac3ff primary c6a0f6
onPrimary 232c60 onPrimary 24273a
primaryContainer 6a73ac primaryContainer 967cbe
onPrimaryContainer ffffff onPrimaryContainer ffffff
inversePrimary 525b92 inversePrimary 6c4f94
secondary c3c5e0 secondary 766597
onSecondary 2c2f44 onSecondary ffffff
secondaryContainer 42455c secondaryContainer 544874
onSecondaryContainer b1b3ce onSecondaryContainer cbbae8
tertiary f1b3e5 tertiary f5bde6
onTertiary 4c1f48 onTertiary 4e1e44
tertiaryContainer b77ead tertiaryContainer bb7da9
onTertiaryContainer 000000 onTertiaryContainer 000000
error ffb4ab error ed8796
onError 690005 onError 4a0019
errorContainer 93000a errorContainer 8c2643
onErrorContainer ffdad6 onErrorContainer ffb3c6
primaryFixed dee0ff primaryFixed e8d4ff
primaryFixedDim bac3ff primaryFixedDim c6a0f6
onPrimaryFixed 0b154b onPrimaryFixed 2a1040
onPrimaryFixedVariant 3a4378 onPrimaryFixedVariant 544874
secondaryFixed dfe1fd secondaryFixed e2d4ff
secondaryFixedDim c3c5e0 secondaryFixedDim 766597
onSecondaryFixed 171a2e onSecondaryFixed 1a0a28
onSecondaryFixedVariant 42455c onSecondaryFixedVariant 3a2850
tertiaryFixed ffd7f4 tertiaryFixed ffd7f4
tertiaryFixedDim f1b3e5 tertiaryFixedDim f5bde6
onTertiaryFixed 340831 onTertiaryFixed 340831
onTertiaryFixedVariant 66365f onTertiaryFixedVariant 66365f
term0 353434 term0 363a4f
term1 a178ff term1 ed8796
term2 44def5 term2 a6da95
term3 ffdcf2 term3 eed49f
term4 94abd7 term4 8aadf4
term5 ada0ed term5 f5bde6
term6 9dceff term6 8bd5ca
term7 e8d3de term7 cad3f5
term8 ac9fa9 term8 494d64
term9 b797ff term9 ed8796
term10 89ecff term10 a6da95
term11 fff0f6 term11 eed49f
term12 b2c2dc term12 8aadf4
term13 c4b6f6 term13 f5bde6
term14 bae0ff term14 8bd5ca
term15 ffffff term15 a5adcb
rosewater f6eff9 rosewater f4dbd6
flamingo e7def4 flamingo f0c6c6
pink ded8ff pink f5bde6
mauve b9baff mauve c6a0f6
red b9a8ff red ed8796
maroon c4b7ee maroon ee99a0
peach e0c2f9 peach f5a97f
yellow ffecf3 yellow eed49f
green c8e3ff green a6da95
teal d0e0ff teal 8bd5ca
sky ccdbff sky 91d7e3
sapphire b1c6ff sapphire 7dc4e4
blue aab9ff blue 8aadf4
lavender c2c9ff lavender b7bdf8
klink 6a84d1 klink 7382d2
klinkSelection 6a84d1 klinkSelection 7382d2
kvisited 7775dc kvisited 8172da
kvisitedSelection 7775dc kvisitedSelection 8172da
knegative 946dff knegative a167ff
knegativeSelection 946dff knegativeSelection a167ff
kneutral c794ff kneutral ca92ff
kneutralSelection c794ff kneutralSelection c992ff
kpositive 5daeff kpositive 60adff
kpositiveSelection 5eaeff kpositiveSelection 60adff
text e4e1e7 text cad3f5
subtext1 c6c5d1 subtext1 a5adcb
subtext0 90909a subtext0 7a7f9e
overlay2 7d7d86 overlay2 6e738d
overlay1 6a6a72 overlay1 585b70
overlay0 595960 overlay0 45475a
surface2 48484e surface2 363a4f
surface1 37373d surface1 2a2e43
surface0 25252a surface0 24273a
base 131317 base 24273a
mantle 131317 mantle 1e2030
crust 121216 crust 181926
success B5CCBA success a6da95
onSuccess 213528 onSuccess 24273a
successContainer 374B3E successContainer 3b5e3b
onSuccessContainer D1E9D6 onSuccessContainer b6f0b1
@@ -0,0 +1,110 @@
primary_paletteKeyColor c6a0f6
secondary_paletteKeyColor 766597
tertiary_paletteKeyColor f5bde6
neutral_paletteKeyColor 363a4f
neutral_variant_paletteKeyColor 24273a
background 24273a
onBackground cad3f5
surface 363a4f
surfaceDim 363a4f
surfaceBright 4a4e63
surfaceContainerLowest 1e2030
surfaceContainerLow 2a2e43
surfaceContainer 24273a
surfaceContainerHigh 1e2030
surfaceContainerHighest 181926
onSurface cad3f5
surfaceVariant 24273a
onSurfaceVariant a5adcb
inverseSurface cad3f5
inverseOnSurface 363a4f
outline 6e738d
outlineVariant 494d64
shadow 000000
scrim 000000
surfaceTint b3979c
primary f0c6c6
onPrimary 24273a
primaryContainer b3979c
onPrimaryContainer ffffff
inversePrimary 6c4f94
secondary 996780
onSecondary ffffff
secondaryContainer 544874
onSecondaryContainer cbbae8
tertiary f5bde6
onTertiary 4e1e44
tertiaryContainer bb7da9
onTertiaryContainer 000000
error ed8796
onError 4a0019
errorContainer 8c2643
onErrorContainer ffb3c6
primaryFixed e8d4ff
primaryFixedDim c6a0f6
onPrimaryFixed 2a1040
onPrimaryFixedVariant 544874
secondaryFixed e2d4ff
secondaryFixedDim 766597
onSecondaryFixed 1a0a28
onSecondaryFixedVariant 3a2850
tertiaryFixed ffd7f4
tertiaryFixedDim f5bde6
onTertiaryFixed 340831
onTertiaryFixedVariant 66365f
term0 363a4f
term1 ed8796
term2 a6da95
term3 eed49f
term4 8aadf4
term5 f5bde6
term6 8bd5ca
term7 cad3f5
term8 494d64
term9 ed8796
term10 a6da95
term11 eed49f
term12 8aadf4
term13 f5bde6
term14 8bd5ca
term15 a5adcb
rosewater f4dbd6
flamingo f0c6c6
pink f5bde6
mauve c6a0f6
red ed8796
maroon ee99a0
peach f5a97f
yellow eed49f
green a6da95
teal 8bd5ca
sky 91d7e3
sapphire 7dc4e4
blue 8aadf4
lavender b7bdf8
klink 7382d2
klinkSelection 7382d2
kvisited 8172da
kvisitedSelection 8172da
knegative a167ff
knegativeSelection a167ff
kneutral ca92ff
kneutralSelection c992ff
kpositive 60adff
kpositiveSelection 60adff
text cad3f5
subtext1 a5adcb
subtext0 7a7f9e
overlay2 6e738d
overlay1 585b70
overlay0 45475a
surface2 363a4f
surface1 2a2e43
surface0 24273a
base 24273a
mantle 1e2030
crust 181926
success a6da95
onSuccess 24273a
successContainer 3b5e3b
onSuccessContainer b6f0b1
@@ -0,0 +1,110 @@
primary_paletteKeyColor c6a0f6
secondary_paletteKeyColor 766597
tertiary_paletteKeyColor f5bde6
neutral_paletteKeyColor 363a4f
neutral_variant_paletteKeyColor 24273a
background 24273a
onBackground cad3f5
surface 363a4f
surfaceDim 363a4f
surfaceBright 4a4e63
surfaceContainerLowest 1e2030
surfaceContainerLow 2a2e43
surfaceContainer 24273a
surfaceContainerHigh 1e2030
surfaceContainerHighest 181926
onSurface cad3f5
surfaceVariant 24273a
onSurfaceVariant a5adcb
inverseSurface cad3f5
inverseOnSurface 363a4f
outline 6e738d
outlineVariant 494d64
shadow 000000
scrim 000000
surfaceTint 80a57a
primary a6da95
onPrimary 24273a
primaryContainer 80a57a
onPrimaryContainer ffffff
inversePrimary 6c4f94
secondary 5c8a61
onSecondary ffffff
secondaryContainer 544874
onSecondaryContainer cbbae8
tertiary f5bde6
onTertiary 4e1e44
tertiaryContainer bb7da9
onTertiaryContainer 000000
error ed8796
onError 4a0019
errorContainer 8c2643
onErrorContainer ffb3c6
primaryFixed e8d4ff
primaryFixedDim c6a0f6
onPrimaryFixed 2a1040
onPrimaryFixedVariant 544874
secondaryFixed e2d4ff
secondaryFixedDim 766597
onSecondaryFixed 1a0a28
onSecondaryFixedVariant 3a2850
tertiaryFixed ffd7f4
tertiaryFixedDim f5bde6
onTertiaryFixed 340831
onTertiaryFixedVariant 66365f
term0 363a4f
term1 ed8796
term2 a6da95
term3 eed49f
term4 8aadf4
term5 f5bde6
term6 8bd5ca
term7 cad3f5
term8 494d64
term9 ed8796
term10 a6da95
term11 eed49f
term12 8aadf4
term13 f5bde6
term14 8bd5ca
term15 a5adcb
rosewater f4dbd6
flamingo f0c6c6
pink f5bde6
mauve c6a0f6
red ed8796
maroon ee99a0
peach f5a97f
yellow eed49f
green a6da95
teal 8bd5ca
sky 91d7e3
sapphire 7dc4e4
blue 8aadf4
lavender b7bdf8
klink 7382d2
klinkSelection 7382d2
kvisited 8172da
kvisitedSelection 8172da
knegative a167ff
knegativeSelection a167ff
kneutral ca92ff
kneutralSelection c992ff
kpositive 60adff
kpositiveSelection 60adff
text cad3f5
subtext1 a5adcb
subtext0 7a7f9e
overlay2 6e738d
overlay1 585b70
overlay0 45475a
surface2 363a4f
surface1 2a2e43
surface0 24273a
base 24273a
mantle 1e2030
crust 181926
success a6da95
onSuccess 24273a
successContainer 3b5e3b
onSuccessContainer b6f0b1
@@ -0,0 +1,110 @@
primary_paletteKeyColor c6a0f6
secondary_paletteKeyColor 766597
tertiary_paletteKeyColor f5bde6
neutral_paletteKeyColor 363a4f
neutral_variant_paletteKeyColor 24273a
background 24273a
onBackground cad3f5
surface 363a4f
surfaceDim 363a4f
surfaceBright 4a4e63
surfaceContainerLowest 1e2030
surfaceContainerLow 2a2e43
surfaceContainer 24273a
surfaceContainerHigh 1e2030
surfaceContainerHighest 181926
onSurface cad3f5
surfaceVariant 24273a
onSurfaceVariant a5adcb
inverseSurface cad3f5
inverseOnSurface 363a4f
outline 6e738d
outlineVariant 494d64
shadow 000000
scrim 000000
surfaceTint 8b91bf
primary b7bdf8
onPrimary 24273a
primaryContainer 8b91bf
onPrimaryContainer ffffff
inversePrimary 6c4f94
secondary 6b709d
onSecondary ffffff
secondaryContainer 544874
onSecondaryContainer cbbae8
tertiary f5bde6
onTertiary 4e1e44
tertiaryContainer bb7da9
onTertiaryContainer 000000
error ed8796
onError 4a0019
errorContainer 8c2643
onErrorContainer ffb3c6
primaryFixed e8d4ff
primaryFixedDim c6a0f6
onPrimaryFixed 2a1040
onPrimaryFixedVariant 544874
secondaryFixed e2d4ff
secondaryFixedDim 766597
onSecondaryFixed 1a0a28
onSecondaryFixedVariant 3a2850
tertiaryFixed ffd7f4
tertiaryFixedDim f5bde6
onTertiaryFixed 340831
onTertiaryFixedVariant 66365f
term0 363a4f
term1 ed8796
term2 a6da95
term3 eed49f
term4 8aadf4
term5 f5bde6
term6 8bd5ca
term7 cad3f5
term8 494d64
term9 ed8796
term10 a6da95
term11 eed49f
term12 8aadf4
term13 f5bde6
term14 8bd5ca
term15 a5adcb
rosewater f4dbd6
flamingo f0c6c6
pink f5bde6
mauve c6a0f6
red ed8796
maroon ee99a0
peach f5a97f
yellow eed49f
green a6da95
teal 8bd5ca
sky 91d7e3
sapphire 7dc4e4
blue 8aadf4
lavender b7bdf8
klink 7382d2
klinkSelection 7382d2
kvisited 8172da
kvisitedSelection 8172da
knegative a167ff
knegativeSelection a167ff
kneutral ca92ff
kneutralSelection c992ff
kpositive 60adff
kpositiveSelection 60adff
text cad3f5
subtext1 a5adcb
subtext0 7a7f9e
overlay2 6e738d
overlay1 585b70
overlay0 45475a
surface2 363a4f
surface1 2a2e43
surface0 24273a
base 24273a
mantle 1e2030
crust 181926
success a6da95
onSuccess 24273a
successContainer 3b5e3b
onSuccessContainer b6f0b1

Some files were not shown because too many files have changed in this diff Show More