mirror of
https://github.com/balzack/databag.git
synced 2025-05-04 23:45:21 +00:00
updating style for light mode
This commit is contained in:
parent
b4278d99c2
commit
01dba5b8de
@ -37,7 +37,7 @@ const databagColors = {
|
|||||||
surfaceVariant: 'rgb(220, 229, 220)',
|
surfaceVariant: 'rgb(220, 229, 220)',
|
||||||
onSurfaceVariant: 'rgb(64, 73, 67)',
|
onSurfaceVariant: 'rgb(64, 73, 67)',
|
||||||
outline: 'rgb(112, 121, 114)',
|
outline: 'rgb(112, 121, 114)',
|
||||||
outlineVariant: 'rgb(192, 201, 193)',
|
outlineVariant: 'rgb(128, 128, 128)',
|
||||||
shadow: 'rgb(0, 0, 0)',
|
shadow: 'rgb(0, 0, 0)',
|
||||||
scrim: 'rgb(0, 0, 0)',
|
scrim: 'rgb(0, 0, 0)',
|
||||||
inverseSurface: 'rgb(46, 49, 46)',
|
inverseSurface: 'rgb(46, 49, 46)',
|
||||||
@ -46,8 +46,8 @@ const databagColors = {
|
|||||||
elevation: {
|
elevation: {
|
||||||
level0: 'rgb(255, 255, 255)',
|
level0: 'rgb(255, 255, 255)',
|
||||||
level1: 'rgb(240, 240, 240)',
|
level1: 'rgb(240, 240, 240)',
|
||||||
level2: 'rgb(220, 220, 220)',
|
level2: 'rgb(225, 225, 225)',
|
||||||
level3: 'rgb(200, 200, 200)',
|
level3: 'rgb(210, 210, 210)',
|
||||||
level4: 'rgb(180, 180, 180)',
|
level4: 'rgb(180, 180, 180)',
|
||||||
level5: 'rgb(160, 160, 160)',
|
level5: 'rgb(160, 160, 160)',
|
||||||
},
|
},
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
export const Colors = {
|
export const Colors = {
|
||||||
primary: '#66aa88',
|
primary: '#408060',
|
||||||
danger: '#ff8888',
|
danger: '#ff8888',
|
||||||
placeholder: '#888888',
|
placeholder: '#888888',
|
||||||
unsaved: '#555555',
|
unsaved: '#555555',
|
||||||
|
@ -60,6 +60,7 @@ export const styles = StyleSheet.create({
|
|||||||
height: 40,
|
height: 40,
|
||||||
marginRight: 8,
|
marginRight: 8,
|
||||||
marginLeft: 4,
|
marginLeft: 4,
|
||||||
|
marginBottom: 4,
|
||||||
display: 'flex',
|
display: 'flex',
|
||||||
borderRadius: 8,
|
borderRadius: 8,
|
||||||
},
|
},
|
||||||
|
@ -110,7 +110,7 @@ export function Content({openConversation, textCard}: {openConversation: ()=>voi
|
|||||||
};
|
};
|
||||||
const Wrap = (state.layout === 'large' && focused) ? Surface : View;
|
const Wrap = (state.layout === 'large' && focused) ? Surface : View;
|
||||||
return (
|
return (
|
||||||
<Wrap elevation={1}>
|
<Wrap elevation={1} mode="flat">
|
||||||
<Channel
|
<Channel
|
||||||
containerStyle={{
|
containerStyle={{
|
||||||
...styles.channel,
|
...styles.channel,
|
||||||
|
@ -118,10 +118,14 @@ export const styles = StyleSheet.create({
|
|||||||
},
|
},
|
||||||
nopad: {
|
nopad: {
|
||||||
},
|
},
|
||||||
border: {
|
topBorder: {
|
||||||
width: '100%',
|
width: '100%',
|
||||||
height: 2,
|
height: 2,
|
||||||
},
|
},
|
||||||
|
border: {
|
||||||
|
width: '100%',
|
||||||
|
height: 1,
|
||||||
|
},
|
||||||
progress: {
|
progress: {
|
||||||
height: 1,
|
height: 1,
|
||||||
position: 'absolute',
|
position: 'absolute',
|
||||||
|
@ -228,7 +228,7 @@ export function Conversation({close, openDetails, wide}: {close: ()=>void, openD
|
|||||||
<IconButton style={styles.icon} mode="contained" icon="cog-transfer-outline" size={28} onPress={openDetails} />
|
<IconButton style={styles.icon} mode="contained" icon="cog-transfer-outline" size={28} onPress={openDetails} />
|
||||||
</View>
|
</View>
|
||||||
<View style={padStyle}>
|
<View style={padStyle}>
|
||||||
<Divider style={styles.border} bold={true} />
|
<Divider style={styles.topBorder} bold={true} />
|
||||||
</View>
|
</View>
|
||||||
<View style={styles.thread}>
|
<View style={styles.thread}>
|
||||||
<FlatList
|
<FlatList
|
||||||
|
@ -19,7 +19,6 @@ export const styles = StyleSheet.create({
|
|||||||
paddingLeft: 8,
|
paddingLeft: 8,
|
||||||
width: '100%',
|
width: '100%',
|
||||||
zIndex: 1,
|
zIndex: 1,
|
||||||
height: 48,
|
|
||||||
},
|
},
|
||||||
close: {
|
close: {
|
||||||
flexShrink: 0,
|
flexShrink: 0,
|
||||||
|
@ -276,7 +276,7 @@ function DetailsScreen({nav}) {
|
|||||||
|
|
||||||
const DetailsComponent = useCallback(
|
const DetailsComponent = useCallback(
|
||||||
(props) => (
|
(props) => (
|
||||||
<Surface elevation={1}>
|
<Surface elevation={3}>
|
||||||
<Details
|
<Details
|
||||||
closeAll={()=>closeAll(props)}
|
closeAll={()=>closeAll(props)}
|
||||||
/>
|
/>
|
||||||
@ -293,6 +293,7 @@ function DetailsScreen({nav}) {
|
|||||||
drawerPosition: 'right',
|
drawerPosition: 'right',
|
||||||
drawerType: 'front',
|
drawerType: 'front',
|
||||||
headerShown: false,
|
headerShown: false,
|
||||||
|
overlayColor: 'rgba(8,8,8,.9)',
|
||||||
}}>
|
}}>
|
||||||
<DetailsDrawer.Screen name="details">{({navigation}) => <ProfileScreen nav={{...nav, focus, setFocus, details: navigation}} />}</DetailsDrawer.Screen>
|
<DetailsDrawer.Screen name="details">{({navigation}) => <ProfileScreen nav={{...nav, focus, setFocus, details: navigation}} />}</DetailsDrawer.Screen>
|
||||||
</DetailsDrawer.Navigator>
|
</DetailsDrawer.Navigator>
|
||||||
@ -319,6 +320,7 @@ function ProfileScreen({nav}) {
|
|||||||
drawerPosition: 'right',
|
drawerPosition: 'right',
|
||||||
drawerType: 'front',
|
drawerType: 'front',
|
||||||
headerShown: false,
|
headerShown: false,
|
||||||
|
overlayColor: 'rgba(8,8,8,.9)',
|
||||||
}}>
|
}}>
|
||||||
<ProfileDrawer.Screen name="registry">{({navigation}) => <RegistryScreen nav={{...nav, profile: navigation, openContact}} />}</ProfileDrawer.Screen>
|
<ProfileDrawer.Screen name="registry">{({navigation}) => <RegistryScreen nav={{...nav, profile: navigation, openContact}} />}</ProfileDrawer.Screen>
|
||||||
</ProfileDrawer.Navigator>
|
</ProfileDrawer.Navigator>
|
||||||
@ -328,7 +330,7 @@ function ProfileScreen({nav}) {
|
|||||||
function RegistryScreen({nav}) {
|
function RegistryScreen({nav}) {
|
||||||
const RegistryComponent = useCallback(
|
const RegistryComponent = useCallback(
|
||||||
() => (
|
() => (
|
||||||
<Surface elevation={1}>
|
<Surface elevation={3}>
|
||||||
<Registry
|
<Registry
|
||||||
openContact={(params: ContactParams) => {
|
openContact={(params: ContactParams) => {
|
||||||
nav.openContact(params, nav.profile.openDrawer);
|
nav.openContact(params, nav.profile.openDrawer);
|
||||||
@ -348,6 +350,7 @@ function RegistryScreen({nav}) {
|
|||||||
drawerPosition: 'right',
|
drawerPosition: 'right',
|
||||||
drawerType: 'front',
|
drawerType: 'front',
|
||||||
headerShown: false,
|
headerShown: false,
|
||||||
|
overlayColor: 'rgba(8,8,8,.9)',
|
||||||
}}>
|
}}>
|
||||||
<RegistryDrawer.Screen name="contacts">{({navigation}) => <ContactsScreen nav={{...nav, registry: navigation}} />}</RegistryDrawer.Screen>
|
<RegistryDrawer.Screen name="contacts">{({navigation}) => <ContactsScreen nav={{...nav, registry: navigation}} />}</RegistryDrawer.Screen>
|
||||||
</RegistryDrawer.Navigator>
|
</RegistryDrawer.Navigator>
|
||||||
@ -358,7 +361,7 @@ function ContactsScreen({nav}) {
|
|||||||
const [textCard, setTextCard] = useState({ cardId: null} as {cardId: null|string});
|
const [textCard, setTextCard] = useState({ cardId: null} as {cardId: null|string});
|
||||||
const ContactsComponent = useCallback(
|
const ContactsComponent = useCallback(
|
||||||
() => (
|
() => (
|
||||||
<Surface elevation={1}>
|
<Surface elevation={3}>
|
||||||
<Contacts
|
<Contacts
|
||||||
openRegistry={nav.registry.openDrawer}
|
openRegistry={nav.registry.openDrawer}
|
||||||
openContact={(params: ContactParams) => {
|
openContact={(params: ContactParams) => {
|
||||||
@ -381,8 +384,11 @@ function ContactsScreen({nav}) {
|
|||||||
drawerPosition: 'right',
|
drawerPosition: 'right',
|
||||||
drawerType: 'front',
|
drawerType: 'front',
|
||||||
headerShown: false,
|
headerShown: false,
|
||||||
|
overlayColor: 'rgba(8,8,8,.9)',
|
||||||
}}>
|
}}>
|
||||||
<ContactsDrawer.Screen name="settings">{({navigation}) => <SettingsScreen nav={{...nav, textCard, contacts: navigation}} />}</ContactsDrawer.Screen>
|
<ContactsDrawer.Screen name="settings">{({navigation}) => (
|
||||||
|
<SettingsScreen nav={{...nav, textCard, contacts: navigation}} />
|
||||||
|
)}</ContactsDrawer.Screen>
|
||||||
</ContactsDrawer.Navigator>
|
</ContactsDrawer.Navigator>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
@ -390,7 +396,7 @@ function ContactsScreen({nav}) {
|
|||||||
function SettingsScreen({nav}) {
|
function SettingsScreen({nav}) {
|
||||||
const SettingsComponent = useCallback(
|
const SettingsComponent = useCallback(
|
||||||
() => (
|
() => (
|
||||||
<Surface elevation={1}>
|
<Surface elevation={3}>
|
||||||
<SafeAreaView>
|
<SafeAreaView>
|
||||||
<Settings />
|
<Settings />
|
||||||
</SafeAreaView>
|
</SafeAreaView>
|
||||||
@ -408,6 +414,7 @@ function SettingsScreen({nav}) {
|
|||||||
drawerPosition: 'right',
|
drawerPosition: 'right',
|
||||||
drawerType: 'front',
|
drawerType: 'front',
|
||||||
headerShown: false,
|
headerShown: false,
|
||||||
|
overlayColor: 'rgba(8,8,8,.9)',
|
||||||
}}>
|
}}>
|
||||||
<SettingsDrawer.Screen name="home">{({navigation}) => <HomeScreen nav={{...nav, settings: navigation}} />}</SettingsDrawer.Screen>
|
<SettingsDrawer.Screen name="home">{({navigation}) => <HomeScreen nav={{...nav, settings: navigation}} />}</SettingsDrawer.Screen>
|
||||||
</SettingsDrawer.Navigator>
|
</SettingsDrawer.Navigator>
|
||||||
@ -427,7 +434,7 @@ function HomeScreen({nav}) {
|
|||||||
<Content textCard={nav.textCard} openConversation={()=>nav.setFocus(true)} />
|
<Content textCard={nav.textCard} openConversation={()=>nav.setFocus(true)} />
|
||||||
</Surface>
|
</Surface>
|
||||||
</View>
|
</View>
|
||||||
<Surface elevation={1} style={styles.right}>
|
<Surface elevation={1} style={styles.right} mode="flat">
|
||||||
<SafeAreaView style={styles.right}>
|
<SafeAreaView style={styles.right}>
|
||||||
{nav.focus && <Conversation openDetails={nav.details.openDrawer} close={()=>nav.setFocus(false)} wide={true} />}
|
{nav.focus && <Conversation openDetails={nav.details.openDrawer} close={()=>nav.setFocus(false)} wide={true} />}
|
||||||
{!nav.focus && <Text>FOCUS NOT SET</Text>}
|
{!nav.focus && <Text>FOCUS NOT SET</Text>}
|
||||||
|
@ -423,7 +423,7 @@ export function Settings({showLogout}: {showLogout: boolean}) {
|
|||||||
{state.profile.imageSet && <Image style={styles.logoSet} resizeMode={'contain'} source={{uri: state.imageUrl}} />}
|
{state.profile.imageSet && <Image style={styles.logoSet} resizeMode={'contain'} source={{uri: state.imageUrl}} />}
|
||||||
<View style={styles.editBar}>
|
<View style={styles.editBar}>
|
||||||
<TouchableOpacity onPress={selectImage}>
|
<TouchableOpacity onPress={selectImage}>
|
||||||
<Surface style={styles.editBorder} elevation={0}>
|
<Surface style={styles.editBorder} elevation={2}>
|
||||||
<Text style={styles.editLogo}>{state.strings.edit}</Text>
|
<Text style={styles.editLogo}>{state.strings.edit}</Text>
|
||||||
</Surface>
|
</Surface>
|
||||||
</TouchableOpacity>
|
</TouchableOpacity>
|
||||||
|
Loading…
x
Reference in New Issue
Block a user