Update internal components library

LinwoodDev · Aug 27, 2024 · c65e462 · c65e462
1 parent e968d7e
commit c65e462
Show file tree

Hide file tree

Showing 10 changed files with 53 additions and 45 deletions.
diff --git a/SECURITY.md b/SECURITY.md
@@ -4,7 +4,7 @@
 
 | Version | Supported          |                                                                                                                                    |
 | ------- | ------------------ | ---------------------------------------------------------------------------------------------------------------------------------- |
-| 2.2-dev | :warning:          | [Docs](https://butterfly.linwood.dev/docs/2.1/intro) [Release](https://github.com/LinwoodDev/butterfly/releases/tag/v2.2.0-beta.1) |
+| 2.2-dev | :warning:          | [Docs](https://butterfly.linwood.dev/docs/2.1/intro) [Release](https://github.com/LinwoodDev/butterfly/releases/tag/v2.2.0-beta.2) |
 | 2.1.1   | :white_check_mark: | [Docs](https://butterfly.linwood.dev/docs/2.1/intro) [Release](https://github.com/LinwoodDev/butterfly/releases/tag/v2.1.1)        |
 | 2.0.3   | :x:                | [Docs](https://butterfly.linwood.dev/docs/2.0/intro) [Release](https://github.com/LinwoodDev/butterfly/releases/tag/v2.0.3)        |
 | 1.6.1   | :x:                | [Docs](https://butterfly.linwood.dev/docs/1.6/intro) [Release](https://github.com/LinwoodDev/butterfly/releases/tag/v1.6.1)        |

diff --git a/app/lib/dialogs/packs/dialog.dart b/app/lib/dialogs/packs/dialog.dart
@@ -332,7 +332,8 @@ class _PacksDialogState extends State<PacksDialog>
                       onPressed: () {
                         showLeapBottomSheet(
                           context: context,
-                          title: AppLocalizations.of(context).add,
+                          titleBuilder: (ctx) =>
+                              Text(AppLocalizations.of(ctx).add),
                           childrenBuilder: (ctx) => [
                             ListTile(
                               title: Text(AppLocalizations.of(ctx).import),

diff --git a/app/lib/settings/connections.dart b/app/lib/settings/connections.dart
@@ -56,7 +56,8 @@ class ConnectionsSettingsPage extends StatelessWidget {
             : FloatingActionButton.extended(
                 onPressed: () => showLeapBottomSheet<ExternalStorage>(
                     context: context,
-                    title: AppLocalizations.of(context).addConnection,
+                    titleBuilder: (context) =>
+                        Text(AppLocalizations.of(context).addConnection),
                     childrenBuilder: (context) => getSupportedStorages()
                         .whereNot(
                             (e) => e is LocalStorage && Platform.isAndroid)

diff --git a/app/lib/settings/data.dart b/app/lib/settings/data.dart
@@ -175,7 +175,7 @@ class _DataSettingsPageState extends State<DataSettingsPage> {
 
   Future<void> _openSyncModeModal(BuildContext context) => showLeapBottomSheet(
       context: context,
-      title: AppLocalizations.of(context).syncMode,
+      titleBuilder: (ctx) => Text(AppLocalizations.of(ctx).syncMode),
       childrenBuilder: (ctx) {
         final settingsCubit = context.read<SettingsCubit>();
         void changeSyncMode(SyncMode syncMode) {

diff --git a/app/lib/settings/personalization.dart b/app/lib/settings/personalization.dart
@@ -218,7 +218,8 @@ class PersonalizationSettingsPage extends StatelessWidget {
                           onTap: () async {
                             final position = await showLeapBottomSheet(
                                 context: context,
-                                title: AppLocalizations.of(context).position,
+                                titleBuilder: (context) =>
+                                    Text(AppLocalizations.of(context).position),
                                 childrenBuilder: (context) => [
                                       ListTile(
                                         title: Text(
@@ -262,7 +263,7 @@ class PersonalizationSettingsPage extends StatelessWidget {
 
     showLeapBottomSheet(
         context: context,
-        title: AppLocalizations.of(context).density,
+        titleBuilder: (context) => Text(AppLocalizations.of(context).density),
         childrenBuilder: (context) {
           void changeDensity(ThemeDensity density) {
             cubit.changeDensity(density);
@@ -285,7 +286,7 @@ class PersonalizationSettingsPage extends StatelessWidget {
 
     showLeapBottomSheet(
         context: context,
-        title: AppLocalizations.of(context).design,
+        titleBuilder: (context) => Text(AppLocalizations.of(context).design),
         childrenBuilder: (context) {
           void changeDesign(String design) {
             cubit.changeDesign(design);
@@ -323,7 +324,7 @@ class PersonalizationSettingsPage extends StatelessWidget {
 
     showLeapBottomSheet(
         context: context,
-        title: AppLocalizations.of(context).theme,
+        titleBuilder: (context) => Text(AppLocalizations.of(context).theme),
         childrenBuilder: (context) {
           void changeTheme(ThemeMode themeMode) {
             cubit.changeTheme(themeMode, MediaQuery.of(context));
@@ -356,7 +357,7 @@ class PersonalizationSettingsPage extends StatelessWidget {
     var locales = getLocales();
     showLeapBottomSheet(
         context: context,
-        title: AppLocalizations.of(context).locale,
+        titleBuilder: (context) => Text(AppLocalizations.of(context).locale),
         childrenBuilder: (context) {
           void changeLocale(Locale? locale) {
             cubit.changeLocale(locale);
@@ -381,7 +382,8 @@ class PersonalizationSettingsPage extends StatelessWidget {
     var currentTheme = cubit.state.platformTheme;
     showLeapBottomSheet(
         context: context,
-        title: AppLocalizations.of(context).platformTheme,
+        titleBuilder: (context) =>
+            Text(AppLocalizations.of(context).platformTheme),
         childrenBuilder: (context) => PlatformTheme.values
             .map((e) => ListTile(
                 title: Text(_getPlatformThemeName(context, e)),
@@ -403,7 +405,8 @@ class PersonalizationSettingsPage extends StatelessWidget {
     var currentPos = cubit.state.toolbarPosition;
     showLeapBottomSheet(
         context: context,
-        title: AppLocalizations.of(context).toolbarPosition,
+        titleBuilder: (context) =>
+            Text(AppLocalizations.of(context).toolbarPosition),
         childrenBuilder: (context) => ToolbarPosition.values
             .map((e) => ListTile(
                 title: Text(e.getLocalizedName(context)),
@@ -420,7 +423,8 @@ class PersonalizationSettingsPage extends StatelessWidget {
     var currentSize = cubit.state.toolbarSize;
     showLeapBottomSheet(
         context: context,
-        title: AppLocalizations.of(context).toolbarSize,
+        titleBuilder: (context) =>
+            Text(AppLocalizations.of(context).toolbarSize),
         childrenBuilder: (context) => ToolbarSize.values
             .map((e) => ListTile(
                 title: Text(e.getLocalizedName(context)),

diff --git a/app/lib/views/property.dart b/app/lib/views/property.dart
@@ -141,6 +141,8 @@ class _PropertyViewState extends State<PropertyView>
                             crossAxisAlignment: CrossAxisAlignment.stretch,
                             children: [
                               Header(
+                                centerTitle: false,
+                                leadingWidth: 60,
                                 title:
                                     Text(selection.getLocalizedName(context)),
                                 leading: menuChildren.length <= 1

diff --git a/app/pubspec.lock b/app/pubspec.lock
@@ -491,10 +491,10 @@ packages:
     dependency: transitive
     description:
       name: flex_seed_scheme
-      sha256: cc08c81879ecfd2ab840664ce4770980da0b8a319e35f51bcf763849b7f7596b
+      sha256: "86470c8dc470f55dd3e28a6d30e3253a1c176df32903263d7daeabfc0c77dbd4"
       url: "https://pub.dev"
     source: hosted
-    version: "3.1.2"
+    version: "3.2.0"
   flutter:
     dependency: "direct main"
     description: flutter
@@ -546,10 +546,10 @@ packages:
     dependency: transitive
     description:
       name: flutter_plugin_android_lifecycle
-      sha256: "9d98bd47ef9d34e803d438f17fd32b116d31009f534a6fa5ce3a1167f189a6de"
+      sha256: "9ee02950848f61c4129af3d6ec84a1cfc0e47931abc746b03e7a3bc3e8ff6eda"
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.21"
+    version: "2.0.22"
   flutter_secure_storage:
     dependency: "direct main"
     description:
@@ -658,10 +658,10 @@ packages:
     dependency: "direct main"
     description:
       name: go_router
-      sha256: "48d03a1e4887b00fe622695139246e3c778ac814eeb32421467b56d23fa64034"
+      sha256: "2ddb88e9ad56ae15ee144ed10e33886777eb5ca2509a914850a5faa7b52ff459"
       url: "https://pub.dev"
     source: hosted
-    version: "14.2.6"
+    version: "14.2.7"
   graphs:
     dependency: transitive
     description:
@@ -882,8 +882,8 @@ packages:
     dependency: "direct main"
     description:
       path: "packages/material_leap"
-      ref: e844798751461be17a633fc98565a1aa9003a297
-      resolved-ref: e844798751461be17a633fc98565a1aa9003a297
+      ref: "065b5b2808517551559f7cd27d6f9a8b294ffebf"
+      resolved-ref: "065b5b2808517551559f7cd27d6f9a8b294ffebf"
       url: "https://github.com/LinwoodDev/dart_pkgs.git"
     source: git
     version: "0.0.1"
@@ -899,10 +899,10 @@ packages:
     dependency: transitive
     description:
       name: mime
-      sha256: "2e123074287cc9fd6c09de8336dae606d1ddb88d9ac47358826db698c176a1f2"
+      sha256: "801fd0b26f14a4a58ccb09d5892c3fbdeff209594300a542492cf13fba9d247a"
       url: "https://pub.dev"
     source: hosted
-    version: "1.0.5"
+    version: "1.0.6"
   nested:
     dependency: transitive
     description:
@@ -1230,10 +1230,10 @@ packages:
     dependency: transitive
     description:
       name: shared_preferences_android
-      sha256: a7e8467e9181cef109f601e3f65765685786c1a738a83d7fbbde377589c0d974
+      sha256: "480ba4345773f56acda9abf5f50bd966f581dac5d514e5fc4a18c62976bbba7e"
       url: "https://pub.dev"
     source: hosted
-    version: "2.3.1"
+    version: "2.3.2"
   shared_preferences_foundation:
     dependency: transitive
     description:
@@ -1363,18 +1363,18 @@ packages:
     dependency: "direct main"
     description:
       name: super_clipboard
-      sha256: "74098001413e075cc53dee72b68c32eaffc10709df41806800393abaa6dac9d5"
+      sha256: "71d2a81e0e3a8c5d6339715a42f8dd42c6def02c0c805a23d45611010de39fbe"
       url: "https://pub.dev"
     source: hosted
-    version: "0.8.19"
+    version: "0.8.20"
   super_native_extensions:
     dependency: transitive
     description:
       name: super_native_extensions
-      sha256: c24676825c9f3ae844676a843d45ad186f2270539ffe72be4277753e46d14e29
+      sha256: "9d674b8c71e16f586b3967e67a6faa83c35e3d9ea4f64bca8551badfddf992cb"
       url: "https://pub.dev"
     source: hosted
-    version: "0.8.19"
+    version: "0.8.20"
   sync_http:
     dependency: transitive
     description:

diff --git a/app/pubspec.yaml b/app/pubspec.yaml
@@ -72,7 +72,7 @@ dependencies:
   material_leap:
     git:
       url: https://github.com/LinwoodDev/dart_pkgs.git
-      ref: e844798751461be17a633fc98565a1aa9003a297
+      ref: 065b5b2808517551559f7cd27d6f9a8b294ffebf
       path: packages/material_leap
   lw_sysapi:
     git:
@@ -116,7 +116,6 @@ dev_dependencies:
   espresso: ^0.4.0
   freezed: ^2.5.2
 dependency_overrides:
-  web: ^1.0.0
   flutter_secure_storage_web:
     git:
       url: https://github.com/CodeDoctorDE/flutter_secure_storage.git

diff --git a/docs/src/styles/custom.css b/docs/src/styles/custom.css
@@ -5,28 +5,28 @@
   --sl-color-accent: #8f5e00;
   --sl-color-accent-high: #dbc5a8;
   --sl-color-white: #ffffff;
-  --sl-color-gray-1: #def5de;
-  --sl-color-gray-2: #afcbaf;
-  --sl-color-gray-3: #639c65;
-  --sl-color-gray-4: #2f6633;
-  --sl-color-gray-5: #084512;
-  --sl-color-gray-6: #003107;
-  --sl-color-black: #071e09;
+  --sl-color-gray-1: #eaefea;
+  --sl-color-gray-2: #bec4be;
+  --sl-color-gray-3: #848f84;
+  --sl-color-gray-4: #515b51;
+  --sl-color-gray-5: #323b32;
+  --sl-color-gray-6: #212921;
+  --sl-color-black: #151915;
   --sl-font-system: "Barlow", sans-serif;
 }
 /* Light mode colors. */
 :root[data-theme="light"] {
   --sl-color-accent-low: #e5d4bf;
   --sl-color-accent: #916000;
   --sl-color-accent-high: #462c00;
-  --sl-color-white: #071e09;
-  --sl-color-gray-1: #003107;
-  --sl-color-gray-2: #084512;
-  --sl-color-gray-3: #2f6633;
-  --sl-color-gray-4: #639c65;
-  --sl-color-gray-5: #afcbaf;
-  --sl-color-gray-6: #def5de;
-  --sl-color-gray-7: #eefaee;
+  --sl-color-white: #151915;
+  --sl-color-gray-1: #212921;
+  --sl-color-gray-2: #323b32;
+  --sl-color-gray-3: #515b51;
+  --sl-color-gray-4: #848f84;
+  --sl-color-gray-5: #bec4be;
+  --sl-color-gray-6: #eaefea;
+  --sl-color-gray-7: #f5f7f5;
   --sl-color-black: #ffffff;
 }
 

diff --git a/metadata/en-US/changelogs/111.txt b/metadata/en-US/changelogs/111.txt
@@ -2,6 +2,7 @@
 * Use date for default file name
 * Fix unnamed files gets duplicated on save
 * Upgrade to flutter 3.24
+* Update internal component library
 * Remove FLUTTER_VERSION file, use pubspec instead
 
 Read more here: https://linwood.dev/butterfly/2.2.0-beta.2