fix: removed unnesaccary states + fixed RTL problems

mohammadmansour200 · Jul 24, 2024 · 1f90adb · 1f90adb
1 parent 1a83aa5
commit 1f90adb
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 12 deletions.
diff --git a/App.tsx b/App.tsx
@@ -12,15 +12,14 @@ import LightTheme from "./src/themes/LightTheme";
 import "./i18n";
 import OnBoardDialog from "./src/components/OnBoardModal";
 
-I18nManager.allowRTL(false);
-I18nManager.forceRTL(false);
-
 const Stack = createNativeStackNavigator();
 
 function App() {
 	const { colors } = useTheme();
 	const { isVisible, theme } = useSettingsModalStore();
 	const defaultColorScheme = useColorScheme();
+	I18nManager.allowRTL(false);
+	I18nManager.forceRTL(false);
 
 	const systemColorSheme =
 		defaultColorScheme === "dark" ? DarkTheme : LightTheme;

diff --git a/src/components/OnBoardModal.tsx b/src/components/OnBoardModal.tsx
@@ -64,7 +64,11 @@ function OnBoardDialog() {
 					>
 						<Pressable
 							android_ripple={{ color: colors.text, borderless: true }}
-							style={{ alignSelf: "flex-end" }}
+							style={{
+								alignSelf: "flex-end",
+								marginHorizontal: 5,
+								marginTop: 5,
+							}}
 							onPress={hideModal}
 						>
 							<CloseIcon />

diff --git a/src/components/SettingsModal.tsx b/src/components/SettingsModal.tsx
@@ -1,7 +1,7 @@
 import AsyncStorage from "@react-native-async-storage/async-storage";
 import { Picker } from "@react-native-picker/picker";
 import { useTheme } from "@react-navigation/native";
-import { useEffect, useState } from "react";
+import { useEffect } from "react";
 import { useTranslation } from "react-i18next";
 import {
 	Modal,
@@ -20,14 +20,10 @@ function SettingsModal() {
 	const { isVisible, setIsVisible, theme, setTheme } = useSettingsModalStore();
 	const colors = useTheme().colors;
 	const { t, i18n } = useTranslation();
-	const [language, setLanguage] = useState(
-		i18n.language.split("-")[0].toString(),
-	);
 
 	useEffect(() => {
 		async function setLanguageOnMount() {
 			const language = await AsyncStorage.getItem("i18nextLng");
-			setLanguage(language || "en");
 			i18n.changeLanguage(language || "en");
 		}
 		setLanguageOnMount();
@@ -57,7 +53,7 @@ function SettingsModal() {
 				>
 					<Pressable
 						android_ripple={{ color: colors.text, borderless: true }}
-						style={{ alignSelf: "flex-end" }}
+						style={{ alignSelf: "flex-end", marginHorizontal: 5, marginTop: 5 }}
 						onPress={() => setIsVisible(false)}
 					>
 						<CloseIcon />
@@ -91,10 +87,11 @@ function SettingsModal() {
 							<Picker
 								style={{ color: colors.text }}
 								dropdownIconColor={colors.text}
-								selectedValue={language}
+								selectedValue={i18n.language.split("-")[0].toString()}
 								onValueChange={async (value) => {
 									await AsyncStorage.setItem("i18nextLng", value);
-									setLanguage(value);
+									i18n.changeLanguage(value);
+
 									ToastAndroid.show(
 										t("header.reloadToast"),
 										ToastAndroid.SHORT,