Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
116 changes: 0 additions & 116 deletions app/(tabs)/_layout.tsx

This file was deleted.

3 changes: 0 additions & 3 deletions app/(tabs)/explore.tsx

This file was deleted.

3 changes: 0 additions & 3 deletions app/(tabs)/index.tsx.backup

This file was deleted.

165 changes: 0 additions & 165 deletions app/(tabs)/more.tsx

This file was deleted.

16 changes: 8 additions & 8 deletions app/_layout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ SplashScreen.preventAutoHideAsync().catch(() => {
});

export const unstable_settings = {
anchor: '(tabs)',
anchor: 'index',
};

type BootstrapStatus = 'idle' | 'running' | 'success' | 'failed';
Expand All @@ -57,15 +57,15 @@ function RootLayoutContent() {
const [bootstrapResult, setBootstrapResult] = useState<BootstrapResult | null>(null);
const bootstrapStatusRef = useRef<BootstrapStatus>('idle');
const nativeSplashHiddenRef = useRef(false);
const { isSettled: homeWebViewPreloadSettled, status: homeWebViewPreloadStatus } =
const { isSettled: homeWebViewPreloadSettled } =
useHomeWebViewPreloadContext();

const initialPathnameRef = useRef(pathname);
const bootstrapSucceeded = bootstrapStatus === 'success';
const shouldWaitForHomeWebView = pathname === '/';
const shouldBlockSplash =
forceUpdateRequired ||
!bootstrapSucceeded ||
(shouldWaitForHomeWebView && !homeWebViewPreloadSettled);
(initialPathnameRef.current === '/' && !homeWebViewPreloadSettled);

// 강제 업데이트가 필요한 경우(또는 체크 전)에는 FCM 권한 프롬프트/핸들러 설정이 뜨지 않도록 비활성화
useFcm(forceUpdateChecked && !forceUpdateRequired && bootstrapSucceeded);
Expand Down Expand Up @@ -204,7 +204,7 @@ function RootLayoutContent() {
forceUpdateRequired,
bootstrapStatus,
pathname,
homeWebViewPreloadStatus,
homeWebViewPreloadSettled,
});
return;
}
Expand All @@ -213,7 +213,7 @@ function RootLayoutContent() {
forceUpdateRequired,
bootstrapStatus,
pathname,
homeWebViewPreloadStatus,
homeWebViewPreloadSettled,
shouldBlockSplash,
]);

Expand All @@ -236,7 +236,7 @@ function RootLayoutContent() {
bootstrapStatus,
forceUpdateRequired,
pathname,
homeWebViewPreloadStatus,
homeWebViewPreloadSettled,
});
}

Expand All @@ -252,7 +252,7 @@ function RootLayoutContent() {
<SubscribedClubsProvider initialClubIds={initialSubscribedClubIds}>
<ThemeProvider value={DefaultTheme}>
<Stack>
<Stack.Screen name="(tabs)" options={{ headerShown: false }} />
<Stack.Screen name="index" options={{ headerShown: false }} />
<Stack.Screen name="club/[id]" options={{ headerShown: false }} />
<Stack.Screen name="clubDetail/[id]" options={{ headerShown: false }} />
<Stack.Screen name="webview/[slug]" options={{ headerShown: false }} />
Expand Down
2 changes: 1 addition & 1 deletion app/(tabs)/index.tsx → app/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import React, { Suspense, lazy, useCallback, useState } from 'react';

const LazyHomeScreen = lazy(() => import('@/ui/home/home-screen'));

export default function HomeTab() {
export default function Home() {
const [webViewFailed, setWebViewFailed] = useState(false);
const { markFailed } = useHomeWebViewPreloadContext();

Expand Down
2 changes: 1 addition & 1 deletion app/webview/[slug].tsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
import { ActivityIndicator, TouchableOpacity } from "react-native";
import { SafeAreaView } from "react-native-safe-area-context";
import { WebView } from "react-native-webview";
import styled from "styled-components/native";

Check warning on line 16 in app/webview/[slug].tsx

View workflow job for this annotation

GitHub Actions / android-check

Using exported name 'styled' as identifier for default import

const webviewUrl =
process.env.EXPO_PUBLIC_WEBVIEW_URL || "https://develop.moadong.com";
Expand Down Expand Up @@ -83,7 +83,7 @@
if (router.canGoBack()) {
router.back();
} else {
router.push("/(tabs)/more");
router.push("/");
}
};

Expand Down
Loading
Loading