Merge pull request #41 from yoesuv/develop

Develop

App.tsx

@@ -1,20 +1,44 @@
-import { DefaultTheme, Provider as PaperProvider } from 'react-native-paper';
-import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
+import {
+  configureFonts,
+  MD3LightTheme as DefaultTheme,
+  Provider as PaperProvider,
+} from "react-native-paper";
+import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
 
-import AppNavigation from './src/navigations';
-import { THEME_COLOR } from './src/data/colors';
+import AppNavigation from "./src/navigations";
+import { THEME_COLOR } from "./src/data/colors";
+import { useFonts } from "expo-font";
 
 const queryClient = new QueryClient();
-const theme = {
-  ...DefaultTheme,
-  colors: {
-    ...DefaultTheme.colors,
-    primary: THEME_COLOR,
-    accent: 'yellow',
-  }
-}
 
 export default function App() {
+  const [loaded] = useFonts({
+    Pacifico: require("./assets/fonts/Pacifico.ttf"),
+    "Poppins-Bold": require("./assets/fonts/Poppins-Bold.ttf"),
+    "Poppins-Regular": require("./assets/fonts/Poppins-Regular.ttf"),
+    SometypeMono: require("./assets/fonts/SometypeMono.ttf"),
+  });
+
+  const baseFont = {
+    fontFamily: "Poppins-Regular",
+  } as const;
+
+  const baseVariants = configureFonts({ config: baseFont });
+
+  const theme = {
+    ...DefaultTheme,
+    fonts: configureFonts({ config: { ...baseVariants } }),
+    colors: {
+      ...DefaultTheme.colors,
+      primary: THEME_COLOR,
+      accent: "yellow",
+    },
+  };
+
+  if (!loaded) {
+    return null;
+  }
+
   return (
     <PaperProvider theme={theme}>
       <QueryClientProvider client={queryClient}>

README.MD

@@ -1,19 +1,26 @@
 ## Info Malang Batu RN ##
 
+```
+Node js version | Java Version
+v18.19.1        | java 17.0.11 2024-04-16 LTS
+```
+
 #### Whats new? #####
+* :art: use custom fonts
 * :arrow_up: update libraries
 
 Build from [Expo Framework](https://expo.dev/), click [here](https://github.com/yoesuv/Info-Malang-Batu) for Android Native version.  
-Download apk file [here](https://e.pcloud.link/publink/show?code=XZeWwsZR3g9T460hrVFRyHRiLDIK00xmrVX)
+Download apk file [here](https://e.pcloud.link/publink/show?code=XZn1uxZ26QUXIyN9OVCfiEhVPEe1Vgq7H3V)
 
 #### Screenshot ####
-| ![](https://images2.imgbox.com/7f/e5/xlMEXJvW_o.png) | ![](https://i.imgur.com/n9mJ4Z3.png) | ![](https://i.imgur.com/XSFyadz.png) | ![](https://i.imgur.com/vYW9Gbi.png) |
+| ![](https://i.imgur.com/0ezpBvi.png) | ![](https://i.imgur.com/ukhbFbZ.png) | ![](https://i.imgur.com/ZiZoG9O.png) | ![](https://i.imgur.com/VeEKF07.png) |
 | :---: | :---: | :---: | :---: |
-| ![](https://i.imgur.com/k2hZdkB.png) | ![](https://images2.imgbox.com/a7/79/iDAF7vRw_o.png) | ![](https://i.imgur.com/MfMjKwe.png) | ![](https://i.imgur.com/563Xwv7.png) |
+| ![](https://i.imgur.com/PTPoDnA.png) | ![](https://i.imgur.com/dHhKg9q.png) | ![](https://i.imgur.com/6bMYfZB.png) | ![](https://i.imgur.com/H4VD0jl.png) |
 
 #### List Package ####
 - [Application](https://docs.expo.dev/versions/latest/sdk/application/)
 - [Axios](https://axios-http.com/)
+- [Expo Font](https://docs.expo.dev/develop/user-interface/fonts)
 - [Flashlist](https://github.com/shopify/flash-list)
 - [React Navigation](https://reactnavigation.org/)
 - [React Native Maps](https://github.com/react-native-maps/react-native-maps)

app.json

@@ -2,7 +2,9 @@
   "expo": {
     "name": "Info-Malang-Batu",
     "slug": "Info-Malang-Batu",
-    "version": "2.0.1",
+    "version": "2.1.0",
+    "android.versionCode": "1",
+    "ios.buildNumber": "1",
     "orientation": "portrait",
     "icon": "./assets/icon.png",
     "userInterfaceStyle": "light",
@@ -14,9 +16,7 @@
     "updates": {
       "fallbackToCacheTimeout": 0
     },
-    "assetBundlePatterns": [
-      "**/*"
-    ],
+    "assetBundlePatterns": ["**/*"],
     "ios": {
       "supportsTablet": true
     },
@@ -39,6 +39,20 @@
       "eas": {
         "projectId": "0041a1ae-5f19-45ef-99d4-bb8b8893aa15"
       }
-    }
+    },
+    "plugins": [
+      [
+        "expo-font",
+        {
+          "fonts": [
+            "./assets/fonts/Pacifico.ttf",
+            "./assets/fonts/Poppins-Bold.ttf",
+            "./assets/fonts/Poppins-Regular.ttf",
+            "./assets/fonts/SometypeMono.ttf"
+          ]
+        }
+      ],
+      "expo-asset"
+    ]
   }
 }

eas.json

@@ -1,6 +1,7 @@
 {
   "cli": {
-    "version": ">= 2.5.1"
+    "version": ">= 2.5.1",
+    "appVersionSource": "local"
   },
   "build": {
     "development": {