diff --git a/ios/Fonts/MaterialCommunityIcons.ttf b/ios/Fonts/MaterialCommunityIcons.ttf new file mode 100644 index 0000000..ba87359 Binary files /dev/null and b/ios/Fonts/MaterialCommunityIcons.ttf differ diff --git a/ios/Podfile b/ios/Podfile index 4e817c4..f79d687 100644 --- a/ios/Podfile +++ b/ios/Podfile @@ -20,8 +20,6 @@ end target 'dfuapp' do config = use_native_modules! - pod 'RNVectorIcons', :path => '../node_modules/react-native-vector-icons' - use_react_native!( :path => config[:reactNativePath], # An absolute path to your application root. diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 41ff88a..79f0aa7 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -2715,6 +2715,6 @@ SPEC CHECKSUMS: Yoga: a3ed390a19db0459bd6839823a6ac6d9c6db198d ZIPFoundation: b8c29ea7ae353b309bc810586181fd073cb3312c -PODFILE CHECKSUM: e355c95d6768dc6e2cefb822baab7ea0d98c9440 +PODFILE CHECKSUM: a23d7c8b0484328e91cacd79617607a52e3cf7fb COCOAPODS: 1.16.2 diff --git a/ios/dfuapp.xcodeproj/project.pbxproj b/ios/dfuapp.xcodeproj/project.pbxproj index 1ef932c..0bb9605 100644 --- a/ios/dfuapp.xcodeproj/project.pbxproj +++ b/ios/dfuapp.xcodeproj/project.pbxproj @@ -27,6 +27,7 @@ 81AB9BB72411601600AC10FF /* LaunchScreen.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = LaunchScreen.storyboard; path = dfuapp/LaunchScreen.storyboard; sourceTree = ""; }; 82A7EFF12EFD325200209B1F /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = ""; }; 82A7EFF32EFD325E00209B1F /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/InfoPlist.strings"; sourceTree = ""; }; + 82A7EFF72EFD3C7000209B1F /* MaterialCommunityIcons.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = MaterialCommunityIcons.ttf; sourceTree = ""; }; ED297162215061F000B7C4FE /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = System/Library/Frameworks/JavaScriptCore.framework; sourceTree = SDKROOT; }; /* End PBXFileReference section */ @@ -45,6 +46,7 @@ 13B07FAE1A68108700A75B9A /* dfuapp */ = { isa = PBXGroup; children = ( + 82A7EFF82EFD3C7000209B1F /* Fonts */, 82A7EFF02EFD325200209B1F /* InfoPlist.strings */, 13B07FB51A68108700A75B9A /* Images.xcassets */, 761780EC2CA45674006654EE /* AppDelegate.swift */, @@ -64,6 +66,14 @@ name = Frameworks; sourceTree = ""; }; + 82A7EFF82EFD3C7000209B1F /* Fonts */ = { + isa = PBXGroup; + children = ( + 82A7EFF72EFD3C7000209B1F /* MaterialCommunityIcons.ttf */, + ); + path = Fonts; + sourceTree = ""; + }; 832341AE1AAA6A7D00B99B32 /* Libraries */ = { isa = PBXGroup; children = ( @@ -287,7 +297,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0.0; + MARKETING_VERSION = 1.0.1; OTHER_LDFLAGS = ( "$(inherited)", "-ObjC", @@ -316,7 +326,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0.0; + MARKETING_VERSION = 1.0.1; OTHER_LDFLAGS = ( "$(inherited)", "-ObjC", diff --git a/ios/dfuapp/Info.plist b/ios/dfuapp/Info.plist index ef7d728..d20c68b 100644 --- a/ios/dfuapp/Info.plist +++ b/ios/dfuapp/Info.plist @@ -53,5 +53,9 @@ UIViewControllerBasedStatusBarAppearance + UIAppFonts + + MaterialCommunityIcons.ttf + diff --git a/package.json b/package.json index 56895fa..db6986c 100644 --- a/package.json +++ b/package.json @@ -28,8 +28,8 @@ "react-native-device-info": "^15.0.1", "react-native-fs": "^2.20.0", "react-native-safe-area-context": "^5.6.1", + "react-native-safearea-height": "^1.0.8", "react-native-screens": "^4.16.0", - "react-native-status-bar-height": "^2.6.0", "react-native-toast-message": "^2.3.3", "react-native-vector-icons": "^10.3.0" }, diff --git a/src/helper/helper.js b/src/helper/helper.js index b1a6c6a..ba38a93 100644 --- a/src/helper/helper.js +++ b/src/helper/helper.js @@ -1,6 +1,6 @@ import { Dimensions, StatusBar, Platform, Linking } from 'react-native'; import pxToDp from './pxToDp'; -import { getStatusBarHeight } from 'react-native-status-bar-height'; +import { getStatusBarHeight } from 'react-native-safearea-height'; import * as _ from 'lodash'; import myToast, { Toast } from './myToast'; export default { diff --git a/yarn.lock b/yarn.lock index bbd935a..2d3e6e5 100644 --- a/yarn.lock +++ b/yarn.lock @@ -980,20 +980,7 @@ "@babel/parser" "^7.27.2" "@babel/types" "^7.27.1" -"@babel/traverse--for-generate-function-map@npm:@babel/traverse@^7.25.3": - version "7.28.4" - resolved "https://registry.npmjs.org/@babel/traverse/-/traverse-7.28.4.tgz" - integrity sha512-YEzuboP2qvQavAcjgQNVgsvHIDv6ZpwXvcvjmyySP2DIMuByS/6ioU5G9pYrWHM6T2YDfc7xga9iNzYOs12CFQ== - dependencies: - "@babel/code-frame" "^7.27.1" - "@babel/generator" "^7.28.3" - "@babel/helper-globals" "^7.28.0" - "@babel/parser" "^7.28.4" - "@babel/template" "^7.27.2" - "@babel/types" "^7.28.4" - debug "^4.3.1" - -"@babel/traverse@^7.25.3", "@babel/traverse@^7.27.1", "@babel/traverse@^7.28.0", "@babel/traverse@^7.28.3", "@babel/traverse@^7.28.4": +"@babel/traverse--for-generate-function-map@npm:@babel/traverse@^7.25.3", "@babel/traverse@^7.25.3", "@babel/traverse@^7.27.1", "@babel/traverse@^7.28.0", "@babel/traverse@^7.28.3", "@babel/traverse@^7.28.4": version "7.28.4" resolved "https://registry.npmjs.org/@babel/traverse/-/traverse-7.28.4.tgz" integrity sha512-YEzuboP2qvQavAcjgQNVgsvHIDv6ZpwXvcvjmyySP2DIMuByS/6ioU5G9pYrWHM6T2YDfc7xga9iNzYOs12CFQ== @@ -5553,6 +5540,11 @@ react-native-safe-area-context@^5.6.1: resolved "https://registry.npmjs.org/react-native-safe-area-context/-/react-native-safe-area-context-5.6.1.tgz" integrity sha512-/wJE58HLEAkATzhhX1xSr+fostLsK8Q97EfpfMDKo8jlOc1QKESSX/FQrhk7HhQH/2uSaox4Y86sNaI02kteiA== +react-native-safearea-height@^1.0.8: + version "1.0.8" + resolved "https://registry.npmmirror.com/react-native-safearea-height/-/react-native-safearea-height-1.0.8.tgz#efa2cecc2dfb2368288c435603ade3ee9c695479" + integrity sha512-nAACsA6HwbMI5zUKHUy4IOvqrohA2AFYB31Yhv6JOXbok6S7VOjOWJZNJx4dllECREon254Y2ZlqeVGUb2eqgQ== + react-native-screens@^4.16.0: version "4.16.0" resolved "https://registry.npmjs.org/react-native-screens/-/react-native-screens-4.16.0.tgz" @@ -5562,11 +5554,6 @@ react-native-screens@^4.16.0: react-native-is-edge-to-edge "^1.2.1" warn-once "^0.1.0" -react-native-status-bar-height@^2.6.0: - version "2.6.0" - resolved "https://repo.huaweicloud.com/repository/npm/react-native-status-bar-height/-/react-native-status-bar-height-2.6.0.tgz#b6afd25b6e3d533c43d0fcdcfd5cafd775592cea" - integrity sha512-z3SGLF0mHT+OlJDq7B7h/jXPjWcdBT3V14Le5L2PjntjjWM3+EJzq2BcXDwV+v67KFNJic5pgA26cCmseYek6w== - react-native-toast-message@^2.3.3: version "2.3.3" resolved "https://repo.huaweicloud.com/repository/npm/react-native-toast-message/-/react-native-toast-message-2.3.3.tgz#e301508d386a9902ff6b4559ecc6674f8cfdf97a"