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);