From da6736a35b576c79aa6c9d6b47d1068e27ec6555 Mon Sep 17 00:00:00 2001
From: Yassin Nouh <70436855+YassinNouh21@users.noreply.github.com>
Date: Sun, 1 Dec 2024 22:51:18 +0200
Subject: [PATCH] fix: Resolve overlapping and focus issues for Back and Switch
 buttons (#1457)

---
 .../quran/reading/quran_reading_screen.dart   | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/lib/src/pages/quran/reading/quran_reading_screen.dart b/lib/src/pages/quran/reading/quran_reading_screen.dart
index db51bcbf..fa2ff88d 100644
--- a/lib/src/pages/quran/reading/quran_reading_screen.dart
+++ b/lib/src/pages/quran/reading/quran_reading_screen.dart
@@ -136,11 +136,6 @@ class NormalViewStrategy implements QuranViewStrategy {
   ) {
     if (isPortrait) {
       return [
-        BackButtonWidget(
-          isPortrait: isPortrait,
-          userPrefs: userPrefs,
-          focusNode: focusNodes.backButtonNode,
-        ),
         SurahSelectorWidget(
           isPortrait: isPortrait,
           focusNode: focusNodes.surahSelectorNode,
@@ -157,15 +152,15 @@ class NormalViewStrategy implements QuranViewStrategy {
           focusNode: focusNodes.switchQuranNode,
           isThereCurrentDialogShowing: false,
         ),
+        BackButtonWidget(
+          isPortrait: isPortrait,
+          userPrefs: userPrefs,
+          focusNode: focusNodes.backButtonNode,
+        ),
       ];
     }
 
     return [
-      BackButtonWidget(
-        isPortrait: isPortrait,
-        userPrefs: userPrefs,
-        focusNode: focusNodes.backButtonNode,
-      ),
       _buildNavigationButtons(
         context,
         focusNodes,
@@ -188,6 +183,11 @@ class NormalViewStrategy implements QuranViewStrategy {
         focusNode: focusNodes.switchQuranNode,
         isThereCurrentDialogShowing: false,
       ),
+      BackButtonWidget(
+        isPortrait: isPortrait,
+        userPrefs: userPrefs,
+        focusNode: focusNodes.backButtonNode,
+      ),
     ];
   }