Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit1d59e26

Browse files
authored
Merge pull request#78 from Resgrid/develop
CU-868frkzum Fixed issue with broken onboarding screens.
2 parentsea54cc2 +e7e5018 commit1d59e26

File tree

4 files changed

+86
-133
lines changed

4 files changed

+86
-133
lines changed

‎ANALYTICS_MIGRATION.md‎

Lines changed: 0 additions & 107 deletions
This file was deleted.

‎src/app/__tests__/onboarding.test.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@ describe('Onboarding Component', () => {
213213
expect(getByTestId('onboarding-flatlist')).toBeTruthy();
214214
expect(getByText('Skip')).toBeTruthy();
215215

216-
// TheFlatList content might not render immediately in tests,
216+
// TheFlashList content might not render immediately in tests,
217217
// so we verify the component renders without crashing
218218
expect(getByTestId('onboarding-flatlist')).toBeTruthy();
219219
});

‎src/app/onboarding.tsx‎

Lines changed: 81 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ import { FlashList } from '@shopify/flash-list';
33
import{useRouter}from'expo-router';
44
import{Bell,ChevronRight,MapPin,Users}from'lucide-react-native';
55
import{useColorScheme}from'nativewind';
6-
importReact,{useCallback,useEffect,useRef,useState}from'react';
7-
import{Dimensions,Image}from'react-native';
6+
importReact,{useCallback,useMemo,useRef,useState}from'react';
7+
import{Dimensions,Image,StyleSheet}from'react-native';
88
importAnimated,{useAnimatedStyle,useSharedValue,withTiming}from'react-native-reanimated';
99

1010
import{FocusAwareStatusBar,SafeAreaView,View}from'@/components/ui';
@@ -17,6 +17,50 @@ import { useIsFirstTime } from '@/lib/storage';
1717

1818
const{ width}=Dimensions.get('window');
1919

