Merge pull request #206 from LezdCS/develop

Develop
LezdCS · Jun 8, 2024 · 3b7a2cf · 3b7a2cf
2 parents 1c89a39 + 868b754
commit 3b7a2cf
Show file tree

Hide file tree

Showing 5 changed files with 43 additions and 31 deletions.
diff --git 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<WidgetState> 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<WidgetState> states) {

diff --git 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();

diff --git 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
@@ -30,6 +30,9 @@ class RealtimeIrlTabView extends GetView<RealtimeIrlViewController> {
         ),
         const SizedBox(height: 10),
         ElevatedButton(
+          style: ElevatedButton.styleFrom(
+            backgroundColor: Colors.green,
+          ),
           onPressed: () {
             controller.start();
           },
@@ -51,6 +54,9 @@ class RealtimeIrlTabView extends GetView<RealtimeIrlViewController> {
         ),
         const SizedBox(height: 10),
         ElevatedButton(
+          style: ElevatedButton.styleFrom(
+            backgroundColor: Colors.red,
+          ),
           onPressed: () {
             controller.stop();
           },

diff --git 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'