chore(cleanup): some context adjustments

Author: Kounex

lib/shared/general/base/adaptive_text_field.dart

@@ -136,6 +136,27 @@ class BaseAdaptiveTextFieldState extends State<BaseAdaptiveTextField> {
     super.dispose();
   }
 
+  List<TextInputFormatter>? _textInputFormatter() {
+    if (this.widget.inputFormatters != null) {
+      return this.widget.inputFormatters;
+    }
+
+    if (this.widget.keyboardType == TextInputType.number) {
+      return [
+        FilteringTextInputFormatter.digitsOnly,
+      ];
+    }
+
+    if (this.widget.keyboardType ==
+        const TextInputType.numberWithOptions(decimal: true)) {
+      return [
+        FilteringTextInputFormatter.deny(',', replacementString: '.'),
+        FilteringTextInputFormatter.allow(RegExp(r'^-?\d*\.?\d*')),
+      ];
+    }
+    return null;
+  }
+
   @override
   Widget build(BuildContext context) {
     return Column(
@@ -148,7 +169,7 @@ class BaseAdaptiveTextFieldState extends State<BaseAdaptiveTextField> {
               cursorColor: Theme.of(context).textSelectionTheme.cursorColor,
               placeholder: this.widget.placeholder,
               keyboardType: this.widget.keyboardType,
-              inputFormatters: this.widget.inputFormatters ?? [],
+              inputFormatters: _textInputFormatter(),
               minLines: this.widget.minLines,
               maxLines: this.widget.maxLines ?? this.widget.minLines,
               autocorrect: this.widget.autocorrect,
@@ -192,7 +213,7 @@ class BaseAdaptiveTextFieldState extends State<BaseAdaptiveTextField> {
                       : null,
                 ),
                 keyboardType: this.widget.keyboardType,
-                inputFormatters: this.widget.inputFormatters ?? [],
+                inputFormatters: _textInputFormatter(),
                 minLines: this.widget.minLines,
                 maxLines: this.widget.maxLines ?? this.widget.minLines,
                 autocorrect: this.widget.autocorrect,

lib/shared/general/cupertino_dropdown.dart

@@ -33,7 +33,7 @@ class CupertinoDropdown<T> extends StatelessWidget {
             right: 2.0,
           ),
           child: DropdownButton<T>(
-            underline: Container(),
+            underline: const SizedBox(),
             isExpanded: true,
             isDense: true,
             value: this.value,

lib/shared/general/custom_expansion_tile.dart

@@ -151,7 +151,7 @@ class _CustomExpansionTileState extends State<CustomExpansionTile>
             ),
           ),
         ),
-        collapsed: Container(),
+        collapsed: const SizedBox(),
         expanded: this.widget.expandedBody,
       ),
     );

lib/stores/views/dashboard.dart

@@ -549,7 +549,7 @@ abstract class _DashboardStore with Store {
             !defaultFilter.filterSettings.containsKey(key)));
   }
 
