diff --git a/app/mobile/ios/Databag.xcodeproj/project.pbxproj b/app/mobile/ios/Databag.xcodeproj/project.pbxproj index f746c6ae..b98a5ab3 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 = 13; + CURRENT_PROJECT_VERSION = 15; 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 = 13; + CURRENT_PROJECT_VERSION = 15; DEVELOPMENT_TEAM = 3P65PQ7SUR; INFOPLIST_FILE = Databag/Info.plist; INFOPLIST_KEY_CFBundleDisplayName = Databag; diff --git a/app/mobile/src/access/admin/Admin.jsx b/app/mobile/src/access/admin/Admin.jsx index 49cd1cbd..210a2d6a 100644 --- a/app/mobile/src/access/admin/Admin.jsx +++ b/app/mobile/src/access/admin/Admin.jsx @@ -2,6 +2,7 @@ import { ActivityIndicator, Alert, Text, TextInput, View, TouchableOpacity } fro import { styles } from './Admin.styled'; import Ionicons from '@expo/vector-icons/AntDesign'; import { useAdmin } from './useAdmin.hook'; +import Colors from 'constants/Colors'; export function Admin() { @@ -35,13 +36,14 @@ export function Admin() { + autoCorrect={false} autoCapitalize="none" placeholder="server" placeholderTextColor={Colors.grey} /> + secureTextEntry={!state.plainText} autoCapitalize="none" placeholder="token" + placeholderTextColor={Colors.grey} /> { state.plainText && ( diff --git a/app/mobile/src/access/admin/Admin.styled.js b/app/mobile/src/access/admin/Admin.styled.js index e426ce3e..84402fb3 100644 --- a/app/mobile/src/access/admin/Admin.styled.js +++ b/app/mobile/src/access/admin/Admin.styled.js @@ -97,7 +97,7 @@ export const styles = StyleSheet.create({ borderWidth: 1, }, noresettext: { - color: Colors.disabled, + color: Colors.grey, }, login: { marginTop: 16, diff --git a/app/mobile/src/access/create/Create.jsx b/app/mobile/src/access/create/Create.jsx index 854bfc24..a15e9beb 100644 --- a/app/mobile/src/access/create/Create.jsx +++ b/app/mobile/src/access/create/Create.jsx @@ -2,6 +2,7 @@ import { ScrollView, ActivityIndicator, Alert, Text, TextInput, View, TouchableO import { styles } from './Create.styled'; import Ionicons from '@expo/vector-icons/AntDesign'; import { useCreate } from './useCreate.hook'; +import Colors from 'constants/Colors'; export function Create() { @@ -39,7 +40,7 @@ export function Create() { + autoCorrect={false} autoCapitalize="none" placeholder="server" placeholderTextColor={Colors.grey} /> { (!state.server || !state.serverChecked) && ( @@ -57,7 +58,7 @@ export function Create() { + autoCorrect={false} autoCapitalize="none" placeholder="token" placeholderTextColor={Colors.grey} /> { (!validServer || !state.token || !state.tokenChecked) && ( @@ -75,7 +76,7 @@ export function Create() { + autoCorrect={false} autoCapitalize="none" placeholder="username" placeholderTextColor={Colors.grey} /> { (!validServer || !validToken || !state.username || !state.usernameChecked) && ( @@ -92,7 +93,7 @@ export function Create() { + autoCorrect={false} autoCapitalize="none" placeholder="password" placeholderTextColor={Colors.grey} /> @@ -102,7 +103,8 @@ export function Create() { + autoCorrect={false} secureTextEntry={true} autoCapitalize="none" placeholder="password" + placeholderTextColor={Colors.grey} /> @@ -112,7 +114,8 @@ export function Create() { + autoCorrect={false} autoCapitalize="none" placeholder="confirm password" + placeholderTextColor={Colors.grey} /> @@ -122,7 +125,8 @@ export function Create() { + autoCorrect={false} secureTextEntry={true} autoCapitalize="none" placeholder="confirm password" + placeholderTextColor={Colors.grey} /> diff --git a/app/mobile/src/access/create/Create.styled.js b/app/mobile/src/access/create/Create.styled.js index 7460b990..c1ba7080 100644 --- a/app/mobile/src/access/create/Create.styled.js +++ b/app/mobile/src/access/create/Create.styled.js @@ -124,7 +124,7 @@ export const styles = StyleSheet.create({ marginBottom: 16, }, nocreatetext: { - color: Colors.disabled, + color: Colors.grey, }, login: { marginTop: 16, diff --git a/app/mobile/src/access/login/Login.jsx b/app/mobile/src/access/login/Login.jsx index 739649ae..2ad48716 100644 --- a/app/mobile/src/access/login/Login.jsx +++ b/app/mobile/src/access/login/Login.jsx @@ -2,6 +2,7 @@ import { ActivityIndicator, Alert, Text, TextInput, View, TouchableOpacity } fro import { styles } from './Login.styled'; import Ionicons from '@expo/vector-icons/AntDesign'; import { useLogin } from './useLogin.hook'; +import { Colors } from 'constants/Colors'; export function Login() { @@ -35,14 +36,14 @@ export function Login() { + autoCorrect={false} autoCapitalize="none" placeholder="username@server" placeholderTextColor={Colors.grey} /> { state.showPassword && ( + autoCorrect={false} autoCapitalize="none" placeholder="password" placeholderTextColor={Colors.grey} /> @@ -52,7 +53,8 @@ export function Login() { + autoCorrect={false} secureTextEntry={true} autoCapitalize="none" placeholder="password" + placeholderTextColor={Colors.grey} /> diff --git a/app/mobile/src/access/login/Login.styled.js b/app/mobile/src/access/login/Login.styled.js index 25795aa4..e10cccb0 100644 --- a/app/mobile/src/access/login/Login.styled.js +++ b/app/mobile/src/access/login/Login.styled.js @@ -97,7 +97,7 @@ export const styles = StyleSheet.create({ borderWidth: 1, }, nologintext: { - color: Colors.disabled, + color: Colors.grey, }, create: { marginTop: 16, diff --git a/app/mobile/src/access/reset/Reset.jsx b/app/mobile/src/access/reset/Reset.jsx index fda1dec0..edcfb559 100644 --- a/app/mobile/src/access/reset/Reset.jsx +++ b/app/mobile/src/access/reset/Reset.jsx @@ -2,6 +2,7 @@ import { ActivityIndicator, Alert, Text, TextInput, View, TouchableOpacity } fro import { styles } from './Reset.styled'; import Ionicons from '@expo/vector-icons/AntDesign'; import { useReset } from './useReset.hook'; +import Colors from 'constants/Colors'; export function Reset() { @@ -35,13 +36,13 @@ export function Reset() { + autoCapitalize="none" placeholder="server" placeholderTextColor={Colors.grey} /> + autoCapitalize="none" placeholder="token" placeholderTextColor={Colors.grey} /> { state.enabled && ( diff --git a/app/mobile/src/access/reset/Reset.styled.js b/app/mobile/src/access/reset/Reset.styled.js index e426ce3e..84402fb3 100644 --- a/app/mobile/src/access/reset/Reset.styled.js +++ b/app/mobile/src/access/reset/Reset.styled.js @@ -97,7 +97,7 @@ export const styles = StyleSheet.create({ borderWidth: 1, }, noresettext: { - color: Colors.disabled, + color: Colors.grey, }, login: { marginTop: 16,