#22/fix - noti card desgin

One-Bit-Myanmar · Oct 30, 2024 · 3dd0430 · 3dd0430
1 parent 2190b9f
commit 3dd0430
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 7 deletions.
diff --git a/app/screens/HomeScreen/HomeScreenHeader.jsx b/app/screens/HomeScreen/HomeScreenHeader.jsx
@@ -55,7 +55,7 @@ export default function HomeScreenHeader() {
                     </View>
                 </View>
                 {/* nofification icon  */}
-                <FontAwesome onPress={() => router.push('/screens/NotificationScreen/NotificationCenterScreen')} name="bell" size={24} color={Colors.white} style={styles.notificationIcon} />
+                <FontAwesome onPress={() => router.push('/screens/NotificationScreen/NotificationCenterScreen')} name="bell" size={24} color={Colors.Swan} style={styles.notificationIcon} />
 
             </View>
         </View>

diff --git a/app/screens/NotificationScreen/NotificationCard.jsx b/app/screens/NotificationScreen/NotificationCard.jsx
@@ -3,6 +3,7 @@ import PropTypes from 'prop-types';
 import React from 'react';
 import { StyleSheet, Text, TouchableOpacity, View } from 'react-native';
 import { Colors } from '../../../constants/Colors';
+import FontAwesome from 'react-native-vector-icons/FontAwesome';
 
 function NotificationCard({ type, content, timestamp, sender, onDelete }) {
   return (
@@ -30,7 +31,9 @@ function NotificationCard({ type, content, timestamp, sender, onDelete }) {
 
       {/* delete msg button  */}
       <TouchableOpacity style={styles.deleteButton} onPress={onDelete}>
-        <Text style={{ color: Colors.Red, textTransform: 'uppercase', fontWeight: 'bold' }}>x</Text>
+        <Text style={{ color: Colors.LightRed, fontWeight: 'bold' }}>
+          <FontAwesome name="trash" size={18} style={{ marginRight: 15 }} />  Remove
+        </Text>
       </TouchableOpacity>
     </View>
   );
@@ -76,7 +79,7 @@ const styles = StyleSheet.create({
     right: 10,
     paddingVertical: 4,
     paddingHorizontal: 10,
-    backgroundColor: Colors.LightRed,
+    // backgroundColor: Colors.LightRed,
     borderRadius: 5,
   },
   deleteButtonText: {

diff --git a/app/screens/UserScreen/ProfileScreen.jsx b/app/screens/UserScreen/ProfileScreen.jsx
@@ -68,10 +68,7 @@ export default function ProfileScreen() {
                 </Text>
             </View>
 
-            <Text style={{
-                paddingHorizontal: 15, fontSize: 15, color: Colors.Red,
-                fontWeight: 'bold', marginTop: 20, marginBottom: 10,
-            }}>Danger Zone</Text>
+
 
             {/* just for further upgrade  */}
             <View style={{ padding: 12, }}>
@@ -83,6 +80,12 @@ export default function ProfileScreen() {
                         <FontAwesome name="file" size={18} color={Colors.tailwind.primary} style={{ marginRight: 10 }} /> Export Contribution Records
                     </Text>
                 </View>
+
+                <Text style={{
+                    paddingHorizontal: 5, fontSize: 15, color: Colors.Red,
+                    fontWeight: 'bold', marginTop: 20, marginBottom: 10,
+                }}>Danger Zone</Text>
+
                 {/* delete account button  */}
                 <View style={styles.deleteButton}>
                     <Text
-Original file line number
+Diff line change
@@ Expand Up / @@ -55,7 +55,7 @@ export default function HomeScreenHeader() { @@
                         </View>
                     </View>
                     {/* nofification icon  */}
-                    <FontAwesome onPress={() => router.push('/screens/NotificationScreen/NotificationCenterScreen')} name="bell" size={24} color={Colors.white} style={styles.notificationIcon} />
+                    <FontAwesome onPress={() => router.push('/screens/NotificationScreen/NotificationCenterScreen')} name="bell" size={24} color={Colors.Swan} style={styles.notificationIcon} />
                 </View>
             </View>
@@ Expand Down @@