Skip to content

Commit

Permalink
chore: bump versions
Browse files Browse the repository at this point in the history
chore: embed fonts
  • Loading branch information
suvam0451 committed Jan 7, 2025
1 parent e38adec commit 20e64d5
Show file tree
Hide file tree
Showing 7 changed files with 46 additions and 58 deletions.
10 changes: 8 additions & 2 deletions apps/mobile/app.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ const expo = ({ config }: ConfigContext): ExpoConfig => ({
...config,
name: IS_DEV ? 'Dhaaga (Dev)' : 'Dhaaga',
slug: 'dhaaga',
version: '0.11.1',
version: '0.12.0',
orientation: 'portrait',
icon: './assets/placeholder_icon.png',
userInterfaceStyle: 'dark',
Expand All @@ -21,7 +21,7 @@ const expo = ({ config }: ConfigContext): ExpoConfig => ({
},
android: {
package: IS_DEV ? 'io.suvam.dhaaga.dev' : 'io.suvam.dhaaga',
versionCode: 16,
versionCode: 17,
},
androidStatusBar: {
barStyle: 'dark-content',
Expand Down Expand Up @@ -85,6 +85,12 @@ const expo = ({ config }: ConfigContext): ExpoConfig => ({
'../../node_modules/@expo-google-fonts/montserrat/Montserrat_600SemiBold.ttf',
'../../node_modules/@expo-google-fonts/montserrat/Montserrat_700Bold.ttf',
'../../node_modules/@expo-google-fonts/montserrat/Montserrat_800ExtraBold.ttf',
// BebasNeue
'../../node_modules/@expo-google-fonts/bebas-neue/BebasNeue_400Regular.ttf',
// Roboto
'../../node_modules/@expo-google-fonts/roboto/Roboto_400Regular.ttf',
'../../node_modules/@expo-google-fonts/roboto/Roboto_500Medium.ttf',
'../../node_modules/@expo-google-fonts/roboto/Roboto_700Bold.ttf',
],
},
],
Expand Down
50 changes: 25 additions & 25 deletions apps/mobile/app/_layout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -21,18 +21,18 @@ import useAppSession from '../states/useAppSession';
import ImageInspectModal from '../components/modals/ImageInspectModal';
import { AppDialog } from '../components/lib/AppDialog';
import { useAppTheme } from '../hooks/utility/global-state-extractors';
import {
BebasNeue_400Regular,
PublicSans_600SemiBold,
Roboto_400Regular,
Roboto_500Medium,
Roboto_700Bold,
SourceSansPro_400Regular,
SourceSansPro_400Regular_Italic,
SourceSansPro_600SemiBold,
SourceSansPro_600SemiBold_Italic,
useFonts,
} from '@expo-google-fonts/dev';
// import {
// BebasNeue_400Regular,
// PublicSans_600SemiBold,
// Roboto_400Regular,
// Roboto_500Medium,
// Roboto_700Bold,
// SourceSansPro_400Regular,
// SourceSansPro_400Regular_Italic,
// SourceSansPro_600SemiBold,
// SourceSansPro_600SemiBold_Italic,
// useFonts,
// } from '@expo-google-fonts/dev';

enableMapSet();

Expand Down Expand Up @@ -74,26 +74,26 @@ function App() {

const pathname = usePathname();

const [loaded, error] = useFonts({
// SourceSansPro
SourceSansPro_400Regular: SourceSansPro_400Regular,
SourceSansPro_400Regular_Italic: SourceSansPro_400Regular_Italic,
SourceSansPro_600SemiBold: SourceSansPro_600SemiBold,
SourceSansPro_600SemiBold_Italic: SourceSansPro_600SemiBold_Italic, // PublicSans
PublicSans_600SemiBold: PublicSans_600SemiBold,
Roboto_400Regular: Roboto_400Regular,
Roboto_500Medium: Roboto_500Medium,
Roboto_700Bold: Roboto_700Bold,
BebasNeue_400Regular: BebasNeue_400Regular,
});
// const [loaded, error] = useFonts({
// // SourceSansPro
// SourceSansPro_400Regular: SourceSansPro_400Regular,
// SourceSansPro_400Regular_Italic: SourceSansPro_400Regular_Italic,
// SourceSansPro_600SemiBold: SourceSansPro_600SemiBold,
// SourceSansPro_600SemiBold_Italic: SourceSansPro_600SemiBold_Italic, // PublicSans
// PublicSans_600SemiBold: PublicSans_600SemiBold,
// Roboto_400Regular: Roboto_400Regular,
// Roboto_500Medium: Roboto_500Medium,
// Roboto_700Bold: Roboto_700Bold,
// BebasNeue_400Regular: BebasNeue_400Regular,
// });

const { appReady } = useAppSession();

/**
* Wait for fonts and database to load
*/
const onLayoutRootView = useCallback(async () => {
if (!appReady || !loaded || error) {
if (!appReady) {
await SplashScreen.hideAsync();
}
}, [appReady]);
Expand Down
5 changes: 3 additions & 2 deletions apps/mobile/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@dhaaga/mobile",
"version": "0.11.0",
"version": "0.12.0",
"private": true,
"main": "index.js",
"scripts": {
Expand All @@ -17,9 +17,10 @@
"@atproto/api": "^0.13.23",
"@dhaaga/bridge": "*",
"@dhaaga/orm": "*",
"@expo-google-fonts/dev": "^0.2.3",
"@expo-google-fonts/bebas-neue": "^0.2.3",
"@expo-google-fonts/inter": "^0.2.3",
"@expo-google-fonts/montserrat": "^0.2.3",
"@expo-google-fonts/roboto": "^0.2.3",
"@expo/downloader": "^1.0.118",
"@expo/metro-config": "~0.19.0",
"@expo/vector-icons": "^14.0.4",
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "dhaaga",
"version": "0.11.0",
"version": "0.12.0",
"description": "A fun 🥳 and cozy ☕ microblogging app for the decentralized social web ",
"author": "Debashish Patra <suvam.io>",
"license": "AGPLv3",
Expand Down
2 changes: 1 addition & 1 deletion packages/orm/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@dhaaga/orm",
"description": "A custom expo-sqlite ORM implementation inspired by TypeORM",
"version": "0.1.0",
"version": "0.12.0",
"license": "MIT",
"type": "module",
"keywords": ["expo", "sqlite", "orm"],
Expand Down
24 changes: 0 additions & 24 deletions packages/parser/package.json

This file was deleted.

11 changes: 8 additions & 3 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -878,10 +878,10 @@
dependencies:
"@types/hammerjs" "^2.0.36"

"@expo-google-fonts/dev@^0.2.3":
"@expo-google-fonts/bebas-neue@^0.2.3":
version "0.2.3"
resolved "https://registry.yarnpkg.com/@expo-google-fonts/dev/-/dev-0.2.3.tgz#b52587de9f4562185d223d1ec3cb163ea49ace12"
integrity sha512-b0s8mqYb2IJn5pWyFmM4qD3Urbfz7DmRb1tNnSYMlQdj94YaFGGCTcXGPtQJ2m7p+aPWlZLkK0capQgYrPpJUw==
resolved "https://registry.yarnpkg.com/@expo-google-fonts/bebas-neue/-/bebas-neue-0.2.3.tgz#41df66599a96dd9ba208f2c59ac86e7a24fa7bcf"
integrity sha512-FrFjb2gShHLM/XTL0nYcxRt4dHjbVPmg6HzcJRoIIVt+HJQU6Nbh7Nan8KeeEny8wQFDEVCdJATnofS5xaDxqA==

"@expo-google-fonts/inter@^0.2.3":
version "0.2.3"
Expand All @@ -893,6 +893,11 @@
resolved "https://registry.yarnpkg.com/@expo-google-fonts/montserrat/-/montserrat-0.2.3.tgz#e22b337ee6bd2007126b466ddd18f9de59eb3fc6"
integrity sha512-9imhwIs6j5uyTkTxoNplC5T8ERES1W98ZgF7kf7OaypnbcoLoIW0wKH6oudecZyiEqoSktC7epkRpj+UEUvzWg==

"@expo-google-fonts/roboto@^0.2.3":
version "0.2.3"
resolved "https://registry.yarnpkg.com/@expo-google-fonts/roboto/-/roboto-0.2.3.tgz#c103422a3c8f461aaada33acaf06418f6650dc19"
integrity sha512-PF6S//ZYWeXfpYTwvY2oEe0d5RnqwR5KMsGjuTgg6y9p/CPK/IkWL+wsbkzjfd+Jck1Q1pRlWOoe5uz42sQFRg==

"@expo/bunyan@^4.0.0":
version "4.0.1"
resolved "https://registry.yarnpkg.com/@expo/bunyan/-/bunyan-4.0.1.tgz#ab9e17e36c71c704a0ce72168378a487368da736"
Expand Down

0 comments on commit 20e64d5

Please sign in to comment.