mirror of
https://github.com/urosran/cally.git
synced 2025-07-15 17:47:08 +00:00
Small fixes
This commit is contained in:
@ -1,15 +1,7 @@
|
|||||||
import {
|
import {Button, Dialog, TextField, TextFieldRef, TouchableOpacity, View,} from "react-native-ui-lib";
|
||||||
View,
|
import React, {useEffect, useRef, useState} from "react";
|
||||||
Text,
|
|
||||||
Button,
|
|
||||||
TextField,
|
|
||||||
TextFieldRef,
|
|
||||||
TouchableOpacity,
|
|
||||||
} from "react-native-ui-lib";
|
|
||||||
import React, { useEffect, useState, useRef } from "react";
|
|
||||||
import { Dialog } from "react-native-ui-lib";
|
|
||||||
import {PanningDirectionsEnum} from "react-native-ui-lib/src/incubator/panView";
|
import {PanningDirectionsEnum} from "react-native-ui-lib/src/incubator/panView";
|
||||||
import { Dimensions, Keyboard, StyleSheet } from "react-native";
|
import {Dimensions, StyleSheet} from "react-native";
|
||||||
|
|
||||||
import DropModalIcon from "@/assets/svgs/DropModalIcon";
|
import DropModalIcon from "@/assets/svgs/DropModalIcon";
|
||||||
import {useBrainDumpContext} from "@/contexts/DumpContext";
|
import {useBrainDumpContext} from "@/contexts/DumpContext";
|
||||||
@ -42,10 +34,12 @@ const AddBrainDump = ({
|
|||||||
}, [addBrainDumpProps.isVisible]);
|
}, [addBrainDumpProps.isVisible]);
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
|
if (addBrainDumpProps.isVisible) {
|
||||||
setTimeout(() => {
|
setTimeout(() => {
|
||||||
titleRef?.current?.focus()
|
titleRef?.current?.focus()
|
||||||
}, 500)
|
}, 500)
|
||||||
}, []);
|
}
|
||||||
|
}, [addBrainDumpProps.isVisible]);
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
KeyboardManager.setEnableAutoToolbar(false);
|
KeyboardManager.setEnableAutoToolbar(false);
|
||||||
@ -78,7 +72,11 @@ const AddBrainDump = ({
|
|||||||
label="Save"
|
label="Save"
|
||||||
style={styles.topBtn}
|
style={styles.topBtn}
|
||||||
onPress={() => {
|
onPress={() => {
|
||||||
addBrainDump({ id: 99, title: dumpTitle.trimEnd().trimStart(), description: dumpDesc.trimEnd().trimStart() });
|
addBrainDump({
|
||||||
|
id: 99,
|
||||||
|
title: dumpTitle.trimEnd().trimStart(),
|
||||||
|
description: dumpDesc.trimEnd().trimStart()
|
||||||
|
});
|
||||||
addBrainDumpProps.setIsVisible(false);
|
addBrainDumpProps.setIsVisible(false);
|
||||||
}}
|
}}
|
||||||
/>
|
/>
|
||||||
|
@ -1,11 +1,11 @@
|
|||||||
import React, { useEffect, useState } from "react";
|
import React, {useEffect, useRef, useState} from "react";
|
||||||
import {
|
import {
|
||||||
Button,
|
Button,
|
||||||
Dialog,
|
Dialog,
|
||||||
View,
|
View,
|
||||||
Text,
|
Text,
|
||||||
TextField,
|
TextField,
|
||||||
TouchableOpacity,
|
TouchableOpacity, TextFieldRef,
|
||||||
} from "react-native-ui-lib";
|
} from "react-native-ui-lib";
|
||||||
import { Dimensions, StyleSheet } from "react-native";
|
import { Dimensions, StyleSheet } from "react-native";
|
||||||
import { PanningDirectionsEnum } from "react-native-ui-lib/src/incubator/panView";
|
import { PanningDirectionsEnum } from "react-native-ui-lib/src/incubator/panView";
|
||||||
@ -30,6 +30,7 @@ const MoveBrainDump = (props: {
|
|||||||
props.item.description
|
props.item.description
|
||||||
);
|
);
|
||||||
const [modalVisible, setModalVisible] = useState<boolean>(false);
|
const [modalVisible, setModalVisible] = useState<boolean>(false);
|
||||||
|
const descriptionRef = useRef<TextFieldRef>(null)
|
||||||
|
|
||||||
const { width } = Dimensions.get("screen");
|
const { width } = Dimensions.get("screen");
|
||||||
|
|
||||||
@ -37,6 +38,14 @@ const MoveBrainDump = (props: {
|
|||||||
updateBrainDumpItem(props.item.id, { description: description });
|
updateBrainDumpItem(props.item.id, { description: description });
|
||||||
}, [description]);
|
}, [description]);
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
if (props.isVisible) {
|
||||||
|
setTimeout(() => {
|
||||||
|
descriptionRef?.current?.focus()
|
||||||
|
}, 500)
|
||||||
|
}
|
||||||
|
}, [props.isVisible]);
|
||||||
|
|
||||||
const showConfirmationDialog = () => {
|
const showConfirmationDialog = () => {
|
||||||
setModalVisible(true);
|
setModalVisible(true);
|
||||||
};
|
};
|
||||||
@ -112,7 +121,6 @@ const MoveBrainDump = (props: {
|
|||||||
<TextField
|
<TextField
|
||||||
textAlignVertical="top"
|
textAlignVertical="top"
|
||||||
multiline
|
multiline
|
||||||
autoFocus
|
|
||||||
fieldStyle={{
|
fieldStyle={{
|
||||||
width: "94%",
|
width: "94%",
|
||||||
}}
|
}}
|
||||||
@ -123,6 +131,7 @@ const MoveBrainDump = (props: {
|
|||||||
onChangeText={(value) => {
|
onChangeText={(value) => {
|
||||||
setDescription(value);
|
setDescription(value);
|
||||||
}}
|
}}
|
||||||
|
ref={descriptionRef}
|
||||||
returnKeyType="default"
|
returnKeyType="default"
|
||||||
/>
|
/>
|
||||||
</View>
|
</View>
|
||||||
|
@ -1,7 +1,16 @@
|
|||||||
import {Button, ButtonSize, Dialog, Text, TextField, TextFieldRef, View,} from "react-native-ui-lib";
|
import {
|
||||||
|
Button,
|
||||||
|
ButtonSize, Colors,
|
||||||
|
Dialog,
|
||||||
|
KeyboardAwareScrollView, LoaderScreen, Modal,
|
||||||
|
Text,
|
||||||
|
TextField,
|
||||||
|
TextFieldRef,
|
||||||
|
View,
|
||||||
|
} from "react-native-ui-lib";
|
||||||
import React, {useRef, useState} from "react";
|
import React, {useRef, useState} from "react";
|
||||||
import {useSignIn} from "@/hooks/firebase/useSignIn";
|
import {useSignIn} from "@/hooks/firebase/useSignIn";
|
||||||
import {StyleSheet} from "react-native";
|
import {KeyboardAvoidingView, Platform, StyleSheet} from "react-native";
|
||||||
import Toast from "react-native-toast-message";
|
import Toast from "react-native-toast-message";
|
||||||
import {useLoginWithQrCode} from "@/hooks/firebase/useLoginWithQrCode";
|
import {useLoginWithQrCode} from "@/hooks/firebase/useLoginWithQrCode";
|
||||||
import {Camera, CameraView} from "expo-camera";
|
import {Camera, CameraView} from "expo-camera";
|
||||||
@ -19,8 +28,10 @@ const SignInPage = ({
|
|||||||
const [showCameraDialog, setShowCameraDialog] = useState<boolean>(false);
|
const [showCameraDialog, setShowCameraDialog] = useState<boolean>(false);
|
||||||
const passwordRef = useRef<TextFieldRef>(null);
|
const passwordRef = useRef<TextFieldRef>(null);
|
||||||
|
|
||||||
const {mutateAsync: signIn, error, isError} = useSignIn();
|
const {mutateAsync: signIn, error, isError, isLoading: isSigninIn} = useSignIn();
|
||||||
const {mutateAsync: signInWithQrCode} = useLoginWithQrCode();
|
const {mutateAsync: signInWithQrCode, isLoading: isQRCodeLoggingIn} = useLoginWithQrCode();
|
||||||
|
|
||||||
|
const isLoading = isSigninIn || isQRCodeLoggingIn
|
||||||
|
|
||||||
const handleSignIn = async () => {
|
const handleSignIn = async () => {
|
||||||
await signIn({email, password});
|
await signIn({email, password});
|
||||||
@ -64,7 +75,12 @@ const SignInPage = ({
|
|||||||
};
|
};
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<View padding-10 centerV height={"100%"}>
|
<View padding-10 centerV height={"100%%"} style={{justifyContent: "center"}}>
|
||||||
|
<KeyboardAvoidingView
|
||||||
|
contentContainerStyle={{ justifyContent:"center"}}
|
||||||
|
keyboardVerticalOffset={50}
|
||||||
|
behavior={Platform.OS === "ios" ? "padding" : "height"}
|
||||||
|
>
|
||||||
<TextField
|
<TextField
|
||||||
placeholder="Email"
|
placeholder="Email"
|
||||||
keyboardType={"email-address"}
|
keyboardType={"email-address"}
|
||||||
@ -73,6 +89,8 @@ const SignInPage = ({
|
|||||||
defaultValue={email}
|
defaultValue={email}
|
||||||
onChangeText={setEmail}
|
onChangeText={setEmail}
|
||||||
style={styles.textfield}
|
style={styles.textfield}
|
||||||
|
autoComplete={"email"}
|
||||||
|
autoCorrect={false}
|
||||||
onSubmitEditing={() => {
|
onSubmitEditing={() => {
|
||||||
// Move focus to the description field
|
// Move focus to the description field
|
||||||
passwordRef.current?.focus();
|
passwordRef.current?.focus();
|
||||||
@ -111,6 +129,7 @@ const SignInPage = ({
|
|||||||
style={{marginBottom: 20, height: 50}}
|
style={{marginBottom: 20, height: 50}}
|
||||||
backgroundColor="#fd1775"
|
backgroundColor="#fd1775"
|
||||||
/>
|
/>
|
||||||
|
|
||||||
{isError && (
|
{isError && (
|
||||||
<Text center style={{marginBottom: 20}}>{`${
|
<Text center style={{marginBottom: 20}}>{`${
|
||||||
error?.toString()?.split("]")?.[1]
|
error?.toString()?.split("]")?.[1]
|
||||||
@ -155,6 +174,7 @@ const SignInPage = ({
|
|||||||
color="#fd1775"
|
color="#fd1775"
|
||||||
/>
|
/>
|
||||||
</View>
|
</View>
|
||||||
|
</KeyboardAvoidingView>
|
||||||
|
|
||||||
{/* Camera Dialog */}
|
{/* Camera Dialog */}
|
||||||
<Dialog
|
<Dialog
|
||||||
@ -185,6 +205,12 @@ const SignInPage = ({
|
|||||||
style={{margin: 10, marginBottom: 30}}
|
style={{margin: 10, marginBottom: 30}}
|
||||||
/>
|
/>
|
||||||
</Dialog>
|
</Dialog>
|
||||||
|
|
||||||
|
|
||||||
|
{isLoading && (
|
||||||
|
<LoaderScreen overlay message={"Signing in..."} backgroundColor={Colors.white} color={Colors.grey40}/>
|
||||||
|
)}
|
||||||
|
|
||||||
</View>
|
</View>
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
@ -55,6 +55,12 @@ const SignUpPage = ({
|
|||||||
lnameRef.current?.focus();
|
lnameRef.current?.focus();
|
||||||
}}
|
}}
|
||||||
blurOnSubmit={false}
|
blurOnSubmit={false}
|
||||||
|
accessibilityLabel="First name input"
|
||||||
|
accessibilityHint="Enter your first name"
|
||||||
|
accessible
|
||||||
|
returnKeyType="next"
|
||||||
|
textContentType="givenName"
|
||||||
|
importantForAccessibility="yes"
|
||||||
/>
|
/>
|
||||||
<TextField
|
<TextField
|
||||||
ref={lnameRef}
|
ref={lnameRef}
|
||||||
@ -66,17 +72,27 @@ const SignUpPage = ({
|
|||||||
emailRef.current?.focus();
|
emailRef.current?.focus();
|
||||||
}}
|
}}
|
||||||
blurOnSubmit={false}
|
blurOnSubmit={false}
|
||||||
|
accessibilityLabel="Last name input"
|
||||||
|
accessibilityHint="Enter your last name"
|
||||||
|
accessible
|
||||||
|
returnKeyType="next"
|
||||||
|
textContentType="familyName"
|
||||||
|
importantForAccessibility="yes"
|
||||||
/>
|
/>
|
||||||
<TextField
|
<TextField
|
||||||
ref={emailRef}
|
|
||||||
placeholder="Email"
|
placeholder="Email"
|
||||||
value={email}
|
keyboardType={"email-address"}
|
||||||
|
returnKeyType={"next"}
|
||||||
|
textContentType={"emailAddress"}
|
||||||
|
defaultValue={email}
|
||||||
onChangeText={setEmail}
|
onChangeText={setEmail}
|
||||||
style={styles.textfield}
|
style={styles.textfield}
|
||||||
|
autoComplete={"email"}
|
||||||
|
autoCorrect={false}
|
||||||
|
ref={emailRef}
|
||||||
onSubmitEditing={() => {
|
onSubmitEditing={() => {
|
||||||
passwordRef.current?.focus();
|
passwordRef.current?.focus();
|
||||||
}}
|
}}
|
||||||
blurOnSubmit={false}
|
|
||||||
/>
|
/>
|
||||||
<View
|
<View
|
||||||
centerV
|
centerV
|
||||||
|
@ -22,7 +22,7 @@ const AddChore = () => {
|
|||||||
>
|
>
|
||||||
<View style={styles.buttonContainer}>
|
<View style={styles.buttonContainer}>
|
||||||
<Button
|
<Button
|
||||||
marginH-20
|
marginB-30
|
||||||
size={ButtonSize.large}
|
size={ButtonSize.large}
|
||||||
style={styles.button}
|
style={styles.button}
|
||||||
onPress={() => setIsVisible(!isVisible)}
|
onPress={() => setIsVisible(!isVisible)}
|
||||||
|
Reference in New Issue
Block a user