Provided a new parameter to control preview alignment

mateusfccp · Jan 31, 2020 · afcee75 · afcee75
1 parent d132065
commit afcee75
Show file tree

Hide file tree

Showing 5 changed files with 42 additions and 17 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 0.1.4
+
+* Added a new parameter to `MagicEye` to control preview alignment.
+* **Possibly Breaking Change:** By default, the alignment is now `topCenter`.
+
 ## 0.1.3+2
 
 * Added a [`analysis_options.yaml`](https://dart.dev/guides/language/analysis-options) file

diff --git a/example/pubspec.lock b/example/pubspec.lock
@@ -94,7 +94,7 @@ packages:
       path: ".."
       relative: true
     source: path
-    version: "0.1.3+2"
+    version: "0.1.4"
   matcher:
     dependency: transitive
     description:

diff --git a/lib/src/layers/default_camera_control_layer.dart b/lib/src/layers/default_camera_control_layer.dart
@@ -59,7 +59,7 @@ Widget Function(BuildContext, ControlLayerContext) defaultCameraControlLayer() {
               }
 
               return Stack(
-                alignment: Alignment.bottomCenter,
+                alignment: Alignment.topCenter,
                 children: <Widget>[
                   if (snapshot.data is _TakingPicture ||
                       snapshot.data is _WithPicture)
@@ -73,16 +73,26 @@ Widget Function(BuildContext, ControlLayerContext) defaultCameraControlLayer() {
                       ),
                     ),
                   if (snapshot.data is _WithPicture)
-                    _BottomConfirmationButtons(
-                      path: (snapshot.data as _WithPicture).path,
-                      pathStream: cameraState,
+                    Positioned(
+                      bottom: 0,
+                      left: 0,
+                      right: 0,
+                      child: _BottomConfirmationButtons(
+                        path: (snapshot.data as _WithPicture).path,
+                        pathStream: cameraState,
+                      ),
                     ),
                   if (snapshot.data is _TakingPicture)
                     Center(child: CircularProgressIndicator()),
                   if (snapshot.data is _Idle)
-                    _BottomPictureButtons(
-                      layerContext: layerContext,
-                      cameraState: cameraState,
+                    Positioned(
+                      bottom: 0,
+                      left: 0,
+                      right: 0,
+                      child: _BottomPictureButtons(
+                        layerContext: layerContext,
+                        cameraState: cameraState,
+                      ),
                     ),
                 ],
               );

diff --git a/lib/src/widget/magiceye_widget.dart b/lib/src/widget/magiceye_widget.dart
@@ -98,6 +98,9 @@ class MagicEye extends StatelessWidget with WidgetsBindingObserver {
           .map((orientation) => DeviceDirection.values[orientation.index])
           .shareValue() as BehaviorSubject<DeviceDirection>;
 
+  /// The alignment of the preview in the stack
+  final AlignmentDirectional previewAlignment;
+
   /// Creates a MagicEye component.
   MagicEye({
     Key key,
@@ -115,6 +118,7 @@ class MagicEye extends StatelessWidget with WidgetsBindingObserver {
       DeviceDirection.portraitReversed,
       DeviceDirection.landscapeRight,
     },
+    this.previewAlignment = AlignmentDirectional.topCenter,
   })  : this._bloc = MagicEyeBloc(
           resolutionPreset: resolutionPreset,
           defaultDirection: defaultDirection,
@@ -137,7 +141,7 @@ class MagicEye extends StatelessWidget with WidgetsBindingObserver {
         builder: (context, snapshot) => snapshot.data.fold<Widget>(
           () => Center(child: loadingWidget),
           (controller) => Stack(
-            alignment: AlignmentDirectional.bottomCenter,
+            alignment: this.previewAlignment,
             children: [
               AspectRatio(
                 aspectRatio: controller.value.aspectRatio,
@@ -154,13 +158,19 @@ class MagicEye extends StatelessWidget with WidgetsBindingObserver {
                   ],
                 ),
               ),
-              controlLayer(
-                context,
-                ControlLayerContext(
-                  allowedCameras: allowedCameras,
-                  allowedDirections: allowedDirections,
-                  bloc: _bloc,
-                  direction: _orientation,
+              Positioned(
+                bottom: 0,
+                top: 0,
+                left: 0,
+                right: 0,
+                child: controlLayer(
+                  context,
+                  ControlLayerContext(
+                    allowedCameras: allowedCameras,
+                    allowedDirections: allowedDirections,
+                    bloc: _bloc,
+                    direction: _orientation,
+                  ),
                 ),
               ),
             ],

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -1,6 +1,6 @@
 name: magiceye
 description: An abstraction on top of flutter camera, that allows you to have a default camera screen or build your own with the layer builders.
-version: 0.1.3+2
+version: 0.1.4
 homepage: https://github.com/mateusfccp/magiceye
 repository: https://github.com/mateusfccp/magiceye