newcandies 0.1.4 → 0.1.6

package/dist/index.js

@@ -151,7 +151,8 @@ async function writeBaseline({ dest, name, withQuery }) {
     "react-native-worklets": "0.5.1",
     // Styling
     tailwindcss: "^4.1.16",
-    uniwind: "^1.0.0"
+    uniwind: "^1.0.0",
+    "@expo/vector-icons": "latest"
   };
   if (withQuery) {
     baseDeps["@tanstack/react-query"] = "latest";
@@ -285,80 +286,184 @@ module.exports = withUniwindConfig(config, {
 `;
   await fs.writeFile(path.join(dest, "global.css"), globalCss);
   {
-    const rootLayout = withQuery ? `import 'react-native-gesture-handler';
-import '../global.css';
-import { Slot } from 'expo-router';
-import { GestureHandlerRootView } from 'react-native-gesture-handler';
-import { SafeAreaProvider } from 'react-native-safe-area-context';
-import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
+    const rootLayout = withQuery ? `import FontAwesome from "@expo/vector-icons/FontAwesome";
+import { useFonts } from "expo-font";
+import { Stack } from "expo-router";
+import * as SplashScreen from "expo-splash-screen";
+import { useEffect } from "react";
+import "react-native-reanimated";
+import "../global.css";
+import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
+
+export { ErrorBoundary } from "expo-router";
+
+export const unstable_settings = {
+  initialRouteName: "(tabs)",
+};
+
+SplashScreen.preventAutoHideAsync();
 
 const queryClient = new QueryClient();
 
-const RootLayout = () => {
+export default function RootLayout() {
+  const [loaded, error] = useFonts({
+    SpaceMono: require("../assets/fonts/SpaceMono-Regular.ttf"),
+    ...FontAwesome.font,
+  });
+
+  useEffect(() => {
+    if (error) throw error;
+  }, [error]);
+
+  useEffect(() => {
+    if (loaded) {
+      SplashScreen.hideAsync();
+    }
+  }, [loaded]);
+
+  if (!loaded) {
+    return null;
+  }
+
   return (
-    <GestureHandlerRootView style={{ flex: 1 }}>
-      <SafeAreaProvider>
-        <QueryClientProvider client={queryClient}>
-          <Slot />
-        </QueryClientProvider>
-      </SafeAreaProvider>
-    </GestureHandlerRootView>
+    <QueryClientProvider client={queryClient}>
+      <RootLayoutNav />
+    </QueryClientProvider>
   );
-};
-
-export default RootLayout;
-` : `import 'react-native-gesture-handler';
-import '../global.css';
-import { Slot } from 'expo-router';
-import { GestureHandlerRootView } from 'react-native-gesture-handler';
-import { SafeAreaProvider } from 'react-native-safe-area-context';
+}
 
-const RootLayout = () => {
+function RootLayoutNav() {
   return (
-    <GestureHandlerRootView style={{ flex: 1 }}>
-      <SafeAreaProvider>
-        <Slot />
-      </SafeAreaProvider>
-    </GestureHandlerRootView>
+    <Stack>
+      <Stack.Screen name="(tabs)" options={{ headerShown: false }} />
+      <Stack.Screen name="modal" options={{ presentation: "modal" }} />
+    </Stack>
   );
+}
+` : `import FontAwesome from "@expo/vector-icons/FontAwesome";
+import { useFonts } from "expo-font";
+import { Stack } from "expo-router";
+import * as SplashScreen from "expo-splash-screen";
+import { useEffect } from "react";
+import "react-native-reanimated";
+import "../global.css";
+
+export { ErrorBoundary } from "expo-router";
+
+export const unstable_settings = {
+  initialRouteName: "(tabs)",
 };
 
-export default RootLayout;
+SplashScreen.preventAutoHideAsync();
+
+export default function RootLayout() {
+  const [loaded, error] = useFonts({
+    SpaceMono: require("../assets/fonts/SpaceMono-Regular.ttf"),
+    ...FontAwesome.font,
+  });
+
+  useEffect(() => {
+    if (error) throw error;
+  }, [error]);
+
+  useEffect(() => {
+    if (loaded) {
+      SplashScreen.hideAsync();
+    }
+  }, [loaded]);
+
+  if (!loaded) {
+    return null;
+  }
+
+  return <RootLayoutNav />;
+}
+
+function RootLayoutNav() {
+  return (
+    <Stack>
+      <Stack.Screen name="(tabs)" options={{ headerShown: false }} />
+      <Stack.Screen name="modal" options={{ presentation: "modal" }} />
+    </Stack>
+  );
+}
 `;
     await fs.writeFile(path.join(appDir, "_layout.tsx"), rootLayout);
     const tabsDir = path.join(appDir, "(tabs)");
     await fs.ensureDir(tabsDir);
-    const layout = `import { Tabs } from 'expo-router';
+    const layout = `import React from 'react';
+import FontAwesome from '@expo/vector-icons/FontAwesome';
+import { Link, Tabs } from 'expo-router';
+import { Pressable } from 'react-native';
 
-const TabsLayout = () => {
-  return <Tabs screenOptions={{ headerShown: false }} />;
-};
+function TabBarIcon(props: { name: React.ComponentProps<typeof FontAwesome>['name']; color: string; }) {
+  return <FontAwesome size={28} style={{ marginBottom: -3 }} {...props} />;
+}
 
-export default TabsLayout;
+export default function TabLayout() {
+  return (
+    <Tabs screenOptions={{ headerShown: true }}>
+      <Tabs.Screen
+        name="index"
+        options={{
+          title: 'Tab One',
+          tabBarIcon: ({ color }) => <TabBarIcon name="code" color={color} />,
+          headerRight: () => (
+            <Link href="/modal" asChild>
+              <Pressable>
+                {({ pressed }) => (
+                  <FontAwesome name="info-circle" size={25} color={"#1f2937"} style={{ marginRight: 15, opacity: pressed ? 0.5 : 1 }} />
+                )}
+              </Pressable>
+            </Link>
+          ),
+        }}
+      />
+      <Tabs.Screen
+        name="two"
+        options={{
+          title: 'Tab Two',
+          tabBarIcon: ({ color }) => <TabBarIcon name="code" color={color} />,
+        }}
+      />
+    </Tabs>
+  );
+}
 `;
     await fs.writeFile(path.join(tabsDir, "_layout.tsx"), layout);
-    const home = `import { View, Text } from 'react-native';
+    const tabOne = `import { View, Text } from 'react-native';
 
-const Home = () => (
-  <View className="flex-1 items-center justify-center bg-background">
-    <Text className="text-foreground text-xl">Home Tab</Text>
-  </View>
-);
-
-export default Home;
+export default function Index() {
+  return (
+    <View className="flex-1 items-center justify-center bg-background">
+      <Text className="text-foreground text-xl">Tab One</Text>
+    </View>
+  );
+}
 `;
-    await fs.writeFile(path.join(tabsDir, "index.tsx"), home);
-    const settings = `import { View, Text } from 'react-native';
+    await fs.writeFile(path.join(tabsDir, "index.tsx"), tabOne);
+    const tabTwo = `import { View, Text } from 'react-native';
 
-const Settings = () => (
-  <View className="flex-1 items-center justify-center bg-background">
-    <Text className="text-foreground text-xl">Settings Tab</Text>
-  </View>
-);
+export default function Two() {
+  return (
+    <View className="flex-1 items-center justify-center bg-background">
+      <Text className="text-foreground text-xl">Tab Two</Text>
+    </View>
+  );
+}
+`;
+    await fs.writeFile(path.join(tabsDir, "two.tsx"), tabTwo);
+    const modal = `import { View, Text } from 'react-native';
 
-export default Settings;
+export default function Modal() {
+  return (
+    <View className="flex-1 items-center justify-center bg-background">
+      <Text className="text-foreground text-xl">Modal screen</Text>
+    </View>
+  );
+}
 `;
-    await fs.writeFile(path.join(tabsDir, "settings.tsx"), settings);
+    await fs.writeFile(path.join(appDir, "modal.tsx"), modal);
   }
 }
 async function applyTemplateOverlay({ dest, type, template, category, variant }) {
@@ -388,20 +493,10 @@ function resolveExtraDeps({ type, template, category, variant }) {
   const spec = key ? TEMPLATE_MAP[key] : void 0;
   return spec?.extraDeps ?? [];
 }
-async function installDeps(pm, cwd, extraDeps) {
-  const base = [
-    "expo",
-    "expo-router",
-    "react",
-    "react-native",
-    "react-native-reanimated",
-    "react-native-gesture-handler",
-    "react-native-safe-area-context",
-    "react-native-screens",
-    "tailwindcss",
-    "uniwind"
-  ];
-  await execa("npx", ["expo", "install", ...base, ...extraDeps], { cwd, stdio: "inherit" });
+async function installDeps(pm, cwd, _extraDeps) {
+  const cmd = pm === "bun" ? "bun" : pm;
+  const args = pm === "bun" ? ["install"] : ["install"];
+  await execa(cmd, args, { cwd, stdio: "inherit" });
 }
 main().catch((e) => {
   p.log.error(e?.message ?? String(e));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "newcandies",
-  "version": "0.1.4",
+  "version": "0.1.6",
   "description": "Scaffold Expo Router + Uniwind React Native apps with layered templates.",
   "type": "module",
   "bin": {