Add option to follow current system theme & fix windows installer

Author: warreth

SETUP.md

@@ -28,13 +28,13 @@ cd OpenlibProject
 ### 2. Clone the Repository
 Use Git to clone the project into your newly created directory:
 ```bash
-git clone https://github.com/dstark5/Openlib.git
+git clone https://github.com/warreth/OpenlibExtended.git
 ```
 
 ### 3. Navigate to the Project Folder
-After cloning, move into the **Openlib** folder:
+After cloning, move into the **OpenlibExtended** folder:
 ```bash
-cd Openlib
+cd OpenlibExtended
 ```
 
 ### 4. Open the Project in Android Studio or VS Code
@@ -70,6 +70,28 @@ To run the app:
 
 ---
 
+## Linux Setup
+
+### Requirements
+To build and run on Linux, you need to install **WebKitGTK 4.1**. This is required for the internal browser window used for CAPTCHA verification and downloads.
+
+**Arch Linux / CachyOS:**
+```bash
+sudo pacman -S webkit2gtk-4.1
+```
+
+**Ubuntu / Debian:**
+```bash
+sudo apt install libwebkit2gtk-4.1-dev
+```
+
+**Fedora:**
+```bash
+sudo dnf install webkit2gtk4.1-devel
+```
+
+---
+
 ## Additional Resources and Troubleshooting
 If you encounter any issues, refer to the official [Flutter documentation](https://docs.flutter.dev/) for comprehensive troubleshooting and setup tips.
 

lib/main.dart

@@ -30,6 +30,7 @@ import 'package:openlib/services/download_notification.dart';
 import 'package:openlib/services/instance_manager.dart';
 import 'package:openlib/state/state.dart'
     show
+        ThemeModeNotifier,
         selectedIndexProvider,
         themeModeProvider,
         fontSizeScaleProvider,
@@ -64,8 +65,7 @@ void main(List<String> args) async {
 
   await DownloadManager().initialize();
 
-  bool isDarkMode =
-      await dataBase.getPreference('darkMode') == 0 ? false : true;
+  ThemeMode startThemeMode = await ThemeModeNotifier.getInitialTheme();
 
   double fontSizeScale = 1.0;
   try {
@@ -139,17 +139,15 @@ void main(List<String> args) async {
 
   if (Platform.isAndroid) {
     // Android-specific setup for system UI overlay colors
-    SystemChrome.setSystemUIOverlayStyle(SystemUiOverlayStyle(
-        systemNavigationBarColor:
-            isDarkMode ? Colors.black : Colors.grey.shade200));
+    ThemeModeNotifier.updateSystemUi(startThemeMode);
     await moveFilesToAndroidInternalStorage();
   }
 
   runApp(
     ProviderScope(
       overrides: [
-        themeModeProvider.overrideWith(
-            (ref) => isDarkMode ? ThemeMode.dark : ThemeMode.light),
+        themeModeProvider
+            .overrideWith((ref) => ThemeModeNotifier(startThemeMode)),
         fontSizeScaleProvider.overrideWith((ref) => fontSizeScale),
         openPdfWithExternalAppProvider
             .overrideWith((ref) => openPdfwithExternalapp),

lib/services/database.dart

@@ -140,6 +140,8 @@ class MyLibraryDb {
             await getBookStorageDefaultDirectory;
         await db.execute(
             "INSERT OR IGNORE INTO preferences (name, value) VALUES ('darkMode', 0)");
+        await db.execute(
+            "INSERT OR IGNORE INTO preferences (name, value) VALUES ('themeMode', 'system')");
         await db.execute(
             "INSERT OR IGNORE INTO preferences (name, value) VALUES ('openPdfwithExternalApp', 0)");
         await db.execute(

lib/state/state.dart

@@ -1,8 +1,11 @@
 // Dart imports:
 import 'dart:math';
+import 'dart:io';
+import 'dart:ui' as ui;
 
 // Flutter imports:
 import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
 
 // Package imports:
 import 'package:dio/dio.dart';
@@ -161,9 +164,65 @@ class FileName {
 // UI AND SIMPLE STATE PROVIDERS
 // ====================================================================
 
+class ThemeModeNotifier extends StateNotifier<ThemeMode> {
+  ThemeModeNotifier(super.state);
+
+  Future<void> setTheme(ThemeMode mode) async {
+    state = mode;
+
+    // Save to DB
+    String pref = 'system';
+    if (mode == ThemeMode.light) pref = 'light';
+    if (mode == ThemeMode.dark) pref = 'dark';
+    await MyLibraryDb.instance.savePreference('themeMode', pref);
+
+    updateSystemUi(mode);
+  }
+
+  static void updateSystemUi(ThemeMode mode) {
+    if (Platform.isAndroid) {
+      bool isDark = mode == ThemeMode.dark;
+      if (mode == ThemeMode.system) {
+        isDark = ui.PlatformDispatcher.instance.platformBrightness ==
+            Brightness.dark;
+      }
+      SystemChrome.setSystemUIOverlayStyle(SystemUiOverlayStyle(
+          systemNavigationBarColor:
+              isDark ? Colors.black : Colors.grey.shade200));
+    }
+  }
+
+  static Future<ThemeMode> getInitialTheme() async {
+    try {
+      MyLibraryDb dataBase = MyLibraryDb.instance;
+      // Check for new theme mode preference
+      var themePref =
+          await dataBase.getPreference('themeMode').catchError((e) => null);
+      if (themePref != null && themePref is String) {
+        if (themePref == 'light') return ThemeMode.light;
+        if (themePref == 'dark') return ThemeMode.dark;
+        return ThemeMode.system;
+      } else {
+        // Fallback to legacy darkMode preference
+        var legacyDark =
+            await dataBase.getPreference('darkMode').catchError((e) => null);
+        if (legacyDark != null) {
+          return (legacyDark == 0) ? ThemeMode.light : ThemeMode.dark;
+        }
+      }
+    } catch (e) {
+      // Ignore
+    }
+    return ThemeMode.system;
+  }
+}
+
 final selectedIndexProvider = StateProvider<int>((ref) => 0);
 final homePageSelectedIndexProvider = StateProvider<int>((ref) => 0);
-final themeModeProvider = StateProvider<ThemeMode>((ref) => ThemeMode.light);
+final themeModeProvider =
+    StateNotifierProvider<ThemeModeNotifier, ThemeMode>((ref) {
+  return ThemeModeNotifier(ThemeMode.light);
+});
 final fontSizeScaleProvider = StateProvider<double>((ref) => 1.0);
 
 // Search Filter States

lib/ui/onboarding/onboarding_page.dart

@@ -457,18 +457,19 @@ class _OnboardingPageState extends ConsumerState<OnboardingPage> {
                   icon: Icons.light_mode,
                   selected: mode == ThemeMode.light,
                   onTap: () {
-                    ref.read(themeModeProvider.notifier).state =
-                        ThemeMode.light;
-                    MyLibraryDb.instance.savePreference('darkMode', 0);
+                    ref
+                        .read(themeModeProvider.notifier)
+                        .setTheme(ThemeMode.light);
                   }),
               const SizedBox(width: 20),
               _ThemeCard(
                   title: "Dark",
                   icon: Icons.dark_mode,
                   selected: mode == ThemeMode.dark,
                   onTap: () {
-                    ref.read(themeModeProvider.notifier).state = ThemeMode.dark;
-                    MyLibraryDb.instance.savePreference('darkMode', 1);
+                    ref
+                        .read(themeModeProvider.notifier)
+                        .setTheme(ThemeMode.dark);
                   }),
             ],
           ),

lib/ui/settings_page.dart

@@ -163,20 +163,34 @@ class SettingsPage extends ConsumerWidget {
             const _AutoRankInstancesWidget(),
             const SizedBox(height: 20),
             _buildSectionHeader(context, "Appearance"),
-            _buildSwitchTile(
+            _buildSettingCard(
               context,
-              title: "Dark Mode",
-              value: themeMode == ThemeMode.dark,
-              onChanged: (val) {
-                ref.read(themeModeProvider.notifier).state =
-                    val ? ThemeMode.dark : ThemeMode.light;
-                dataBase.savePreference('darkMode', val);
-                if (Platform.isAndroid) {
-                  SystemChrome.setSystemUIOverlayStyle(SystemUiOverlayStyle(
-                      systemNavigationBarColor:
-                          val ? Colors.black : Colors.grey.shade200));
-                }
-              },
+              title: "Theme",
+              child: Padding(
+                padding:
+                    const EdgeInsets.symmetric(horizontal: 16.0, vertical: 8.0),
+                child: DropdownButtonFormField<ThemeMode>(
+                  value: themeMode,
+                  decoration: const InputDecoration(
+                    border: InputBorder.none,
+                    contentPadding: EdgeInsets.zero,
+                  ),
+                  items: const [
+                    DropdownMenuItem(
+                        value: ThemeMode.system,
+                        child: Text("Follow the System")),
+                    DropdownMenuItem(
+                        value: ThemeMode.light, child: Text("Light theme")),
+                    DropdownMenuItem(
+                        value: ThemeMode.dark, child: Text("Dark theme")),
+                  ],
+                  onChanged: (ThemeMode? val) {
+                    if (val != null) {
+                      ref.read(themeModeProvider.notifier).setTheme(val);
+                    }
+                  },
+                ),
+              ),
             ),
             _buildSettingCard(
               context,

linux/CMakeLists.txt

@@ -4,7 +4,7 @@ project(runner LANGUAGES CXX)
 
 # The name of the executable created for the application. Change this to change
 # the on-disk name of your application.
-set(BINARY_NAME "OpenlibExtended")
+set(BINARY_NAME "OpenLibExtended")
 # The unique GTK application identifier for this application. See:
 # https://wiki.gnome.org/HowDoI/ChooseApplicationID
 set(APPLICATION_ID "dev.wath.openlibextended")
@@ -100,6 +100,12 @@ if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
   set(CMAKE_INSTALL_PREFIX "${BUILD_BUNDLE_DIR}" CACHE PATH "..." FORCE)
 endif()
 
+# If the install prefix is /usr/local, it's likely the default from a previous run
+# or system setting, but we want to install to the local bundle directory.
+if(CMAKE_INSTALL_PREFIX STREQUAL "/usr/local")
+  set(CMAKE_INSTALL_PREFIX "${BUILD_BUNDLE_DIR}" CACHE PATH "..." FORCE)
+endif()
+
 # Start with a clean build bundle directory every time.
 install(CODE "
   file(REMOVE_RECURSE \"${BUILD_BUNDLE_DIR}/\")