From 067a7c466205a179bff358499aad6cf3a302f695 Mon Sep 17 00:00:00 2001 From: CodeDoctorDE Date: Sat, 2 Nov 2024 16:34:50 +0100 Subject: [PATCH] Update app colors and logo --- README.md | 12 ++--- .../res/drawable/ic_launcher_foreground.xml | 2 +- app/lib/theme.dart | 2 +- app/lib/widgets/navigation.dart | 4 +- app/pubspec.lock | 4 +- docs/package.json | 2 +- docs/pnpm-lock.yaml | 54 ++++++++++--------- metadata/en-US/changelogs/8.txt | 2 + 8 files changed, 45 insertions(+), 37 deletions(-) diff --git a/README.md b/README.md index 4dcec9f6906..d2e466e60c1 100644 --- a/README.md +++ b/README.md @@ -8,12 +8,12 @@ > Free, opensource time and event management software -[![Latest release)](https://img.shields.io/github/v/release/LinwoodDev/Flow?color=7C4DFF&style=for-the-badge&logo=github&logoColor=7C4DFF)](https://github.com/LinwoodDev/Flow/releases) -[![GitHub License badge](https://img.shields.io/github/license/LinwoodDev/Flow?color=7C4DFF&style=for-the-badge&logo=data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxOTIiIGhlaWdodD0iMTkyIiBmaWxsPSIjN2M0ZGZmIiB2aWV3Qm94PSIwIDAgMjU2IDI1NiI%2BPHJlY3Qgd2lkdGg9IjI1NiIgaGVpZ2h0PSIyNTYiIGZpbGw9Im5vbmUiPjwvcmVjdD48cmVjdCB4PSIzMiIgeT0iNDgiIHdpZHRoPSIxOTIiIGhlaWdodD0iMTYwIiByeD0iOCIgc3Ryb2tlLXdpZHRoPSIxNiIgc3Ryb2tlPSIjN2M0ZGZmIiBzdHJva2UtbGluZWNhcD0icm91bmQiIHN0cm9rZS1saW5lam9pbj0icm91bmQiIGZpbGw9Im5vbmUiPjwvcmVjdD48bGluZSB4MT0iNzYiIHkxPSI5NiIgeDI9IjE4MCIgeTI9Ijk2IiBmaWxsPSJub25lIiBzdHJva2U9IiM3YzRkZmYiIHN0cm9rZS1saW5lY2FwPSJyb3VuZCIgc3Ryb2tlLWxpbmVqb2luPSJyb3VuZCIgc3Ryb2tlLXdpZHRoPSIxNiI%2BPC9saW5lPjxsaW5lIHgxPSI3NiIgeTE9IjEyOCIgeDI9IjE4MCIgeTI9IjEyOCIgZmlsbD0ibm9uZSIgc3Ryb2tlPSIjN2M0ZGZmIiBzdHJva2UtbGluZWNhcD0icm91bmQiIHN0cm9rZS1saW5lam9pbj0icm91bmQiIHN0cm9rZS13aWR0aD0iMTYiPjwvbGluZT48bGluZSB4MT0iNzYiIHkxPSIxNjAiIHgyPSIxODAiIHkyPSIxNjAiIGZpbGw9Im5vbmUiIHN0cm9rZT0iIzdjNGRmZiIgc3Ryb2tlLWxpbmVjYXA9InJvdW5kIiBzdHJva2UtbGluZWpvaW49InJvdW5kIiBzdHJva2Utd2lkdGg9IjE2Ij48L2xpbmU%2BPC9zdmc%2B)](https://github.com/LinwoodDev/Flow/blob/main/LICENSE) -[![GitHub Repo stars](https://img.shields.io/github/stars/LinwoodDev/Flow?color=7C4DFF&logo=github&logoColor=7C4DFF&style=for-the-badge)](https://github.com/LinwoodDev/Flow) -[![Matrix badge](https://img.shields.io/matrix/linwood:matrix.org?style=for-the-badge&color=7C4DFF&logo=matrix&logoColor=7C4DFF&label=Matrix)](https://linwood.dev/matrix) -[![Discord badge](https://img.shields.io/discord/735424757142519848?style=for-the-badge&color=7C4DFF&logo=discord&logoColor=7C4DFF&label=Discord)](https://discord.linwood.dev) -[![Download](https://img.shields.io/github/downloads/LinwoodDev/Flow/total?color=7C4DFF&style=for-the-badge&logo=data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxOTIiIGhlaWdodD0iMTkyIiBmaWxsPSIjN2M0ZGZmIiB2aWV3Qm94PSIwIDAgMjU2IDI1NiI%2BPHJlY3Qgd2lkdGg9IjI1NiIgaGVpZ2h0PSIyNTYiIGZpbGw9Im5vbmUiPjwvcmVjdD48cG9seWxpbmUgcG9pbnRzPSI4NiAxMTAuMDExIDEyOCAxNTIgMTcwIDExMC4wMTEiIGZpbGw9Im5vbmUiIHN0cm9rZT0iIzdjNGRmZiIgc3Ryb2tlLWxpbmVjYXA9InJvdW5kIiBzdHJva2UtbGluZWpvaW49InJvdW5kIiBzdHJva2Utd2lkdGg9IjE2Ij48L3BvbHlsaW5lPjxsaW5lIHgxPSIxMjgiIHkxPSI0MCIgeDI9IjEyOCIgeTI9IjE1MS45NzA1NyIgZmlsbD0ibm9uZSIgc3Ryb2tlPSIjN2M0ZGZmIiBzdHJva2UtbGluZWNhcD0icm91bmQiIHN0cm9rZS1saW5lam9pbj0icm91bmQiIHN0cm9rZS13aWR0aD0iMTYiPjwvbGluZT48cGF0aCBkPSJNMjE2LDE1MnY1NmE4LDgsMCwwLDEtOCw4SDQ4YTgsOCwwLDAsMS04LThWMTUyIiBmaWxsPSJub25lIiBzdHJva2U9IiM3YzRkZmYiIHN0cm9rZS1saW5lY2FwPSJyb3VuZCIgc3Ryb2tlLWxpbmVqb2luPSJyb3VuZCIgc3Ryb2tlLXdpZHRoPSIxNiI%2BPC9wYXRoPjwvc3ZnPg%3D%3D)](https://docs.flow.linwood.dev/downloads) +[![Latest release)](https://img.shields.io/github/v/release/LinwoodDev/Flow?color=35CDEF&style=for-the-badge&logo=github&logoColor=35CDEF)](https://github.com/LinwoodDev/Flow/releases) +[![GitHub License badge](https://img.shields.io/github/license/LinwoodDev/Flow?color=35CDEF&style=for-the-badge&logo=data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIzMiIgaGVpZ2h0PSIzMiIgZmlsbD0iIzM1Y2RlZiIgdmlld0JveD0iMCAwIDI1NiAyNTYiPjxwYXRoIGQ9Ik0yMTYsNDBINDBBMTYsMTYsMCwwLDAsMjQsNTZWMjAwYTE2LDE2LDAsMCwwLDE2LDE2SDIxNmExNiwxNiwwLDAsMCwxNi0xNlY1NkExNiwxNiwwLDAsMCwyMTYsNDBabTAsMTYwSDQwVjU2SDIxNlYyMDBaTTE4NCw5NmE4LDgsMCwwLDEtOCw4SDgwYTgsOCwwLDAsMSwwLTE2aDk2QTgsOCwwLDAsMSwxODQsOTZabTAsMzJhOCw4LDAsMCwxLTgsOEg4MGE4LDgsMCwwLDEsMC0xNmg5NkE4LDgsMCwwLDEsMTg0LDEyOFptMCwzMmE4LDgsMCwwLDEtOCw4SDgwYTgsOCwwLDAsMSwwLTE2aDk2QTgsOCwwLDAsMSwxODQsMTYwWiI%2BPC9wYXRoPjwvc3ZnPg%3D%3D)](https://github.com/LinwoodDev/Flow/blob/main/LICENSE) +[![GitHub Repo stars](https://img.shields.io/github/stars/LinwoodDev/Flow?color=35CDEF&logo=github&logoColor=35CDEF&style=for-the-badge)](https://github.com/LinwoodDev/Flow) +[![Matrix badge](https://img.shields.io/matrix/linwood:matrix.org?style=for-the-badge&color=35CDEF&logo=matrix&logoColor=35CDEF&label=Matrix)](https://linwood.dev/matrix) +[![Discord badge](https://img.shields.io/discord/735424757142519848?style=for-the-badge&color=35CDEF&logo=discord&logoColor=35CDEF&label=Discord)](https://discord.linwood.dev) +[![Download](https://img.shields.io/github/downloads/LinwoodDev/Flow/total?color=35CDEF&style=for-the-badge&logo=data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIzMiIgaGVpZ2h0PSIzMiIgZmlsbD0iIzM1Y2RlZiIgdmlld0JveD0iMCAwIDI1NiAyNTYiPjxwYXRoIGQ9Ik0yMjQsMTQ0djY0YTgsOCwwLDAsMS04LDhINDBhOCw4LDAsMCwxLTgtOFYxNDRhOCw4LDAsMCwxLDE2LDB2NTZIMjA4VjE0NGE4LDgsMCwwLDEsMTYsMFptLTEwMS42Niw1LjY2YTgsOCwwLDAsMCwxMS4zMiwwbDQwLTQwYTgsOCwwLDAsMC0xMS4zMi0xMS4zMkwxMzYsMTI0LjY5VjMyYTgsOCwwLDAsMC0xNiwwdjkyLjY5TDkzLjY2LDk4LjM0YTgsOCwwLDAsMC0xMS4zMiwxMS4zMloiPjwvcGF0aD48L3N2Zz4%3D)](https://docs.flow.linwood.dev/downloads) diff --git a/app/android/app/src/main/res/drawable/ic_launcher_foreground.xml b/app/android/app/src/main/res/drawable/ic_launcher_foreground.xml index 5f89900877a..a7631f3a5b0 100644 --- a/app/android/app/src/main/res/drawable/ic_launcher_foreground.xml +++ b/app/android/app/src/main/res/drawable/ic_launcher_foreground.xml @@ -12,7 +12,7 @@ android:pathData="M0,0h64v64h-64z"/> + android:fillColor="#35CDEF"/> diff --git a/app/lib/theme.dart b/app/lib/theme.dart index 4bef34e5ad3..fc73045b144 100644 --- a/app/lib/theme.dart +++ b/app/lib/theme.dart @@ -3,7 +3,7 @@ import 'package:flutter/material.dart'; import 'main.dart'; -const kClassicThemePrimary = isNightly ? Color(0xFF6877FD) : Color(0xFFA28DDB); +const kClassicThemePrimary = isNightly ? Color(0xFF35CDEF) : Color(0xFF35CDEF); const kClassicThemeSecondary = Color(0xFF35EF53); const kClassicTheme = FlexSchemeColor( primary: kClassicThemePrimary, secondary: kClassicThemeSecondary); diff --git a/app/lib/widgets/navigation.dart b/app/lib/widgets/navigation.dart index 2f10b3b7008..f614bb56d91 100644 --- a/app/lib/widgets/navigation.dart +++ b/app/lib/widgets/navigation.dart @@ -264,10 +264,12 @@ class _FlowDrawer extends StatelessWidget { padding: const EdgeInsets.only(left: 8.0), child: Image.asset( isNightly ? "images/logo.png" : "images/logo.png", + height: 64, + width: 64, ), ), toolbarHeight: kAppBarHeight, - leadingWidth: 32, + leadingWidth: 42, title: const Text( shortApplicationName, textAlign: TextAlign.center, diff --git a/app/pubspec.lock b/app/pubspec.lock index 9ff8981234c..e19673f2ae0 100644 --- a/app/pubspec.lock +++ b/app/pubspec.lock @@ -1333,10 +1333,10 @@ packages: dependency: transitive description: name: win32 - sha256: "10169d3934549017f0ae278ccb07f828f9d6ea21573bab0fb77b0e1ef0fce454" + sha256: "84ba388638ed7a8cb3445a320c8273136ab2631cd5f2c57888335504ddab1bc2" url: "https://pub.dev" source: hosted - version: "5.7.2" + version: "5.8.0" window_manager: dependency: "direct main" description: diff --git a/docs/package.json b/docs/package.json index 77d18c882e6..67c11d71860 100644 --- a/docs/package.json +++ b/docs/package.json @@ -18,6 +18,6 @@ }, "packageManager": "pnpm@9.12.3", "devDependencies": { - "sass": "^1.80.5" + "sass": "^1.80.6" } } diff --git a/docs/pnpm-lock.yaml b/docs/pnpm-lock.yaml index 930fc2e6168..0ff495e085d 100644 --- a/docs/pnpm-lock.yaml +++ b/docs/pnpm-lock.yaml @@ -13,10 +13,10 @@ importers: version: 0.9.4(typescript@5.6.3) '@astrojs/starlight': specifier: ^0.28.5 - version: 0.28.5(astro@4.16.8(rollup@4.24.3)(sass@1.80.5)(typescript@5.6.3)) + version: 0.28.5(astro@4.16.8(rollup@4.24.3)(sass@1.80.6)(typescript@5.6.3)) astro: specifier: ^4.16.8 - version: 4.16.8(rollup@4.24.3)(sass@1.80.5)(typescript@5.6.3) + version: 4.16.8(rollup@4.24.3)(sass@1.80.6)(typescript@5.6.3) sharp: specifier: ^0.33.5 version: 0.33.5 @@ -25,8 +25,8 @@ importers: version: 5.6.3 devDependencies: sass: - specifier: ^1.80.5 - version: 1.80.5 + specifier: ^1.80.6 + version: 1.80.6 packages: @@ -1830,8 +1830,8 @@ packages: run-parallel@1.2.0: resolution: {integrity: sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==} - sass@1.80.5: - resolution: {integrity: sha512-TQd2aoQl/+zsxRMEDSxVdpPIqeq9UFc6pr7PzkugiTx3VYCFPUaa3P4RrBQsqok4PO200Vkz0vXQBNlg7W907g==} + sass@1.80.6: + resolution: {integrity: sha512-ccZgdHNiBF1NHBsWvacvT5rju3y1d/Eu+8Ex6c21nHp2lZGLBEtuwc415QfiI1PJa1TpCo3iXwwSRjRpn2Ckjg==} engines: {node: '>=14.0.0'} hasBin: true @@ -2310,12 +2310,12 @@ snapshots: transitivePeerDependencies: - supports-color - '@astrojs/mdx@3.1.9(astro@4.16.8(rollup@4.24.3)(sass@1.80.5)(typescript@5.6.3))': + '@astrojs/mdx@3.1.9(astro@4.16.8(rollup@4.24.3)(sass@1.80.6)(typescript@5.6.3))': dependencies: '@astrojs/markdown-remark': 5.3.0 '@mdx-js/mdx': 3.1.0(acorn@8.14.0) acorn: 8.14.0 - astro: 4.16.8(rollup@4.24.3)(sass@1.80.5)(typescript@5.6.3) + astro: 4.16.8(rollup@4.24.3)(sass@1.80.6)(typescript@5.6.3) es-module-lexer: 1.5.4 estree-util-visit: 2.0.0 gray-matter: 4.0.3 @@ -2340,15 +2340,15 @@ snapshots: stream-replace-string: 2.0.0 zod: 3.23.8 - '@astrojs/starlight@0.28.5(astro@4.16.8(rollup@4.24.3)(sass@1.80.5)(typescript@5.6.3))': + '@astrojs/starlight@0.28.5(astro@4.16.8(rollup@4.24.3)(sass@1.80.6)(typescript@5.6.3))': dependencies: - '@astrojs/mdx': 3.1.9(astro@4.16.8(rollup@4.24.3)(sass@1.80.5)(typescript@5.6.3)) + '@astrojs/mdx': 3.1.9(astro@4.16.8(rollup@4.24.3)(sass@1.80.6)(typescript@5.6.3)) '@astrojs/sitemap': 3.2.1 '@pagefind/default-ui': 1.1.1 '@types/hast': 3.0.4 '@types/mdast': 4.0.4 - astro: 4.16.8(rollup@4.24.3)(sass@1.80.5)(typescript@5.6.3) - astro-expressive-code: 0.35.6(astro@4.16.8(rollup@4.24.3)(sass@1.80.5)(typescript@5.6.3)) + astro: 4.16.8(rollup@4.24.3)(sass@1.80.6)(typescript@5.6.3) + astro-expressive-code: 0.35.6(astro@4.16.8(rollup@4.24.3)(sass@1.80.6)(typescript@5.6.3)) bcp-47: 2.1.0 hast-util-from-html: 2.0.3 hast-util-select: 6.0.3 @@ -2840,6 +2840,7 @@ snapshots: '@parcel/watcher-win32-arm64': 2.4.1 '@parcel/watcher-win32-ia32': 2.4.1 '@parcel/watcher-win32-x64': 2.4.1 + optional: true '@rollup/pluginutils@5.1.3(rollup@4.24.3)': dependencies: @@ -3086,12 +3087,12 @@ snapshots: astring@1.9.0: {} - astro-expressive-code@0.35.6(astro@4.16.8(rollup@4.24.3)(sass@1.80.5)(typescript@5.6.3)): + astro-expressive-code@0.35.6(astro@4.16.8(rollup@4.24.3)(sass@1.80.6)(typescript@5.6.3)): dependencies: - astro: 4.16.8(rollup@4.24.3)(sass@1.80.5)(typescript@5.6.3) + astro: 4.16.8(rollup@4.24.3)(sass@1.80.6)(typescript@5.6.3) rehype-expressive-code: 0.35.6 - astro@4.16.8(rollup@4.24.3)(sass@1.80.5)(typescript@5.6.3): + astro@4.16.8(rollup@4.24.3)(sass@1.80.6)(typescript@5.6.3): dependencies: '@astrojs/compiler': 2.10.3 '@astrojs/internal-helpers': 0.4.1 @@ -3147,8 +3148,8 @@ snapshots: tsconfck: 3.1.4(typescript@5.6.3) unist-util-visit: 5.0.0 vfile: 6.0.3 - vite: 5.4.10(sass@1.80.5) - vitefu: 1.0.3(vite@5.4.10(sass@1.80.5)) + vite: 5.4.10(sass@1.80.6) + vitefu: 1.0.3(vite@5.4.10(sass@1.80.6)) which-pm: 3.0.0 xxhash-wasm: 1.0.2 yargs-parser: 21.1.1 @@ -3286,7 +3287,8 @@ snapshots: dequal@2.0.3: {} - detect-libc@1.0.3: {} + detect-libc@1.0.3: + optional: true detect-libc@2.0.3: {} @@ -4285,7 +4287,8 @@ snapshots: dependencies: '@types/nlcst': 2.0.3 - node-addon-api@7.1.1: {} + node-addon-api@7.1.1: + optional: true node-releases@2.0.18: {} @@ -4621,12 +4624,13 @@ snapshots: dependencies: queue-microtask: 1.2.3 - sass@1.80.5: + sass@1.80.6: dependencies: - '@parcel/watcher': 2.4.1 chokidar: 4.0.1 immutable: 4.3.7 source-map-js: 1.2.1 + optionalDependencies: + '@parcel/watcher': 2.4.1 sax@1.4.1: {} @@ -4844,18 +4848,18 @@ snapshots: '@types/unist': 3.0.3 vfile-message: 4.0.2 - vite@5.4.10(sass@1.80.5): + vite@5.4.10(sass@1.80.6): dependencies: esbuild: 0.21.5 postcss: 8.4.47 rollup: 4.24.3 optionalDependencies: fsevents: 2.3.3 - sass: 1.80.5 + sass: 1.80.6 - vitefu@1.0.3(vite@5.4.10(sass@1.80.5)): + vitefu@1.0.3(vite@5.4.10(sass@1.80.6)): optionalDependencies: - vite: 5.4.10(sass@1.80.5) + vite: 5.4.10(sass@1.80.6) volar-service-css@0.0.62(@volar/language-service@2.4.8): dependencies: diff --git a/metadata/en-US/changelogs/8.txt b/metadata/en-US/changelogs/8.txt index 67d150febac..a57e1cb8b11 100644 --- a/metadata/en-US/changelogs/8.txt +++ b/metadata/en-US/changelogs/8.txt @@ -1,5 +1,7 @@ * Add right click menus * Add new icons ([#22](https://github.com/LinwoodDev/Flow/issues/22)) +* Update app color to match the new icons +* Make icon bigger * Fix month view start of the week * Upgrade project layout * Upgrade to flutter 3.24