From 262572dde32acd71766ad0bb2e65c4511e1649c0 Mon Sep 17 00:00:00 2001
From: Adrian Castro <22133246+castdrian@users.noreply.github.com>
Date: Wed, 20 Mar 2024 14:44:41 +0100
Subject: [PATCH] chore: remove native ios modals

---
 apps/expo/package.json                             |  1 -
 apps/expo/src/app/(tabs)/settings.tsx              |  1 -
 apps/expo/src/app/_layout.tsx                      |  5 -----
 apps/expo/src/components/player/settings/Sheet.tsx |  4 ++--
 pnpm-lock.yaml                                     | 13 -------------
 5 files changed, 2 insertions(+), 22 deletions(-)

diff --git a/apps/expo/package.json b/apps/expo/package.json
index b299d0a..d67871a 100644
--- a/apps/expo/package.json
+++ b/apps/expo/package.json
@@ -55,7 +55,6 @@
     "react-native-change-icon": "^5.0.0",
     "react-native-context-menu-view": "^1.14.1",
     "react-native-gesture-handler": "~2.14.1",
-    "react-native-ios-modal": "^0.1.8",
     "react-native-modal": "^13.0.1",
     "react-native-quick-base64": "^2.0.8",
     "react-native-quick-crypto": "^0.6.1",
diff --git a/apps/expo/src/app/(tabs)/settings.tsx b/apps/expo/src/app/(tabs)/settings.tsx
index 16f2ea8..49c8e96 100644
--- a/apps/expo/src/app/(tabs)/settings.tsx
+++ b/apps/expo/src/app/(tabs)/settings.tsx
@@ -76,7 +76,6 @@ export function ThemeSelector(props: SelectProps) {
 
       <Adapt platform="native">
         <Sheet
-          native
           modal
           dismissOnSnapToBottom
           dismissOnOverlayPress
diff --git a/apps/expo/src/app/_layout.tsx b/apps/expo/src/app/_layout.tsx
index 7c22070..92e458b 100644
--- a/apps/expo/src/app/_layout.tsx
+++ b/apps/expo/src/app/_layout.tsx
@@ -1,13 +1,10 @@
 /* eslint-disable @typescript-eslint/no-unsafe-assignment */
 import { useEffect } from "react";
 import { GestureHandlerRootView } from "react-native-gesture-handler";
-// @ts-expect-error - No exported types
-import { ModalView } from "react-native-ios-modal";
 import { useFonts } from "expo-font";
 import { SplashScreen, Stack } from "expo-router";
 import FontAwesome from "@expo/vector-icons/FontAwesome";
 import { DarkTheme, ThemeProvider } from "@react-navigation/native";
-import { setupNativeSheet } from "@tamagui/sheet";
 import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
 import { TamaguiProvider, Theme, useTheme } from "tamagui";
 import tamaguiConfig from "tamagui.config";
@@ -21,8 +18,6 @@ export {
   ErrorBoundary,
 } from "expo-router";
 
-setupNativeSheet("ios", ModalView);
-
 export const unstable_settings = {
   // Ensure that reloading on `/modal` keeps a back button present.
   initialRouteName: "(tabs)",
diff --git a/apps/expo/src/components/player/settings/Sheet.tsx b/apps/expo/src/components/player/settings/Sheet.tsx
index d5a87af..0dbb298 100644
--- a/apps/expo/src/components/player/settings/Sheet.tsx
+++ b/apps/expo/src/components/player/settings/Sheet.tsx
@@ -19,7 +19,7 @@ const PlayerText = styled(Text, {
 function SettingsSheet(props: SheetProps) {
   return (
     <Sheet
-      snapPoints={[90]}
+      snapPoints={[80]}
       dismissOnSnapToBottom
       modal
       animation="spring"
@@ -54,7 +54,7 @@ function SettingsSheetFrame({
 }) {
   return (
     <SafeAreaProvider>
-      <SafeAreaView style={{ flex: 1 }}>
+      <SafeAreaView style={{ flex: 1, backgroundColor: "black" }}>
         <Sheet.Frame
           backgroundColor="$playerSettingsBackground"
           padding="$5"
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 5ab0634..33d728f 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -137,9 +137,6 @@ importers:
       react-native-gesture-handler:
         specifier: ~2.14.1
         version: 2.14.1(react-native@0.73.5)(react@18.2.0)
-      react-native-ios-modal:
-        specifier: ^0.1.8
-        version: 0.1.8(react-native@0.73.5)(react@18.2.0)
       react-native-modal:
         specifier: ^13.0.1
         version: 13.0.1(react-native@0.73.5)(react@18.2.0)
@@ -11376,16 +11373,6 @@ packages:
       react-native: 0.73.5(@babel/core@7.23.9)(@babel/preset-env@7.23.9)(react@18.2.0)
     dev: false
 
-  /react-native-ios-modal@0.1.8(react-native@0.73.5)(react@18.2.0):
-    resolution: {integrity: sha512-kA068hIhI9+r21OnRXzkRevGjGYTVAYf5kzsIFI15IrCiAkR40dE2lqJtOpnrB3lZ9KZeS0ph59qNNpDSG7xpA==}
-    peerDependencies:
-      react: '*'
-      react-native: '*'
-    dependencies:
-      react: 18.2.0
-      react-native: 0.73.5(@babel/core@7.23.9)(@babel/preset-env@7.23.9)(react@18.2.0)
-    dev: false
-
   /react-native-modal@13.0.1(react-native@0.73.5)(react@18.2.0):
     resolution: {integrity: sha512-UB+mjmUtf+miaG/sDhOikRfBOv0gJdBU2ZE1HtFWp6UixW9jCk/bhGdHUgmZljbPpp0RaO/6YiMmQSSK3kkMaw==}
     peerDependencies: