Skip to content

Commit 4e1ca92

Browse files
Merge pull request #371 from alichherawalla/change-pro-banner-ui
feat(pro): redesign Pro detail screen and settings banner
2 parents ecbfcd7 + d40373f commit 4e1ca92

6 files changed

Lines changed: 471 additions & 95 deletions

File tree

ios/OffgridMobile/Info.plist

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,23 @@
5757
<array>
5858
<string>Feather.ttf</string>
5959
<string>MaterialIcons.ttf</string>
60+
<string>MaterialCommunityIcons.ttf</string>
61+
<string>Fontisto.ttf</string>
62+
<string>Octicons.ttf</string>
63+
<string>FontAwesome6_Regular.ttf</string>
64+
<string>Entypo.ttf</string>
65+
<string>FontAwesome5_Brands.ttf</string>
66+
<string>AntDesign.ttf</string>
67+
<string>Foundation.ttf</string>
68+
<string>Ionicons.ttf</string>
69+
<string>FontAwesome5_Solid.ttf</string>
70+
<string>FontAwesome5_Regular.ttf</string>
71+
<string>FontAwesome.ttf</string>
72+
<string>Zocial.ttf</string>
73+
<string>EvilIcons.ttf</string>
74+
<string>FontAwesome6_Solid.ttf</string>
75+
<string>SimpleLineIcons.ttf</string>
76+
<string>FontAwesome6_Brands.ttf</string>
6077
</array>
6178
<key>UILaunchStoryboardName</key>
6279
<string>LaunchScreen</string>

src/screens/HomeScreen/index.tsx

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import React from 'react';
2-
import { View, Text, ScrollView } from 'react-native';
2+
import { View, Text, ScrollView, TouchableOpacity } from 'react-native';
33
import { SafeAreaView } from 'react-native-safe-area-context';
44
import { Button, Card, CustomAlert, hideAlert } from '../../components';
55
import { AnimatedEntry } from '../../components/AnimatedEntry';
@@ -9,6 +9,7 @@ import { PulsatingIcon } from '../../components/onboarding/PulsatingIcon';
99
import { useOnboardingSheet } from '../../components/onboarding/useOnboardingSheet';
1010
import { useFocusTrigger } from '../../hooks/useFocusTrigger';
1111
import Icon from 'react-native-vector-icons/Feather';
12+
import IconMC from 'react-native-vector-icons/MaterialCommunityIcons';
1213
import { useThemedStyles, useTheme } from '../../theme';
1314
import { createStyles } from './styles';
1415
import { useHomeScreen, HomeScreenNavigationProp } from './hooks/useHomeScreen';
@@ -77,8 +78,13 @@ export const HomeScreen: React.FC<HomeScreenProps> = ({ navigation }) => {
7778
<View testID="home-screen" style={styles.scrollView}>
7879
<ScrollView style={styles.scrollView} contentContainerStyle={styles.content}>
7980
<View style={styles.header}>
80-
<Text style={styles.title}>Off Grid</Text>
81-
{showIcon && <PulsatingIcon onPress={openSheet} />}
81+
<View style={styles.headerLeft}>
82+
<Text style={styles.title}>Off Grid</Text>
83+
{showIcon && <PulsatingIcon onPress={openSheet} />}
84+
</View>
85+
<TouchableOpacity onPress={() => navigation.navigate('ProDetail')} hitSlop={8} style={styles.crownButton}>
86+
<IconMC name="crown" size={16} color={colors.primary} />
87+
</TouchableOpacity>
8288
</View>
8389

8490
{/* Active Models Section */}

src/screens/HomeScreen/styles.ts

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,23 @@ const createLayoutStyles = (colors: ThemeColors) => ({
1515
header: {
1616
flexDirection: 'row' as const,
1717
alignItems: 'center' as const,
18+
justifyContent: 'space-between' as const,
1819
marginBottom: 20,
1920
},
21+
headerLeft: {
22+
flexDirection: 'row' as const,
23+
alignItems: 'center' as const,
24+
gap: 8,
25+
},
26+
crownButton: {
27+
width: 32,
28+
height: 32,
29+
borderRadius: 16,
30+
borderWidth: 1,
31+
borderColor: colors.primary,
32+
alignItems: 'center' as const,
33+
justifyContent: 'center' as const,
34+
},
2035
title: {
2136
...TYPOGRAPHY.h2,
2237
color: colors.text,

0 commit comments

Comments
 (0)