Merge pull request #133 from OpenDTU-App/fix-ios-modal

Author: CommanderRedYT

android/app/build.gradle

@@ -113,7 +113,7 @@ android {
             minifyEnabled enableProguardInReleaseBuilds
             proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro"
             **/
-            if (false && project.hasProperty('MYAPP_UPLOAD_STORE_FILE')) {
+            if (project.hasProperty('MYAPP_UPLOAD_STORE_FILE')) {
                 signingConfig signingConfigs.release
                 minifyEnabled enableProguardInReleaseBuilds
                 proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro"

licenses.json

@@ -35,7 +35,7 @@
         "licenseUrl": "https://github.com/react-native-masked-view/masked-view/raw/master/LICENSE",
         "parents": "opendtu-react-native"
     },
-    "@react-navigation/bottom-tabs@6.5.20": {
+    "@react-navigation/bottom-tabs@6.6.0": {
         "licenses": "MIT",
         "repository": "https://github.com/react-navigation/react-navigation",
         "licenseUrl": "https://github.com/react-navigation/react-navigation/raw/master/LICENSE",
@@ -209,7 +209,7 @@
         "licenseUrl": "https://github.com/callstack/react-native-paper/raw/master/LICENSE.md",
         "parents": "opendtu-react-native"
     },
-    "react-native-reanimated@3.11.0": {
+    "react-native-reanimated@3.12.1": {
         "licenses": "MIT",
         "repository": "https://github.com/software-mansion/react-native-reanimated",
         "licenseUrl": "https://github.com/software-mansion/react-native-reanimated/raw/master/LICENSE",

src/components/BaseModal.tsx

@@ -2,6 +2,10 @@ import type { FC } from 'react';
 import type { ModalProps } from 'react-native-paper';
 import { Modal, useTheme } from 'react-native-paper';
 
+import { Platform } from 'react-native';
+
+import { spacing } from '@/constants';
+
 export interface BaseModalProps extends ModalProps {
   backgroundColor?: string;
   disableSidePadding?: boolean;
@@ -20,7 +24,12 @@ const BaseModal: FC<BaseModalProps> = ({
   return (
     <Modal
       {...rest}
-      style={{ backgroundColor: visible ? 'rgba(0, 0, 0, 0.5)' : undefined }}
+      style={{
+        ...(Platform.OS !== 'android'
+          ? { height: '100%', paddingBottom: spacing * 10 }
+          : {}),
+        backgroundColor: visible ? 'rgba(0, 0, 0, 0.5)' : undefined,
+      }}
       contentContainerStyle={{
         backgroundColor: backgroundColor ?? theme.colors.elevation.level4,
         ...(disableSidePadding