From 554f9b9a545d1f7cf53ab0c37a05e91d7e4e3b51 Mon Sep 17 00:00:00 2001
From: Christien Rioux <chris@veilid.org>
Date: Fri, 21 Jun 2024 23:03:11 -0400
Subject: [PATCH] revert theme ugliness

---
 lib/theme/models/scale_scheme.dart           |  4 +++-
 packages/veilid_support/example/pubspec.lock |  8 ++++----
 packages/veilid_support/pubspec.lock         | 14 ++++++++------
 packages/veilid_support/pubspec.yaml         | 10 +++++-----
 pubspec.lock                                 | 14 ++++++++------
 pubspec.yaml                                 | 10 +++++-----
 6 files changed, 33 insertions(+), 27 deletions(-)

diff --git a/lib/theme/models/scale_scheme.dart b/lib/theme/models/scale_scheme.dart
index 642dfee..990fe1e 100644
--- a/lib/theme/models/scale_scheme.dart
+++ b/lib/theme/models/scale_scheme.dart
@@ -89,9 +89,11 @@ class ScaleScheme extends ThemeExtension<ScaleScheme> {
         onError: errorScale.primaryText,
         // errorContainer: errorScale.hoverElementBackground,
         // onErrorContainer: errorScale.subtleText,
+        background: grayScale.appBackground, // reviewed
+        onBackground: grayScale.appText, // reviewed
         surface: primaryScale.primary, // reviewed
         onSurface: primaryScale.primaryText, // reviewed
-        surfaceContainerHighest: secondaryScale.primary,
+        surfaceVariant: secondaryScale.primary,
         onSurfaceVariant: secondaryScale.primaryText, // ?? reviewed a little
         outline: primaryScale.border,
         outlineVariant: secondaryScale.border,
diff --git a/packages/veilid_support/example/pubspec.lock b/packages/veilid_support/example/pubspec.lock
index 5ff4899..304670e 100644
--- a/packages/veilid_support/example/pubspec.lock
+++ b/packages/veilid_support/example/pubspec.lock
@@ -37,10 +37,10 @@ packages:
     dependency: "direct dev"
     description:
       name: async_tools
-      sha256: "72590010ed6c6f5cbd5d40e33834abc08a43da6a73ac3c3645517d53899b8684"
+      sha256: f35f5590711f1422c7eff990351e879c5433486f9b5be5df30818521bf6ab8d6
       url: "https://pub.dev"
     source: hosted
-    version: "0.1.2"
+    version: "0.1.3"
   bloc:
     dependency: transitive
     description:
@@ -53,10 +53,10 @@ packages:
     dependency: transitive
     description:
       name: bloc_advanced_tools
-      sha256: "0cf9b3a73a67addfe22ec3f97a1ac240f6ad53870d6b21a980260f390d7901cd"
+      sha256: "11f534f9e89561302de3bd07ab2dfe1c2dacaa8db9794ccdb57c55cfc02dffc6"
       url: "https://pub.dev"
     source: hosted
-    version: "0.1.2"
+    version: "0.1.3"
   boolean_selector:
     dependency: transitive
     description:
diff --git a/packages/veilid_support/pubspec.lock b/packages/veilid_support/pubspec.lock
index 107e8d4..f38de9a 100644
--- a/packages/veilid_support/pubspec.lock
+++ b/packages/veilid_support/pubspec.lock
@@ -36,9 +36,10 @@ packages:
   async_tools:
     dependency: "direct main"
     description:
-      path: "../../../dart_async_tools"
-      relative: true
-    source: path
+      name: async_tools
+      sha256: f35f5590711f1422c7eff990351e879c5433486f9b5be5df30818521bf6ab8d6
+      url: "https://pub.dev"
+    source: hosted
     version: "0.1.3"
   bloc:
     dependency: "direct main"
@@ -51,9 +52,10 @@ packages:
   bloc_advanced_tools:
     dependency: "direct main"
     description:
-      path: "../../../bloc_advanced_tools"
-      relative: true
-    source: path
+      name: bloc_advanced_tools
+      sha256: "11f534f9e89561302de3bd07ab2dfe1c2dacaa8db9794ccdb57c55cfc02dffc6"
+      url: "https://pub.dev"
+    source: hosted
     version: "0.1.3"
   boolean_selector:
     dependency: transitive
diff --git a/packages/veilid_support/pubspec.yaml b/packages/veilid_support/pubspec.yaml
index b2b0e5c..01970ba 100644
--- a/packages/veilid_support/pubspec.yaml
+++ b/packages/veilid_support/pubspec.yaml
@@ -24,11 +24,11 @@ dependencies:
     #   veilid: ^0.0.1
     path: ../../../veilid/veilid-flutter
 
-dependency_overrides:
-  async_tools: 
-    path: ../../../dart_async_tools
-  bloc_advanced_tools: 
-    path: ../../../bloc_advanced_tools
+# dependency_overrides:
+#   async_tools: 
+#     path: ../../../dart_async_tools
+#   bloc_advanced_tools: 
+#     path: ../../../bloc_advanced_tools
 
 dev_dependencies:
   build_runner: ^2.4.10
diff --git a/pubspec.lock b/pubspec.lock
index 0855cbc..16edf0a 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -60,9 +60,10 @@ packages:
   async_tools:
     dependency: "direct main"
     description:
-      path: "../dart_async_tools"
-      relative: true
-    source: path
+      name: async_tools
+      sha256: f35f5590711f1422c7eff990351e879c5433486f9b5be5df30818521bf6ab8d6
+      url: "https://pub.dev"
+    source: hosted
     version: "0.1.3"
   awesome_extensions:
     dependency: "direct main"
@@ -99,9 +100,10 @@ packages:
   bloc_advanced_tools:
     dependency: "direct main"
     description:
-      path: "../bloc_advanced_tools"
-      relative: true
-    source: path
+      name: bloc_advanced_tools
+      sha256: "11f534f9e89561302de3bd07ab2dfe1c2dacaa8db9794ccdb57c55cfc02dffc6"
+      url: "https://pub.dev"
+    source: hosted
     version: "0.1.3"
   blurry_modal_progress_hud:
     dependency: "direct main"
diff --git a/pubspec.yaml b/pubspec.yaml
index 2f28727..a81d632 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -93,11 +93,11 @@ dependencies:
   xterm: ^4.0.0
   zxing2: ^0.2.3
 
-dependency_overrides:
-  async_tools: 
-    path: ../dart_async_tools
-  bloc_advanced_tools: 
-    path: ../bloc_advanced_tools
+# dependency_overrides:
+#   async_tools: 
+#     path: ../dart_async_tools
+#   bloc_advanced_tools: 
+#     path: ../bloc_advanced_tools
 #   flutter_chat_ui:
 #     path: ../flutter_chat_ui