Skip to content

Commit 015e96d

Browse files
Made image proper size and changed the font family
1 parent c6cd527 commit 015e96d

21 files changed

+533
-246
lines changed
Binary file not shown.
Binary file not shown.
Binary file not shown.

assets/fonts/SourceSerifPro-Light.ttf

222 KB
Binary file not shown.
221 KB
Binary file not shown.
224 KB
Binary file not shown.

components/Categories.tsx

+1
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ const styles = StyleSheet.create({
4444
color: "#000",
4545
fontSize: 19,
4646
// paddingTop: 20,
47+
fontFamily: "SourceSerifPro-Regular",
4748
height: 28,
4849
},
4950
category: {

components/ListBookmarks.tsx

+9-4
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,8 @@ const ListBookmarks = ({ navigation, id }: any) => {
7878
</View>
7979
);
8080
};
81+
const { height } = Dimensions.get("screen");
82+
const height_logo = height * 0.1;
8183

8284
const styles = StyleSheet.create({
8385
container: {
@@ -120,16 +122,17 @@ const styles = StyleSheet.create({
120122
},
121123

122124
cardImage: {
123-
height: 150,
124125
width: undefined,
126+
height: height_logo * 2.5,
125127
marginTop: 15,
126128
},
127129
title: {
128-
fontSize: 18,
130+
fontSize: 19,
129131
color: "#000",
132+
fontFamily: "SourceSerifPro-SemiBold",
130133
},
131134
description: {
132-
fontSize: 15,
135+
fontSize: 16,
133136
borderTopLeftRadius: 1,
134137
borderTopRightRadius: 1,
135138
flexDirection: "row",
@@ -140,12 +143,14 @@ const styles = StyleSheet.create({
140143
marginTop: 5,
141144
marginBottom: 5,
142145
width: undefined,
146+
fontFamily: "SourceSerifPro-Regular",
143147
},
144148
time: {
145-
fontSize: 13,
149+
fontSize: 14,
146150
color: "#808080",
147151
// color: "#000",
148152
marginTop: 5,
153+
fontFamily: "SourceSerifPro-Regular",
149154
},
150155

151156
timeContainer: {

navigation/AppInsiderStack.tsx

+47-5
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,27 @@ const Stack = createNativeStackNavigator();
1313
export const HomeScreenNavigator = () => {
1414
return (
1515
<Stack.Navigator initialRouteName="Home">
16-
<Stack.Screen name="Home" component={HomeScreen} />
16+
<Stack.Screen
17+
name="Home"
18+
component={HomeScreen}
19+
options={{
20+
headerTitleStyle: {
21+
fontFamily: "SourceSerifPro-Regular",
22+
fontSize: 20,
23+
},
24+
}}
25+
/>
1726
<Stack.Screen
1827
name="Category"
1928
component={CategoryScreen}
2029
//TODO: If you want to render each category header based on params passed then you have to do typescript typing into the params to access them here
21-
// options={({ route }) => ({ title: route.params?.category ? route.params.category : "" })}
30+
options={({ route }) => ({
31+
title: route.params?.category,
32+
headerTitleStyle: {
33+
fontFamily: "SourceSerifPro-Regular",
34+
fontSize: 20,
35+
},
36+
})}
2237
/>
2338
<Stack.Screen
2439
name="Blog"
@@ -32,22 +47,49 @@ export const HomeScreenNavigator = () => {
3247
export const ExploreScreenNavigator = () => {
3348
return (
3449
<Stack.Navigator>
35-
<Stack.Screen name="Explore" component={ExploreScreen} />
50+
<Stack.Screen
51+
name="Explore"
52+
component={ExploreScreen}
53+
options={{
54+
headerTitleStyle: {
55+
fontFamily: "SourceSerifPro-Regular",
56+
fontSize: 20,
57+
},
58+
}}
59+
/>
3660
</Stack.Navigator>
3761
);
3862
};
3963

4064
export const BookmarkScreenNavigator = () => {
4165
return (
4266
<Stack.Navigator>
43-
<Stack.Screen name="Bookmark" component={BookmarkScreen} />
67+
<Stack.Screen
68+
name="Bookmark"
69+
component={BookmarkScreen}
70+
options={{
71+
headerTitleStyle: {
72+
fontFamily: "SourceSerifPro-Regular",
73+
fontSize: 20,
74+
},
75+
}}
76+
/>
4477
</Stack.Navigator>
4578
);
4679
};
4780
export const ProfileScreenNavigator = () => {
4881
return (
4982
<Stack.Navigator>
50-
<Stack.Screen name="Profile" component={ProfileScreen} />
83+
<Stack.Screen
84+
name="Profile"
85+
component={ProfileScreen}
86+
options={{
87+
headerTitleStyle: {
88+
fontFamily: "SourceSerifPro-Regular",
89+
fontSize: 20,
90+
},
91+
}}
92+
/>
5193
</Stack.Navigator>
5294
);
5395
};

navigation/AppStack.tsx

+14-3
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,16 @@ import {
1212
const Tab = createMaterialBottomTabNavigator();
1313

1414
function AppStack() {
15+
const getTabBarVisibility = (route: any) => {
16+
const routeName = route.state
17+
? route.state.routes[route.state.index].name
18+
: "";
19+
20+
if (routeName === "Blog") {
21+
return false;
22+
}
23+
return true;
24+
};
1525
return (
1626
<Tab.Navigator
1727
initialRouteName="HomeScreen"
@@ -30,13 +40,14 @@ function AppStack() {
3040
<Tab.Screen
3141
name="HomeScreen"
3242
component={HomeScreenNavigator}
33-
options={{
43+
options={({ route }) => ({
44+
//? The feature of tab bar visibility is not available in react native material bottom tabs navigator
45+
// tabBarVisible: getTabBarVisibility(route),
3446
tabBarLabel: "Home",
3547
tabBarIcon: ({ color }) => (
3648
<MaterialIcons name="home" color={color} size={26} />
3749
),
38-
title: "Home",
39-
}}
50+
})}
4051
/>
4152
<Tab.Screen
4253
name="ExploreScreen"

navigation/AuthStack.tsx

+2-14
Original file line numberDiff line numberDiff line change
@@ -23,20 +23,8 @@ const AuthStack: React.FC<AuthStackProps> = ({}) => {
2323
}}
2424
initialRouteName="SignupScreen"
2525
>
26-
<Stack.Screen
27-
// options={{
28-
// headerTitle: "Sign In"
29-
// }}
30-
name="LoginScreen"
31-
component={LoginScreen}
32-
/>
33-
<Stack.Screen
34-
// options={{
35-
// headerTitle: "Sign Up"
36-
// }}
37-
name="SignupScreen"
38-
component={SignupScreen}
39-
/>
26+
<Stack.Screen name="LoginScreen" component={LoginScreen} />
27+
<Stack.Screen name="SignupScreen" component={SignupScreen} />
4028
</Stack.Navigator>
4129
);
4230
};

package-lock.json

+49
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

+3
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
"@react-native-firebase/auth": "^12.7.3",
1616
"@react-native-firebase/firestore": "^12.7.3",
1717
"@react-native-google-signin/google-signin": "^6.0.1",
18+
"@react-native-masked-view/masked-view": "^0.2.6",
1819
"@react-navigation/material-bottom-tabs": "^6.0.5",
1920
"@react-navigation/native": "^6.0.2",
2021
"@react-navigation/native-stack": "^6.0.6",
@@ -28,11 +29,13 @@
2829
"react-native-bootsplash": "^3.2.4",
2930
"react-native-dotenv": "^3.2.0",
3031
"react-native-fbsdk-next": "^4.3.0",
32+
"react-native-linear-gradient": "^2.5.6",
3133
"react-native-markdown-display": "^7.0.0-alpha.2",
3234
"react-native-paper": "^4.9.2",
3335
"react-native-popup-confirm-toast": "^2.0.2",
3436
"react-native-safe-area-context": "^3.3.0",
3537
"react-native-screens": "^3.5.0",
38+
"react-native-skeleton-placeholder": "^5.0.0",
3639
"react-native-status-bar-height": "^2.6.0",
3740
"react-native-vector-icons": "^8.1.0",
3841
"react-native-windows": "^0.64.0-0",

0 commit comments

Comments
 (0)