From db4ac86875db03fc06b37ff4bf44045370d102e6 Mon Sep 17 00:00:00 2001 From: harukin-expo-dev-env Date: Tue, 2 Apr 2024 03:39:39 +0000 Subject: [PATCH] =?UTF-8?q?=E3=82=A6=E3=82=A3=E3=82=B8=E3=82=A7=E3=83=83?= =?UTF-8?q?=E3=83=88=E3=81=AB=E5=BF=9C=E3=81=98=E3=81=A6=E8=87=AA=E5=8B=95?= =?UTF-8?q?=E5=A4=89=E5=8C=96=E3=81=99=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB?= =?UTF-8?q?=E5=A4=89=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AndroidWidget/widget-task-handler.jsx | 2 +- components/Settings/WidgetSettings.js | 25 ++++++++++++------- 2 files changed, 17 insertions(+), 10 deletions(-) diff --git a/components/AndroidWidget/widget-task-handler.jsx b/components/AndroidWidget/widget-task-handler.jsx index 42fc7ff..5b7ae14 100644 --- a/components/AndroidWidget/widget-task-handler.jsx +++ b/components/AndroidWidget/widget-task-handler.jsx @@ -3,7 +3,7 @@ import { TraInfoEXWidget } from "./TraInfoEXWidget"; import dayjs from "dayjs"; import { ToastAndroid } from "react-native"; -const nameToWidget = { +export const nameToWidget = { // Hello will be the **name** with which we will reference our widget. JR_shikoku_train_info: TraInfoEXWidget, }; diff --git a/components/Settings/WidgetSettings.js b/components/Settings/WidgetSettings.js index 31cefa6..982906f 100644 --- a/components/Settings/WidgetSettings.js +++ b/components/Settings/WidgetSettings.js @@ -5,21 +5,28 @@ import { CheckBox } from "react-native-elements"; import { TripleSwitchArea } from "../atom/TripleSwitchArea"; import { getWidgetInfo, WidgetPreview } from "react-native-android-widget"; import { TraInfoEXWidget } from "../AndroidWidget/TraInfoEXWidget"; -import { getDelayData } from "../AndroidWidget/widget-task-handler"; +import { + getDelayData, + nameToWidget, +} from "../AndroidWidget/widget-task-handler"; import { ListItem } from "native-base"; export const WidgetSettings = ({ navigate }) => { - const widgetInfo = getWidgetInfo("JR_shikoku_train_info"); const [widgetList, setWidgetList] = useState([]); useEffect(() => { - widgetInfo.then((s) => { - if (s.length > 0) { - setWidgetList(s); - s.forEach((element) => { - console.log(element); - }); - } + const d = []; + Object.keys(nameToWidget).forEach((element) => { + const widgetInfo = getWidgetInfo(element); + widgetInfo.then((s) => { + if (s.length > 0) { + s.forEach((elem) => { + console.log(elem); + d.push(elem); + }); + } + }); }); + setWidgetList(d); }, []); const [time, setTime] = useState(time);