[UI > Card] Move most actions into overflow action sheet (#43)

* [Plugin/ThemeCard] Move most actions into overflow action sheet

* [UI > Card] Move overflow menu, add icon to header

---------

Co-authored-by: Beef <beefers@riseup.net>

src/ui/settings/components/Card.tsx

@@ -1,9 +1,12 @@
 import { ReactNative as RN, stylesheet } from "@metro/common";
+import { findByProps } from "@metro/filters";
 import { Forms } from "@ui/components";
 import { getAssetIDByName } from "@ui/assets";
 import { semanticColors } from "@ui/color";
 
 const { FormRow, FormSwitch, FormRadio } = Forms;
+const { hideActionSheet } = findByProps("openLazy", "hideActionSheet");
+const { showSimpleActionSheet } = findByProps("showSimpleActionSheet");
 
 // TODO: These styles work weirdly. iOS has cramped text, Android with low DPI probably does too. Fix?
 const styles = stylesheet.createThemedStyleSheet({
@@ -36,6 +39,11 @@ interface Action {
     onPress: () => void;
 }
 
+interface OverflowAction extends Action {
+    label: string;
+    isDestructive?: boolean;
+}
+
 interface CardProps {
     index?: number;
     headerLabel: string | React.ComponentType;
@@ -45,6 +53,8 @@ interface CardProps {
     onToggleChange?: (v: boolean) => void;
     descriptionLabel?: string | React.ComponentType;
     actions?: Action[];
+    overflowTitle?: string;
+    overflowActions?: OverflowAction[];
 }
 
 export default function Card(props: CardProps) {
@@ -76,6 +86,19 @@ export default function Card(props: CardProps) {
                 label={props.descriptionLabel}
                 trailing={
                     <RN.View style={styles.actions}>
+                        {props.overflowActions && <RN.TouchableOpacity
+                            onPress={() => showSimpleActionSheet({
+                                key: "CardOverflow",
+                                header: {
+                                    title: props.overflowTitle,
+                                    icon: props.headerIcon && <FormRow.Icon style={{ marginRight: 8 }} source={getAssetIDByName(props.headerIcon)} />,
+                                    onClose: () => hideActionSheet(),
+                                },
+                                options: props.overflowActions?.map(i => ({ ...i, icon: getAssetIDByName(i.icon) })),
+                            })}
+                        >
+                            <RN.Image style={styles.icon} source={getAssetIDByName("ic_more_24px")} />
+                        </RN.TouchableOpacity>}
                         {props.actions?.map(({ icon, onPress }) => (
                             <RN.TouchableOpacity
                                 onPress={onPress}

src/ui/settings/components/PluginCard.tsx

@@ -35,9 +35,28 @@ export default function PluginCard({ plugin, index }: PluginCardProps) {
                 }
             }}
             descriptionLabel={plugin.manifest.description}
-            actions={[
+            overflowTitle={plugin.manifest.name}
+            overflowActions={[
+                {   
+                    icon: "ic_download_24px",
+                    label: plugin.update ? "Disable updates" : "Enable updates",
+                    onPress: () => {
+                        plugin.update = !plugin.update;
+                        showToast(`${plugin.update ? "Enabled" : "Disabled"} updates for ${plugin.manifest.name}.`, getAssetIDByName("toast_image_saved"));
+                    }
+                },
+                {
+                    icon: "copy",
+                    label: "Copy plugin URL",
+                    onPress: () => {
+                        clipboard.setString(plugin.id);
+                        showToast("Copied plugin URL to clipboard.", getAssetIDByName("toast_copy_link"));
+                    }
+                },
                 {
                     icon: "ic_message_delete",
+                    label: "Delete plugin",
+                    isDestructive: true,
                     onPress: () => showConfirmationAlert({
                         title: "Wait!",
                         content: `Are you sure you wish to delete ${plugin.manifest.name}?`,
@@ -54,20 +73,8 @@ export default function PluginCard({ plugin, index }: PluginCardProps) {
                         }
                     }),
                 },
-                {
+            ]}
-                    icon: "copy",
+            actions={[
-                    onPress: () => {
-                        clipboard.setString(plugin.id);
-                        showToast("Copied plugin URL to clipboard.", getAssetIDByName("toast_copy_link"));
-                    },
-                },
-                {
-                    icon: plugin.update ? "Check" : "Small",
-                    onPress: () => {
-                        plugin.update = !plugin.update;
-                        showToast(`${plugin.update ? "Enabled" : "Disabled"} updates for ${plugin.manifest.name}.`, getAssetIDByName("toast_image_saved"));
-                    }
-                },
                 ...(settings ? [{
                     icon: "settings",
                     onPress: () => navigation.push("VendettaCustomPage", {

src/ui/settings/components/ThemeCard.tsx

@@ -34,34 +34,11 @@ export default function ThemeCard({ theme, index }: ThemeCardProps) {
             onToggleChange={(v: boolean) => {
                 selectAndReload(v, theme.id);
             }}
-            actions={[
+            overflowTitle={theme.data.name}
-                {
+            overflowActions={[
-                    icon: "ic_message_delete",
-                    onPress: () => showConfirmationAlert({
-                        title: "Wait!",
-                        content: `Are you sure you wish to delete ${theme.data.name}?`,
-                        confirmText: "Delete",
-                        cancelText: "Cancel",
-                        confirmColor: ButtonColors.RED,
-                        onConfirm: () => {
-                            removeTheme(theme.id).then((wasSelected) => {
-                                setRemoved(true);
-                                if (wasSelected) selectAndReload(false, theme.id);
-                            }).catch((e: Error) => {
-                                showToast(e.message, getAssetIDByName("Small"));
-                            });
-                        }
-                    }),
-                },
-                {
-                    icon: "copy",
-                    onPress: () => {
-                        clipboard.setString(theme.id);
-                        showToast("Copied theme URL to clipboard.", getAssetIDByName("toast_copy_link"));
-                    },
-                },
                 {
                     icon: "ic_sync_24px",
+                    label: "Refetch",
                     onPress: () => {
                         fetchTheme(theme.id).then(() => {
                             if (theme.selected) {
@@ -81,6 +58,34 @@ export default function ThemeCard({ theme, index }: ThemeCardProps) {
                         });
                     },
                 },
+                {
+                    icon: "copy",
+                    label: "Copy theme URL",
+                    onPress: () => {
+                        clipboard.setString(theme.id);
+                        showToast("Copied theme URL to clipboard.", getAssetIDByName("toast_copy_link"));
+                    }
+                },
+                {
+                    icon: "ic_message_delete",
+                    label: "Delete theme",
+                    isDestructive: true,
+                    onPress: () => showConfirmationAlert({
+                        title: "Wait!",
+                        content: `Are you sure you wish to delete ${theme.data.name}?`,
+                        confirmText: "Delete",
+                        cancelText: "Cancel",
+                        confirmColor: ButtonColors.RED,
+                        onConfirm: () => {
+                            removeTheme(theme.id).then((wasSelected) => {
+                                setRemoved(true);
+                                if (wasSelected) selectAndReload(false, theme.id);
+                            }).catch((e: Error) => {
+                                showToast(e.message, getAssetIDByName("Small"));
+                            });
+                        }
+                    })
+                },
             ]}
         />
     )