From fec4c68f70a0202344c9efa2e25b2cdffcd1700c Mon Sep 17 00:00:00 2001
From: Jack <30497388+FieryFlames@users.noreply.github.com>
Date: Mon, 6 Feb 2023 03:34:22 -0500
Subject: [PATCH] [UI] iOS UI fixes (#19)

* [UI > Developer] Move React DevTools FormDivider inside conditional inclusion

* [UI > Developer] Add FormDividers to Loader config

* [UI > General] Remove trailing FormDividers for versions and platform info

* [UI > Developer] Remove extraneous FormDivider
---
 src/ui/settings/pages/Developer.tsx | 54 ++++++++++++++++-------------
 src/ui/settings/pages/General.tsx   |  8 ++---
 2 files changed, 34 insertions(+), 28 deletions(-)

diff --git a/src/ui/settings/pages/Developer.tsx b/src/ui/settings/pages/Developer.tsx
index 9851093..6769742 100644
--- a/src/ui/settings/pages/Developer.tsx
+++ b/src/ui/settings/pages/Developer.tsx
@@ -27,7 +27,7 @@ export default function Developer() {
     return (
         <RN.ScrollView style={{ flex: 1 }} contentContainerStyle={{ paddingBottom: 38 }}>
             <FormSection title="Debug" titleStyleType="no_border">
-                <FormInput 
+                <FormInput
                     value={settings.debuggerUrl}
                     onChange={(v: string) => settings.debuggerUrl = v}
                     placeholder="127.0.0.1:9090"
@@ -39,23 +39,25 @@ export default function Developer() {
                     leading={<FormRow.Icon source={getAssetIDByName("copy")} />}
                     onPress={() => connectToDebugger(settings.debuggerUrl)}
                 />
-                <FormDivider />
-                {window.__vendetta_rdc && <FormRow
-                    label="Connect to React DevTools"
-                    leading={<FormRow.Icon source={getAssetIDByName("ic_badge_staff")} />}
-                    onPress={() => {
-                        try {
-                            window.__vendetta_rdc?.connectToDevTools({
-                                host: settings.debuggerUrl.split(":")?.[0],
-                                resolveRNStyle: RN.StyleSheet.flatten,
-                            });
-                        } catch(e) {
-                            // TODO: Check if this ever actually catches anything
-                            logger.error("Failed to connect to React DevTools!", e);
-                            showToast("Failed to connect to React DevTools!", getAssetIDByName("Small"));
-                        }
-                    }}
-                />}
+                {window.__vendetta_rdc && <>
+                    <FormDivider />
+                    <FormRow
+                        label="Connect to React DevTools"
+                        leading={<FormRow.Icon source={getAssetIDByName("ic_badge_staff")} />}
+                        onPress={() => {
+                            try {
+                                window.__vendetta_rdc?.connectToDevTools({
+                                    host: settings.debuggerUrl.split(":")?.[0],
+                                    resolveRNStyle: RN.StyleSheet.flatten,
+                                });
+                            } catch (e) {
+                                // TODO: Check if this ever actually catches anything
+                                logger.error("Failed to connect to React DevTools!", e);
+                                showToast("Failed to connect to React DevTools!", getAssetIDByName("Small"));
+                            }
+                        }}
+                    />
+                </>}
             </FormSection>
             {window.__vendetta_loader?.features.loaderConfig && <FormSection title="Loader config">
                 <FormSwitchRow
@@ -67,12 +69,16 @@ export default function Developer() {
                         loaderConfig.customLoadUrl.enabled = v;
                     }}
                 />
-                {loaderConfig.customLoadUrl.enabled && <FormInput
-                    value={loaderConfig.customLoadUrl.url}
-                    onChange={(v: string) => loaderConfig.customLoadUrl.url = v}
-                    placeholder="http://localhost:4040/vendetta.js"
-                    title="VENDETTA URL"
-                />}
+                <FormDivider />
+                {loaderConfig.customLoadUrl.enabled && <>
+                    <FormInput
+                        value={loaderConfig.customLoadUrl.url}
+                        onChange={(v: string) => loaderConfig.customLoadUrl.url = v}
+                        placeholder="http://localhost:4040/vendetta.js"
+                        title="VENDETTA URL"
+                    />
+                    <FormDivider />
+                </>}
                 {window.__vendetta_loader.features.devtools && <FormSwitchRow
                     label="Load React DevTools"
                     subLabel={`Version: ${window.__vendetta_loader.features.devtools.version}`}
diff --git a/src/ui/settings/pages/General.tsx b/src/ui/settings/pages/General.tsx
index fa5d0b8..6f8ca6e 100644
--- a/src/ui/settings/pages/General.tsx
+++ b/src/ui/settings/pages/General.tsx
@@ -92,18 +92,18 @@ export default function General() {
                 />
             </FormSection>
             <FormSection title="Versions">
-                {versions.map((v) => (
+                {versions.map((v, i) => (
                     <>
                         <Version label={v.label} version={v.version} icon={v.icon} />
-                        <FormDivider />
+                        {i !== versions.length - 1 && <FormDivider />}
                     </>
                 ))}
             </FormSection>
             <FormSection title="Platform Info">
-                {platformInfo.map((p) => (
+                {platformInfo.map((p, i) => (
                     <>
                         <Version label={p.label} version={p.version} icon={p.icon} />
-                        <FormDivider />
+                        {i !== platformInfo.length - 1 && <FormDivider />}
                     </>
                 ))}
             </FormSection>