Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: Resolve overlapping and focus issues for Back and Switch buttons #1457

Merged
merged 1 commit into from
Dec 1, 2024
Merged

fix: Resolve overlapping and focus issues for Back and Switch buttons #1457

merged 1 commit into from
Dec 1, 2024

Conversation

YassinNouh21
Copy link
Contributor

@YassinNouh21 YassinNouh21 commented Dec 1, 2024 •
edited
Loading

📝 Summary

This PR fixes #1456

Description

This PR resolves the overlapping and focus issues between the Back and Switch buttons in the Quran reading screen.

Key Changes

  • Fixed overlapping of the Back and Switch buttons in portrait mode by adjusting the layout and ensuring proper vertical spacing.
  • Improved focus traversal logic, enabling smooth navigation between the Back and Switch buttons.

These improvements enhance both the visual appearance and the user interaction experience.

Tests

🧪 Use case 1

💬 Description:

  1. Open the Quran reading screen in portrait mode.
  2. Verify that the Back and Switch buttons no longer overlap.
  3. Test the focus navigation between the buttons to ensure smooth transitions.

📷 Screenshots or GIFs (if applicable):

portrait_mode_back

🧪 Use case 2

💬 Description:

  1. Rotate the device to landscape mode.
  2. Confirm that the layout changes do not negatively affect button placement or behavior in this mode.

horizontal

Checklist

  • Coding Standards: I have reviewed my code to ensure it follows the project's coding standards.
  • Testing: I have tested the changes and they work as expected.
  • Merge Conflicts: I have resolved any merge conflicts with the latest main/development branch.
  • Branch Status: The branch is up-to-date with the target branch (main/development).

@YassinNouh21 YassinNouh21 added the bug Something isn't working label Dec 1, 2024
@YassinNouh21 YassinNouh21 self-assigned this Dec 1, 2024
@YassinNouh21 YassinNouh21 linked an issue Dec 1, 2024 that may be closed by this pull request
Overlapping Back and Switch Buttons in Quran Reading Screen #1456
Closed
ghassenbenzahra123
ghassenbenzahra123 approved these changes Dec 1, 2024
View reviewed changes
Copy link
Contributor

@ghassenbenzahra123 ghassenbenzahra123 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!

