mirror of
https://github.com/tapframe/NuvioStreaming.git
synced 2026-01-11 20:10:25 +00:00
All slide_from_right animations for Android have been replaced with 'default'
This commit is contained in:
parent
83ce7cf44d
commit
b6a5c108de
1 changed files with 26 additions and 44 deletions
|
|
@ -1253,31 +1253,13 @@ const InnerNavigator = ({ initialRouteName }: { initialRouteName?: keyof RootSta
|
||||||
headerShown: false,
|
headerShown: false,
|
||||||
// Freeze non-focused stack screens to prevent background re-renders (e.g., SeriesContent behind player)
|
// Freeze non-focused stack screens to prevent background re-renders (e.g., SeriesContent behind player)
|
||||||
freezeOnBlur: true,
|
freezeOnBlur: true,
|
||||||
// Use slide_from_right for consistency and smooth transitions
|
// Use default animation for Android (consistent non-slide transition), slide_from_right for iOS
|
||||||
animation: Platform.OS === 'android' ? 'slide_from_right' : 'slide_from_right',
|
animation: Platform.OS === 'android' ? 'default' : 'slide_from_right',
|
||||||
animationDuration: Platform.OS === 'android' ? 250 : 300,
|
animationDuration: Platform.OS === 'android' ? 250 : 300,
|
||||||
// Ensure consistent background during transitions
|
// Ensure consistent background during transitions
|
||||||
contentStyle: {
|
contentStyle: {
|
||||||
backgroundColor: currentTheme.colors.darkBackground,
|
backgroundColor: currentTheme.colors.darkBackground,
|
||||||
},
|
},
|
||||||
// Improve Android performance with custom interpolator
|
|
||||||
...(Platform.OS === 'android' && {
|
|
||||||
cardStyleInterpolator: ({ current, layouts }: any) => {
|
|
||||||
return {
|
|
||||||
cardStyle: {
|
|
||||||
transform: [
|
|
||||||
{
|
|
||||||
translateX: current.progress.interpolate({
|
|
||||||
inputRange: [0, 1],
|
|
||||||
outputRange: [layouts.screen.width, 0],
|
|
||||||
}),
|
|
||||||
},
|
|
||||||
],
|
|
||||||
backgroundColor: currentTheme.colors.darkBackground,
|
|
||||||
},
|
|
||||||
};
|
|
||||||
},
|
|
||||||
}),
|
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
<Stack.Screen
|
<Stack.Screen
|
||||||
|
|
@ -1315,7 +1297,7 @@ const InnerNavigator = ({ initialRouteName }: { initialRouteName?: keyof RootSta
|
||||||
component={AccountManageScreen as any}
|
component={AccountManageScreen as any}
|
||||||
options={{
|
options={{
|
||||||
headerShown: false,
|
headerShown: false,
|
||||||
animation: Platform.OS === 'android' ? 'slide_from_right' : 'fade',
|
animation: Platform.OS === 'android' ? 'default' : 'fade',
|
||||||
animationDuration: Platform.OS === 'android' ? 250 : 200,
|
animationDuration: Platform.OS === 'android' ? 250 : 200,
|
||||||
contentStyle: {
|
contentStyle: {
|
||||||
backgroundColor: currentTheme.colors.darkBackground,
|
backgroundColor: currentTheme.colors.darkBackground,
|
||||||
|
|
@ -1447,7 +1429,7 @@ const InnerNavigator = ({ initialRouteName }: { initialRouteName?: keyof RootSta
|
||||||
name="HomeScreenSettings"
|
name="HomeScreenSettings"
|
||||||
component={HomeScreenSettings}
|
component={HomeScreenSettings}
|
||||||
options={{
|
options={{
|
||||||
animation: Platform.OS === 'android' ? 'slide_from_right' : 'default',
|
animation: Platform.OS === 'android' ? 'default' : 'default',
|
||||||
animationDuration: Platform.OS === 'android' ? 250 : 200,
|
animationDuration: Platform.OS === 'android' ? 250 : 200,
|
||||||
presentation: 'card',
|
presentation: 'card',
|
||||||
gestureEnabled: true,
|
gestureEnabled: true,
|
||||||
|
|
@ -1462,7 +1444,7 @@ const InnerNavigator = ({ initialRouteName }: { initialRouteName?: keyof RootSta
|
||||||
name="ContinueWatchingSettings"
|
name="ContinueWatchingSettings"
|
||||||
component={ContinueWatchingSettingsScreen}
|
component={ContinueWatchingSettingsScreen}
|
||||||
options={{
|
options={{
|
||||||
animation: Platform.OS === 'android' ? 'slide_from_right' : 'default',
|
animation: Platform.OS === 'android' ? 'default' : 'default',
|
||||||
animationDuration: Platform.OS === 'android' ? 250 : 200,
|
animationDuration: Platform.OS === 'android' ? 250 : 200,
|
||||||
presentation: 'card',
|
presentation: 'card',
|
||||||
gestureEnabled: true,
|
gestureEnabled: true,
|
||||||
|
|
@ -1477,7 +1459,7 @@ const InnerNavigator = ({ initialRouteName }: { initialRouteName?: keyof RootSta
|
||||||
name="Contributors"
|
name="Contributors"
|
||||||
component={ContributorsScreen}
|
component={ContributorsScreen}
|
||||||
options={{
|
options={{
|
||||||
animation: Platform.OS === 'android' ? 'slide_from_right' : 'default',
|
animation: Platform.OS === 'android' ? 'default' : 'default',
|
||||||
animationDuration: Platform.OS === 'android' ? 250 : 200,
|
animationDuration: Platform.OS === 'android' ? 250 : 200,
|
||||||
presentation: 'card',
|
presentation: 'card',
|
||||||
gestureEnabled: true,
|
gestureEnabled: true,
|
||||||
|
|
@ -1492,7 +1474,7 @@ const InnerNavigator = ({ initialRouteName }: { initialRouteName?: keyof RootSta
|
||||||
name="HeroCatalogs"
|
name="HeroCatalogs"
|
||||||
component={HeroCatalogsScreen}
|
component={HeroCatalogsScreen}
|
||||||
options={{
|
options={{
|
||||||
animation: Platform.OS === 'android' ? 'slide_from_right' : 'default',
|
animation: Platform.OS === 'android' ? 'default' : 'default',
|
||||||
animationDuration: Platform.OS === 'android' ? 250 : 200,
|
animationDuration: Platform.OS === 'android' ? 250 : 200,
|
||||||
presentation: 'card',
|
presentation: 'card',
|
||||||
gestureEnabled: true,
|
gestureEnabled: true,
|
||||||
|
|
@ -1544,7 +1526,7 @@ const InnerNavigator = ({ initialRouteName }: { initialRouteName?: keyof RootSta
|
||||||
name="MDBListSettings"
|
name="MDBListSettings"
|
||||||
component={MDBListSettingsScreen}
|
component={MDBListSettingsScreen}
|
||||||
options={{
|
options={{
|
||||||
animation: Platform.OS === 'android' ? 'slide_from_right' : 'fade',
|
animation: Platform.OS === 'android' ? 'default' : 'fade',
|
||||||
animationDuration: Platform.OS === 'android' ? 250 : 200,
|
animationDuration: Platform.OS === 'android' ? 250 : 200,
|
||||||
presentation: 'card',
|
presentation: 'card',
|
||||||
gestureEnabled: true,
|
gestureEnabled: true,
|
||||||
|
|
@ -1559,7 +1541,7 @@ const InnerNavigator = ({ initialRouteName }: { initialRouteName?: keyof RootSta
|
||||||
name="TMDBSettings"
|
name="TMDBSettings"
|
||||||
component={TMDBSettingsScreen}
|
component={TMDBSettingsScreen}
|
||||||
options={{
|
options={{
|
||||||
animation: Platform.OS === 'android' ? 'slide_from_right' : 'fade',
|
animation: Platform.OS === 'android' ? 'default' : 'fade',
|
||||||
animationDuration: Platform.OS === 'android' ? 250 : 200,
|
animationDuration: Platform.OS === 'android' ? 250 : 200,
|
||||||
presentation: 'card',
|
presentation: 'card',
|
||||||
gestureEnabled: true,
|
gestureEnabled: true,
|
||||||
|
|
@ -1574,7 +1556,7 @@ const InnerNavigator = ({ initialRouteName }: { initialRouteName?: keyof RootSta
|
||||||
name="TraktSettings"
|
name="TraktSettings"
|
||||||
component={TraktSettingsScreen}
|
component={TraktSettingsScreen}
|
||||||
options={{
|
options={{
|
||||||
animation: Platform.OS === 'android' ? 'slide_from_right' : 'fade',
|
animation: Platform.OS === 'android' ? 'default' : 'fade',
|
||||||
animationDuration: Platform.OS === 'android' ? 250 : 200,
|
animationDuration: Platform.OS === 'android' ? 250 : 200,
|
||||||
presentation: 'card',
|
presentation: 'card',
|
||||||
gestureEnabled: true,
|
gestureEnabled: true,
|
||||||
|
|
@ -1589,7 +1571,7 @@ const InnerNavigator = ({ initialRouteName }: { initialRouteName?: keyof RootSta
|
||||||
name="PlayerSettings"
|
name="PlayerSettings"
|
||||||
component={PlayerSettingsScreen}
|
component={PlayerSettingsScreen}
|
||||||
options={{
|
options={{
|
||||||
animation: Platform.OS === 'android' ? 'slide_from_right' : 'fade',
|
animation: Platform.OS === 'android' ? 'default' : 'fade',
|
||||||
animationDuration: Platform.OS === 'android' ? 250 : 200,
|
animationDuration: Platform.OS === 'android' ? 250 : 200,
|
||||||
presentation: 'card',
|
presentation: 'card',
|
||||||
gestureEnabled: true,
|
gestureEnabled: true,
|
||||||
|
|
@ -1604,7 +1586,7 @@ const InnerNavigator = ({ initialRouteName }: { initialRouteName?: keyof RootSta
|
||||||
name="ThemeSettings"
|
name="ThemeSettings"
|
||||||
component={ThemeScreen}
|
component={ThemeScreen}
|
||||||
options={{
|
options={{
|
||||||
animation: Platform.OS === 'android' ? 'slide_from_right' : 'fade',
|
animation: Platform.OS === 'android' ? 'default' : 'fade',
|
||||||
animationDuration: Platform.OS === 'android' ? 250 : 200,
|
animationDuration: Platform.OS === 'android' ? 250 : 200,
|
||||||
presentation: 'card',
|
presentation: 'card',
|
||||||
gestureEnabled: true,
|
gestureEnabled: true,
|
||||||
|
|
@ -1619,7 +1601,7 @@ const InnerNavigator = ({ initialRouteName }: { initialRouteName?: keyof RootSta
|
||||||
name="ScraperSettings"
|
name="ScraperSettings"
|
||||||
component={PluginsScreen}
|
component={PluginsScreen}
|
||||||
options={{
|
options={{
|
||||||
animation: Platform.OS === 'android' ? 'slide_from_right' : 'fade',
|
animation: Platform.OS === 'android' ? 'default' : 'fade',
|
||||||
animationDuration: Platform.OS === 'android' ? 250 : 200,
|
animationDuration: Platform.OS === 'android' ? 250 : 200,
|
||||||
presentation: 'card',
|
presentation: 'card',
|
||||||
gestureEnabled: true,
|
gestureEnabled: true,
|
||||||
|
|
@ -1634,7 +1616,7 @@ const InnerNavigator = ({ initialRouteName }: { initialRouteName?: keyof RootSta
|
||||||
name="PluginTester"
|
name="PluginTester"
|
||||||
component={PluginTesterScreen}
|
component={PluginTesterScreen}
|
||||||
options={{
|
options={{
|
||||||
animation: Platform.OS === 'android' ? 'slide_from_right' : 'fade',
|
animation: Platform.OS === 'android' ? 'default' : 'fade',
|
||||||
animationDuration: Platform.OS === 'android' ? 250 : 200,
|
animationDuration: Platform.OS === 'android' ? 250 : 200,
|
||||||
presentation: 'card',
|
presentation: 'card',
|
||||||
gestureEnabled: true,
|
gestureEnabled: true,
|
||||||
|
|
@ -1649,7 +1631,7 @@ const InnerNavigator = ({ initialRouteName }: { initialRouteName?: keyof RootSta
|
||||||
name="CastMovies"
|
name="CastMovies"
|
||||||
component={CastMoviesScreen}
|
component={CastMoviesScreen}
|
||||||
options={{
|
options={{
|
||||||
animation: Platform.OS === 'android' ? 'slide_from_right' : 'fade',
|
animation: Platform.OS === 'android' ? 'default' : 'fade',
|
||||||
animationDuration: Platform.OS === 'android' ? 250 : 200,
|
animationDuration: Platform.OS === 'android' ? 250 : 200,
|
||||||
presentation: 'card',
|
presentation: 'card',
|
||||||
gestureEnabled: true,
|
gestureEnabled: true,
|
||||||
|
|
@ -1664,7 +1646,7 @@ const InnerNavigator = ({ initialRouteName }: { initialRouteName?: keyof RootSta
|
||||||
name="Update"
|
name="Update"
|
||||||
component={UpdateScreen}
|
component={UpdateScreen}
|
||||||
options={{
|
options={{
|
||||||
animation: Platform.OS === 'android' ? 'slide_from_right' : 'slide_from_right',
|
animation: Platform.OS === 'android' ? 'default' : 'slide_from_right',
|
||||||
animationDuration: Platform.OS === 'android' ? 250 : 300,
|
animationDuration: Platform.OS === 'android' ? 250 : 300,
|
||||||
presentation: 'card',
|
presentation: 'card',
|
||||||
gestureEnabled: true,
|
gestureEnabled: true,
|
||||||
|
|
@ -1679,7 +1661,7 @@ const InnerNavigator = ({ initialRouteName }: { initialRouteName?: keyof RootSta
|
||||||
name="AISettings"
|
name="AISettings"
|
||||||
component={AISettingsScreen}
|
component={AISettingsScreen}
|
||||||
options={{
|
options={{
|
||||||
animation: Platform.OS === 'android' ? 'slide_from_right' : 'slide_from_right',
|
animation: Platform.OS === 'android' ? 'default' : 'slide_from_right',
|
||||||
animationDuration: Platform.OS === 'android' ? 250 : 300,
|
animationDuration: Platform.OS === 'android' ? 250 : 300,
|
||||||
presentation: 'card',
|
presentation: 'card',
|
||||||
gestureEnabled: true,
|
gestureEnabled: true,
|
||||||
|
|
@ -1695,7 +1677,7 @@ const InnerNavigator = ({ initialRouteName }: { initialRouteName?: keyof RootSta
|
||||||
name="Backup"
|
name="Backup"
|
||||||
component={BackupScreen}
|
component={BackupScreen}
|
||||||
options={{
|
options={{
|
||||||
animation: Platform.OS === 'android' ? 'slide_from_right' : 'slide_from_right',
|
animation: Platform.OS === 'android' ? 'default' : 'slide_from_right',
|
||||||
animationDuration: Platform.OS === 'android' ? 250 : 300,
|
animationDuration: Platform.OS === 'android' ? 250 : 300,
|
||||||
presentation: 'card',
|
presentation: 'card',
|
||||||
gestureEnabled: true,
|
gestureEnabled: true,
|
||||||
|
|
@ -1736,7 +1718,7 @@ const InnerNavigator = ({ initialRouteName }: { initialRouteName?: keyof RootSta
|
||||||
name="DebridIntegration"
|
name="DebridIntegration"
|
||||||
component={DebridIntegrationScreen}
|
component={DebridIntegrationScreen}
|
||||||
options={{
|
options={{
|
||||||
animation: Platform.OS === 'android' ? 'slide_from_right' : 'slide_from_right',
|
animation: Platform.OS === 'android' ? 'default' : 'slide_from_right',
|
||||||
animationDuration: Platform.OS === 'android' ? 250 : 300,
|
animationDuration: Platform.OS === 'android' ? 250 : 300,
|
||||||
presentation: 'card',
|
presentation: 'card',
|
||||||
gestureEnabled: true,
|
gestureEnabled: true,
|
||||||
|
|
@ -1751,7 +1733,7 @@ const InnerNavigator = ({ initialRouteName }: { initialRouteName?: keyof RootSta
|
||||||
name="ContentDiscoverySettings"
|
name="ContentDiscoverySettings"
|
||||||
component={ContentDiscoverySettingsScreen}
|
component={ContentDiscoverySettingsScreen}
|
||||||
options={{
|
options={{
|
||||||
animation: Platform.OS === 'android' ? 'slide_from_right' : 'slide_from_right',
|
animation: Platform.OS === 'android' ? 'default' : 'slide_from_right',
|
||||||
animationDuration: Platform.OS === 'android' ? 250 : 300,
|
animationDuration: Platform.OS === 'android' ? 250 : 300,
|
||||||
presentation: 'card',
|
presentation: 'card',
|
||||||
gestureEnabled: true,
|
gestureEnabled: true,
|
||||||
|
|
@ -1766,7 +1748,7 @@ const InnerNavigator = ({ initialRouteName }: { initialRouteName?: keyof RootSta
|
||||||
name="AppearanceSettings"
|
name="AppearanceSettings"
|
||||||
component={AppearanceSettingsScreen}
|
component={AppearanceSettingsScreen}
|
||||||
options={{
|
options={{
|
||||||
animation: Platform.OS === 'android' ? 'slide_from_right' : 'slide_from_right',
|
animation: Platform.OS === 'android' ? 'default' : 'slide_from_right',
|
||||||
animationDuration: Platform.OS === 'android' ? 250 : 300,
|
animationDuration: Platform.OS === 'android' ? 250 : 300,
|
||||||
presentation: 'card',
|
presentation: 'card',
|
||||||
gestureEnabled: true,
|
gestureEnabled: true,
|
||||||
|
|
@ -1781,7 +1763,7 @@ const InnerNavigator = ({ initialRouteName }: { initialRouteName?: keyof RootSta
|
||||||
name="IntegrationsSettings"
|
name="IntegrationsSettings"
|
||||||
component={IntegrationsSettingsScreen}
|
component={IntegrationsSettingsScreen}
|
||||||
options={{
|
options={{
|
||||||
animation: Platform.OS === 'android' ? 'slide_from_right' : 'slide_from_right',
|
animation: Platform.OS === 'android' ? 'default' : 'slide_from_right',
|
||||||
animationDuration: Platform.OS === 'android' ? 250 : 300,
|
animationDuration: Platform.OS === 'android' ? 250 : 300,
|
||||||
presentation: 'card',
|
presentation: 'card',
|
||||||
gestureEnabled: true,
|
gestureEnabled: true,
|
||||||
|
|
@ -1796,7 +1778,7 @@ const InnerNavigator = ({ initialRouteName }: { initialRouteName?: keyof RootSta
|
||||||
name="PlaybackSettings"
|
name="PlaybackSettings"
|
||||||
component={PlaybackSettingsScreen}
|
component={PlaybackSettingsScreen}
|
||||||
options={{
|
options={{
|
||||||
animation: Platform.OS === 'android' ? 'slide_from_right' : 'slide_from_right',
|
animation: Platform.OS === 'android' ? 'default' : 'slide_from_right',
|
||||||
animationDuration: Platform.OS === 'android' ? 250 : 300,
|
animationDuration: Platform.OS === 'android' ? 250 : 300,
|
||||||
presentation: 'card',
|
presentation: 'card',
|
||||||
gestureEnabled: true,
|
gestureEnabled: true,
|
||||||
|
|
@ -1811,7 +1793,7 @@ const InnerNavigator = ({ initialRouteName }: { initialRouteName?: keyof RootSta
|
||||||
name="AboutSettings"
|
name="AboutSettings"
|
||||||
component={AboutSettingsScreen}
|
component={AboutSettingsScreen}
|
||||||
options={{
|
options={{
|
||||||
animation: Platform.OS === 'android' ? 'slide_from_right' : 'slide_from_right',
|
animation: Platform.OS === 'android' ? 'default' : 'slide_from_right',
|
||||||
animationDuration: Platform.OS === 'android' ? 250 : 300,
|
animationDuration: Platform.OS === 'android' ? 250 : 300,
|
||||||
presentation: 'card',
|
presentation: 'card',
|
||||||
gestureEnabled: true,
|
gestureEnabled: true,
|
||||||
|
|
@ -1826,7 +1808,7 @@ const InnerNavigator = ({ initialRouteName }: { initialRouteName?: keyof RootSta
|
||||||
name="DeveloperSettings"
|
name="DeveloperSettings"
|
||||||
component={DeveloperSettingsScreen}
|
component={DeveloperSettingsScreen}
|
||||||
options={{
|
options={{
|
||||||
animation: Platform.OS === 'android' ? 'slide_from_right' : 'slide_from_right',
|
animation: Platform.OS === 'android' ? 'default' : 'slide_from_right',
|
||||||
animationDuration: Platform.OS === 'android' ? 250 : 300,
|
animationDuration: Platform.OS === 'android' ? 250 : 300,
|
||||||
presentation: 'card',
|
presentation: 'card',
|
||||||
gestureEnabled: true,
|
gestureEnabled: true,
|
||||||
|
|
@ -1841,7 +1823,7 @@ const InnerNavigator = ({ initialRouteName }: { initialRouteName?: keyof RootSta
|
||||||
name="Legal"
|
name="Legal"
|
||||||
component={LegalScreen}
|
component={LegalScreen}
|
||||||
options={{
|
options={{
|
||||||
animation: Platform.OS === 'android' ? 'slide_from_right' : 'slide_from_right',
|
animation: Platform.OS === 'android' ? 'default' : 'slide_from_right',
|
||||||
animationDuration: Platform.OS === 'android' ? 250 : 300,
|
animationDuration: Platform.OS === 'android' ? 250 : 300,
|
||||||
presentation: 'card',
|
presentation: 'card',
|
||||||
gestureEnabled: true,
|
gestureEnabled: true,
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue