From 8bb510d5a2e6c75f3351a56f8f62c8def523401f Mon Sep 17 00:00:00 2001 From: LezdCS Date: Sat, 8 Jun 2024 21:05:57 +0900 Subject: [PATCH 1/3] theme rtirl --- lib/src/core/resources/themes.dart | 56 ++++++++++++------- .../settings/dashboard_settings_view.dart | 8 --- .../widgets/tabs/realtime_irl_tab_view.dart | 6 ++ 3 files changed, 42 insertions(+), 28 deletions(-) diff --git a/lib/src/core/resources/themes.dart b/lib/src/core/resources/themes.dart index 9e5279cf..70157923 100644 --- a/lib/src/core/resources/themes.dart +++ b/lib/src/core/resources/themes.dart @@ -64,20 +64,28 @@ class Themes { fontSize: 12, ), ), - foregroundColor: WidgetStatePropertyAll( - Colors.white - ), + foregroundColor: WidgetStatePropertyAll(Colors.white), ), ), - chipTheme: const ChipThemeData( - deleteIconColor: Colors.white, - labelStyle: TextStyle( - color: Colors.white, + elevatedButtonTheme: ElevatedButtonThemeData( + style: ButtonStyle( + textStyle: const WidgetStatePropertyAll( + TextStyle( + fontSize: 12, + ), + ), + foregroundColor: const WidgetStatePropertyAll(Colors.white), + backgroundColor: WidgetStatePropertyAll(Colors.deepPurpleAccent[200]), ), - side: BorderSide( - color: Colors.white, - ) ), + chipTheme: const ChipThemeData( + deleteIconColor: Colors.white, + labelStyle: TextStyle( + color: Colors.white, + ), + side: BorderSide( + color: Colors.white, + )), switchTheme: SwitchThemeData( thumbColor: WidgetStateProperty.resolveWith( (Set states) { @@ -176,20 +184,28 @@ class Themes { fontSize: 12, ), ), - foregroundColor: WidgetStatePropertyAll( - Colors.white - ), + foregroundColor: WidgetStatePropertyAll(Colors.white), ), ), - chipTheme: const ChipThemeData( - deleteIconColor: Colors.black, - labelStyle: TextStyle( - color: Colors.black, + elevatedButtonTheme: ElevatedButtonThemeData( + style: ButtonStyle( + textStyle: const WidgetStatePropertyAll( + TextStyle( + fontSize: 12, + ), + ), + foregroundColor: const WidgetStatePropertyAll(Colors.white), + backgroundColor: WidgetStatePropertyAll(Colors.deepPurpleAccent[200]), ), - side: BorderSide( - color: Colors.black, - ) ), + chipTheme: const ChipThemeData( + deleteIconColor: Colors.black, + labelStyle: TextStyle( + color: Colors.black, + ), + side: BorderSide( + color: Colors.black, + )), switchTheme: SwitchThemeData( thumbColor: WidgetStateProperty.resolveWith( (Set states) { diff --git a/lib/src/presentation/widgets/settings/dashboard_settings_view.dart b/lib/src/presentation/widgets/settings/dashboard_settings_view.dart index deaec37a..ba2a7b70 100644 --- a/lib/src/presentation/widgets/settings/dashboard_settings_view.dart +++ b/lib/src/presentation/widgets/settings/dashboard_settings_view.dart @@ -310,14 +310,6 @@ Widget _addDialog(context, DashboardController dashboardController) { height: 10, ), ElevatedButton( - style: ButtonStyle( - backgroundColor: WidgetStateProperty.all( - Theme.of(context).colorScheme.tertiary, - ), - foregroundColor: WidgetStateProperty.all( - Theme.of(context).textTheme.bodyLarge!.color, - ), - ), onPressed: () { if (formKey.currentState!.validate()) { DashboardEvent newEvent = DashboardEvent( diff --git a/lib/src/presentation/widgets/tabs/realtime_irl_tab_view.dart b/lib/src/presentation/widgets/tabs/realtime_irl_tab_view.dart index b061bef9..780c3e9b 100644 --- a/lib/src/presentation/widgets/tabs/realtime_irl_tab_view.dart +++ b/lib/src/presentation/widgets/tabs/realtime_irl_tab_view.dart @@ -30,6 +30,9 @@ class RealtimeIrlTabView extends GetView { ), const SizedBox(height: 10), ElevatedButton( + style: ElevatedButton.styleFrom( + backgroundColor: Colors.green, + ), onPressed: () { controller.start(); }, @@ -51,6 +54,9 @@ class RealtimeIrlTabView extends GetView { ), const SizedBox(height: 10), ElevatedButton( + style: ElevatedButton.styleFrom( + backgroundColor: Colors.red, + ), onPressed: () { controller.stop(); }, From 843d955a40c5dda707a2ec87529f9abc64fd4200 Mon Sep 17 00:00:00 2001 From: LezdCS Date: Sat, 8 Jun 2024 21:06:55 +0900 Subject: [PATCH 2/3] remove debug --- lib/src/presentation/controllers/settings_view_controller.dart | 2 -- 1 file changed, 2 deletions(-) diff --git a/lib/src/presentation/controllers/settings_view_controller.dart b/lib/src/presentation/controllers/settings_view_controller.dart index 2a718e43..ca4ce838 100644 --- a/lib/src/presentation/controllers/settings_view_controller.dart +++ b/lib/src/presentation/controllers/settings_view_controller.dart @@ -10,7 +10,6 @@ import 'package:irllink/src/presentation/events/settings_events.dart'; import 'package:irllink/src/presentation/events/streamelements_events.dart'; import '../../domain/entities/twitch/twitch_user.dart'; -import 'package:irllink/src/core/utils/globals.dart' as globals; class SettingsViewController extends GetxController { SettingsViewController( @@ -84,7 +83,6 @@ class SettingsViewController extends GetxController { homeViewController.settings.value.streamElementsSettings!.jwt ?? ''; seOverlayTokenInputController.text = homeViewController .settings.value.streamElementsSettings!.overlayToken ?? ''; - globals.talker?.debug(homeViewController.settings.value); rtIrlInputController.text = homeViewController.settings.value.rtIrlPushKey ?? ''; getUsernames(); From 868b75400d422e4ad25449c1d094a9905e866ad2 Mon Sep 17 00:00:00 2001 From: LezdCS Date: Sat, 8 Jun 2024 21:08:47 +0900 Subject: [PATCH 3/3] 2.4.0 --- pubspec.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pubspec.yaml b/pubspec.yaml index 0a4d3634..916ada04 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -15,7 +15,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev # In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion. # Read more about iOS versioning at # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html -version: 2.3.3+57 +version: 2.4.0+58 environment: sdk: '>=2.19.0-0 <4.0.0'