-  Filter _filterWithDefaults(Filter filter) {
+  Filter _populateFiltersWithDefaults(Filter filter) {
     try {
       final defaultFilterSettings = _defaultFilters
           .firstWhere(
@@ -1642,11 +1642,13 @@ abstract class _DashboardStore with Store {
               /// default FilterSettings of these.
               List<Filter> filters = [...sceneItem.filters];
 
-              /// If this is the first time we fetch the current [Filter]s, we
-              /// can just add them since there are no default ones.
+              /// If this is the first time we fetch the current [Filter]s or we
+              /// have new ones or some were deleted, we can just add them since
+              /// there are no default ones.
               if (filters.length != responseFilters.length) {
                 filters = [];
-                filters.addAll(responseFilters.map(_filterWithDefaults));
+                filters
+                    .addAll(responseFilters.map(_populateFiltersWithDefaults));
               } else {
                 /// We handle this case if this is a subsequent fetch and our
                 /// [Filter]s are already populated. Here we need to make sure
@@ -1746,7 +1748,9 @@ abstract class _DashboardStore with Store {
         this.currentSceneItems = ObservableList.of(
           this.currentSceneItems.map(
                 (sceneItem) => sceneItem.copyWith(
-                  filters: sceneItem.filters.map(_filterWithDefaults).toList(),
+                  filters: sceneItem.filters
+                      .map(_populateFiltersWithDefaults)
+                      .toList(),
                 ),
               ),
         );

lib/stores/views/statistics.dart

@@ -139,7 +139,7 @@ abstract class _StatisticsStore with Store {
     this.excludeUnnamedStats = false;
     this.statType = StatType.All;
     this.durationFilter = null;
-    this.durationFilterAmount;
+    this.durationFilterAmount = null;
     this.durationFilterTimeUnit = TimeUnit.Minutes;
 
     /// Used as a toggle (only listen for change, not value) to exactly determine

lib/tab_base.dart

@@ -99,7 +99,7 @@ class _TabBaseState extends State<TabBase> {
     TabsStore tabsStore = GetIt.instance<TabsStore>();
 
     return Scaffold(
-      body: Observer(builder: (_) {
+      body: Observer(builder: (context) {
         return WillPopScope(
           onWillPop: () {
             if (tabsStore.navigatorKeys[tabsStore.activeTab]!.currentState!
@@ -131,7 +131,7 @@ class _TabBaseState extends State<TabBase> {
       }),
       extendBody: true,
       bottomNavigationBar: Observer(
-        builder: (_) => CupertinoTabBar(
+        builder: (context) => CupertinoTabBar(
           backgroundColor: !StylingHelper.isApple(context)
               ? CupertinoTheme.of(context).barBackgroundColor.withOpacity(1.0)
               : null,

lib/views/dashboard/dashboard.dart

@@ -134,7 +134,7 @@ class _DashboardViewState extends State<DashboardView> {
   @override
   Widget build(BuildContext context) {
     return ThemedCupertinoScaffold(
-      body: Observer(builder: (_) {
+      body: Observer(builder: (context) {
         return Stack(
           alignment: Alignment.topCenter,
           children: [

lib/views/dashboard/widgets/obs_widgets/stats/stats.dart

@@ -46,7 +46,7 @@ class _StatsState extends State<Stats> {
           ),
         ),
         Expanded(
-          child: Observer(builder: (_) {
+          child: Observer(builder: (context) {
             return PageView(
               controller: _pageController,
               children: <Widget>[

lib/views/dashboard/widgets/scenes/exposed_controls/exposed_controls.dart

@@ -1,5 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:obs_blade/shared/general/base/card.dart';
+import 'package:obs_blade/shared/general/base/divider.dart';
+import 'package:obs_blade/shared/general/custom_expansion_tile.dart';
 import 'package:obs_blade/shared/general/described_box.dart';
 import 'package:obs_blade/views/dashboard/widgets/scenes/exposed_controls/hotkeys_control/hotkeys_control.dart';
 import 'package:obs_blade/views/dashboard/widgets/scenes/exposed_controls/replay_buffer_controls.dart';
@@ -90,8 +92,23 @@ class ExposedControls extends StatelessWidget {
         return exposedControls.isNotEmpty
             ? BaseCard(
                 bottomPadding: 0.0,
-                child: Column(
-                  children: exposedControls,
+                paddingChild: const EdgeInsets.symmetric(vertical: 18.0),
+                child: CustomExpansionTile(
+                  headerText: 'Exposed Controls',
+                  headerPadding: const EdgeInsets.symmetric(horizontal: 18.0),
+                  expandedBody: Column(
+                    children: [
+                      const SizedBox(height: 18.0),
+                      const BaseDivider(),
+                      const SizedBox(height: 24.0),
+                      Padding(
+                        padding: const EdgeInsets.symmetric(horizontal: 18.0),
+                        child: Column(
+                          children: exposedControls,
+                        ),
+                      )
+                    ],
+                  ),
                 ),
               )
             : const SizedBox();

lib/views/dashboard/widgets/scenes/scene_buttons/scene_button.dart

@@ -38,7 +38,7 @@ class SceneButton extends StatelessWidget {
       hiveKey: HiveKeys.Settings,
       rebuildKeys: const [SettingsKeys.ExposeStudioControls],
       builder: (context, settingsBox, child) => Observer(
-        builder: (_) =>
+        builder: (context) =>
             // GestureDetector(
             //   onTap: () {
             //     if (dashboardStore.editSceneVisibility) {