From 52d646c1c02530cb9df2447aa6aff37897adaa15 Mon Sep 17 00:00:00 2001 From: CodeDoctorDE Date: Tue, 23 Apr 2024 13:40:16 +0200 Subject: [PATCH] Improve icon style for different calendar item types --- app/FlowSetup.iss | 2 +- app/lib/pages/calendar/tile.dart | 8 +++++--- app/pubspec.lock | 4 ++-- app/pubspec.yaml | 2 +- fastlane/metadata/android/en-US/changelogs/7.txt | 1 + 5 files changed, 10 insertions(+), 7 deletions(-) diff --git a/app/FlowSetup.iss b/app/FlowSetup.iss index 25ef1973a7e..381399e171b 100644 --- a/app/FlowSetup.iss +++ b/app/FlowSetup.iss @@ -30,7 +30,7 @@ LicenseFile=..\LICENSE ; Uncomment the following line to run in non administrative install mode (install for current user only.) PrivilegesRequired=lowest PrivilegesRequiredOverridesAllowed=dialog -OutputDir=build\windows +OutputDir=build\windows\x64 OutputBaseFilename=linwood-flow-windows-setup SetupIconFile={#RunnerSourceDir}\resources\app_icon.ico UninstallDisplayIcon={app}\{#MyAppExeName} diff --git a/app/lib/pages/calendar/tile.dart b/app/lib/pages/calendar/tile.dart index 0e9d709a7bb..a801a09b25f 100644 --- a/app/lib/pages/calendar/tile.dart +++ b/app/lib/pages/calendar/tile.dart @@ -75,9 +75,11 @@ class CalendarListTile extends StatelessWidget { leading: Tooltip( message: model.status.getLocalizedName(context), child: PhosphorIcon( - model.status.icon(main.type == CalendarItemType.appointment - ? PhosphorIconsStyle.bold - : PhosphorIconsStyle.light), + model.status.icon(switch (main.type) { + CalendarItemType.appointment => PhosphorIconsStyle.fill, + CalendarItemType.moment => PhosphorIconsStyle.duotone, + CalendarItemType.pending => PhosphorIconsStyle.light, + }), color: model.status.getColor(), ), ), diff --git a/app/pubspec.lock b/app/pubspec.lock index 8402dba1822..fc2d9096107 100644 --- a/app/pubspec.lock +++ b/app/pubspec.lock @@ -642,8 +642,8 @@ packages: dependency: "direct main" description: path: "packages/material_leap" - ref: f6161499b096f1d0bf55acbd0f6d8a58330a40e6 - resolved-ref: f6161499b096f1d0bf55acbd0f6d8a58330a40e6 + ref: "9338503df442df2e9a156511de1e93dfee8c4257" + resolved-ref: "9338503df442df2e9a156511de1e93dfee8c4257" url: "https://github.com/LinwoodDev/dart_pkgs" source: git version: "0.0.1" diff --git a/app/pubspec.yaml b/app/pubspec.yaml index 6911ea655e0..14f35c99984 100644 --- a/app/pubspec.yaml +++ b/app/pubspec.yaml @@ -37,7 +37,7 @@ dependencies: material_leap: git: url: https://github.com/LinwoodDev/dart_pkgs - ref: f6161499b096f1d0bf55acbd0f6d8a58330a40e6 + ref: 9338503df442df2e9a156511de1e93dfee8c4257 path: packages/material_leap phosphor_flutter: git: diff --git a/fastlane/metadata/android/en-US/changelogs/7.txt b/fastlane/metadata/android/en-US/changelogs/7.txt index fd9f1b7e1a4..51c379a2ce2 100644 --- a/fastlane/metadata/android/en-US/changelogs/7.txt +++ b/fastlane/metadata/android/en-US/changelogs/7.txt @@ -3,6 +3,7 @@ * Add high contrast mode * Add classic theme * Make dashboard the back page +* Improve icon style for different calendar item types * Improve custom title bar window buttons * Use default page transition instead of fade * Upgrade to flutter 3.19