diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index b26ece873..dc6f0b888 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -26,8 +26,8 @@ + + + + @@ -92,30 +96,6 @@ - - - - - - - - - - - - - - diff --git a/android/app/src/main/ic_launcher_black-playstore.png b/android/app/src/main/ic_launcher_black-playstore.png new file mode 100644 index 000000000..ea65b684e Binary files /dev/null and b/android/app/src/main/ic_launcher_black-playstore.png differ diff --git a/android/app/src/main/ic_launcher-playstore.png b/android/app/src/main/ic_launcher_orange-playstore.png similarity index 100% rename from android/app/src/main/ic_launcher-playstore.png rename to android/app/src/main/ic_launcher_orange-playstore.png diff --git a/android/app/src/main/res/drawable/ic_launcher_calculator_monochrome.xml b/android/app/src/main/res/drawable/ic_launcher_calculator_monochrome.xml deleted file mode 100644 index 7462da444..000000000 --- a/android/app/src/main/res/drawable/ic_launcher_calculator_monochrome.xml +++ /dev/null @@ -1,41 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_black.xml b/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_black.xml new file mode 100644 index 000000000..226dc8bb9 --- /dev/null +++ b/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_black.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_black_round.xml b/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_black_round.xml new file mode 100644 index 000000000..226dc8bb9 --- /dev/null +++ b/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_black_round.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_calculator.xml b/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_calculator.xml deleted file mode 100644 index c9f4c6fd5..000000000 --- a/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_calculator.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_calculator_round.xml b/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_calculator_round.xml deleted file mode 100644 index c9f4c6fd5..000000000 --- a/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_calculator_round.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_default.xml b/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_orange.xml similarity index 100% rename from android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_default.xml rename to android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_orange.xml diff --git a/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_default_round.xml b/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_orange_round.xml similarity index 100% rename from android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_default_round.xml rename to android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_orange_round.xml diff --git a/android/app/src/main/res/mipmap-hdpi/ic_launcher_black.webp b/android/app/src/main/res/mipmap-hdpi/ic_launcher_black.webp new file mode 100644 index 000000000..1db101b7b Binary files /dev/null and b/android/app/src/main/res/mipmap-hdpi/ic_launcher_black.webp differ diff --git a/android/app/src/main/res/mipmap-hdpi/ic_launcher_black_round.webp b/android/app/src/main/res/mipmap-hdpi/ic_launcher_black_round.webp new file mode 100644 index 000000000..1db101b7b Binary files /dev/null and b/android/app/src/main/res/mipmap-hdpi/ic_launcher_black_round.webp differ diff --git a/android/app/src/main/res/mipmap-hdpi/ic_launcher_calculator.webp b/android/app/src/main/res/mipmap-hdpi/ic_launcher_calculator.webp deleted file mode 100644 index ea94a5f23..000000000 Binary files a/android/app/src/main/res/mipmap-hdpi/ic_launcher_calculator.webp and /dev/null differ diff --git a/android/app/src/main/res/mipmap-hdpi/ic_launcher_calculator_foreground.webp b/android/app/src/main/res/mipmap-hdpi/ic_launcher_calculator_foreground.webp deleted file mode 100644 index 962d2cf6a..000000000 Binary files a/android/app/src/main/res/mipmap-hdpi/ic_launcher_calculator_foreground.webp and /dev/null differ diff --git a/android/app/src/main/res/mipmap-hdpi/ic_launcher_calculator_round.webp b/android/app/src/main/res/mipmap-hdpi/ic_launcher_calculator_round.webp deleted file mode 100644 index ea94a5f23..000000000 Binary files a/android/app/src/main/res/mipmap-hdpi/ic_launcher_calculator_round.webp and /dev/null differ diff --git a/android/app/src/main/res/mipmap-hdpi/ic_launcher_default.webp b/android/app/src/main/res/mipmap-hdpi/ic_launcher_orange.webp similarity index 100% rename from android/app/src/main/res/mipmap-hdpi/ic_launcher_default.webp rename to android/app/src/main/res/mipmap-hdpi/ic_launcher_orange.webp diff --git a/android/app/src/main/res/mipmap-hdpi/ic_launcher_default_round.webp b/android/app/src/main/res/mipmap-hdpi/ic_launcher_orange_round.webp similarity index 100% rename from android/app/src/main/res/mipmap-hdpi/ic_launcher_default_round.webp rename to android/app/src/main/res/mipmap-hdpi/ic_launcher_orange_round.webp diff --git a/android/app/src/main/res/mipmap-mdpi/ic_launcher_black.webp b/android/app/src/main/res/mipmap-mdpi/ic_launcher_black.webp new file mode 100644 index 000000000..56f224ed9 Binary files /dev/null and b/android/app/src/main/res/mipmap-mdpi/ic_launcher_black.webp differ diff --git a/android/app/src/main/res/mipmap-mdpi/ic_launcher_black_round.webp b/android/app/src/main/res/mipmap-mdpi/ic_launcher_black_round.webp new file mode 100644 index 000000000..56f224ed9 Binary files /dev/null and b/android/app/src/main/res/mipmap-mdpi/ic_launcher_black_round.webp differ diff --git a/android/app/src/main/res/mipmap-mdpi/ic_launcher_calculator.webp b/android/app/src/main/res/mipmap-mdpi/ic_launcher_calculator.webp deleted file mode 100644 index 1c9811870..000000000 Binary files a/android/app/src/main/res/mipmap-mdpi/ic_launcher_calculator.webp and /dev/null differ diff --git a/android/app/src/main/res/mipmap-mdpi/ic_launcher_calculator_foreground.webp b/android/app/src/main/res/mipmap-mdpi/ic_launcher_calculator_foreground.webp deleted file mode 100644 index 23807ec32..000000000 Binary files a/android/app/src/main/res/mipmap-mdpi/ic_launcher_calculator_foreground.webp and /dev/null differ diff --git a/android/app/src/main/res/mipmap-mdpi/ic_launcher_calculator_round.webp b/android/app/src/main/res/mipmap-mdpi/ic_launcher_calculator_round.webp deleted file mode 100644 index 1c9811870..000000000 Binary files a/android/app/src/main/res/mipmap-mdpi/ic_launcher_calculator_round.webp and /dev/null differ diff --git a/android/app/src/main/res/mipmap-mdpi/ic_launcher_default.webp b/android/app/src/main/res/mipmap-mdpi/ic_launcher_orange.webp similarity index 100% rename from android/app/src/main/res/mipmap-mdpi/ic_launcher_default.webp rename to android/app/src/main/res/mipmap-mdpi/ic_launcher_orange.webp diff --git a/android/app/src/main/res/mipmap-mdpi/ic_launcher_default_round.webp b/android/app/src/main/res/mipmap-mdpi/ic_launcher_orange_round.webp similarity index 100% rename from android/app/src/main/res/mipmap-mdpi/ic_launcher_default_round.webp rename to android/app/src/main/res/mipmap-mdpi/ic_launcher_orange_round.webp diff --git a/android/app/src/main/res/mipmap-xhdpi/ic_launcher_black.webp b/android/app/src/main/res/mipmap-xhdpi/ic_launcher_black.webp new file mode 100644 index 000000000..75c39c855 Binary files /dev/null and b/android/app/src/main/res/mipmap-xhdpi/ic_launcher_black.webp differ diff --git a/android/app/src/main/res/mipmap-xhdpi/ic_launcher_black_round.webp b/android/app/src/main/res/mipmap-xhdpi/ic_launcher_black_round.webp new file mode 100644 index 000000000..75c39c855 Binary files /dev/null and b/android/app/src/main/res/mipmap-xhdpi/ic_launcher_black_round.webp differ diff --git a/android/app/src/main/res/mipmap-xhdpi/ic_launcher_calculator.webp b/android/app/src/main/res/mipmap-xhdpi/ic_launcher_calculator.webp deleted file mode 100644 index fb1917ff6..000000000 Binary files a/android/app/src/main/res/mipmap-xhdpi/ic_launcher_calculator.webp and /dev/null differ diff --git a/android/app/src/main/res/mipmap-xhdpi/ic_launcher_calculator_foreground.webp b/android/app/src/main/res/mipmap-xhdpi/ic_launcher_calculator_foreground.webp deleted file mode 100644 index 428a29bcd..000000000 Binary files a/android/app/src/main/res/mipmap-xhdpi/ic_launcher_calculator_foreground.webp and /dev/null differ diff --git a/android/app/src/main/res/mipmap-xhdpi/ic_launcher_calculator_round.webp b/android/app/src/main/res/mipmap-xhdpi/ic_launcher_calculator_round.webp deleted file mode 100644 index fb1917ff6..000000000 Binary files a/android/app/src/main/res/mipmap-xhdpi/ic_launcher_calculator_round.webp and /dev/null differ diff --git a/android/app/src/main/res/mipmap-xhdpi/ic_launcher_default.webp b/android/app/src/main/res/mipmap-xhdpi/ic_launcher_orange.webp similarity index 100% rename from android/app/src/main/res/mipmap-xhdpi/ic_launcher_default.webp rename to android/app/src/main/res/mipmap-xhdpi/ic_launcher_orange.webp diff --git a/android/app/src/main/res/mipmap-xhdpi/ic_launcher_default_round.webp b/android/app/src/main/res/mipmap-xhdpi/ic_launcher_orange_round.webp similarity index 100% rename from android/app/src/main/res/mipmap-xhdpi/ic_launcher_default_round.webp rename to android/app/src/main/res/mipmap-xhdpi/ic_launcher_orange_round.webp diff --git a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_black.webp b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_black.webp new file mode 100644 index 000000000..6ffea2482 Binary files /dev/null and b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_black.webp differ diff --git a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_black_round.webp b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_black_round.webp new file mode 100644 index 000000000..6ffea2482 Binary files /dev/null and b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_black_round.webp differ diff --git a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_calculator.webp b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_calculator.webp deleted file mode 100644 index c97110374..000000000 Binary files a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_calculator.webp and /dev/null differ diff --git a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_calculator_foreground.webp b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_calculator_foreground.webp deleted file mode 100644 index 71c213233..000000000 Binary files a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_calculator_foreground.webp and /dev/null differ diff --git a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_calculator_round.webp b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_calculator_round.webp deleted file mode 100644 index c97110374..000000000 Binary files a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_calculator_round.webp and /dev/null differ diff --git a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_default.webp b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_orange.webp similarity index 100% rename from android/app/src/main/res/mipmap-xxhdpi/ic_launcher_default.webp rename to android/app/src/main/res/mipmap-xxhdpi/ic_launcher_orange.webp diff --git a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_default_round.webp b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_orange_round.webp similarity index 100% rename from android/app/src/main/res/mipmap-xxhdpi/ic_launcher_default_round.webp rename to android/app/src/main/res/mipmap-xxhdpi/ic_launcher_orange_round.webp diff --git a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_black.webp b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_black.webp new file mode 100644 index 000000000..c6d24faa3 Binary files /dev/null and b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_black.webp differ diff --git a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_black_round.webp b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_black_round.webp new file mode 100644 index 000000000..c6d24faa3 Binary files /dev/null and b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_black_round.webp differ diff --git a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_calculator.webp b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_calculator.webp deleted file mode 100644 index f8231c9be..000000000 Binary files a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_calculator.webp and /dev/null differ diff --git a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_calculator_foreground.webp b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_calculator_foreground.webp deleted file mode 100644 index 30cdc0e93..000000000 Binary files a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_calculator_foreground.webp and /dev/null differ diff --git a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_calculator_round.webp b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_calculator_round.webp deleted file mode 100644 index f8231c9be..000000000 Binary files a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_calculator_round.webp and /dev/null differ diff --git a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_default.webp b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_orange.webp similarity index 100% rename from android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_default.webp rename to android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_orange.webp diff --git a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_default_round.webp b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_orange_round.webp similarity index 100% rename from android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_default_round.webp rename to android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_orange_round.webp diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 07d67e907..2165e9ae0 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -1007,27 +1007,6 @@ PODS: - ReactCommon/turbomodule/bridging - ReactCommon/turbomodule/core - Yoga - - react-native-change-icon (5.0.0): - - DoubleConversion - - glog - - hermes-engine - - RCT-Folly (= 2024.01.01.00) - - RCTRequired - - RCTTypeSafety - - React-Codegen - - React-Core - - React-debug - - React-Fabric - - React-featureflags - - React-graphics - - React-ImageManager - - React-NativeModulesApple - - React-RCTFabric - - React-rendererdebug - - React-utils - - ReactCommon/turbomodule/bridging - - ReactCommon/turbomodule/core - - Yoga - react-native-image-picker (7.1.2): - DoubleConversion - glog @@ -1549,7 +1528,6 @@ DEPENDENCIES: - react-native-address-generator (from `../node_modules/react-native-address-generator`) - react-native-biometrics (from `../node_modules/react-native-biometrics`) - "react-native-blur (from `../node_modules/@react-native-community/blur`)" - - "react-native-change-icon (from `../node_modules/@synonymdev/react-native-change-icon`)" - react-native-image-picker (from `../node_modules/react-native-image-picker`) - "react-native-ldk (from `../node_modules/@synonymdev/react-native-ldk`)" - react-native-mmkv (from `../node_modules/react-native-mmkv`) @@ -1686,8 +1664,6 @@ EXTERNAL SOURCES: :path: "../node_modules/react-native-biometrics" react-native-blur: :path: "../node_modules/@react-native-community/blur" - react-native-change-icon: - :path: "../node_modules/@synonymdev/react-native-change-icon" react-native-image-picker: :path: "../node_modules/react-native-image-picker" react-native-ldk: @@ -1837,7 +1813,6 @@ SPEC CHECKSUMS: react-native-address-generator: 7034f33d6e63c1c5e123b3c8a3c97f4fe4aa2d93 react-native-biometrics: 352e5a794bfffc46a0c86725ea7dc62deb085bdc react-native-blur: a2acf22fd7bd13621df5e0b1c130b81adea7009c - react-native-change-icon: a7cfe810b8d7cc159cb32903bde8ae17a598df5c react-native-image-picker: c3afe5472ef870d98a4b28415fc0b928161ee5f7 react-native-ldk: 2b19de9eb94dcfd46f3f2a7191502292b75a5d7a react-native-mmkv: 8c9a677e64a1ac89b0c6cf240feea528318b3074 @@ -1893,7 +1868,7 @@ SPEC CHECKSUMS: SocketRocket: abac6f5de4d4d62d24e11868d7a2f427e0ef940d sodium-react-native-direct: 6bc246dbb4ec7c28093675e98b2846ce667f739d SSZipArchive: fe6a26b2a54d5a0890f2567b5cc6de5caa600aef - Yoga: 88480008ccacea6301ff7bf58726e27a72931c8d + Yoga: 04f1db30bb810187397fa4c37dd1868a27af229c ZXingObjC: 8898711ab495761b2dbbdec76d90164a6d7e14c5 PODFILE CHECKSUM: 8c2c3949d19327675be00d5f066e8eab99dd1e04 diff --git a/ios/bitkit.xcodeproj/project.pbxproj b/ios/bitkit.xcodeproj/project.pbxproj index 2698ebca7..245226876 100644 --- a/ios/bitkit.xcodeproj/project.pbxproj +++ b/ios/bitkit.xcodeproj/project.pbxproj @@ -12,7 +12,6 @@ 13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB51A68108700A75B9A /* Images.xcassets */; }; 13B07FC11A68108700A75B9A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; }; 17074219BB5847259EAFC7A6 /* InterTight-Black.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 3815D562618543E7A9BC191E /* InterTight-Black.ttf */; }; - 3FF10CD3FF6C6A80B3D9B24F /* libPods-bitkit.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 553D3BE0B237F180A174BF78 /* libPods-bitkit.a */; }; 57072143CA0F49089AE64F61 /* InterTight-ExtraBold.ttf in Resources */ = {isa = PBXBuildFile; fileRef = A223BA795CEB4CB2B344FBAF /* InterTight-ExtraBold.ttf */; }; 6980B602E6DC4429841BE5EE /* InterTight-Medium.ttf in Resources */ = {isa = PBXBuildFile; fileRef = D67AECF5F543462F90EC89AD /* InterTight-Medium.ttf */; }; 81AB9BB82411601600AC10FF /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 81AB9BB72411601600AC10FF /* LaunchScreen.storyboard */; }; @@ -20,8 +19,9 @@ 925570EA7B1D43CC8AD07B91 /* InterTight-Bold.ttf in Resources */ = {isa = PBXBuildFile; fileRef = CA37793F82F144678099A00D /* InterTight-Bold.ttf */; }; 9952E811473D46FB9003A56D /* InterTight-SemiBold.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 50A8DA09F2974D05A3C58E87 /* InterTight-SemiBold.ttf */; }; B3BE07A9843E4B7DA375B877 /* InterTight-Regular.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 79DFAC55B0D745DE815EC2E0 /* InterTight-Regular.ttf */; }; - B60201B73E75483C7E29CF45 /* libPods-bitkit-bitkitTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 14A0F617EC348EC790E0AEFD /* libPods-bitkit-bitkitTests.a */; }; + BBC9731B7D9C72548BC42C35 /* libPods-bitkit-bitkitTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4072CF178C6811C27BE16827 /* libPods-bitkit-bitkitTests.a */; }; E2F35FC226645CE623C61C03 /* PrivacyInfo.xcprivacy in Resources */ = {isa = PBXBuildFile; fileRef = 919FE2A2B4A7605C9F606896 /* PrivacyInfo.xcprivacy */; }; + EC34482BDFFC55206077E800 /* libPods-bitkit.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3C50DD6D0434692E5BE5C1C3 /* libPods-bitkit.a */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -45,22 +45,22 @@ 13B07FB61A68108700A75B9A /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = bitkit/Info.plist; sourceTree = ""; }; 13B07FB71A68108700A75B9A /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = main.m; path = bitkit/main.m; sourceTree = ""; }; 13B07FB81A68108700A75B9A /* PrivacyInfo.xcprivacy */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = PrivacyInfo.xcprivacy; path = bitkit/PrivacyInfo.xcprivacy; sourceTree = ""; }; - 14A0F617EC348EC790E0AEFD /* libPods-bitkit-bitkitTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-bitkit-bitkitTests.a"; sourceTree = BUILT_PRODUCTS_DIR; }; 3815D562618543E7A9BC191E /* InterTight-Black.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "InterTight-Black.ttf"; path = "../src/assets/fonts/InterTight-Black.ttf"; sourceTree = ""; }; + 3BE44ABA44F8D883E8738357 /* Pods-bitkit.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-bitkit.debug.xcconfig"; path = "Target Support Files/Pods-bitkit/Pods-bitkit.debug.xcconfig"; sourceTree = ""; }; + 3C50DD6D0434692E5BE5C1C3 /* libPods-bitkit.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-bitkit.a"; sourceTree = BUILT_PRODUCTS_DIR; }; + 4072CF178C6811C27BE16827 /* libPods-bitkit-bitkitTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-bitkit-bitkitTests.a"; sourceTree = BUILT_PRODUCTS_DIR; }; 50A8DA09F2974D05A3C58E87 /* InterTight-SemiBold.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "InterTight-SemiBold.ttf"; path = "../src/assets/fonts/InterTight-SemiBold.ttf"; sourceTree = ""; }; - 553D3BE0B237F180A174BF78 /* libPods-bitkit.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-bitkit.a"; sourceTree = BUILT_PRODUCTS_DIR; }; 79DFAC55B0D745DE815EC2E0 /* InterTight-Regular.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "InterTight-Regular.ttf"; path = "../src/assets/fonts/InterTight-Regular.ttf"; sourceTree = ""; }; + 81767485E82F0D9B4AB722B5 /* Pods-bitkit-bitkitTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-bitkit-bitkitTests.debug.xcconfig"; path = "Target Support Files/Pods-bitkit-bitkitTests/Pods-bitkit-bitkitTests.debug.xcconfig"; sourceTree = ""; }; 81AB9BB72411601600AC10FF /* LaunchScreen.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = LaunchScreen.storyboard; path = bitkit/LaunchScreen.storyboard; sourceTree = ""; }; 919FE2A2B4A7605C9F606896 /* PrivacyInfo.xcprivacy */ = {isa = PBXFileReference; includeInIndex = 1; name = PrivacyInfo.xcprivacy; path = bitkit/PrivacyInfo.xcprivacy; sourceTree = ""; }; - 946483D442DFFDE640145341 /* Pods-bitkit.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-bitkit.debug.xcconfig"; path = "Target Support Files/Pods-bitkit/Pods-bitkit.debug.xcconfig"; sourceTree = ""; }; A223BA795CEB4CB2B344FBAF /* InterTight-ExtraBold.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "InterTight-ExtraBold.ttf"; path = "../src/assets/fonts/InterTight-ExtraBold.ttf"; sourceTree = ""; }; - BB244AB66CF48671390DB95E /* Pods-bitkit-bitkitTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-bitkit-bitkitTests.release.xcconfig"; path = "Target Support Files/Pods-bitkit-bitkitTests/Pods-bitkit-bitkitTests.release.xcconfig"; sourceTree = ""; }; + B280297988208E1BF1BC559F /* Pods-bitkit.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-bitkit.release.xcconfig"; path = "Target Support Files/Pods-bitkit/Pods-bitkit.release.xcconfig"; sourceTree = ""; }; + C520B2A69FF77BE430CF7DDF /* Pods-bitkit-bitkitTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-bitkit-bitkitTests.release.xcconfig"; path = "Target Support Files/Pods-bitkit-bitkitTests/Pods-bitkit-bitkitTests.release.xcconfig"; sourceTree = ""; }; CA37793F82F144678099A00D /* InterTight-Bold.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "InterTight-Bold.ttf"; path = "../src/assets/fonts/InterTight-Bold.ttf"; sourceTree = ""; }; D67AECF5F543462F90EC89AD /* InterTight-Medium.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "InterTight-Medium.ttf"; path = "../src/assets/fonts/InterTight-Medium.ttf"; sourceTree = ""; }; - DA09F8F415621665F42D22AF /* Pods-bitkit.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-bitkit.release.xcconfig"; path = "Target Support Files/Pods-bitkit/Pods-bitkit.release.xcconfig"; sourceTree = ""; }; DEC74C5375A34FFCAEBA0781 /* Damion-Regular.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Damion-Regular.ttf"; path = "../src/assets/fonts/Damion-Regular.ttf"; sourceTree = ""; }; ED297162215061F000B7C4FE /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = System/Library/Frameworks/JavaScriptCore.framework; sourceTree = SDKROOT; }; - F13D8E5810518B5372178BFC /* Pods-bitkit-bitkitTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-bitkit-bitkitTests.debug.xcconfig"; path = "Target Support Files/Pods-bitkit-bitkitTests/Pods-bitkit-bitkitTests.debug.xcconfig"; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -68,7 +68,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - B60201B73E75483C7E29CF45 /* libPods-bitkit-bitkitTests.a in Frameworks */, + BBC9731B7D9C72548BC42C35 /* libPods-bitkit-bitkitTests.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -76,7 +76,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 3FF10CD3FF6C6A80B3D9B24F /* libPods-bitkit.a in Frameworks */, + EC34482BDFFC55206077E800 /* libPods-bitkit.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -119,8 +119,8 @@ isa = PBXGroup; children = ( ED297162215061F000B7C4FE /* JavaScriptCore.framework */, - 553D3BE0B237F180A174BF78 /* libPods-bitkit.a */, - 14A0F617EC348EC790E0AEFD /* libPods-bitkit-bitkitTests.a */, + 3C50DD6D0434692E5BE5C1C3 /* libPods-bitkit.a */, + 4072CF178C6811C27BE16827 /* libPods-bitkit-bitkitTests.a */, ); name = Frameworks; sourceTree = ""; @@ -183,10 +183,10 @@ BBD78D7AC51CEA395F1C20DB /* Pods */ = { isa = PBXGroup; children = ( - 946483D442DFFDE640145341 /* Pods-bitkit.debug.xcconfig */, - DA09F8F415621665F42D22AF /* Pods-bitkit.release.xcconfig */, - F13D8E5810518B5372178BFC /* Pods-bitkit-bitkitTests.debug.xcconfig */, - BB244AB66CF48671390DB95E /* Pods-bitkit-bitkitTests.release.xcconfig */, + 3BE44ABA44F8D883E8738357 /* Pods-bitkit.debug.xcconfig */, + B280297988208E1BF1BC559F /* Pods-bitkit.release.xcconfig */, + 81767485E82F0D9B4AB722B5 /* Pods-bitkit-bitkitTests.debug.xcconfig */, + C520B2A69FF77BE430CF7DDF /* Pods-bitkit-bitkitTests.release.xcconfig */, ); path = Pods; sourceTree = ""; @@ -198,12 +198,12 @@ isa = PBXNativeTarget; buildConfigurationList = 00E357021AD99517003FC87E /* Build configuration list for PBXNativeTarget "bitkitTests" */; buildPhases = ( - 21B2D8CCC1F8BE66AE32A903 /* [CP] Check Pods Manifest.lock */, + 036518138E8B9496A4E853D6 /* [CP] Check Pods Manifest.lock */, 00E356EA1AD99517003FC87E /* Sources */, 00E356EB1AD99517003FC87E /* Frameworks */, 00E356EC1AD99517003FC87E /* Resources */, - C598285EE99ED609447BF0A4 /* [CP] Embed Pods Frameworks */, - 5CD8AD8145DC28E30521CD23 /* [CP] Copy Pods Resources */, + 433CF9245DE964ABD00FB429 /* [CP] Embed Pods Frameworks */, + CD19A7BBB54C823D36FA61A4 /* [CP] Copy Pods Resources */, ); buildRules = ( ); @@ -219,13 +219,13 @@ isa = PBXNativeTarget; buildConfigurationList = 13B07F931A680F5B00A75B9A /* Build configuration list for PBXNativeTarget "bitkit" */; buildPhases = ( - F2836A2CC97B51651E5E0B77 /* [CP] Check Pods Manifest.lock */, + 72FFE2E54300E29A43887CF2 /* [CP] Check Pods Manifest.lock */, 13B07F871A680F5B00A75B9A /* Sources */, 13B07F8C1A680F5B00A75B9A /* Frameworks */, 13B07F8E1A680F5B00A75B9A /* Resources */, 00DD1BFF1BD5951E006B06BC /* Bundle React Native code and images */, - EB531B17A015B6C746D0B3AB /* [CP] Embed Pods Frameworks */, - E763B3949FAA9785A226E6E7 /* [CP] Copy Pods Resources */, + 2E3D61DA626340982B5869C7 /* [CP] Embed Pods Frameworks */, + B5432C25295F0048C514F7C0 /* [CP] Copy Pods Resources */, ); buildRules = ( ); @@ -316,7 +316,7 @@ shellPath = /bin/sh; shellScript = "set -e\n\nWITH_ENVIRONMENT=\"$REACT_NATIVE_PATH/scripts/xcode/with-environment.sh\"\nREACT_NATIVE_XCODE=\"$REACT_NATIVE_PATH/scripts/react-native-xcode.sh\"\n\n/bin/sh -c \"$WITH_ENVIRONMENT $REACT_NATIVE_XCODE\"\n"; }; - 21B2D8CCC1F8BE66AE32A903 /* [CP] Check Pods Manifest.lock */ = { + 036518138E8B9496A4E853D6 /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( @@ -338,24 +338,24 @@ shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; showEnvVarsInLog = 0; }; - 5CD8AD8145DC28E30521CD23 /* [CP] Copy Pods Resources */ = { + 2E3D61DA626340982B5869C7 /* [CP] Embed Pods Frameworks */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-bitkit-bitkitTests/Pods-bitkit-bitkitTests-resources-${CONFIGURATION}-input-files.xcfilelist", + "${PODS_ROOT}/Target Support Files/Pods-bitkit/Pods-bitkit-frameworks-${CONFIGURATION}-input-files.xcfilelist", ); - name = "[CP] Copy Pods Resources"; + name = "[CP] Embed Pods Frameworks"; outputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-bitkit-bitkitTests/Pods-bitkit-bitkitTests-resources-${CONFIGURATION}-output-files.xcfilelist", + "${PODS_ROOT}/Target Support Files/Pods-bitkit/Pods-bitkit-frameworks-${CONFIGURATION}-output-files.xcfilelist", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-bitkit-bitkitTests/Pods-bitkit-bitkitTests-resources.sh\"\n"; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-bitkit/Pods-bitkit-frameworks.sh\"\n"; showEnvVarsInLog = 0; }; - C598285EE99ED609447BF0A4 /* [CP] Embed Pods Frameworks */ = { + 433CF9245DE964ABD00FB429 /* [CP] Embed Pods Frameworks */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( @@ -372,60 +372,60 @@ shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-bitkit-bitkitTests/Pods-bitkit-bitkitTests-frameworks.sh\"\n"; showEnvVarsInLog = 0; }; - E763B3949FAA9785A226E6E7 /* [CP] Copy Pods Resources */ = { + 72FFE2E54300E29A43887CF2 /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-bitkit/Pods-bitkit-resources-${CONFIGURATION}-input-files.xcfilelist", ); - name = "[CP] Copy Pods Resources"; + inputPaths = ( + "${PODS_PODFILE_DIR_PATH}/Podfile.lock", + "${PODS_ROOT}/Manifest.lock", + ); + name = "[CP] Check Pods Manifest.lock"; outputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-bitkit/Pods-bitkit-resources-${CONFIGURATION}-output-files.xcfilelist", + ); + outputPaths = ( + "$(DERIVED_FILE_DIR)/Pods-bitkit-checkManifestLockResult.txt", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-bitkit/Pods-bitkit-resources.sh\"\n"; + shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; showEnvVarsInLog = 0; }; - EB531B17A015B6C746D0B3AB /* [CP] Embed Pods Frameworks */ = { + B5432C25295F0048C514F7C0 /* [CP] Copy Pods Resources */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-bitkit/Pods-bitkit-frameworks-${CONFIGURATION}-input-files.xcfilelist", + "${PODS_ROOT}/Target Support Files/Pods-bitkit/Pods-bitkit-resources-${CONFIGURATION}-input-files.xcfilelist", ); - name = "[CP] Embed Pods Frameworks"; + name = "[CP] Copy Pods Resources"; outputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-bitkit/Pods-bitkit-frameworks-${CONFIGURATION}-output-files.xcfilelist", + "${PODS_ROOT}/Target Support Files/Pods-bitkit/Pods-bitkit-resources-${CONFIGURATION}-output-files.xcfilelist", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-bitkit/Pods-bitkit-frameworks.sh\"\n"; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-bitkit/Pods-bitkit-resources.sh\"\n"; showEnvVarsInLog = 0; }; - F2836A2CC97B51651E5E0B77 /* [CP] Check Pods Manifest.lock */ = { + CD19A7BBB54C823D36FA61A4 /* [CP] Copy Pods Resources */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-bitkit-bitkitTests/Pods-bitkit-bitkitTests-resources-${CONFIGURATION}-input-files.xcfilelist", ); - inputPaths = ( - "${PODS_PODFILE_DIR_PATH}/Podfile.lock", - "${PODS_ROOT}/Manifest.lock", - ); - name = "[CP] Check Pods Manifest.lock"; + name = "[CP] Copy Pods Resources"; outputFileListPaths = ( - ); - outputPaths = ( - "$(DERIVED_FILE_DIR)/Pods-bitkit-checkManifestLockResult.txt", + "${PODS_ROOT}/Target Support Files/Pods-bitkit-bitkitTests/Pods-bitkit-bitkitTests-resources-${CONFIGURATION}-output-files.xcfilelist", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-bitkit-bitkitTests/Pods-bitkit-bitkitTests-resources.sh\"\n"; showEnvVarsInLog = 0; }; /* End PBXShellScriptBuildPhase section */ @@ -461,7 +461,7 @@ /* Begin XCBuildConfiguration section */ 00E356F61AD99517003FC87E /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = F13D8E5810518B5372178BFC /* Pods-bitkit-bitkitTests.debug.xcconfig */; + baseConfigurationReference = 81767485E82F0D9B4AB722B5 /* Pods-bitkit-bitkitTests.debug.xcconfig */; buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; BUNDLE_LOADER = "$(TEST_HOST)"; @@ -489,7 +489,7 @@ }; 00E356F71AD99517003FC87E /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = BB244AB66CF48671390DB95E /* Pods-bitkit-bitkitTests.release.xcconfig */; + baseConfigurationReference = C520B2A69FF77BE430CF7DDF /* Pods-bitkit-bitkitTests.release.xcconfig */; buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; BUNDLE_LOADER = "$(TEST_HOST)"; @@ -514,7 +514,7 @@ }; 13B07F941A680F5B00A75B9A /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 946483D442DFFDE640145341 /* Pods-bitkit.debug.xcconfig */; + baseConfigurationReference = 3BE44ABA44F8D883E8738357 /* Pods-bitkit.debug.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIconOrange; ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES; @@ -546,7 +546,7 @@ }; 13B07F951A680F5B00A75B9A /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = DA09F8F415621665F42D22AF /* Pods-bitkit.release.xcconfig */; + baseConfigurationReference = B280297988208E1BF1BC559F /* Pods-bitkit.release.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIconOrange; ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES; diff --git a/ios/bitkit/Images.xcassets/AppIconCalculator.appiconset/1024.png b/ios/bitkit/Images.xcassets/AppIconCalculator.appiconset/1024.png deleted file mode 100644 index 94f35d43d..000000000 Binary files a/ios/bitkit/Images.xcassets/AppIconCalculator.appiconset/1024.png and /dev/null differ diff --git a/ios/bitkit/Images.xcassets/AppIconCalculator.appiconset/114.png b/ios/bitkit/Images.xcassets/AppIconCalculator.appiconset/114.png deleted file mode 100644 index a18feb258..000000000 Binary files a/ios/bitkit/Images.xcassets/AppIconCalculator.appiconset/114.png and /dev/null differ diff --git a/ios/bitkit/Images.xcassets/AppIconCalculator.appiconset/120.png b/ios/bitkit/Images.xcassets/AppIconCalculator.appiconset/120.png deleted file mode 100644 index d79f71b3c..000000000 Binary files a/ios/bitkit/Images.xcassets/AppIconCalculator.appiconset/120.png and /dev/null differ diff --git a/ios/bitkit/Images.xcassets/AppIconCalculator.appiconset/180.png b/ios/bitkit/Images.xcassets/AppIconCalculator.appiconset/180.png deleted file mode 100644 index b0d49276c..000000000 Binary files a/ios/bitkit/Images.xcassets/AppIconCalculator.appiconset/180.png and /dev/null differ diff --git a/ios/bitkit/Images.xcassets/AppIconCalculator.appiconset/29.png b/ios/bitkit/Images.xcassets/AppIconCalculator.appiconset/29.png deleted file mode 100644 index e41ab6ce1..000000000 Binary files a/ios/bitkit/Images.xcassets/AppIconCalculator.appiconset/29.png and /dev/null differ diff --git a/ios/bitkit/Images.xcassets/AppIconCalculator.appiconset/40.png b/ios/bitkit/Images.xcassets/AppIconCalculator.appiconset/40.png deleted file mode 100644 index eba5cb7e9..000000000 Binary files a/ios/bitkit/Images.xcassets/AppIconCalculator.appiconset/40.png and /dev/null differ diff --git a/ios/bitkit/Images.xcassets/AppIconCalculator.appiconset/57.png b/ios/bitkit/Images.xcassets/AppIconCalculator.appiconset/57.png deleted file mode 100644 index 112e31a1a..000000000 Binary files a/ios/bitkit/Images.xcassets/AppIconCalculator.appiconset/57.png and /dev/null differ diff --git a/ios/bitkit/Images.xcassets/AppIconCalculator.appiconset/58.png b/ios/bitkit/Images.xcassets/AppIconCalculator.appiconset/58.png deleted file mode 100644 index c839e019e..000000000 Binary files a/ios/bitkit/Images.xcassets/AppIconCalculator.appiconset/58.png and /dev/null differ diff --git a/ios/bitkit/Images.xcassets/AppIconCalculator.appiconset/60.png b/ios/bitkit/Images.xcassets/AppIconCalculator.appiconset/60.png deleted file mode 100644 index 9d0dd6e9f..000000000 Binary files a/ios/bitkit/Images.xcassets/AppIconCalculator.appiconset/60.png and /dev/null differ diff --git a/ios/bitkit/Images.xcassets/AppIconCalculator.appiconset/80.png b/ios/bitkit/Images.xcassets/AppIconCalculator.appiconset/80.png deleted file mode 100644 index c27bb05de..000000000 Binary files a/ios/bitkit/Images.xcassets/AppIconCalculator.appiconset/80.png and /dev/null differ diff --git a/ios/bitkit/Images.xcassets/AppIconCalculator.appiconset/87.png b/ios/bitkit/Images.xcassets/AppIconCalculator.appiconset/87.png deleted file mode 100644 index c20d8a030..000000000 Binary files a/ios/bitkit/Images.xcassets/AppIconCalculator.appiconset/87.png and /dev/null differ diff --git a/ios/bitkit/Images.xcassets/AppIconCalculator.appiconset/Contents.json b/ios/bitkit/Images.xcassets/AppIconCalculator.appiconset/Contents.json deleted file mode 100644 index a4d65f157..000000000 --- a/ios/bitkit/Images.xcassets/AppIconCalculator.appiconset/Contents.json +++ /dev/null @@ -1,100 +0,0 @@ -{ - "images": [ - { - "size": "60x60", - "expected-size": "180", - "filename": "180.png", - "folder": "Assets.xcassets/AppIconCalculator.appiconset/", - "idiom": "iphone", - "scale": "3x" - }, - { - "size": "40x40", - "expected-size": "80", - "filename": "80.png", - "folder": "Assets.xcassets/AppIconCalculator.appiconset/", - "idiom": "iphone", - "scale": "2x" - }, - { - "size": "40x40", - "expected-size": "120", - "filename": "120.png", - "folder": "Assets.xcassets/AppIconCalculator.appiconset/", - "idiom": "iphone", - "scale": "3x" - }, - { - "size": "60x60", - "expected-size": "120", - "filename": "120.png", - "folder": "Assets.xcassets/AppIconCalculator.appiconset/", - "idiom": "iphone", - "scale": "2x" - }, - { - "size": "57x57", - "expected-size": "57", - "filename": "57.png", - "folder": "Assets.xcassets/AppIconCalculator.appiconset/", - "idiom": "iphone", - "scale": "1x" - }, - { - "size": "29x29", - "expected-size": "58", - "filename": "58.png", - "folder": "Assets.xcassets/AppIconCalculator.appiconset/", - "idiom": "iphone", - "scale": "2x" - }, - { - "size": "29x29", - "expected-size": "29", - "filename": "29.png", - "folder": "Assets.xcassets/AppIconCalculator.appiconset/", - "idiom": "iphone", - "scale": "1x" - }, - { - "size": "29x29", - "expected-size": "87", - "filename": "87.png", - "folder": "Assets.xcassets/AppIconCalculator.appiconset/", - "idiom": "iphone", - "scale": "3x" - }, - { - "size": "57x57", - "expected-size": "114", - "filename": "114.png", - "folder": "Assets.xcassets/AppIconCalculator.appiconset/", - "idiom": "iphone", - "scale": "2x" - }, - { - "size": "20x20", - "expected-size": "40", - "filename": "40.png", - "folder": "Assets.xcassets/AppIconCalculator.appiconset/", - "idiom": "iphone", - "scale": "2x" - }, - { - "size": "20x20", - "expected-size": "60", - "filename": "60.png", - "folder": "Assets.xcassets/AppIconCalculator.appiconset/", - "idiom": "iphone", - "scale": "3x" - }, - { - "size": "1024x1024", - "filename": "1024.png", - "expected-size": "1024", - "idiom": "ios-marketing", - "folder": "Assets.xcassets/AppIconCalculator.appiconset/", - "scale": "1x" - } - ] -} diff --git a/ios/bitkit/Images.xcassets/AppIconOrange.appiconset/1024.png b/ios/bitkit/Images.xcassets/AppIconOrange.appiconset/1024.png deleted file mode 100644 index ce7ccd94c..000000000 Binary files a/ios/bitkit/Images.xcassets/AppIconOrange.appiconset/1024.png and /dev/null differ diff --git a/ios/bitkit/Images.xcassets/AppIconOrange.appiconset/114.png b/ios/bitkit/Images.xcassets/AppIconOrange.appiconset/114.png deleted file mode 100644 index 9e00f6bfd..000000000 Binary files a/ios/bitkit/Images.xcassets/AppIconOrange.appiconset/114.png and /dev/null differ diff --git a/ios/bitkit/Images.xcassets/AppIconOrange.appiconset/120.png b/ios/bitkit/Images.xcassets/AppIconOrange.appiconset/120.png deleted file mode 100644 index ef93fd9f5..000000000 Binary files a/ios/bitkit/Images.xcassets/AppIconOrange.appiconset/120.png and /dev/null differ diff --git a/ios/bitkit/Images.xcassets/AppIconOrange.appiconset/180.png b/ios/bitkit/Images.xcassets/AppIconOrange.appiconset/180.png deleted file mode 100644 index f70ab29b6..000000000 Binary files a/ios/bitkit/Images.xcassets/AppIconOrange.appiconset/180.png and /dev/null differ diff --git a/ios/bitkit/Images.xcassets/AppIconOrange.appiconset/29.png b/ios/bitkit/Images.xcassets/AppIconOrange.appiconset/29.png deleted file mode 100644 index 849d2c89c..000000000 Binary files a/ios/bitkit/Images.xcassets/AppIconOrange.appiconset/29.png and /dev/null differ diff --git a/ios/bitkit/Images.xcassets/AppIconOrange.appiconset/40.png b/ios/bitkit/Images.xcassets/AppIconOrange.appiconset/40.png deleted file mode 100644 index 0e321b91f..000000000 Binary files a/ios/bitkit/Images.xcassets/AppIconOrange.appiconset/40.png and /dev/null differ diff --git a/ios/bitkit/Images.xcassets/AppIconOrange.appiconset/57.png b/ios/bitkit/Images.xcassets/AppIconOrange.appiconset/57.png deleted file mode 100644 index 2ca96e583..000000000 Binary files a/ios/bitkit/Images.xcassets/AppIconOrange.appiconset/57.png and /dev/null differ diff --git a/ios/bitkit/Images.xcassets/AppIconOrange.appiconset/58.png b/ios/bitkit/Images.xcassets/AppIconOrange.appiconset/58.png deleted file mode 100644 index 61b49bf31..000000000 Binary files a/ios/bitkit/Images.xcassets/AppIconOrange.appiconset/58.png and /dev/null differ diff --git a/ios/bitkit/Images.xcassets/AppIconOrange.appiconset/60.png b/ios/bitkit/Images.xcassets/AppIconOrange.appiconset/60.png deleted file mode 100644 index 93cb1ff31..000000000 Binary files a/ios/bitkit/Images.xcassets/AppIconOrange.appiconset/60.png and /dev/null differ diff --git a/ios/bitkit/Images.xcassets/AppIconOrange.appiconset/80.png b/ios/bitkit/Images.xcassets/AppIconOrange.appiconset/80.png deleted file mode 100644 index 23834ece4..000000000 Binary files a/ios/bitkit/Images.xcassets/AppIconOrange.appiconset/80.png and /dev/null differ diff --git a/ios/bitkit/Images.xcassets/AppIconOrange.appiconset/87.png b/ios/bitkit/Images.xcassets/AppIconOrange.appiconset/87.png deleted file mode 100644 index 807ac98a0..000000000 Binary files a/ios/bitkit/Images.xcassets/AppIconOrange.appiconset/87.png and /dev/null differ diff --git a/ios/bitkit/Images.xcassets/AppIconOrange.appiconset/Contents.json b/ios/bitkit/Images.xcassets/AppIconOrange.appiconset/Contents.json index 792e08ece..1e2d7086b 100644 --- a/ios/bitkit/Images.xcassets/AppIconOrange.appiconset/Contents.json +++ b/ios/bitkit/Images.xcassets/AppIconOrange.appiconset/Contents.json @@ -1,100 +1,122 @@ { - "images": [ - { - "size": "60x60", - "expected-size": "180", - "filename": "180.png", - "folder": "Images.xcassets/AppIconOrange.appiconset/", - "idiom": "iphone", - "scale": "3x" - }, - { - "size": "40x40", - "expected-size": "80", - "filename": "80.png", - "folder": "Images.xcassets/AppIconOrange.appiconset/", - "idiom": "iphone", - "scale": "2x" - }, - { - "size": "40x40", - "expected-size": "120", - "filename": "120.png", - "folder": "Images.xcassets/AppIconOrange.appiconset/", - "idiom": "iphone", - "scale": "3x" - }, - { - "size": "60x60", - "expected-size": "120", - "filename": "120.png", - "folder": "Images.xcassets/AppIconOrange.appiconset/", - "idiom": "iphone", - "scale": "2x" - }, - { - "size": "57x57", - "expected-size": "57", - "filename": "57.png", - "folder": "Images.xcassets/AppIconOrange.appiconset/", - "idiom": "iphone", - "scale": "1x" - }, - { - "size": "29x29", - "expected-size": "58", - "filename": "58.png", - "folder": "Images.xcassets/AppIconOrange.appiconset/", - "idiom": "iphone", - "scale": "2x" - }, - { - "size": "29x29", - "expected-size": "29", - "filename": "29.png", - "folder": "Images.xcassets/AppIconOrange.appiconset/", - "idiom": "iphone", - "scale": "1x" - }, - { - "size": "29x29", - "expected-size": "87", - "filename": "87.png", - "folder": "Images.xcassets/AppIconOrange.appiconset/", - "idiom": "iphone", - "scale": "3x" - }, - { - "size": "57x57", - "expected-size": "114", - "filename": "114.png", - "folder": "Images.xcassets/AppIconOrange.appiconset/", - "idiom": "iphone", - "scale": "2x" - }, - { - "size": "20x20", - "expected-size": "40", - "filename": "40.png", - "folder": "Images.xcassets/AppIconOrange.appiconset/", - "idiom": "iphone", - "scale": "2x" - }, - { - "size": "20x20", - "expected-size": "60", - "filename": "60.png", - "folder": "Images.xcassets/AppIconOrange.appiconset/", - "idiom": "iphone", - "scale": "3x" - }, - { - "size": "1024x1024", - "filename": "1024.png", - "expected-size": "1024", - "idiom": "ios-marketing", - "folder": "Images.xcassets/AppIconOrange.appiconset/", - "scale": "1x" - } - ] + "images" : [ + { + "filename" : "Icon-App-20x20@2x.png", + "idiom" : "iphone", + "scale" : "2x", + "size" : "20x20" + }, + { + "filename" : "Icon-App-20x20@3x.png", + "idiom" : "iphone", + "scale" : "3x", + "size" : "20x20" + }, + { + "filename" : "Icon-App-29x29@1x.png", + "idiom" : "iphone", + "scale" : "1x", + "size" : "29x29" + }, + { + "filename" : "Icon-App-29x29@2x.png", + "idiom" : "iphone", + "scale" : "2x", + "size" : "29x29" + }, + { + "filename" : "Icon-App-29x29@3x.png", + "idiom" : "iphone", + "scale" : "3x", + "size" : "29x29" + }, + { + "filename" : "Icon-App-40x40@2x.png", + "idiom" : "iphone", + "scale" : "2x", + "size" : "40x40" + }, + { + "filename" : "Icon-App-40x40@3x.png", + "idiom" : "iphone", + "scale" : "3x", + "size" : "40x40" + }, + { + "filename" : "Icon-App-60x60@2x.png", + "idiom" : "iphone", + "scale" : "2x", + "size" : "60x60" + }, + { + "filename" : "Icon-App-60x60@3x.png", + "idiom" : "iphone", + "scale" : "3x", + "size" : "60x60" + }, + { + "filename" : "Icon-App-20x20@1x.png", + "idiom" : "ipad", + "scale" : "1x", + "size" : "20x20" + }, + { + "filename" : "Icon-App-20x20@2x.png", + "idiom" : "ipad", + "scale" : "2x", + "size" : "20x20" + }, + { + "filename" : "Icon-App-29x29@1x.png", + "idiom" : "ipad", + "scale" : "1x", + "size" : "29x29" + }, + { + "filename" : "Icon-App-29x29@2x.png", + "idiom" : "ipad", + "scale" : "2x", + "size" : "29x29" + }, + { + "filename" : "Icon-App-40x40@1x.png", + "idiom" : "ipad", + "scale" : "1x", + "size" : "40x40" + }, + { + "filename" : "Icon-App-40x40@2x.png", + "idiom" : "ipad", + "scale" : "2x", + "size" : "40x40" + }, + { + "filename" : "Icon-App-76x76@1x.png", + "idiom" : "ipad", + "scale" : "1x", + "size" : "76x76" + }, + { + "filename" : "Icon-App-76x76@2x.png", + "idiom" : "ipad", + "scale" : "2x", + "size" : "76x76" + }, + { + "filename" : "Icon-App-83.5x83.5@2x.png", + "idiom" : "ipad", + "scale" : "2x", + "size" : "83.5x83.5" + }, + { + "filename" : "ItunesArtwork@2x.png", + "idiom" : "ios-marketing", + "scale" : "1x", + "size" : "1024x1024" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } } diff --git a/ios/bitkit/Images.xcassets/AppIconOrange.appiconset/Icon-App-20x20@1x.png b/ios/bitkit/Images.xcassets/AppIconOrange.appiconset/Icon-App-20x20@1x.png new file mode 100644 index 000000000..99397463d Binary files /dev/null and b/ios/bitkit/Images.xcassets/AppIconOrange.appiconset/Icon-App-20x20@1x.png differ diff --git a/ios/bitkit/Images.xcassets/AppIconOrange.appiconset/Icon-App-20x20@2x.png b/ios/bitkit/Images.xcassets/AppIconOrange.appiconset/Icon-App-20x20@2x.png new file mode 100644 index 000000000..06e11b50b Binary files /dev/null and b/ios/bitkit/Images.xcassets/AppIconOrange.appiconset/Icon-App-20x20@2x.png differ diff --git a/ios/bitkit/Images.xcassets/AppIconOrange.appiconset/Icon-App-20x20@3x.png b/ios/bitkit/Images.xcassets/AppIconOrange.appiconset/Icon-App-20x20@3x.png new file mode 100644 index 000000000..dcbd8c6ff Binary files /dev/null and b/ios/bitkit/Images.xcassets/AppIconOrange.appiconset/Icon-App-20x20@3x.png differ diff --git a/ios/bitkit/Images.xcassets/AppIconOrange.appiconset/Icon-App-29x29@1x.png b/ios/bitkit/Images.xcassets/AppIconOrange.appiconset/Icon-App-29x29@1x.png new file mode 100644 index 000000000..1759c8a5d Binary files /dev/null and b/ios/bitkit/Images.xcassets/AppIconOrange.appiconset/Icon-App-29x29@1x.png differ diff --git a/ios/bitkit/Images.xcassets/AppIconOrange.appiconset/Icon-App-29x29@2x.png b/ios/bitkit/Images.xcassets/AppIconOrange.appiconset/Icon-App-29x29@2x.png new file mode 100644 index 000000000..00513e61d Binary files /dev/null and b/ios/bitkit/Images.xcassets/AppIconOrange.appiconset/Icon-App-29x29@2x.png differ diff --git a/ios/bitkit/Images.xcassets/AppIconOrange.appiconset/Icon-App-29x29@3x.png b/ios/bitkit/Images.xcassets/AppIconOrange.appiconset/Icon-App-29x29@3x.png new file mode 100644 index 000000000..4aa0ef922 Binary files /dev/null and b/ios/bitkit/Images.xcassets/AppIconOrange.appiconset/Icon-App-29x29@3x.png differ diff --git a/ios/bitkit/Images.xcassets/AppIconOrange.appiconset/Icon-App-40x40@1x.png b/ios/bitkit/Images.xcassets/AppIconOrange.appiconset/Icon-App-40x40@1x.png new file mode 100644 index 000000000..06e11b50b Binary files /dev/null and b/ios/bitkit/Images.xcassets/AppIconOrange.appiconset/Icon-App-40x40@1x.png differ diff --git a/ios/bitkit/Images.xcassets/AppIconOrange.appiconset/Icon-App-40x40@2x.png b/ios/bitkit/Images.xcassets/AppIconOrange.appiconset/Icon-App-40x40@2x.png new file mode 100644 index 000000000..21dfd9cbb Binary files /dev/null and b/ios/bitkit/Images.xcassets/AppIconOrange.appiconset/Icon-App-40x40@2x.png differ diff --git a/ios/bitkit/Images.xcassets/AppIconOrange.appiconset/Icon-App-40x40@3x.png b/ios/bitkit/Images.xcassets/AppIconOrange.appiconset/Icon-App-40x40@3x.png new file mode 100644 index 000000000..79675fa76 Binary files /dev/null and b/ios/bitkit/Images.xcassets/AppIconOrange.appiconset/Icon-App-40x40@3x.png differ diff --git a/ios/bitkit/Images.xcassets/AppIconOrange.appiconset/Icon-App-60x60@2x.png b/ios/bitkit/Images.xcassets/AppIconOrange.appiconset/Icon-App-60x60@2x.png new file mode 100644 index 000000000..79675fa76 Binary files /dev/null and b/ios/bitkit/Images.xcassets/AppIconOrange.appiconset/Icon-App-60x60@2x.png differ diff --git a/ios/bitkit/Images.xcassets/AppIconOrange.appiconset/Icon-App-60x60@3x.png b/ios/bitkit/Images.xcassets/AppIconOrange.appiconset/Icon-App-60x60@3x.png new file mode 100644 index 000000000..07460a3f1 Binary files /dev/null and b/ios/bitkit/Images.xcassets/AppIconOrange.appiconset/Icon-App-60x60@3x.png differ diff --git a/ios/bitkit/Images.xcassets/AppIconOrange.appiconset/Icon-App-76x76@1x.png b/ios/bitkit/Images.xcassets/AppIconOrange.appiconset/Icon-App-76x76@1x.png new file mode 100644 index 000000000..186fb70b7 Binary files /dev/null and b/ios/bitkit/Images.xcassets/AppIconOrange.appiconset/Icon-App-76x76@1x.png differ diff --git a/ios/bitkit/Images.xcassets/AppIconOrange.appiconset/Icon-App-76x76@2x.png b/ios/bitkit/Images.xcassets/AppIconOrange.appiconset/Icon-App-76x76@2x.png new file mode 100644 index 000000000..1bb7a1433 Binary files /dev/null and b/ios/bitkit/Images.xcassets/AppIconOrange.appiconset/Icon-App-76x76@2x.png differ diff --git a/ios/bitkit/Images.xcassets/AppIconOrange.appiconset/Icon-App-83.5x83.5@2x.png b/ios/bitkit/Images.xcassets/AppIconOrange.appiconset/Icon-App-83.5x83.5@2x.png new file mode 100644 index 000000000..b34a1240b Binary files /dev/null and b/ios/bitkit/Images.xcassets/AppIconOrange.appiconset/Icon-App-83.5x83.5@2x.png differ diff --git a/ios/bitkit/Images.xcassets/AppIconOrange.appiconset/ItunesArtwork@2x.png b/ios/bitkit/Images.xcassets/AppIconOrange.appiconset/ItunesArtwork@2x.png new file mode 100644 index 000000000..ad3973e50 Binary files /dev/null and b/ios/bitkit/Images.xcassets/AppIconOrange.appiconset/ItunesArtwork@2x.png differ diff --git a/ios/bitkit/Info.plist b/ios/bitkit/Info.plist index 96ad03fa0..f8e440175 100644 --- a/ios/bitkit/Info.plist +++ b/ios/bitkit/Info.plist @@ -8,32 +8,6 @@ Bitkit CFBundleExecutable $(EXECUTABLE_NAME) - CFBundleIcons - - CFBundlePrimaryIcon - - CFBundleIconName - - CFBundleIconFiles - - AppIcon - - UIPrerenderedIcon - - - CFBundleAlternateIcons - - AppIconCalculator - - CFBundleIconFiles - - AppIconCalculator - - UIPrerenderedIcon - - - - CFBundleIdentifier $(PRODUCT_BUNDLE_IDENTIFIER) CFBundleInfoDictionaryVersion diff --git a/package.json b/package.json index 39cf4f391..2567ae32a 100644 --- a/package.json +++ b/package.json @@ -50,7 +50,6 @@ "@synonymdev/blocktank-lsp-http-client": "1.5.0", "@synonymdev/feeds": "3.0.0", "@synonymdev/ledger": "0.0.5", - "@synonymdev/react-native-change-icon": "5.0.0", "@synonymdev/react-native-keychain": "8.2.2", "@synonymdev/react-native-ldk": "0.0.150", "@synonymdev/react-native-lnurl": "0.0.10", diff --git a/src/assets/icons/calculator.ts b/src/assets/icons/calculator.ts deleted file mode 100644 index fac460b15..000000000 --- a/src/assets/icons/calculator.ts +++ /dev/null @@ -1,52 +0,0 @@ -export const negateIcon = (color = 'white'): string => - ` - - - - - -`; - -export const percentageIcon = (color = 'white'): string => - ` - - - - -`; - -export const divideIcon = (color = 'white'): string => - ` - - - - -`; - -export const multiplyIcon = (color = 'white'): string => - ` - - - -`; - -export const subtractIcon = (color = 'white'): string => - ` - - -`; - -export const addIcon = (color = 'white'): string => - ` - - - -`; - -export const equalsIcon = (color = 'white'): string => - ` - - - -`; diff --git a/src/assets/illustrations/stealth-mode.png b/src/assets/illustrations/stealth-mode.png deleted file mode 100644 index ac29e485c..000000000 Binary files a/src/assets/illustrations/stealth-mode.png and /dev/null differ diff --git a/src/components/AuthCheck.tsx b/src/components/AuthCheck.tsx index 2be3824cf..d4ed31df4 100644 --- a/src/components/AuthCheck.tsx +++ b/src/components/AuthCheck.tsx @@ -7,14 +7,9 @@ import Animated, { FadeOut } from 'react-native-reanimated'; import { View as ThemedView } from '../styles/components'; import Biometrics from './Biometrics'; import PinPad from './PinPad'; -import Calculator from '../screens/Calculator'; -import { - biometricsSelector, - enableStealthModeSelector, -} from '../store/reselect/settings'; +import { biometricsSelector } from '../store/reselect/settings'; type AuthCheckProps = { - isAppStart?: boolean; showBackNavigation?: boolean; showLogoOnPIN?: boolean; onSuccess?: () => void; @@ -31,24 +26,18 @@ type AuthCheckProps = { * This component checks if the user has enabled pin or biometrics and runs through each check as needed before proceeding. */ const AuthCheck = ({ - isAppStart = false, showBackNavigation = true, showLogoOnPIN = false, route, onSuccess, }: AuthCheckProps): ReactElement => { const biometrics = useAppSelector(biometricsSelector); - const stealthModeEnabled = useAppSelector(enableStealthModeSelector); const [bioEnabled, setBioEnabled] = useState(biometrics); const requirePin = route?.params?.requirePin ?? false; const requireBiometrics = route?.params?.requireBiometrics ?? false; onSuccess = route?.params?.onSuccess ?? onSuccess; - if (isAppStart && stealthModeEnabled) { - return onSuccess?.()} />; - } - if ((bioEnabled && !requirePin) || requireBiometrics) { return ( diff --git a/src/constants/app.ts b/src/constants/app.ts index fdd9e78f1..0be4e86e3 100644 --- a/src/constants/app.ts +++ b/src/constants/app.ts @@ -1,4 +1,3 @@ -import { Platform } from 'react-native'; import { getBundleId } from 'react-native-device-info'; export const appName = 'Bitkit'; @@ -7,8 +6,3 @@ export const appStoreUrl = export const playStoreUrl = `https://play.google.com/store/apps/details?id=${getBundleId()}`; export const PIN_ATTEMPTS = '8'; - -export const appIcon = { - default: 'Default', - calculator: Platform.OS === 'ios' ? 'AppIconCalculator' : 'Calculator', -}; diff --git a/src/navigation/root/RootNavigator.tsx b/src/navigation/root/RootNavigator.tsx index fe6108cf0..e6de08775 100644 --- a/src/navigation/root/RootNavigator.tsx +++ b/src/navigation/root/RootNavigator.tsx @@ -239,7 +239,6 @@ const RootNavigator = (): ReactElement => { {!isAuthenticated && ( { - diff --git a/src/screens/Calculator/index.tsx b/src/screens/Calculator/index.tsx deleted file mode 100644 index 03b4b8890..000000000 --- a/src/screens/Calculator/index.tsx +++ /dev/null @@ -1,397 +0,0 @@ -import React, { - memo, - ReactElement, - useCallback, - useEffect, - useState, -} from 'react'; -import { - StyleProp, - StyleSheet, - useWindowDimensions, - View, - ViewStyle, -} from 'react-native'; -import { useTranslation } from 'react-i18next'; - -import { Text } from '../../styles/text'; -import { - AddIcon, - DivideIcon, - EqualsIcon, - MultiplyIcon, - NegateIcon, - PercentageIcon, - SubtractIcon, -} from '../../styles/icons'; -import { IThemeColors } from '../../styles/themes'; -import { Pressable, View as ThemedView } from '../../styles/components'; -import SafeAreaInset from '../../components/SafeAreaInset'; -import NavigationHeader from '../../components/NavigationHeader'; -import { vibrate } from '../../utils/helpers'; -import { getKeychainValue, setKeychainValue } from '../../utils/keychain'; -import { showToast } from '../../utils/notifications'; -import { wipeApp } from '../../store/utils/settings'; -import { PIN_ATTEMPTS } from '../../constants/app'; - -type Key = { - value: string; - content: ReactElement | string; - color: keyof IThemeColors; -}; - -const matrix: Key[][] = [ - [ - { value: 'AC', content: 'AC', color: 'white64' }, - { value: '+-', content: , color: 'white64' }, - { value: '%', content: , color: 'white64' }, - { value: '/', content: , color: 'brand' }, - ], - [ - { value: '7', content: '7', color: 'white' }, - { value: '8', content: '8', color: 'white' }, - { value: '9', content: '9', color: 'white' }, - { value: 'x', content: , color: 'brand' }, - ], - [ - { value: '4', content: '4', color: 'white' }, - { value: '5', content: '5', color: 'white' }, - { value: '6', content: '6', color: 'white' }, - { value: '-', content: , color: 'brand' }, - ], - [ - { value: '1', content: '1', color: 'white' }, - { value: '2', content: '2', color: 'white' }, - { value: '3', content: '3', color: 'white' }, - { value: '+', content: , color: 'brand' }, - ], - [ - { value: '0', content: '0', color: 'white' }, - { value: '.', content: '.', color: 'white' }, - { value: '=', content: , color: 'brand' }, - ], -]; - -const Symbol = ({ - symbol, - color, -}: { - symbol: string | ReactElement; - color?: keyof IThemeColors; -}): ReactElement => { - const isAc = symbol === 'AC'; - const textStyle = { - ...(isAc ? { fontSize: 36, lineHeight: 36 } : {}), - }; - - if (typeof symbol === 'string') { - return ( - - {symbol} - - ); - } - - return React.cloneElement(symbol, { color, height: 42 }); -}; - -const Button = ({ - symbol, - color = 'white', - style, - onPress, -}: { - symbol: string | ReactElement; - color?: keyof IThemeColors; - style?: StyleProp; - onPress: () => void; -}): ReactElement => { - const symbolColor = color === 'brand' ? 'white' : 'black'; - - return ( - => [ - styles.button, - style, - pressed && styles.pressed, - ]} - color={color} - testID={`calculator-button-${symbol}`} - onPressIn={onPress}> - - - ); -}; - -const Calculator = ({ onSuccess }: { onSuccess: () => void }): ReactElement => { - const { t } = useTranslation('security'); - const { width } = useWindowDimensions(); - const [input, setInput] = useState(''); - const [attemptsRemaining, setAttemptsRemaining] = useState(0); - - // on mount - useEffect(() => { - (async (): Promise => { - // wait for initial keychain read - const response = await getKeychainValue({ - key: 'pinAttemptsRemaining', - }); - - if (!response.error) { - let attempts = 5; - if (response.data !== undefined) { - attempts = Number(response.data); - } - setAttemptsRemaining(attempts); - } - })(); - }, []); - - const onPress = (key: string): void => { - vibrate(); - - if (key === 'AC') { - setInput(''); - return; - } - - if (key === '+-') { - setInput((prev) => { - if (prev === '0') { - return prev; - } - - if (prev.startsWith('-')) { - return prev.slice(1); - } - - return `-${prev}`; - }); - return; - } - - if (key === '%') { - if (!input.endsWith('%')) { - setInput((prev) => prev + key); - } - return; - } - - if (key === '/') { - if (!input.endsWith('/')) { - setInput((prev) => prev + key); - } - return; - } - - if (key === 'x') { - setInput((prev) => prev + '*'); - return; - } - - if (key === '-') { - if (!input.endsWith('-')) { - setInput((prev) => prev + key); - } - return; - } - - if (key === '+') { - if (!input.endsWith('+')) { - setInput((prev) => prev + key); - } - return; - } - - if (key === '.') { - if (!input.endsWith('.')) { - setInput((prev) => prev + key); - } - return; - } - - if (key === '=') { - onCalculate(); - return; - } - - setInput((prev) => { - return prev + key; - }); - }; - - const onCalculate = async (): Promise => { - // check if input ends with a number - if (!/[0-9]$/.test(input)) { - return; - } - - // Check only for 4 digit numbers - if (input.length === 4 && /^[0-9]+$/.test(input)) { - checkPin(); - return; - } - - try { - // `Function` constructor is safer than eval() - // make sure input doesn't contain anything other than numbers and operators - if (/^[0-9+\-*/().\s]+$/.test(input)) { - // eslint-disable-next-line no-new-func - const result = Function(`"use strict"; return (${input})`)(); - setInput(result.toString()); - } - } catch (e) { - setInput('ERROR'); - setTimeout(() => setInput(''), 2000); - } - }; - - // Reduce the amount of pin attempts remaining - const reduceAttemptsRemaining = useCallback(async (): Promise => { - const attempts = attemptsRemaining - 1; - await setKeychainValue({ - key: 'pinAttemptsRemaining', - value: `${attempts}`, - }); - setAttemptsRemaining(attempts); - }, [attemptsRemaining]); - - const checkPin = async (): Promise => { - const realPIN = await getKeychainValue({ key: 'pin' }); - - // Error getting PIN - if (realPIN.error) { - await reduceAttemptsRemaining(); - vibrate(); - return; - } - - // Incorrect PIN - if (input !== realPIN.data) { - if (attemptsRemaining <= 1) { - vibrate({ type: 'default' }); - await wipeApp(); - showToast({ - type: 'warning', - title: t('wiped_title'), - description: t('wiped_message'), - }); - } else { - await reduceAttemptsRemaining(); - } - - vibrate(); - return; - } - - // Correct PIN, reset pin attempts - await setKeychainValue({ - key: 'pinAttemptsRemaining', - value: PIN_ATTEMPTS, - }); - onSuccess(); - }; - - // No CSS grid, so we need to calculate the button width - const rowWidth = width - 16 * 2; - const gapWidth = 8; - const buttonWidth = (rowWidth - gapWidth * 3) / 4; - const zeroButtonWidth = buttonWidth * 2 + gapWidth; - - return ( - - - - - - {!input ? ( - - 0 - - ) : ( - - {input} - - )} - - - {matrix.map((row, rowIndex) => ( - - {row.map((key, columnIndex) => { - const isFirst = columnIndex === 0; - const isZero = key.value === '0'; - - const style = { - width: buttonWidth, - ...(isFirst ? { marginLeft: 0 } : {}), - ...(isZero ? { width: zeroButtonWidth } : {}), - }; - - return ( -