Skip to content

fix onboarding #46

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Palloxin merged 1 commit into from
Oct 9, 2025
Merged

fix onboarding #46

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion App.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,10 @@ Notifications.setNotificationHandler({
};
},
});
createTables();

const App = () => {
createTables();

const navigationRef =
useRef<NavigationContainerRef<RootStackParamList>>(null);
// Enable React Navigation DevTools in development
Expand Down
1 change: 1 addition & 0 deletions src/database/tables/CategoryTable.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,5 @@ export const createCategoryDefaultQuery = `
INSERT INTO Category (id, name, sort) VALUES
(1, "${getString('categories.default')}", 1),
(2, "${getString('categories.local')}", 2)
ON CONFLICT (id) DO NOTHING;
`;
97 changes: 51 additions & 46 deletions src/navigators/Main.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,58 +97,63 @@ const MainNavigator = ({
[theme],
);

if (!isOnboarded) {
return <OnboardingScreen />;
}

return (
<NavigationContainer<RootStackParamList>
ref={ref}
theme={NavTheme}
onReady={() => {
// Hide splash screen when navigation is ready (BottomNavigator loaded)
LottieSplashScreen.hide();
}}
linking={{
prefixes: ['lnreader://'],
config: {
screens: {
MoreStack: {
screens: {
SettingsStack: {
screens: {
RespositorySettings: '/repo/add',
<>
{isOnboarded ? null : <OnboardingScreen />}
<NavigationContainer<RootStackParamList>
ref={ref}
theme={NavTheme}
onReady={() => {
// Hide splash screen when navigation is ready (BottomNavigator loaded)
LottieSplashScreen.hide();
}}
linking={{
prefixes: ['lnreader://'],
config: {
screens: {
MoreStack: {
screens: {
SettingsStack: {
screens: {
RespositorySettings: '/repo/add',
},
},
},
},
},
},
},
}}
>
<LibraryContextProvider>
<UpdateContextProvider>
{isNewVersion && <NewUpdateDialog newVersion={latestRelease} />}
<Stack.Navigator screenOptions={{ headerShown: false }}>
<Stack.Screen name="BottomNavigator" component={BottomNavigator} />
<Stack.Screen name="ReaderStack" component={ReaderStack} />
<Stack.Screen name="MoreStack" component={MoreStack} />
<Stack.Screen name="SourceScreen" component={BrowseSourceScreen} />
<Stack.Screen name="BrowseMal" component={MalTopNovels} />
<Stack.Screen name="BrowseAL" component={AniListTopNovels} />
<Stack.Screen name="BrowseSettings" component={BrowseSettings} />
<Stack.Screen
name="GlobalSearchScreen"
component={GlobalSearchScreen}
/>
<Stack.Screen name="Migration" component={Migration} />
<Stack.Screen name="SourceNovels" component={SourceNovels} />
<Stack.Screen name="MigrateNovel" component={MigrateNovel} />
<Stack.Screen name="WebviewScreen" component={WebviewScreen} />
</Stack.Navigator>
</UpdateContextProvider>
</LibraryContextProvider>
</NavigationContainer>
}}
>
<LibraryContextProvider>
<UpdateContextProvider>
{isNewVersion && <NewUpdateDialog newVersion={latestRelease} />}
<Stack.Navigator screenOptions={{ headerShown: false }}>
<Stack.Screen
name="BottomNavigator"
component={BottomNavigator}
/>
<Stack.Screen name="ReaderStack" component={ReaderStack} />
<Stack.Screen name="MoreStack" component={MoreStack} />
<Stack.Screen
name="SourceScreen"
component={BrowseSourceScreen}
/>
<Stack.Screen name="BrowseMal" component={MalTopNovels} />
<Stack.Screen name="BrowseAL" component={AniListTopNovels} />
<Stack.Screen name="BrowseSettings" component={BrowseSettings} />
<Stack.Screen
name="GlobalSearchScreen"
component={GlobalSearchScreen}
/>
<Stack.Screen name="Migration" component={Migration} />
<Stack.Screen name="SourceNovels" component={SourceNovels} />
<Stack.Screen name="MigrateNovel" component={MigrateNovel} />
<Stack.Screen name="WebviewScreen" component={WebviewScreen} />
</Stack.Navigator>
</UpdateContextProvider>
</LibraryContextProvider>
</NavigationContainer>
</>
);
};

Expand Down