Add settings page and proxy configuration

lib/config.dart

@@ -2,6 +2,12 @@
 //
 // SPDX-License-Identifier: Apache-2.0
 
+import 'package:fluent_ui/fluent_ui.dart';
+import 'package:inference/utils.dart';
+import 'dart:convert';
+import 'dart:io';
+import 'package:path_provider/path_provider.dart';
+
 enum HintsEnum { intelCoreLLMPerformanceSuggestion }
 
 class Hints {
@@ -12,7 +18,54 @@
 }
 
 class Config {
-  static bool geti = false;
   static Hints hints = Hints();
-  static bool proxyDirect = false;
-}
+  static String _proxy = '';
+  static bool _proxyEnabled = false;
+  static ThemeMode _mode = ThemeMode.system;
+
+  static String get proxy => _proxy;
+  static set proxy(String value) {
+    _proxy = value;
+    _save('proxy', value);
+  }
+
+  static bool get proxyEnabled => _proxyEnabled;
+  static set proxyEnabled(bool value) {
+    _proxyEnabled = value;
+    _save('proxyEnabled', value);
+  }
+
+  static ThemeMode get themeMode => _mode;
+  static set themeMode(ThemeMode value) {
+    _mode = value;
+    _save('mode', value.index);
+  }
+
+  static Future<void> loadFromFile() async {
+    final directory = await getApplicationSupportDirectory();
+    final file = File('${directory.path}/config.json');
+    if (await file.exists()) {
+      final contents = await file.readAsString();
+      final json = jsonDecode(contents);
+      _proxyEnabled = json['proxyEnabled'] ?? false;
+      if (json['proxy'] is String && json['proxy'].isNotEmpty) {
+        _proxy = json['proxy'];
+      } else if (_proxyEnabled) {
+        _proxy = await getProxy();
+      }
+      _mode = ThemeMode.values[json['mode'] ?? 0];
+    }
+  }
+
+  static Future<void> _save(String key, dynamic value) async {
+    final directory = await getApplicationSupportDirectory();
+    final file = File('${directory.path}/config.json');
+    Map<String, dynamic> json = {};
+    if (await file.exists()) {
+      final contents = await file.readAsString();
+      json = jsonDecode(contents);
+    }
+    json[key] = value;
+    await file.writeAsString(jsonEncode(json));
+  }
+}

lib/main.dart

@@ -3,37 +3,22 @@
 // SPDX-License-Identifier: Apache-2.0
 import 'dart:io';
 
-import 'package:dio/dio.dart';
 import 'package:fluent_ui/fluent_ui.dart';
 import 'package:inference/config.dart';
 import 'package:inference/router.dart';
 import 'package:inference/theme_fluent.dart';
 import 'package:inference/providers/preference_provider.dart';
 import 'package:inference/providers/project_provider.dart';
-import 'package:inference/public_models.dart';
 import 'package:provider/provider.dart';
 import 'package:window_manager/window_manager.dart';
 
 const String title = 'OpenVINO TestDrive';
 
