Mirrors/notesnook
1
0
Fork 0
mirror of https://github.com/streetwriters/notesnook.git synced 2025-12-23 06:59:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

update colors

Browse Source
This commit is contained in:
ammarahm-ed
2020-09-07 21:23:38 +05:00
parent b65028cd1d
commit 2d70a18465
11 changed files with 78 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
apps/mobile/src/components/ActionIcon/index.js
View File

@@ -8,8 +8,8 @@ export const ActionIcon = ({onPress, name, color,customStyle}) => {
<TouchableOpacity
onPress={onPress}
style={[{
width: 60,
height: 50,
width: 50,
height: 40,
justifyContent: 'center',
alignItems: 'flex-end',
paddingRight: 12,

6
apps/mobile/src/components/Menu/MenuListItem.js
View File

@@ -68,7 +68,7 @@ export const MenuListItem = ({item, index, noTextMode,ignore}) => {
style={{
fontFamily: WEIGHT.regular,
fontSize: SIZE.sm,
color: colors.pri,
color: colors.heading,
}}>
{item.name}
</Text>
@@ -81,9 +81,7 @@ export const MenuListItem = ({item, index, noTextMode,ignore}) => {
color={item.on ? colors.accent : colors.icon}
name={item.on ? 'toggle-switch' : 'toggle-switch-off'}
/>
) : (
undefined
)}
) : undefined}
</TouchableOpacity>
);
};

9
apps/mobile/src/components/Menu/index.js
View File

