Allow settings options panel on mobile

LinwoodDev · Nov 29, 2024 · a6a924b · a6a924b
1 parent 8e8478a
commit a6a924b
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 21 deletions.
diff --git a/app/android/Gemfile.lock b/app/android/Gemfile.lock
@@ -10,16 +10,16 @@ GEM
     artifactory (3.0.17)
     atomos (0.1.3)
     aws-eventstream (1.3.0)
-    aws-partitions (1.1011.0)
-    aws-sdk-core (3.213.0)
+    aws-partitions (1.1014.0)
+    aws-sdk-core (3.214.0)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.992.0)
       aws-sigv4 (~> 1.9)
       jmespath (~> 1, >= 1.6.1)
     aws-sdk-kms (1.96.0)
       aws-sdk-core (~> 3, >= 3.210.0)
       aws-sigv4 (~> 1.5)
-    aws-sdk-s3 (1.172.0)
+    aws-sdk-s3 (1.174.0)
       aws-sdk-core (~> 3, >= 3.210.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.5)

diff --git a/app/lib/settings/view.dart b/app/lib/settings/view.dart
@@ -136,19 +136,8 @@ class ViewSettingsPage extends StatelessWidget {
                       leading: const PhosphorIcon(PhosphorIconsLight.archive),
                       title: Text(
                           AppLocalizations.of(context).optionsPanelPosition),
-                      subtitle: Column(
-                        mainAxisSize: MainAxisSize.min,
-                        crossAxisAlignment: CrossAxisAlignment.stretch,
-                        children: [
-                          Text(state.optionsPanelPosition
-                              .getLocalizedName(context)),
-                          Text(
-                            AppLocalizations.of(context)
-                                .onlyAvailableLargerScreen,
-                            style: Theme.of(context).textTheme.labelSmall,
-                          ),
-                        ],
-                      ),
+                      subtitle: Text(
+                          state.optionsPanelPosition.getLocalizedName(context)),
                       onTap: () => _openOptionsPanelPositionModal(context),
                     ),
                     SwitchListTile(
@@ -158,7 +147,7 @@ class ViewSettingsPage extends StatelessWidget {
                           .changeColorToolbarEnabled(value),
                       title: Text(AppLocalizations.of(context).colorToolbar),
                       secondary: const PhosphorIcon(PhosphorIconsLight.palette),
-                    )
+                    ),
                   ]),
             ),
           ),

diff --git a/app/lib/views/main.dart b/app/lib/views/main.dart
@@ -561,8 +561,7 @@ class _MainBody extends StatelessWidget {
                                         currentIndex.hideUi ==
                                             HideState.visible)
                                       toolbar,
-                                    if ((optPos == OptionsPanelPosition.top ||
-                                            isMobile) &&
+                                    if (optPos == OptionsPanelPosition.top &&
                                         currentIndex.hideUi ==
                                             HideState.visible)
                                       const ToolbarView(),
@@ -604,7 +603,6 @@ class _MainBody extends StatelessWidget {
                                       ),
                                     ),
                                     if (optPos == OptionsPanelPosition.bottom &&
-                                        !isMobile &&
                                         currentIndex.hideUi ==
                                             HideState.visible)
                                       const ToolbarView(),

diff --git a/metadata/en-US/changelogs/123.txt b/metadata/en-US/changelogs/123.txt
@@ -2,8 +2,8 @@
 * Add save button indicator for autosave ([#757](https://github.com/LinwoodDev/Butterfly/issues/757))
 * Add duplicate layer button
 * Add tool options panel position
-* Separate laser duration in normal duration and hide duration
 * Add path laser animation
+* Separate laser duration in normal duration and hide duration
 * Use long press to move tools on all platforms to improve desktop touch behavior
 * Use sha checksum for assets
 * Separate personalization settings in new view settings