chore: create separate widget for proxy dialog

abhinavs1920 · abhinavs1920 · commit 239b75cbadfa · 2025-03-24T11:50:28.000+05:30
diff --git a/lib/models/settings_model.dart b/lib/models/settings_model.dart
@@ -34,7 +34,7 @@ class SettingsModel {
   final bool isSSLDisabled;
 
   // Proxy settings
-  final ProxySettings proxySettings;
+  final ProxySettings? proxySettings;
 
   SettingsModel copyWith({
     bool? isDark,
@@ -66,7 +66,7 @@ class SettingsModel {
           historyRetentionPeriod ?? this.historyRetentionPeriod,
       workspaceFolderPath: workspaceFolderPath ?? this.workspaceFolderPath,
       isSSLDisabled: isSSLDisabled ?? this.isSSLDisabled,
-      proxySettings: proxySettings ?? this.proxySettings,
+      proxySettings: proxySettings,
     );
   }
 
@@ -99,13 +99,16 @@ class SettingsModel {
     final dx = data["dx"] as double?;
     final dy = data["dy"] as double?;
     Size? size;
+
     if (width != null && height != null) {
       size = Size(width, height);
     }
     Offset? offset;
+
     if (dx != null && dy != null) {
       offset = Offset(dx, dy);
     }
+
     final defaultUriSchemeStr = data["defaultUriScheme"] as String?;
     SupportedUriSchemes? defaultUriScheme;
     if (defaultUriSchemeStr != null) {
@@ -116,6 +119,7 @@ class SettingsModel {
         // pass
       }
     }
+
     final defaultCodeGenLangStr = data["defaultCodeGenLang"] as String?;
     CodegenLanguage? defaultCodeGenLang;
     if (defaultCodeGenLangStr != null) {
@@ -126,6 +130,7 @@ class SettingsModel {
         // pass
       }
     }
+
     final saveResponses = data["saveResponses"] as bool?;
     final promptBeforeClosing = data["promptBeforeClosing"] as bool?;
     final activeEnvironmentId = data["activeEnvironmentId"] as String?;
@@ -139,9 +144,19 @@ class SettingsModel {
         // pass
       }
     }
+
     final workspaceFolderPath = data["workspaceFolderPath"] as String?;
     final isSSLDisabled = data["isSSLDisabled"] as bool?;
 
+    ProxySettings? proxySettings;
+    if (data["proxySettings"] != null) {
+      try {
+        proxySettings = ProxySettings.fromJson(Map<String, dynamic>.from(data["proxySettings"]));
+      } catch (e) {
+        // pass
+      }
+    }
+
     const sm = SettingsModel();
 
     return sm.copyWith(
@@ -158,7 +173,7 @@ class SettingsModel {
           historyRetentionPeriod ?? HistoryRetentionPeriod.oneWeek,
       workspaceFolderPath: workspaceFolderPath,
       isSSLDisabled: isSSLDisabled,
-      proxySettings: ProxySettings.fromJson(data["proxySettings"]),
+      proxySettings: proxySettings,
     );
   }
 
@@ -178,7 +193,7 @@ class SettingsModel {
       "historyRetentionPeriod": historyRetentionPeriod.name,
       "workspaceFolderPath": workspaceFolderPath,
       "isSSLDisabled": isSSLDisabled,
-      "proxySettings": proxySettings,
+      "proxySettings": proxySettings?.toJson(),
     };
   }
 
diff --git a/lib/providers/settings_providers.dart b/lib/providers/settings_providers.dart
@@ -35,21 +35,26 @@ class ThemeStateNotifier extends StateNotifier<SettingsModel> {
     bool? isSSLDisabled,
     ProxySettings? proxySettings,
   }) async {
-    state = state.copyWith(
-      isDark: isDark ?? state.isDark,
-      alwaysShowCollectionPaneScrollbar: alwaysShowCollectionPaneScrollbar ?? state.alwaysShowCollectionPaneScrollbar,
-      size: size ?? state.size,
-      offset: offset ?? state.offset,
-      defaultUriScheme: defaultUriScheme ?? state.defaultUriScheme,
-      defaultCodeGenLang: defaultCodeGenLang ?? state.defaultCodeGenLang,
-      saveResponses: saveResponses ?? state.saveResponses,
-      promptBeforeClosing: promptBeforeClosing ?? state.promptBeforeClosing,
-      activeEnvironmentId: activeEnvironmentId ?? state.activeEnvironmentId,
-      historyRetentionPeriod: historyRetentionPeriod ?? state.historyRetentionPeriod,
-      workspaceFolderPath: workspaceFolderPath ?? state.workspaceFolderPath,
-      isSSLDisabled: isSSLDisabled ?? state.isSSLDisabled,
-      proxySettings: proxySettings ?? state.proxySettings,
+    
+    final newState = state.copyWith(
+      isDark: isDark,
+      alwaysShowCollectionPaneScrollbar: alwaysShowCollectionPaneScrollbar,
+      size: size,
+      offset: offset,
+      defaultUriScheme: defaultUriScheme,
+      defaultCodeGenLang: defaultCodeGenLang,
+      saveResponses: saveResponses,
+      promptBeforeClosing: promptBeforeClosing,
+      activeEnvironmentId: activeEnvironmentId,
+      historyRetentionPeriod: historyRetentionPeriod,
+      workspaceFolderPath: workspaceFolderPath,
+      isSSLDisabled: isSSLDisabled,
+      proxySettings: proxySettings,
     );
-    await setSettingsToSharedPrefs(state);
+        
+    if (newState != state) {
+      state = newState;
+      await setSettingsToSharedPrefs(state);
+    }
   }
 }
