chore: merge dev to main (#1295)

ReVanced · Sep 22, 2023 · d2b0993 · d2b0993
2 parents 5ead49a + 68e9f0f
commit d2b0993
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/lib/ui/views/navigation/navigation_viewmodel.dart b/lib/ui/views/navigation/navigation_viewmodel.dart
@@ -1,4 +1,5 @@
 // ignore_for_file: use_build_context_synchronously
+import 'package:device_info_plus/device_info_plus.dart';
 import 'package:dynamic_themes/dynamic_themes.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
@@ -30,9 +31,23 @@ class NavigationViewModel extends IndexTrackingViewModel {
           );
     }
 
+    final dynamicTheme = DynamicTheme.of(context)!;
     if (prefs.getInt('themeMode') == null) {
       await prefs.setInt('themeMode', 0);
+      await dynamicTheme.setTheme(0);
     }
+
+    // Force disable Material You on Android 11 and below
+    if (dynamicTheme.themeId.isOdd) {
+      const int ANDROID_12_SDK_VERSION = 31;
+      final AndroidDeviceInfo info = await DeviceInfoPlugin().androidInfo;
+      if (info.version.sdkInt < ANDROID_12_SDK_VERSION) {
+        await prefs.setInt('themeMode', 0);
+        await prefs.setBool('useDynamicTheme', false);
+        await dynamicTheme.setTheme(0);
+      }
+    }
+
     SystemChrome.setEnabledSystemUIMode(SystemUiMode.edgeToEdge);
     SystemChrome.setSystemUIOverlayStyle(
       SystemUiOverlayStyle(

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -4,7 +4,7 @@ homepage: https://github.com/revanced/revanced-manager
 
 publish_to: 'none'
 
-version: 1.10.1+101000001
+version: 1.10.2+101000200
 
 environment:
   sdk: '>=3.0.0 <4.0.0'