mirror of
https://github.com/jakejarvis/sofa.git
synced 2026-07-14 18:15:56 -04:00
refactor(native): bundle fonts locally and replace @expo-google-fonts packages
Replace the three `@expo-google-fonts` npm dependencies (dm-sans, dm-serif-display, geist-mono) with locally vendored TTF files under `assets/fonts/`. Update `app.json` font paths accordingly and consolidate the four separate DM Sans Android font-family entries into a single `"DM Sans"` family with multiple weight definitions. Rename font family identifiers throughout components and `global.css` to match the simplified names (`DM Sans`, `DM Serif Display`, `Geist Mono`).
This commit is contained in:
+18
-33
@@ -40,66 +40,51 @@
|
||||
{
|
||||
"ios": {
|
||||
"fonts": [
|
||||
"../../node_modules/@expo-google-fonts/dm-sans/400Regular/DMSans_400Regular.ttf",
|
||||
"../../node_modules/@expo-google-fonts/dm-sans/500Medium/DMSans_500Medium.ttf",
|
||||
"../../node_modules/@expo-google-fonts/dm-sans/600SemiBold/DMSans_600SemiBold.ttf",
|
||||
"../../node_modules/@expo-google-fonts/dm-sans/700Bold/DMSans_700Bold.ttf",
|
||||
"../../node_modules/@expo-google-fonts/dm-serif-display/400Regular/DMSerifDisplay_400Regular.ttf",
|
||||
"../../node_modules/@expo-google-fonts/geist-mono/400Regular/GeistMono_400Regular.ttf"
|
||||
"./assets/fonts/DM_Sans/DMSans-Regular.ttf",
|
||||
"./assets/fonts/DM_Sans/DMSans-Medium.ttf",
|
||||
"./assets/fonts/DM_Sans/DMSans-SemiBold.ttf",
|
||||
"./assets/fonts/DM_Sans/DMSans-Bold.ttf",
|
||||
"./assets/fonts/DM_Serif_Display/DMSerifDisplay-Regular.ttf",
|
||||
"./assets/fonts/Geist_Mono/GeistMono-Regular.ttf"
|
||||
]
|
||||
},
|
||||
"android": {
|
||||
"fonts": [
|
||||
{
|
||||
"fontFamily": "DMSans-Regular",
|
||||
"fontFamily": "DM Sans",
|
||||
"fontDefinitions": [
|
||||
{
|
||||
"path": "../../node_modules/@expo-google-fonts/dm-sans/400Regular/DMSans_400Regular.ttf",
|
||||
"path": "./assets/fonts/DM_Sans/DMSans-Regular.ttf",
|
||||
"weight": 400
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"fontFamily": "DMSans-Medium",
|
||||
"fontDefinitions": [
|
||||
},
|
||||
{
|
||||
"path": "../../node_modules/@expo-google-fonts/dm-sans/500Medium/DMSans_500Medium.ttf",
|
||||
"path": "./assets/fonts/DM_Sans/DMSans-Medium.ttf",
|
||||
"weight": 500
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"fontFamily": "DMSans-SemiBold",
|
||||
"fontDefinitions": [
|
||||
},
|
||||
{
|
||||
"path": "../../node_modules/@expo-google-fonts/dm-sans/600SemiBold/DMSans_600SemiBold.ttf",
|
||||
"path": "./assets/fonts/DM_Sans/DMSans-SemiBold.ttf",
|
||||
"weight": 600
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"fontFamily": "DMSans-Bold",
|
||||
"fontDefinitions": [
|
||||
},
|
||||
{
|
||||
"path": "../../node_modules/@expo-google-fonts/dm-sans/700Bold/DMSans_700Bold.ttf",
|
||||
"path": "./assets/fonts/DM_Sans/DMSans-Bold.ttf",
|
||||
"weight": 700
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"fontFamily": "DMSerifDisplay-Regular",
|
||||
"fontFamily": "DM Serif Display",
|
||||
"fontDefinitions": [
|
||||
{
|
||||
"path": "../../node_modules/@expo-google-fonts/dm-serif-display/400Regular/DMSerifDisplay_400Regular.ttf",
|
||||
"path": "./assets/fonts/DM_Serif_Display/DMSerifDisplay-Regular.ttf",
|
||||
"weight": 400
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"fontFamily": "GeistMono-Regular",
|
||||
"fontFamily": "Geist Mono",
|
||||
"fontDefinitions": [
|
||||
{
|
||||
"path": "../../node_modules/@expo-google-fonts/geist-mono/400Regular/GeistMono_400Regular.ttf",
|
||||
"path": "./assets/fonts/Geist_Mono/GeistMono-Regular.ttf",
|
||||
"weight": 400
|
||||
}
|
||||
]
|
||||
|
||||
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
Binary file not shown.
BIN
Binary file not shown.
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
Executable
+93
@@ -0,0 +1,93 @@
|
||||
Copyright 2014 The DM Sans Project Authors (https://github.com/googlefonts/dm-fonts)
|
||||
|
||||
This Font Software is licensed under the SIL Open Font License, Version 1.1.
|
||||
This license is copied below, and is also available with a FAQ at:
|
||||
https://openfontlicense.org
|
||||
|
||||
|
||||
-----------------------------------------------------------
|
||||
SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
|
||||
-----------------------------------------------------------
|
||||
|
||||
PREAMBLE
|
||||
The goals of the Open Font License (OFL) are to stimulate worldwide
|
||||
development of collaborative font projects, to support the font creation
|
||||
efforts of academic and linguistic communities, and to provide a free and
|
||||
open framework in which fonts may be shared and improved in partnership
|
||||
with others.
|
||||
|
||||
The OFL allows the licensed fonts to be used, studied, modified and
|
||||
redistributed freely as long as they are not sold by themselves. The
|
||||
fonts, including any derivative works, can be bundled, embedded,
|
||||
redistributed and/or sold with any software provided that any reserved
|
||||
names are not used by derivative works. The fonts and derivatives,
|
||||
however, cannot be released under any other type of license. The
|
||||
requirement for fonts to remain under this license does not apply
|
||||
to any document created using the fonts or their derivatives.
|
||||
|
||||
DEFINITIONS
|
||||
"Font Software" refers to the set of files released by the Copyright
|
||||
Holder(s) under this license and clearly marked as such. This may
|
||||
include source files, build scripts and documentation.
|
||||
|
||||
"Reserved Font Name" refers to any names specified as such after the
|
||||
copyright statement(s).
|
||||
|
||||
"Original Version" refers to the collection of Font Software components as
|
||||
distributed by the Copyright Holder(s).
|
||||
|
||||
"Modified Version" refers to any derivative made by adding to, deleting,
|
||||
or substituting -- in part or in whole -- any of the components of the
|
||||
Original Version, by changing formats or by porting the Font Software to a
|
||||
new environment.
|
||||
|
||||
"Author" refers to any designer, engineer, programmer, technical
|
||||
writer or other person who contributed to the Font Software.
|
||||
|
||||
PERMISSION & CONDITIONS
|
||||
Permission is hereby granted, free of charge, to any person obtaining
|
||||
a copy of the Font Software, to use, study, copy, merge, embed, modify,
|
||||
redistribute, and sell modified and unmodified copies of the Font
|
||||
Software, subject to the following conditions:
|
||||
|
||||
1) Neither the Font Software nor any of its individual components,
|
||||
in Original or Modified Versions, may be sold by itself.
|
||||
|
||||
2) Original or Modified Versions of the Font Software may be bundled,
|
||||
redistributed and/or sold with any software, provided that each copy
|
||||
contains the above copyright notice and this license. These can be
|
||||
included either as stand-alone text files, human-readable headers or
|
||||
in the appropriate machine-readable metadata fields within text or
|
||||
binary files as long as those fields can be easily viewed by the user.
|
||||
|
||||
3) No Modified Version of the Font Software may use the Reserved Font
|
||||
Name(s) unless explicit written permission is granted by the corresponding
|
||||
Copyright Holder. This restriction only applies to the primary font name as
|
||||
presented to the users.
|
||||
|
||||
4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
|
||||
Software shall not be used to promote, endorse or advertise any
|
||||
Modified Version, except to acknowledge the contribution(s) of the
|
||||
Copyright Holder(s) and the Author(s) or with their explicit written
|
||||
permission.
|
||||
|
||||
5) The Font Software, modified or unmodified, in part or in whole,
|
||||
must be distributed entirely under this license, and must not be
|
||||
distributed under any other license. The requirement for fonts to
|
||||
remain under this license does not apply to any document created
|
||||
using the Font Software.
|
||||
|
||||
TERMINATION
|
||||
This license becomes null and void if any of the above conditions are
|
||||
not met.
|
||||
|
||||
DISCLAIMER
|
||||
THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
|
||||
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
|
||||
OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
|
||||
COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
|
||||
INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
|
||||
DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
||||
FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
|
||||
OTHER DEALINGS IN THE FONT SOFTWARE.
|
||||
Binary file not shown.
Binary file not shown.
+93
@@ -0,0 +1,93 @@
|
||||
Copyright 2014-2018 Adobe (http://www.adobe.com/), with Reserved Font Name 'Source'. All Rights Reserved. Source is a trademark of Adobe in the United States and/or other countries. Copyright 2019 Google LLC.
|
||||
|
||||
This Font Software is licensed under the SIL Open Font License, Version 1.1.
|
||||
This license is copied below, and is also available with a FAQ at:
|
||||
https://openfontlicense.org
|
||||
|
||||
|
||||
-----------------------------------------------------------
|
||||
SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
|
||||
-----------------------------------------------------------
|
||||
|
||||
PREAMBLE
|
||||
The goals of the Open Font License (OFL) are to stimulate worldwide
|
||||
development of collaborative font projects, to support the font creation
|
||||
efforts of academic and linguistic communities, and to provide a free and
|
||||
open framework in which fonts may be shared and improved in partnership
|
||||
with others.
|
||||
|
||||
The OFL allows the licensed fonts to be used, studied, modified and
|
||||
redistributed freely as long as they are not sold by themselves. The
|
||||
fonts, including any derivative works, can be bundled, embedded,
|
||||
redistributed and/or sold with any software provided that any reserved
|
||||
names are not used by derivative works. The fonts and derivatives,
|
||||
however, cannot be released under any other type of license. The
|
||||
requirement for fonts to remain under this license does not apply
|
||||
to any document created using the fonts or their derivatives.
|
||||
|
||||
DEFINITIONS
|
||||
"Font Software" refers to the set of files released by the Copyright
|
||||
Holder(s) under this license and clearly marked as such. This may
|
||||
include source files, build scripts and documentation.
|
||||
|
||||
"Reserved Font Name" refers to any names specified as such after the
|
||||
copyright statement(s).
|
||||
|
||||
"Original Version" refers to the collection of Font Software components as
|
||||
distributed by the Copyright Holder(s).
|
||||
|
||||
"Modified Version" refers to any derivative made by adding to, deleting,
|
||||
or substituting -- in part or in whole -- any of the components of the
|
||||
Original Version, by changing formats or by porting the Font Software to a
|
||||
new environment.
|
||||
|
||||
"Author" refers to any designer, engineer, programmer, technical
|
||||
writer or other person who contributed to the Font Software.
|
||||
|
||||
PERMISSION & CONDITIONS
|
||||
Permission is hereby granted, free of charge, to any person obtaining
|
||||
a copy of the Font Software, to use, study, copy, merge, embed, modify,
|
||||
redistribute, and sell modified and unmodified copies of the Font
|
||||
Software, subject to the following conditions:
|
||||
|
||||
1) Neither the Font Software nor any of its individual components,
|
||||
in Original or Modified Versions, may be sold by itself.
|
||||
|
||||
2) Original or Modified Versions of the Font Software may be bundled,
|
||||
redistributed and/or sold with any software, provided that each copy
|
||||
contains the above copyright notice and this license. These can be
|
||||
included either as stand-alone text files, human-readable headers or
|
||||
in the appropriate machine-readable metadata fields within text or
|
||||
binary files as long as those fields can be easily viewed by the user.
|
||||
|
||||
3) No Modified Version of the Font Software may use the Reserved Font
|
||||
Name(s) unless explicit written permission is granted by the corresponding
|
||||
Copyright Holder. This restriction only applies to the primary font name as
|
||||
presented to the users.
|
||||
|
||||
4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
|
||||
Software shall not be used to promote, endorse or advertise any
|
||||
Modified Version, except to acknowledge the contribution(s) of the
|
||||
Copyright Holder(s) and the Author(s) or with their explicit written
|
||||
permission.
|
||||
|
||||
5) The Font Software, modified or unmodified, in part or in whole,
|
||||
must be distributed entirely under this license, and must not be
|
||||
distributed under any other license. The requirement for fonts to
|
||||
remain under this license does not apply to any document created
|
||||
using the Font Software.
|
||||
|
||||
TERMINATION
|
||||
This license becomes null and void if any of the above conditions are
|
||||
not met.
|
||||
|
||||
DISCLAIMER
|
||||
THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
|
||||
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
|
||||
OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
|
||||
COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
|
||||
INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
|
||||
DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
||||
FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
|
||||
OTHER DEALINGS IN THE FONT SOFTWARE.
|
||||
BIN
Binary file not shown.
BIN
Binary file not shown.
Binary file not shown.
Binary file not shown.
BIN
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
BIN
Binary file not shown.
Executable
+93
@@ -0,0 +1,93 @@
|
||||
Copyright 2024 The Geist Project Authors (https://github.com/vercel/geist-font.git)
|
||||
|
||||
This Font Software is licensed under the SIL Open Font License, Version 1.1.
|
||||
This license is copied below, and is also available with a FAQ at:
|
||||
https://openfontlicense.org
|
||||
|
||||
|
||||
-----------------------------------------------------------
|
||||
SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
|
||||
-----------------------------------------------------------
|
||||
|
||||
PREAMBLE
|
||||
The goals of the Open Font License (OFL) are to stimulate worldwide
|
||||
development of collaborative font projects, to support the font creation
|
||||
efforts of academic and linguistic communities, and to provide a free and
|
||||
open framework in which fonts may be shared and improved in partnership
|
||||
with others.
|
||||
|
||||
The OFL allows the licensed fonts to be used, studied, modified and
|
||||
redistributed freely as long as they are not sold by themselves. The
|
||||
fonts, including any derivative works, can be bundled, embedded,
|
||||
redistributed and/or sold with any software provided that any reserved
|
||||
names are not used by derivative works. The fonts and derivatives,
|
||||
however, cannot be released under any other type of license. The
|
||||
requirement for fonts to remain under this license does not apply
|
||||
to any document created using the fonts or their derivatives.
|
||||
|
||||
DEFINITIONS
|
||||
"Font Software" refers to the set of files released by the Copyright
|
||||
Holder(s) under this license and clearly marked as such. This may
|
||||
include source files, build scripts and documentation.
|
||||
|
||||
"Reserved Font Name" refers to any names specified as such after the
|
||||
copyright statement(s).
|
||||
|
||||
"Original Version" refers to the collection of Font Software components as
|
||||
distributed by the Copyright Holder(s).
|
||||
|
||||
"Modified Version" refers to any derivative made by adding to, deleting,
|
||||
or substituting -- in part or in whole -- any of the components of the
|
||||
Original Version, by changing formats or by porting the Font Software to a
|
||||
new environment.
|
||||
|
||||
"Author" refers to any designer, engineer, programmer, technical
|
||||
writer or other person who contributed to the Font Software.
|
||||
|
||||
PERMISSION & CONDITIONS
|
||||
Permission is hereby granted, free of charge, to any person obtaining
|
||||
a copy of the Font Software, to use, study, copy, merge, embed, modify,
|
||||
redistribute, and sell modified and unmodified copies of the Font
|
||||
Software, subject to the following conditions:
|
||||
|
||||
1) Neither the Font Software nor any of its individual components,
|
||||
in Original or Modified Versions, may be sold by itself.
|
||||
|
||||
2) Original or Modified Versions of the Font Software may be bundled,
|
||||
redistributed and/or sold with any software, provided that each copy
|
||||
contains the above copyright notice and this license. These can be
|
||||
included either as stand-alone text files, human-readable headers or
|
||||
in the appropriate machine-readable metadata fields within text or
|
||||
binary files as long as those fields can be easily viewed by the user.
|
||||
|
||||
3) No Modified Version of the Font Software may use the Reserved Font
|
||||
Name(s) unless explicit written permission is granted by the corresponding
|
||||
Copyright Holder. This restriction only applies to the primary font name as
|
||||
presented to the users.
|
||||
|
||||
4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
|
||||
Software shall not be used to promote, endorse or advertise any
|
||||
Modified Version, except to acknowledge the contribution(s) of the
|
||||
Copyright Holder(s) and the Author(s) or with their explicit written
|
||||
permission.
|
||||
|
||||
5) The Font Software, modified or unmodified, in part or in whole,
|
||||
must be distributed entirely under this license, and must not be
|
||||
distributed under any other license. The requirement for fonts to
|
||||
remain under this license does not apply to any document created
|
||||
using the Font Software.
|
||||
|
||||
TERMINATION
|
||||
This license becomes null and void if any of the above conditions are
|
||||
not met.
|
||||
|
||||
DISCLAIMER
|
||||
THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
|
||||
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
|
||||
OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
|
||||
COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
|
||||
INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
|
||||
DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
||||
FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
|
||||
OTHER DEALINGS IN THE FONT SOFTWARE.
|
||||
@@ -15,9 +15,6 @@
|
||||
},
|
||||
"dependencies": {
|
||||
"@better-auth/expo": "catalog:",
|
||||
"@expo-google-fonts/dm-sans": "0.4.2",
|
||||
"@expo-google-fonts/dm-serif-display": "0.4.2",
|
||||
"@expo-google-fonts/geist-mono": "0.4.1",
|
||||
"@expo/metro-runtime": "55.0.6",
|
||||
"@expo/ui": "55.0.2",
|
||||
"@orpc/client": "catalog:",
|
||||
|
||||
@@ -195,7 +195,7 @@ export default function ServerUrlScreen() {
|
||||
) : isSuccess ? (
|
||||
<View className="min-h-12 flex-row items-center justify-center gap-1.5 py-2">
|
||||
<IconCircleCheck size={16} color={statusCompletedColor} />
|
||||
<Text className="font-sans-medium text-[13px] text-status-completed">
|
||||
<Text className="font-medium font-sans text-[13px] text-status-completed">
|
||||
Connected
|
||||
</Text>
|
||||
</View>
|
||||
@@ -237,7 +237,7 @@ export default function ServerUrlScreen() {
|
||||
className="flex-row items-center gap-1.5"
|
||||
>
|
||||
<IconInfoCircle size={16} color={mutedFgColor} />
|
||||
<Text className="font-sans-medium text-[13px] text-primary">
|
||||
<Text className="font-medium font-sans text-[13px] text-primary">
|
||||
Don't have a server?
|
||||
</Text>
|
||||
</Pressable>
|
||||
|
||||
@@ -144,6 +144,9 @@ export default function SearchScreen() {
|
||||
<View className="flex-1 bg-background">
|
||||
<Stack.Screen
|
||||
options={{
|
||||
headerTransparent: false,
|
||||
headerStyle: { backgroundColor: "#000" },
|
||||
headerLargeStyle: { backgroundColor: "#000" },
|
||||
headerSearchBarOptions: {
|
||||
placeholder: "Search movies, shows, people...",
|
||||
onChangeText: (e) => setQuery(e.nativeEvent.text),
|
||||
|
||||
@@ -287,7 +287,7 @@ export default function SettingsScreen() {
|
||||
</View>
|
||||
) : (
|
||||
<View className="flex-1 items-center justify-center bg-primary/[0.08]">
|
||||
<Text className="font-sans-medium text-lg text-primary">
|
||||
<Text className="font-medium font-sans text-lg text-primary">
|
||||
{session?.user?.name?.charAt(0)?.toUpperCase() ?? "?"}
|
||||
</Text>
|
||||
</View>
|
||||
@@ -326,7 +326,7 @@ export default function SettingsScreen() {
|
||||
</View>
|
||||
) : (
|
||||
<Pressable onPress={() => setIsEditingName(true)}>
|
||||
<Text className="font-sans-medium text-base text-foreground">
|
||||
<Text className="font-medium font-sans text-base text-foreground">
|
||||
{session?.user?.name}
|
||||
</Text>
|
||||
</Pressable>
|
||||
@@ -340,7 +340,7 @@ export default function SettingsScreen() {
|
||||
</View>
|
||||
{isAdmin && (
|
||||
<View className="rounded-full bg-primary/10 px-2 py-0.5">
|
||||
<Text className="font-sans-medium text-[10px] text-primary">
|
||||
<Text className="font-medium font-sans text-[10px] text-primary">
|
||||
Admin
|
||||
</Text>
|
||||
</View>
|
||||
@@ -485,7 +485,7 @@ export default function SettingsScreen() {
|
||||
/>
|
||||
{updateCheck.data?.updateCheck?.updateAvailable && (
|
||||
<View className="py-3.5">
|
||||
<Text className="font-sans-medium text-[13px] text-status-completed">
|
||||
<Text className="font-medium font-sans text-[13px] text-status-completed">
|
||||
Update available: {updateCheck.data.updateCheck.latestVersion}
|
||||
</Text>
|
||||
</View>
|
||||
|
||||
@@ -444,7 +444,7 @@ export default function TitleDetailScreen() {
|
||||
</Text>
|
||||
<View className="mt-1.5 flex-row flex-wrap items-center gap-2">
|
||||
<View className="rounded-full bg-title-accent px-2 py-0.5">
|
||||
<Text className="font-sans-medium text-[10px] text-title-accent-foreground">
|
||||
<Text className="font-medium font-sans text-[10px] text-title-accent-foreground">
|
||||
{title.type === "movie" ? "Movie" : "TV"}
|
||||
</Text>
|
||||
</View>
|
||||
@@ -528,7 +528,7 @@ export default function TitleDetailScreen() {
|
||||
) : (
|
||||
<>
|
||||
<IconCheck size={16} color={titleAccentForeground} />
|
||||
<Text className="font-sans-medium text-sm text-title-accent-foreground">
|
||||
<Text className="font-medium font-sans text-sm text-title-accent-foreground">
|
||||
Mark Watched
|
||||
</Text>
|
||||
</>
|
||||
|
||||
@@ -97,7 +97,7 @@ export function ContinueWatchingCard({ item }: { item: ContinueWatchingItem }) {
|
||||
<View className="absolute right-2.5 bottom-3 left-2.5">
|
||||
<Text
|
||||
numberOfLines={1}
|
||||
className="font-sans-medium text-[11px] text-white/80"
|
||||
className="font-medium font-sans text-[11px] text-white/80"
|
||||
>
|
||||
S{item.nextEpisode.seasonNumber} E
|
||||
{item.nextEpisode.episodeNumber}
|
||||
@@ -119,7 +119,7 @@ export function ContinueWatchingCard({ item }: { item: ContinueWatchingItem }) {
|
||||
<View className="p-2.5">
|
||||
<Text
|
||||
numberOfLines={1}
|
||||
className="font-sans-medium text-[13px] text-foreground"
|
||||
className="font-medium font-sans text-[13px] text-foreground"
|
||||
>
|
||||
{item.title.title}
|
||||
</Text>
|
||||
|
||||
@@ -14,7 +14,7 @@ export function StatsCard({
|
||||
style={{ borderCurve: "continuous" }}
|
||||
>
|
||||
<Text
|
||||
className="font-sans-bold text-[24px] text-primary"
|
||||
className="font-bold font-sans text-[24px] text-primary"
|
||||
style={{ fontVariant: ["tabular-nums"] }}
|
||||
>
|
||||
{value ?? "—"}
|
||||
|
||||
@@ -28,7 +28,7 @@ export function GenreChip({
|
||||
className={`mr-2 rounded-full px-3 py-1.5 ${isSelected ? "bg-primary" : "bg-secondary"}`}
|
||||
>
|
||||
<Text
|
||||
className={`font-sans-medium text-[12px] ${isSelected ? "text-primary-foreground" : "text-foreground"}`}
|
||||
className={`font-medium font-sans text-[12px] ${isSelected ? "text-primary-foreground" : "text-foreground"}`}
|
||||
>
|
||||
{label}
|
||||
</Text>
|
||||
|
||||
@@ -37,7 +37,7 @@ export function HeaderAvatar() {
|
||||
/>
|
||||
) : (
|
||||
<View className="flex-1 items-center justify-center bg-primary/[0.08]">
|
||||
<Text className="font-sans-medium text-[13px] text-primary">
|
||||
<Text className="font-medium font-sans text-[13px] text-primary">
|
||||
{user.name?.charAt(0)?.toUpperCase() ?? "?"}
|
||||
</Text>
|
||||
</View>
|
||||
|
||||
@@ -20,7 +20,9 @@ export function NativeTabBar() {
|
||||
}),
|
||||
[],
|
||||
);
|
||||
const labelTextStyle = useResolveClassNames("font-sans-medium text-[11.5px]");
|
||||
const labelTextStyle = useResolveClassNames(
|
||||
"font-sans font-medium text-[11.5px]",
|
||||
);
|
||||
|
||||
return (
|
||||
<NativeTabs
|
||||
|
||||
@@ -53,7 +53,7 @@ export function RecentlyViewedRowContent({
|
||||
<View className="flex-1">
|
||||
<Text
|
||||
numberOfLines={1}
|
||||
className="font-sans-medium text-[15px] text-foreground"
|
||||
className="font-medium font-sans text-[15px] text-foreground"
|
||||
>
|
||||
{item.title}
|
||||
</Text>
|
||||
|
||||
@@ -80,7 +80,7 @@ export const SearchResultRow = memo(function SearchResultRow({
|
||||
<View className="flex-1">
|
||||
<Text
|
||||
numberOfLines={1}
|
||||
className="font-sans-medium text-[15px] text-foreground"
|
||||
className="font-medium font-sans text-[15px] text-foreground"
|
||||
>
|
||||
{item.title}
|
||||
</Text>
|
||||
|
||||
@@ -182,7 +182,7 @@ export function IntegrationCard({ config, connection }: IntegrationCardProps) {
|
||||
color={connection ? primaryColor : mutedFgColor}
|
||||
/>
|
||||
<View>
|
||||
<Text className="font-sans-medium text-[15px] text-foreground">
|
||||
<Text className="font-medium font-sans text-[15px] text-foreground">
|
||||
{label}
|
||||
</Text>
|
||||
<Text className="mt-0.5 text-muted-foreground text-xs">
|
||||
@@ -228,7 +228,7 @@ export function IntegrationCard({ config, connection }: IntegrationCardProps) {
|
||||
disabled={connectMutation.isPending}
|
||||
className="items-center rounded-lg bg-primary py-2.5 active:opacity-80"
|
||||
>
|
||||
<Text className="font-sans-medium text-primary-foreground">
|
||||
<Text className="font-medium font-sans text-primary-foreground">
|
||||
{connectMutation.isPending ? "Connecting…" : `Connect ${label}`}
|
||||
</Text>
|
||||
</Pressable>
|
||||
@@ -270,7 +270,7 @@ export function IntegrationCard({ config, connection }: IntegrationCardProps) {
|
||||
className="flex-1 flex-row items-center justify-center gap-1.5 rounded-lg bg-secondary py-2.5 active:opacity-80"
|
||||
>
|
||||
<IconRefresh size={14} color={mutedFgColor} />
|
||||
<Text className="font-sans-medium text-[13px] text-foreground">
|
||||
<Text className="font-medium font-sans text-[13px] text-foreground">
|
||||
Regenerate
|
||||
</Text>
|
||||
</Pressable>
|
||||
@@ -279,7 +279,7 @@ export function IntegrationCard({ config, connection }: IntegrationCardProps) {
|
||||
className="flex-1 flex-row items-center justify-center gap-1.5 rounded-lg bg-destructive/10 py-2.5 active:opacity-80"
|
||||
>
|
||||
<IconTrash size={14} color="#ef4444" />
|
||||
<Text className="font-sans-medium text-[13px] text-destructive">
|
||||
<Text className="font-medium font-sans text-[13px] text-destructive">
|
||||
Disconnect
|
||||
</Text>
|
||||
</Pressable>
|
||||
|
||||
@@ -30,7 +30,7 @@ export function IntegrationsSection() {
|
||||
style={{ borderCurve: "continuous" }}
|
||||
>
|
||||
<IconRefresh size={14} className="accent-primary" />
|
||||
<Text className="font-sans-medium text-[13px] text-primary">
|
||||
<Text className="font-medium font-sans text-[13px] text-primary">
|
||||
Retry
|
||||
</Text>
|
||||
</Pressable>
|
||||
|
||||
@@ -37,7 +37,7 @@ export function SettingsSection({
|
||||
<SectionHeader title={title} icon={icon} />
|
||||
{badge ? (
|
||||
<View className="mb-2.5 rounded-full bg-primary/10 px-2 py-0.5">
|
||||
<Text className="font-sans-medium text-[10px] text-primary">
|
||||
<Text className="font-medium font-sans text-[10px] text-primary">
|
||||
{badge}
|
||||
</Text>
|
||||
</View>
|
||||
|
||||
@@ -43,7 +43,7 @@ export function CastCard({
|
||||
</View>
|
||||
<Text
|
||||
numberOfLines={1}
|
||||
className="text-center font-sans-medium text-[11px] text-foreground"
|
||||
className="text-center font-medium font-sans text-[11px] text-foreground"
|
||||
>
|
||||
{person.name}
|
||||
</Text>
|
||||
|
||||
@@ -70,15 +70,15 @@ export function ContinueWatchingBanner({
|
||||
<View className="absolute right-3 bottom-2.5 left-3">
|
||||
<View className="flex-row items-center gap-1.5">
|
||||
<View className="h-1.5 w-1.5 rounded-full bg-title-accent" />
|
||||
<Text className="font-sans-medium text-[10px] text-title-accent uppercase tracking-wider">
|
||||
<Text className="font-medium font-sans text-[10px] text-title-accent uppercase tracking-wider">
|
||||
Up next
|
||||
</Text>
|
||||
</View>
|
||||
<Text
|
||||
numberOfLines={1}
|
||||
className="mt-0.5 font-sans-medium text-[13px] text-white"
|
||||
className="mt-0.5 font-medium font-sans text-[13px] text-white"
|
||||
>
|
||||
<Text className="font-sans-medium text-[11px] text-white/60">
|
||||
<Text className="font-medium font-sans text-[11px] text-white/60">
|
||||
S{nextEpisode.seasonNumber} E{nextEpisode.episodeNumber}
|
||||
</Text>
|
||||
{" "}
|
||||
|
||||
@@ -41,7 +41,7 @@ export function EpisodeRow({
|
||||
)}
|
||||
<View className="ml-3 flex-1">
|
||||
<Text
|
||||
className={`font-sans-medium text-sm ${isWatched ? "text-muted-foreground" : "text-foreground"}`}
|
||||
className={`font-medium font-sans text-sm ${isWatched ? "text-muted-foreground" : "text-foreground"}`}
|
||||
numberOfLines={1}
|
||||
>
|
||||
{episode.episodeNumber}.{" "}
|
||||
|
||||
@@ -150,7 +150,7 @@ export function SeasonAccordion({
|
||||
className="flex-row items-center justify-between p-4"
|
||||
>
|
||||
<View className="flex-1">
|
||||
<Text className="font-sans-medium text-[15px] text-foreground">
|
||||
<Text className="font-medium font-sans text-[15px] text-foreground">
|
||||
{season.name ?? `Season ${season.seasonNumber}`}
|
||||
</Text>
|
||||
<Text className="mt-0.5 text-muted-foreground text-xs">
|
||||
@@ -186,7 +186,7 @@ export function SeasonAccordion({
|
||||
onPress={() => watchSeason.mutate({ id: season.id })}
|
||||
className="mx-4 mb-2 flex-row items-center justify-center rounded-lg bg-secondary py-2"
|
||||
>
|
||||
<Text className="font-sans-medium text-title-accent text-xs">
|
||||
<Text className="font-medium font-sans text-title-accent text-xs">
|
||||
Mark All Watched
|
||||
</Text>
|
||||
</Pressable>
|
||||
|
||||
@@ -63,7 +63,7 @@ export function StatusActionButton({
|
||||
className="flex-row items-center gap-1.5 rounded-lg border border-title-accent/20 bg-title-accent/10 px-4 py-2"
|
||||
>
|
||||
<IconPlus size={14} color={titleAccent} strokeWidth={2.5} />
|
||||
<Text className="font-sans-medium text-sm text-title-accent">
|
||||
<Text className="font-medium font-sans text-sm text-title-accent">
|
||||
Watchlist
|
||||
</Text>
|
||||
</Pressable>
|
||||
@@ -85,7 +85,7 @@ export function StatusActionButton({
|
||||
className={`flex-row items-center gap-1.5 rounded-lg border px-4 py-2 ${config.bgClass}`}
|
||||
>
|
||||
<config.Icon size={14} color={iconColor} />
|
||||
<Text className={`font-sans-medium text-sm ${config.textClass}`}>
|
||||
<Text className={`font-medium font-sans text-sm ${config.textClass}`}>
|
||||
{config.label}
|
||||
</Text>
|
||||
</Pressable>
|
||||
|
||||
@@ -67,7 +67,7 @@ export function ButtonLabel({ style, className, ...props }: ButtonLabelProps) {
|
||||
return (
|
||||
<Text
|
||||
className={cn(
|
||||
"text-center font-sans-medium text-[15px]",
|
||||
"text-center font-medium font-sans text-[15px]",
|
||||
variant === "secondary"
|
||||
? "text-secondary-foreground"
|
||||
: "text-primary-foreground",
|
||||
|
||||
@@ -32,7 +32,7 @@ export function EmptyState({
|
||||
<View accessible={false}>
|
||||
<IconComponent size={48} color={mutedForeground} />
|
||||
</View>
|
||||
<Text className="mt-3 text-center font-sans-medium text-[16px] text-foreground">
|
||||
<Text className="mt-3 text-center font-medium font-sans text-[16px] text-foreground">
|
||||
{title}
|
||||
</Text>
|
||||
{description && (
|
||||
|
||||
@@ -61,7 +61,7 @@ export function ExpandableText({
|
||||
className="mt-1"
|
||||
>
|
||||
<Text
|
||||
className="font-sans-medium text-[13px] text-primary"
|
||||
className="font-medium font-sans text-[13px] text-primary"
|
||||
style={actionColor ? { color: actionColor } : undefined}
|
||||
>
|
||||
{expanded ? "Show less" : "Show more"}
|
||||
|
||||
@@ -68,14 +68,14 @@ export function OfflineBanner() {
|
||||
}}
|
||||
>
|
||||
<IconWifiOff size={16} color="white" />
|
||||
<Text className="font-sans-medium text-[13px] text-white">
|
||||
<Text className="font-medium font-sans text-[13px] text-white">
|
||||
No internet connection
|
||||
</Text>
|
||||
</GlassView>
|
||||
) : (
|
||||
<View className="mx-4 flex-row items-center justify-center gap-2 rounded-xl bg-destructive px-4 py-2.5">
|
||||
<IconWifiOff size={16} color="white" />
|
||||
<Text className="font-sans-medium text-[13px] text-white">
|
||||
<Text className="font-medium font-sans text-[13px] text-white">
|
||||
No internet connection
|
||||
</Text>
|
||||
</View>
|
||||
|
||||
@@ -53,7 +53,7 @@ export function OfflineBanner() {
|
||||
>
|
||||
<View className="mx-4 flex-row items-center justify-center gap-2 rounded-xl bg-destructive px-4 py-2.5">
|
||||
<IconWifiOff size={16} color="white" />
|
||||
<Text className="font-sans-medium text-[13px] text-white">
|
||||
<Text className="font-medium font-sans text-[13px] text-white">
|
||||
No internet connection
|
||||
</Text>
|
||||
</View>
|
||||
|
||||
@@ -207,7 +207,7 @@ export function PosterCard({
|
||||
/>
|
||||
)}
|
||||
<Text
|
||||
className="flex-1 font-sans-medium text-[13px] text-foreground"
|
||||
className="flex-1 font-medium font-sans text-[13px] text-foreground"
|
||||
numberOfLines={1}
|
||||
>
|
||||
{title}
|
||||
|
||||
@@ -61,14 +61,16 @@ export function ServerUnreachableBanner() {
|
||||
const content = (
|
||||
<>
|
||||
<IconCloudOff size={16} color="white" />
|
||||
<Text className="font-sans-medium text-[13px] text-white">
|
||||
<Text className="font-medium font-sans text-[13px] text-white">
|
||||
Can't reach server
|
||||
</Text>
|
||||
<Pressable
|
||||
onPress={handleRetry}
|
||||
className="ml-1 rounded-md bg-white/20 px-2 py-0.5"
|
||||
>
|
||||
<Text className="font-sans-medium text-[12px] text-white">Retry</Text>
|
||||
<Text className="font-medium font-sans text-[12px] text-white">
|
||||
Retry
|
||||
</Text>
|
||||
</Pressable>
|
||||
</>
|
||||
);
|
||||
|
||||
@@ -69,14 +69,16 @@ export function ServerUnreachableBanner() {
|
||||
>
|
||||
<View className="mx-4 flex-row items-center justify-center gap-2 rounded-xl bg-status-watching px-4 py-2.5">
|
||||
<IconCloudOff size={16} color="white" />
|
||||
<Text className="font-sans-medium text-[13px] text-white">
|
||||
<Text className="font-medium font-sans text-[13px] text-white">
|
||||
Can't reach server
|
||||
</Text>
|
||||
<Pressable
|
||||
onPress={handleRetry}
|
||||
className="ml-1 rounded-md bg-white/20 px-2 py-0.5"
|
||||
>
|
||||
<Text className="font-sans-medium text-[12px] text-white">Retry</Text>
|
||||
<Text className="font-medium font-sans text-[12px] text-white">
|
||||
Retry
|
||||
</Text>
|
||||
</Pressable>
|
||||
</View>
|
||||
</Animated.View>
|
||||
|
||||
@@ -45,7 +45,9 @@ export function StatusBadge({ status }: { status: TitleStatus }) {
|
||||
className={`flex-row items-center gap-1.5 rounded-full px-2.5 py-1 ${bgClasses[status]}`}
|
||||
>
|
||||
<StatusIcon size={12} color={colorMap[status]} />
|
||||
<Text className={`font-sans-medium text-[11px] ${textClasses[status]}`}>
|
||||
<Text
|
||||
className={`font-medium font-sans text-[11px] ${textClasses[status]}`}
|
||||
>
|
||||
{label}
|
||||
</Text>
|
||||
</View>
|
||||
|
||||
@@ -35,7 +35,7 @@ export function Label({
|
||||
return (
|
||||
<Text
|
||||
nativeID={nativeID ?? ctxId}
|
||||
className={cn("font-sans-medium text-foreground text-sm", className)}
|
||||
className={cn("font-medium font-sans text-foreground text-sm", className)}
|
||||
{...props}
|
||||
/>
|
||||
);
|
||||
|
||||
@@ -3,12 +3,9 @@
|
||||
|
||||
@theme {
|
||||
/* Fonts */
|
||||
--font-sans: "DMSans-Regular";
|
||||
--font-sans-medium: "DMSans-Medium";
|
||||
--font-sans-semibold: "DMSans-SemiBold";
|
||||
--font-sans-bold: "DMSans-Bold";
|
||||
--font-display: "DMSerifDisplay-Regular";
|
||||
--font-mono: "GeistMono-Regular";
|
||||
--font-sans: "DM Sans";
|
||||
--font-display: "DM Serif Display";
|
||||
--font-mono: "Geist Mono";
|
||||
|
||||
/* Sofa — dark cinema theme with warm amber accents */
|
||||
--color-background: oklch(0 0 0);
|
||||
|
||||
@@ -10,7 +10,7 @@ type ScreenOptions = NonNullable<
|
||||
export function useTabScreenOptions() {
|
||||
const backgroundColor = useCSSVariable("--color-background") as string;
|
||||
const headerTitleStyle = useResolveClassNames(
|
||||
"font-sans-semibold text-lg text-foreground",
|
||||
"font-sans font-semibold text-lg text-foreground",
|
||||
);
|
||||
const contentStyle = useResolveClassNames("bg-background");
|
||||
|
||||
|
||||
@@ -15,9 +15,6 @@
|
||||
"version": "0.1.0",
|
||||
"dependencies": {
|
||||
"@better-auth/expo": "catalog:",
|
||||
"@expo-google-fonts/dm-sans": "0.4.2",
|
||||
"@expo-google-fonts/dm-serif-display": "0.4.2",
|
||||
"@expo-google-fonts/geist-mono": "0.4.1",
|
||||
"@expo/metro-runtime": "55.0.6",
|
||||
"@expo/ui": "55.0.2",
|
||||
"@orpc/client": "catalog:",
|
||||
@@ -625,12 +622,6 @@
|
||||
|
||||
"@esbuild/win32-x64": ["@esbuild/win32-x64@0.25.12", "", { "os": "win32", "cpu": "x64" }, "sha512-alJC0uCZpTFrSL0CCDjcgleBXPnCrEAhTBILpeAp7M/OFgoqtAetfBzX0xM00MUsVVPpVjlPuMbREqnZCXaTnA=="],
|
||||
|
||||
"@expo-google-fonts/dm-sans": ["@expo-google-fonts/dm-sans@0.4.2", "", {}, "sha512-e/fLH5aCJzkEenz7axvEn8N7IJAKhUwNjIxS75h9j+Ip1M9S7d22M19gJN3A7QW4egVkBJRyQh1hQFhngQn9yA=="],
|
||||
|
||||
"@expo-google-fonts/dm-serif-display": ["@expo-google-fonts/dm-serif-display@0.4.2", "", {}, "sha512-onlO8xAzsgMbKcwUE+fAgJ5AFHhk06VtaDN7eQOJwjV65QIciDKTiSNu1ymHc4m6g/x6D9OqPIYPXdTNIfaEaA=="],
|
||||
|
||||
"@expo-google-fonts/geist-mono": ["@expo-google-fonts/geist-mono@0.4.1", "", {}, "sha512-4amQyslc5Qsr06CymJA7PzUaJd0ohlbpY7sWqRfZkwPp9xeVzy9JBLg05VwO3bx+M4CY+FV4AAIG/8fGRCXguw=="],
|
||||
|
||||
"@expo-google-fonts/material-symbols": ["@expo-google-fonts/material-symbols@0.4.26", "", {}, "sha512-1RBDVbRQDIAldwf0oV9QjEallOJ+FkkuYxgKFc345Vzi0dK/ipVITWTUTJHr49Jh1XQuEyVKdHH+mo3DXqZU7g=="],
|
||||
|
||||
"@expo/cli": ["@expo/cli@55.0.16", "", { "dependencies": { "@expo/code-signing-certificates": "^0.0.6", "@expo/config": "~55.0.8", "@expo/config-plugins": "~55.0.6", "@expo/devcert": "^1.2.1", "@expo/env": "~2.1.1", "@expo/image-utils": "^0.8.12", "@expo/json-file": "^10.0.12", "@expo/log-box": "55.0.7", "@expo/metro": "~54.2.0", "@expo/metro-config": "~55.0.9", "@expo/osascript": "^2.4.2", "@expo/package-manager": "^1.10.3", "@expo/plist": "^0.5.2", "@expo/prebuild-config": "^55.0.8", "@expo/require-utils": "^55.0.2", "@expo/router-server": "^55.0.10", "@expo/schema-utils": "^55.0.2", "@expo/spawn-async": "^1.7.2", "@expo/ws-tunnel": "^1.0.1", "@expo/xcpretty": "^4.4.0", "@react-native/dev-middleware": "0.83.2", "accepts": "^1.3.8", "arg": "^5.0.2", "better-opn": "~3.0.2", "bplist-creator": "0.1.0", "bplist-parser": "^0.3.1", "chalk": "^4.0.0", "ci-info": "^3.3.0", "compression": "^1.7.4", "connect": "^3.7.0", "debug": "^4.3.4", "dnssd-advertise": "^1.1.3", "expo-server": "^55.0.6", "fetch-nodeshim": "^0.4.6", "getenv": "^2.0.0", "glob": "^13.0.0", "lan-network": "^0.2.0", "multitars": "^0.2.3", "node-forge": "^1.3.3", "npm-package-arg": "^11.0.0", "ora": "^3.4.0", "picomatch": "^4.0.3", "pretty-format": "^29.7.0", "progress": "^2.0.3", "prompts": "^2.3.2", "resolve-from": "^5.0.0", "semver": "^7.6.0", "send": "^0.19.0", "slugify": "^1.3.4", "source-map-support": "~0.5.21", "stacktrace-parser": "^0.1.10", "structured-headers": "^0.4.1", "terminal-link": "^2.1.1", "toqr": "^0.1.1", "wrap-ansi": "^7.0.0", "ws": "^8.12.1", "zod": "^3.25.76" }, "peerDependencies": { "expo": "*", "expo-router": "*", "react-native": "*" }, "optionalPeers": ["expo-router", "react-native"], "bin": { "expo-internal": "build/bin/cli" } }, "sha512-rp1mBnA5msGDPTfFuqVl+9RsJOtuA0cXsWSJpHdvsIxcSVg0oJyF/rgvrwsFrNQCLXzkMXm+o3CsY9iL1D/CDA=="],
|
||||
|
||||
Reference in New Issue
Block a user