Add tool options panel position

api/lib/src/protocol/event.dart

@@ -141,10 +141,8 @@ class DocumentEvent extends ReplayEvent with _$DocumentEvent {
     String id,
   ) = LayerRemoved;
 
-  const factory DocumentEvent.layersMerged(
-    List<String> layers,
-    [bool duplicate = false],
-  ) = LayersMerged;
+  const factory DocumentEvent.layersMerged(List<String> layers,
+      [@Default(false) bool duplicate]) = LayersMerged;
 
   const factory DocumentEvent.layerOrderChanged(
     String id,

api/lib/src/protocol/event.freezed.dart

@@ -3410,7 +3410,7 @@ abstract class _$$LayersMergedImplCopyWith<$Res> {
           _$LayersMergedImpl value, $Res Function(_$LayersMergedImpl) then) =
       __$$LayersMergedImplCopyWithImpl<$Res>;
   @useResult
-  $Res call({List<String> layers});
+  $Res call({List<String> layers, bool duplicate});
 }
 
 /// @nodoc
@@ -3427,20 +3427,26 @@ class __$$LayersMergedImplCopyWithImpl<$Res>
   @override
   $Res call({
     Object? layers = null,
+    Object? duplicate = null,
   }) {
     return _then(_$LayersMergedImpl(
       null == layers
           ? _value._layers
           : layers // ignore: cast_nullable_to_non_nullable
               as List<String>,
+      null == duplicate
+          ? _value.duplicate
+          : duplicate // ignore: cast_nullable_to_non_nullable
+              as bool,
     ));
   }
 }
 
 /// @nodoc
 @JsonSerializable()
 class _$LayersMergedImpl extends LayersMerged {
-  const _$LayersMergedImpl(final List<String> layers, {final String? $type})
+  const _$LayersMergedImpl(final List<String> layers,
+      [this.duplicate = false, final String? $type])
       : _layers = layers,
         $type = $type ?? 'layersMerged',
         super._();
@@ -3456,26 +3462,32 @@ class _$LayersMergedImpl extends LayersMerged {
     return EqualUnmodifiableListView(_layers);
   }
 
+  @override
+  @JsonKey()
+  final bool duplicate;
+
   @JsonKey(name: 'type')
   final String $type;
 
   @override
   String toString() {
-    return 'DocumentEvent.layersMerged(layers: $layers)';
+    return 'DocumentEvent.layersMerged(layers: $layers, duplicate: $duplicate)';
   }
 
   @override
   bool operator ==(Object other) {
     return identical(this, other) ||
         (other.runtimeType == runtimeType &&
             other is _$LayersMergedImpl &&
-            const DeepCollectionEquality().equals(other._layers, _layers));
+            const DeepCollectionEquality().equals(other._layers, _layers) &&
+            (identical(other.duplicate, duplicate) ||
+                other.duplicate == duplicate));
   }
 
   @JsonKey(includeFromJson: false, includeToJson: false)
   @override
-  int get hashCode =>
-      Object.hash(runtimeType, const DeepCollectionEquality().hash(_layers));
+  int get hashCode => Object.hash(
+      runtimeType, const DeepCollectionEquality().hash(_layers), duplicate);
 
   /// Create a copy of DocumentEvent
   /// with the given fields replaced by the non-null parameter values.
@@ -3494,13 +3506,15 @@ class _$LayersMergedImpl extends LayersMerged {
 }
 
 abstract class LayersMerged extends DocumentEvent {
-  const factory LayersMerged(final List<String> layers) = _$LayersMergedImpl;
+  const factory LayersMerged(final List<String> layers,
+      [final bool duplicate]) = _$LayersMergedImpl;
   const LayersMerged._() : super._();
 
   factory LayersMerged.fromJson(Map<String, dynamic> json) =
       _$LayersMergedImpl.fromJson;
 
   List<String> get layers;
+  bool get duplicate;
 
   /// Create a copy of DocumentEvent
   /// with the given fields replaced by the non-null parameter values.

app/lib/bloc/document_bloc.dart

@@ -687,7 +687,7 @@ class DocumentBloc extends ReplayBloc<DocumentEvent, DocumentState> {
         ...aboveLayers.expand((e) => current.page.getLayer(e).content),
       ]);
       final newLayers = layers
-          .where((e) => duplicate || !mergedLayers.contains(e.id))
+          .where((e) => event.duplicate || !mergedLayers.contains(e.id))
           .map((e) => e.id == mainLayer ? layer : e)
           .toList();
       return _saveState(

app/lib/cubits/settings.dart

@@ -137,6 +137,16 @@ enum ToolbarPosition {
       };
 }
 
+enum OptionsPanelPosition {
+  top,
+  bottom;
+
+  String getLocalizedName(BuildContext context) => switch (this) {
+        OptionsPanelPosition.top => AppLocalizations.of(context).top,
+        OptionsPanelPosition.bottom => AppLocalizations.of(context).bottom,
+      };
+}
+
 enum ThemeDensity {
   system,
   maximize,
@@ -208,6 +218,8 @@ class ButterflySettings with _$ButterflySettings, LeapSettings {
     @Default(UtilitiesState()) UtilitiesState utilities,
     @Default(StartupBehavior.openHomeScreen) StartupBehavior onStartup,
     @Default(true) bool colorToolbarEnabled,
+    @Default(OptionsPanelPosition.top)
+    OptionsPanelPosition optionsPanelPosition,
   }) = _ButterflySettings;
 
   factory ButterflySettings.fromPrefs(SharedPreferences prefs) {
@@ -303,6 +315,10 @@ class ButterflySettings with _$ButterflySettings, LeapSettings {
           : StartupBehavior.openHomeScreen,
       colorToolbarEnabled: prefs.getBool('color_toolbar_enabled') ?? true,
       showSaveButton: prefs.getBool('show_save_button') ?? true,
+      optionsPanelPosition: prefs.containsKey('options_panel_position')
+          ? OptionsPanelPosition.values
+              .byName(prefs.getString('options_panel_position')!)
+          : OptionsPanelPosition.top,
     );
   }
 
@@ -372,6 +388,7 @@ class ButterflySettings with _$ButterflySettings, LeapSettings {
     await prefs.setString('on_startup', onStartup.name);
     await prefs.setBool('color_toolbar_enabled', colorToolbarEnabled);
     await prefs.setBool('show_save_button', showSaveButton);
+    await prefs.setString('options_panel_position', optionsPanelPosition.name);
   }
 
   ExternalStorage? getRemote(String? identifier) {
@@ -464,11 +481,16 @@ class SettingsCubit extends Cubit<ButterflySettings>
     return save();
   }
 
-  Future<void> resetToolbarSize() {
-    emit(state.copyWith(toolbarSize: ToolbarSize.normal));
+  Future<void> resetToolbarSize() => changeToolbarSize(ToolbarSize.normal);
+
+  Future<void> changeOptionsPanelPosition(OptionsPanelPosition position) {
+    emit(state.copyWith(optionsPanelPosition: position));
     return save();
   }
 
+  Future<void> resetOptionsPanelPosition() =>
+      changeOptionsPanelPosition(OptionsPanelPosition.top);
+
   void changeLocaleTemporarily(String locale) {
     emit(state.copyWith(localeTag: locale));
   }