fix fonts

LunatiqueCoder · Jan 19, 2023 · bf88bdc · bf88bdc · vercel · Jan 19, 2023
1 parent 2a2509f
commit bf88bdc
Show file tree

Hide file tree

Showing 9 changed files with 111 additions and 95 deletions.
diff --git a/...id/app/src/main/assets/custom/slkscr.woff → ...pp/src/main/assets/custom/Silkscreen.woff b/...id/app/src/main/assets/custom/slkscr.woff → ...pp/src/main/assets/custom/Silkscreen.woff
diff --git a/...oid/app/src/main/assets/fonts/slkscrb.ttf → ...src/main/assets/fonts/Silkscreen-bold.ttf b/...oid/app/src/main/assets/fonts/slkscrb.ttf → ...src/main/assets/fonts/Silkscreen-bold.ttf
diff --git a/...roid/app/src/main/assets/fonts/slkscr.ttf → .../app/src/main/assets/fonts/Silkscreen.ttf b/...roid/app/src/main/assets/fonts/slkscr.ttf → .../app/src/main/assets/fonts/Silkscreen.ttf
diff --git a/template/android/link-assets-manifest.json b/template/android/link-assets-manifest.json
@@ -70,16 +70,16 @@
       "sha1": "cf2dcfd6aa812f641e3d2c81af69a6c553539083"
     },
     {
-      "path": "node_modules/@tamagui/font-silkscreen/files/slkscr.ttf",
-      "sha1": "417bc8219cf9d819c538c052397f3352dda426a7"
+      "path": "node_modules/@tamagui/font-silkscreen/files/Silkscreen-bold.ttf",
+      "sha1": "a960fd4e201077cda027756743c344ffcb8285fb"
     },
     {
-      "path": "node_modules/@tamagui/font-silkscreen/files/slkscr.woff",
-      "sha1": "30d9b6f1b318c955d613dcf18d572f9aee9a35c8"
+      "path": "node_modules/@tamagui/font-silkscreen/files/Silkscreen.ttf",
+      "sha1": "417bc8219cf9d819c538c052397f3352dda426a7"
     },
     {
-      "path": "node_modules/@tamagui/font-silkscreen/files/slkscrb.ttf",
-      "sha1": "a960fd4e201077cda027756743c344ffcb8285fb"
+      "path": "node_modules/@tamagui/font-silkscreen/files/Silkscreen.woff",
+      "sha1": "30d9b6f1b318c955d613dcf18d572f9aee9a35c8"
     }
   ]
 }
diff --git a/template/ios/ProjectName.xcodeproj/project.pbxproj b/template/ios/ProjectName.xcodeproj/project.pbxproj
diff --git a/template/ios/ProjectName/Info.plist b/template/ios/ProjectName/Info.plist
@@ -70,8 +70,8 @@
 		<string>Inter-SemiBoldItalic.otf</string>
 		<string>Inter-Thin.otf</string>
 		<string>Inter-ThinItalic.otf</string>
-		<string>slkscr.ttf</string>
-		<string>slkscrb.ttf</string>
+		<string>Silkscreen-bold.ttf</string>
+		<string>Silkscreen.ttf</string>
 	</array>
 </dict>
 </plist>
diff --git a/template/ios/link-assets-manifest.json b/template/ios/link-assets-manifest.json
@@ -70,16 +70,16 @@
       "sha1": "cf2dcfd6aa812f641e3d2c81af69a6c553539083"
     },
     {
-      "path": "node_modules/@tamagui/font-silkscreen/files/slkscr.ttf",
-      "sha1": "417bc8219cf9d819c538c052397f3352dda426a7"
+      "path": "node_modules/@tamagui/font-silkscreen/files/Silkscreen-bold.ttf",
+      "sha1": "a960fd4e201077cda027756743c344ffcb8285fb"
     },
     {
-      "path": "node_modules/@tamagui/font-silkscreen/files/slkscr.woff",
-      "sha1": "30d9b6f1b318c955d613dcf18d572f9aee9a35c8"
+      "path": "node_modules/@tamagui/font-silkscreen/files/Silkscreen.ttf",
+      "sha1": "417bc8219cf9d819c538c052397f3352dda426a7"
     },
     {
-      "path": "node_modules/@tamagui/font-silkscreen/files/slkscrb.ttf",
-      "sha1": "a960fd4e201077cda027756743c344ffcb8285fb"
+      "path": "node_modules/@tamagui/font-silkscreen/files/Silkscreen.woff",
+      "sha1": "30d9b6f1b318c955d613dcf18d572f9aee9a35c8"
     }
   ]
 }
diff --git a/template/patches/@tamagui+font-silkscreen+1.0.17.patch b/template/patches/@tamagui+font-silkscreen+1.0.17.patch
@@ -0,0 +1,12 @@
+diff --git a/node_modules/@tamagui/font-silkscreen/files/slkscrb.ttf b/node_modules/@tamagui/font-silkscreen/files/Silkscreen-bold.ttf
+similarity index 100%
+rename from node_modules/@tamagui/font-silkscreen/files/slkscrb.ttf
+rename to node_modules/@tamagui/font-silkscreen/files/Silkscreen-bold.ttf
+diff --git a/node_modules/@tamagui/font-silkscreen/files/slkscr.ttf b/node_modules/@tamagui/font-silkscreen/files/Silkscreen.ttf
+similarity index 100%
+rename from node_modules/@tamagui/font-silkscreen/files/slkscr.ttf
+rename to node_modules/@tamagui/font-silkscreen/files/Silkscreen.ttf
+diff --git a/node_modules/@tamagui/font-silkscreen/files/slkscr.woff b/node_modules/@tamagui/font-silkscreen/files/Silkscreen.woff
+similarity index 100%
+rename from node_modules/@tamagui/font-silkscreen/files/slkscr.woff
+rename to node_modules/@tamagui/font-silkscreen/files/Silkscreen.woff
diff --git a/template/tamagui/fonts.ts b/template/tamagui/fonts.ts
@@ -47,7 +47,7 @@ export function createGenericFont<
 
 const systemFamily =
   process.env.TAMAGUI_TARGET === 'native'
-    ? 'Inter'
+    ? 'Inter-Medium'
     : '-apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol"';
 
 const silkscreenFont = createSilkscreenFont();
@@ -99,6 +99,10 @@ const bodyFont = createInterFont(
       1: '500',
       7: '600',
     },
+    // for native
+    face: {
+      900: {normal: 'Inter-Bold'},
+    },
   },
   {
     sizeSize: size => Math.round(size),