Skip to content

Commit 6d4b14d

Browse files
hiteshjoshi1hiteshjoshi1
authored
Merge pull request #3 from hiteshjoshi1/habits
Habits
2 parents 3dc2058 + e1344a8 commit 6d4b14d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+7339
-1403
lines changed

‎README.md

+5
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,14 @@ Tracker app
44
2. Firebase
55
3. Google Auth
66

7+
78
Build locally and test
9+
npx expo run:android
10+
811

912

13+
To clean and rebuild
14+
npx expo prebuild --clean && npx expo run:android
1015

1116
Build for device (apk)
1217
- expo always has googleservices.json issue for local as well as remote

‎android/app/src/main/AndroidManifest.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
</intent-filter>
3131
<intent-filter android:autoVerify="true" data-generated="true">
3232
<action android:name="android.intent.action.VIEW"/>
33-
<data android:scheme="com.hiteshjoshi.tracker" android:host="oauth2redirect"/>
33+
<data android:scheme="tracker" android:host="*"/>
3434
<category android:name="android.intent.category.BROWSABLE"/>
3535
<category android:name="android.intent.category.DEFAULT"/>
3636
</intent-filter>

‎app.config.ts

+25-19
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,18 @@ export default ({ config }: ConfigContext): ExpoConfig => ({
1111
userInterfaceStyle: "automatic",
1212
newArchEnabled: true,
1313
scheme: "tracker", // Only define scheme once here
14+
plugins: [
15+
[
16+
"expo-notifications",
17+
{
18+
icon: "./assets/images/adaptive-icon.png"
19+
}
20+
]
21+
],
1422
ios: {
1523
supportsTablet: true,
16-
bundleIdentifier: "com.hiteshjoshi.tracker", // Add this
17-
googleServicesFile: "./GoogleService-Info.plist", // Add this if using Firebase
24+
bundleIdentifier: "com.hiteshjoshi.tracker",
25+
googleServicesFile: "./GoogleService-Info.plist",
1826
},
1927
android: {
2028
adaptiveIcon: {
@@ -23,22 +31,20 @@ export default ({ config }: ConfigContext): ExpoConfig => ({
2331
},
2432
package: "com.hiteshjoshi.tracker",
2533
googleServicesFile: "./google-services.json",
26-
versionCode: 1 ,
27-
// Add this if not present
28-
intentFilters: [
29-
{
30-
action: "VIEW",
31-
autoVerify: true,
32-
data: [
33-
{
34-
scheme: "tracker",
35-
host: "*"
36-
}
37-
],
38-
category: ["BROWSABLE", "DEFAULT"]
39-
}
40-
]
41-
34+
versionCode: 1,
35+
intentFilters: [
36+
{
37+
action: "VIEW",
38+
autoVerify: true,
39+
data: [
40+
{
41+
scheme: "tracker",
42+
host: "*"
43+
}
44+
],
45+
category: ["BROWSABLE", "DEFAULT"]
46+
}
47+
]
4248
},
4349
web: {
4450
bundler: "metro",
@@ -60,4 +66,4 @@ export default ({ config }: ConfigContext): ExpoConfig => ({
6066
},
6167
enableDebugLogging: true
6268
}
63-
});
69+
});

‎app/(tabs)/_layout.tsx

+79-158
Original file line numberDiff line numberDiff line change
@@ -1,174 +1,95 @@
1-
import React, { useEffect } from 'react';
1+
import React from 'react';
22
import { Tabs } from 'expo-router';
33
import { Ionicons } from '@expo/vector-icons';
4-
import { getAuth, onAuthStateChanged, signOut } from 'firebase/auth';
5-
import AsyncStorage from '@react-native-async-storage/async-storage';
6-
import { router } from 'expo-router';
74
import { TouchableOpacity, Alert } from 'react-native';
8-
import { auth } from '../../config/firebase';
5+
import { useAuth } from '../../context/AuthContext';
6+
import AuthProtectedRoute from '../../components/AuthProtectedRoute';
97

108
export default function TabsLayout() {
11-
useEffect(() => {
12-
// Set up auth state listener for tabs
13-
const unsubscribe = onAuthStateChanged(auth, (user) => {
14-
// If user signs out or no user is found, redirect to login
15-
if (!user) {
16-
console.log('No user found in tabs layout, redirecting to login');
17-
router.replace('/login');
18-
}
19-
});
9+
const { signOut } = useAuth();
2010

21-
// Check if user exists in AsyncStorage
22-
const checkUser = async () => {
23-
const userJSON = await AsyncStorage.getItem('@user');
24-
if (!userJSON) {
25-
console.log('No user in AsyncStorage, redirecting to login');
26-
router.replace('/login');
27-
}
28-
};
29-
30-
checkUser();
31-
32-
// Clean up subscription
33-
return () => unsubscribe();
34-
}, []);
35-
36-
// Handle logout
37-
const handleLogout = async () => {
11+
const handleLogout = () => {
3812
Alert.alert(
39-
'Logout',
40-
'Are you sure you want to log out?',
13+
"Sign Out",
14+
"Are you sure you want to sign out?",
4115
[
4216
{
43-
text: 'Cancel',
44-
style: 'cancel',
45-
},
46-
{
47-
text: 'Logout',
48-
onPress: async () => {
49-
try {
50-
console.log('Logging out user');
51-
// Sign out from Firebase
52-
await signOut(auth);
53-
// Clear AsyncStorage user data
54-
await AsyncStorage.removeItem('@user');
55-
// Navigate to login
56-
router.replace('/login');
57-
} catch (error) {
58-
console.error('Error during logout:', error);
59-
Alert.alert('Error', 'Failed to log out. Please try again.');
60-
}
61-
},
17+
text: "Cancel",
18+
style: "cancel"
6219
},
63-
],
64-
{ cancelable: true }
20+
{
21+
text: "Sign Out",
22+
onPress: () => signOut(),
23+
style: "destructive"
24+
}
25+
]
6526
);
6627
};
6728

29+
// Create logout button component for header
30+
const LogoutButton = () => (
31+
<TouchableOpacity
32+
onPress={handleLogout}
33+
style={{ marginRight: 16 }}
34+
>
35+
<Ionicons name="log-out-outline" size={24} color="#3498db" />
36+
</TouchableOpacity>
37+
);
38+
6839
return (
69-
<Tabs screenOptions={{
70-
tabBarActiveTintColor: '#4a90e2',
71-
headerRight: () => (
72-
<TouchableOpacity
73-
onPress={handleLogout}
74-
style={{ marginRight: 15 }}
75-
>
76-
<Ionicons name="log-out-outline" size={24} color="#FF3B30" />
77-
</TouchableOpacity>
78-
),
79-
}}>
80-
<Tabs.Screen
81-
name="index"
82-
options={{
83-
title: 'Today',
84-
tabBarIcon: ({ color, size }) => (
85-
<Ionicons name="today-outline" size={size} color={color} />
86-
),
87-
}}
88-
/>
89-
<Tabs.Screen
90-
name="habits"
91-
options={{
92-
title: 'Habits',
93-
tabBarIcon: ({ color, size }) => (
94-
<Ionicons name="calendar-outline" size={size} color={color} />
95-
),
40+
<AuthProtectedRoute>
41+
<Tabs
42+
screenOptions={{
43+
headerShown: true,
44+
tabBarActiveTintColor: '#3498db',
45+
tabBarInactiveTintColor: '#95a5a6',
46+
// Add logout button to all screen headers
47+
headerRight: () => <LogoutButton />
9648
}}
97-
/>
98-
</Tabs>
49+
>
50+
<Tabs.Screen
51+
name="today"
52+
options={{
53+
title: "Today",
54+
tabBarIcon: ({ color, size }) => (
55+
<Ionicons name="today-outline" size={size} color={color} />
56+
),
57+
}}
58+
/>
59+
60+
<Tabs.Screen
61+
name="habits"
62+
options={{
63+
title: "Habits",
64+
tabBarIcon: ({ color, size }) => (
65+
<Ionicons name="list-outline" size={size} color={color} />
66+
),
67+
}}
68+
/>
69+
70+
{/* Add your future tabs here */}
71+
{/*
72+
<Tabs.Screen
73+
name="quotes"
74+
options={{
75+
title: "Quotes",
76+
tabBarIcon: ({ color, size }) => (
77+
<Ionicons name="chatbubble-ellipses-outline" size={size} color={color} />
78+
),
79+
}}
80+
/>
81+
82+
<Tabs.Screen
83+
name="progress"
84+
options={{
85+
title: "Progress",
86+
tabBarIcon: ({ color, size }) => (
87+
<Ionicons name="analytics-outline" size={size} color={color} />
88+
),
89+
}}
90+
/>
91+
*/}
92+
</Tabs>
93+
</AuthProtectedRoute>
9994
);
100-
}
101-
// // app/(tabs)/_layout.tsx
102-
// import { Tabs } from 'expo-router';
103-
// import { useColorScheme, Platform, TouchableOpacity } from 'react-native';
104-
// import FontAwesome from '@expo/vector-icons/FontAwesome';
105-
// import { useGoogleAuth } from '../../services/authService';
106-
// import { useRouter } from 'expo-router';
107-
108-
// export default function TabLayout() {
109-
// const colorScheme = useColorScheme();
110-
// const router = useRouter();
111-
// // const { handleSignOut } = useGoogleAuth();
112-
113-
// return (
114-
// <Tabs
115-
// screenOptions={{
116-
// tabBarActiveTintColor: '#7C3AED',
117-
// tabBarInactiveTintColor: '#6B7280',
118-
// headerShown: true,
119-
// tabBarStyle: {
120-
// backgroundColor: '#FFFFFF',
121-
// borderTopColor: '#E5E7EB',
122-
// height: Platform.OS === 'ios' ? 88 : 60,
123-
// paddingBottom: Platform.OS === 'ios' ? 28 : 8,
124-
// paddingTop: 8,
125-
// },
126-
// headerStyle: {
127-
// backgroundColor: '#FFFFFF',
128-
// elevation: 0,
129-
// shadowOpacity: 0,
130-
// borderBottomWidth: 1,
131-
// borderBottomColor: '#E5E7EB',
132-
// },
133-
// headerTitleStyle: {
134-
// color: '#1F2937',
135-
// fontWeight: 'bold',
136-
// fontSize: 18,
137-
// },
138-
// tabBarLabelStyle: {
139-
// fontSize: 12,
140-
// fontWeight: '500',
141-
// },
142-
// // Add sign out button to header
143-
// headerRight: () => (
144-
// <TouchableOpacity
145-
// onPress={handleSignOut}
146-
// style={{ marginRight: 16 }}
147-
// >
148-
// <FontAwesome name="sign-out" size={24} color="#7C3AED" />
149-
// </TouchableOpacity>
150-
// ),
151-
// }}>
152-
// <Tabs.Screen
153-
// name="index"
154-
// options={{
155-
// title: 'Today',
156-
// tabBarIcon: ({ color, size }) => (
157-
// <FontAwesome size={size} name="calendar" color={color} />
158-
// ),
159-
// headerTitle: 'Life Companion',
160-
// }}
161-
// />
162-
// <Tabs.Screen
163-
// name="habits"
164-
// options={{
165-
// title: 'Habits',
166-
// tabBarIcon: ({ color, size }) => (
167-
// <FontAwesome size={size} name="check-square" color={color} />
168-
// ),
169-
// headerTitle: 'Habits',
170-
// }}
171-
// />
172-
// </Tabs>
173-
// );
174-
// }
95+
}

0 commit comments

Comments
 (0)