From b803ce7435983a6f4ee164927a7cf65ebc59ca56 Mon Sep 17 00:00:00 2001
From: Dhruvan Bhalara <53393418+dhruvanbhalara@users.noreply.github.com>
Date: Wed, 10 May 2023 15:48:51 +0530
Subject: [PATCH] fix: system navigation overlapping UI (#853)

---
 lib/ui/views/app_selector/app_selector_view.dart         | 5 ++++-
 lib/ui/views/contributors/contributors_view.dart         | 1 +
 lib/ui/views/installer/installer_view.dart               | 6 ++++++
 lib/ui/views/patches_selector/patches_selector_view.dart | 6 ++++--
 4 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/lib/ui/views/app_selector/app_selector_view.dart b/lib/ui/views/app_selector/app_selector_view.dart
index 487f08a8..620c7b68 100644
--- a/lib/ui/views/app_selector/app_selector_view.dart
+++ b/lib/ui/views/app_selector/app_selector_view.dart
@@ -92,7 +92,10 @@ class _AppSelectorViewState extends State<AppSelectorView> {
                       ? const AppSkeletonLoader()
                       : Padding(
                           padding: const EdgeInsets.symmetric(horizontal: 12.0)
-                              .copyWith(bottom: 80),
+                              .copyWith(
+                            bottom:
+                                MediaQuery.of(context).viewPadding.bottom + 8.0,
+                          ),
                           child: Column(
                             children: [
                               ...model
diff --git a/lib/ui/views/contributors/contributors_view.dart b/lib/ui/views/contributors/contributors_view.dart
index 3ebebd7a..1fdc6d40 100644
--- a/lib/ui/views/contributors/contributors_view.dart
+++ b/lib/ui/views/contributors/contributors_view.dart
@@ -57,6 +57,7 @@ class ContributorsView extends StatelessWidget {
                       title: 'contributorsView.managerContributors',
                       contributors: model.managerContributors,
                     ),
+                    SizedBox(height: MediaQuery.of(context).viewPadding.bottom)
                   ],
                 ),
               ),
diff --git a/lib/ui/views/installer/installer_view.dart b/lib/ui/views/installer/installer_view.dart
index 0a2c5487..2ba73779 100644
--- a/lib/ui/views/installer/installer_view.dart
+++ b/lib/ui/views/installer/installer_view.dart
@@ -20,6 +20,7 @@ class InstallerView extends StatelessWidget {
       builder: (context, model, child) => WillPopScope(
         child: SafeArea(
           top: false,
+          bottom: false,
           child: Scaffold(
             body: CustomScrollView(
               controller: model.scrollController,
@@ -153,6 +154,11 @@ class InstallerView extends StatelessWidget {
                     ),
                   ),
                 ),
+                SliverFillRemaining(
+                  hasScrollBody: false,
+                  child: SizedBox(
+                      height: MediaQuery.of(context).viewPadding.bottom),
+                ),
               ],
             ),
           ),
diff --git a/lib/ui/views/patches_selector/patches_selector_view.dart b/lib/ui/views/patches_selector/patches_selector_view.dart
index d616f9fe..5182d55f 100644
--- a/lib/ui/views/patches_selector/patches_selector_view.dart
+++ b/lib/ui/views/patches_selector/patches_selector_view.dart
@@ -129,8 +129,10 @@ class _PatchesSelectorViewState extends State<PatchesSelectorView> {
                       ),
                     )
                   : Padding(
-                      padding: const EdgeInsets.symmetric(horizontal: 12.0)
-                          .copyWith(bottom: 80),
+                      padding:
+                          const EdgeInsets.symmetric(horizontal: 12.0).copyWith(
+                        bottom: MediaQuery.of(context).viewPadding.bottom + 8.0,
+                      ),
                       child: Column(
                         children: [
                           Row(