Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Habits #3

Merged
merged 2 commits into from
Mar 9, 2025
Merged

Habits #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3aa6bbc
Auth changes and habit fixes
hitesh-learn Mar 7, 2025
e1344a8
Habit reminders
hitesh-learn Mar 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,14 @@ Tracker app
2. Firebase
3. Google Auth


Build locally and test
npx expo run:android



To clean and rebuild
npx expo prebuild --clean && npx expo run:android

Build for device (apk)
- expo always has googleservices.json issue for local as well as remote
Expand Down
2 changes: 1 addition & 1 deletion android/app/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
</intent-filter>
<intent-filter android:autoVerify="true" data-generated="true">
<action android:name="android.intent.action.VIEW"/>
<data android:scheme="com.hiteshjoshi.tracker" android:host="oauth2redirect"/>
<data android:scheme="tracker" android:host="*"/>
<category android:name="android.intent.category.BROWSABLE"/>
<category android:name="android.intent.category.DEFAULT"/>
</intent-filter>
Expand Down
44 changes: 25 additions & 19 deletions app.config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,18 @@ export default ({ config }: ConfigContext): ExpoConfig => ({
userInterfaceStyle: "automatic",
newArchEnabled: true,
scheme: "tracker", // Only define scheme once here
plugins: [
[
"expo-notifications",
{
icon: "./assets/images/adaptive-icon.png"
}
]
],
ios: {
supportsTablet: true,
bundleIdentifier: "com.hiteshjoshi.tracker", // Add this
googleServicesFile: "./GoogleService-Info.plist", // Add this if using Firebase
bundleIdentifier: "com.hiteshjoshi.tracker",
googleServicesFile: "./GoogleService-Info.plist",
},
android: {
adaptiveIcon: {
Expand All @@ -23,22 +31,20 @@ export default ({ config }: ConfigContext): ExpoConfig => ({
},
package: "com.hiteshjoshi.tracker",
googleServicesFile: "./google-services.json",
versionCode: 1 ,
// Add this if not present
intentFilters: [
{
action: "VIEW",
autoVerify: true,
data: [
{
scheme: "tracker",
host: "*"
}
],
category: ["BROWSABLE", "DEFAULT"]
}
]

versionCode: 1,
intentFilters: [
{
action: "VIEW",
autoVerify: true,
data: [
{
scheme: "tracker",
host: "*"
}
],
category: ["BROWSABLE", "DEFAULT"]
}
]
},
web: {
bundler: "metro",
Expand All @@ -60,4 +66,4 @@ export default ({ config }: ConfigContext): ExpoConfig => ({
},
enableDebugLogging: true
}
});
});
237 changes: 79 additions & 158 deletions app/(tabs)/_layout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,174 +1,95 @@
import React, { useEffect } from 'react';
import React from 'react';
import { Tabs } from 'expo-router';
import { Ionicons } from '@expo/vector-icons';
import { getAuth, onAuthStateChanged, signOut } from 'firebase/auth';
import AsyncStorage from '@react-native-async-storage/async-storage';
import { router } from 'expo-router';
import { TouchableOpacity, Alert } from 'react-native';
import { auth } from '../../config/firebase';
import { useAuth } from '../../context/AuthContext';
import AuthProtectedRoute from '../../components/AuthProtectedRoute';

export default function TabsLayout() {
useEffect(() => {
// Set up auth state listener for tabs
const unsubscribe = onAuthStateChanged(auth, (user) => {
// If user signs out or no user is found, redirect to login
if (!user) {
console.log('No user found in tabs layout, redirecting to login');
router.replace('/login');
}
});
const { signOut } = useAuth();

// Check if user exists in AsyncStorage
const checkUser = async () => {
const userJSON = await AsyncStorage.getItem('@user');
if (!userJSON) {
console.log('No user in AsyncStorage, redirecting to login');
router.replace('/login');
}
};

checkUser();

// Clean up subscription
return () => unsubscribe();
}, []);

// Handle logout
const handleLogout = async () => {
const handleLogout = () => {
Alert.alert(
'Logout',
'Are you sure you want to log out?',
"Sign Out",
"Are you sure you want to sign out?",
[
{
text: 'Cancel',
style: 'cancel',
},
{
text: 'Logout',
onPress: async () => {
try {
console.log('Logging out user');
// Sign out from Firebase
await signOut(auth);
// Clear AsyncStorage user data
await AsyncStorage.removeItem('@user');
// Navigate to login
router.replace('/login');
} catch (error) {
console.error('Error during logout:', error);
Alert.alert('Error', 'Failed to log out. Please try again.');
}
},
text: "Cancel",
style: "cancel"
},
],
{ cancelable: true }
{
text: "Sign Out",
onPress: () => signOut(),
style: "destructive"
}
]
);
};

// Create logout button component for header
const LogoutButton = () => (
<TouchableOpacity
onPress={handleLogout}
style={{ marginRight: 16 }}
>
<Ionicons name="log-out-outline" size={24} color="#3498db" />
</TouchableOpacity>
);

return (
<Tabs screenOptions={{
tabBarActiveTintColor: '#4a90e2',
headerRight: () => (
<TouchableOpacity
onPress={handleLogout}
style={{ marginRight: 15 }}
>
<Ionicons name="log-out-outline" size={24} color="#FF3B30" />
</TouchableOpacity>
),
}}>
<Tabs.Screen
name="index"
options={{
title: 'Today',
tabBarIcon: ({ color, size }) => (
<Ionicons name="today-outline" size={size} color={color} />
),
}}
/>
<Tabs.Screen
name="habits"
options={{
title: 'Habits',
tabBarIcon: ({ color, size }) => (
<Ionicons name="calendar-outline" size={size} color={color} />
),
<AuthProtectedRoute>
<Tabs
screenOptions={{
headerShown: true,
tabBarActiveTintColor: '#3498db',
tabBarInactiveTintColor: '#95a5a6',
// Add logout button to all screen headers
headerRight: () => <LogoutButton />
}}
/>
</Tabs>
>
<Tabs.Screen
name="today"
options={{
title: "Today",
tabBarIcon: ({ color, size }) => (
<Ionicons name="today-outline" size={size} color={color} />
),
}}
/>

<Tabs.Screen
name="habits"
options={{
title: "Habits",
tabBarIcon: ({ color, size }) => (
<Ionicons name="list-outline" size={size} color={color} />
),
}}
/>

{/* Add your future tabs here */}
{/*
<Tabs.Screen
name="quotes"
options={{
title: "Quotes",
tabBarIcon: ({ color, size }) => (
<Ionicons name="chatbubble-ellipses-outline" size={size} color={color} />
),
}}
/>

<Tabs.Screen
name="progress"
options={{
title: "Progress",
tabBarIcon: ({ color, size }) => (
<Ionicons name="analytics-outline" size={size} color={color} />
),
}}
/>
*/}
</Tabs>
</AuthProtectedRoute>
);
}
// // app/(tabs)/_layout.tsx
// import { Tabs } from 'expo-router';
// import { useColorScheme, Platform, TouchableOpacity } from 'react-native';
// import FontAwesome from '@expo/vector-icons/FontAwesome';
// import { useGoogleAuth } from '../../services/authService';
// import { useRouter } from 'expo-router';

// export default function TabLayout() {
// const colorScheme = useColorScheme();
// const router = useRouter();
// // const { handleSignOut } = useGoogleAuth();

// return (
// <Tabs
// screenOptions={{
// tabBarActiveTintColor: '#7C3AED',
// tabBarInactiveTintColor: '#6B7280',
// headerShown: true,
// tabBarStyle: {
// backgroundColor: '#FFFFFF',
// borderTopColor: '#E5E7EB',
// height: Platform.OS === 'ios' ? 88 : 60,
// paddingBottom: Platform.OS === 'ios' ? 28 : 8,
// paddingTop: 8,
// },
// headerStyle: {
// backgroundColor: '#FFFFFF',
// elevation: 0,
// shadowOpacity: 0,
// borderBottomWidth: 1,
// borderBottomColor: '#E5E7EB',
// },
// headerTitleStyle: {
// color: '#1F2937',
// fontWeight: 'bold',
// fontSize: 18,
// },
// tabBarLabelStyle: {
// fontSize: 12,
// fontWeight: '500',
// },
// // Add sign out button to header
// headerRight: () => (
// <TouchableOpacity
// onPress={handleSignOut}
// style={{ marginRight: 16 }}
// >
// <FontAwesome name="sign-out" size={24} color="#7C3AED" />
// </TouchableOpacity>
// ),
// }}>
// <Tabs.Screen
// name="index"
// options={{
// title: 'Today',
// tabBarIcon: ({ color, size }) => (
// <FontAwesome size={size} name="calendar" color={color} />
// ),
// headerTitle: 'Life Companion',
// }}
// />
// <Tabs.Screen
// name="habits"
// options={{
// title: 'Habits',
// tabBarIcon: ({ color, size }) => (
// <FontAwesome size={size} name="check-square" color={color} />
// ),
// headerTitle: 'Habits',
// }}
// />
// </Tabs>
// );
// }
}
Loading