ikualo-ui-kit-mobile 0.2.3 → 0.2.4

package/%ProgramData%/Microsoft/Windows/UUS/State/_active.uusver

@@ -0,0 +1 @@
+1309.2409.26012.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ikualo-ui-kit-mobile",
-  "version": "0.2.3",
+  "version": "0.2.4",
   "main": "src/index.ts",
   "scripts": {
     "start": "expo start",

package/src/elements/timer/Timer.tsx

@@ -1,5 +1,5 @@
 import { useEffect, useState } from 'react';
-import { StyleProp, TextStyle, View } from 'react-native';
+import { AppState, StyleProp, TextStyle, View } from 'react-native';
 import { Text } from 'react-native-paper';
 interface IFTimer {
   onFinished?: () => void;
@@ -10,38 +10,92 @@ interface IFTimer {
 export const Timer = (props: IFTimer) => {
   const { onFinished, style, minutes, resetTimer } = props;
   const [minutesTemp, setMinutesTemp] = useState<number>(minutes);
-  const [seconds, setSeconds] = useState<number>(60);
+  const [seconds, setSeconds] = useState<number>(0);
+  const [appState, setAppState] = useState(AppState.currentState);
+  const [lastTimestamp, setLastTimestamp] = useState(Date.now());
+  const [updateTime, setUpdateTime] = useState(false);
 
   useEffect(() => {
-    let secondsInterval: number = 60;
-    let minutesInterval: number = minutes;
+    let secondsInterval: number = updateTime ? seconds : 0;
+    let minutesInterval: number = updateTime ? minutesTemp : minutes;
+    setUpdateTime(false);
+
     const intervalId = setInterval(() => {
-      if (secondsInterval > 0) {
+      if (minutesInterval > 0 && secondsInterval === 0) {
+        secondsInterval = 59;
+        minutesInterval = minutesInterval - 1;
+        setMinutesTemp(minutesInterval);
+        setSeconds(secondsInterval);
+      } else if (secondsInterval > 0) {
         secondsInterval = secondsInterval - 1;
         setSeconds(secondsInterval);
-      } else {
-        secondsInterval = 60;
-        minutesInterval = minutesInterval - 1 > 0 ? minutesInterval - 1 : 0;
-        setMinutesTemp(minutesInterval);
-        if (minutesInterval === 0) {
+      } else if (minutesInterval === 0 && secondsInterval === 0) {
+        clearInterval(intervalId);
+        onFinished && onFinished();
+        return;
+      }
+    }, 1000);
+
+    const subscription = AppState.addEventListener("change", nextAppState => {
+      if (appState === "active" && nextAppState.match(/inactive|background/)) {
+        setLastTimestamp(Date.now());
+      } else if (appState.match(/inactive|background/) && nextAppState === "active") {
+        setUpdateTime(true);
+        const now = Date.now();
+        const timeElapsed = Math.floor((now - lastTimestamp) / 1000);
+        let minElapsed = Math.floor(timeElapsed / 60)
+        let secElapsed = timeElapsed > 60 ? timeElapsed % 60 : timeElapsed
+        let secAux = 0
+        let newMin = 0
+        let newSec = 0
+
+        if (minElapsed > minutesTemp || (minElapsed === minutesTemp && secElapsed > seconds)) {
+          setSeconds(0);
+          setMinutesTemp(0);
           clearInterval(intervalId);
           onFinished && onFinished();
-          return;
+        } else if (minElapsed > 0 && secElapsed > seconds) {
+          secAux = seconds - secElapsed
+          newSec = secAux < 0 ? 60 - (secAux * -1) : secAux
+          newMin = (minutesTemp - minElapsed) - (secAux < 0 ? 1 : 0)
+          setSeconds(newSec);
+          setMinutesTemp(newMin);
+        } else if (minElapsed > 0 && secElapsed > 0) {
+          newSec = seconds - secElapsed
+          newMin = minutesTemp - minElapsed
+          setSeconds(newSec);
+          setMinutesTemp(newMin);
+        } else if (minElapsed > 0 && secElapsed === 0) {
+          newMin = minutesTemp - minElapsed
+          setMinutesTemp(newMin);
+        } else if (secElapsed > seconds) {
+          secAux = seconds - secElapsed
+          newSec = secAux < 0 ? 60 - (secAux * -1) : secAux
+          newMin = minutesTemp - (secAux < 0 ? 1 : 0)
+          setSeconds(newSec);
+          setMinutesTemp(newMin);
+        } else if (secElapsed > 0) {
+          newSec = seconds - secElapsed
+          setSeconds(newSec);
         }
       }
-    }, 1000);
-    return () => clearInterval(intervalId);
-  }, [resetTimer]);
+      setAppState(nextAppState);
+      return
+    });
+
+    return () => {
+      subscription.remove();
+      clearInterval(intervalId);
+    }
+  }, [resetTimer, appState, lastTimestamp]);
+
+  useEffect(() => { }, [])
+
   return (
     <View>
       <Text style={style}>
-        {seconds === 60
-          ? `${minutesTemp < 10 ? `0${minutesTemp - 1}` : minutesTemp - 1}:60`
-          : `${minutesTemp < 10
-            ? `0${minutesTemp - 1 === -1 ? minutesTemp : minutesTemp - 1}`
-            : minutesTemp - 1
-          }:${seconds < 10 ? `0${seconds}` : seconds}`}
+        {`${minutesTemp < 10 ? `0${minutesTemp}` : minutesTemp}:${seconds < 10 ? `0${seconds}` : seconds}`}
       </Text>
     </View>
   );
-};
+};