build: bump version to v0.0.41

* refactor: separate language selection to own widget.

* feat: separate theme changer to own widget.

* refactor: move Appearance UI to separate class.

* refactor: move language selection UI to separate class.

* refactor: move sources selection to separate file.

* refactor: move sources selection to separate file.

* refactor: split settings sections in separate files.

* refactor: move logging section to separate file.

* fix: show toast on bottom.

* fix: recommended patches not being selected by default.

* fix: patch selection selecting non recommended patches.

* fix: experimental toggle not updating.

.github/workflows/debug-build.yml

@@ -19,6 +19,10 @@ jobs:
       - uses: subosito/flutter-action@v1
         with:
           channel: 'stable'
+      - name: Set environment variables
+        run: echo $SECRETS | base64 -d > lib/utils/environment.dart
+        env:
+          SECRETS: ${{ secrets.SECRETS }}
       - name: Set up Flutter
         run: flutter pub get
       - name: Generate files with Builder

.github/workflows/release-build.yml

@@ -19,6 +19,10 @@ jobs:
       - uses: subosito/flutter-action@v1
         with:
           channel: 'stable'
+      - name: Set environment variables
+        run: echo $SECRETS | base64 -d > lib/utils/environment.dart
+        env:
+          SECRETS: ${{ secrets.SECRETS }}
       - name: Set up Flutter
         run: flutter pub get
       - name: Generate files with Builder

.gitignore

@@ -135,4 +135,4 @@ app.*.map.json
 !/dev/ci/**/Gemfile.lock
 
 Firebase related
-.firebase
+.firebase

README.md

