Huge refactoring; Implement inverter info

Author: CommanderRedYT

src/App.tsx

@@ -1,43 +1,46 @@
-import { NavigationContainer } from '@react-navigation/native';
-import moment from 'moment';
-import { PersistGate as ReduxPersistGate } from 'redux-persist/integration/react';
-
 import type { FC } from 'react';
 import { StrictMode, useEffect, useMemo, useState } from 'react';
 import { useTranslation } from 'react-i18next';
-import { StatusBar, useColorScheme } from 'react-native';
 import type { MD3Theme } from 'react-native-paper';
 import {
   adaptNavigationTheme,
   MD3DarkTheme,
   MD3LightTheme,
   PaperProvider,
 } from 'react-native-paper';
+import type { TranslationsType } from 'react-native-paper-dates';
 import { registerTranslation } from 'react-native-paper-dates';
 import { SafeAreaProvider } from 'react-native-safe-area-context';
 import SplashScreen from 'react-native-splash-screen';
 import { Provider as ReduxProvider } from 'react-redux';
 
+import { StatusBar, useColorScheme } from 'react-native';
+
+import moment from 'moment';
+import { PersistGate as ReduxPersistGate } from 'redux-persist/integration/react';
+
+import { setLanguage } from '@/slices/settings';
+
 import AppOfflineModal from '@/components/modals/AppOfflineModal';
 import EnableAppUpdatesModal from '@/components/modals/EnableAppUpdatesModal';
 import EnableFetchOpenDtuUpdatesModal from '@/components/modals/EnableFetchOpenDtuUpdatesModal';
 
-import { rootLogger } from '@/utils/log';
+import { rootLogging } from '@/utils/log';
 
 import ApiProvider from '@/api/ApiHandler';
 import DatabaseProvider from '@/database';
 import GithubProvider from '@/github';
 import FetchHandler from '@/github/FetchHandler';
-import { store, persistor, useAppSelector, useAppDispatch } from '@/store';
+import { persistor, store, useAppDispatch, useAppSelector } from '@/store';
 import { ReactNavigationDarkTheme, ReactNavigationLightTheme } from '@/style';
+import type { SupportedLanguage } from '@/translations';
 import NavigationStack from '@/views/navigation/NavigationStack';
-import type { TranslationsType } from 'react-native-paper-dates';
+
 import RNLanguageDetector from '@os-team/i18next-react-native-language-detector';
-import { setLanguage } from '@/slices/settings';
-import type { SupportedLanguage } from '@/translations';
 import { useMaterial3Theme } from '@pchmn/expo-material3-theme';
+import { NavigationContainer } from '@react-navigation/native';
 
-const log = rootLogger.extend('App');
+const log = rootLogging.extend('App');
 
 const App = () => {
   /*const onBeforeLift = useCallback(() => {
@@ -178,6 +181,9 @@ const _App: FC = () => {
   const { theme: m3theme } = useMaterial3Theme();
 
   const appTheme = useAppSelector(state => state.settings.appTheme);
+  const allowMaterialYou = useAppSelector(
+    state => state.settings.allowMaterialYou,
+  );
 
   const systemModeWantsDark = colorScheme === 'dark';
 
@@ -194,12 +200,22 @@ const _App: FC = () => {
   const theme = useMemo(() => {
     if (darkMode) {
       log.debug('darkMode');
-      return { ...DarkTheme, colors: m3theme.dark };
+
+      if (allowMaterialYou) {
+        return { ...DarkTheme, colors: m3theme.dark };
+      } else {
+        return DarkTheme;
+      }
     }
 
     log.debug('lightMode');
-    return { ...LightTheme, colors: m3theme.light };
-  }, [darkMode, m3theme.dark, m3theme.light]);
+
+    if (allowMaterialYou) {
+      return { ...LightTheme, colors: m3theme.light };
+    } else {
+      return LightTheme;
+    }
+  }, [allowMaterialYou, darkMode, m3theme.dark, m3theme.light]);
 
   const navigationTheme = useMemo(() => {
     if (darkMode) return AdaptedNavigationDarkTheme;

src/api/ApiHandler.tsx

@@ -5,12 +5,17 @@ import {
   clearOpenDtuState,
   setDeviceState,
   setEventLog,
+  setGridProfile,
+  setInverterDevice,
   setInverters,
   setIsConnected,
+  setLimitStatus,
+  setLiveDataFromStatus,
   setLiveDataFromWebsocket,
   setMqttStatus,
   setNetworkStatus,
   setNtpStatus,
+  setPowerStatus,
   setSystemStatus,
   setTriedToConnect,
 } from '@/slices/opendtu';
@@ -22,13 +27,14 @@ import {
 
 import { DeviceState } from '@/types/opendtu/state';
 
-import { rootLogger } from '@/utils/log';
+import useAppLanguage from '@/hooks/useAppLanguage';
+
+import { rootLogging } from '@/utils/log';
 
 import OpenDtuApi from '@/api/opendtuapi';
 import { useAppDispatch, useAppSelector } from '@/store';
-import useAppLanguage from '@/hooks/useAppLanguage';
 
-const log = rootLogger.extend('ApiHandler');
+const log = rootLogging.extend('ApiHandler');
 
 // create context for the api handler
 export const ApiContext = createContext<OpenDtuApi | undefined>(undefined);
@@ -94,6 +100,14 @@ export const ApiProvider: FC<PropsWithChildren> = ({ children }) => {
         dispatch(setDeviceState({ deviceState: DeviceState.Connected, index }));
       });
 
+      api.registerLiveDataFromStatusHandler((data, valid, index) => {
+        dispatch(
+          setTriedToConnect({ triedToConnect: true, index: configIndex }),
+        );
+        dispatch(setLiveDataFromStatus({ data, valid, index: configIndex }));
+        dispatch(setDeviceState({ deviceState: DeviceState.Connected, index }));
+      });
+
       api.registerHttpStatusHandler(
         (
           { systemStatus, networkStatus, ntpStatus, mqttStatus, inverters },
@@ -146,9 +160,27 @@ export const ApiProvider: FC<PropsWithChildren> = ({ children }) => {
         dispatch(setEventLog({ data, index, inverterSerial }));
       });
 
+      api.registerOnPowerStatusHandler((data, index) => {
+        dispatch(setPowerStatus({ data, index }));
+      });
+
+      api.registerOnLimitStatusHandler((data, index) => {
+        dispatch(setLimitStatus({ data, index }));
+      });
+
+      api.registerOnInverterDeviceHandler((data, index, inverterSerial) => {
+        dispatch(setInverterDevice({ data, index, inverterSerial }));
+      });
+
+      api.registerOnGridProfileHandler((data, index, inverterSerial) => {
+        dispatch(setGridProfile({ data, index, inverterSerial }));
+      });
+
       log.debug('Connecting API Handler');
 
       api.connect();
+
+      api.getLiveData();
     } else {
       log.debug('Disconnecting API Handler');
 
@@ -163,6 +195,22 @@ export const ApiProvider: FC<PropsWithChildren> = ({ children }) => {
     };
   }, [currentConfiguration, configIndex, dispatch, api]);
 
+  useEffect(() => {
+    const func = (): void => {
+      if (configIndex === null) {
+        return;
+      }
+
+      api.handle();
+    };
+
+    const interval = setInterval(func, 5000);
+
+    return () => {
+      clearInterval(interval);
+    };
+  }, [api, configIndex]);
+
   return <ApiContext.Provider value={api}>{children}</ApiContext.Provider>;
 };