Merge branch 'auth-screen' into 'master'

Bug Fixing and design optimization for Register Screens

See merge request !51

README.md

+# Click
+
+URL to APK:
+
+## Group Members:
+- Ahmad Izzudin Alifyandra (1906316944)
+- Angelin Depthios (1906426771)
+- Abraham Rudolf B (1906426720)
+- Bagus Prabowo (1906317966)
+- Mohammad Faraz Abisha Mirza (1906316162)
+- Muhammad Zahran Agung Dewantoro (1906426922)
+
+## Tech Stacks:
+- React Native - Expo (Frontend)
+- Firebase - Firestore (Backend)
\ No newline at end of file

src/components/Forms/DropdownForm.tsx

@@ -68,7 +68,7 @@ const DropdownForm = ({
       searchPlaceholder={searchPlaceholder}
       searchContainerStyle={styles.SearchContainer}
       searchTextInputStyle={styles.SearchInput}
-      dropDownDirection="BOTTOM"
+      dropDownDirection="TOP"
       dropDownContainerStyle={styles.Container}
       style={{
         ...styles.Main,

src/screens/auth/RegisterGoogleFacebookScreen.tsx

@@ -27,6 +27,12 @@ const RegisterGoogleFacebookScreen = ({
     { label: "Pertambangan", value: "E" },
     { label: "Perikanan", value: "F" },
     { label: "Real Estat", value: "G" },
+    { label: "Makanan dan Minuman", value: "H" },
+    { label: "Otomotif", value: "I" },
+    { label: "Industri Berat", value: "J" },
+    { label: "Pengolahan Bahan Mentah", value: "K" },
+    { label: "Distributor", value: "L" },
+    { label: "Pasar Modal", value: "M" },
   ]);
   // const [categories, setCategories] = useState<IDD[]>();
   //
@@ -37,8 +43,8 @@ const RegisterGoogleFacebookScreen = ({
   // }, []);
 
   return (
-    <ScrollView nestedScrollEnabled={true}>
-      <View style={styles.container}>
+    <View style={styles.container}>
+      <ScrollView nestedScrollEnabled={true}>
         <View>
           <Text style={styles.titleText}>Selamat Datang!</Text>
         </View>
@@ -80,30 +86,33 @@ const RegisterGoogleFacebookScreen = ({
           />
         </View>
         <Spacer variant={"l"} />
-        <View>
-          <DropdownForm
-            formPlaceholder={"Kategori Bisnis"}
-            searchPlaceholder={"Cari Kategori Bisnis"}
-            value={picked}
-            setValue={setPicked}
-            items={categories}
-            setItems={setCategories}
-          />
-        </View>
-        <Spacer variant={"l"} />
-        <View>
-          <Text style={styles.textView}>
-            Dengan membuat akun Click, saya telah setuju dengan Syarat &
-            Ketentuan serta Kebijakan Privasi yang telah ditetapkan oleh Click.
-          </Text>
-        </View>
-        <Spacer variant={"l"} />
-        <View style={styles.button}>
-          <MainButton text="Daftar" colors="primary" onPress={() => {}} />
-        </View>
-        <Spacer variant={"xl"} />
+      </ScrollView>
+      <View style={styles.titleContainer} testID="TitleContainer">
+        <Text style={styles.formTitle} testID="Title">
+          Kategori Bisnis
+        </Text>
+      </View>
+      <DropdownForm
+        formPlaceholder={"Kategori Bisnis"}
+        searchPlaceholder={"Cari Kategori Bisnis"}
+        value={picked}
+        setValue={setPicked}
+        items={categories}
+        setItems={setCategories}
+      />
+      <Spacer variant={"l"} />
+      <View>
+        <Text style={styles.textView}>
+          Dengan membuat akun Click, saya telah setuju dengan Syarat & Ketentuan
+          serta Kebijakan Privasi yang telah ditetapkan oleh Click.
+        </Text>
+      </View>
+      <Spacer variant={"l"} />
+      <View style={styles.button}>
+        <MainButton text="Daftar" colors="primary" onPress={() => {}} />
       </View>
-    </ScrollView>
+      <Spacer variant={"xl"} />
+    </View>
   );
 };
 
@@ -137,6 +146,14 @@ const styles = StyleSheet.create({
     letterSpacing: 0,
     textAlign: "left",
   },
+  titleContainer: {
+    paddingBottom: 8,
+  },
+  formTitle: {
+    fontSize: 14,
+    width: "100%",
+    color: Colors.text.subtitle,
+  },
   componentWrapper: {
     width: "100%",
   },

src/screens/auth/RegisterScreen.tsx

@@ -8,9 +8,6 @@ import IconForm from "../../components/Forms/IconForm";
 import Spacer from "../../components/Spacer/Spacer";
 import MainButton from "../../components/button/MainButton";
 import DropdownForm from "../../components/Forms/DropdownForm";
-import { getCategories } from "../../db/categories";
-import { ICategory, IDD } from "../../types/firestore";
-import { ddConverter } from "../../helpers/ddConverter";
 import { RootTabScreenProps } from "../../types/navigation";
 import { useNavigation } from "@react-navigation/core";
 import { validateEmail, validateEmpty } from "../../helpers/Validators";
@@ -30,6 +27,15 @@ const RegisterScreen = ({ navigation }: RootTabScreenProps<"TabOne">) => {
   const [categories, setCategories] = useState([
     { label: "Agrikultur", value: "B" },
     { label: "Pertanian", value: "D" },
+    { label: "Pertambangan", value: "E" },
+    { label: "Perikanan", value: "F" },
+    { label: "Real Estat", value: "G" },
+    { label: "Makanan dan Minuman", value: "H" },
+    { label: "Otomotif", value: "I" },
+    { label: "Industri Berat", value: "J" },
+    { label: "Pengolahan Bahan Mentah", value: "K" },
+    { label: "Distributor", value: "L" },
+    { label: "Pasar Modal", value: "M" },
   ]);
   const dispatch = useAppDispatch();
   // useEffect(() => {