-void testConnection() async {
-  final dio = Dio(BaseOptions(connectTimeout: const Duration(seconds: 10)));
-
-  try {
-    await dio.get(collections[0].path);
-  } on DioException catch(ex) {
-    if (ex.type == DioExceptionType.connectionError) {
-      // Perhaps proxy issue, disable proxy in future requests.
-      Config.proxyDirect = true;
-    }
-  }
-}
 
 void main() async {
   WidgetsFlutterBinding.ensureInitialized();
-  testConnection();
   await windowManager.ensureInitialized();
-
+  await Config.loadFromFile();
   WindowOptions windowOptions = WindowOptions(
     size: const Size(1400, 1024),
     center: true,

lib/openvino_console_app.dart

@@ -9,7 +9,6 @@ import 'package:inference/interop/device.dart';
 import 'package:inference/interop/image_inference.dart';
 import 'package:inference/providers/preference_provider.dart';
 import 'package:inference/providers/project_provider.dart';
-import 'package:inference/theme_fluent.dart';
 import 'package:inference/utils.dart';
 import 'package:inference/widgets/feedback_button.dart';
 import 'package:provider/provider.dart';
@@ -97,35 +96,33 @@ class _OpenVINOTestDriveAppState extends State<OpenVINOTestDriveApp> {
 
   late final List<NavigationPaneItem> footerNavigationItems = [
     PaneItem(
-      title: const Text('Dark mode'),
-      icon: Builder(builder: (context) {
-        final appTheme = context.watch<AppTheme>();
-        if (appTheme.mode == ThemeMode.dark) {
-          return const Icon(FluentIcons.clear_night);
-        } else if (appTheme.mode == ThemeMode.light) {
-          return const Icon(FluentIcons.brightness);
-        } else {
-          return const Icon(FluentIcons.half_alpha);
-        }
-      }),
+      key: const ValueKey('/settings'),
+      title: const Text('Settings'),
+      icon: const Icon(FluentIcons.settings),
       body: const SizedBox.shrink(),
       onTap: () {
-        final appTheme = context.read<AppTheme>();
-        appTheme.toggleTheme();
+        if (GoRouterState.of(context).uri.toString() != '/settings') {
+          GoRouter.of(context).go('/settings');
+        }
       },
     ),
   ];
 
   int? _calculateSelectedIndex(BuildContext context) {
     final uri = GoRouterState.of(context).uri.toString();
-    int? index = originalNavigationItems
+    int? indexOriginal = originalNavigationItems
       .indexWhere((item) {
         return uri.startsWith((item.key as ValueKey).value);
     });
-    if (index == -1) {
-      index = null;
+    if (indexOriginal == -1) {
+      int indexFooter = footerNavigationItems
+        .indexWhere((element) => element.key == Key(uri));
+      if (indexFooter == -1) {
+        return 0;
+      }
+      return originalNavigationItems.length + indexFooter;
     }
-    return index;
+    return indexOriginal;
   }
 
   void toggleMaximize() {

lib/pages/download_model/download_model.dart

@@ -100,6 +100,7 @@ class _DownloadModelPageState extends State<DownloadModelPage> {
   }
 
   Future<void> onClose() async {
+    final router = GoRouter.of(context);
     final result = await showDialog<bool>(context: context, builder: (BuildContext context) => ContentDialog(
         title: const Text("Download in progress"),
         content: const Text("Press 'continue' to keep downloading the model"),
@@ -117,7 +118,7 @@ class _DownloadModelPageState extends State<DownloadModelPage> {
     );
 
     if (result == true && context.mounted) {
-      GoRouter.of(context).pop();
+      router.pop();
     }
   }
 

lib/pages/settings/settings.dart

@@ -0,0 +1,154 @@
+// Copyright (c) 2024 Intel Corporation
+//
+// SPDX-License-Identifier: Apache-2.0
+
+import 'package:fluent_ui/fluent_ui.dart';
+import 'package:inference/config.dart';
+import 'package:inference/theme_fluent.dart';
+import 'package:inference/utils.dart';
+import 'package:provider/provider.dart';
+
+class SettingsPage extends StatefulWidget {
+  const SettingsPage({super.key});
+
+  @override
+  _SettingsPageState createState() => _SettingsPageState();
+}
+
+class _SettingsPageState extends State<SettingsPage> {
+  late TextEditingController _proxyController;
+
+  @override
+  void initState() {
+    super.initState();
+    _proxyController = TextEditingController(text: Config.proxy);
+  }
+
+  @override
+  void dispose() {
+    _proxyController.dispose();
+    super.dispose();
+  }
+
+  Widget buildSettingSection({
+    required String title,
+    required String description,
+    required Widget child,
+    bool isWide = false,
+  }) {
+    return isWide
+        ? Row(
+            mainAxisAlignment: MainAxisAlignment.spaceBetween,
+            crossAxisAlignment: CrossAxisAlignment.start,
+            children: [
+              Expanded(
+                child: Column(
+                  crossAxisAlignment: CrossAxisAlignment.start,
+                  children: [
+                    Text(title, style: const TextStyle(fontWeight: FontWeight.bold)),
+                    const SizedBox(height: 12),
+                    Text(
+                      description,
+                      style: TextStyle(color: subtleTextColor.of(FluentTheme.of(context)), fontSize: 12),
+                      overflow: TextOverflow.visible,
+                    ),
+                  ],
+                ),
+              ),
+              child,
+            ],
+          )
+        : Column(
+            crossAxisAlignment: CrossAxisAlignment.start,
+            children: [
+              Text(title, style: const TextStyle(fontWeight: FontWeight.bold)),
+              const SizedBox(height: 12),
+              Text(
+                description,
+                style: TextStyle(color: subtleTextColor.of(FluentTheme.of(context)), fontSize: 12),
+                overflow: TextOverflow.visible,
+              ),
+              const SizedBox(height: 8),
+              child,
+            ],
+          );
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final theme = Provider.of<AppTheme>(context);
+    return ScaffoldPage(
+      header: const PageHeader(title: Text('Settings')),
+      content: LayoutBuilder(
+        builder: (context, constraints) {
+          final isWide = constraints.maxWidth > 589;
+          return Padding(
+            padding: EdgeInsets.symmetric(horizontal: isWide ? 32 : 12),
+            child: Column(
+              crossAxisAlignment: CrossAxisAlignment.start,
+              children: [
+                buildSettingSection(
+                  title: 'Appearance',
+                  description: 'Select the color theme for the application.',
+                  child: ComboBox<ThemeMode>(
+                    value: theme.mode,
+                    items: ThemeMode.values.map((mode) {
+                      return ComboBoxItem<ThemeMode>(
+                        value: mode,
+                        child: Text(mode.toString().split('.').last.capitalize()),
+                      );
+                    }).toList(),
+                    onChanged: (mode) {
+                      if (mode != null) {
+                        setState(() {
+                          theme.mode = mode;
+                        });
+                      }
+                    },
+                  ),
+                  isWide: isWide,
+                ),
+                const Padding(
+                  padding: EdgeInsets.symmetric(vertical: 20),
+                  child: Divider(),
+                ),
+                buildSettingSection(
+                  title: 'HTTPS Proxy',
+                  description: 'Configure the proxy settings for network connections. Leave empty to auto-configure.',
+                  child: Column(
+                    crossAxisAlignment: isWide ? CrossAxisAlignment.end : CrossAxisAlignment.start,
+                    children: [
+                      const SizedBox(height: 8),
+                      ToggleSwitch(
+                        checked: Config.proxyEnabled,
+                        onChanged: (value) {
+                          setState(() {
+                            Config.proxyEnabled = value;
+                          });
+                        },
+                      ),
+                      const SizedBox(height: 8),
+                      ConstrainedBox(
+                        constraints: BoxConstraints(maxWidth: isWide ? 300 : double.infinity),
+                        child: TextBox(
+                          controller: _proxyController,
+                          placeholder: '<username>:<password>@<proxy>:<port>',
+                          onChanged: (value) {
+                            Config.proxy = value;
+                          },
+                        ),
+                      ),
+                    ],
+                  ),
+                  isWide: isWide,
+                ),
+                const SizedBox(height: 4),
+              ],
+            ),
+          );
+        },
+      ),
+    );
+  }
+}
+

lib/router.dart

@@ -12,6 +12,7 @@ import 'package:inference/pages/import/import.dart';
 import 'package:inference/pages/models/models.dart';
 import 'package:inference/project.dart';
 import 'package:inference/pages/models/inference.dart';
+import 'package:inference/pages/settings/settings.dart';
 
 final rootNavigatorKey = GlobalKey<NavigatorState>();
 final _shellNavigatorKey = GlobalKey<NavigatorState>();
@@ -26,6 +27,7 @@ final router = GoRouter(navigatorKey: rootNavigatorKey,
       ),
       routes: [
         GoRoute(path: '/home', builder: (context, state) => const HomePage()),
+        GoRoute(path: '/settings', builder: (context, state) => const SettingsPage()),
         GoRoute(path: '/models', builder: (context, state) => const ModelsPage()),
         GoRoute(path: '/models/import', builder: (context, state) => const ImportPage()),
         GoRoute(path: '/models/download', builder: (context, state) => DownloadPage(project: state.extra as PublicProject)),