2.4.3

.github/workflows/module.yaml

@@ -19,7 +19,7 @@ jobs:
       - name: Make
         shell: bash
         run: |
-          zip -r "module.zip" * -x ".git" -x "README.md"
+          zip -r "module.zip" * -x ".git" -x "README.md" -x "assets/*"
           
       - name: Publish
         uses: softprops/action-gh-release@v1

CHANGELOG.md

@@ -1,4 +1,6 @@
-<divider textAlign="left"><h1>2.3.2</h1></divider>
+<divider textAlign="left"><h1>2.4.3</h1></divider>
 
-- Removed toolbar coloring
-- Added ability to view saved bluetooth devices
+> MMRL v2.19.18 is required to use this version!
+
+- Fixed bluetooth tab
+- Fixed imports

README.md

@@ -8,7 +8,7 @@ This project is also a example to show how powerful MMRL's ModConf feature is.
 Using `DOMParser` to extract local saved wifi passwords
 
 > [!IMPORTANT]
-> This project requires MMRL above 2.14.10!
+> This project requires MMRL above 2.19.18!
 
 ```js
 const wifiXmlParser = new DOMParser();

common/repo.json

@@ -5,5 +5,9 @@
     "Tweaks and Hacks",
     "Miscellaneous"
   ],
+  "screenshots": [
+    "https://raw.githubusercontent.com/Googlers-Repo/wpd/master/assets/1.png",
+    "https://raw.githubusercontent.com/Googlers-Repo/wpd/master/assets/2.png"
+  ],
   "readme": "https://raw.githubusercontent.com/Googlers-Repo/wpd/master/README.md"
 }

module.prop

@@ -1,6 +1,6 @@
 id=mmrl_wpd
 name=WiFi Password Viewer for MMRL
-version=2.3.2
-versionCode=232
+version=2.4.3
+versionCode=243
 author=Der_Googler, veez21 @ xda-developers
 description=View all your WiFi passwords and bluetooth devices inside MMRL

system/usr/share/mmrl/config/mmrl_wpd/components/CenterBox.jsx

@@ -1,7 +1,6 @@
-import React from "react";
 import { Box } from "@mui/material";
 
-export default (props) => {
+const CenterBox = (props) => {
   return (
     <Box
       component="h4"
@@ -17,3 +16,5 @@ export default (props) => {
     />
   );
 };
+
+export { CenterBox }

system/usr/share/mmrl/config/mmrl_wpd/hooks/useBackHandler.js

@@ -1,23 +1,38 @@
 import { useActivity, useConfirm } from "@mmrl/hooks";
 
-export default () => {
+const useBackHandler = () => {
   const { context } = useActivity();
   const confirm = useConfirm();
 
-  return (e) => {
-    confirm({
-      title: "Leaving?",
-      description: "Are you sure that you want leave this config?",
-      confirmationText: "Yes",
-      cancellationText: "No",
-    })
-      .then(() => {
-        if (typeof e.callParentHandler === "function") {
-          e.callParentHandler();
-        } else {
-          context.popPage();
-        }
+  const [index, setIndex] = React.useState(0);
+
+  const backHandler = React.useCallback((e) => {
+    if (index === 0) {
+      confirm({
+        title: "Leaving?",
+        description: "Are you sure that you want leave this config?",
+        confirmationText: "Yes",
+        cancellationText: "No",
       })
-      .catch(() => {});
-  };
+        .then(() => {
+          if (typeof e.callParentHandler === "function") {
+            e.callParentHandler();
+          } else {
+            context.popPage();
+          }
+        })
+        .catch(() => { });
+    } else {
+      setIndex(0)
+    }
+  }, [index])
+
+  return {
+    handleBack: backHandler,
+    index: index,
+    setIndex: setIndex
+  }
+
 };
+
+export { useBackHandler }

system/usr/share/mmrl/config/mmrl_wpd/hooks/useBluetoothConfig.js

@@ -1,9 +1,6 @@
-import React from "react";
-
 const isBlueMac = (mac) => mac.match(/([0-9a-fA-F]{2}[:]){5}([0-9a-fA-F]{2})/)
 
-
-export default () => {
+const useBluetoothConfig = () => {
     const [config, setConfig] = React.useState([]);
 
     React.useEffect(() => {
@@ -20,3 +17,5 @@ export default () => {
 
     return config;
 };
+
+export { useBluetoothConfig }

system/usr/share/mmrl/config/mmrl_wpd/hooks/useConfigStore.js

@@ -1,6 +1,4 @@
-import React from "react";
-
-export default () => {
+const useConfigStore = () => {
   const [store, setStore] = React.useState(null);
 
   React.useEffect(() => {
@@ -18,3 +16,5 @@ export default () => {
 
   return store;
 };
+
+export { useConfigStore }

system/usr/share/mmrl/config/mmrl_wpd/hooks/useNetworks.js

@@ -1,8 +1,6 @@
-import React from "react";
+import { useConfigStore } from "./hooks/useConfigStore.js";
 
-const useConfigStore = include("hooks/useConfigStore.js")
-
-export default () => {
+const useNetworks = () => {
   const [networks, setNetworks] = React.useState(null);
   const config = useConfigStore();
 
@@ -38,3 +36,5 @@ export default () => {
 
   return networks;
 };
+
+export { useNetworks }

system/usr/share/mmrl/config/mmrl_wpd/index.jsx

@@ -1,16 +1,14 @@
 import { withRequireNewVersion } from "@mmrl/hoc";
-import { Page, Tabbar } from "@mmrl/ui";
-import React from "react";
+import { Page, Tabbar, Toolbar } from "@mmrl/ui";
 
-const BluetoothTab = include("tabs/BluetoothTab.jsx");
-const WLANTab = include("tabs/WLANTab.jsx");
-const RenderToolbar = include("components/RenderToolbar.jsx");
-const useBackHandler = include("hooks/useBackHandler.js")
+import { BluetoothTab } from "./tabs/BluetoothTab";
+import { WLANTab } from "./tabs/WLANTab";
+import { useBackHandler } from "./hooks/useBackHandler";
 
+import { useActivity } from "@mmrl/hooks";
 
 function App() {
-  const handleBack = useBackHandler()
-  const [index, setIndex] = React.useState(0);
+  const { handleBack, index, setIndex } = useBackHandler()
 
   const renderTabs = () => {
     return [
@@ -21,12 +19,19 @@ function App() {
       {
         content: <BluetoothTab />,
         tab: <Tabbar.Tab label="Bluetooth" />,
-      },
+      }
     ];
   };
 
   return (
-    <Page onDeviceBackButton={handleBack} renderToolbar={RenderToolbar} modifier="noshadow">
+    <Page onDeviceBackButton={handleBack} renderToolbar={() => (
+      <Toolbar modifier="noshadow">
+        <Toolbar.Left>
+          <Toolbar.BackButton onClick={handleBack} />
+        </Toolbar.Left>
+        <Toolbar.Center>WiFi Password Viewer</Toolbar.Center>
+      </Toolbar>
+    )} modifier="noshadow" >
       <Tabbar
         modifier="noshadow"
         position="top"
@@ -38,11 +43,11 @@ function App() {
         }}
         renderTabs={renderTabs}
       />
-    </Page>
+    </Page >
   );
 }
 
 export default withRequireNewVersion({
-  versionCode: 21510,
+  versionCode: 21918,
   component: App,
 });

system/usr/share/mmrl/config/mmrl_wpd/tabs/BluetoothTab.jsx

@@ -1,10 +1,9 @@
 import { useNativeStorage } from "@mmrl/hooks";
 import { CodeBlock, Page } from "@mmrl/ui";
 import { Divider, List, ListItem, ListItemText, ListSubheader, Switch, Typography } from "@mui/material";
-import React from "react";
 
-const CenterBox = include("components/CenterBox.jsx");
-const useBluetoothConfig = include("hooks/useBluetoothConfig.js")
+import { CenterBox } from "./components/CenterBox";
+import { useBluetoothConfig } from "./hooks/useBluetoothConfig";
 
 
 function BluetoothTab() {
@@ -30,7 +29,6 @@ function BluetoothTab() {
             <Divider />
             <List subheader={<ListSubheader>Devices</ListSubheader>}>
                 {devices.map((device, index, arr) => {
-                    //                    const stats = Object.entries(device).flatMap((d) => `${d[0]}: ${d[1]}`).join("\n")
                     const stats = JSON.stringify(device, null, 2)
                     return (<>
                         <ListItem>
@@ -50,9 +48,10 @@ function BluetoothTab() {
                         {index + 1 !== arr.length && <Divider variant="middle" />}
                     </>)
                 })}
+
             </List>
         </Page>
     );
 }
 
-export default BluetoothTab
+export { BluetoothTab }

system/usr/share/mmrl/config/mmrl_wpd/tabs/WLANTab.jsx

@@ -1,12 +1,9 @@
 import { useNativeStorage } from "@mmrl/hooks";
 import { CodeBlock, Page } from "@mmrl/ui";
 import { Divider, List, ListItem, ListItemText, ListSubheader, Switch, Typography } from "@mui/material";
-import React from "react";
 
-const RenderToolbar = include("components/RenderToolbar.jsx");
-const CenterBox = include("components/CenterBox.jsx");
-
-const useNetworks = include("hooks/useNetworks.js");
+import { CenterBox } from "./components/CenterBox";
+import { useNetworks } from "./hooks/useNetworks";
 
 
 function WLANTab() {
@@ -53,4 +50,4 @@ function WLANTab() {
   );
 }
 
-export default WLANTab
+export { WLANTab }