Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' into moving-user-types
- Loading branch information
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,14 @@ | ||
| // https://docs.expo.dev/guides/using-eslint/ | ||
| module.exports = { | ||
| extends: "expo", | ||
| rules: { | ||
| "import/no-unresolved": [2, { ignore: ["^@env"] }], | ||
| }, | ||
| settings: { | ||
| "import/resolver": { | ||
| node: { | ||
| extensions: [".js", ".jsx", ".ts", ".tsx"], | ||
| }, | ||
| }, | ||
| }, | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -35,4 +35,4 @@ yarn-error.* | |
| # typescript | ||
| *.tsbuildinfo | ||
|
|
||
| .prettierrc | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,171 @@ | ||
| import React, {useState} from "react"; | ||
| import { | ||
| Button, | ||
| Modal, | ||
| SafeAreaView, | ||
| Text, | ||
| TextInput, | ||
| View, | ||
| StyleSheet, | ||
| Pressable, | ||
| TouchableWithoutFeedback | ||
| } from "react-native"; | ||
|
|
||
| type GenericTextInputProps = { | ||
| defaultValue: string; | ||
| isVisible: boolean; | ||
| visibleSetter: Function; | ||
| outputSetter: Function; | ||
| headerText: string; | ||
| errorMessage: string; | ||
| maxLength: number; | ||
| inputValidator: Function; | ||
|
|
||
| } | ||
|
|
||
| const GenericTextInput = ({ | ||
| defaultValue, | ||
| isVisible, | ||
| visibleSetter, | ||
| outputSetter, | ||
| headerText, | ||
| errorMessage, | ||
| maxLength, | ||
| inputValidator, | ||
| }: GenericTextInputProps) => { | ||
| const[textInput, setTextInput] = useState(''); | ||
| const[error, setError] = useState(''); | ||
|
|
||
| return( | ||
| <Modal | ||
| animationType="fade" | ||
| transparent={true} | ||
| visible={isVisible} | ||
| onRequestClose={() => { | ||
| visibleSetter(false); | ||
| setError(''); | ||
| }} | ||
| > | ||
| <Pressable onPress={() => { | ||
| visibleSetter(false); | ||
| setError(''); | ||
| }}> | ||
| <SafeAreaView style={styles.centeredView}> | ||
| <TouchableWithoutFeedback> | ||
| <View style={styles.inputModal}> | ||
| <Text style={styles.inputHeader}>{headerText}</Text> | ||
| <Text style={error==='' ? {display:"none"} : {color: "red"}}>{error}</Text> | ||
| <TextInput | ||
| defaultValue={defaultValue} | ||
| maxLength={maxLength} | ||
| style={styles.textInput} | ||
| onChangeText={text => {setTextInput(text); setError('');}} | ||
| /> | ||
| <View style={styles.buttonContainer}> | ||
| <Button title="Cancel" | ||
| onPress={() => { | ||
| visibleSetter(false); | ||
| setError(''); | ||
| }} | ||
| /> | ||
| <Button title="Save" onPress={() => { | ||
| if (inputValidator(textInput)) { | ||
| visibleSetter(false); | ||
| outputSetter(textInput); | ||
| defaultValue=textInput; | ||
| setError(''); | ||
| } else | ||
| setError(errorMessage); | ||
| }} | ||
| /> | ||
| </View> | ||
| </View> | ||
| </TouchableWithoutFeedback> | ||
| </SafeAreaView> | ||
| </Pressable> | ||
| </Modal> | ||
| )}; | ||
|
|
||
| type InputProps = { | ||
| defaultValue: string; | ||
| isVisible: boolean; | ||
| visibleSetter: Function; | ||
| outputSetter: Function; | ||
| }; | ||
|
|
||
| export const DisplayNameInput = ({ | ||
| defaultValue, | ||
| isVisible, | ||
| visibleSetter, | ||
| outputSetter, | ||
| }: InputProps) => GenericTextInput({ | ||
| defaultValue: defaultValue, | ||
| isVisible: isVisible, | ||
| visibleSetter: visibleSetter, | ||
| outputSetter: outputSetter, | ||
| headerText: "Edit Display Name", | ||
| errorMessage: "Please enter a display name.", | ||
| maxLength: 12, | ||
| inputValidator: (input: string) => input.length > 0, | ||
| }); | ||
|
|
||
| export const ColorInput = ({ | ||
| defaultValue, | ||
| isVisible, | ||
| visibleSetter, | ||
| outputSetter, | ||
| }: InputProps) => GenericTextInput({ | ||
| defaultValue: defaultValue, | ||
| isVisible: isVisible, | ||
| visibleSetter: visibleSetter, | ||
| outputSetter: outputSetter, | ||
| headerText: "Edit Profile Color", | ||
| errorMessage: "Please enter a valid hex code.", | ||
| maxLength: 7, | ||
| inputValidator: (input: string) => (/^#[0-9A-Fa-f]{6}|#[0-9A-Fa-f]{3}$/).exec(input), | ||
| }); | ||
|
|
||
| const styles = StyleSheet.create({ | ||
| inputHeader: { | ||
| fontSize: 14, | ||
| fontWeight: "600", | ||
| color: "#a7a7a7", | ||
| textTransform: "uppercase", | ||
| letterSpacing: 1.2, | ||
| }, | ||
| centeredView: { | ||
| height: "100%", | ||
| justifyContent: "flex-start", | ||
| alignItems: "center", | ||
| backgroundColor: "rgba(54, 54, 54, 0.5)", | ||
| }, | ||
| inputModal: { | ||
| alignItems: "center", | ||
| backgroundColor: "#cccccc", | ||
| marginTop: "50%", | ||
| width: "70%", | ||
| borderRadius: 20, | ||
| padding: "5%", | ||
| shadowColor: "black", | ||
| shadowOffset: { | ||
| width: 0, | ||
| height: 2, | ||
| }, | ||
| shadowOpacity: 0.25, | ||
| shadowRadius: 4, | ||
| elevation: 5, | ||
| }, | ||
| buttonContainer: { | ||
| paddingHorizontal: "5%", | ||
| flexDirection: 'row', | ||
| justifyContent: 'space-between', | ||
| width: "90%", | ||
| }, | ||
| textInput: { | ||
| marginVertical: "5%", | ||
| width: "75%", | ||
| textAlign: "center", | ||
| borderBottomWidth: 2, | ||
| fontSize: 20, | ||
| }, | ||
| }); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.