updating modal styles

This commit is contained in:
balzack 2023-10-03 13:55:57 -07:00
parent 405e6c2b76
commit c28e1ebb84
5 changed files with 103 additions and 64 deletions

View File

@ -67,7 +67,7 @@ export function Conversation({ navigation, cardId, channelId, closeConversation,
return ( return (
<KeyboardAvoidingView style={styles.modalBase} behavior={Platform.OS === 'ios' ? 'padding' : 'height'}> <KeyboardAvoidingView style={styles.modalBase} behavior={Platform.OS === 'ios' ? 'padding' : 'height'} keyboardVerticalOffset={72}>
<View style={styles.container}> <View style={styles.container}>
{ !navigation && ( { !navigation && (
<View style={styles.header}> <View style={styles.header}>

View File

@ -13,6 +13,7 @@ import { VideoFile } from './videoFile/VideoFile';
import { AudioFile } from './audioFile/AudioFile'; import { AudioFile } from './audioFile/AudioFile';
import { ImageFile } from './imageFile/ImageFile'; import { ImageFile } from './imageFile/ImageFile';
import { BinaryFile } from './binaryFile/BinaryFile'; import { BinaryFile } from './binaryFile/BinaryFile';
import { BlurView } from "@react-native-community/blur";
export function AddTopic({ contentKey, shareIntent, setShareIntent }) { export function AddTopic({ contentKey, shareIntent, setShareIntent }) {
@ -227,8 +228,10 @@ export function AddTopic({ contentKey, shareIntent, setShareIntent }) {
supportedOrientations={['portrait', 'landscape']} supportedOrientations={['portrait', 'landscape']}
onRequestClose={actions.hideFontSize} onRequestClose={actions.hideFontSize}
> >
<View style={styles.editWrapper}> <View style={styles.modalOverlay}>
<View style={styles.editContainer}> <BlurView style={styles.modalOverlay} blurType={Colors.overlay} blurAmount={2} reducedTransparencyFallbackColor="black" />
<View style={styles.modalBase} behavior={Platform.OS === 'ios' ? 'padding' : 'height'}>
<View style={styles.modalContainer}>
<Text style={styles.editHeader}>Font Size:</Text> <Text style={styles.editHeader}>Font Size:</Text>
<View style={styles.editSize}> <View style={styles.editSize}>
{ state.size === 'small' && ( { state.size === 'small' && (
@ -265,11 +268,12 @@ export function AddTopic({ contentKey, shareIntent, setShareIntent }) {
<View style={styles.editControls}> <View style={styles.editControls}>
<View style={styles.selection} /> <View style={styles.selection} />
<TouchableOpacity style={styles.close} onPress={actions.hideFontSize}> <TouchableOpacity style={styles.close} onPress={actions.hideFontSize}>
<Text>Close</Text> <Text style={styles.closeText}>Close</Text>
</TouchableOpacity> </TouchableOpacity>
</View> </View>
</View> </View>
</View> </View>
</View>
</Modal> </Modal>
<Modal <Modal
animationType="fade" animationType="fade"
@ -278,8 +282,10 @@ export function AddTopic({ contentKey, shareIntent, setShareIntent }) {
supportedOrientations={['portrait', 'landscape']} supportedOrientations={['portrait', 'landscape']}
onRequestClose={actions.hideFontColor} onRequestClose={actions.hideFontColor}
> >
<View style={styles.editWrapper}> <View style={styles.modalOverlay}>
<View style={styles.editContainer}> <BlurView style={styles.modalOverlay} blurType={Colors.overlay} blurAmount={2} reducedTransparencyFallbackColor="black" />
<View style={styles.modalBase} behavior={Platform.OS === 'ios' ? 'padding' : 'height'}>
<View style={styles.modalContainer}>
<Text style={styles.editHeader}>Font Color:</Text> <Text style={styles.editHeader}>Font Color:</Text>
<View style={styles.editColor}> <View style={styles.editColor}>
<ColorPicker <ColorPicker
@ -291,15 +297,16 @@ export function AddTopic({ contentKey, shareIntent, setShareIntent }) {
</View> </View>
<View style={styles.editControls}> <View style={styles.editControls}>
<View style={styles.selection}> <View style={styles.selection}>
<Text>Set Color:</Text> <Text style={styles.selectionText}>Set Color:</Text>
<View style={{ marginLeft: 6, borderRadius: 4, width: 16, height: 16, backgroundColor: state.color }} /> <View style={{ marginLeft: 6, borderRadius: 4, width: 16, height: 16, backgroundColor: state.color }} />
</View> </View>
<TouchableOpacity style={styles.close} onPress={actions.hideFontColor}> <TouchableOpacity style={styles.close} onPress={actions.hideFontColor}>
<Text>Close</Text> <Text style={styles.closeText}>Close</Text>
</TouchableOpacity> </TouchableOpacity>
</View> </View>
</View> </View>
</View> </View>
</View>
</Modal> </Modal>
</SafeAreaView> </SafeAreaView>
); );

View File

@ -63,19 +63,15 @@ export const styles = StyleSheet.create({
editHeader: { editHeader: {
fontSize: 18, fontSize: 18,
paddingBottom: 16, paddingBottom: 16,
color: Colors.text,
}, },
editSize: { editSize: {
width: '100%', width: '100%',
borderWidth: 1,
borderColor: Colors.lightgrey,
borderRadius: 2, borderRadius: 2,
}, },
editColor: { editColor: {
width: '100%', width: '100%',
height: 300, height: 300,
borderWidth: 1,
borderColor: Colors.lightgrey,
borderRadius: 2,
}, },
editControls: { editControls: {
display: 'flex', display: 'flex',
@ -120,7 +116,7 @@ export const styles = StyleSheet.create({
}, },
close: { close: {
borderWidth: 1, borderWidth: 1,
borderColor: Colors.lightgrey, borderColor: Colors.closeButton,
borderRadius: 4, borderRadius: 4,
padding: 8, padding: 8,
marginTop: 8, marginTop: 8,
@ -128,12 +124,44 @@ export const styles = StyleSheet.create({
display: 'flex', display: 'flex',
alignItems: 'center', alignItems: 'center',
}, },
closeText: {
color: Colors.closeButtonText,
},
selection: { selection: {
flexGrow: 1, flexGrow: 1,
display: 'flex', display: 'flex',
flexDirection: 'row', flexDirection: 'row',
alignItems: 'center', alignItems: 'center',
}, },
selectionText: {
color: Colors.text,
},
modalOverlay: {
width: '100%',
height: '100%',
},
modalBase: {
position: 'absolute',
top: 0,
left: 0,
width: '100%',
height: '100%',
display: 'flex',
alignItems: 'center',
justifyContent: 'center'
},
modalContainer: {
backgroundColor: Colors.modalBase,
borderColor: Colors.modalBorder,
borderWidth: 1,
width: '80%',
maxWidth: 400,
display: 'flex',
alignItems: 'center',
borderRadius: 8,
padding: 8,
},
}) })

View File

@ -201,6 +201,8 @@ export const styles = StyleSheet.create({
display: 'flex', display: 'flex',
alignItems: 'center', alignItems: 'center',
borderRadius: 8, borderRadius: 8,
borderColor: Colors.modalBorder,
borderWidth: 1,
padding: 16, padding: 16,
}, },
close: { close: {

View File

@ -294,6 +294,8 @@ export const styles = StyleSheet.create({
}, },
modalContainer: { modalContainer: {
backgroundColor: Colors.modalBase, backgroundColor: Colors.modalBase,
borderColor: Colors.modalBorder,
borderWidth: 1,
width: '80%', width: '80%',
maxWidth: 400, maxWidth: 400,
display: 'flex', display: 'flex',