diff --git a/app/mobile/ios/Databag.xcodeproj/project.pbxproj b/app/mobile/ios/Databag.xcodeproj/project.pbxproj index 5687f2d3..b7f1dd43 100644 --- a/app/mobile/ios/Databag.xcodeproj/project.pbxproj +++ b/app/mobile/ios/Databag.xcodeproj/project.pbxproj @@ -310,7 +310,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES; CLANG_ENABLE_MODULES = YES; - CURRENT_PROJECT_VERSION = 17; + CURRENT_PROJECT_VERSION = 18; DEVELOPMENT_TEAM = 3P65PQ7SUR; ENABLE_BITCODE = NO; GCC_PREPROCESSOR_DEFINITIONS = ( @@ -348,7 +348,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES; CLANG_ENABLE_MODULES = YES; - CURRENT_PROJECT_VERSION = 17; + CURRENT_PROJECT_VERSION = 18; DEVELOPMENT_TEAM = 3P65PQ7SUR; INFOPLIST_FILE = Databag/Info.plist; INFOPLIST_KEY_CFBundleDisplayName = Databag; diff --git a/app/mobile/src/session/cards/Cards.jsx b/app/mobile/src/session/cards/Cards.jsx index 0295c858..89ef75c7 100644 --- a/app/mobile/src/session/cards/Cards.jsx +++ b/app/mobile/src/session/cards/Cards.jsx @@ -39,12 +39,21 @@ export function CardsTitle({ state, actions, openRegistry }) { export function CardsBody({ state, actions, openContact }) { return ( - } - keyExtractor={item => item.cardId} - /> + <> + { state.cards.length == 0 && ( + + No Contacts Found + + )} + { state.cards.length != 0 && ( + } + keyExtractor={item => item.cardId} + /> + )} + ); } diff --git a/app/mobile/src/session/cards/Cards.styled.js b/app/mobile/src/session/cards/Cards.styled.js index 12ea6b75..a1e03f84 100644 --- a/app/mobile/src/session/cards/Cards.styled.js +++ b/app/mobile/src/session/cards/Cards.styled.js @@ -104,6 +104,16 @@ export const styles = StyleSheet.create({ findarea: { borderTopWidth: 1, borderColor: Colors.divider, + }, + notfound: { + width: '100%', + height: '100%', + alignItems: 'center', + justifyContent: 'center', + }, + notfoundtext: { + fontSize: 20, + color: Colors.grey, } }) diff --git a/app/mobile/src/session/cards/useCards.hook.js b/app/mobile/src/session/cards/useCards.hook.js index 1923e996..5c509034 100644 --- a/app/mobile/src/session/cards/useCards.hook.js +++ b/app/mobile/src/session/cards/useCards.hook.js @@ -88,7 +88,6 @@ export function useCards() { return -1; }); } - filtered.push({cardId:''}); updateState({ cards: filtered }); }, [card, state.filter, state.sorting]); diff --git a/app/mobile/src/session/channels/Channels.jsx b/app/mobile/src/session/channels/Channels.jsx index 313aff5e..e492e087 100644 --- a/app/mobile/src/session/channels/Channels.jsx +++ b/app/mobile/src/session/channels/Channels.jsx @@ -44,12 +44,19 @@ export function ChannelsBody({ state, actions, openConversation }) { return ( <> - } - keyExtractor={item => (`${item.cardId}:${item.channelId}`)} - /> + { state.channels.length == 0 && ( + + No Topics Found + + )} + { state.channels.length > 0 && ( + } + keyExtractor={item => (`${item.cardId}:${item.channelId}`)} + /> + )} - } - keyExtractor={item => (`${item.cardId}:${item.channelId}`)} - /> + { state.channels.length == 0 && ( + + No Topics Found + + )} + { state.channels.length != 0 && ( + } + keyExtractor={item => (`${item.cardId}:${item.channelId}`)} + /> + )} diff --git a/app/mobile/src/session/channels/Channels.styled.js b/app/mobile/src/session/channels/Channels.styled.js index 13ae217c..74f4793c 100644 --- a/app/mobile/src/session/channels/Channels.styled.js +++ b/app/mobile/src/session/channels/Channels.styled.js @@ -56,12 +56,18 @@ export const styles = StyleSheet.create({ flexGrow: 1, flexShrink: 1, }, + notfound: { + fontSize: 20, + color: Colors.grey, + }, channels: { flexShrink: 1, flexGrow: 1, width: '100%', paddingLeft: 16, paddingRight: 16, + alignItems: 'center', + justifyContent: 'center', }, addbottom: { backgroundColor: Colors.primary, diff --git a/app/mobile/src/session/profile/Profile.jsx b/app/mobile/src/session/profile/Profile.jsx index 0849bde0..fa724b1a 100644 --- a/app/mobile/src/session/profile/Profile.jsx +++ b/app/mobile/src/session/profile/Profile.jsx @@ -123,16 +123,31 @@ export function Profile() { )} - { state.name } + { state.name && ( + { state.name } + )} + { !state.name && ( + Name + )} - { state.location } + { state.location && ( + { state.location } + )} + { !state.location && ( + Location + )} - { state.description } + { state.description && ( + { state.description } + )} + { !state.description && ( + Description + )} diff --git a/app/mobile/src/session/profile/Profile.styled.js b/app/mobile/src/session/profile/Profile.styled.js index 72ef8c91..c11f7b43 100644 --- a/app/mobile/src/session/profile/Profile.styled.js +++ b/app/mobile/src/session/profile/Profile.styled.js @@ -75,6 +75,12 @@ export const styles = StyleSheet.create({ alignItems: 'center', paddingBottom: 8, }, + nonametext: { + fontSize: 18, + paddingRight: 8, + fontWeight: 'bold', + color: Colors.grey, + }, nametext: { fontSize: 18, paddingRight: 8, @@ -83,10 +89,22 @@ export const styles = StyleSheet.create({ locationtext: { fontSize: 16, paddingLeft: 8, + color: Colors.text, + }, + nolocationtext: { + fontSize: 16, + paddingLeft: 8, + color: Colors.grey, }, descriptiontext: { fontSize: 16, - paddingLeft: 8 + paddingLeft: 8, + color: Colors.text, + }, + nodescriptiontext: { + fontSize: 16, + paddingLeft: 8, + color: Colors.grey, }, visible: { display: 'flex',