From 04ce9f2979c3d374a0eb8875daa2140a677214f2 Mon Sep 17 00:00:00 2001 From: Lei Nelissen Date: Thu, 8 Feb 2024 23:27:48 +0100 Subject: [PATCH] fix: timer icon and resetting on cancel --- ios/Podfile.lock | 446 +++++++++--------- src/assets/icons/timer-icon.svg | 5 - src/assets/icons/timer.svg | 3 + .../modals/Player/components/Timer.tsx | 10 +- 4 files changed, 233 insertions(+), 231 deletions(-) delete mode 100644 src/assets/icons/timer-icon.svg create mode 100644 src/assets/icons/timer.svg diff --git a/ios/Podfile.lock b/ios/Podfile.lock index b9e30de7..979f68b2 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -2,14 +2,14 @@ PODS: - boost (1.83.0) - CocoaAsyncSocket (7.6.5) - DoubleConversion (1.1.6) - - FBLazyVector (0.73.3) - - FBReactNativeSpec (0.73.3): + - FBLazyVector (0.73.4) + - FBReactNativeSpec (0.73.4): - RCT-Folly (= 2022.05.16.00) - - RCTRequired (= 0.73.3) - - RCTTypeSafety (= 0.73.3) - - React-Core (= 0.73.3) - - React-jsi (= 0.73.3) - - ReactCommon/turbomodule/core (= 0.73.3) + - RCTRequired (= 0.73.4) + - RCTTypeSafety (= 0.73.4) + - React-Core (= 0.73.4) + - React-jsi (= 0.73.4) + - ReactCommon/turbomodule/core (= 0.73.4) - Flipper (0.201.0): - Flipper-Folly (~> 2.6) - Flipper-Boost-iOSX (1.76.0.1.11) @@ -107,28 +107,28 @@ PODS: - fmt (~> 6.2.1) - glog - libevent - - RCTRequired (0.73.3) - - RCTTypeSafety (0.73.3): - - FBLazyVector (= 0.73.3) - - RCTRequired (= 0.73.3) - - React-Core (= 0.73.3) - - React (0.73.3): - - React-Core (= 0.73.3) - - React-Core/DevSupport (= 0.73.3) - - React-Core/RCTWebSocket (= 0.73.3) - - React-RCTActionSheet (= 0.73.3) - - React-RCTAnimation (= 0.73.3) - - React-RCTBlob (= 0.73.3) - - React-RCTImage (= 0.73.3) - - React-RCTLinking (= 0.73.3) - - React-RCTNetwork (= 0.73.3) - - React-RCTSettings (= 0.73.3) - - React-RCTText (= 0.73.3) - - React-RCTVibration (= 0.73.3) + - RCTRequired (0.73.4) + - RCTTypeSafety (0.73.4): + - FBLazyVector (= 0.73.4) + - RCTRequired (= 0.73.4) + - React-Core (= 0.73.4) + - React (0.73.4): + - React-Core (= 0.73.4) + - React-Core/DevSupport (= 0.73.4) + - React-Core/RCTWebSocket (= 0.73.4) + - React-RCTActionSheet (= 0.73.4) + - React-RCTAnimation (= 0.73.4) + - React-RCTBlob (= 0.73.4) + - React-RCTImage (= 0.73.4) + - React-RCTLinking (= 0.73.4) + - React-RCTNetwork (= 0.73.4) + - React-RCTSettings (= 0.73.4) + - React-RCTText (= 0.73.4) + - React-RCTVibration (= 0.73.4) - react-airplay (1.2.0): - React-Core - - React-callinvoker (0.73.3) - - React-Codegen (0.73.3): + - React-callinvoker (0.73.4) + - React-Codegen (0.73.4): - DoubleConversion - FBReactNativeSpec - glog @@ -143,11 +143,11 @@ PODS: - React-rncore - ReactCommon/turbomodule/bridging - ReactCommon/turbomodule/core - - React-Core (0.73.3): + - React-Core (0.73.4): - glog - hermes-engine - RCT-Folly (= 2022.05.16.00) - - React-Core/Default (= 0.73.3) + - React-Core/Default (= 0.73.4) - React-cxxreact - React-hermes - React-jsi @@ -157,7 +157,7 @@ PODS: - React-utils - SocketRocket (= 0.6.1) - Yoga - - React-Core/CoreModulesHeaders (0.73.3): + - React-Core/CoreModulesHeaders (0.73.4): - glog - hermes-engine - RCT-Folly (= 2022.05.16.00) @@ -171,7 +171,7 @@ PODS: - React-utils - SocketRocket (= 0.6.1) - Yoga - - React-Core/Default (0.73.3): + - React-Core/Default (0.73.4): - glog - hermes-engine - RCT-Folly (= 2022.05.16.00) @@ -184,23 +184,23 @@ PODS: - React-utils - SocketRocket (= 0.6.1) - Yoga - - React-Core/DevSupport (0.73.3): + - React-Core/DevSupport (0.73.4): - glog - hermes-engine - RCT-Folly (= 2022.05.16.00) - - React-Core/Default (= 0.73.3) - - React-Core/RCTWebSocket (= 0.73.3) + - React-Core/Default (= 0.73.4) + - React-Core/RCTWebSocket (= 0.73.4) - React-cxxreact - React-hermes - React-jsi - React-jsiexecutor - - React-jsinspector (= 0.73.3) + - React-jsinspector (= 0.73.4) - React-perflogger - React-runtimescheduler - React-utils - SocketRocket (= 0.6.1) - Yoga - - React-Core/RCTActionSheetHeaders (0.73.3): + - React-Core/RCTActionSheetHeaders (0.73.4): - glog - hermes-engine - RCT-Folly (= 2022.05.16.00) @@ -214,7 +214,7 @@ PODS: - React-utils - SocketRocket (= 0.6.1) - Yoga - - React-Core/RCTAnimationHeaders (0.73.3): + - React-Core/RCTAnimationHeaders (0.73.4): - glog - hermes-engine - RCT-Folly (= 2022.05.16.00) @@ -228,7 +228,7 @@ PODS: - React-utils - SocketRocket (= 0.6.1) - Yoga - - React-Core/RCTBlobHeaders (0.73.3): + - React-Core/RCTBlobHeaders (0.73.4): - glog - hermes-engine - RCT-Folly (= 2022.05.16.00) @@ -242,7 +242,7 @@ PODS: - React-utils - SocketRocket (= 0.6.1) - Yoga - - React-Core/RCTImageHeaders (0.73.3): + - React-Core/RCTImageHeaders (0.73.4): - glog - hermes-engine - RCT-Folly (= 2022.05.16.00) @@ -256,7 +256,7 @@ PODS: - React-utils - SocketRocket (= 0.6.1) - Yoga - - React-Core/RCTLinkingHeaders (0.73.3): + - React-Core/RCTLinkingHeaders (0.73.4): - glog - hermes-engine - RCT-Folly (= 2022.05.16.00) @@ -270,7 +270,7 @@ PODS: - React-utils - SocketRocket (= 0.6.1) - Yoga - - React-Core/RCTNetworkHeaders (0.73.3): + - React-Core/RCTNetworkHeaders (0.73.4): - glog - hermes-engine - RCT-Folly (= 2022.05.16.00) @@ -284,7 +284,7 @@ PODS: - React-utils - SocketRocket (= 0.6.1) - Yoga - - React-Core/RCTSettingsHeaders (0.73.3): + - React-Core/RCTSettingsHeaders (0.73.4): - glog - hermes-engine - RCT-Folly (= 2022.05.16.00) @@ -298,7 +298,7 @@ PODS: - React-utils - SocketRocket (= 0.6.1) - Yoga - - React-Core/RCTTextHeaders (0.73.3): + - React-Core/RCTTextHeaders (0.73.4): - glog - hermes-engine - RCT-Folly (= 2022.05.16.00) @@ -312,7 +312,7 @@ PODS: - React-utils - SocketRocket (= 0.6.1) - Yoga - - React-Core/RCTVibrationHeaders (0.73.3): + - React-Core/RCTVibrationHeaders (0.73.4): - glog - hermes-engine - RCT-Folly (= 2022.05.16.00) @@ -326,11 +326,11 @@ PODS: - React-utils - SocketRocket (= 0.6.1) - Yoga - - React-Core/RCTWebSocket (0.73.3): + - React-Core/RCTWebSocket (0.73.4): - glog - hermes-engine - RCT-Folly (= 2022.05.16.00) - - React-Core/Default (= 0.73.3) + - React-Core/Default (= 0.73.4) - React-cxxreact - React-hermes - React-jsi @@ -340,33 +340,33 @@ PODS: - React-utils - SocketRocket (= 0.6.1) - Yoga - - React-CoreModules (0.73.3): + - React-CoreModules (0.73.4): - RCT-Folly (= 2022.05.16.00) - - RCTTypeSafety (= 0.73.3) + - RCTTypeSafety (= 0.73.4) - React-Codegen - - React-Core/CoreModulesHeaders (= 0.73.3) - - React-jsi (= 0.73.3) + - React-Core/CoreModulesHeaders (= 0.73.4) + - React-jsi (= 0.73.4) - React-NativeModulesApple - React-RCTBlob - - React-RCTImage (= 0.73.3) + - React-RCTImage (= 0.73.4) - ReactCommon - SocketRocket (= 0.6.1) - - React-cxxreact (0.73.3): + - React-cxxreact (0.73.4): - boost (= 1.83.0) - DoubleConversion - fmt (~> 6.2.1) - glog - hermes-engine - RCT-Folly (= 2022.05.16.00) - - React-callinvoker (= 0.73.3) - - React-debug (= 0.73.3) - - React-jsi (= 0.73.3) - - React-jsinspector (= 0.73.3) - - React-logger (= 0.73.3) - - React-perflogger (= 0.73.3) - - React-runtimeexecutor (= 0.73.3) - - React-debug (0.73.3) - - React-Fabric (0.73.3): + - React-callinvoker (= 0.73.4) + - React-debug (= 0.73.4) + - React-jsi (= 0.73.4) + - React-jsinspector (= 0.73.4) + - React-logger (= 0.73.4) + - React-perflogger (= 0.73.4) + - React-runtimeexecutor (= 0.73.4) + - React-debug (0.73.4) + - React-Fabric (0.73.4): - DoubleConversion - fmt (~> 6.2.1) - glog @@ -377,20 +377,20 @@ PODS: - React-Core - React-cxxreact - React-debug - - React-Fabric/animations (= 0.73.3) - - React-Fabric/attributedstring (= 0.73.3) - - React-Fabric/componentregistry (= 0.73.3) - - React-Fabric/componentregistrynative (= 0.73.3) - - React-Fabric/components (= 0.73.3) - - React-Fabric/core (= 0.73.3) - - React-Fabric/imagemanager (= 0.73.3) - - React-Fabric/leakchecker (= 0.73.3) - - React-Fabric/mounting (= 0.73.3) - - React-Fabric/scheduler (= 0.73.3) - - React-Fabric/telemetry (= 0.73.3) - - React-Fabric/templateprocessor (= 0.73.3) - - React-Fabric/textlayoutmanager (= 0.73.3) - - React-Fabric/uimanager (= 0.73.3) + - React-Fabric/animations (= 0.73.4) + - React-Fabric/attributedstring (= 0.73.4) + - React-Fabric/componentregistry (= 0.73.4) + - React-Fabric/componentregistrynative (= 0.73.4) + - React-Fabric/components (= 0.73.4) + - React-Fabric/core (= 0.73.4) + - React-Fabric/imagemanager (= 0.73.4) + - React-Fabric/leakchecker (= 0.73.4) + - React-Fabric/mounting (= 0.73.4) + - React-Fabric/scheduler (= 0.73.4) + - React-Fabric/telemetry (= 0.73.4) + - React-Fabric/templateprocessor (= 0.73.4) + - React-Fabric/textlayoutmanager (= 0.73.4) + - React-Fabric/uimanager (= 0.73.4) - React-graphics - React-jsi - React-jsiexecutor @@ -399,7 +399,7 @@ PODS: - React-runtimescheduler - React-utils - ReactCommon/turbomodule/core - - React-Fabric/animations (0.73.3): + - React-Fabric/animations (0.73.4): - DoubleConversion - fmt (~> 6.2.1) - glog @@ -418,7 +418,7 @@ PODS: - React-runtimescheduler - React-utils - ReactCommon/turbomodule/core - - React-Fabric/attributedstring (0.73.3): + - React-Fabric/attributedstring (0.73.4): - DoubleConversion - fmt (~> 6.2.1) - glog @@ -437,7 +437,7 @@ PODS: - React-runtimescheduler - React-utils - ReactCommon/turbomodule/core - - React-Fabric/componentregistry (0.73.3): + - React-Fabric/componentregistry (0.73.4): - DoubleConversion - fmt (~> 6.2.1) - glog @@ -456,7 +456,7 @@ PODS: - React-runtimescheduler - React-utils - ReactCommon/turbomodule/core - - React-Fabric/componentregistrynative (0.73.3): + - React-Fabric/componentregistrynative (0.73.4): - DoubleConversion - fmt (~> 6.2.1) - glog @@ -475,7 +475,7 @@ PODS: - React-runtimescheduler - React-utils - ReactCommon/turbomodule/core - - React-Fabric/components (0.73.3): + - React-Fabric/components (0.73.4): - DoubleConversion - fmt (~> 6.2.1) - glog @@ -486,17 +486,17 @@ PODS: - React-Core - React-cxxreact - React-debug - - React-Fabric/components/inputaccessory (= 0.73.3) - - React-Fabric/components/legacyviewmanagerinterop (= 0.73.3) - - React-Fabric/components/modal (= 0.73.3) - - React-Fabric/components/rncore (= 0.73.3) - - React-Fabric/components/root (= 0.73.3) - - React-Fabric/components/safeareaview (= 0.73.3) - - React-Fabric/components/scrollview (= 0.73.3) - - React-Fabric/components/text (= 0.73.3) - - React-Fabric/components/textinput (= 0.73.3) - - React-Fabric/components/unimplementedview (= 0.73.3) - - React-Fabric/components/view (= 0.73.3) + - React-Fabric/components/inputaccessory (= 0.73.4) + - React-Fabric/components/legacyviewmanagerinterop (= 0.73.4) + - React-Fabric/components/modal (= 0.73.4) + - React-Fabric/components/rncore (= 0.73.4) + - React-Fabric/components/root (= 0.73.4) + - React-Fabric/components/safeareaview (= 0.73.4) + - React-Fabric/components/scrollview (= 0.73.4) + - React-Fabric/components/text (= 0.73.4) + - React-Fabric/components/textinput (= 0.73.4) + - React-Fabric/components/unimplementedview (= 0.73.4) + - React-Fabric/components/view (= 0.73.4) - React-graphics - React-jsi - React-jsiexecutor @@ -505,7 +505,7 @@ PODS: - React-runtimescheduler - React-utils - ReactCommon/turbomodule/core - - React-Fabric/components/inputaccessory (0.73.3): + - React-Fabric/components/inputaccessory (0.73.4): - DoubleConversion - fmt (~> 6.2.1) - glog @@ -524,7 +524,7 @@ PODS: - React-runtimescheduler - React-utils - ReactCommon/turbomodule/core - - React-Fabric/components/legacyviewmanagerinterop (0.73.3): + - React-Fabric/components/legacyviewmanagerinterop (0.73.4): - DoubleConversion - fmt (~> 6.2.1) - glog @@ -543,7 +543,7 @@ PODS: - React-runtimescheduler - React-utils - ReactCommon/turbomodule/core - - React-Fabric/components/modal (0.73.3): + - React-Fabric/components/modal (0.73.4): - DoubleConversion - fmt (~> 6.2.1) - glog @@ -562,7 +562,7 @@ PODS: - React-runtimescheduler - React-utils - ReactCommon/turbomodule/core - - React-Fabric/components/rncore (0.73.3): + - React-Fabric/components/rncore (0.73.4): - DoubleConversion - fmt (~> 6.2.1) - glog @@ -581,7 +581,7 @@ PODS: - React-runtimescheduler - React-utils - ReactCommon/turbomodule/core - - React-Fabric/components/root (0.73.3): + - React-Fabric/components/root (0.73.4): - DoubleConversion - fmt (~> 6.2.1) - glog @@ -600,7 +600,7 @@ PODS: - React-runtimescheduler - React-utils - ReactCommon/turbomodule/core - - React-Fabric/components/safeareaview (0.73.3): + - React-Fabric/components/safeareaview (0.73.4): - DoubleConversion - fmt (~> 6.2.1) - glog @@ -619,7 +619,7 @@ PODS: - React-runtimescheduler - React-utils - ReactCommon/turbomodule/core - - React-Fabric/components/scrollview (0.73.3): + - React-Fabric/components/scrollview (0.73.4): - DoubleConversion - fmt (~> 6.2.1) - glog @@ -638,7 +638,7 @@ PODS: - React-runtimescheduler - React-utils - ReactCommon/turbomodule/core - - React-Fabric/components/text (0.73.3): + - React-Fabric/components/text (0.73.4): - DoubleConversion - fmt (~> 6.2.1) - glog @@ -657,7 +657,7 @@ PODS: - React-runtimescheduler - React-utils - ReactCommon/turbomodule/core - - React-Fabric/components/textinput (0.73.3): + - React-Fabric/components/textinput (0.73.4): - DoubleConversion - fmt (~> 6.2.1) - glog @@ -676,7 +676,7 @@ PODS: - React-runtimescheduler - React-utils - ReactCommon/turbomodule/core - - React-Fabric/components/unimplementedview (0.73.3): + - React-Fabric/components/unimplementedview (0.73.4): - DoubleConversion - fmt (~> 6.2.1) - glog @@ -695,7 +695,7 @@ PODS: - React-runtimescheduler - React-utils - ReactCommon/turbomodule/core - - React-Fabric/components/view (0.73.3): + - React-Fabric/components/view (0.73.4): - DoubleConversion - fmt (~> 6.2.1) - glog @@ -715,7 +715,7 @@ PODS: - React-utils - ReactCommon/turbomodule/core - Yoga - - React-Fabric/core (0.73.3): + - React-Fabric/core (0.73.4): - DoubleConversion - fmt (~> 6.2.1) - glog @@ -734,7 +734,7 @@ PODS: - React-runtimescheduler - React-utils - ReactCommon/turbomodule/core - - React-Fabric/imagemanager (0.73.3): + - React-Fabric/imagemanager (0.73.4): - DoubleConversion - fmt (~> 6.2.1) - glog @@ -753,7 +753,7 @@ PODS: - React-runtimescheduler - React-utils - ReactCommon/turbomodule/core - - React-Fabric/leakchecker (0.73.3): + - React-Fabric/leakchecker (0.73.4): - DoubleConversion - fmt (~> 6.2.1) - glog @@ -772,7 +772,7 @@ PODS: - React-runtimescheduler - React-utils - ReactCommon/turbomodule/core - - React-Fabric/mounting (0.73.3): + - React-Fabric/mounting (0.73.4): - DoubleConversion - fmt (~> 6.2.1) - glog @@ -791,7 +791,7 @@ PODS: - React-runtimescheduler - React-utils - ReactCommon/turbomodule/core - - React-Fabric/scheduler (0.73.3): + - React-Fabric/scheduler (0.73.4): - DoubleConversion - fmt (~> 6.2.1) - glog @@ -810,7 +810,7 @@ PODS: - React-runtimescheduler - React-utils - ReactCommon/turbomodule/core - - React-Fabric/telemetry (0.73.3): + - React-Fabric/telemetry (0.73.4): - DoubleConversion - fmt (~> 6.2.1) - glog @@ -829,7 +829,7 @@ PODS: - React-runtimescheduler - React-utils - ReactCommon/turbomodule/core - - React-Fabric/templateprocessor (0.73.3): + - React-Fabric/templateprocessor (0.73.4): - DoubleConversion - fmt (~> 6.2.1) - glog @@ -848,7 +848,7 @@ PODS: - React-runtimescheduler - React-utils - ReactCommon/turbomodule/core - - React-Fabric/textlayoutmanager (0.73.3): + - React-Fabric/textlayoutmanager (0.73.4): - DoubleConversion - fmt (~> 6.2.1) - glog @@ -868,7 +868,7 @@ PODS: - React-runtimescheduler - React-utils - ReactCommon/turbomodule/core - - React-Fabric/uimanager (0.73.3): + - React-Fabric/uimanager (0.73.4): - DoubleConversion - fmt (~> 6.2.1) - glog @@ -887,42 +887,42 @@ PODS: - React-runtimescheduler - React-utils - ReactCommon/turbomodule/core - - React-FabricImage (0.73.3): + - React-FabricImage (0.73.4): - DoubleConversion - fmt (~> 6.2.1) - glog - hermes-engine - RCT-Folly/Fabric (= 2022.05.16.00) - - RCTRequired (= 0.73.3) - - RCTTypeSafety (= 0.73.3) + - RCTRequired (= 0.73.4) + - RCTTypeSafety (= 0.73.4) - React-Fabric - React-graphics - React-ImageManager - React-jsi - - React-jsiexecutor (= 0.73.3) + - React-jsiexecutor (= 0.73.4) - React-logger - React-rendererdebug - React-utils - ReactCommon - Yoga - - React-graphics (0.73.3): + - React-graphics (0.73.4): - glog - RCT-Folly/Fabric (= 2022.05.16.00) - - React-Core/Default (= 0.73.3) + - React-Core/Default (= 0.73.4) - React-utils - - React-hermes (0.73.3): + - React-hermes (0.73.4): - DoubleConversion - fmt (~> 6.2.1) - glog - hermes-engine - RCT-Folly (= 2022.05.16.00) - RCT-Folly/Futures (= 2022.05.16.00) - - React-cxxreact (= 0.73.3) + - React-cxxreact (= 0.73.4) - React-jsi - - React-jsiexecutor (= 0.73.3) - - React-jsinspector (= 0.73.3) - - React-perflogger (= 0.73.3) - - React-ImageManager (0.73.3): + - React-jsiexecutor (= 0.73.4) + - React-jsinspector (= 0.73.4) + - React-perflogger (= 0.73.4) + - React-ImageManager (0.73.4): - glog - RCT-Folly/Fabric - React-Core/Default @@ -931,31 +931,31 @@ PODS: - React-graphics - React-rendererdebug - React-utils - - React-jserrorhandler (0.73.3): + - React-jserrorhandler (0.73.4): - RCT-Folly/Fabric (= 2022.05.16.00) - React-debug - React-jsi - React-Mapbuffer - - React-jsi (0.73.3): + - React-jsi (0.73.4): - boost (= 1.83.0) - DoubleConversion - fmt (~> 6.2.1) - glog - hermes-engine - RCT-Folly (= 2022.05.16.00) - - React-jsiexecutor (0.73.3): + - React-jsiexecutor (0.73.4): - DoubleConversion - fmt (~> 6.2.1) - glog - hermes-engine - RCT-Folly (= 2022.05.16.00) - - React-cxxreact (= 0.73.3) - - React-jsi (= 0.73.3) - - React-perflogger (= 0.73.3) - - React-jsinspector (0.73.3) - - React-logger (0.73.3): + - React-cxxreact (= 0.73.4) + - React-jsi (= 0.73.4) + - React-perflogger (= 0.73.4) + - React-jsinspector (0.73.4) + - React-logger (0.73.4): - glog - - React-Mapbuffer (0.73.3): + - React-Mapbuffer (0.73.4): - glog - React-debug - react-native-blur (4.4.0): @@ -979,8 +979,8 @@ PODS: - glog - RCT-Folly (= 2022.05.16.00) - React-Core - - React-nativeconfig (0.73.3) - - React-NativeModulesApple (0.73.3): + - React-nativeconfig (0.73.4) + - React-NativeModulesApple (0.73.4): - glog - hermes-engine - React-callinvoker @@ -990,10 +990,10 @@ PODS: - React-runtimeexecutor - ReactCommon/turbomodule/bridging - ReactCommon/turbomodule/core - - React-perflogger (0.73.3) - - React-RCTActionSheet (0.73.3): - - React-Core/RCTActionSheetHeaders (= 0.73.3) - - React-RCTAnimation (0.73.3): + - React-perflogger (0.73.4) + - React-RCTActionSheet (0.73.4): + - React-Core/RCTActionSheetHeaders (= 0.73.4) + - React-RCTAnimation (0.73.4): - RCT-Folly (= 2022.05.16.00) - RCTTypeSafety - React-Codegen @@ -1001,7 +1001,7 @@ PODS: - React-jsi - React-NativeModulesApple - ReactCommon - - React-RCTAppDelegate (0.73.3): + - React-RCTAppDelegate (0.73.4): - RCT-Folly - RCTRequired - RCTTypeSafety @@ -1015,7 +1015,7 @@ PODS: - React-RCTNetwork - React-runtimescheduler - ReactCommon - - React-RCTBlob (0.73.3): + - React-RCTBlob (0.73.4): - hermes-engine - RCT-Folly (= 2022.05.16.00) - React-Codegen @@ -1025,7 +1025,7 @@ PODS: - React-NativeModulesApple - React-RCTNetwork - ReactCommon - - React-RCTFabric (0.73.3): + - React-RCTFabric (0.73.4): - glog - hermes-engine - RCT-Folly/Fabric (= 2022.05.16.00) @@ -1043,7 +1043,7 @@ PODS: - React-runtimescheduler - React-utils - Yoga - - React-RCTImage (0.73.3): + - React-RCTImage (0.73.4): - RCT-Folly (= 2022.05.16.00) - RCTTypeSafety - React-Codegen @@ -1052,14 +1052,14 @@ PODS: - React-NativeModulesApple - React-RCTNetwork - ReactCommon - - React-RCTLinking (0.73.3): + - React-RCTLinking (0.73.4): - React-Codegen - - React-Core/RCTLinkingHeaders (= 0.73.3) - - React-jsi (= 0.73.3) + - React-Core/RCTLinkingHeaders (= 0.73.4) + - React-jsi (= 0.73.4) - React-NativeModulesApple - ReactCommon - - ReactCommon/turbomodule/core (= 0.73.3) - - React-RCTNetwork (0.73.3): + - ReactCommon/turbomodule/core (= 0.73.4) + - React-RCTNetwork (0.73.4): - RCT-Folly (= 2022.05.16.00) - RCTTypeSafety - React-Codegen @@ -1067,7 +1067,7 @@ PODS: - React-jsi - React-NativeModulesApple - ReactCommon - - React-RCTSettings (0.73.3): + - React-RCTSettings (0.73.4): - RCT-Folly (= 2022.05.16.00) - RCTTypeSafety - React-Codegen @@ -1075,25 +1075,25 @@ PODS: - React-jsi - React-NativeModulesApple - ReactCommon - - React-RCTText (0.73.3): - - React-Core/RCTTextHeaders (= 0.73.3) + - React-RCTText (0.73.4): + - React-Core/RCTTextHeaders (= 0.73.4) - Yoga - - React-RCTVibration (0.73.3): + - React-RCTVibration (0.73.4): - RCT-Folly (= 2022.05.16.00) - React-Codegen - React-Core/RCTVibrationHeaders - React-jsi - React-NativeModulesApple - ReactCommon - - React-rendererdebug (0.73.3): + - React-rendererdebug (0.73.4): - DoubleConversion - fmt (~> 6.2.1) - RCT-Folly (= 2022.05.16.00) - React-debug - - React-rncore (0.73.3) - - React-runtimeexecutor (0.73.3): - - React-jsi (= 0.73.3) - - React-runtimescheduler (0.73.3): + - React-rncore (0.73.4) + - React-runtimeexecutor (0.73.4): + - React-jsi (= 0.73.4) + - React-runtimescheduler (0.73.4): - glog - hermes-engine - RCT-Folly (= 2022.05.16.00) @@ -1104,48 +1104,48 @@ PODS: - React-rendererdebug - React-runtimeexecutor - React-utils - - React-utils (0.73.3): + - React-utils (0.73.4): - glog - RCT-Folly (= 2022.05.16.00) - React-debug - - ReactCommon (0.73.3): - - React-logger (= 0.73.3) - - ReactCommon/turbomodule (= 0.73.3) - - ReactCommon/turbomodule (0.73.3): + - ReactCommon (0.73.4): + - React-logger (= 0.73.4) + - ReactCommon/turbomodule (= 0.73.4) + - ReactCommon/turbomodule (0.73.4): - DoubleConversion - fmt (~> 6.2.1) - glog - hermes-engine - RCT-Folly (= 2022.05.16.00) - - React-callinvoker (= 0.73.3) - - React-cxxreact (= 0.73.3) - - React-jsi (= 0.73.3) - - React-logger (= 0.73.3) - - React-perflogger (= 0.73.3) - - ReactCommon/turbomodule/bridging (= 0.73.3) - - ReactCommon/turbomodule/core (= 0.73.3) - - ReactCommon/turbomodule/bridging (0.73.3): + - React-callinvoker (= 0.73.4) + - React-cxxreact (= 0.73.4) + - React-jsi (= 0.73.4) + - React-logger (= 0.73.4) + - React-perflogger (= 0.73.4) + - ReactCommon/turbomodule/bridging (= 0.73.4) + - ReactCommon/turbomodule/core (= 0.73.4) + - ReactCommon/turbomodule/bridging (0.73.4): - DoubleConversion - fmt (~> 6.2.1) - glog - hermes-engine - RCT-Folly (= 2022.05.16.00) - - React-callinvoker (= 0.73.3) - - React-cxxreact (= 0.73.3) - - React-jsi (= 0.73.3) - - React-logger (= 0.73.3) - - React-perflogger (= 0.73.3) - - ReactCommon/turbomodule/core (0.73.3): + - React-callinvoker (= 0.73.4) + - React-cxxreact (= 0.73.4) + - React-jsi (= 0.73.4) + - React-logger (= 0.73.4) + - React-perflogger (= 0.73.4) + - ReactCommon/turbomodule/core (0.73.4): - DoubleConversion - fmt (~> 6.2.1) - glog - hermes-engine - RCT-Folly (= 2022.05.16.00) - - React-callinvoker (= 0.73.3) - - React-cxxreact (= 0.73.3) - - React-jsi (= 0.73.3) - - React-logger (= 0.73.3) - - React-perflogger (= 0.73.3) + - React-callinvoker (= 0.73.4) + - React-cxxreact (= 0.73.4) + - React-jsi (= 0.73.4) + - React-logger (= 0.73.4) + - React-perflogger (= 0.73.4) - RNCAsyncStorage (1.21.0): - React-Core - RNDateTimePicker (7.6.2): @@ -1443,8 +1443,8 @@ SPEC CHECKSUMS: boost: d3f49c53809116a5d38da093a8aa78bf551aed09 CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99 DoubleConversion: fea03f2699887d960129cc54bba7e52542b6f953 - FBLazyVector: 70590b4f9e8ae9b0ce076efacea3abd7bc585ace - FBReactNativeSpec: e47ea8c8f044c25e41a4fa5e8b7ff3923d3e0a94 + FBLazyVector: 84f6edbe225f38aebd9deaf1540a4160b1f087d7 + FBReactNativeSpec: d0086a479be91c44ce4687a962956a352d2dc697 Flipper: c7a0093234c4bdd456e363f2f19b2e4b27652d44 Flipper-Boost-iOSX: fd1e2b8cbef7e662a122412d7ac5f5bea715403c Flipper-DoubleConversion: 2dc99b02f658daf147069aad9dbd29d8feb06d30 @@ -1460,53 +1460,53 @@ SPEC CHECKSUMS: libwebp: 1786c9f4ff8a279e4dac1e8f385004d5fc253009 OpenSSL-Universal: ebc357f1e6bc71fa463ccb2fe676756aff50e88c RCT-Folly: 7169b2b1c44399c76a47b5deaaba715eeeb476c0 - RCTRequired: 9b898847f76977a6dfed2a08f4c5ed37add75ec0 - RCTTypeSafety: 0debdc4ba38c8138016d8d8ada4bdf9ec1b8aa82 - React: f8afb04431634ac7e9b876dc96d30af9871f5946 + RCTRequired: ab7f915c15569f04a49669e573e6e319a53f9faa + RCTTypeSafety: 63b97ced7b766865057e7154db0e81ce4ee6cf1e + React: 1c87497e50fa40ba9c54e5ea5e53483a0f8eecc0 react-airplay: 8197767f12cae11a7623b1507d29a89482a720ad - React-callinvoker: 5ea86c3f93326867aa5114989d229db54d4759d0 - React-Codegen: f8f3172b716f793b334e6603b3b33207c0e813c7 - React-Core: bbac074eba495788a01d1e5455b132872bf86843 - React-CoreModules: 92fee6d8f4095e151b9678e44fcf0dc8eabeae37 - React-cxxreact: e856e0370bf52aea71acce10007ad9ba6a63b66c - React-debug: 23ea1f904cd98ae3b04b2b4982584641d3c7bcb5 - React-Fabric: f692e74b325a408f328d337615a22539315d8a90 - React-FabricImage: 969993a105d5e2a9bfab6945b78b88a2b0d70504 - React-graphics: f95976953fc89d60b1022a4ea3d8281985993fe7 - React-hermes: ac421eebea18bab58a57b70c590b7c11edaac00b - React-ImageManager: d67a26f14b62ff5a0c86c36d5d580940f4f07771 - React-jserrorhandler: 7087c3b3d9691ba72798adf600a4157beeb16fd7 - React-jsi: 57498df51dfb8a37a996f470a457d8797e931eaa - React-jsiexecutor: d83a7d7aea2ffc60dbda0f3d523578a76820f0e1 - React-jsinspector: 6fad0fe14882fb6b1c32e5cc8a4bd3d33a8b6790 - React-logger: cb0dd15ac67b00e7b771ef15203edcb29d4a3f8e - React-Mapbuffer: d59258be3b0d2280c6ba8964ab6e36ec69211871 + React-callinvoker: e3a52a9a93e3eb004d7282c26a4fb27003273fe6 + React-Codegen: 50c0f8f073e71b929b057b68bf31be604f1dccc8 + React-Core: d0ecde72894b792cb8922efaa0990199cbe85169 + React-CoreModules: 2ff1684dd517f0c441495d90a704d499f05e9d0a + React-cxxreact: d9be2fac926741052395da0a6d0bab8d71e2f297 + React-debug: 4678e73a37cb501d784e99ff0f219b4940362a3b + React-Fabric: 460ee9d4b8b9de3382504a711430bfead1d5be1e + React-FabricImage: d0a0631bc8ad9143f42bfccf9d3d533a144cc3d6 + React-graphics: f0d5040263a9649e2a70ebe27b3120c49411afef + React-hermes: b9ac2f7b0c1eeb206eb883583cab7a973d570a6e + React-ImageManager: 6c4bf9d5ed363ead7b5aaf820a3feab221b7063e + React-jserrorhandler: 6e7a7e187583e14dc7a0053a2bdd66c252ea3b21 + React-jsi: 380cd24dd81a705dd042c18989fb10b07182210c + React-jsiexecutor: 8ed7a18b9f119440efdcd424c8257dc7e18067e2 + React-jsinspector: 9ac353eccf6ab54d1e0a33862ba91221d1e88460 + React-logger: 0a57b68dd2aec7ff738195f081f0520724b35dab + React-Mapbuffer: 63913773ed7f96b814a2521e13e6d010282096ad react-native-blur: 27113acc008facbc8accae5fb3a78b8424f64cfd react-native-netinfo: 8a7fd3f7130ef4ad2fb4276d5c9f8d3f28d2df3d react-native-safe-area-context: b97eb6f9e3b7f437806c2ce5983f479f8eb5de4b react-native-skia: 88bc2430278842f46935d77888059bc1a2f564b6 react-native-track-player: 97d76dbbd35f27cc709e5f04540615e54264b3f9 react-native-webview: d35380fcc2e1385cebc5b90fb96eebcdd1f2548e - React-nativeconfig: 4d3076dc3dc498ec49819e4e4225b55d3507f902 - React-NativeModulesApple: 46f14baf36010b22ffd84fd89d5586e4148edfb3 - React-perflogger: 27ccacf853ba725524ef2b4e444f14e34d0837b0 - React-RCTActionSheet: 77dd6a2a5cfab9e85b7f1add0f7e2e9cd697d936 - React-RCTAnimation: 977a25a4e8007ecc90e556abcceb1b25602eea7c - React-RCTAppDelegate: 252a478047dbc9d0ac0dcda7440b4d3fbb6184a4 - React-RCTBlob: 1e18ab09f57cf3bd2b9681cbeedfca866d971f50 - React-RCTFabric: f09af5b9aac819d8c362ef3030b2d16be426c176 - React-RCTImage: b1eac9526111cf7e37c304f94e81b76a5ae6a984 - React-RCTLinking: d7f7dc665af6442ff38e18e34308da7865347bb1 - React-RCTNetwork: c2c1df3a3c838e9547259e3638f6b290aebb3b72 - React-RCTSettings: f3074b14047a57fa95499c28fb89028a894d3c18 - React-RCTText: 9d48b2bbce5e1ed9c4d9514414dc6d99731d1b0a - React-RCTVibration: 394ea84082b08b5b3c211dc2bc9c0c4c163e7f23 - React-rendererdebug: 3445e5d7d8fa3c66974d779b6a77b41186224b0f - React-rncore: bfb1b25c3e6ce9535708a7ac109c91fed3c8085b - React-runtimeexecutor: 7e71a40def8262ef7d82a1145d873ea61b1a27b5 - React-runtimescheduler: aa382ce525689b88459e1181b3649220f175dc31 - React-utils: b22b4a51aa578b3aac1e7c19501c0b9ba358ed79 - ReactCommon: e708b8be8cb317b83e31c6ccfeda8bf6c0d1a2b3 + React-nativeconfig: d7af5bae6da70fa15ce44f045621cf99ed24087c + React-NativeModulesApple: 0123905d5699853ac68519607555a9a4f5c7b3ac + React-perflogger: 8a1e1af5733004bdd91258dcefbde21e0d1faccd + React-RCTActionSheet: 64bbff3a3963664c2d0146f870fe8e0264aee4c4 + React-RCTAnimation: b698168a7269265a4694727196484342d695f0c1 + React-RCTAppDelegate: dcd8e955116eb1d1908dfaf08b4c970812e6a1e6 + React-RCTBlob: 47f8c3b2b4b7fa2c5f19c43f0b7f77f57fb9d953 + React-RCTFabric: 6067a32d683d0c2b84d444548bc15a263c64abed + React-RCTImage: ac0e77a44c290b20db783649b2b9cddc93e3eb99 + React-RCTLinking: e626fd2900913fe5d25922ea1be394b7aafa09c9 + React-RCTNetwork: d3114bce3977dafe8bd06421b29812f5a8527ba0 + React-RCTSettings: a53511f90d8df637a1a11ac729179a4d2f734481 + React-RCTText: f0176f5f5952f9a4a2c7354f5ae71f7c420aaf34 + React-RCTVibration: 8160223c6eda5b187079fec204f80eca8b8f3177 + React-rendererdebug: ed286b4da8648c27d6ed3ae1410d4b21ba890d5a + React-rncore: 43f133b89ac10c4b6ab43702a541dee1c292a3bf + React-runtimeexecutor: e6ab6bb083dbdbdd489cff426ed0bce0652e6edf + React-runtimescheduler: ed48e5faac6751e66ee1261c4bd01643b436f112 + React-utils: 6e5ad394416482ae21831050928ae27348f83487 + ReactCommon: 840a955d37b7f3358554d819446bffcf624b2522 RNCAsyncStorage: 618d03a5f52fbccb3d7010076bc54712844c18ef RNDateTimePicker: fc2e4f2795877d45e84d85659bebe627eba5c931 RNFastImage: 5c9c9fed9c076e521b3f509fe79e790418a544e8 @@ -1523,7 +1523,7 @@ SPEC CHECKSUMS: SentryPrivate: 839b1e58addf58624087a80b2628e543193fa8ef SocketRocket: f32cd54efbe0f095c4d7594881e52619cfe80b17 SwiftAudioEx: 6f511018b7a0fdfd14ed1bb4081f953588245cc0 - Yoga: ff0382b894475dba0b4d2a5fda860bfee5a9afad + Yoga: 1b901a6d6eeba4e8a2e8f308f708691cdb5db312 PODFILE CHECKSUM: 0061941757351ef20fb9ad4bc98e51b1212f87d3 diff --git a/src/assets/icons/timer-icon.svg b/src/assets/icons/timer-icon.svg deleted file mode 100644 index 0d03834a..00000000 --- a/src/assets/icons/timer-icon.svg +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/src/assets/icons/timer.svg b/src/assets/icons/timer.svg new file mode 100644 index 00000000..2b58774f --- /dev/null +++ b/src/assets/icons/timer.svg @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/src/screens/modals/Player/components/Timer.tsx b/src/screens/modals/Player/components/Timer.tsx index 01b3b391..230b81bc 100644 --- a/src/screens/modals/Player/components/Timer.tsx +++ b/src/screens/modals/Player/components/Timer.tsx @@ -4,7 +4,7 @@ import styled from 'styled-components/native'; import { THEME_COLOR } from '@/CONSTANTS'; import { useDispatch } from 'react-redux'; import { useTypedSelector } from '@/store'; -import TimerIcon from '@/assets/icons/timer-icon.svg'; +import TimerIcon from '@/assets/icons/timer.svg'; import { setTimerDate } from '@/store/sleep-timer'; import ticksToDuration from '@/utility/ticksToDuration'; import useDefaultStyles from '@/components/Colors'; @@ -66,7 +66,8 @@ export default function Timer() { // Close the picker when it is canceled const handleCancelDatePicker = useCallback(() => { setShowPicker(false); - }, []); + dispatch(setTimerDate(null)); + }, [dispatch]); // Show it when it should be opened const showDatePicker = useCallback(() => { @@ -110,7 +111,9 @@ export default function Timer() { fill={showPicker || date ? THEME_COLOR : defaultStyles.textHalfOpacity.color - } + } + width={16} + height={16} />