20+
// Color constants
21+
constCOLORS={
22+
primary:'#FF7B1A',
23+
text:{
24+
light:{
25+
primary:'#1f2937',
26+
secondary:'#6b7280',
27+
},
28+
dark:{
29+
primary:'#ffffff',
30+
secondary:'#d1d5db',
31+
},
32+
},
33+
};
34+
35+
// Static styles
36+
conststyles=StyleSheet.create({
37+
onboardingContainer:{
38+
height:400,
39+
justifyContent:'center',
40+
alignItems:'center',
41+
paddingHorizontal:32,
42+
},
43+
iconContainer:{
44+
marginBottom:32,
45+
alignItems:'center',
46+
},
47+
title:{
48+
fontSize:28,
49+
fontWeight:'bold',
50+
textAlign:'center',
51+
marginBottom:16,
52+
},
53+
description:{
54+
fontSize:16,
55+
textAlign:'center',
56+
lineHeight:24,
57+
},
58+
flexContainer:{
59+
flex:1,
60+
minHeight:400,
61+
},
62+
});
63+
2064
typeOnboardingItemProps={
2165
title:string;
2266
description:string;
@@ -27,26 +71,37 @@ const onboardingData: OnboardingItemProps[] = [
2771
{
2872
title:'Resgrid Responder',
2973
description:'Manage your status, staffing, and interact with your organization in real-time',
30-
icon:<MapPinsize={80}color="#FF7B1A"/>,
74+
icon:<MapPinsize={80}color={COLORS.primary}/>,
3175
},
3276
{
3377
title:'Instant Notifications',
3478
description:'Receive immediate alerts for emergencies and important updates from your department',
35-
icon:<Bellsize={80}color="#FF7B1A"/>,
79+
icon:<Bellsize={80}color={COLORS.primary}/>,
3680
},
3781
{
3882
title:'Interact with Calls',
3983
description:'Seamlessly view call information and interact with your team members for efficient emergency response',
40-
icon:<Userssize={80}color="#FF7B1A"/>,
84+
icon:<Userssize={80}color={COLORS.primary}/>,
4185
},
4286
];
4387

4488
constOnboardingItem:React.FC<OnboardingItemProps>=({ title, description, icon})=>{
89+
const{ colorScheme}=useColorScheme();
90+
91+
// Compute dynamic colors once using useMemo
92+
consttextColors=useMemo(()=>{
93+
constisDark=colorScheme==='dark';
94+
return{
95+
title:isDark ?COLORS.text.dark.primary :COLORS.text.light.primary,
96+
description:isDark ?COLORS.text.dark.secondary :COLORS.text.light.secondary,
97+
};
98+
},[colorScheme]);
99+
45100
return(
46-
<ViewclassName="w-full flex-1 items-center justify-center px-8"style={{ width}}>
47-
<ViewclassName="mb-8 items-center justify-center">{icon}</View>
48-
<TextclassName="mb-4 text-center text-3xl font-bold">{title}</Text>
49-
<TextclassName="text-center text-lg text-gray-600">{description}</Text>
101+
<Viewstyle={[styles.onboardingContainer,{ width}]}>
102+
<Viewstyle={styles.iconContainer}>{icon}</View>
103+
<Textstyle={[styles.title,{color:textColors.title}]}>{title}</Text>
104+
<Textstyle={[styles.description,{color:textColors.description}]}>{description}</Text>
50105
</View>
51106
);
52107
};
@@ -140,19 +195,23 @@ export default function Onboarding() {
140195
<Imagestyle={{width:'96%'}}resizeMode="contain"source={colorScheme==='dark' ?require('@assets/images/Resgrid_JustText_White.png') :require('@assets/images/Resgrid_JustText.png')}/>
141196
</View>
142197

143-
<FlashList
144-
ref={flatListRef}
145-
data={onboardingData}
146-
renderItem={({ item}:{item:OnboardingItemProps})=><OnboardingItem{...item}/>}
147-
horizontal
148-
showsHorizontalScrollIndicator={false}
149-
pagingEnabled
150-
bounces={false}
151-
keyExtractor={(item:OnboardingItemProps)=>item.title}
152-
onScroll={handleScroll}
153-
scrollEventThrottle={16}
154-
testID="onboarding-flatlist"
155-
/>
198+
<Viewstyle={styles.flexContainer}>
199+
<FlashList
200+
ref={flatListRef}
201+
data={onboardingData}
202+
renderItem={({ item}:{item:OnboardingItemProps})=><OnboardingItem{...item}/>}
203+
horizontal
204+
showsHorizontalScrollIndicator={false}
205+
pagingEnabled
206+
bounces={false}
207+
keyExtractor={(item:OnboardingItemProps)=>item.title}
208+
onScroll={handleScroll}
209+
scrollEventThrottle={16}
210+
estimatedItemSize={width}
211+
getItemType={()=>'onboarding-item'}
212+
testID="onboarding-flatlist"
213+
/>
214+
</View>
156215

157216
<PaginationcurrentIndex={currentIndex}length={onboardingData.length}/>
158217

‎src/components/ui/index.tsx‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,22 @@
11
import{cssInterop}from'nativewind';
22
importSvgfrom'react-native-svg';
33

4-
//export * from './button';
4+
export*from'./button';
55
export*from'./checkbox';
66
export*from'./cover';
77
export*from'./focus-aware-status-bar';
88
//export * from './image';
99
//export * from './input';
1010
//export * from './list';
1111
//export * from './modal';
12+
export*from'./pressable';
1213
//export * from './progress-bar';
1314
//export * from './select';
14-
//export * from './text';
15+
export*from'./text';
1516
//export * from './utils';
1617

1718
// export base components from react-native
18-
export{ActivityIndicator,Pressable,ScrollView,TouchableOpacity,View}from'react-native';
19+
export{ActivityIndicator,ScrollView,TouchableOpacity,View}from'react-native';
1920
export{SafeAreaView}from'react-native-safe-area-context';
2021

2122
//Apply cssInterop to Svg to resolve className string into style

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp