Add lighter purple color option
This commit is contained in:
parent
2c029b5f6a
commit
0ed3b9817c
3
App.tsx
3
App.tsx
|
@ -13,7 +13,6 @@ import {
|
|||
Snackbar,
|
||||
} from 'react-native-paper'
|
||||
import MaterialIcon from 'react-native-vector-icons/MaterialIcons'
|
||||
import {lightColors} from './colors'
|
||||
import {AppDataSource} from './data-source'
|
||||
import {settingsRepo} from './db'
|
||||
import Routes from './Routes'
|
||||
|
@ -35,8 +34,6 @@ export const CombinedDarkTheme = {
|
|||
colors: {
|
||||
...NavigationDarkTheme.colors,
|
||||
...PaperDarkTheme.colors,
|
||||
primary: lightColors[0].hex,
|
||||
background: '#0E0E0E',
|
||||
},
|
||||
}
|
||||
|
||||
|
|
|
@ -6,9 +6,7 @@ import {lightColors} from './colors'
|
|||
export default function MassiveFab(props: Partial<ComponentProps<typeof FAB>>) {
|
||||
const {colors} = useTheme()
|
||||
|
||||
const fabColor = lightColors
|
||||
.map(lightColor => lightColor.hex)
|
||||
.includes(colors.primary)
|
||||
const fabColor = lightColors.includes(colors.primary)
|
||||
? CombinedDarkTheme.colors.background
|
||||
: CombinedDefaultTheme.colors.background
|
||||
|
||||
|
|
|
@ -202,10 +202,10 @@ export default function SettingsPage() {
|
|||
<Select value={color} onChange={changeColor}>
|
||||
{lightColors.concat(darkColors).map(colorOption => (
|
||||
<Picker.Item
|
||||
key={colorOption.hex}
|
||||
value={colorOption.hex}
|
||||
key={colorOption}
|
||||
value={colorOption}
|
||||
label="Primary color"
|
||||
color={colorOption.hex}
|
||||
color={colorOption}
|
||||
/>
|
||||
))}
|
||||
</Select>
|
||||
|
|
16
colors.ts
16
colors.ts
|
@ -1,16 +1,12 @@
|
|||
export const lightColors = [
|
||||
{hex: '#B3E5FC', name: 'Cyan'},
|
||||
{hex: '#FA8072', name: 'Salmon'},
|
||||
{hex: '#FFC0CB', name: 'Pink'},
|
||||
{hex: '#E9DCC9', name: 'Linen'},
|
||||
'#B3E5FC',
|
||||
'#FA8072',
|
||||
'#FFC0CB',
|
||||
'#E9DCC9',
|
||||
'#BBA1CE',
|
||||
]
|
||||
|
||||
export const darkColors = [
|
||||
{hex: '#8156A7', name: 'Purple'},
|
||||
{hex: '#007AFF', name: 'Blue'},
|
||||
{hex: '#000000', name: 'Black'},
|
||||
{hex: '#CD5C5C', name: 'Red'},
|
||||
]
|
||||
export const darkColors = ['#8156A7', '#007AFF', '#000000', '#CD5C5C']
|
||||
|
||||
export const colorShade = (color: any, amount: number) => {
|
||||
color = color.replace(/^#/, '')
|
||||
|
|
|
@ -10,7 +10,7 @@ export class addColor1667186320954 implements MigrationInterface {
|
|||
name: 'color',
|
||||
type: 'text',
|
||||
isNullable: false,
|
||||
default: `'${darkColors[0].hex}'`,
|
||||
default: `'${darkColors[0]}'`,
|
||||
}),
|
||||
)
|
||||
.catch(console.error)
|
||||
|
|
Loading…
Reference in New Issue
Block a user