From 1c2e01405bd85d7d649ea4c0cb9490571f39fa0a Mon Sep 17 00:00:00 2001 From: Julie Krasnick Date: Fri, 3 Oct 2025 17:00:09 -0400 Subject: [PATCH 1/4] forgot to include when removing hardcoded colors --- lib/src/screens/shared_widgets/primary_button.dart | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/lib/src/screens/shared_widgets/primary_button.dart b/lib/src/screens/shared_widgets/primary_button.dart index 54c0e9f..ae0da43 100644 --- a/lib/src/screens/shared_widgets/primary_button.dart +++ b/lib/src/screens/shared_widgets/primary_button.dart @@ -16,22 +16,13 @@ class PrimaryButton extends StatelessWidget { Widget build(BuildContext context) { return FilledButton( onPressed: (isLoading || onPressed == null) ? null : onPressed, - style: OutlinedButton.styleFrom(backgroundColor: Theme.of(context).colorScheme.primary), child: isLoading ? SizedBox( width: 20, height: 20, - child: CircularProgressIndicator.adaptive( - backgroundColor: Theme.of(context).colorScheme.onPrimary, - ), + child: CircularProgressIndicator.adaptive(), ) - : Text( - text, - style: TextStyle( - fontWeight: FontWeight.w500, - color: onPressed != null ? Theme.of(context).colorScheme.onPrimary : Theme.of(context).disabledColor, - ), - ), + : Text(text), ); } } From 633956b441ad6ed9d1296f87cf8f9af5d170a954 Mon Sep 17 00:00:00 2001 From: Julie Krasnick Date: Fri, 3 Oct 2025 17:02:47 -0400 Subject: [PATCH 2/4] change log complete --- CHANGELOG.md | 2 ++ pubspec.yaml | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6e0dd85..c3c034c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,5 @@ +## 0.0.17 +- Follow up to "Update colors to be non-hardcoded" by @jckras in https://github.com/viamrobotics/viam_flutter_hotspot_provisioning_widget/pull/48 ## 0.0.16 - Update colors to be non-hardcoded by @jckras in https://github.com/viamrobotics/viam_flutter_hotspot_provisioning_widget/pull/46 - [APP-9720] [Hotspot prov widget] remove the "done" button on the setting up device screen by @jckras in https://github.com/viamrobotics/viam_flutter_hotspot_provisioning_widget/pull/44 diff --git a/pubspec.yaml b/pubspec.yaml index 462453c..a1ecf79 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,6 +1,6 @@ name: viam_flutter_hotspot_provisioning_widget description: "A Viam Flutter Hotspot Provisioning Widget." -version: 0.0.16 +version: 0.0.17 repository: https://github.com/viamrobotics/viam_flutter_hotspot_provisioning_widget homepage: https://www.viam.com/ From 0fef3a25c3fc0fcc5f8b964b82b424cbdbbb062b Mon Sep 17 00:00:00 2001 From: Julie Krasnick Date: Fri, 3 Oct 2025 17:10:09 -0400 Subject: [PATCH 3/4] remove custom colors --- .../widgets/network_selection_screen.dart | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/lib/src/screens/network_selection.dart/widgets/network_selection_screen.dart b/lib/src/screens/network_selection.dart/widgets/network_selection_screen.dart index 44a4f67..5ea238a 100644 --- a/lib/src/screens/network_selection.dart/widgets/network_selection_screen.dart +++ b/lib/src/screens/network_selection.dart/widgets/network_selection_screen.dart @@ -43,7 +43,7 @@ class _NetworkSelectionScreenState extends State { } if (widget.viewModel.machineVisibleNetworks.isEmpty) { return NoContentWidget( - icon: Icon(Icons.error, color: Theme.of(context).colorScheme.error), + icon: Icon(Icons.error, color: Theme.of(context).colorScheme.error), buttons: [ FilledButton( onPressed: () { @@ -125,14 +125,6 @@ class _NetworkSelectionScreenState extends State { padding: const EdgeInsets.symmetric(horizontal: 16.0, vertical: 16.0), child: Center( child: ElevatedButton( - style: ElevatedButton.styleFrom( - backgroundColor: Theme.of(context).colorScheme.primary, - shape: RoundedRectangleBorder( - borderRadius: BorderRadius.circular(24.0), - ), - padding: const EdgeInsets.symmetric(horizontal: 24.0, vertical: 12.0), - elevation: 0, - ), onPressed: () { showDialog( context: context, @@ -143,7 +135,6 @@ class _NetworkSelectionScreenState extends State { }, child: Text( "My network isn't showing up", - style: TextStyle(color: Theme.of(context).colorScheme.onPrimary, fontWeight: FontWeight.w500), ), ), ), From 2354872c98a5b2f7be36c0885949aab5d9282551 Mon Sep 17 00:00:00 2001 From: Julie Krasnick Date: Fri, 3 Oct 2025 17:47:38 -0400 Subject: [PATCH 4/4] minor tweaks --- .../widgets/network_selection_screen.dart | 7 +++++++ lib/src/screens/shared_widgets/pill_button.dart | 1 - 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/lib/src/screens/network_selection.dart/widgets/network_selection_screen.dart b/lib/src/screens/network_selection.dart/widgets/network_selection_screen.dart index 5ea238a..20d308b 100644 --- a/lib/src/screens/network_selection.dart/widgets/network_selection_screen.dart +++ b/lib/src/screens/network_selection.dart/widgets/network_selection_screen.dart @@ -125,6 +125,13 @@ class _NetworkSelectionScreenState extends State { padding: const EdgeInsets.symmetric(horizontal: 16.0, vertical: 16.0), child: Center( child: ElevatedButton( + style: ElevatedButton.styleFrom( + shape: RoundedRectangleBorder( + borderRadius: BorderRadius.circular(24.0), + ), + padding: const EdgeInsets.symmetric(horizontal: 24.0, vertical: 12.0), + elevation: 0, + ), onPressed: () { showDialog( context: context, diff --git a/lib/src/screens/shared_widgets/pill_button.dart b/lib/src/screens/shared_widgets/pill_button.dart index 77b72b3..63ec90f 100644 --- a/lib/src/screens/shared_widgets/pill_button.dart +++ b/lib/src/screens/shared_widgets/pill_button.dart @@ -19,7 +19,6 @@ class PillButton extends StatelessWidget { return TextButton( style: ButtonStyle( shape: WidgetStatePropertyAll(RoundedRectangleBorder(borderRadius: BorderRadius.circular(20.0))), - backgroundColor: WidgetStatePropertyAll(enabled == null || !enabled! ? Theme.of(context).disabledColor : Theme.of(context).colorScheme.primary), ), onPressed: onPressed, child: Row(