Merge pull request #156 from YajanaRao/stable-android

Stable android
YajanaRao · Aug 19, 2024 · a1dad31 · a1dad31
2 parents 6dd1276 + 14daccf
commit a1dad31
Show file tree

Hide file tree

Showing 5 changed files with 1,689 additions and 2,430 deletions.
diff --git a/apps/mobile/android/app/src/main/java/com/serenity/MainActivity.kt b/apps/mobile/android/app/src/main/java/com/serenity/MainActivity.kt
@@ -19,7 +19,7 @@ class MainActivity : ReactActivity() {
 
   override fun onCreate(savedInstanceState: Bundle?) {
     RNBootSplash.init(this, R.style.BootTheme) // ⬅️ initialize the splash screen
-    super.onCreate(savedInstanceState) // super.onCreate(null) with react-native-screens
+    super.onCreate(null)
   }
 
   /**

diff --git a/apps/mobile/package.json b/apps/mobile/package.json
@@ -35,7 +35,6 @@
 		"@serenity/components": "*",
 		"@serenity/core": "*",
 		"@yajanarao/react-native-get-music-files": "*",
-		"add": "^2.0.6",
 		"dayjs": "^1.11.5",
 		"lodash": "4.17.21",
 		"lottie-ios": "3.4.0",
@@ -46,7 +45,6 @@
 		"react-native-clarity": "^3.0.0",
 		"react-native-config": "^1.4.2",
 		"react-native-fast-image": "^8.3.4",
-		"react-native-fs": "^2.17.0",
 		"react-native-gesture-handler": "2.14.0",
 		"react-native-get-random-values": "^1.7.0",
 		"react-native-linear-gradient": "2.8.3",

diff --git a/apps/mobile/src/navigation/RootNavigator.tsx b/apps/mobile/src/navigation/RootNavigator.tsx
@@ -2,9 +2,9 @@ import React, {useEffect} from 'react';
 import {useTheme} from 'react-native-paper';
 import {createStackNavigator} from '@react-navigation/stack';
 import RNBootSplash from 'react-native-bootsplash';
-import {createNativeStackNavigator} from 'react-native-screens/native-stack';
+import {createNativeStackNavigator} from '@react-navigation/native-stack';
 import {NavigatorScreenParams} from '@react-navigation/native';
-import {SafeAreaView} from 'react-native';
+import {View} from 'react-native';
 
 import IntroductionScreen from '../screens/intro/Introduction';
 
@@ -74,9 +74,9 @@ export const RootNavigator = () => {
 	}, []);
 
 	return (
-		<SafeAreaView style={{flex: 1, backgroundColor: colors.surface}}>
+		<View style={{flex: 1, backgroundColor: colors.surface}}>
 			<NotificationDialog />
 			<AppStack />
-		</SafeAreaView>
+		</View>
 	);
 };
diff --git a/apps/mobile/src/screens/player/index.tsx b/apps/mobile/src/screens/player/index.tsx
@@ -1,30 +1,28 @@
 import React from 'react';
-import { useTheme } from 'react-native-paper';
-import { createNativeStackNavigator } from 'react-native-screens/native-stack';
-import { PlayerScreen } from './player/PlayerScreen';
-import { QueueScreen } from './Queue';
+import {useTheme} from 'react-native-paper';
+import {createNativeStackNavigator} from '@react-navigation/native-stack';
+import {PlayerScreen} from './player/PlayerScreen';
+import {QueueScreen} from './Queue';
 
 const NativeStack = createNativeStackNavigator();
 
 export const PlayerStack = () => {
-  const { colors } = useTheme();
-  return (
-    <NativeStack.Navigator
-      initialRouteName="Active"
-      screenOptions={{
-        headerStyle: {
-          backgroundColor: colors.surface,
-        },
-        headerTintColor: colors.text,
-        headerTopInsetEnabled: false,
-      }}
-    >
-      <NativeStack.Screen
-        name="Active"
-        component={PlayerScreen}
-        options={{ headerShown: false }}
-      />
-      <NativeStack.Screen name="Queue" component={QueueScreen} />
-    </NativeStack.Navigator>
-  );
+	const {colors} = useTheme();
+	return (
+		<NativeStack.Navigator
+			initialRouteName="Active"
+			screenOptions={{
+				headerStyle: {
+					backgroundColor: colors.surface,
+				},
+				headerTintColor: colors.text,
+			}}>
+			<NativeStack.Screen
+				name="Active"
+				component={PlayerScreen}
+				options={{headerShown: false}}
+			/>
+			<NativeStack.Screen name="Queue" component={QueueScreen} />
+		</NativeStack.Navigator>
+	);
 };