@@ -42,7 +42,6 @@ export const Menu = ({
const [state, dispatch] = useTracked();
const {colors} = state;
// todo
function changeColorScheme(colors = COLOR_SCHEME, accent = ACCENT) {
let newColors = setColorScheme(colors, accent);
@@ -50,7 +49,6 @@ export const Menu = ({
dispatch({type: ACTIONS.THEME, colors: newColors});
}
const listItems = [
{
name: 'Home',
@@ -196,7 +194,12 @@ export const Menu = ({
width: '100%',
}}>
{listItems2.map((item, index) => (
<MenuListItem item={item} index={index} ignore={true} noTextMode={noTextMode} />
<MenuListItem
item={item}
index={index}
ignore={true}
noTextMode={noTextMode}
/>
))}
</View>

11
apps/mobile/src/components/NoteItem/index.js
View File

@@ -160,7 +160,7 @@ export default class NoteItem extends React.Component {
justifyContent: 'center',
alignItems: 'center',
}}>
{item.colors.map(item => (
{item.colors.map((item) => (
<View
key={item}
style={{
@@ -253,12 +253,6 @@ export default class NoteItem extends React.Component {
</>
</TouchableOpacity>
<View
style={{
justifyContent: 'center',
minHeight: 70,
alignItems: 'center',
}}>
<TouchableOpacity
style={{
justifyContent: 'center',
@@ -276,10 +270,9 @@ export default class NoteItem extends React.Component {
isTrash ? [] : ['Pin', 'Favorite', 'Add to Vault'],
);
}}>
<Icon name="dots-horizontal" size={SIZE.lg} color={colors.icon} />
<Icon name="dots-horizontal" size={SIZE.lg} color={colors.heading} />
</TouchableOpacity>
</View>
</View>
);
}
}

4
apps/mobile/src/components/NotebookItem/index.js
View File

@@ -113,7 +113,7 @@ export const NotebookItem = ({
style={{
fontFamily: WEIGHT.bold,
fontSize: SIZE.sm + 1,
color: colors.pri,
color: colors.heading,
maxWidth: '100%',
}}>
{item.title}
@@ -258,7 +258,7 @@ export const NotebookItem = ({
notebookID: notebookID,
});
}}>
<Icon name="dots-horizontal" size={SIZE.lg} color={colors.icon} />
<Icon name="dots-horizontal" size={SIZE.lg} color={colors.heading} />
</TouchableOpacity>
)}

2
apps/mobile/src/components/Premium/PremiumDialog.js
View File

@@ -79,7 +79,7 @@ class PremiumDialog extends React.Component {
style={{
fontSize: SIZE.lg,
fontFamily: WEIGHT.bold,
color: colors.pri,
color: colors.heading,
paddingVertical: 20,
}}>
Unlock Premium Features

2
apps/mobile/src/components/SimpleList/index.js
View File

@@ -63,7 +63,7 @@ const SimpleList = ({
}}>
<Text
style={{
color: colors.navbg,
color: colors.nav,
fontSize: SIZE.sm,
fontFamily: WEIGHT.regular,
}}>

6
apps/mobile/src/components/header/index.js
View File

@@ -28,6 +28,7 @@ import {moveNoteHideEvent} from '../DialogManager/recievers';
import {HeaderMenu} from './HeaderMenu';
import {HeaderTitle} from './HeaderTitle';
import {useHideHeader, useForceUpdate} from '../../utils/hooks';
import RNIconic from 'react-native-iconic';
export const Header = ({showSearch, root}) => {
const [state, dispatch] = useTracked();
@@ -121,12 +122,13 @@ export const Header = ({showSearch, root}) => {
</Animatable.View>
<View style={styles.leftBtnContainer}>
{headerState.menu && !DDS.isTab ? (
{!DDS.isTab ? (
<TouchableOpacity
hitSlop={{top: 20, bottom: 20, left: 50, right: 40}}
onPress={onLeftButtonPress}
style={styles.leftBtn}>
<Icon
<RNIconic
shape="BURGER"
style={{
marginLeft: headerState.canGoBack ? -5 : 0,
}}

1
apps/mobile/src/utils/hooks.js
View File

@@ -56,7 +56,6 @@ export function useHideHeader() {
eUnSubscribeEvent(eScrollEvent, onScroll);
};
}, []);
console.log('used',hide)
return hide;
}

12
apps/mobile/src/views/Editor/index.js
View File

@@ -172,14 +172,16 @@ const Editor = ({noMenu}) => {
width: '100%',
height: 50,
justifyContent: 'space-between',
alignItems: 'center',
}}>
{noMenu ? null : (
<ActionIcon
name="arrow-left"
color={colors.icon}
color={colors.heading}
onPress={_onBackPress}
customStyle={{
marginLeft: -5,
paddingLeft: 12,
}}
/>
)}
@@ -191,7 +193,7 @@ const Editor = ({noMenu}) => {
{DDS.isTab && !fullscreen ? (
<ActionIcon
name="fullscreen"
color={colors.icon}
color={colors.heading}
onPress={() => {
eSendEvent(eOpenFullscreenEditor);
setFullscreen(true);
@@ -208,18 +210,18 @@ const Editor = ({noMenu}) => {
<ActionIcon
name="undo-variant"
color={colors.icon}
color={colors.heading}
onPress={() => {}}
/>
<ActionIcon
name="redo-variant"
color={colors.icon}
color={colors.heading}
onPress={() => {}}
/>
<ActionIcon
name="dots-horizontal"
color={colors.icon}
color={colors.heading}
onPress={() => {
ActionSheetEvent(
getNote(),

18
apps/mobile/src/views/Signup/index.js
View File

@@ -12,9 +12,7 @@ import {TextInput} from 'react-native-gesture-handler';
import QRCode from 'react-native-qrcode-generator';
import {useIsFocused} from '@react-navigation/native';
import {opacity, pv, SIZE, WEIGHT, ph} from '../../common/common';
import {Header} from '../../components/header';
import {useTracked} from '../../provider';
import {
eSubscribeEvent,
eUnSubscribeEvent,
@@ -90,8 +88,7 @@ export const Signup = ({route, navigation}) => {
ToastEvent.show('Signup information is invalid', 'error');
return false;
}
}
};
const _signUp = async () => {
if (!validateInfo) return;
@@ -100,8 +97,6 @@ export const Signup = ({route, navigation}) => {
setStatus('Creating your account...');
try {
await db.user.signup(username, email, password);
} catch (e) {
setSigningIn(false);
setFailed(true);
@@ -111,8 +106,6 @@ export const Signup = ({route, navigation}) => {
let user;
try {
user = await db.user.user.get();
setStatus('Logging you in...');
let k = await db.user.key();
@@ -128,7 +121,6 @@ export const Signup = ({route, navigation}) => {
setFailed(true);
ToastEvent.show('Login Failed, try again', 'error');
}
};
useEffect(() => {
@@ -430,7 +422,7 @@ export const Signup = ({route, navigation}) => {
}
}}
textContentType="username"
onChangeText={value => {
onChangeText={(value) => {
setUsername(value);
if (invalidUsername && validateUsername(username)) {
@@ -520,7 +512,7 @@ export const Signup = ({route, navigation}) => {
}
}}
textContentType="emailAddress"
onChangeText={value => {
onChangeText={(value) => {
setEmail(value);
if (invalidEmail && validateEmail(email)) {
setInvalidEmail(false);
@@ -626,7 +618,7 @@ export const Signup = ({route, navigation}) => {
});
}
}}
onChangeText={value => {
onChangeText={(value) => {
setPassword(value);
if (invalidPassword && validatePass(password)) {
setInvalidPassword(false);
@@ -677,7 +669,7 @@ export const Signup = ({route, navigation}) => {
ref={_passConfirm}
editable={password && !invalidPassword ? true : false}
defaultValue={passwordReEnter}
onChangeText={value => {
onChangeText={(value) => {
setPasswordReEnter(value);
if (value !== password) {
setConfirmPassword(false);