diff --git a/lib/screens/settings_page.dart b/lib/screens/settings_page.dart
@@ -1,3 +1,4 @@
+import 'package:apidash/widgets/proxy_settings_dialog.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
@@ -7,7 +8,6 @@ import '../services/services.dart';
 import '../utils/utils.dart';
 import '../widgets/widgets.dart';
 import '../consts.dart';
-import 'dart:developer' as developer;
 
 class SettingsPage extends ConsumerWidget {
   const SettingsPage({super.key});
@@ -51,75 +51,24 @@ class SettingsPage extends ConsumerWidget {
                   ref.read(settingsProvider.notifier).update(isDark: value);
                 },
               ),
-              // Proxy Settings Section
               SwitchListTile(
-                hoverColor: kColorTransparent,
-                title: const Text('Enable Proxy'),
-                subtitle: const Text('Configure HTTP proxy settings'),
-                value: ref.watch(settingsProvider.select((settings) => settings.isProxyEnabled)),
-                onChanged: (bool? value) {
-                  if (value != null) {
-                    developer.log('Toggling proxy settings', name: 'settings_page', error: 'New value: $value');
-                    ref.read(settingsProvider.notifier).update(
-                      isProxyEnabled: value,
-                      proxyHost: value ? settings.proxyHost : '',
-                      proxyPort: value ? settings.proxyPort : '',
-                      proxyUsername: value ? settings.proxyUsername : null,
-                      proxyPassword: value ? settings.proxyPassword : null,
+                title: const Text('Proxy Settings'),
+                subtitle: Text(ref.watch(settingsProvider).proxySettings != null 
+                  ? 'Enabled - ${ref.watch(settingsProvider).proxySettings!.host}:${ref.watch(settingsProvider).proxySettings!.port}' 
+                  : 'Disabled'
+                ),
+                value: ref.watch(settingsProvider).proxySettings != null,
+                onChanged: (bool value) {
+                  if (!value) {
+                    ref.read(settingsProvider.notifier).update(proxySettings: null);
+                  } else {
+                    showDialog(
+                      context: context,
+                      builder: (context) => const ProxySettingsDialog(),
                     );
-                    developer.log('Proxy settings updated', name: 'settings_page');
                   }
                 },
               ),
-              if (ref.watch(settingsProvider.select((settings) => settings.isProxyEnabled))) ...[
-                ListTile(
-                  title: TextField(
-                    decoration: const InputDecoration(
-                      labelText: 'Proxy Host',
-                      hintText: 'e.g., localhost',
-                    ),
-                    controller: TextEditingController(text: settings.proxyHost),
-                    onChanged: (value) {
-                      ref.read(settingsProvider.notifier).update(proxyHost: value);
-                    },
-                  ),
-                ),
-                ListTile(
-                  title: TextField(
-                    decoration: const InputDecoration(
-                      labelText: 'Proxy Port',
-                      hintText: 'e.g., 8080',
-                    ),
-                    controller: TextEditingController(text: settings.proxyPort),
-                    onChanged: (value) {
-                      ref.read(settingsProvider.notifier).update(proxyPort: value);
-                    },
-                  ),
-                ),
-                ListTile(
-                  title: TextField(
-                    decoration: const InputDecoration(
-                      labelText: 'Username (Optional)',
-                    ),
-                    controller: TextEditingController(text: settings.proxyUsername),
-                    onChanged: (value) {
-                      ref.read(settingsProvider.notifier).update(proxyUsername: value);
-                    },
-                  ),
-                ),
-                ListTile(
-                  title: TextField(
-                    decoration: const InputDecoration(
-                      labelText: 'Password (Optional)',
-                    ),
-                    obscureText: true,
-                    controller: TextEditingController(text: settings.proxyPassword),
-                    onChanged: (value) {
-                      ref.read(settingsProvider.notifier).update(proxyPassword: value);
-                    },
-                  ),
-                ),
-              ],
               SwitchListTile(
                 hoverColor: kColorTransparent,
                 title: const Text('Collection Pane Scrollbar Visiblity'),
diff --git a/lib/widgets/proxy_settings_dialog.dart b/lib/widgets/proxy_settings_dialog.dart
@@ -0,0 +1,109 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:apidash_core/models/models.dart';
+import 'package:apidash/providers/settings_providers.dart';
+
+class ProxySettingsDialog extends ConsumerStatefulWidget {
+  const ProxySettingsDialog({super.key});
+
+  @override
+  ConsumerState<ProxySettingsDialog> createState() =>
+      _ProxySettingsDialogState();
+}
+
+class _ProxySettingsDialogState extends ConsumerState<ProxySettingsDialog> {
+  late TextEditingController _hostController;
+  late TextEditingController _portController;
+  late TextEditingController _usernameController;
+  late TextEditingController _passwordController;
+
+  @override
+  void initState() {
+    super.initState();
+    final settings = ref.read(settingsProvider);
+    final proxy = settings.proxySettings;
+    _hostController = TextEditingController(text: proxy?.host ?? '');
+    _portController = TextEditingController(text: proxy?.port ?? '');
+    _usernameController = TextEditingController(text: proxy?.username ?? '');
+    _passwordController = TextEditingController(text: proxy?.password ?? '');
+  }
+
+  @override
+  void dispose() {
+    _hostController.dispose();
+    _portController.dispose();
+    _usernameController.dispose();
+    _passwordController.dispose();
+    super.dispose();
+  }
+
+  void _saveSettings() {
+    if (_hostController.text.isNotEmpty && _portController.text.isNotEmpty) {
+      final newProxy = ProxySettings(
+        host: _hostController.text,
+        port: _portController.text,
+        username: _usernameController.text.isEmpty ? null : _usernameController.text,
+        password: _passwordController.text.isEmpty ? null : _passwordController.text,
+      );
+      ref.read(settingsProvider.notifier).update(proxySettings: newProxy);
+      Navigator.of(context).pop();
+    }
+    else{
+      ref.read(settingsProvider.notifier).update(proxySettings: null);
+    }
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return AlertDialog(
+      title: const Text('Proxy Settings'),
+      content: SingleChildScrollView(
+        child: Column(
+          mainAxisSize: MainAxisSize.min,
+          children: [
+            TextField(
+              controller: _hostController,
+              decoration: const InputDecoration(
+                labelText: 'Proxy Host',
+                hintText: 'e.g., localhost',
+              ),
+            ),
+            const SizedBox(height: 8),
+            TextField(
+              controller: _portController,
+              decoration: const InputDecoration(
+                labelText: 'Proxy Port',
+                hintText: 'e.g., 8080',
+              ),
+            ),
+            const SizedBox(height: 8),
+            TextField(
+              controller: _usernameController,
+              decoration: const InputDecoration(
+                labelText: 'Username (Optional)',
+              ),
+            ),
+            const SizedBox(height: 8),
+            TextField(
+              controller: _passwordController,
+              decoration: const InputDecoration(
+                labelText: 'Password (Optional)',
+              ),
+              obscureText: true,
+            ),
+          ],
+        ),
+      ),
+      actions: [
+        TextButton(
+          onPressed: () => Navigator.of(context).pop(),
+          child: const Text('Cancel'),
+        ),
+        TextButton(
+          onPressed: _saveSettings,
+          child: const Text('Save'),
+        ),
+      ],
+    );
+  }
+}
diff --git a/packages/apidash_core/lib/models/proxy_settings_model.dart b/packages/apidash_core/lib/models/proxy_settings_model.dart
@@ -1,5 +1,4 @@
 import 'package:freezed_annotation/freezed_annotation.dart';
-import 'package:json_annotation/json_annotation.dart';
 
 part 'proxy_settings_model.freezed.dart';
 part 'proxy_settings_model.g.dart';

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`import 'package:freezed_annotation/freezed_annotation.dart';`
`2`		`-import 'package:json_annotation/json_annotation.dart';`
`3`	`2`
`4`	`3`	`part 'proxy_settings_model.freezed.dart';`
`5`	`4`	`part 'proxy_settings_model.g.dart';`