Fix zoom usable if hidden, closes #538

LinwoodDev · Dec 5, 2023 · 879e13c · 879e13c
1 parent 4e9f0f4
commit 879e13c
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 2 deletions.
diff --git a/app/lib/l10n/app_en.arb b/app/lib/l10n/app_en.arb
@@ -580,5 +580,6 @@
       }
     }
   },
-  "continueAnyway": "Continue anyway"
+  "continueAnyway": "Continue anyway",
+  "zoomControl": "Zoom control"
 }
diff --git a/app/lib/settings/personalization.dart b/app/lib/settings/personalization.dart
@@ -140,7 +140,7 @@ class PersonalizationSettingsPage extends StatelessWidget {
                         SwitchListTile(
                           secondary: const PhosphorIcon(
                               PhosphorIconsLight.magnifyingGlass),
-                          title: Text(AppLocalizations.of(context).zoom),
+                          title: Text(AppLocalizations.of(context).zoomControl),
                           value: state.zoomEnabled,
                           onChanged: (value) => context
                               .read<SettingsCubit>()

diff --git a/app/lib/views/zoom.dart b/app/lib/views/zoom.dart
@@ -148,6 +148,7 @@ class _ZoomViewState extends State<ZoomView> with TickerProviderStateMixin {
             } else {
               _controller.forward();
             }
+            if (_animation.value == 0) return const SizedBox();
             if (!widget.floating) return body;
             return AnimatedBuilder(
               animation: _animation,

diff --git a/fastlane/metadata/android/en-US/changelogs/82.txt b/fastlane/metadata/android/en-US/changelogs/82.txt
@@ -1,4 +1,5 @@
 * Improve documentation of shortcuts ([#534](https://github.com/LinwoodDev/Butterfly/issues/534))
 * Fix closing of settings on click on mobile ([#537](https://github.com/LinwoodDev/Butterfly/issues/537))
+* Fix zoom usable if hidden ([#538](https://github.com/LinwoodDev/Butterfly/issues/538))
 
 View all changes in the blog: https://linwood.dev/butterfly/2.0.0-rc.1