more variable naming

This commit is contained in:
ppc
2024-11-09 20:21:33 +00:00
parent a0b44c165b
commit 35a8c28c0e
+11 -11
View File
@@ -48,7 +48,7 @@ export default function ServerCardIn({route, navigation}) {
// server state
const [serverRefreshing, setServerRefreshing] = useState<boolean>(false);
const [serverReloadCounter, setServerReloadCounter] = useState<number>(0);
const [connectionTestResult, setConnectionTestResult] = useState<boolean | null>(null);
const [serverConnectionSuccess, setServerConnectionSuccess] = useState<boolean | null>(null);
const [userSelectedCard, setUserSelectedCard] = useState<AMCard>(null);
const [cardInCompleted, setCardInCompleted] = useState<boolean>(null);
@@ -82,7 +82,7 @@ export default function ServerCardIn({route, navigation}) {
// auto-refresh
useEffect(() => {
if (!connectionTestResult) {
if (!serverConnectionSuccess) {
return;
}
@@ -91,7 +91,7 @@ export default function ServerCardIn({route, navigation}) {
const timeout = setTimeout(() => setServerReloadCounter(serverReloadCounter + 1), 5000);
return () => clearTimeout(timeout);
}
}, [connectionTestResult, server]);
}, [serverConnectionSuccess, server]);
// server info update
useEffect(() => {
@@ -108,18 +108,18 @@ export default function ServerCardIn({route, navigation}) {
const abortController = new AbortController();
fetchServerInfo(server.serverAddress, abortController.signal).then(r => {
if (!r) {
setConnectionTestResult(false);
setServerConnectionSuccess(false);
return;
}
setConnectionTestResult(true);
setServerConnectionSuccess(true);
realm.write(() => {
server.lastUsed = new Date();
Object.keys(r).forEach(x => server[x] = r[x]);
});
}).catch(() => {
setConnectionTestResult(false);
setServerConnectionSuccess(false);
}).finally(() => {
setServerRefreshing(false);
});
@@ -160,9 +160,9 @@ export default function ServerCardIn({route, navigation}) {
};
const gameName = useMemo(() => getGameName(server.gameId), [server.gameId]);
const disableCardIn = useMemo(() => cardInCompleted !== null || !connectionTestResult, [cardInCompleted, connectionTestResult]);
const disableCardIn = useMemo(() => cardInCompleted !== null || !serverConnectionSuccess, [cardInCompleted, serverConnectionSuccess]);
if (connectionTestResult === null) {
if (serverConnectionSuccess === null) {
return (
<View style={{flex: 1, justifyContent: "center", alignItems: "center", gap: 10}}>
<ActivityIndicator animating/>
@@ -173,9 +173,9 @@ export default function ServerCardIn({route, navigation}) {
return (
<ScrollView contentInsetAdjustmentBehavior="automatic"
contentContainerStyle={{...styles.container, paddingTop: connectionTestResult ? 0 : 10}}
contentContainerStyle={{...styles.container, paddingTop: serverConnectionSuccess ? 0 : 10}}
refreshControl={<RefreshControl refreshing={serverRefreshing} onRefresh={performRefresh}/>}>
<StatusAlert server={server} connectionEstablished={connectionTestResult}/>
<StatusAlert server={server} connectionEstablished={serverConnectionSuccess}/>
<View style={styles.section}>
<Title style={styles.sectionTitle}>{gameName ? `Play ${gameName}` : "Selected Card"}</Title>
{selectedCard ? <>
@@ -188,7 +188,7 @@ export default function ServerCardIn({route, navigation}) {
onPress={cardInCallback}
disabled={disableCardIn}
contentStyle={{flexDirection: 'row-reverse'}}
mode={connectionTestResult ? "contained" : "outlined"}
mode={serverConnectionSuccess ? "contained" : "outlined"}
buttonColor={cardInCompleted === false ? "red" : "green"}
icon={() => <Nfc color={disableCardIn ? "gray" : "white"} size={18}/>}>
{cardInCompleted === null ? "Card In" : cardInCompleted ? "Card In Success" : "Failed"}