From 71609896257502a77cb6df0ad702f650b1236294 Mon Sep 17 00:00:00 2001 From: G Date: Sat, 6 Sep 2025 23:00:42 +0000 Subject: [PATCH] refactor: Renamed ButtonNew and InputNew to simple Button and Input effectively replacing the old ones. --- src/components/Button.tsx | 42 ++++++++++++++++++++++++++++++++++++++++++ src/components/ButtonNew.tsx | 42 ------------------------------------------ src/components/Input.tsx | 70 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ src/components/InputNew.tsx | 70 ---------------------------------------------------------------------- src/features/auth/components/LoginForm.tsx | 4 ++-- src/screens/HomeUserNotLoggedIn.tsx | 2 +- src/screens/NumberAndOtpForPaymentScreen.tsx | 4 ++-- src/screens/PaymentAmountInputScreen.tsx | 4 ++-- src/screens/PaymentResultScreen.tsx | 2 +- src/screens/TransactionHistoryScreen.tsx | 4 ++-- src/screens/UserProfileScreen.tsx | 2 +- src/screens/WaveQrCodePaymentScreen.tsx | 2 +- 12 files changed, 124 insertions(+), 124 deletions(-) create mode 100644 src/components/Button.tsx delete mode 100644 src/components/ButtonNew.tsx create mode 100644 src/components/Input.tsx delete mode 100644 src/components/InputNew.tsx diff --git a/src/components/Button.tsx b/src/components/Button.tsx new file mode 100644 index 0000000..e260e5c --- /dev/null +++ b/src/components/Button.tsx @@ -0,0 +1,42 @@ +import { asp as g } from "@asp/asp"; +import type { FC } from "react"; +import { + ActivityIndicator, + Text, + type TextProps, + TouchableOpacity, + type TouchableOpacityProps, +} from "react-native"; + +const DEFAULT_HEIGHT = 50; + +type ContainerProps = TouchableOpacityProps & { + isLoading?: boolean; +}; + +export const Container: FC = ({ children, style, isLoading, onPress, ...rest }) => { + return ( + + {isLoading ? : children} + + ); +}; + +export const Label: FC = ({ children, style, ...rest }) => { + return ( + + {children} + + ); +}; diff --git a/src/components/ButtonNew.tsx b/src/components/ButtonNew.tsx deleted file mode 100644 index e260e5c..0000000 --- a/src/components/ButtonNew.tsx +++ /dev/null @@ -1,42 +0,0 @@ -import { asp as g } from "@asp/asp"; -import type { FC } from "react"; -import { - ActivityIndicator, - Text, - type TextProps, - TouchableOpacity, - type TouchableOpacityProps, -} from "react-native"; - -const DEFAULT_HEIGHT = 50; - -type ContainerProps = TouchableOpacityProps & { - isLoading?: boolean; -}; - -export const Container: FC = ({ children, style, isLoading, onPress, ...rest }) => { - return ( - - {isLoading ? : children} - - ); -}; - -export const Label: FC = ({ children, style, ...rest }) => { - return ( - - {children} - - ); -}; diff --git a/src/components/Input.tsx b/src/components/Input.tsx new file mode 100644 index 0000000..94b0ece --- /dev/null +++ b/src/components/Input.tsx @@ -0,0 +1,70 @@ +import { asp as g } from "@asp/asp"; +import type { FC } from "react"; +import { + Text, + TextInput, + type TextInputProps, + type TextProps, + View, + type ViewProps, +} from "react-native"; + +const DEFAULT_HEIGHT = 50; + +export const Container: FC = ({ children, style, ...rest }) => { + return ( + + {children} + + ); +}; + +export const Header: FC = ({ children, style, ...rest }) => { + return ( + + {children} + + ); +}; + +export const FieldContainer: FC = ({ children, style, ...rest }) => { + return ( + + {children} + + ); +}; + +export const Field: FC }> = ({ + style, + ref, + ...props +}) => { + return ( + + ); +}; diff --git a/src/components/InputNew.tsx b/src/components/InputNew.tsx deleted file mode 100644 index 94b0ece..0000000 --- a/src/components/InputNew.tsx +++ /dev/null @@ -1,70 +0,0 @@ -import { asp as g } from "@asp/asp"; -import type { FC } from "react"; -import { - Text, - TextInput, - type TextInputProps, - type TextProps, - View, - type ViewProps, -} from "react-native"; - -const DEFAULT_HEIGHT = 50; - -export const Container: FC = ({ children, style, ...rest }) => { - return ( - - {children} - - ); -}; - -export const Header: FC = ({ children, style, ...rest }) => { - return ( - - {children} - - ); -}; - -export const FieldContainer: FC = ({ children, style, ...rest }) => { - return ( - - {children} - - ); -}; - -export const Field: FC }> = ({ - style, - ref, - ...props -}) => { - return ( - - ); -}; diff --git a/src/features/auth/components/LoginForm.tsx b/src/features/auth/components/LoginForm.tsx index 0b2ae80..df9eb21 100644 --- a/src/features/auth/components/LoginForm.tsx +++ b/src/features/auth/components/LoginForm.tsx @@ -1,6 +1,6 @@ import { asp as g } from "@asp/asp"; -import * as Button from "@components/ButtonNew"; -import * as Input from "@components/InputNew"; +import * as Button from "@components/Button"; +import * as Input from "@components/Input"; import * as Modal from "@components/Modal"; import { MaterialIcons } from "@expo/vector-icons"; import Feather from "@expo/vector-icons/Feather"; diff --git a/src/screens/HomeUserNotLoggedIn.tsx b/src/screens/HomeUserNotLoggedIn.tsx index 74af9a7..b01372a 100644 --- a/src/screens/HomeUserNotLoggedIn.tsx +++ b/src/screens/HomeUserNotLoggedIn.tsx @@ -1,5 +1,5 @@ import { asp as g } from "@asp/asp"; -import * as Button from "@components/ButtonNew"; +import * as Button from "@components/Button"; import { Image } from "expo-image"; import { Text, View } from "react-native"; import type { MainStackScreenComponentProps } from "@/navigations/types"; diff --git a/src/screens/NumberAndOtpForPaymentScreen.tsx b/src/screens/NumberAndOtpForPaymentScreen.tsx index 4a3ad99..5dea6f0 100644 --- a/src/screens/NumberAndOtpForPaymentScreen.tsx +++ b/src/screens/NumberAndOtpForPaymentScreen.tsx @@ -1,8 +1,8 @@ import { asp as g } from "@asp/asp"; import { BarnoinPayBackground } from "@components/BarnoinPayBackground"; import BeasyLogoIcon from "@components/BeasyLogoIcon"; -import * as Button from "@components/ButtonNew"; -import * as Input from "@components/InputNew"; +import * as Button from "@components/Button"; +import * as Input from "@components/Input"; import AntDesign from "@expo/vector-icons/AntDesign"; import { LOG } from "@logger"; import { Text, View } from "react-native"; diff --git a/src/screens/PaymentAmountInputScreen.tsx b/src/screens/PaymentAmountInputScreen.tsx index f6ec4da..39ad56a 100644 --- a/src/screens/PaymentAmountInputScreen.tsx +++ b/src/screens/PaymentAmountInputScreen.tsx @@ -1,8 +1,8 @@ import { asp as g } from "@asp/asp"; import { BarnoinPayBackground } from "@components/BarnoinPayBackground"; import BeasyLogoIcon from "@components/BeasyLogoIcon"; -import * as Button from "@components/ButtonNew"; -import * as Input from "@components/InputNew"; +import * as Button from "@components/Button"; +import * as Input from "@components/Input"; import * as Modal from "@components/Modal"; import { LOG } from "@logger"; import { useMutation } from "@tanstack/react-query"; diff --git a/src/screens/PaymentResultScreen.tsx b/src/screens/PaymentResultScreen.tsx index 2a42c56..c528ee7 100644 --- a/src/screens/PaymentResultScreen.tsx +++ b/src/screens/PaymentResultScreen.tsx @@ -1,7 +1,7 @@ import { asp as g } from "@asp/asp"; import { BarnoinPayBackground } from "@components/BarnoinPayBackground"; import BeasyLogoIcon from "@components/BeasyLogoIcon"; -import * as Button from "@components/ButtonNew"; +import * as Button from "@components/Button"; import CheckIcon from "@components/icons/CheckIcon"; import { AntDesign } from "@expo/vector-icons"; import { LOG } from "@logger"; diff --git a/src/screens/TransactionHistoryScreen.tsx b/src/screens/TransactionHistoryScreen.tsx index eb6f8ab..4b1f63c 100644 --- a/src/screens/TransactionHistoryScreen.tsx +++ b/src/screens/TransactionHistoryScreen.tsx @@ -3,8 +3,8 @@ import { asp as g } from "@asp/asp"; import { BarnoinPayBackground } from "@components/BarnoinPayBackground"; import BeasyLogoIcon from "@components/BeasyLogoIcon"; -import * as Button from "@components/ButtonNew"; -import * as Input from "@components/InputNew"; +import * as Button from "@components/Button"; +import * as Input from "@components/Input"; import * as Modal from "@components/Modal"; import Entypo from "@expo/vector-icons/Entypo"; import Ionicons from "@expo/vector-icons/Ionicons"; diff --git a/src/screens/UserProfileScreen.tsx b/src/screens/UserProfileScreen.tsx index 325ad32..c247ef0 100644 --- a/src/screens/UserProfileScreen.tsx +++ b/src/screens/UserProfileScreen.tsx @@ -1,7 +1,7 @@ import { asp as g } from "@asp/asp"; import { BarnoinPayBackground } from "@components/BarnoinPayBackground"; import BeasyLogoIcon from "@components/BeasyLogoIcon"; -import * as Button from "@components/ButtonNew"; +import * as Button from "@components/Button"; import Ionicons from "@expo/vector-icons/Ionicons"; import { LOG } from "@logger"; import { Text, View } from "react-native"; diff --git a/src/screens/WaveQrCodePaymentScreen.tsx b/src/screens/WaveQrCodePaymentScreen.tsx index 2d59223..1112e77 100644 --- a/src/screens/WaveQrCodePaymentScreen.tsx +++ b/src/screens/WaveQrCodePaymentScreen.tsx @@ -1,7 +1,7 @@ import { asp as g } from "@asp/asp"; import { BarnoinPayBackground } from "@components/BarnoinPayBackground"; import BeasyLogoIcon from "@components/BeasyLogoIcon"; -import * as Button from "@components/ButtonNew"; +import * as Button from "@components/Button"; import * as Modal from "@components/Modal"; import AntDesign from "@expo/vector-icons/AntDesign"; import { LOG } from "@logger"; -- libgit2 0.27.1