diff --git a/app/mobile/src/constants/Colors.js b/app/mobile/src/constants/Colors.js
index ed07cdf8..a01ade89 100644
--- a/app/mobile/src/constants/Colors.js
+++ b/app/mobile/src/constants/Colors.js
@@ -4,6 +4,8 @@ const LightColors = {
tabBar: '#448866',
activeTabIcon: '#ffffff',
idleTabIcon: '#cccccc',
+ activeBorder: '#338866',
+ idleBorder: '#dddddd',
linkText: '#338866',
dangerText: '#ff8888',
labelText: '#555555',
@@ -37,6 +39,8 @@ const DarkColors = {
tabBar: '#111111',
activeTabIcon: '#dddddd',
idleTabIcon: '#aaaaaa',
+ activeBorder: '#aa8866',
+ idleBorder: '#eeeeee',
linkText: '#88eecc',
dangerText: '#ffaaaa',
labelText: '#eeeeee',
@@ -74,6 +78,8 @@ export const Colors = {
tabBar: getColor('tabBar'),
activeTabIcon: getColor('activeTabIcon'),
idleTabIcon: getColor('idleTabIcon'),
+ idleBorder: getColor('idleBorder'),
+ activeBorder: getColor('activeBorder'),
linkText: getColor('linkText'),
dangerText: getColor('dangerText'),
labelText: getColor('labelText'),
diff --git a/app/mobile/src/constants/Strings.js b/app/mobile/src/constants/Strings.js
index 6409bd13..1552f527 100644
--- a/app/mobile/src/constants/Strings.js
+++ b/app/mobile/src/constants/Strings.js
@@ -7,8 +7,8 @@ const Strings = [
enableNotifications: 'Enable Notifications',
sealedTopics: 'Sealed Topics',
colorMode: 'Color Mode',
- hourMode: 'Hour Format',
- dateMode: 'Date Format',
+ hourMode: 'Hour',
+ dateMode: 'Date',
language: 'Language',
logout: 'Logout',
changeLogin: 'Change Login',
@@ -19,7 +19,7 @@ const Strings = [
support: 'Support',
blocked: 'Blocked',
account: 'Account',
- display: 'Display',
+ display: 'Format',
messaging: 'Messaging',
},
{
@@ -28,8 +28,8 @@ const Strings = [
enableNotifications: 'Activer les Notifications',
sealedTopics: 'Sujets Sécurisés',
colorMode: 'Mode de Couleur',
- hourMode: 'Format d\'Heure',
- dateMode: 'Format de Date',
+ hourMode: 'Heure',
+ dateMode: 'Date',
language: 'Langue',
logout: 'Se Déconnecter',
changeLogin: 'Changer le Mot de Passe',
@@ -40,7 +40,7 @@ const Strings = [
support: 'Aide',
blocked: 'Supprimé',
account: 'Compte',
- display: 'Écran',
+ display: 'Format',
messaging: 'Messagerie',
},
{
@@ -49,8 +49,8 @@ const Strings = [
enableNotifications: 'Permitir Notificaciones',
sealedTopics: 'Temas Protegidos',
colorMode: 'Modo de Color',
- hourMode: 'Formato de Hora',
- dateMode: 'Formato de Fecha',
+ hourMode: 'Hora',
+ dateMode: 'Fecha',
language: 'Idioma',
logout: 'Cerrar Sesión',
changeLogin: 'Cambiar la contraseña',
@@ -61,7 +61,7 @@ const Strings = [
support: 'Ayuda',
blocked: 'Oculto',
account: 'Cuenta',
- display: 'Pantalla',
+ display: 'Formato',
messaging: 'Mensajería',
},
{
@@ -70,8 +70,8 @@ const Strings = [
enableNotifications: 'Benachrichtigungen aktivieren',
sealedTopics: 'Gesicherte Themen',
colorMode: 'Farmodus',
- hourMode: 'Stundenformat',
- dateMode: 'Datumsformat',
+ hourMode: 'Stunde',
+ dateMode: 'Datum',
language: 'Sprache',
logout: 'Ausloggen',
changeLogin: 'Kennwort Aktualisieren',
@@ -82,7 +82,7 @@ const Strings = [
support: 'Helfen',
blocked: 'Versteckt',
account: 'Konto',
- display: 'Bildschirm',
+ display: 'Format',
messages: 'Nachrichtenübermittlung',
}
];
diff --git a/app/mobile/src/session/settings/Settings.jsx b/app/mobile/src/session/settings/Settings.jsx
index 3f855d34..4565c520 100644
--- a/app/mobile/src/session/settings/Settings.jsx
+++ b/app/mobile/src/session/settings/Settings.jsx
@@ -41,24 +41,38 @@ export function Settings() {
{ state.strings.display }
-
+
-
+
-
- { state.strings.hourMode }
+
+ { state.strings.hourMode }
+
+
+ 12h
+
+
+
+ 24h
+
-
-
+
-
+
-
- { state.strings.dateMode }
+
+ { state.strings.dateMode }
+
+
+ mm/dd
+
+
+
+ dd/mm
+
-
@@ -102,30 +116,27 @@ export function Settings() {
-
+
{ state.strings.contacts }
-
-
+
{ state.strings.topics }
-
-
+
{ state.strings.messages }
-
@@ -135,10 +146,9 @@ export function Settings() {
-
+
github.com/balzack/databag
-
diff --git a/app/mobile/src/session/settings/Settings.styled.js b/app/mobile/src/session/settings/Settings.styled.js
index 320418b9..5d0c163c 100644
--- a/app/mobile/src/session/settings/Settings.styled.js
+++ b/app/mobile/src/session/settings/Settings.styled.js
@@ -15,6 +15,23 @@ export const styles = StyleSheet.create({
padding: 4,
fontFamily: 'Roboto',
},
+ radio: {
+ marginLeft: 34,
+ display: 'flex',
+ flexDirection: 'row',
+ },
+ idleRadioCircle: {
+ borderWidth: 1,
+ borderColor: Colors.activeBorder,
+ borderRadius: 8,
+ width: 16,
+ height: 16,
+ },
+ radioLabel: {
+ color: Colors.linkText,
+ paddingLeft: 8,
+ fontFamily: 'Roboto',
+ },
group: {
backgroundColor: Colors.areaBase,
width: '100%',
@@ -44,6 +61,12 @@ export const styles = StyleSheet.create({
flexDirection: 'row',
alignItems: 'center',
},
+ optionControl: {
+ flex: 12,
+ display: 'flex',
+ flexDirection: 'row',
+ alignItems: 'center',
+ },
control: {
flex: 2,
alignItems: 'center',