@ghassenbenzahra123 ghassenbenzahra123 merged commit da6736a into main Dec 1, 2024
1 check passed
@ghassenbenzahra123 ghassenbenzahra123 deleted the hotfix/unpressed-back-button-reading branch December 1, 2024 20:51
ghassenbenzahra123 added a commit that referenced this pull request Dec 3, 2024
@ghassenbenzahra123 @YassinNouh21 @ibrahim-zehhaf-mawaqit
Fix/ Update 1.18 branch with main changes (#1463)
6422442 
* fix: Improve Quran Download and Navigation Experience (#1452)

* fix: Ensure correct Moshaf type (Hafs) is displayed after download

* fix: display Hafs Quran correctly and remove success dialog

- Set Hafs as default Moshaf type if none is selected.
- Auto-dismiss success dialog on download completion.
- Improved state invalidation for Quran reading updates.
- Added FocusNode for better dialog interaction.
- Optimized resource management with keepAlive and link.close().

* fix: improve Quran Download and Navigation Experience

- Redirect user to Quran reading screen automatically after successful download and extraction of Quran (Hafs).
- Remove the unnecessary "OK" button to confirm Quran download completion, streamlining the user experience.
- Enhance state management for download-related UI in `quran_reading_screen.dart` to handle various download states (needed, downloading, extracting).
- Update `download_quran_popup.dart` to ensure proper navigation based on the user's first-time download experience.
- Improve error handling and loading indicators for a smoother and more intuitive flow.

* fix formating

* Update pubspec.yaml

* fix: Resolve overlapping and focus issues for Back and Switch buttons (#1457)

* fix: Resolve pop-up issue when selecting Listening mode (#1455)

- updated `_handleNavigation` method in `quran_mode_selection_screen.dart` to use `async/await` for ensuring proper completion of Quran mode selection before navigation.
- fixed unexpected pop-ups by adjusting the handling of the `moshafType` state in `download_quran_popup.dart`.
- improved navigation flow for both Reading and Listening modes, ensuring seamless user experience.

Co-authored-by: Ghassen Ben Zahra <[email protected]>

* Update pubspec.yaml

---------

Co-authored-by: Yassin Nouh <[email protected]>
Co-authored-by: Ibrahim ZEHHAF <[email protected]>
YassinNouh21 added a commit that referenced this pull request Dec 3, 2024
@ghassenbenzahra123 @YassinNouh21 @ibrahim-zehhaf-mawaqit
Fix/ Update 1.18 branch with main changes (#1463)
d1e490d 
* fix: Improve Quran Download and Navigation Experience (#1452)

* fix: Ensure correct Moshaf type (Hafs) is displayed after download

* fix: display Hafs Quran correctly and remove success dialog

- Set Hafs as default Moshaf type if none is selected.
- Auto-dismiss success dialog on download completion.
- Improved state invalidation for Quran reading updates.
- Added FocusNode for better dialog interaction.
- Optimized resource management with keepAlive and link.close().

* fix: improve Quran Download and Navigation Experience

- Redirect user to Quran reading screen automatically after successful download and extraction of Quran (Hafs).
- Remove the unnecessary "OK" button to confirm Quran download completion, streamlining the user experience.
- Enhance state management for download-related UI in `quran_reading_screen.dart` to handle various download states (needed, downloading, extracting).
- Update `download_quran_popup.dart` to ensure proper navigation based on the user's first-time download experience.
- Improve error handling and loading indicators for a smoother and more intuitive flow.

* fix formating

* Update pubspec.yaml

* fix: Resolve overlapping and focus issues for Back and Switch buttons (#1457)

* fix: Resolve pop-up issue when selecting Listening mode (#1455)

- updated `_handleNavigation` method in `quran_mode_selection_screen.dart` to use `async/await` for ensuring proper completion of Quran mode selection before navigation.
- fixed unexpected pop-ups by adjusting the handling of the `moshafType` state in `download_quran_popup.dart`.
- improved navigation flow for both Reading and Listening modes, ensuring seamless user experience.

Co-authored-by: Ghassen Ben Zahra <[email protected]>

* Update pubspec.yaml

---------

Co-authored-by: Yassin Nouh <[email protected]>
Co-authored-by: Ibrahim ZEHHAF <[email protected]>
YassinNouh21 added a commit that referenced this pull request Dec 12, 2024
@ghassenbenzahra123 @YassinNouh21 @ibrahim-zehhaf-mawaqit
Feat/on off for tablet (#1464)
cc845c3 
* fix: Improve Quran Download and Navigation Experience (#1452)

* fix: Ensure correct Moshaf type (Hafs) is displayed after download

* fix: display Hafs Quran correctly and remove success dialog

- Set Hafs as default Moshaf type if none is selected.
- Auto-dismiss success dialog on download completion.
- Improved state invalidation for Quran reading updates.
- Added FocusNode for better dialog interaction.
- Optimized resource management with keepAlive and link.close().

* fix: improve Quran Download and Navigation Experience

- Redirect user to Quran reading screen automatically after successful download and extraction of Quran (Hafs).
- Remove the unnecessary "OK" button to confirm Quran download completion, streamlining the user experience.
- Enhance state management for download-related UI in `quran_reading_screen.dart` to handle various download states (needed, downloading, extracting).
- Update `download_quran_popup.dart` to ensure proper navigation based on the user's first-time download experience.
- Improve error handling and loading indicators for a smoother and more intuitive flow.

* fix formating

* Update pubspec.yaml

* fix: Resolve overlapping and focus issues for Back and Switch buttons (#1457)

* fix: Resolve pop-up issue when selecting Listening mode (#1455)

- updated `_handleNavigation` method in `quran_mode_selection_screen.dart` to use `async/await` for ensuring proper completion of Quran mode selection before navigation.
- fixed unexpected pop-ups by adjusting the handling of the `moshafType` state in `download_quran_popup.dart`.
- improved navigation flow for both Reading and Listening modes, ensuring seamless user experience.

Co-authored-by: Ghassen Ben Zahra <[email protected]>

* Update pubspec.yaml

* add support of on/off feature to tablet

* fix: remove open bracket intl_en.arb

---------

Co-authored-by: Yassin Nouh <[email protected]>
Co-authored-by: Ibrahim ZEHHAF <[email protected]>
Co-authored-by: Yassin <[email protected]>
ghassenbenzahra123 added a commit that referenced this pull request Dec 15, 2024
@ibrahim-zehhaf-mawaqit @YassinNouh21 @ghassenbenzahra123
New Crowdin updates (#1467)
f0a3b63 
* fix: Improve Quran Download and Navigation Experience (#1452)

* fix: Ensure correct Moshaf type (Hafs) is displayed after download

* fix: display Hafs Quran correctly and remove success dialog

- Set Hafs as default Moshaf type if none is selected.
- Auto-dismiss success dialog on download completion.
- Improved state invalidation for Quran reading updates.
- Added FocusNode for better dialog interaction.
- Optimized resource management with keepAlive and link.close().

* fix: improve Quran Download and Navigation Experience

- Redirect user to Quran reading screen automatically after successful download and extraction of Quran (Hafs).
- Remove the unnecessary "OK" button to confirm Quran download completion, streamlining the user experience.
- Enhance state management for download-related UI in `quran_reading_screen.dart` to handle various download states (needed, downloading, extracting).
- Update `download_quran_popup.dart` to ensure proper navigation based on the user's first-time download experience.
- Improve error handling and loading indicators for a smoother and more intuitive flow.

* fix formating

* Update pubspec.yaml

* fix: Resolve overlapping and focus issues for Back and Switch buttons (#1457)

* fix: Resolve pop-up issue when selecting Listening mode (#1455)

- updated `_handleNavigation` method in `quran_mode_selection_screen.dart` to use `async/await` for ensuring proper completion of Quran mode selection before navigation.
- fixed unexpected pop-ups by adjusting the handling of the `moshafType` state in `download_quran_popup.dart`.
- improved navigation flow for both Reading and Listening modes, ensuring seamless user experience.

Co-authored-by: Ghassen Ben Zahra <[email protected]>

* Update pubspec.yaml

* New translations intl_en.arb (pt)

* New translations intl_en.arb (pt)

* New translations intl_en.arb (Portuguese, Brazilian)

* New translations intl_en.arb (Italian)

* New translations intl_en.arb (Italian)

* New translations intl_en.arb (Italian)

* New translations intl_en.arb (Italian)

* fix merge conflict

---------

Co-authored-by: Yassin Nouh <[email protected]>
Co-authored-by: Ghassen Ben Zahra <[email protected]>
ghassenbenzahra123 added a commit that referenced this pull request Dec 18, 2024
@ghassenbenzahra123 @YassinNouh21 @ibrahim-zehhaf-mawaqit
Fix/Navigation with remote control is not working anymore in Quran re…
605345b 
…ading mode (#1482)

* fix: Improve Quran Download and Navigation Experience (#1452)

* fix: Ensure correct Moshaf type (Hafs) is displayed after download

* fix: display Hafs Quran correctly and remove success dialog

- Set Hafs as default Moshaf type if none is selected.
- Auto-dismiss success dialog on download completion.
- Improved state invalidation for Quran reading updates.
- Added FocusNode for better dialog interaction.
- Optimized resource management with keepAlive and link.close().

* fix: improve Quran Download and Navigation Experience

- Redirect user to Quran reading screen automatically after successful download and extraction of Quran (Hafs).
- Remove the unnecessary "OK" button to confirm Quran download completion, streamlining the user experience.
- Enhance state management for download-related UI in `quran_reading_screen.dart` to handle various download states (needed, downloading, extracting).
- Update `download_quran_popup.dart` to ensure proper navigation based on the user's first-time download experience.
- Improve error handling and loading indicators for a smoother and more intuitive flow.

* fix formating

* Update pubspec.yaml

* fix: Resolve overlapping and focus issues for Back and Switch buttons (#1457)

* fix: Resolve pop-up issue when selecting Listening mode (#1455)

- updated `_handleNavigation` method in `quran_mode_selection_screen.dart` to use `async/await` for ensuring proper completion of Quran mode selection before navigation.
- fixed unexpected pop-ups by adjusting the handling of the `moshafType` state in `download_quran_popup.dart`.
- improved navigation flow for both Reading and Listening modes, ensuring seamless user experience.

Co-authored-by: Ghassen Ben Zahra <[email protected]>

* Update pubspec.yaml

* fix: remove the traversal node in the reading quran

* feat: add the setupFocusTraversal method

* fix focus issues in portrait mode

* code format

---------

Co-authored-by: Yassin Nouh <[email protected]>
Co-authored-by: Ibrahim ZEHHAF <[email protected]>
Co-authored-by: Yassin <[email protected]>
ghassenbenzahra123 added a commit that referenced this pull request Dec 18, 2024
@ghassenbenzahra123 @YassinNouh21 @ibrahim-zehhaf-mawaqit
Fix/missing dua iftar (#1484)
58199ed 
* fix: Improve Quran Download and Navigation Experience (#1452)

* fix: Ensure correct Moshaf type (Hafs) is displayed after download

* fix: display Hafs Quran correctly and remove success dialog

- Set Hafs as default Moshaf type if none is selected.
- Auto-dismiss success dialog on download completion.
- Improved state invalidation for Quran reading updates.
- Added FocusNode for better dialog interaction.
- Optimized resource management with keepAlive and link.close().

* fix: improve Quran Download and Navigation Experience

- Redirect user to Quran reading screen automatically after successful download and extraction of Quran (Hafs).
- Remove the unnecessary "OK" button to confirm Quran download completion, streamlining the user experience.
- Enhance state management for download-related UI in `quran_reading_screen.dart` to handle various download states (needed, downloading, extracting).
- Update `download_quran_popup.dart` to ensure proper navigation based on the user's first-time download experience.
- Improve error handling and loading indicators for a smoother and more intuitive flow.

* fix formating

* Update pubspec.yaml

* fix: Resolve overlapping and focus issues for Back and Switch buttons (#1457)

* fix: Resolve pop-up issue when selecting Listening mode (#1455)

- updated `_handleNavigation` method in `quran_mode_selection_screen.dart` to use `async/await` for ensuring proper completion of Quran mode selection before navigation.
- fixed unexpected pop-ups by adjusting the handling of the `moshafType` state in `download_quran_popup.dart`.
- improved navigation flow for both Reading and Listening modes, ensuring seamless user experience.

Co-authored-by: Ghassen Ben Zahra <[email protected]>

* Update pubspec.yaml

* add missing translations (#1468)

* Update pubspec.yaml

* add missing dua text

* code format

---------

Co-authored-by: Yassin Nouh <[email protected]>
Co-authored-by: Ibrahim ZEHHAF <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ghassenbenzahra123 ghassenbenzahra123 ghassenbenzahra123 approved these changes

Assignees

@YassinNouh21 YassinNouh21

Labels
bug Something isn't working
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Overlapping Back and Switch Buttons in Quran Reading Screen
2 participants
@YassinNouh21 @ghassenbenzahra123