From b8fa6b730f919ecca0842f091659a072ea8631e3 Mon Sep 17 00:00:00 2001
From: Harkamal Randhawa <harkamalsr@gmail.com>
Date: Sun, 29 Mar 2026 18:09:12 -0600
Subject: [PATCH] Fix status bar and navigation bar layout

---
 android/app/src/main/res/layout/fragment_pet.xml            | 3 ++-
 android/app/src/main/res/layout/fragment_purchase_order.xml | 3 ++-
 android/app/src/main/res/values/themes.xml                  | 2 ++
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/android/app/src/main/res/layout/fragment_pet.xml b/android/app/src/main/res/layout/fragment_pet.xml
index 1f625bac..293d0a93 100644
--- a/android/app/src/main/res/layout/fragment_pet.xml
+++ b/android/app/src/main/res/layout/fragment_pet.xml
@@ -9,7 +9,8 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:orientation="vertical">
+        android:orientation="vertical"
+        android:fitsSystemWindows="true">
 
         <LinearLayout
             android:id="@+id/header"
diff --git a/android/app/src/main/res/layout/fragment_purchase_order.xml b/android/app/src/main/res/layout/fragment_purchase_order.xml
index ea11397d..e0c59b5a 100644
--- a/android/app/src/main/res/layout/fragment_purchase_order.xml
+++ b/android/app/src/main/res/layout/fragment_purchase_order.xml
@@ -8,7 +8,8 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:orientation="vertical">
+        android:orientation="vertical"
+        android:fitsSystemWindows="true">
 
         <LinearLayout
             android:layout_width="match_parent"
diff --git a/android/app/src/main/res/values/themes.xml b/android/app/src/main/res/values/themes.xml
index 5ac5ff57..f92c35db 100644
--- a/android/app/src/main/res/values/themes.xml
+++ b/android/app/src/main/res/values/themes.xml
@@ -8,7 +8,9 @@
         <item name="editTextStyle">@style/Widget.App.EditText</item>
         <item name="spinnerStyle">@style/Widget.App.Spinner</item>
         <item name="android:statusBarColor">@color/primary_dark</item>
+        <item name="android:navigationBarColor">@color/primary_dark</item>
         <item name="android:windowLightStatusBar">false</item>
+        <item name="android:windowLightNavigationBar">false</item>
     </style>
     <style name="Widget.App.EditText" parent="Widget.AppCompat.EditText">
         <item name="android:textColor">@color/text_dark</item>