diff --git a/app/mobile/src/constants/Colors.js b/app/mobile/src/constants/Colors.js index f7156b7b..3055d3ab 100644 --- a/app/mobile/src/constants/Colors.js +++ b/app/mobile/src/constants/Colors.js @@ -28,7 +28,7 @@ const LightColors = { primaryButton: '#448866', primaryButtonText: '#ffffff', cancelButton: '#888888', - cancelButtonText: '#888888', + cancelButtonText: '#ffffff', disabledButton: '#dddddd', disabledButtonText: '#aaaaaa', dangerButton: '#ff5555', @@ -38,6 +38,7 @@ const LightColors = { inputBase: '#eeeeee', inputPlaceholder: '#888888', inputText: '#444444', + statusText: '#ffffff', connectedIndicator: '#41d041', connectingIndicator: '#0000cc', requestedIndicator: '#00bbbb', @@ -101,6 +102,7 @@ const DarkColors = { inputBase: '#777777', inputPlaceholder: '#aaaaaa', inputText: '#eeeeee', + statusText: '#ffffff', connectedIndicator: '#00cc00', connectingIndicator: '#0000cc', requestedIndicator: '#00bbbb', @@ -166,6 +168,7 @@ export const Colors = { inputBase: getColor('inputBase'), inputPlaceholder: getColor('inputPlaceholder'), inputText: getColor('inputText'), + statusText: getColor('statusText'), connectedIndicator: getColor('connectedIndicator'), connectingIndicator: getColor('connectingIndicator'), requestedIndicator: getColor('requestedIndicator'), diff --git a/app/mobile/src/constants/Strings.js b/app/mobile/src/constants/Strings.js index 9422734d..41670659 100644 --- a/app/mobile/src/constants/Strings.js +++ b/app/mobile/src/constants/Strings.js @@ -211,7 +211,7 @@ const Strings = [ unlockSeal: 'Déverrouiller la clé de sécurité', typeDelete: 'Tapez [supprimer]', deleteKey: 'supprimer', - enableTopics: 'Activer les sujets sécurisés', + enableTopics: 'Activer les Sujets Sécurisés', manageTopics: 'Gérer la clé de sécurité', changePassword: 'Changez le mot de passe de la clé de sécurité.', update: 'Mise à jour', diff --git a/app/mobile/src/session/Session.jsx b/app/mobile/src/session/Session.jsx index f1b97817..f784dc49 100644 --- a/app/mobile/src/session/Session.jsx +++ b/app/mobile/src/session/Session.jsx @@ -45,7 +45,7 @@ const RegistryDrawer = createDrawerNavigator(); const Tab = createBottomTabNavigator(); function ConversationStackScreen({ dmChannel, shareChannel, shareIntent, setShareIntent }) { - const stackParams = { headerStyle: { backgroundColor: Colors.screenBase }, headerBackTitleVisible: false, cardStyle: {backgroundColor: Colors.screenBase }}; + const stackParams = { headerStyle: { backgroundColor: Colors.screenBase, borderBottomWidth: 0.5, borderBottomColor: Colors.horizontalDivider }, headerBackTitleVisible: false, cardStyle: {backgroundColor: Colors.screenBase }}; const screenParams = { headerShown: true, headerTintColor: Colors.primary }; const conversation = useContext(ConversationContext); @@ -130,7 +130,7 @@ function ProfileStackScreen() { } function ContactStackScreen({ addChannel }) { - const stackParams = { headerStyle: { backgroundColor: Colors.screenBase }, headerBackTitleVisible: false }; + const stackParams = { headerStyle: { backgroundColor: Colors.screenBase, borderBottomWidth: 0.2, borderBottomColor: Colors.horizontalDivider }, headerBackTitleVisible: false }; const screenParams = { headerShown: true, headerTintColor: Colors.primary }; const profile = useContext(ProfileContext); diff --git a/app/mobile/src/session/Session.styled.js b/app/mobile/src/session/Session.styled.js index 1040d035..1d3febca 100644 --- a/app/mobile/src/session/Session.styled.js +++ b/app/mobile/src/session/Session.styled.js @@ -67,7 +67,7 @@ export const styles = StyleSheet.create({ color: Colors.primaryButtonText, }, tabBar: { - borderColor: Colors.tabBar, + borderTopColor: Colors.tabBar, backgroundColor: Colors.screenBase, maxHeight: 72, }, diff --git a/app/mobile/src/session/channels/Channels.styled.js b/app/mobile/src/session/channels/Channels.styled.js index bf192503..b0ea5acc 100644 --- a/app/mobile/src/session/channels/Channels.styled.js +++ b/app/mobile/src/session/channels/Channels.styled.js @@ -142,8 +142,7 @@ export const styles = StyleSheet.create({ justifyContent: 'center', }, cancel: { - borderWidth: 1, - borderColor: Colors.cancelButton, + backgroundColor: Colors.cancelButton, borderRadius: 4, padding: 4, marginRight: 8, diff --git a/app/mobile/src/session/contact/Contact.styled.js b/app/mobile/src/session/contact/Contact.styled.js index 0eb35080..9fe017ba 100644 --- a/app/mobile/src/session/contact/Contact.styled.js +++ b/app/mobile/src/session/contact/Contact.styled.js @@ -256,7 +256,7 @@ export const styles = StyleSheet.create({ backgroundColor: Colors.offsync, }, statusLabel: { - color: Colors.text, + color: Colors.statusText, fontSize: 16, }, attributes: { @@ -296,7 +296,7 @@ export const styles = StyleSheet.create({ }, divider: { width: '100%', - height: 2, + height: 3, backgroundColor: Colors.screenBase, }, entry: { diff --git a/app/mobile/src/session/profile/Profile.styled.js b/app/mobile/src/session/profile/Profile.styled.js index 06ff99b9..2b298c3f 100644 --- a/app/mobile/src/session/profile/Profile.styled.js +++ b/app/mobile/src/session/profile/Profile.styled.js @@ -189,7 +189,7 @@ export const styles = StyleSheet.create({ }, divider: { width: '100%', - height: 2, + height: 3, backgroundColor: Colors.screenBase, }, entry: { diff --git a/app/mobile/src/session/settings/Settings.styled.js b/app/mobile/src/session/settings/Settings.styled.js index 517f872e..102efa75 100644 --- a/app/mobile/src/session/settings/Settings.styled.js +++ b/app/mobile/src/session/settings/Settings.styled.js @@ -65,8 +65,8 @@ export const styles = StyleSheet.create({ }, divider: { width: '100%', - height: 2, - backgroundColor: Colors.areaBase, + height: 3, + backgroundColor: Colors.screenBase, }, entry: { width: '100%',