- Header showed the 'goon' text wordmark while the login screen leads with the GoonMark symbol — switch the header to GoonMark so the logo is consistent across login + main. - Scenes/Movies/Sites could overlap the header action icons on narrow phones: the mark is narrower than the wordmark, row gap reduced 16->10, and the 'Sign out' text replaced with a compact icon — frees ~80px so the left (logo+tabs) and right (actions) fit down to ~320px. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
282 lines
11 KiB
TypeScript
282 lines
11 KiB
TypeScript
import {
|
|
DefaultTheme,
|
|
NavigationContainer,
|
|
useNavigationContainerRef,
|
|
} from '@react-navigation/native';
|
|
import { BugReportFAB } from './components/BugReportFAB';
|
|
import { GoonMark } from './components/GoonWordmark';
|
|
import { GoonClient } from './api';
|
|
import { createNativeStackNavigator } from '@react-navigation/native-stack';
|
|
import React from 'react';
|
|
import { Pressable, Text, View } from 'react-native';
|
|
import { AppLockSettingsScreen } from './screens/AppLockSettingsScreen';
|
|
import { DonateScreen } from './screens/DonateScreen';
|
|
import { FavoritesScreen } from './screens/FavoritesScreen';
|
|
import { MovieDetailScreen } from './screens/MovieDetailScreen';
|
|
import { MoviesScreen } from './screens/MoviesScreen';
|
|
import { PerformerScenesScreen } from './screens/PerformerScenesScreen';
|
|
import { PerformersScreen } from './screens/PerformersScreen';
|
|
import { PlayerScreen } from './screens/PlayerScreen';
|
|
import { ScenesScreen } from './screens/ScenesScreen';
|
|
import { SceneDetailScreen } from './screens/SceneDetailScreen';
|
|
import { SiteScenesScreen } from './screens/SiteScenesScreen';
|
|
import { SitesScreen } from './screens/SitesScreen';
|
|
import { StudioScenesScreen } from './screens/StudioScenesScreen';
|
|
import { TagScenesScreen } from './screens/TagScenesScreen';
|
|
import { TagsScreen } from './screens/TagsScreen';
|
|
import { fonts, theme } from './theme';
|
|
|
|
export type RootStackParamList = {
|
|
Scenes: undefined;
|
|
Movies: undefined;
|
|
Sites: undefined;
|
|
// `origin`: raw playback_source.origin (np. 'tube:hqpornercom'). Idzie do
|
|
// listScenes({origin}) — backend robi substring match. `name`: display name
|
|
// do title bara (np. 'hqporner.com').
|
|
SiteScenes: { origin: string; name: string };
|
|
MovieDetail: { id: string };
|
|
SceneDetail: { id: string };
|
|
Performers: undefined;
|
|
// `seenSince` (ISO timestamp): jeśli ten performer jest favorited, FavoritesScreen
|
|
// przekazuje `last_seen_at` SPRZED markFavoriteSeen. Sceny z `created_at > seenSince`
|
|
// dostają NEW badge.
|
|
PerformerScenes: { id: string; name: string; seenSince?: string };
|
|
// StudioScenes: `id` to studio.slug (do filter scen `studio_slugs`),
|
|
// `studioId` to UUID (do favorite/blacklist API). Backend filtruje scen po slug,
|
|
// ale favorites + blacklist używają UUID.
|
|
StudioScenes: { id: string; name: string; studioId: string; seenSince?: string };
|
|
Favorites: undefined;
|
|
Tags: undefined;
|
|
TagScenes: { slug: string; name: string };
|
|
AppLockSettings: undefined;
|
|
Donate: undefined;
|
|
Player: {
|
|
url: string;
|
|
sceneId: string;
|
|
// 'movie' = MovieDetail wywołał Player z movieId zamiast sceneId. Backend
|
|
// ma /movies/{id}/progress oddzielnie od /scenes/{id}/progress (2026-05-28).
|
|
// Default 'scene' dla back-compat z istniejącymi nav callami.
|
|
entityKind?: 'scene' | 'movie';
|
|
// playback_source.id — pozwala Playerowi oznaczyć źródło jako dead bez powrotu
|
|
// do SceneDetail (gdy CDN zwróci 404/410 przy odtwarzaniu — sxyprn/fpo „404
|
|
// którego apka nie potrafi zidentyfikować”, bug a78cc3b6). Undefined dla
|
|
// legacy/non-tube nav callów → przycisk „Mark broken” się nie pokazuje.
|
|
playbackId?: string;
|
|
durationSec?: number | null;
|
|
refererHost?: string;
|
|
title?: string;
|
|
mode?: 'video' | 'webview';
|
|
// Headers do bezpośredniego fetchu CDN URL'a (Referer + User-Agent). Mobile
|
|
// próbuje direct PIERWSZY — bandwidth idzie device→CDN, nie przez VPS proxy.
|
|
// Backend zwraca te headers w StreamLink.headers przy resolve.
|
|
headers?: Record<string, string>;
|
|
// Proxy URL fallback gdy direct fails (CDN IP-bound, np. fpo.xxx z kt_remote_ips).
|
|
// Native player na error → replace na ten URL (proxy re-fetchuje z VPS IP).
|
|
fallbackProxyUrl?: string;
|
|
// Gdy native VideoView dostanie błąd (typowe dla IP-bound CDN URL'i z luluvids/
|
|
// iceyfile/tnmr — extracted z VPS IP, mobile fetch dostaje 403), apka przełącza
|
|
// się automatycznie na WebView z tym URL'em — tam JS embed page sam pobiera
|
|
// m3u8 we własnym kontekście (Cookies + JA3 + IP set ok).
|
|
fallbackEmbedUrl?: string;
|
|
};
|
|
};
|
|
|
|
const Stack = createNativeStackNavigator<RootStackParamList>();
|
|
|
|
type TopTab = 'Scenes' | 'Movies' | 'Sites';
|
|
|
|
function TopTabs({
|
|
current,
|
|
onNavigate,
|
|
}: {
|
|
current: TopTab;
|
|
onNavigate: (tab: TopTab) => void;
|
|
}) {
|
|
const tabs: TopTab[] = ['Scenes', 'Movies', 'Sites'];
|
|
return (
|
|
<View style={{ flexDirection: 'row', gap: 10, paddingHorizontal: 10, alignItems: 'center' }}>
|
|
{/* Logo (mark) — spójne z ekranem logowania; węższe od wordmarku, więc Scenes/Movies/Sites
|
|
+ akcje po prawej mieszczą się bez nachodzenia na wąskich telefonach. */}
|
|
<GoonMark size={30} />
|
|
<View style={{ width: 1, height: 18, backgroundColor: theme.border, marginRight: 2 }} />
|
|
{tabs.map((t) => {
|
|
const active = t === current;
|
|
return (
|
|
<Pressable key={t} onPress={() => (active ? null : onNavigate(t))} hitSlop={12}>
|
|
<Text
|
|
style={{
|
|
color: active ? theme.accent : theme.muted,
|
|
fontSize: 13,
|
|
fontFamily: active ? fonts.display : fonts.medium,
|
|
letterSpacing: 0.3,
|
|
}}
|
|
>
|
|
{t}
|
|
</Text>
|
|
</Pressable>
|
|
);
|
|
})}
|
|
</View>
|
|
);
|
|
}
|
|
|
|
const navTheme = {
|
|
...DefaultTheme,
|
|
dark: true,
|
|
colors: {
|
|
...DefaultTheme.colors,
|
|
background: theme.bg,
|
|
card: theme.card,
|
|
text: theme.fg,
|
|
border: theme.border,
|
|
primary: theme.accent,
|
|
notification: theme.bad,
|
|
},
|
|
};
|
|
|
|
interface AppNavigatorProps {
|
|
onLogout: () => void;
|
|
client: GoonClient | null;
|
|
appVersion: string;
|
|
}
|
|
|
|
export function AppNavigator({ onLogout, client, appVersion }: AppNavigatorProps) {
|
|
// Ref przypisany do NavigationContainer pozwala BugReportFAB (sibling
|
|
// Stack.Navigator) wyciągnąć current route bez bycia w screen context —
|
|
// useNavigationState wymagałby NavigationContext którego siblings nie mają.
|
|
const navRef = useNavigationContainerRef();
|
|
return (
|
|
<NavigationContainer ref={navRef} theme={navTheme}>
|
|
<View style={{ flex: 1 }}>
|
|
<Stack.Navigator
|
|
screenOptions={{
|
|
headerStyle: { backgroundColor: theme.card },
|
|
headerTitleStyle: { color: theme.fg, fontFamily: fonts.display },
|
|
headerTintColor: theme.accent,
|
|
contentStyle: { backgroundColor: theme.bg },
|
|
}}
|
|
>
|
|
<Stack.Screen
|
|
name="Scenes"
|
|
component={ScenesScreen}
|
|
options={({ navigation }) => ({
|
|
title: '',
|
|
headerLeft: () => (
|
|
<TopTabs
|
|
current="Scenes"
|
|
onNavigate={(t) => navigation.replace(t)}
|
|
/>
|
|
),
|
|
headerRight: () => (
|
|
<View style={{ flexDirection: 'row', gap: 14, alignItems: 'center' }}>
|
|
<Pressable onPress={() => navigation.navigate('Donate')} hitSlop={12}>
|
|
<Text style={{ color: theme.accent, fontSize: 18 }}>♥</Text>
|
|
</Pressable>
|
|
<Pressable
|
|
onPress={() => navigation.navigate('AppLockSettings')}
|
|
hitSlop={12}
|
|
>
|
|
<Text style={{ color: theme.muted, fontSize: 18 }}>⚙</Text>
|
|
</Pressable>
|
|
<Pressable onPress={onLogout} hitSlop={12}>
|
|
<Text style={{ fontSize: 17 }}>🚪</Text>
|
|
</Pressable>
|
|
</View>
|
|
),
|
|
})}
|
|
/>
|
|
<Stack.Screen
|
|
name="Movies"
|
|
component={MoviesScreen}
|
|
options={({ navigation }) => ({
|
|
title: '',
|
|
headerBackVisible: false,
|
|
headerLeft: () => (
|
|
<TopTabs
|
|
current="Movies"
|
|
onNavigate={(t) => navigation.replace(t)}
|
|
/>
|
|
),
|
|
headerRight: () => (
|
|
<View style={{ flexDirection: 'row', gap: 14, alignItems: 'center' }}>
|
|
<Pressable onPress={onLogout} hitSlop={12}>
|
|
<Text style={{ fontSize: 17 }}>🚪</Text>
|
|
</Pressable>
|
|
</View>
|
|
),
|
|
})}
|
|
/>
|
|
<Stack.Screen
|
|
name="Sites"
|
|
component={SitesScreen}
|
|
options={({ navigation }) => ({
|
|
title: '',
|
|
headerBackVisible: false,
|
|
headerLeft: () => (
|
|
<TopTabs
|
|
current="Sites"
|
|
onNavigate={(t) => navigation.replace(t)}
|
|
/>
|
|
),
|
|
headerRight: () => (
|
|
<View style={{ flexDirection: 'row', gap: 14, alignItems: 'center' }}>
|
|
<Pressable onPress={onLogout} hitSlop={12}>
|
|
<Text style={{ fontSize: 17 }}>🚪</Text>
|
|
</Pressable>
|
|
</View>
|
|
),
|
|
})}
|
|
/>
|
|
<Stack.Screen
|
|
name="SiteScenes"
|
|
component={SiteScenesScreen}
|
|
options={{ title: 'Site scenes' }}
|
|
/>
|
|
<Stack.Screen name="MovieDetail" component={MovieDetailScreen} options={{ title: '' }} />
|
|
<Stack.Screen name="SceneDetail" component={SceneDetailScreen} options={{ title: '' }} />
|
|
<Stack.Screen name="Performers" component={PerformersScreen} options={{ title: 'Performers' }} />
|
|
<Stack.Screen name="Favorites" component={FavoritesScreen} options={{ title: 'Favorites' }} />
|
|
<Stack.Screen
|
|
name="PerformerScenes"
|
|
component={PerformerScenesScreen}
|
|
options={{ title: 'Performer scenes' }}
|
|
/>
|
|
<Stack.Screen
|
|
name="StudioScenes"
|
|
component={StudioScenesScreen}
|
|
options={{ title: 'Studio scenes' }}
|
|
/>
|
|
<Stack.Screen name="Tags" component={TagsScreen} options={{ title: 'Tags' }} />
|
|
<Stack.Screen
|
|
name="TagScenes"
|
|
component={TagScenesScreen}
|
|
options={{ title: 'Tag scenes' }}
|
|
/>
|
|
<Stack.Screen
|
|
name="AppLockSettings"
|
|
options={{ title: 'App lock' }}
|
|
>
|
|
{() => <AppLockSettingsScreen />}
|
|
</Stack.Screen>
|
|
<Stack.Screen
|
|
name="Donate"
|
|
component={DonateScreen}
|
|
options={{ title: 'Support project' }}
|
|
/>
|
|
<Stack.Screen
|
|
name="Player"
|
|
component={PlayerScreen}
|
|
options={{
|
|
// Player ma własny custom overlay z back button (controlsTop). Native header
|
|
// dawał ~80-90px czarnego paska w landscape — letterboxowało wideo.
|
|
headerShown: false,
|
|
contentStyle: { backgroundColor: '#000' },
|
|
orientation: 'all',
|
|
}}
|
|
/>
|
|
</Stack.Navigator>
|
|
<BugReportFAB client={client} appVersion={appVersion} navRef={navRef} />
|
|
</View>
|
|
</NavigationContainer>
|
|
);
|
|
}
|