From 6962e44c64d96ccb3bd47a659bfb38c14c765132 Mon Sep 17 00:00:00 2001 From: ankit-thanekar007 Date: Mon, 15 Mar 2021 13:41:33 -0700 Subject: TMA 643 Added Hide Image --- src/assets/images/hide-caret.png | Bin 0 -> 285 bytes src/assets/images/hide-caret@2x.png | Bin 0 -> 441 bytes src/assets/images/hide-caret@3x.png | Bin 0 -> 603 bytes src/screens/main/NotificationsScreen.tsx | 47 ++++++++++++++++++------------- 4 files changed, 27 insertions(+), 20 deletions(-) create mode 100644 src/assets/images/hide-caret.png create mode 100644 src/assets/images/hide-caret@2x.png create mode 100644 src/assets/images/hide-caret@3x.png (limited to 'src') diff --git a/src/assets/images/hide-caret.png b/src/assets/images/hide-caret.png new file mode 100644 index 00000000..bb05b53a Binary files /dev/null and b/src/assets/images/hide-caret.png differ diff --git a/src/assets/images/hide-caret@2x.png b/src/assets/images/hide-caret@2x.png new file mode 100644 index 00000000..3f4689d3 Binary files /dev/null and b/src/assets/images/hide-caret@2x.png differ diff --git a/src/assets/images/hide-caret@3x.png b/src/assets/images/hide-caret@3x.png new file mode 100644 index 00000000..a44c36fe Binary files /dev/null and b/src/assets/images/hide-caret@3x.png differ diff --git a/src/screens/main/NotificationsScreen.tsx b/src/screens/main/NotificationsScreen.tsx index 24be7123..675d415d 100644 --- a/src/screens/main/NotificationsScreen.tsx +++ b/src/screens/main/NotificationsScreen.tsx @@ -192,7 +192,6 @@ const NotificationsScreen: React.FC = () => { styles.sectionFont, styles.sectionHeader, styles.sectionLocation, - styles.sectionHeader, ]}> {title} @@ -213,34 +212,39 @@ const NotificationsScreen: React.FC = () => { setrequestLimit(DEFAULT_NOTIFICATIONS_SIZE); setMoreFooterEnabled(false); }}> + + + + {'Hide'} + + + + ); + } + + if (allFriendRequests.length > DEFAULT_NOTIFICATIONS_SIZE) { + return ( + { + setrequestLimit(allFriendRequests.length); + setMoreFooterEnabled(true); + }}> - {'Hide'} + {`+ ${allFriendRequests.length - requestLimit} More`} ); } - return ( - { - setrequestLimit(allFriendRequests.length); - setMoreFooterEnabled(true); - }}> - - {`+ ${allFriendRequests.length - requestLimit} More`} - - - ); } return null; @@ -338,7 +342,10 @@ const styles = StyleSheet.create({ fontSize: normalize(12), lineHeight: normalize(14), }, - + hiddenSectionContainer: { + flexDirection: 'row', + }, + hideImageStyles: {alignSelf: 'center', marginRight: 8}, sectionHeader: { color: '#828282', }, -- cgit v1.2.3-70-g09d2