Updtated EmailScreen for useremail and resycn button, added banner when resync. Added marginTop padding for all screens

screens/EmailScreen.tsx

@@ -1,6 +1,7 @@
 import React, { useState, useEffect } from 'react';
-import { View, Text, TouchableOpacity, FlatList, StyleSheet, ActivityIndicator, Alert } from 'react-native';
+import { View, Text, TouchableOpacity, FlatList, StyleSheet, ActivityIndicator, Alert, Animated } from 'react-native';
-import { getEmails, getScannedEmails } from '../api/qrCodeAPI';
+import { Ionicons } from '@expo/vector-icons';
+import { getEmails, getScannedEmails, getUserInfo } from '../api/qrCodeAPI';
 
 const EmailScreen: React.FC = () => {
   const [selectedMessage, setSelectedMessage] = useState(null);
@@ -8,14 +9,29 @@ const EmailScreen: React.FC = () => {
   const [loading, setLoading] = useState(true);
   const [rescanLoading, setRescanLoading] = useState(false);
   const [error, setError] = useState(null);
-  
+  const [userEmail, setUserEmail] = useState('');
+  const [bannerOpacity] = useState(new Animated.Value(0));
+
   useEffect(() => {
     startPollingForScannedEmails();
+    fetchUserEmail();
   }, []);
 
+  // Function to fetch user email
+  const fetchUserEmail = async () => {
+    try {
+      const userInfo = await getUserInfo();
+      setUserEmail(userInfo.email); // Adjust this line based on the actual structure of userInfo
+    } catch (error) {
+      console.error('Error fetching user email:', error);
+      setUserEmail('Error fetching email');
+    }
+  };
+
   // Function to initiate the email fetching process
   const initiateEmailFetch = async () => {
     setRescanLoading(true);
+    showBanner();
     try {
       // Call to start email fetching process
       const response = await getEmails(
@@ -30,6 +46,23 @@ const EmailScreen: React.FC = () => {
     }
   };
 
+  // Function to show the banner
+  const showBanner = () => {
+    Animated.timing(bannerOpacity, {
+      toValue: 1,
+      duration: 500,
+      useNativeDriver: true,
+    }).start(() => {
+      setTimeout(() => {
+        Animated.timing(bannerOpacity, {
+          toValue: 0,
+          duration: 500,
+          useNativeDriver: true,
+        }).start();
+      }, 3000);
+    });
+  };
+
   // Function to poll for scanned emails
   const startPollingForScannedEmails = () => {
     const pollingInterval = setInterval(async () => {
@@ -68,9 +101,10 @@ const EmailScreen: React.FC = () => {
       )}
       {emailData && (
         <>
-          <View style={styles.buttonContainer}>
+          <View style={styles.headerContainer}>
-            <TouchableOpacity onPress={initiateEmailFetch} style={styles.button}>
+            <Text style={styles.emailHeader}>Email: {userEmail}</Text>
-              <Text style={styles.buttonText}>Rescan Inbox</Text>
+            <TouchableOpacity onPress={initiateEmailFetch} style={styles.refreshButton}>
+              <Ionicons name="refresh" size={24} color="#ff69b4" />
             </TouchableOpacity>
           </View>
           {rescanLoading && (
@@ -122,12 +156,34 @@ const EmailScreen: React.FC = () => {
           />
         </>
       )}
+      <Animated.View style={[styles.banner, { opacity: bannerOpacity }]}>
+        <Text style={styles.bannerText}>Scanning emails in the background. This may take a while...</Text>
+      </Animated.View>
     </View>
   );
 };
 
 const styles = StyleSheet.create({
-  // ... (rest of your styles)
+  container: {
+    flex: 1,
+    backgroundColor: '#f8f0fc',
+    padding: 10,
+    paddingTop: 40, // Padding from the top to align content
+  },
+  headerContainer: {
+    flexDirection: 'row',
+    alignItems: 'center',
+    justifyContent: 'space-between',
+    marginBottom: 10,
+  },
+  emailHeader: {
+    fontSize: 18,
+    fontWeight: 'bold',
+    color: '#ff69b4',
+  },
+  refreshButton: {
+    padding: 5,
+  },
   loadingContainer: {
     flex: 1,
     justifyContent: 'center',
@@ -138,11 +194,6 @@ const styles = StyleSheet.create({
     justifyContent: 'center',
     alignItems: 'center',
   },
-  container: {
-    flex: 1,
-    backgroundColor: '#f8f0fc',
-    padding: 10,
-  },
   buttonContainer: {
     justifyContent: 'center',
     alignItems: 'center',
@@ -207,7 +258,21 @@ const styles = StyleSheet.create({
     color: '#ff69b4',
     marginBottom: 5,
     marginTop: 10, // Add margin at the top for spacing from the previous element
-  }
+  },
+  banner: {
+    position: 'absolute',
+    top: 0,
+    left: 0,
+    right: 0,
+    backgroundColor: '#ff69b4',
+    padding: 10,
+    alignItems: 'center',
+    justifyContent: 'center',
+  },
+  bannerText: {
+    color: '#fff',
+    fontWeight: 'bold',
+  },
 });
 
 export default EmailScreen;

screens/HistoryScreen.tsx

@@ -1,15 +1,16 @@
 import React, { useCallback, useState, useEffect } from 'react';
-import { View, Text, StyleSheet, FlatList, TouchableOpacity, Image, Modal, ActivityIndicator } from 'react-native';
+import { View, Text, StyleSheet, FlatList, TouchableOpacity, Image, Modal, ActivityIndicator, Dimensions } from 'react-native';
 import { useDispatch, useSelector } from 'react-redux';
 import ScannedDataBox from '../components/ScannedDataBox';
 import { Ionicons } from '@expo/vector-icons';
 import { RootState, AppDispatch } from '../store';
 import { QRCodeType } from '../types';
 import { toggleBookmark, deleteQRCode, setScannedHistories } from '../reducers/qrCodesReducer';
-
 import useFetchUserAttributes from '../hooks/useFetchUserAttributes';
 import { getScannedHistories } from '../api/qrCodeAPI';
 
+const { width: screenWidth, height: screenHeight } = Dimensions.get('window');
+
 const HistoryScreen: React.FC = () => {
   const dispatch = useDispatch<AppDispatch>();
   const histories = useSelector((state: RootState) => state.qrCodes.histories);
@@ -19,10 +20,8 @@ const HistoryScreen: React.FC = () => {
   const [isModalVisible, setIsModalVisible] = useState<boolean>(false);
   const [historiesLoading, setHistoriesLoading] = useState(false);
   const [historiesError, setHistoriesError] = useState<string | null>(null);
-
   const [selectedQrCodeId, setSelectedQrCodeId] = useState<string | null>(null);
 
-
   const fetchHistories = useCallback(async () => {
     if (!userAttributes?.sub) return;
 
@@ -50,7 +49,6 @@ const HistoryScreen: React.FC = () => {
     }
   }, [dispatch, userAttributes]);
 
-
   const filteredQrCodes = showBookmarks ? histories.filter(qr => qr.bookmarked) : histories;
 
   const handleItemPress = (item: QRCodeType) => {
@@ -60,12 +58,9 @@ const HistoryScreen: React.FC = () => {
   const clearSelectedData = () => {
     setSelectedQrCodeId(null);
   };
-  
-  
 
   return (
     <View style={styles.container}>
-      {/* Header for toggling between History and Bookmarks */}
       <View style={styles.headerContainer}>
         <TouchableOpacity onPress={() => { setShowBookmarks(false); clearSelectedData(); }}>
           <Text style={!showBookmarks ? styles.headerTextActive : styles.headerTextInactive}>History</Text>
@@ -74,25 +69,21 @@ const HistoryScreen: React.FC = () => {
           <Text style={showBookmarks ? styles.headerTextActive : styles.headerTextInactive}>Bookmarks</Text>
         </TouchableOpacity>
       </View>
-      
+
-      {/* Loading Indicator */}
       {historiesLoading && <ActivityIndicator size="large" color="#ff69b4" />}
 
-      {/* Display message when there are no histories or bookmarks */}
       {!historiesLoading && filteredQrCodes.length === 0 && (
         <Text style={styles.emptyMessage}>
           {showBookmarks ? 'No bookmarks available' : 'No history available'}
         </Text>
       )}
 
-      {/* Display scanned data details */}
       {selectedQrCodeId && (
-  <View style={styles.scannedDataBoxContainer}>
+        <View style={styles.scannedDataBoxContainer}>
-    <ScannedDataBox qrCodeId={selectedQrCodeId} clearScanData={clearSelectedData} />
+          <ScannedDataBox qrCodeId={selectedQrCodeId} clearScanData={clearSelectedData} />
-  </View>
+        </View>
-)}
+      )}
 
-      {/* List of QR codes */}
       <FlatList
         data={filteredQrCodes}
         renderItem={({ item }) => (
@@ -110,13 +101,13 @@ const HistoryScreen: React.FC = () => {
             </View>
             <View style={styles.itemRight}>
               <TouchableOpacity onPress={() => dispatch(toggleBookmark({ userId: userAttributes.sub, qrCode: item}))}>
-                <Ionicons name={item.bookmarked ? "bookmark" : "bookmark-outline"} size={24} color={item.bookmarked ? "#2196F3" : "#ff69b4"} />
+                <Ionicons name={item.bookmarked ? "bookmark" : "bookmark-outline"} size={screenWidth * 0.06} color={item.bookmarked ? "#2196F3" : "#ff69b4"} />
               </TouchableOpacity>
               <TouchableOpacity onPress={() => {
                 setQrCodeToDelete(item.data.id);
                 setIsModalVisible(true);
                 }}>
-                <Ionicons name="close-circle-outline" size={24} color="#ff69b4" />
+                <Ionicons name="close-circle-outline" size={screenWidth * 0.06} color="#ff69b4" />
               </TouchableOpacity>
             </View>
           </View>
@@ -125,7 +116,6 @@ const HistoryScreen: React.FC = () => {
         contentContainerStyle={styles.flatListContent}
       />
 
-      {/* Modal for delete confirmation */}
       <Modal
         transparent={true}
         visible={isModalVisible}
@@ -156,6 +146,7 @@ const styles = StyleSheet.create({
     flex: 1,
     backgroundColor: '#f8f0fc',
     padding: 20,
+    paddingTop: screenHeight * 0.05, // Add padding from the top
   },
   headerContainer: {
     flexDirection: 'row',
@@ -163,12 +154,12 @@ const styles = StyleSheet.create({
     marginBottom: 20,
   },
   headerTextActive: {
-    fontSize: 24,
+    fontSize: screenWidth * 0.06,
     fontWeight: 'bold',
     color: '#ff69b4',
   },
   headerTextInactive: {
-    fontSize: 24,
+    fontSize: screenWidth * 0.06,
     fontWeight: 'bold',
     color: '#ccc',
   },
@@ -177,9 +168,9 @@ const styles = StyleSheet.create({
     justifyContent: 'space-between',
     alignItems: 'center',
     backgroundColor: '#ffe6f0',
-    padding: 10,
+    padding: screenWidth * 0.025,
-    borderRadius: 10,
+    borderRadius: screenWidth * 0.025,
-    marginBottom: 10,
+    marginBottom: screenWidth * 0.025,
   },
   itemLeft: {
     flex: 1,
@@ -198,31 +189,31 @@ const styles = StyleSheet.create({
     marginLeft: 0,
   },
   dataText: {
-    fontSize: 12,
+    fontSize: screenWidth * 0.03,
     color: '#000',
-    marginBottom: 7
+    marginBottom: screenWidth * 0.02,
   },
   dateText: {
-    fontSize: 12,
+    fontSize: screenWidth * 0.03,
     color: '#666',
-    marginLeft: 10,
+    marginLeft: screenWidth * 0.02,
-    flex: 1
+    flex: 1,
   },
   scanIcon: {
-    width: 40,
+    width: screenWidth * 0.1,
-    height: 40,
+    height: screenWidth * 0.1,
   },
   flatListContent: {
-    paddingBottom: 100,
+    paddingBottom: screenHeight * 0.1,
   },
   emptyMessage: {
     textAlign: 'center',
-    fontSize: 16,
+    fontSize: screenWidth * 0.04,
     color: '#ff69b4',
-    marginVertical: 20,
+    marginVertical: screenHeight * 0.02,
   },
   scannedDataBoxContainer: {
-    marginBottom: 20,
+    marginBottom: screenHeight * 0.02,
   },
   modalContainer: {
     flex: 1,
@@ -233,18 +224,18 @@ const styles = StyleSheet.create({
   modalContent: {
     width: '80%',
     backgroundColor: 'white',
-    borderRadius: 10,
+    borderRadius: screenWidth * 0.025,
-    padding: 20,
+    padding: screenWidth * 0.05,
     alignItems: 'center',
   },
   modalTitle: {
-    fontSize: 20,
+    fontSize: screenWidth * 0.05,
     fontWeight: 'bold',
-    marginBottom: 10,
+    marginBottom: screenHeight * 0.01,
   },
   modalText: {
-    fontSize: 16,
+    fontSize: screenWidth * 0.04,
-    marginBottom: 20,
+    marginBottom: screenHeight * 0.02,
     textAlign: 'center',
   },
   modalButtons: {
@@ -255,12 +246,12 @@ const styles = StyleSheet.create({
   modalButton: {
     flex: 1,
     alignItems: 'center',
-    padding: 10,
+    padding: screenWidth * 0.025,
   },
   modalButtonText: {
-    fontSize: 16,
+    fontSize: screenWidth * 0.04,
     color: '#000',
   },
 });
 
-export default HistoryScreen;
+export default HistoryScreen;