Merge branch 'main' into feature/routing_fixes

# Conflicts:
#	lib/logic/app_logic.dart
This commit is contained in:
Shawn 2024-01-17 11:42:24 -07:00
commit 59af5d9e3e
2 changed files with 3 additions and 3 deletions

View File

@ -53,8 +53,8 @@ class AppLogic {
await AppBitmaps.init(); await AppBitmaps.init();
// Set preferred refresh rate to the max possible (the OS may ignore this) // Set preferred refresh rate to the max possible (the OS may ignore this)
if (PlatformInfo.isAndroid) { if (!kIsWeb && PlatformInfo.isAndroid) {
FlutterDisplayMode.setHighRefreshRate(); await FlutterDisplayMode.setHighRefreshRate();
} }
// Settings // Settings

View File

@ -12,7 +12,7 @@ class AppHaptics {
static void buttonPress() { static void buttonPress() {
// Android/Fuchsia expect haptics on all button presses, iOS does not. // Android/Fuchsia expect haptics on all button presses, iOS does not.
if (PlatformInfo.isAndroid) { if (!kIsWeb && PlatformInfo.isAndroid) {
lightImpact(); lightImpact();
} }
} }