fix: resolve merge conflicts.

Author: Dhruv1797

lib/view/image_editor.dart

@@ -19,26 +19,6 @@ class ImageEditor extends StatefulWidget {
   State<ImageEditor> createState() => _ImageEditorState();
 }
 
-class _ImageEditorState extends State<ImageEditor> {
-  bool flipHorizontal = false;
-  bool flipVertical = false;
-
-  void toggleFlipHorizontal() {
-    setState(() {
-      flipHorizontal = !flipHorizontal;
-    });
-  }
-
-  void toggleFlipVertical() {
-    setState(() {
-      flipVertical = !flipVertical;
-    });
-  }
-
-  @override
-  State<ImageEditor> createState() => _ImageEditorState();
-}
-
 class _ImageEditorState extends State<ImageEditor> {
   int _selectedFilterIndex = 0;
   bool flipHorizontal = false;
@@ -48,6 +28,20 @@ class _ImageEditorState extends State<ImageEditor> {
   List<img.Image> _rawImages = [];
   List<Uint8List> _processedPngs = [];
 
+  @override
+  void initState() {
+    super.initState();
+    Future.microtask(() {
+      final imgLoader = context.read<ImageLoader>();
+      if (imgLoader.image == null) {
+        imgLoader.loadFinalizedImage(
+          width: widget.epd.width,
+          height: widget.epd.height,
+        );
+      }
+    });
+  }
+
   void _onFilterSelected(int index) {
     if (_selectedFilterIndex != index) {
       setState(() {
@@ -147,35 +141,36 @@ class _ImageEditorState extends State<ImageEditor> {
             ),
         ],
       ),
-      floatingActionButton: orgImg != null
-          ? FlipControls(
-              onFlipHorizontal: toggleFlipHorizontal,
-              onFlipVertical: toggleFlipVertical,
-            )
-          : null,
-      body: SafeArea(
-        child: Padding(
-          padding: const EdgeInsets.symmetric(horizontal: 8.0),
-          child: _processedPngs.isNotEmpty
-              ? ImageList(
-                  key: ValueKey(_processedSourceImage),
-                  processedPngs: _processedPngs,
-                  epd: widget.epd,
-                  selectedIndex: _selectedFilterIndex,
-                  flipHorizontal: flipHorizontal,
-                  flipVertical: flipVertical,
-                  onFilterSelected: _onFilterSelected,
-                  onFlipHorizontal: toggleFlipHorizontal,
-                  onFlipVertical: toggleFlipVertical,
-                )
-              : const Center(
-                  child: Text(
-                    "Import an image to begin",
-                    style: TextStyle(color: Colors.grey, fontSize: 16),
-                  ),
-                ),
-        ),
-      ),
+      body: imgLoader.isLoading
+          ? const Center(
+              child: Text('Loading...',
+                  style: TextStyle(
+                    color: colorBlack,
+                    fontSize: 14,
+                  )))
+          : SafeArea(
+              child: Padding(
+                padding: const EdgeInsets.symmetric(horizontal: 8.0),
+                child: _processedPngs.isNotEmpty
+                    ? ImageList(
+                        key: ValueKey(_processedSourceImage),
+                        processedPngs: _processedPngs,
+                        epd: widget.epd,
+                        selectedIndex: _selectedFilterIndex,
+                        flipHorizontal: flipHorizontal,
+                        flipVertical: flipVertical,
+                        onFilterSelected: _onFilterSelected,
+                        onFlipHorizontal: toggleFlipHorizontal,
+                        onFlipVertical: toggleFlipVertical,
+                      )
+                    : const Center(
+                        child: Text(
+                          "Import an image to begin",
+                          style: TextStyle(color: Colors.grey, fontSize: 16),
+                        ),
+                      ),
+              ),
+            ),
       bottomNavigationBar: BottomActionMenu(
         epd: widget.epd,
         imgLoader: imgLoader,
@@ -219,8 +214,14 @@ class BottomActionMenu extends StatelessWidget {
                 context: context,
                 icon: Icons.add_photo_alternate_outlined,
                 label: 'Import New',
-                onTap: () {
-                  imgLoader.pickImage(width: epd.width, height: epd.height);
+                onTap: () async {
+                  final success = await imgLoader.pickImage(
+                      width: epd.width, height: epd.height);
+                  if (success && imgLoader.image != null) {
+                    final bytes =
+                        Uint8List.fromList(img.encodePng(imgLoader.image!));
+                    await imgLoader.saveFinalizedImageBytes(bytes);
+                  }
                 },
               ),
               _buildActionButton(
@@ -236,11 +237,12 @@ class BottomActionMenu extends StatelessWidget {
                     ),
                   );
                   if (canvasBytes != null) {
-                    imgLoader.updateImage(
+                    await imgLoader.updateImage(
                       bytes: canvasBytes,
                       width: epd.width,
                       height: epd.height,
                     );
+                    await imgLoader.saveFinalizedImageBytes(canvasBytes);
                   }
                 },
               ),