@@ -20,6 +20,11 @@ For suggestions and bug reports, open an issue [here](https://github.com/revance
 If you wish to discuss the Manager, a thread has been made under the [#development](https://discord.com/channels/952946952348270622/1002922226443632761) channel in the Discord server, please note that this thread may be temporary and may be removed in the future.
 
 
+## 🌐 Translation
+[![Crowdin](https://badges.crowdin.net/revanced/localized.svg)](https://crowdin.com/project/revanced)
+
+If you wish to translate ReVanced Manager, we're accepting translations on [Crowdin](https://translate.revanced.app)
+
 ## 🛠️ Building Manager from source
 1. Setup flutter environment for your [platform](https://docs.flutter.dev/get-started/install)
 2. Clone the repository locally

android/app/src/main/kotlin/app/revanced/manager/flutter/MainActivity.kt

@@ -308,13 +308,6 @@ class MainActivity : FlutterActivity() {
             }
         }
 
-        override fun trace(msg: String) {
+        override fun trace(_msg: String) { /* unused */ }
-            handler.post {
-                installerChannel.invokeMethod(
-                    "update",
-                    mapOf("progress" to -1.0, "header" to "", "log" to msg)
-                )
-            }
-        }
     }
 }

assets/i18n/en_US.json

@@ -5,6 +5,7 @@
     "disabledLabel": "Disabled",
     "yesButton": "Yes",
     "noButton": "No",
+    "warning": "Warning",
     "navigationView": {
         "dashboardTab": "Dashboard",
         "patcherTab": "Patcher",
@@ -45,7 +46,6 @@
     "patcherView": {
         "widgetTitle": "Patcher",
         "patchButton": "Patch",
-        "patchDialogTitle": "Warning",
         "patchDialogText": "You have selected a resource patch and a split APK installation has been detected, so patching errors may occur.\nAre you sure you want to proceed?"
     },
     "appSelectorCard": {
@@ -77,15 +77,15 @@
         "viewTitle": "Select patches",
         "searchBarHint": "Search patches",
         "doneButton": "Done",
+        "recommended": "Recommended",
+        "all" : "All",
+        "none" : "None",
         "loadPatchesSelection": "Load patches selection",
         "noSavedPatches": "No saved patches for the selected app\nPress Done to save current selection",
         "noPatchesFound": "No patches found for the selected app",
-        "selectAllPatchesWarningTitle": "Warning",
         "selectAllPatchesWarningContent": "You are about to select all patches, that includes unrecommended patches and can cause unwanted behavior."
     },
     "patchItem": {
-        "unsupportedWarningButton": "Warning",
-        "unsupportedDialogTitle": "Warning",
         "unsupportedDialogText": "Selecting this patch may result in patching errors.\n\nApp version: {packageVersion}\nSupported versions:\n{supportedVersions}",
         "unsupportedPatchVersion": "Patch is not supported for this app version. Enable experimental toggle in settings to proceed."
     },
@@ -119,7 +119,6 @@
         "dynamicThemeHint": "Enjoy an experience closer to your device",
         "languageLabel": "Language",
         "englishOption": "English",
-        "frenchOption": "French",
         "sourcesLabel": "Sources",
         "sourcesLabelHint": "Configure your custom sources",
         "orgPatchesLabel": "Patches organization",

assets/i18n/hi_IN.json

@@ -0,0 +1,197 @@
+{
+    "okButton": "ठीक है",
+    "cancelButton": "रद्द करें",
+    "enabledLabel": "सक्रिय",
+    "disabledLabel": "निष्क्रिय",
+    "yesButton": "हाँ",
+    "noButton": "नहीं",
+    "navigationView": {
+        "dashboardTab": "नियंत्रण-पट्ट",
+        "patcherTab": "पैचर",
+        "settingsTab": "सेटिंग्स"
+    },
+    "homeView": {
+        "widgetTitle": "नियंत्रण पट्ट",
+        "updatesSubtitle": "अपडेट",
+        "patchedSubtitle": "Patched applications",
+        "updatesAvailable": "अपडेट उपलब्ध है",
+        "noUpdates": "कोई अपडेट उपलब्ध नहीं",
+        "WIP": "Work in progress...",
+        "noInstallations": "कोई पैबंद किये हुआ अनुप्रयोग नहीं है।",
+        "installed": "इंस्टॉल किया हुआ",
+        "updateDialogTitle": "अपडेट Manager",
+        "updateDialogText": "क्या आप ReVanced Manager को डाउनलोड और अपडेट करना चाहते है?",
+        "notificationTitle": "Update downloaded",
+        "notificationText": "Tap to install the update",
+        "downloadingMessage": "अपडेट डाउनलोड हो रहा है",
+        "installingMessage": "अपडेट इंस्टॉल हो रहा है",
+        "errorDownloadMessage": "अपडेट डाउनलोड करने मे असफल",
+        "errorInstallMessage": "अपडेट इंस्टॉल करने में असफल",
+        "noConnection": "कोई इंटरनेट कनेक्शन नहीं",
+        "updatesDisabled": "पैच किए गए ऐप को अपडेट करना वर्तमान में अक्षम है। ऐप को फिर से रीपैच करें।"
+    },
+    "applicationItem": {
+        "patchButton": "पैबंद",
+        "infoButton": "जानकारी",
+        "changelogLabel": "परिवर्तन पत्र"
+    },
+    "latestCommitCard": {
+        "loadingLabel": "लोड हो रहा है...",
+        "timeagoLabel": "{time} पहले",
+        "patcherLabel": "पैबंद: ",
+        "managerLabel": "Manager: ",
+        "updateButton": "Manager अपडेट करे"
+    },
+    "patcherView": {
+        "widgetTitle": "पैचर",
+        "patchButton": "पैबंद",
+        "patchDialogTitle": "चेतावनी",
+        "patchDialogText": "You have selected a resource patch and a split APK installation has been detected, so patching errors may occur.\nAre you sure you want to proceed?"
+    },
+    "appSelectorCard": {
+        "widgetTitle": "Select an application",
+        "widgetTitleSelected": "चुना हुआ ऐप्लकैशन",
+        "widgetSubtitle": "कोई ऐप्लकैशन चुना हुआ नहीं",
+        "noAppsLabel": "No applications found",
+        "currentVersion": "वर्तमान",
+        "recommendedVersion": "अनुशंसित",
+        "anyVersion": "कोई"
+    },
+    "patchSelectorCard": {
+        "widgetTitle": "पैच चुने",
+        "widgetTitleSelected": "चुने हुए पैच",
+        "widgetSubtitle": "पहले किसी एप्लिकेशन को चुने",
+        "widgetEmptySubtitle": "कोई पैच चुना हुआ नहीं"
+    },
+    "socialMediaCard": {
+        "widgetTitle": "सामाजिक",
+        "widgetSubtitle": "हम ऑनलाइन है"
+    },
+    "appSelectorView": {
+        "viewTitle": "Select an application",
+        "searchBarHint": "ऐप्लकैशन खोजे",
+        "storageButton": "स्टोरेज",
+        "errorMessage": "Unable to use selected application"
+    },
+    "patchesSelectorView": {
+        "viewTitle": "पैच चुने",
+        "searchBarHint": "पैच खोजे",
+        "doneButton": "पूर्ण",
+        "loadPatchesSelection": "Load patches selection",
+        "noSavedPatches": "No saved patches for the selected app\nPress Done to save current selection",
+        "noPatchesFound": "चुने हुए ऐप्लकैशन के लिए कोई पैच नहीं मिले",
+        "selectAllPatchesWarningTitle": "चेतावनी",
+        "selectAllPatchesWarningContent": "आप सभी पैच का चयन करने वाले हैं, जिसमें अनुशंसित पैच शामिल हैं और अवांछित व्यवहार का कारण बन सकते हैं।"
+    },
+    "patchItem": {
+        "unsupportedWarningButton": "चेतावनी",
+        "unsupportedDialogTitle": "चेतावनी",
+        "unsupportedDialogText": "Selecting this patch may result in patching errors.\n\nApp version: {packageVersion}\nSupported versions:\n{supportedVersions}",
+        "unsupportedPatchVersion": "इस ऐप संस्करण के लिए पैच समर्थित नहीं है। आगे बढ़ने के लिए सेटिंग में प्रयोगात्मक टॉगल सक्षम करें."
+    },
+    "installerView": {
+        "widgetTitle": "इंस्टॉल कर्ता",
+        "installButton": "इंस्टॉल करे",
+        "installRootButton": "रूट के रूप मे इंस्टॉल करे",
+        "openButton": "खोलें",
+        "shareButton": "फाइल शेयर करे",
+        "notificationTitle": "ReVanced Manager पैच कर रहा है",
+        "notificationText": "इंस्टॉल कर्ता पर जाने के लिए टैप करे",
+        "shareApkMenuOption": "APK शेयर करे",
+        "exportApkMenuOption": "निर्यात APK",
+        "shareLogMenuOption": "लॉग शेयर करें",
+        "installErrorDialogTitle": "त्रुटि",
+        "installErrorDialogText1": "वर्तमान पैच चयन के साथ रूट इंस्टॉल संभव नहीं है।\nअपने ऐप को रीपैच करें या नॉन-रूट इंस्टॉल चुनें।",
+        "installErrorDialogText2": "वर्तमान पैच चयन के साथ नॉन-रूट इंस्टॉल संभव नहीं है।\nयदि आपने अपना डिवाइस रूट किया है तो अपने ऐप को रीपैच करें या रूट इंस्टॉल चुनें।",
+        "installErrorDialogText3": "रूट इंस्टॉल संभव नहीं है क्योंकि मूल APK को स्टोरेज से चुना गया था।\nएक इंस्टॉल किया गया ऐप चुनें या नॉन-रूट इंस्टॉल चुनें।",
+        "noExit": "Installer is still running, cannot exit..."
+    },
+    "settingsView": {
+        "widgetTitle": "सेटिंग्स",
+        "appearanceSectionTitle": "स्वरूप",
+        "teamSectionTitle": "टीम",
+        "infoSectionTitle": "जानकारी",
+        "advancedSectionTitle": "एडवांसड",
+        "logsSectionTitle": "लॉग्स",
+        "darkThemeLabel": "Dark mode",
+        "darkThemeHint": "Welcome to the dark side",
+        "dynamicThemeLabel": "मेटीरियल यू",
+        "dynamicThemeHint": "अपने डिवाइस के करीब एक अनुभव का आनंद लें",
+        "languageLabel": "भाषा",
+        "englishOption": "अंग्रेज़ी",
+        "frenchOption": "फ्रेंच",
+        "sourcesLabel": "स्रोत",
+        "sourcesLabelHint": "अपने कस्टम साधन कॉन्फ़िगर करे",
+        "orgPatchesLabel": "Patches organization",
+        "sourcesPatchesLabel": "Patches source",
+        "orgIntegrationsLabel": "Integrations organization",
+        "sourcesIntegrationsLabel": "Integrations source",
+        "sourcesResetDialogTitle": "रीसेट करें",
+        "sourcesResetDialogText": "क्या आप वाकई कस्टम साधन को डिफ़ॉल्ट वैल्यू पर रीसेट करना चाहते हैं?",
+        "apiURLResetDialogText": "क्या आप वाकई कस्टम API URL को डिफ़ॉल्ट वैल्यू पर रीसेट करना चाहते हैं?",
+        "contributorsLabel": "योगदानकर्ता",
+        "contributorsHint": "ReVanced के योगदानकर्ताओ की सूची",
+        "logsLabel": "लॉग्स",
+        "logsHint": "Share Manager's logs",
+        "apiURLLabel": "API  URL",
+        "apiURLHint": "अपनी कस्टम API URL कॉन्फ़िगर करे",
+        "selectApiURL": "API URL",
+        "experimentalPatchesLabel": "Experimental patches support",
+        "experimentalPatchesHint": "Enable usage of unsupported patches in any app version",
+        "enabledExperimentalPatches": "Experimental patches support enabled",
+        "exportSectionTitle": "Import & export",
+        "aboutLabel": "विवरण",
+        "snackbarMessage": "क्लिपबोर्ड में कॉपी हो गया है",
+        "sentryLabel": "Sentry logging",
+        "sentryHint": "उन्नत प्रबंधक को बेहतर बनाने में हमारी सहायता करने के लिए अनाम लॉग भेजें",
+        "restartAppForChanges": "Restart the app to apply changes",
+        "deleteKeystoreLabel": "कीस्टोर मिटाएं",
+        "deleteKeystoreHint": "ऐप पर हस्ताक्षर करने के लिए उपयोग की जाने वाली कीस्टोर हटाएं",
+        "deletedKeystore": "कीस्टोर हटा दिया गया",
+        "deleteTempDirLabel": "Delete temporary files",
+        "deleteTempDirHint": "Delete the unused temporary files",
+        "deletedTempDir": "Temporary files deleted",
+        "exportPatchesLabel": "Export patches selection",
+        "exportPatchesHint": "Export patches selection to a JSON file",
+        "exportedPatches": "Patches selection exported",
+        "noExportFileFound": "No patches selection to export",
+        "importPatchesLabel": "Import patches selection",
+        "importPatchesHint": "Import patches selection from a JSON file",
+        "importedPatches": "Patches selection imported",
+        "resetStoredPatchesLabel": "Reset patches",
+        "resetStoredPatchesHint": "Reset the stored patches selection",
+        "resetStoredPatches": "Patches selection has been reset",
+        "jsonSelectorErrorMessage": "Unable to use selected JSON file",
+        "deleteLogsLabel": "लॉग हटाएं",
+        "deleteLogsHint": "एकत्रित प्रबंधक लॉग हटाएं",
+        "deletedLogs": "लॉग हटा दिए गए"
+    },
+    "appInfoView": {
+        "widgetTitle": "App info",
+        "openButton": "खोलें",
+        "uninstallButton": "अनइंस्टॉल करें",
+        "patchButton": "पैच",
+        "unpatchButton": "अनपैच करे",
+        "unpatchDialogText": "क्या वाकई आप इस एप को अनपैच करना चाहते हैं?",
+        "rootDialogTitle": "त्रुटि",
+        "rootDialogText": "App was installed with superuser permissions, but currently ReVanced Manager has no permissions.\nPlease grant superuser permissions first.",
+        "packageNameLabel": "Package name",
+        "originalPackageNameLabel": "Original package name",
+        "installTypeLabel": "Installation type",
+        "rootTypeLabel": "रूट",
+        "nonRootTypeLabel": "नॉन-रूट",
+        "patchedDateLabel": "Patched date",
+        "patchedDateHint": "{date} {time} पर",
+        "appliedPatchesLabel": "Applied patches",
+        "appliedPatchesHint": "{quantity} लागू किए हुआ पैच",
+        "updateNotImplemented": "This feature has not been implemented yet"
+    },
+    "contributorsView": {
+        "widgetTitle": "योगदानकर्ता",
+        "patcherContributors": "Patcher contributors",
+        "patchesContributors": "Patches contributors",
+        "integrationsContributors": "Integrations contributors",
+        "cliContributors": "CLI contributors",
+        "managerContributors": "Manager contributors"
+    }
+}

lib/app/app.dart

@@ -1,3 +1,4 @@
+import 'package:revanced_manager/services/crowdin_api.dart';
 import 'package:revanced_manager/services/github_api.dart';
 import 'package:revanced_manager/services/manager_api.dart';
 import 'package:revanced_manager/services/patcher_api.dart';
@@ -37,6 +38,7 @@ import 'package:stacked_services/stacked_services.dart';
     LazySingleton(classType: PatcherAPI),
     LazySingleton(classType: RevancedAPI),
     LazySingleton(classType: GithubAPI),
+    LazySingleton(classType: CrowdinAPI),
     LazySingleton(classType: Toast),
   ],
 )

lib/main.dart

@@ -2,16 +2,20 @@ import 'package:flutter/material.dart';
 import 'package:flutter_i18n/flutter_i18n.dart';
 import 'package:flutter_localizations/flutter_localizations.dart';
 import 'package:revanced_manager/app/app.locator.dart';
+import 'package:revanced_manager/services/crowdin_api.dart';
 import 'package:revanced_manager/services/github_api.dart';
 import 'package:revanced_manager/services/manager_api.dart';
 import 'package:revanced_manager/services/patcher_api.dart';
 import 'package:revanced_manager/services/revanced_api.dart';
 import 'package:revanced_manager/ui/theme/dynamic_theme_builder.dart';
 import 'package:revanced_manager/ui/views/navigation/navigation_view.dart';
+import 'package:revanced_manager/utils/environment.dart';
+import 'package:shared_preferences/shared_preferences.dart';
 import 'package:stacked_themes/stacked_themes.dart';
 import 'package:sentry_flutter/sentry_flutter.dart';
 import 'package:timezone/data/latest.dart' as tz;
 
+late SharedPreferences prefs;
 Future main() async {
   await ThemeManager.initialise();
   await setupLocator();
@@ -19,34 +23,35 @@ Future main() async {
   await locator<ManagerAPI>().initialize();
   String apiUrl = locator<ManagerAPI>().getApiUrl();
   await locator<RevancedAPI>().initialize(apiUrl);
-  // bool isSentryEnabled = locator<ManagerAPI>().isSentryEnabled();
+  await locator<CrowdinAPI>().initialize();
+  bool isSentryEnabled = locator<ManagerAPI>().isSentryEnabled();
   locator<GithubAPI>().initialize();
   await locator<PatcherAPI>().initialize();
   tz.initializeTimeZones();
+  prefs = await SharedPreferences.getInstance();
 
-  // Remove this section if you are building from source and don't have sentry configured
+  await SentryFlutter.init(
-  // await SentryFlutter.init(
+    (options) {
-  //   (options) {
+      options
-  //     options
+        ..dsn = isSentryEnabled ? Environment.sentryDSN : ''
-  //       ..dsn = isSentryEnabled ? '' : ''
+        ..environment = 'alpha'
-  //       ..environment = 'alpha'
+        ..release = '0.1'
-  //       ..release = '0.1'
+        ..tracesSampleRate = 1.0
-  //       ..tracesSampleRate = 1.0
+        ..anrEnabled = true
-  //       ..anrEnabled = true
+        ..enableOutOfMemoryTracking = true
-  //       ..enableOutOfMemoryTracking = true
+        ..sampleRate = isSentryEnabled ? 1.0 : 0.0
-  //       ..sampleRate = isSentryEnabled ? 1.0 : 0.0
+        ..beforeSend = (event, hint) {
-  //       ..beforeSend = (event, hint) {
+          if (isSentryEnabled) {
-  //         if (isSentryEnabled) {
+            return event;
-  //           return event;
+          } else {
-  //         } else {
+            return null;
-  //           return null;
+          }
-  //         }
+        } as BeforeSendCallback?;
-  //       } as BeforeSendCallback?;
+    },
-  //   },
+    appRunner: () {
-  //   appRunner: () {
+      runApp(const MyApp());
-  //     runApp(const MyApp());
+    },
-  //   },
+  );
-  // );
   runApp(const MyApp());
 }
 
@@ -55,15 +60,25 @@ class MyApp extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
+    String rawLocale = prefs.getString('language') ?? 'en_US';
+    String replaceLocale = rawLocale.replaceAll('_', '-');
+    List<String> localeList = replaceLocale.split('-');
+    Locale locale = Locale(localeList[0], localeList[1]);
+
     return DynamicThemeBuilder(
       title: 'ReVanced Manager',
       home: const NavigationView(),
       localizationsDelegates: [
         FlutterI18nDelegate(
           translationLoader: FileTranslationLoader(
-            fallbackFile: 'en_US',
+            forcedLocale: locale,
             basePath: 'assets/i18n',
+            useCountryCode: true,
           ),
+          missingTranslationHandler: (key, locale) {
+            print(
+                '--> Missing translation: key: $key, languageCode: ${locale?.languageCode}');
+          },
         ),
         GlobalMaterialLocalizations.delegate,
         GlobalWidgetsLocalizations.delegate

lib/services/crowdin_api.dart

@@ -0,0 +1,61 @@
+import 'package:dio/dio.dart';
+import 'package:dio_http_cache_lts/dio_http_cache_lts.dart';
+import 'package:injectable/injectable.dart' hide Environment;
+import 'package:revanced_manager/utils/environment.dart';
+import 'package:sentry_dio/sentry_dio.dart';
+import 'package:sentry_flutter/sentry_flutter.dart';
+
+@lazySingleton
+class CrowdinAPI {
+  late Dio _dio = Dio();
+  final DioCacheManager _dioCacheManager = DioCacheManager(CacheConfig());
+  final apiKey = Environment.crowdinKEY;
+
+  Future<void> initialize() async {
+    try {
+      _dio = Dio(BaseOptions(
+        baseUrl: 'https://api.crowdin.com/api/v2',
+      ));
+
+      _dio.interceptors.add(_dioCacheManager.interceptor);
+      _dio.addSentry(
+        captureFailedRequests: true,
+      );
+    } on Exception catch (e, s) {
+      await Sentry.captureException(e, stackTrace: s);
+    }
+  }
+
+  Future<void> clearAllCache() async {
+    try {
+      await _dioCacheManager.clearAll();
+    } on Exception catch (e, s) {
+      await Sentry.captureException(e, stackTrace: s);
+    }
+  }
+
+  Future<List> getLanguages() async {
+    try {
+      var response = await _dio.get(
+        '/projects',
+        options: buildCacheOptions(
+          const Duration(hours: 6),
+          maxStale: const Duration(days: 1),
+          options: Options(
+            headers: {
+              'Authorization': 'Bearer $apiKey',
+            },
+            contentType: 'application/json',
+          ),
+        ),
+      );
+      List targetLanguages =
+          await response.data['data'][0]['data']['targetLanguages'];
+
+      return targetLanguages;
+    } on Exception catch (e, s) {
+      await Sentry.captureException(e, stackTrace: s);
+      return [];
+    }
+  }
+}

lib/services/github_api.dart

@@ -130,4 +130,18 @@ class GithubAPI {
     }
     return patches;
   }
+
+  Future<String> getLastestReleaseVersion(String repoName) async {
+    try {
+      Map<String, dynamic>? release = await _getLatestRelease(repoName);
+      if (release != null) {
+        return release['tag_name'];
+      } else {
+        return 'Unknown';
+      }
+    } on Exception catch (e, s) {
+      await Sentry.captureException(e, stackTrace: s);
+      return '';
+    }
+  }
 }

lib/services/manager_api.dart

@@ -86,13 +86,13 @@ class ManagerAPI {
     await _prefs.setBool('useDarkTheme', value);
   }
 
-  // bool isSentryEnabled() {
+  bool isSentryEnabled() {
-  //   return _prefs.getBool('sentryEnabled') ?? true;
+    return _prefs.getBool('sentryEnabled') ?? true;
-  // }
+  }
 
-  // Future<void> setSentryStatus(bool value) async {
+  Future<void> setSentryStatus(bool value) async {
-  //   await _prefs.setBool('sentryEnabled', value);
+    await _prefs.setBool('sentryEnabled', value);
-  // }
+  }
 
   bool areExperimentalPatchesEnabled() {
     return _prefs.getBool('experimentalPatchesEnabled') ?? false;

lib/ui/views/app_selector/app_selector_viewmodel.dart

@@ -49,8 +49,12 @@ class AppSelectorViewModel extends BaseViewModel {
         List<String> pathSplit = result.files.single.path!.split("/");
         pathSplit.removeLast();
         Directory filePickerCacheDir = Directory(pathSplit.join("/"));
-        Iterable<File> deletableFiles = (await filePickerCacheDir.list().toList()).whereType<File>();
+        Iterable<File> deletableFiles =
-        for (var file in deletableFiles) { if (file.path != apkFile.path && file.path.endsWith(".apk")) file.delete(); }
+            (await filePickerCacheDir.list().toList()).whereType<File>();
+        for (var file in deletableFiles) {
+          if (file.path != apkFile.path && file.path.endsWith(".apk"))
+            file.delete();
+        }
         ApplicationWithIcon? application = await DeviceApps.getAppFromStorage(
           apkFile.path,
           true,
@@ -72,7 +76,7 @@ class AppSelectorViewModel extends BaseViewModel {
       }
     } on Exception catch (e, s) {
       await Sentry.captureException(e, stackTrace: s);
-      _toast.show('appSelectorView.errorMessage');
+      _toast.showBottom('appSelectorView.errorMessage');
     }
   }
 

lib/ui/views/home/home_view.dart

@@ -67,7 +67,7 @@ class HomeView extends StatelessWidget {
                       const SizedBox(height: 8),
                       Row(
                         children: <Widget>[
-                          DashboardChip(
+                          CustomChip(
                             label: I18nText('homeView.installed'),
                             isSelected: !model.showUpdatableApps,
                             onSelected: (value) {
@@ -75,7 +75,7 @@ class HomeView extends StatelessWidget {
                             },
                           ),
                           const SizedBox(width: 10),
-                          DashboardChip(
+                          CustomChip(
                             label: I18nText('homeView.updatesAvailable'),
                             isSelected: model.showUpdatableApps,
                             onSelected: (value) {

lib/ui/views/home/home_viewmodel.dart

@@ -47,7 +47,7 @@ class HomeViewModel extends BaseViewModel {
         ?.requestPermission();
     bool isConnected = await Connectivity().checkConnection();
     if (!isConnected) {
-      _toast.show('homeView.noConnection');
+      _toast.showBottom('homeView.noConnection');
     }
     _getPatchedApps();
     _managerAPI.reAssessSavedApps().then((_) => _getPatchedApps());
@@ -105,7 +105,7 @@ class HomeViewModel extends BaseViewModel {
 
   Future<void> updateManager(BuildContext context) async {
     try {
-      _toast.show('homeView.downloadingMessage');
+      _toast.showBottom('homeView.downloadingMessage');
       File? managerApk = await _managerAPI.downloadManager();
       if (managerApk != null) {
         await flutterLocalNotificationsPlugin.zonedSchedule(
@@ -132,19 +132,19 @@ class HomeViewModel extends BaseViewModel {
           uiLocalNotificationDateInterpretation:
               UILocalNotificationDateInterpretation.absoluteTime,
         );
-        _toast.show('homeView.installingMessage');
+        _toast.showBottom('homeView.installingMessage');
         await AppInstaller.installApk(managerApk.path);
       } else {
-        _toast.show('homeView.errorDownloadMessage');
+        _toast.showBottom('homeView.errorDownloadMessage');
       }
     } on Exception catch (e, s) {
       await Sentry.captureException(e, stackTrace: s);
-      _toast.show('homeView.errorInstallMessage');
+      _toast.showBottom('homeView.errorInstallMessage');
     }
   }
 
   void updatesAreDisabled() {
-    _toast.show('homeView.updatesDisabled');
+    _toast.showBottom('homeView.updatesDisabled');
   }
 
   Future<void> showUpdateConfirmationDialog(BuildContext parentContext) async {

lib/ui/views/installer/installer_viewmodel.dart

@@ -268,7 +268,7 @@ class InstallerViewModel extends BaseViewModel {
 
   Future<bool> onWillPop(BuildContext context) async {
     if (isPatching) {
-      _toast.show('installerView.noExit');
+      _toast.showBottom('installerView.noExit');
       return false;
     }
     cleanPatcher();

lib/ui/views/patcher/patcher_viewmodel.dart

@@ -58,7 +58,7 @@ class PatcherViewModel extends BaseViewModel {
       return showDialog(
         context: context,
         builder: (context) => AlertDialog(
-          title: I18nText('patcherView.patchDialogTitle'),
+          title: I18nText('warning'),
           backgroundColor: Theme.of(context).colorScheme.secondaryContainer,
           content: I18nText('patcherView.patchDialogText'),
           actions: <Widget>[
@@ -114,7 +114,8 @@ class PatcherViewModel extends BaseViewModel {
         await _managerAPI.getSelectedPatches(selectedApp!.originalPackageName);
     List<Patch> patches =
         await _patcherAPI.getFilteredPatches(selectedApp!.originalPackageName);
-    this.selectedPatches
+    this
+        .selectedPatches
         .addAll(patches.where((patch) => selectedPatches.contains(patch.name)));
     notifyListeners();
   }

lib/ui/views/patches_selector/patches_selector_view.dart

@@ -2,6 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter_i18n/flutter_i18n.dart';
 import 'package:revanced_manager/ui/views/patches_selector/patches_selector_viewmodel.dart';
 import 'package:revanced_manager/ui/widgets/patchesSelectorView/patch_item.dart';
+import 'package:revanced_manager/ui/widgets/shared/custom_chip.dart';
 import 'package:revanced_manager/ui/widgets/shared/custom_popup_menu.dart';
 import 'package:revanced_manager/ui/widgets/shared/search_bar.dart';
 import 'package:stacked/stacked.dart';
@@ -80,9 +81,7 @@ class _PatchesSelectorViewState extends State<PatchesSelectorView> {
                   ),
                 ),
                 CustomPopupMenu(
-                  onSelected: (value) => {
+                  onSelected: (value) => {model.onMenuSelection(value)},
-                    model.onMenuSelection(value)
-                  },
                   children: {
                     0: I18nText(
                       'patchesSelectorView.loadPatchesSelection',
@@ -142,103 +141,51 @@ class _PatchesSelectorViewState extends State<PatchesSelectorView> {
                       padding: const EdgeInsets.symmetric(horizontal: 12.0)
                           .copyWith(bottom: 80),
                       child: Column(
-                        children: model
+                        children: [
-                            .getQueriedPatches(_query)
+                          Row(
-                            .map(
+                            children: [
-                              (patch) => PatchItem(
+                              CustomChip(
-                                name: patch.name,
+                                label:
-                                simpleName: patch.getSimpleName(),
+                                    I18nText('patchesSelectorView.recommended'),
-                                version: patch.version,
+                                onSelected: (value) {
-                                description: patch.description,
+                                  model.selectRecommendedPatches();
-                                packageVersion: model.getAppVersion(),
+                                },
-                                supportedPackageVersions:
-                                    model.getSupportedVersions(patch),
-                                isUnsupported: !model.isPatchSupported(patch),
-                                isSelected: model.isSelected(patch),
-                                onChanged: (value) =>
-                                    model.selectPatch(patch, value),
                               ),
-                              /* TODO: Enable this and make use of new Patch Options implementation
+                              const SizedBox(width: 8),
-                                   patch.hasOptions ? ExpandablePanel(
+                              CustomChip(
-                                    controller: expController,
+                                label: I18nText('patchesSelectorView.all'),
-                                    theme: const ExpandableThemeData(
+                                onSelected: (value) {
-                                      hasIcon: false,
+                                  model.selectAllPatches(true);
-                                      tapBodyToExpand: true,
+                                },
-                                      tapBodyToCollapse: true,
+                              ),
-                                      tapHeaderToExpand: true,
+                              const SizedBox(width: 8),
-                                    ),
+                              CustomChip(
-                                    header: Column(
+                                label: I18nText('patchesSelectorView.none'),
-                                      children: <Widget>[
+                                onSelected: (value) {
-                                        GestureDetector(
+                                  model.clearPatches();
-                                          onLongPress: () =>
+                                },
-                                              expController.toggle(),
+                              ),
-                                          child: PatchItem(
+                            ],
-                                            name: patch.name,
+                          ),
-                                            simpleName: patch.getSimpleName(),
+                          ...model
-                                            description: patch.description,
+                              .getQueriedPatches(_query)
-                                            version: patch.version,
+                              .map(
-                                            packageVersion:
+                                (patch) => PatchItem(
-                                                model.getAppVersion(),
+                                  name: patch.name,
-                                            supportedPackageVersions: model
+                                  simpleName: patch.getSimpleName(),
-                                                .getSupportedVersions(patch),
+                                  version: patch.version,
-                                            isUnsupported: !model
+                                  description: patch.description,
-                                                .isPatchSupported(patch),
+                                  packageVersion: model.getAppVersion(),
-                                            isSelected:
+                                  supportedPackageVersions:
-                                                model.isSelected(patch),
+                                      model.getSupportedVersions(patch),
-                                            onChanged: (value) => model
+                                  isUnsupported: !model.isPatchSupported(patch),
-                                                .selectPatch(patch, value),
+                                  isSelected: model.isSelected(patch),
-                                            child: const Padding(
+                                  onChanged: (value) =>
-                                              padding: EdgeInsets.symmetric(
+                                      model.selectPatch(patch, value),
-                                                vertical: 8.0,
+                                ),
-                                              ),
+                              )
-                                              child: Text(
+                              .toList(),
-                                                  'Long press for additional options.',
+                        ],
-                                              ),
-                                            ),
-                                          ),
-                                        ),
-                                      ],
-                                    ),
-                                    expanded: Padding(
-                                      padding: const EdgeInsets.symmetric(
-                                        vertical: 10.0,
-                                        horizontal: 10,
-                                      ),
-                                      child: Container(
-                                        padding: const EdgeInsets.symmetric(
-                                          vertical: 8,
-                                          horizontal: 8,
-                                        ),
-                                        decoration: BoxDecoration(
-                                          color: Theme.of(context)
-                                              .colorScheme
-                                              .tertiary
-                                              .withOpacity(0.1),
-                                          borderRadius:
-                                              BorderRadius.circular(12),
-                                        ),
-                                        child: Column(
-                                          children: <Widget>[
-                                            Text(
-                                              'Patch options',
-                                              style: GoogleFonts.inter(
-                                                fontSize: 18,
-                                                fontWeight: FontWeight.w600,
-                                              ),
-                                            ),
-                                            const OptionsTextField(
-                                                hint: 'App name'),
-                                            const OptionsFilePicker(
-                                              optionName: 'Choose a logo',
-                                            ),
-                                          ],
-                                        ),
-                                      ),
-                                    ),
-                                    collapsed: Container(),
-                                  ) */
-                            )
-                            .toList(),
                       ),
                     ),
             ),

lib/ui/views/patches_selector/patches_selector_viewmodel.dart

@@ -3,6 +3,7 @@ import 'package:flutter_i18n/widgets/I18nText.dart';
 import 'package:revanced_manager/app/app.locator.dart';
 import 'package:revanced_manager/models/patch.dart';
 import 'package:revanced_manager/models/patched_application.dart';
+import 'package:revanced_manager/services/github_api.dart';
 import 'package:revanced_manager/services/manager_api.dart';
 import 'package:revanced_manager/services/patcher_api.dart';
 import 'package:revanced_manager/services/toast.dart';
@@ -14,10 +15,14 @@ import 'package:flutter/material.dart';
 class PatchesSelectorViewModel extends BaseViewModel {
   final PatcherAPI _patcherAPI = locator<PatcherAPI>();
   final ManagerAPI _managerAPI = locator<ManagerAPI>();
+  final GithubAPI _githubAPI = locator<GithubAPI>();
   final List<Patch> patches = [];
   final List<Patch> selectedPatches =
       locator<PatcherViewModel>().selectedPatches;
   String? patchesVersion = '';
+  bool isDefaultPatchesRepo() {
+    return _managerAPI.getPatchesRepo() == 'revanced/revanced-patches';
+  }
 
   Future<void> initialize() async {
     getPatchesVersion();
@@ -25,6 +30,7 @@ class PatchesSelectorViewModel extends BaseViewModel {
       locator<PatcherViewModel>().selectedApp!.originalPackageName,
     ));
     patches.sort((a, b) => a.name.compareTo(b.name));
+    selectRecommendedPatches();
     notifyListeners();
   }
 
@@ -47,7 +53,7 @@ class PatchesSelectorViewModel extends BaseViewModel {
     return showDialog(
       context: context,
       builder: (context) => AlertDialog(
-        title: I18nText('patchesSelectorView.selectAllPatchesWarningTitle'),
+        title: I18nText('warning'),
         backgroundColor: Theme.of(context).colorScheme.secondaryContainer,
         content: I18nText('patchesSelectorView.selectAllPatchesWarningContent'),
         actions: <Widget>[
@@ -75,6 +81,27 @@ class PatchesSelectorViewModel extends BaseViewModel {
     notifyListeners();
   }
 
+  void selectRecommendedPatches() {
+    selectedPatches.clear();
+
+    if (_managerAPI.areExperimentalPatchesEnabled() == false) {
+      selectedPatches.addAll(patches.where(
+          (element) => element.excluded == false && isPatchSupported(element)));
+    }
+
+    if (_managerAPI.areExperimentalPatchesEnabled()) {
+      selectedPatches
+          .addAll(patches.where((element) => element.excluded == false));
+    }
+
+    notifyListeners();
+  }
+
+  void clearPatches() {
+    selectedPatches.clear();
+    notifyListeners();
+  }
+
   void selectPatches() {
     locator<PatcherViewModel>().selectedPatches = selectedPatches;
     saveSelectedPatches();
@@ -82,9 +109,15 @@ class PatchesSelectorViewModel extends BaseViewModel {
   }
 
   Future<String?> getPatchesVersion() async {
-    patchesVersion = await _managerAPI.getLatestPatchesVersion();
+    if (isDefaultPatchesRepo()) {
-    // print('Patches version: $patchesVersion');
+      patchesVersion = await _managerAPI.getLatestPatchesVersion();
-    return patchesVersion ?? '0.0.0';
+      // print('Patches version: $patchesVersion');
+      return patchesVersion ?? '0.0.0';
+    } else {
+      // fetch from github
+      patchesVersion = await _githubAPI
+          .getLastestReleaseVersion(_managerAPI.getPatchesRepo());
+    }
   }
 
   List<Patch> getQueriedPatches(String query) {

lib/ui/views/settings/settingsFragement/settings_manage_api_url.dart

@@ -0,0 +1,117 @@
+// ignore_for_file: use_build_context_synchronously
+
+import 'package:flutter/material.dart';
+import 'package:flutter_i18n/flutter_i18n.dart';
+import 'package:revanced_manager/app/app.locator.dart';
+import 'package:revanced_manager/services/manager_api.dart';
+import 'package:revanced_manager/ui/widgets/settingsView/custom_text_field.dart';
+import 'package:revanced_manager/ui/widgets/settingsView/settings_tile_dialog.dart';
+import 'package:revanced_manager/ui/widgets/shared/custom_material_button.dart';
+import 'package:stacked/stacked.dart';
+
+class SManageApiUrl extends BaseViewModel {
+  final ManagerAPI _managerAPI = locator<ManagerAPI>();
+
+  final TextEditingController _apiUrlController = TextEditingController();
+
+  Future<void> showApiUrlDialog(BuildContext context) async {
+    String apiUrl = _managerAPI.getApiUrl();
+    _apiUrlController.text = apiUrl.replaceAll('https://', '');
+    return showDialog(
+      context: context,
+      builder: (context) => AlertDialog(
+        title: Row(
+          children: <Widget>[
+            I18nText('settingsView.apiURLLabel'),
+            const Spacer(),
+            IconButton(
+              icon: const Icon(Icons.manage_history_outlined),
+              onPressed: () => showApiUrlResetDialog(context),
+              color: Theme.of(context).colorScheme.secondary,
+            )
+          ],
+        ),
+        backgroundColor: Theme.of(context).colorScheme.secondaryContainer,
+        content: SingleChildScrollView(
+          child: Column(
+            children: <Widget>[
+              CustomTextField(
+                leadingIcon: Icon(
+                  Icons.api_outlined,
+                  color: Theme.of(context).colorScheme.secondary,
+                ),
+                inputController: _apiUrlController,
+                label: I18nText('settingsView.selectApiURL'),
+                hint: apiUrl.split('/')[0],
+                onChanged: (value) => notifyListeners(),
+              ),
+            ],
+          ),
+        ),
+        actions: <Widget>[
+          CustomMaterialButton(
+            isFilled: false,
+            label: I18nText('cancelButton'),
+            onPressed: () {
+              _apiUrlController.clear();
+              Navigator.of(context).pop();
+            },
+          ),
+          CustomMaterialButton(
+            label: I18nText('okButton'),
+            onPressed: () {
+              String apiUrl = _apiUrlController.text;
+              if (!apiUrl.startsWith('https')) {
+                apiUrl = 'https://$apiUrl';
+              }
+              _managerAPI.setApiUrl(apiUrl);
+              Navigator.of(context).pop();
+            },
+          )
+        ],
+      ),
+    );
+  }
+
+  Future<void> showApiUrlResetDialog(BuildContext context) async {
+    return showDialog(
+      context: context,
+      builder: (context) => AlertDialog(
+        title: I18nText('settingsView.sourcesResetDialogTitle'),
+        backgroundColor: Theme.of(context).colorScheme.secondaryContainer,
+        content: I18nText('settingsView.apiURLResetDialogText'),
+        actions: <Widget>[
+          CustomMaterialButton(
+            isFilled: false,
+            label: I18nText('noButton'),
+            onPressed: () => Navigator.of(context).pop(),
+          ),
+          CustomMaterialButton(
+            label: I18nText('yesButton'),
+            onPressed: () {
+              _managerAPI.setApiUrl('');
+              Navigator.of(context).pop();
+              Navigator.of(context).pop();
+            },
+          )
+        ],
+      ),
+    );
+  }
+}
+
+final sManageApiUrl = SManageApiUrl();
+
+class SManageApiUrlUI extends StatelessWidget {
+  const SManageApiUrlUI({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return SettingsTileDialog(
+      padding: const EdgeInsets.symmetric(horizontal: 20.0),
+      title: 'settingsView.apiURLLabel',
+      subtitle: 'settingsView.apiURLHint',
+      onTap: () => sManageApiUrl.showApiUrlDialog(context),
+    );
+  }
+}

lib/ui/views/settings/settingsFragement/settings_manage_sources.dart

@@ -0,0 +1,162 @@
+// ignore_for_file: use_build_context_synchronously
+
+import 'package:flutter/material.dart';
+import 'package:flutter_i18n/flutter_i18n.dart';
+import 'package:revanced_manager/app/app.locator.dart';
+import 'package:revanced_manager/services/manager_api.dart';
+import 'package:revanced_manager/ui/widgets/settingsView/custom_text_field.dart';
+import 'package:revanced_manager/ui/widgets/settingsView/settings_tile_dialog.dart';
+import 'package:revanced_manager/ui/widgets/shared/custom_material_button.dart';
+import 'package:stacked/stacked.dart';
+
+class SManageSources extends BaseViewModel {
+  final ManagerAPI _managerAPI = locator<ManagerAPI>();
+
+  final TextEditingController _orgPatSourceController = TextEditingController();
+  final TextEditingController _patSourceController = TextEditingController();
+  final TextEditingController _orgIntSourceController = TextEditingController();
+  final TextEditingController _intSourceController = TextEditingController();
+
+  Future<void> showSourcesDialog(BuildContext context) async {
+    String patchesRepo = _managerAPI.getPatchesRepo();
+    String integrationsRepo = _managerAPI.getIntegrationsRepo();
+    _orgPatSourceController.text = patchesRepo.split('/')[0];
+    _patSourceController.text = patchesRepo.split('/')[1];
+    _orgIntSourceController.text = integrationsRepo.split('/')[0];
+    _intSourceController.text = integrationsRepo.split('/')[1];
+    return showDialog(
+      context: context,
+      builder: (context) => AlertDialog(
+        title: Row(
+          children: <Widget>[
+            I18nText('settingsView.sourcesLabel'),
+            const Spacer(),
+            IconButton(
+              icon: const Icon(Icons.manage_history_outlined),
+              onPressed: () => showResetConfirmationDialog(context),
+              color: Theme.of(context).colorScheme.secondary,
+            )
+          ],
+        ),
+        backgroundColor: Theme.of(context).colorScheme.secondaryContainer,
+        content: SingleChildScrollView(
+          child: Column(
+            children: <Widget>[
+              CustomTextField(
+                leadingIcon: Icon(
+                  Icons.extension_outlined,
+                  color: Theme.of(context).colorScheme.secondary,
+                ),
+                inputController: _orgPatSourceController,
+                label: I18nText('settingsView.orgPatchesLabel'),
+                hint: patchesRepo.split('/')[0],
+                onChanged: (value) => notifyListeners(),
+              ),
+              const SizedBox(height: 8),
+              CustomTextField(
+                leadingIcon: const Icon(
+                  Icons.extension_outlined,
+                  color: Colors.transparent,
+                ),
+                inputController: _patSourceController,
+                label: I18nText('settingsView.sourcesPatchesLabel'),
+                hint: patchesRepo.split('/')[1],
+                onChanged: (value) => notifyListeners(),
+              ),
+              const SizedBox(height: 20),
+              CustomTextField(
+                leadingIcon: Icon(
+                  Icons.merge_outlined,
+                  color: Theme.of(context).colorScheme.secondary,
+                ),
+                inputController: _orgIntSourceController,
+                label: I18nText('settingsView.orgIntegrationsLabel'),
+                hint: integrationsRepo.split('/')[0],
+                onChanged: (value) => notifyListeners(),
+              ),
+              const SizedBox(height: 8),
+              CustomTextField(
+                leadingIcon: const Icon(
+                  Icons.merge_outlined,
+                  color: Colors.transparent,
+                ),
+                inputController: _intSourceController,
+                label: I18nText('settingsView.sourcesIntegrationsLabel'),
+                hint: integrationsRepo.split('/')[1],
+                onChanged: (value) => notifyListeners(),
+              ),
+            ],
+          ),
+        ),
+        actions: <Widget>[
+          CustomMaterialButton(
+            isFilled: false,
+            label: I18nText('cancelButton'),
+            onPressed: () {
+              _orgPatSourceController.clear();
+              _patSourceController.clear();
+              _orgIntSourceController.clear();
+              _intSourceController.clear();
+              Navigator.of(context).pop();
+            },
+          ),
+          CustomMaterialButton(
+            label: I18nText('okButton'),
+            onPressed: () {
+              _managerAPI.setPatchesRepo(
+                '${_orgPatSourceController.text}/${_patSourceController.text}',
+              );
+              _managerAPI.setIntegrationsRepo(
+                '${_orgIntSourceController.text}/${_intSourceController.text}',
+              );
+              Navigator.of(context).pop();
+            },
+          )
+        ],
+      ),
+    );
+  }
+
+  Future<void> showResetConfirmationDialog(BuildContext context) async {
+    return showDialog(
+      context: context,
+      builder: (context) => AlertDialog(
+        title: I18nText('settingsView.sourcesResetDialogTitle'),
+        backgroundColor: Theme.of(context).colorScheme.secondaryContainer,
+        content: I18nText('settingsView.sourcesResetDialogText'),
+        actions: <Widget>[
+          CustomMaterialButton(
+            isFilled: false,
+            label: I18nText('noButton'),
+            onPressed: () => Navigator.of(context).pop(),
+          ),
+          CustomMaterialButton(
+            label: I18nText('yesButton'),
+            onPressed: () {
+              _managerAPI.setPatchesRepo('');
+              _managerAPI.setIntegrationsRepo('');
+              Navigator.of(context).pop();
+              Navigator.of(context).pop();
+            },
+          )
+        ],
+      ),
+    );
+  }
+}
+
+final sManageSources = SManageSources();
+
+class SManageSourcesUI extends StatelessWidget {
+  const SManageSourcesUI({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return SettingsTileDialog(
+      padding: const EdgeInsets.symmetric(horizontal: 20.0),
+      title: 'settingsView.sourcesLabel',
+      subtitle: 'settingsView.sourcesLabelHint',
+      onTap: () => sManageSources.showSourcesDialog(context),
+    );
+  }
+}

lib/ui/views/settings/settingsFragement/settings_update_language.dart

@@ -0,0 +1,98 @@
+// ignore_for_file: use_build_context_synchronously
+
+import 'package:flutter/material.dart';
+import 'package:flutter_i18n/flutter_i18n.dart';
+import 'package:revanced_manager/app/app.locator.dart';
+import 'package:revanced_manager/main.dart';
+import 'package:revanced_manager/services/crowdin_api.dart';
+import 'package:revanced_manager/services/toast.dart';
+import 'package:revanced_manager/ui/views/navigation/navigation_viewmodel.dart';
+import 'package:revanced_manager/ui/views/settings/settings_viewmodel.dart';
+import 'package:revanced_manager/ui/widgets/settingsView/settings_tile_dialog.dart';
+import 'package:shared_preferences/shared_preferences.dart';
+import 'package:stacked/stacked.dart';
+import 'package:timeago/timeago.dart' as timeago;
+
+final _settingViewModel = SettingsViewModel();
+
+class SUpdateLanguage extends BaseViewModel {
+  final CrowdinAPI _crowdinAPI = locator<CrowdinAPI>();
+  final Toast _toast = locator<Toast>();
+  late SharedPreferences _prefs;
+  String selectedLanguage = 'English';
+  String selectedLanguageLocale = prefs.getString('language') ?? 'en_US';
+  List languages = [];
+
+  Future<void> initialize() async {
+    _prefs = await SharedPreferences.getInstance();
+    selectedLanguageLocale =
+        _prefs.getString('language') ?? selectedLanguageLocale;
+    notifyListeners();
+  }
+
+  Future<void> updateLanguage(BuildContext context, String? value) async {
+    if (value != null) {
+      selectedLanguageLocale = value;
+      _prefs = await SharedPreferences.getInstance();
+      await _prefs.setString('language', value);
+      await FlutterI18n.refresh(context, Locale(value));
+      timeago.setLocaleMessages(value, timeago.EnMessages());
+      locator<NavigationViewModel>().notifyListeners();
+      notifyListeners();
+    }
+  }
+
+  Future<void> initLang() async {
+    languages = await _crowdinAPI.getLanguages();
+    languages.sort((a, b) => a['name'].compareTo(b['name']));
+    notifyListeners();
+  }
+
+  Future<void> showLanguagesDialog(BuildContext parentContext) {
+    initLang();
+    return showDialog(
+      context: parentContext,
+      builder: (context) => SimpleDialog(
+        title: I18nText('settingsView.languageLabel'),
+        backgroundColor: Theme.of(context).colorScheme.secondaryContainer,
+        children: [
+          SizedBox(
+            height: 500,
+            child: ListView.builder(
+              itemCount: languages.length,
+              itemBuilder: (context, index) {
+                return RadioListTile<String>(
+                  title: Text(languages[index]['name']),
+                  subtitle: Text(languages[index]['locale']),
+                  value: languages[index]['locale'],
+                  groupValue: selectedLanguageLocale,
+                  onChanged: (value) {
+                    selectedLanguage = languages[index]['name'];
+                    _toast.showBottom('settingsView.restartAppForChanges');
+                    updateLanguage(context, value);
+                    Navigator.pop(context);
+                  },
+                );
+              },
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+}
+
+class SUpdateLanguageUI extends StatelessWidget {
+  const SUpdateLanguageUI({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return SettingsTileDialog(
+      padding: const EdgeInsets.symmetric(horizontal: 20.0),
+      title: 'settingsView.languageLabel',
+      subtitle: _settingViewModel.sUpdateLanguage.selectedLanguage,
+      onTap: () =>
+          _settingViewModel.sUpdateLanguage.showLanguagesDialog(context),
+    );
+  }
+}

lib/ui/views/settings/settingsFragement/settings_update_theme.dart

@@ -0,0 +1,116 @@
+// ignore_for_file: use_build_context_synchronously
+
+import 'package:dynamic_themes/dynamic_themes.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
+import 'package:flutter_i18n/widgets/I18nText.dart';
+import 'package:revanced_manager/app/app.locator.dart';
+import 'package:revanced_manager/services/manager_api.dart';
+import 'package:revanced_manager/ui/views/settings/settings_viewmodel.dart';
+import 'package:revanced_manager/ui/widgets/settingsView/custom_switch_tile.dart';
+import 'package:revanced_manager/ui/widgets/settingsView/settings_section.dart';
+import 'package:stacked/stacked.dart';
+
+final _settingViewModel = SettingsViewModel();
+
+// ignore: constant_identifier_names
+const int ANDROID_12_SDK_VERSION = 31;
+
+class SUpdateTheme extends BaseViewModel {
+  final ManagerAPI _managerAPI = locator<ManagerAPI>();
+
+  bool getDynamicThemeStatus() {
+    return _managerAPI.getUseDynamicTheme();
+  }
+
+  void setUseDynamicTheme(BuildContext context, bool value) async {
+    await _managerAPI.setUseDynamicTheme(value);
+    int currentTheme = DynamicTheme.of(context)!.themeId;
+    if (currentTheme.isEven) {
+      await DynamicTheme.of(context)!.setTheme(value ? 2 : 0);
+    } else {
+      await DynamicTheme.of(context)!.setTheme(value ? 3 : 1);
+    }
+    notifyListeners();
+  }
+
+  bool getDarkThemeStatus() {
+    return _managerAPI.getUseDarkTheme();
+  }
+
+  void setUseDarkTheme(BuildContext context, bool value) async {
+    await _managerAPI.setUseDarkTheme(value);
+    int currentTheme = DynamicTheme.of(context)!.themeId;
+    if (currentTheme < 2) {
+      await DynamicTheme.of(context)!.setTheme(value ? 1 : 0);
+    } else {
+      await DynamicTheme.of(context)!.setTheme(value ? 3 : 2);
+    }
+    SystemChrome.setSystemUIOverlayStyle(
+      SystemUiOverlayStyle(
+        systemNavigationBarIconBrightness:
+            value ? Brightness.light : Brightness.dark,
+      ),
+    );
+    notifyListeners();
+  }
+}
+
+class SUpdateThemeUI extends StatelessWidget {
+  const SUpdateThemeUI({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return SettingsSection(
+      title: 'settingsView.appearanceSectionTitle',
+      children: <Widget>[
+        CustomSwitchTile(
+          padding: const EdgeInsets.symmetric(horizontal: 20.0),
+          title: I18nText(
+            'settingsView.darkThemeLabel',
+            child: const Text(
+              '',
+              style: TextStyle(
+                fontSize: 20,
+                fontWeight: FontWeight.w500,
+              ),
+            ),
+          ),
+          subtitle: I18nText('settingsView.darkThemeHint'),
+          value: SUpdateTheme().getDarkThemeStatus(),
+          onTap: (value) => SUpdateTheme().setUseDarkTheme(
+            context,
+            value,
+          ),
+        ),
+        FutureBuilder<int>(
+          future: _settingViewModel.getSdkVersion(),
+          builder: (context, snapshot) => Visibility(
+            visible:
+                snapshot.hasData && snapshot.data! >= ANDROID_12_SDK_VERSION,
+            child: CustomSwitchTile(
+              padding: const EdgeInsets.symmetric(horizontal: 20.0),
+              title: I18nText(
+                'settingsView.dynamicThemeLabel',
+                child: const Text(
+                  '',
+                  style: TextStyle(
+                    fontSize: 20,
+                    fontWeight: FontWeight.w500,
+                  ),
+                ),
+              ),
+              subtitle: I18nText('settingsView.dynamicThemeHint'),
+              value: _settingViewModel.sUpdateTheme.getDynamicThemeStatus(),
+              onTap: (value) =>
+                  _settingViewModel.sUpdateTheme.setUseDynamicTheme(
+                context,
+                value,
+              ),
+            ),
+          ),
+        ),
+      ],
+    );
+  }
+}

lib/ui/views/settings/settings_view.dart

@@ -1,12 +1,15 @@
+// ignore_for_file: prefer_const_constructors
+
 import 'package:flutter/material.dart';
 import 'package:flutter_i18n/flutter_i18n.dart';
 import 'package:google_fonts/google_fonts.dart';
+import 'package:revanced_manager/ui/views/settings/settingsFragement/settings_update_language.dart';
+import 'package:revanced_manager/ui/views/settings/settingsFragement/settings_update_theme.dart';
 import 'package:revanced_manager/ui/views/settings/settings_viewmodel.dart';
-import 'package:revanced_manager/ui/widgets/settingsView/about_widget.dart';
+import 'package:revanced_manager/ui/widgets/settingsView/settings_advanced_section.dart';
-import 'package:revanced_manager/ui/widgets/settingsView/custom_switch_tile.dart';
+import 'package:revanced_manager/ui/widgets/settingsView/settings_export_section.dart';
-import 'package:revanced_manager/ui/widgets/settingsView/settings_tile_dialog.dart';
+import 'package:revanced_manager/ui/widgets/settingsView/settings_info_section.dart';
-import 'package:revanced_manager/ui/widgets/settingsView/settings_section.dart';
+import 'package:revanced_manager/ui/widgets/settingsView/settings_team_section.dart';
-import 'package:revanced_manager/ui/widgets/settingsView/social_media_widget.dart';
 import 'package:revanced_manager/ui/widgets/shared/custom_sliver_app_bar.dart';
 import 'package:stacked/stacked.dart';
 
@@ -38,273 +41,18 @@ class SettingsView extends StatelessWidget {
             SliverList(
               delegate: SliverChildListDelegate.fixed(
                 <Widget>[
-                  SettingsSection(
+                  SUpdateThemeUI(),
-                    title: 'settingsView.appearanceSectionTitle',
+                  SUpdateLanguageUI(),
-                    children: <Widget>[
-                      CustomSwitchTile(
-                        padding: const EdgeInsets.symmetric(horizontal: 20.0),
-                        title: I18nText(
-                          'settingsView.darkThemeLabel',
-                          child: const Text(
-                            '',
-                            style: TextStyle(
-                              fontSize: 20,
-                              fontWeight: FontWeight.w500,
-                            ),
-                          ),
-                        ),
-                        subtitle: I18nText('settingsView.darkThemeHint'),
-                        value: model.getDarkThemeStatus(),
-                        onTap: (value) => model.setUseDarkTheme(
-                          context,
-                          value,
-                        ),
-                      ),
-                      FutureBuilder<int>(
-                        future: model.getSdkVersion(),
-                        builder: (context, snapshot) => Visibility(
-                          visible: snapshot.hasData &&
-                              snapshot.data! >= ANDROID_12_SDK_VERSION,
-                          child: CustomSwitchTile(
-                            padding:
-                                const EdgeInsets.symmetric(horizontal: 20.0),
-                            title: I18nText(
-                              'settingsView.dynamicThemeLabel',
-                              child: const Text(
-                                '',
-                                style: TextStyle(
-                                  fontSize: 20,
-                                  fontWeight: FontWeight.w500,
-                                ),
-                              ),
-                            ),
-                            subtitle: I18nText('settingsView.dynamicThemeHint'),
-                            value: model.getDynamicThemeStatus(),
-                            onTap: (value) => model.setUseDynamicTheme(
-                              context,
-                              value,
-                            ),
-                          ),
-                        ),
-                      ),
-                    ],
-                  ),
-                  SettingsTileDialog(
-                    padding: const EdgeInsets.symmetric(horizontal: 20.0),
-                    title: 'settingsView.languageLabel',
-                    subtitle: 'English',
-                    onTap: () => model.showLanguagesDialog(context),
-                  ),
                   _settingsDivider,
-                  SettingsSection(
+                  STeamSection(),
-                    title: 'settingsView.teamSectionTitle',
-                    children: <Widget>[
-                      ListTile(
-                        contentPadding:
-                            const EdgeInsets.symmetric(horizontal: 20.0),
-                        title: I18nText(
-                          'settingsView.contributorsLabel',
-                          child: const Text(
-                            '',
-                            style: TextStyle(
-                              fontSize: 20,
-                              fontWeight: FontWeight.w500,
-                            ),
-                          ),
-                        ),
-                        subtitle: I18nText('settingsView.contributorsHint'),
-                        onTap: () => model.navigateToContributors(),
-                      ),
-                      const SocialMediaWidget(
-                        padding: EdgeInsets.symmetric(horizontal: 20.0),
-                      ),
-                    ],
-                  ),
                   _settingsDivider,
-                  SettingsSection(
+                  SAdvancedSection(),
-                    title: 'settingsView.advancedSectionTitle',
-                    children: <Widget>[
-                      SettingsTileDialog(
-                        padding: const EdgeInsets.symmetric(horizontal: 20.0),
-                        title: 'settingsView.apiURLLabel',
-                        subtitle: 'settingsView.apiURLHint',
-                        onTap: () => model.showApiUrlDialog(context),
-                      ),
-                      SettingsTileDialog(
-                        padding: const EdgeInsets.symmetric(horizontal: 20.0),
-                        title: 'settingsView.sourcesLabel',
-                        subtitle: 'settingsView.sourcesLabelHint',
-                        onTap: () => model.showSourcesDialog(context),
-                      ),
-                      CustomSwitchTile(
-                        padding: const EdgeInsets.symmetric(horizontal: 20.0),
-                        title: I18nText(
-                          'settingsView.experimentalPatchesLabel',
-                          child: const Text(
-                            '',
-                            style: TextStyle(
-                              fontSize: 20,
-                              fontWeight: FontWeight.w500,
-                            ),
-                          ),
-                        ),
-                        subtitle:
-                            I18nText('settingsView.experimentalPatchesHint'),
-                        value: model.areExperimentalPatchesEnabled(),
-                        onTap: (value) => model.useExperimentalPatches(value),
-                      ),
-                      ListTile(
-                        contentPadding:
-                            const EdgeInsets.symmetric(horizontal: 20.0),
-                        title: I18nText(
-                          'settingsView.deleteKeystoreLabel',
-                          child: const Text(
-                            '',
-                            style: TextStyle(
-                              fontSize: 20,
-                              fontWeight: FontWeight.w500,
-                            ),
-                          ),
-                        ),
-                        subtitle: I18nText('settingsView.deleteKeystoreHint'),
-                        onTap: () => model.deleteKeystore,
-                      ),
-                      ListTile(
-                        contentPadding:
-                            const EdgeInsets.symmetric(horizontal: 20.0),
-                        title: I18nText(
-                          'settingsView.deleteTempDirLabel',
-                          child: const Text(
-                            '',
-                            style: TextStyle(
-                              fontSize: 20,
-                              fontWeight: FontWeight.w500,
-                            ),
-                          ),
-                        ),
-                        subtitle: I18nText('settingsView.deleteTempDirHint'),
-                        onTap: () => model.deleteTempDir(),
-                      ),
-                      ListTile(
-                        contentPadding:
-                            const EdgeInsets.symmetric(horizontal: 20.0),
-                        title: I18nText(
-                          'settingsView.deleteLogsLabel',
-                          child: const Text(
-                            '',
-                            style: TextStyle(
-                              fontSize: 20,
-                              fontWeight: FontWeight.w500,
-                            ),
-                          ),
-                        ),
-                        subtitle: I18nText('settingsView.deleteLogsHint'),
-                        onTap: () => model.deleteLogs(),
-                      ),
-                    ],
-                  ),
                   _settingsDivider,
-                  SettingsSection(
+                  SExportSection(),
-                    title: 'settingsView.exportSectionTitle',
-                    children: <Widget>[
-                      ListTile(
-                        contentPadding:
-                            const EdgeInsets.symmetric(horizontal: 20.0),
-                        title: I18nText(
-                          'settingsView.exportPatchesLabel',
-                          child: const Text(
-                            '',
-                            style: TextStyle(
-                              fontSize: 20,
-                              fontWeight: FontWeight.w500,
-                            ),
-                          ),
-                        ),
-                        subtitle: I18nText('settingsView.exportPatchesHint'),
-                        onTap: () => model.exportPatches(),
-                      ),
-                      ListTile(
-                        contentPadding:
-                            const EdgeInsets.symmetric(horizontal: 20.0),
-                        title: I18nText(
-                          'settingsView.importPatchesLabel',
-                          child: const Text(
-                            '',
-                            style: TextStyle(
-                              fontSize: 20,
-                              fontWeight: FontWeight.w500,
-                            ),
-                          ),
-                        ),
-                        subtitle: I18nText('settingsView.importPatchesHint'),
-                        onTap: () => model.importPatches(),
-                      ),
-                      ListTile(
-                        contentPadding:
-                            const EdgeInsets.symmetric(horizontal: 20.0),
-                        title: I18nText(
-                          'settingsView.resetStoredPatchesLabel',
-                          child: const Text(
-                            '',
-                            style: TextStyle(
-                              fontSize: 20,
-                              fontWeight: FontWeight.w500,
-                            ),
-                          ),
-                        ),
-                        subtitle:
-                            I18nText('settingsView.resetStoredPatchesHint'),
-                        onTap: () => model.resetSelectedPatches(),
-                      ),
-                    ],
-                  ),
                   _settingsDivider,
-                  // SettingsSection(
+                  // SLoggingSection(),
-                  //   title: 'settingsView.logsSectionTitle',
-                  //   children: <Widget>[
-                  //     CustomSwitchTile(
-                  //       padding: const EdgeInsets.symmetric(horizontal: 20.0),
-                  //       title: I18nText(
-                  //         'settingsView.sentryLabel',
-                  //         child: const Text(
-                  //           '',
-                  //           style: TextStyle(
-                  //             fontSize: 20,
-                  //             fontWeight: FontWeight.w500,
-                  //           ),
-                  //         ),
-                  //       ),
-                  //       subtitle: I18nText('settingsView.sentryHint'),
-                  //       value: model.isSentryEnabled(),
-                  //       onTap: (value) => model.useSentry(value),
-                  //     ),
-                  //   ],
-                  // ),
                   // _settingsDivider,
-                  SettingsSection(
+                  SInfoSection(),
-                    title: 'settingsView.infoSectionTitle',
-                    children: <Widget>[
-                      ListTile(
-                        contentPadding:
-                            const EdgeInsets.symmetric(horizontal: 20.0),
-                        title: I18nText(
-                          'settingsView.logsLabel',
-                          child: const Text(
-                            '',
-                            style: TextStyle(
-                              fontSize: 20,
-                              fontWeight: FontWeight.w500,
-                            ),
-                          ),
-                        ),
-                        subtitle: I18nText('settingsView.logsHint'),
-                        onTap: () => model.exportLogcatLogs(),
-                      ),
-                      const AboutWidget(
-                        padding: EdgeInsets.symmetric(horizontal: 20.0),
-                      ),
-                    ],
-                  ),
                 ],
               ),
             ),

lib/ui/views/settings/settings_viewmodel.dart

@@ -1,12 +1,7 @@
-// ignore_for_file: use_build_context_synchronously
 import 'dart:io';
 import 'package:cr_file_saver/file_saver.dart';
 import 'package:device_info_plus/device_info_plus.dart';
-import 'package:dynamic_themes/dynamic_themes.dart';
 import 'package:file_picker/file_picker.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter/services.dart';
-import 'package:flutter_i18n/flutter_i18n.dart';
 import 'package:logcat/logcat.dart';
 import 'package:path_provider/path_provider.dart';
 import 'package:revanced_manager/app/app.locator.dart';
@@ -14,328 +9,41 @@ import 'package:revanced_manager/app/app.router.dart';
 import 'package:revanced_manager/services/manager_api.dart';
 import 'package:revanced_manager/services/toast.dart';
 import 'package:revanced_manager/ui/views/patcher/patcher_viewmodel.dart';
-import 'package:revanced_manager/ui/widgets/shared/custom_material_button.dart';
+import 'package:revanced_manager/ui/views/settings/settingsFragement/settings_update_language.dart';
-import 'package:revanced_manager/ui/widgets/settingsView/custom_text_field.dart';
+import 'package:revanced_manager/ui/views/settings/settingsFragement/settings_update_theme.dart';
 import 'package:sentry_flutter/sentry_flutter.dart';
 import 'package:share_extend/share_extend.dart';
 import 'package:stacked/stacked.dart';
 import 'package:stacked_services/stacked_services.dart';
-import 'package:timeago/timeago.dart';
-
-// ignore: constant_identifier_names
-const int ANDROID_12_SDK_VERSION = 31;
 
 class SettingsViewModel extends BaseViewModel {
   final NavigationService _navigationService = locator<NavigationService>();
   final ManagerAPI _managerAPI = locator<ManagerAPI>();
   final Toast _toast = locator<Toast>();
-  final TextEditingController _orgPatSourceController = TextEditingController();
-  final TextEditingController _patSourceController = TextEditingController();
-  final TextEditingController _orgIntSourceController = TextEditingController();
-  final TextEditingController _intSourceController = TextEditingController();
-  final TextEditingController _apiUrlController = TextEditingController();
 
-  void setLanguage(String language) {
+  final SUpdateLanguage sUpdateLanguage = SUpdateLanguage();
-    notifyListeners();
+  final SUpdateTheme sUpdateTheme = SUpdateTheme();
-  }
 
   void navigateToContributors() {
     _navigationService.navigateTo(Routes.contributorsView);
   }
 
-  Future<void> updateLanguage(BuildContext context, String? value) async {
+  bool isSentryEnabled() {
-    if (value != null) {
+    return _managerAPI.isSentryEnabled();
-      await FlutterI18n.refresh(context, Locale(value));
-      setLocaleMessages(value, EnMessages());
-    }
   }
 
-  bool getDynamicThemeStatus() {
+  void useSentry(bool value) {
-    return _managerAPI.getUseDynamicTheme();
+    _managerAPI.setSentryStatus(value);
-  }
+    _toast.showBottom('settingsView.restartAppForChanges');
-
-  void setUseDynamicTheme(BuildContext context, bool value) async {
-    await _managerAPI.setUseDynamicTheme(value);
-    int currentTheme = DynamicTheme.of(context)!.themeId;
-    if (currentTheme.isEven) {
-      await DynamicTheme.of(context)!.setTheme(value ? 2 : 0);
-    } else {
-      await DynamicTheme.of(context)!.setTheme(value ? 3 : 1);
-    }
     notifyListeners();
   }
 
-  bool getDarkThemeStatus() {
-    return _managerAPI.getUseDarkTheme();
-  }
-
-  void setUseDarkTheme(BuildContext context, bool value) async {
-    await _managerAPI.setUseDarkTheme(value);
-    int currentTheme = DynamicTheme.of(context)!.themeId;
-    if (currentTheme < 2) {
-      await DynamicTheme.of(context)!.setTheme(value ? 1 : 0);
-    } else {
-      await DynamicTheme.of(context)!.setTheme(value ? 3 : 2);
-    }
-    SystemChrome.setSystemUIOverlayStyle(
-      SystemUiOverlayStyle(
-        systemNavigationBarIconBrightness:
-            value ? Brightness.light : Brightness.dark,
-      ),
-    );
-    notifyListeners();
-  }
-
-  Future<void> showLanguagesDialog(BuildContext context) {
-    return showDialog(
-      context: context,
-      builder: (context) => SimpleDialog(
-        title: I18nText('settingsView.languageLabel'),
-        backgroundColor: Theme.of(context).colorScheme.secondaryContainer,
-        children: <Widget>[
-          RadioListTile<String>(
-            title: I18nText('settingsView.englishOption'),
-            value: 'en',
-            groupValue: 'en',
-            onChanged: (value) {
-              updateLanguage(context, value);
-              Navigator.of(context).pop();
-            },
-          ),
-        ],
-      ),
-    );
-  }
-
-  Future<void> showSourcesDialog(BuildContext context) async {
-    String patchesRepo = _managerAPI.getPatchesRepo();
-    String integrationsRepo = _managerAPI.getIntegrationsRepo();
-    _orgPatSourceController.text = patchesRepo.split('/')[0];
-    _patSourceController.text = patchesRepo.split('/')[1];
-    _orgIntSourceController.text = integrationsRepo.split('/')[0];
-    _intSourceController.text = integrationsRepo.split('/')[1];
-    return showDialog(
-      context: context,
-      builder: (context) => AlertDialog(
-        title: Row(
-          children: <Widget>[
-            I18nText('settingsView.sourcesLabel'),
-            const Spacer(),
-            IconButton(
-              icon: const Icon(Icons.manage_history_outlined),
-              onPressed: () => showResetConfirmationDialog(context),
-              color: Theme.of(context).colorScheme.secondary,
-            )
-          ],
-        ),
-        backgroundColor: Theme.of(context).colorScheme.secondaryContainer,
-        content: SingleChildScrollView(
-          child: Column(
-            children: <Widget>[
-              CustomTextField(
-                leadingIcon: Icon(
-                  Icons.extension_outlined,
-                  color: Theme.of(context).colorScheme.secondary,
-                ),
-                inputController: _orgPatSourceController,
-                label: I18nText('settingsView.orgPatchesLabel'),
-                hint: patchesRepo.split('/')[0],
-                onChanged: (value) => notifyListeners(),
-              ),
-              const SizedBox(height: 8),
-              CustomTextField(
-                leadingIcon: const Icon(
-                  Icons.extension_outlined,
-                  color: Colors.transparent,
-                ),
-                inputController: _patSourceController,
-                label: I18nText('settingsView.sourcesPatchesLabel'),
-                hint: patchesRepo.split('/')[1],
-                onChanged: (value) => notifyListeners(),
-              ),
-              const SizedBox(height: 20),
-              CustomTextField(
-                leadingIcon: Icon(
-                  Icons.merge_outlined,
-                  color: Theme.of(context).colorScheme.secondary,
-                ),
-                inputController: _orgIntSourceController,
-                label: I18nText('settingsView.orgIntegrationsLabel'),
-                hint: integrationsRepo.split('/')[0],
-                onChanged: (value) => notifyListeners(),
-              ),
-              const SizedBox(height: 8),
-              CustomTextField(
-                leadingIcon: const Icon(
-                  Icons.merge_outlined,
-                  color: Colors.transparent,
-                ),
-                inputController: _intSourceController,
-                label: I18nText('settingsView.sourcesIntegrationsLabel'),
-                hint: integrationsRepo.split('/')[1],
-                onChanged: (value) => notifyListeners(),
-              ),
-            ],
-          ),
-        ),
-        actions: <Widget>[
-          CustomMaterialButton(
-            isFilled: false,
-            label: I18nText('cancelButton'),
-            onPressed: () {
-              _orgPatSourceController.clear();
-              _patSourceController.clear();
-              _orgIntSourceController.clear();
-              _intSourceController.clear();
-              Navigator.of(context).pop();
-            },
-          ),
-          CustomMaterialButton(
-            label: I18nText('okButton'),
-            onPressed: () {
-              _managerAPI.setPatchesRepo(
-                '${_orgPatSourceController.text}/${_patSourceController.text}',
-              );
-              _managerAPI.setIntegrationsRepo(
-                '${_orgIntSourceController.text}/${_intSourceController.text}',
-              );
-              Navigator.of(context).pop();
-            },
-          )
-        ],
-      ),
-    );
-  }
-
-  Future<void> showApiUrlDialog(BuildContext context) async {
-    String apiUrl = _managerAPI.getApiUrl();
-    _apiUrlController.text = apiUrl.replaceAll('https://', '');
-    return showDialog(
-      context: context,
-      builder: (context) => AlertDialog(
-        title: Row(
-          children: <Widget>[
-            I18nText('settingsView.apiURLLabel'),
-            const Spacer(),
-            IconButton(
-              icon: const Icon(Icons.manage_history_outlined),
-              onPressed: () => showApiUrlResetDialog(context),
-              color: Theme.of(context).colorScheme.secondary,
-            )
-          ],
-        ),
-        backgroundColor: Theme.of(context).colorScheme.secondaryContainer,
-        content: SingleChildScrollView(
-          child: Column(
-            children: <Widget>[
-              CustomTextField(
-                leadingIcon: Icon(
-                  Icons.api_outlined,
-                  color: Theme.of(context).colorScheme.secondary,
-                ),
-                inputController: _apiUrlController,
-                label: I18nText('settingsView.selectApiURL'),
-                hint: apiUrl.split('/')[0],
-                onChanged: (value) => notifyListeners(),
-              ),
-            ],
-          ),
-        ),
-        actions: <Widget>[
-          CustomMaterialButton(
-            isFilled: false,
-            label: I18nText('cancelButton'),
-            onPressed: () {
-              _apiUrlController.clear();
-              Navigator.of(context).pop();
-            },
-          ),
-          CustomMaterialButton(
-            label: I18nText('okButton'),
-            onPressed: () {
-              String apiUrl = _apiUrlController.text;
-              if (!apiUrl.startsWith('https')) {
-                apiUrl = 'https://$apiUrl';
-              }
-              _managerAPI.setApiUrl(apiUrl);
-              Navigator.of(context).pop();
-            },
-          )
-        ],
-      ),
-    );
-  }
-
-  Future<void> showResetConfirmationDialog(BuildContext context) async {
-    return showDialog(
-      context: context,
-      builder: (context) => AlertDialog(
-        title: I18nText('settingsView.sourcesResetDialogTitle'),
-        backgroundColor: Theme.of(context).colorScheme.secondaryContainer,
-        content: I18nText('settingsView.sourcesResetDialogText'),
-        actions: <Widget>[
-          CustomMaterialButton(
-            isFilled: false,
-            label: I18nText('noButton'),
-            onPressed: () => Navigator.of(context).pop(),
-          ),
-          CustomMaterialButton(
-            label: I18nText('yesButton'),
-            onPressed: () {
-              _managerAPI.setPatchesRepo('');
-              _managerAPI.setIntegrationsRepo('');
-              Navigator.of(context).pop();
-              Navigator.of(context).pop();
-            },
-          )
-        ],
-      ),
-    );
-  }
-
-  Future<void> showApiUrlResetDialog(BuildContext context) async {
-    return showDialog(
-      context: context,
-      builder: (context) => AlertDialog(
-        title: I18nText('settingsView.sourcesResetDialogTitle'),
-        backgroundColor: Theme.of(context).colorScheme.secondaryContainer,
-        content: I18nText('settingsView.apiURLResetDialogText'),
-        actions: <Widget>[
-          CustomMaterialButton(
-            isFilled: false,
-            label: I18nText('noButton'),
-            onPressed: () => Navigator.of(context).pop(),
-          ),
-          CustomMaterialButton(
-            label: I18nText('yesButton'),
-            onPressed: () {
-              _managerAPI.setApiUrl('');
-              Navigator.of(context).pop();
-              Navigator.of(context).pop();
-            },
-          )
-        ],
-      ),
-    );
-  }
-
-  // bool isSentryEnabled() {
-  //   return _managerAPI.isSentryEnabled();
-  // }
-
-  // void useSentry(bool value) {
-  //   _managerAPI.setSentryStatus(value);
-  //   _toast.showBottom('settingsView.restartAppForChanges');
-  //   notifyListeners();
-  // }
-
   bool areExperimentalPatchesEnabled() {
     return _managerAPI.areExperimentalPatchesEnabled();
   }
 
   void useExperimentalPatches(bool value) {
     _managerAPI.enableExperimentalPatchesStatus(value);
-    _toast.showBottom('settingsView.enabledExperimentalPatches');
     notifyListeners();
   }
 
@@ -355,16 +63,13 @@ class SettingsViewModel extends BaseViewModel {
     try {
       File outFile = File(_managerAPI.storedPatchesFile);
       if (outFile.existsSync()) {
-        String dateTime = DateTime.now()
+        String dateTime =
-            .toString()
+            DateTime.now().toString().replaceAll(' ', '_').split('.').first;
-            .replaceAll(' ', '_')
+        String tempFilePath =
-            .split('.').first;
+            '${outFile.path.substring(0, outFile.path.lastIndexOf('/') + 1)}selected_patches_$dateTime.json';
-        String tempFilePath = '${outFile.path.substring(0, outFile.path.lastIndexOf('/') + 1)}selected_patches_$dateTime.json';
         outFile.copySync(tempFilePath);
         await CRFileSaver.saveFileWithDialog(SaveFileDialogParams(
-          sourceFilePath: tempFilePath,
+            sourceFilePath: tempFilePath, destinationFileName: ''));
-          destinationFileName: ''
-        ));
         File(tempFilePath).delete();
         locator<Toast>().showBottom('settingsView.exportedPatches');
       } else {

lib/ui/widgets/appInfoView/app_info_viewmodel.dart

@@ -54,7 +54,7 @@ class AppInfoViewModel extends BaseViewModel {
   }
 
   void updateNotImplemented(BuildContext context) {
-    _toast.show('appInfoView.updateNotImplemented');
+    _toast.showBottom('appInfoView.updateNotImplemented');
   }
 
   Future<void> showUninstallDialog(

lib/ui/widgets/patchesSelectorView/patch_item.dart

@@ -54,8 +54,7 @@ class _PatchItemState extends State<PatchItem> {
         onTap: () {
           setState(() {
             if (widget.isUnsupported &&
-                !widget._managerAPI.areExperimentalPatchesEnabled()
+                !widget._managerAPI.areExperimentalPatchesEnabled()) {
-            ) {
               widget.isSelected = false;
               widget.toast.showBottom('patchItem.unsupportedPatchVersion');
             } else {
@@ -125,8 +124,8 @@ class _PatchItemState extends State<PatchItem> {
                     onChanged: (newValue) {
                       setState(() {
                         if (widget.isUnsupported &&
-                            !widget._managerAPI.areExperimentalPatchesEnabled()
+                            !widget._managerAPI
-                        ) {
+                                .areExperimentalPatchesEnabled()) {
                           widget.isSelected = false;
                           widget.toast
                               .showBottom('patchItem.unsupportedPatchVersion');
@@ -146,7 +145,7 @@ class _PatchItemState extends State<PatchItem> {
                       Padding(
                         padding: const EdgeInsets.only(top: 8),
                         child: TextButton.icon(
-                          label: I18nText('patchItem.unsupportedWarningButton'),
+                          label: I18nText('warning'),
                           icon: const Icon(Icons.warning, size: 20.0),
                           onPressed: () => _showUnsupportedWarningDialog(),
                           style: ButtonStyle(
@@ -183,7 +182,7 @@ class _PatchItemState extends State<PatchItem> {
     return showDialog(
       context: context,
       builder: (context) => AlertDialog(
-        title: I18nText('patchItem.unsupportedDialogTitle'),
+        title: I18nText('warning'),
         backgroundColor: Theme.of(context).colorScheme.secondaryContainer,
         content: I18nText(
           'patchItem.unsupportedDialogText',

lib/ui/widgets/settingsView/settings_advanced_section.dart

@@ -0,0 +1,72 @@
+// ignore_for_file: prefer_const_constructors
+
+import 'package:flutter/material.dart';
+import 'package:flutter_i18n/widgets/I18nText.dart';
+import 'package:revanced_manager/ui/views/settings/settingsFragement/settings_manage_api_url.dart';
+import 'package:revanced_manager/ui/views/settings/settingsFragement/settings_manage_sources.dart';
+import 'package:revanced_manager/ui/views/settings/settings_viewmodel.dart';
+import 'package:revanced_manager/ui/widgets/settingsView/settings_experimental_patches.dart';
+import 'package:revanced_manager/ui/widgets/settingsView/settings_section.dart';
+
+final _settingsViewModel = SettingsViewModel();
+
+class SAdvancedSection extends StatelessWidget {
+  const SAdvancedSection({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return SettingsSection(
+      title: 'settingsView.advancedSectionTitle',
+      children: <Widget>[
+        SManageApiUrlUI(),
+        SManageSourcesUI(),
+        SExperimentalPatches(),
+        ListTile(
+          contentPadding: const EdgeInsets.symmetric(horizontal: 20.0),
+          title: I18nText(
+            'settingsView.deleteKeystoreLabel',
+            child: const Text(
+              '',
+              style: TextStyle(
+                fontSize: 20,
+                fontWeight: FontWeight.w500,
+              ),
+            ),
+          ),
+          subtitle: I18nText('settingsView.deleteKeystoreHint'),
+          onTap: () => _settingsViewModel.deleteKeystore,
+        ),
+        ListTile(
+          contentPadding: const EdgeInsets.symmetric(horizontal: 20.0),
+          title: I18nText(
+            'settingsView.deleteTempDirLabel',
+            child: const Text(
+              '',
+              style: TextStyle(
+                fontSize: 20,
+                fontWeight: FontWeight.w500,
+              ),
+            ),
+          ),
+          subtitle: I18nText('settingsView.deleteTempDirHint'),
+          onTap: () => _settingsViewModel.deleteTempDir(),
+        ),
+        ListTile(
+          contentPadding: const EdgeInsets.symmetric(horizontal: 20.0),
+          title: I18nText(
+            'settingsView.deleteLogsLabel',
+            child: const Text(
+              '',
+              style: TextStyle(
+                fontSize: 20,
+                fontWeight: FontWeight.w500,
+              ),
+            ),
+          ),
+          subtitle: I18nText('settingsView.deleteLogsHint'),
+          onTap: () => _settingsViewModel.deleteLogs(),
+        ),
+      ],
+    );
+  }
+}

lib/ui/widgets/settingsView/settings_experimental_patches.dart

@@ -0,0 +1,39 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_i18n/widgets/I18nText.dart';
+import 'package:revanced_manager/ui/views/settings/settings_viewmodel.dart';
+import 'package:revanced_manager/ui/widgets/settingsView/custom_switch_tile.dart';
+
+class SExperimentalPatches extends StatefulWidget {
+  const SExperimentalPatches({super.key});
+
+  @override
+  State<SExperimentalPatches> createState() => _SExperimentalPatchesState();
+}
+
+final _settingsViewModel = SettingsViewModel();
+
+class _SExperimentalPatchesState extends State<SExperimentalPatches> {
+  @override
+  Widget build(BuildContext context) {
+    return CustomSwitchTile(
+      padding: const EdgeInsets.symmetric(horizontal: 20.0),
+      title: I18nText(
+        'settingsView.experimentalPatchesLabel',
+        child: const Text(
+          '',
+          style: TextStyle(
+            fontSize: 20,
+            fontWeight: FontWeight.w500,
+          ),
+        ),
+      ),
+      subtitle: I18nText('settingsView.experimentalPatchesHint'),
+      value: _settingsViewModel.areExperimentalPatchesEnabled(),
+      onTap: (value) {
+        setState(() {
+          _settingsViewModel.useExperimentalPatches(value);
+        });
+      },
+    );
+  }
+}

lib/ui/widgets/settingsView/settings_export_section.dart

@@ -0,0 +1,64 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_i18n/widgets/I18nText.dart';
+import 'package:revanced_manager/ui/views/settings/settings_viewmodel.dart';
+import 'package:revanced_manager/ui/widgets/settingsView/settings_section.dart';
+
+final _settingsViewModel = SettingsViewModel();
+
+class SExportSection extends StatelessWidget {
+  const SExportSection({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return SettingsSection(
+      title: 'settingsView.exportSectionTitle',
+      children: <Widget>[
+        ListTile(
+          contentPadding: const EdgeInsets.symmetric(horizontal: 20.0),
+          title: I18nText(
+            'settingsView.exportPatchesLabel',
+            child: const Text(
+              '',
+              style: TextStyle(
+                fontSize: 20,
+                fontWeight: FontWeight.w500,
+              ),
+            ),
+          ),
+          subtitle: I18nText('settingsView.exportPatchesHint'),
+          onTap: () => _settingsViewModel.exportPatches(),
+        ),
+        ListTile(
+          contentPadding: const EdgeInsets.symmetric(horizontal: 20.0),
+          title: I18nText(
+            'settingsView.importPatchesLabel',
+            child: const Text(
+              '',
+              style: TextStyle(
+                fontSize: 20,
+                fontWeight: FontWeight.w500,
+              ),
+            ),
+          ),
+          subtitle: I18nText('settingsView.importPatchesHint'),
+          onTap: () => _settingsViewModel.importPatches(),
+        ),
+        ListTile(
+          contentPadding: const EdgeInsets.symmetric(horizontal: 20.0),
+          title: I18nText(
+            'settingsView.resetStoredPatchesLabel',
+            child: const Text(
+              '',
+              style: TextStyle(
+                fontSize: 20,
+                fontWeight: FontWeight.w500,
+              ),
+            ),
+          ),
+          subtitle: I18nText('settingsView.resetStoredPatchesHint'),
+          onTap: () => _settingsViewModel.resetSelectedPatches(),
+        ),
+      ],
+    );
+  }
+}

lib/ui/widgets/settingsView/settings_info_section.dart

@@ -0,0 +1,38 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_i18n/widgets/I18nText.dart';
+import 'package:revanced_manager/ui/views/settings/settings_viewmodel.dart';
+import 'package:revanced_manager/ui/widgets/settingsView/about_widget.dart';
+import 'package:revanced_manager/ui/widgets/settingsView/settings_section.dart';
+
+final _settingsViewModel = SettingsViewModel();
+
+class SInfoSection extends StatelessWidget {
+  const SInfoSection({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return SettingsSection(
+      title: 'settingsView.infoSectionTitle',
+      children: <Widget>[
+        ListTile(
+          contentPadding: const EdgeInsets.symmetric(horizontal: 20.0),
+          title: I18nText(
+            'settingsView.logsLabel',
+            child: const Text(
+              '',
+              style: TextStyle(
+                fontSize: 20,
+                fontWeight: FontWeight.w500,
+              ),
+            ),
+          ),
+          subtitle: I18nText('settingsView.logsHint'),
+          onTap: () => _settingsViewModel.exportLogcatLogs(),
+        ),
+        const AboutWidget(
+          padding: EdgeInsets.symmetric(horizontal: 20.0),
+        ),
+      ],
+    );
+  }
+}

lib/ui/widgets/settingsView/settings_logging_section.dart

@@ -0,0 +1,36 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_i18n/widgets/I18nText.dart';
+import 'package:revanced_manager/ui/views/settings/settings_viewmodel.dart';
+import 'package:revanced_manager/ui/widgets/settingsView/custom_switch_tile.dart';
+import 'package:revanced_manager/ui/widgets/settingsView/settings_section.dart';
+
+final _settingsViewModel = SettingsViewModel();
+
+class SLoggingSection extends StatelessWidget {
+  const SLoggingSection({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return SettingsSection(
+      title: 'settingsView.logsSectionTitle',
+      children: <Widget>[
+        CustomSwitchTile(
+          padding: const EdgeInsets.symmetric(horizontal: 20.0),
+          title: I18nText(
+            'settingsView.sentryLabel',
+            child: const Text(
+              '',
+              style: TextStyle(
+                fontSize: 20,
+                fontWeight: FontWeight.w500,
+              ),
+            ),
+          ),
+          subtitle: I18nText('settingsView.sentryHint'),
+          value: _settingsViewModel.isSentryEnabled(),
+          onTap: (value) => _settingsViewModel.useSentry(value),
+        ),
+      ],
+    );
+  }
+}

lib/ui/widgets/settingsView/settings_team_section.dart

@@ -0,0 +1,38 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_i18n/widgets/I18nText.dart';
+import 'package:revanced_manager/ui/views/settings/settings_viewmodel.dart';
+import 'package:revanced_manager/ui/widgets/settingsView/settings_section.dart';
+import 'package:revanced_manager/ui/widgets/settingsView/social_media_widget.dart';
+
+final _settingsViewModel = SettingsViewModel();
+
+class STeamSection extends StatelessWidget {
+  const STeamSection({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return SettingsSection(
+      title: 'settingsView.teamSectionTitle',
+      children: <Widget>[
+        ListTile(
+          contentPadding: const EdgeInsets.symmetric(horizontal: 20.0),
+          title: I18nText(
+            'settingsView.contributorsLabel',
+            child: const Text(
+              '',
+              style: TextStyle(
+                fontSize: 20,
+                fontWeight: FontWeight.w500,
+              ),
+            ),
+          ),
+          subtitle: I18nText('settingsView.contributorsHint'),
+          onTap: () => _settingsViewModel.navigateToContributors(),
+        ),
+        const SocialMediaWidget(
+          padding: EdgeInsets.symmetric(horizontal: 20.0),
+        ),
+      ],
+    );
+  }
+}

lib/ui/widgets/shared/custom_chip.dart

@@ -1,14 +1,14 @@
 import 'package:flutter/material.dart';
 
-class DashboardChip extends StatelessWidget {
+class CustomChip extends StatelessWidget {
   final Widget label;
   final bool isSelected;
   final Function(bool)? onSelected;
 
-  const DashboardChip({
+  const CustomChip({
     Key? key,
     required this.label,
-    required this.isSelected,
+    this.isSelected = false,
     this.onSelected,
   }) : super(key: key);
 

lib/utils/environment.dart

@@ -0,0 +1,5 @@
+// Dummy environment variables used for building the app locally. These automatically get set with correct values during workflow builds.
+class Environment {
+  static const sentryDSN = '';
+  static const crowdinKEY = '';
+}

pubspec.yaml

@@ -4,7 +4,7 @@ homepage: https://github.com/revanced/revanced-manager
 
 publish_to: 'none'
 
-version: 0.0.40+40
+version: 0.0.41+41
 
 environment:
   sdk: ">=2.17.5 <3.0.0"