Skip to content

Commit

Permalink
Merge pull request #3033 from bithyve/dev
Browse files Browse the repository at this point in the history 
Build 208
  • Loading branch information
@cakesoft-shashank
cakesoft-shashank authored Jul 19, 2023
2 parents 15568ca + 6064452 commit 32acb94
Show file tree
Hide file tree
Showing 61 changed files with 1,366 additions and 181 deletions.
4 changes: 2 additions & 2 deletions android/app/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -147,8 +147,8 @@ android {
applicationId "io.hexawallet.keeper"
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 206
versionName "1.0.7"
versionCode 208
versionName "1.0.8"
missingDimensionStrategy 'react-native-camera', 'general'
missingDimensionStrategy 'store', 'play'
multiDexEnabled true
Expand Down
3 changes: 3 additions & 0 deletions android/app/src/main/AndroidManifest.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@
<uses-permission android:name="com.android.vending.BILLING" />
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
<uses-permission android:name="android.permission.DOWNLOAD_WITHOUT_NOTIFICATION" />

<application
android:name=".MainApplication"
android:label="@string/app_name"
Expand All @@ -42,6 +44,7 @@
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
<action android:name="android.intent.action.DOWNLOAD_COMPLETE"/>
</intent-filter>

<intent-filter android:label="@string/backup_with_keeper">
Expand Down
50 changes: 42 additions & 8 deletions ios/hexa_keeper.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,14 @@
13B07FBC1A68108700A75B9A /* AppDelegate.mm in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB01A68108700A75B9A /* AppDelegate.mm */; };
13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB51A68108700A75B9A /* Images.xcassets */; };
13B07FC11A68108700A75B9A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; };
183722102A651CBD00120228 /* FiraSansCondensed-Light.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 183722072A651CBD00120228 /* FiraSansCondensed-Light.ttf */; };
183722112A651CBD00120228 /* FiraSansCondensed-Bold.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 183722082A651CBD00120228 /* FiraSansCondensed-Bold.ttf */; };
183722122A651CBD00120228 /* FiraSansCondensed-Regular.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 183722092A651CBD00120228 /* FiraSansCondensed-Regular.ttf */; };
183722132A651CBD00120228 /* FiraSansCondensed-Italic.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 1837220A2A651CBD00120228 /* FiraSansCondensed-Italic.ttf */; };
183722142A651CBD00120228 /* FiraSansCondensed-Medium.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 1837220C2A651CBD00120228 /* FiraSansCondensed-Medium.ttf */; };
183722152A651CBD00120228 /* FiraSansCondensed-SemiBold.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 1837220D2A651CBD00120228 /* FiraSansCondensed-SemiBold.ttf */; };
183722162A651CBD00120228 /* FiraSansCondensed-LightItalic.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 1837220E2A651CBD00120228 /* FiraSansCondensed-LightItalic.ttf */; };
183722172A651CBD00120228 /* FiraSansCondensed-BoldItalic.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 1837220F2A651CBD00120228 /* FiraSansCondensed-BoldItalic.ttf */; };
183A61952A1F72A700E4DAF9 /* FiraSansCondensed-MediumItalic.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 183A61942A1F72A700E4DAF9 /* FiraSansCondensed-MediumItalic.ttf */; };
183A61962A1F72A700E4DAF9 /* FiraSansCondensed-MediumItalic.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 183A61942A1F72A700E4DAF9 /* FiraSansCondensed-MediumItalic.ttf */; };
18788ED8284652050002EFFD /* BuildFile in Resources */ = {isa = PBXBuildFile; };
Expand Down Expand Up @@ -80,6 +88,15 @@
13B07FB51A68108700A75B9A /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Images.xcassets; path = hexa_keeper/Images.xcassets; sourceTree = "<group>"; };
13B07FB61A68108700A75B9A /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = hexa_keeper/Info.plist; sourceTree = "<group>"; };
13B07FB71A68108700A75B9A /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = main.m; path = hexa_keeper/main.m; sourceTree = "<group>"; };
183722072A651CBD00120228 /* FiraSansCondensed-Light.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "FiraSansCondensed-Light.ttf"; path = "../src/assets/fonts/FiraSansCondensed-Light.ttf"; sourceTree = "<group>"; };
183722082A651CBD00120228 /* FiraSansCondensed-Bold.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "FiraSansCondensed-Bold.ttf"; path = "../src/assets/fonts/FiraSansCondensed-Bold.ttf"; sourceTree = "<group>"; };
183722092A651CBD00120228 /* FiraSansCondensed-Regular.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "FiraSansCondensed-Regular.ttf"; path = "../src/assets/fonts/FiraSansCondensed-Regular.ttf"; sourceTree = "<group>"; };
1837220A2A651CBD00120228 /* FiraSansCondensed-Italic.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "FiraSansCondensed-Italic.ttf"; path = "../src/assets/fonts/FiraSansCondensed-Italic.ttf"; sourceTree = "<group>"; };
1837220B2A651CBD00120228 /* FiraSansCondensed-MediumItalic.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "FiraSansCondensed-MediumItalic.ttf"; path = "../src/assets/fonts/FiraSansCondensed-MediumItalic.ttf"; sourceTree = "<group>"; };
1837220C2A651CBD00120228 /* FiraSansCondensed-Medium.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "FiraSansCondensed-Medium.ttf"; path = "../src/assets/fonts/FiraSansCondensed-Medium.ttf"; sourceTree = "<group>"; };
1837220D2A651CBD00120228 /* FiraSansCondensed-SemiBold.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "FiraSansCondensed-SemiBold.ttf"; path = "../src/assets/fonts/FiraSansCondensed-SemiBold.ttf"; sourceTree = "<group>"; };
1837220E2A651CBD00120228 /* FiraSansCondensed-LightItalic.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "FiraSansCondensed-LightItalic.ttf"; path = "../src/assets/fonts/FiraSansCondensed-LightItalic.ttf"; sourceTree = "<group>"; };
1837220F2A651CBD00120228 /* FiraSansCondensed-BoldItalic.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "FiraSansCondensed-BoldItalic.ttf"; path = "../src/assets/fonts/FiraSansCondensed-BoldItalic.ttf"; sourceTree = "<group>"; };
183A61942A1F72A700E4DAF9 /* FiraSansCondensed-MediumItalic.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "FiraSansCondensed-MediumItalic.ttf"; path = "../src/assets/fonts/FiraSansCondensed-MediumItalic.ttf"; sourceTree = "<group>"; };
1882E88F2A4C338A009C9E0C /* FiraSansCondensed-MediumItalic.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "FiraSansCondensed-MediumItalic.ttf"; path = "../src/assets/fonts/FiraSansCondensed-MediumItalic.ttf"; sourceTree = "<group>"; };
1882E8902A4C338A009C9E0C /* FiraSansCondensed-Italic.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "FiraSansCondensed-Italic.ttf"; path = "../src/assets/fonts/FiraSansCondensed-Italic.ttf"; sourceTree = "<group>"; };
Expand Down Expand Up @@ -227,15 +244,24 @@
83CBB9F61A601CBA00E9B192 = {
isa = PBXGroup;
children = (
1837220E2A651CBD00120228 /* FiraSansCondensed-LightItalic.ttf */,
18E8B2B32A52DC960065205F /* FiraSansCondensed-Medium.ttf */,
18E8B2B12A52D6F10065205F /* FiraSansCondensed-SemiBold.ttf */,
1882E89A2A4C3535009C9E0C /* FiraSansCondensed-BoldItalic.ttf */,
1882E8922A4C338A009C9E0C /* FiraSansCondensed-Bold.ttf */,
1837220F2A651CBD00120228 /* FiraSansCondensed-BoldItalic.ttf */,
1882E8902A4C338A009C9E0C /* FiraSansCondensed-Italic.ttf */,
183722082A651CBD00120228 /* FiraSansCondensed-Bold.ttf */,
1837220A2A651CBD00120228 /* FiraSansCondensed-Italic.ttf */,
1882E8912A4C338A009C9E0C /* FiraSansCondensed-Light.ttf */,
1882E8942A4C338A009C9E0C /* FiraSansCondensed-LightItalic.ttf */,
1837220C2A651CBD00120228 /* FiraSansCondensed-Medium.ttf */,
1882E88F2A4C338A009C9E0C /* FiraSansCondensed-MediumItalic.ttf */,
1837220B2A651CBD00120228 /* FiraSansCondensed-MediumItalic.ttf */,
1882E8932A4C338A009C9E0C /* FiraSansCondensed-Regular.ttf */,
183722072A651CBD00120228 /* FiraSansCondensed-Light.ttf */,
183722092A651CBD00120228 /* FiraSansCondensed-Regular.ttf */,
1837220D2A651CBD00120228 /* FiraSansCondensed-SemiBold.ttf */,
F4F7F75B2A0558220027FE4C /* keepScreenAwake */,
1F9F461229BF9D5D006C129F /* whirlpool */,
13B07FAE1A68108700A75B9A /* hexa_keeper */,
Expand Down Expand Up @@ -425,7 +451,15 @@
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
183722102A651CBD00120228 /* FiraSansCondensed-Light.ttf in Resources */,
183722112A651CBD00120228 /* FiraSansCondensed-Bold.ttf in Resources */,
183722122A651CBD00120228 /* FiraSansCondensed-Regular.ttf in Resources */,
183722132A651CBD00120228 /* FiraSansCondensed-Italic.ttf in Resources */,
183A61952A1F72A700E4DAF9 /* FiraSansCondensed-MediumItalic.ttf in Resources */,
183722142A651CBD00120228 /* FiraSansCondensed-Medium.ttf in Resources */,
183722152A651CBD00120228 /* FiraSansCondensed-SemiBold.ttf in Resources */,
183722162A651CBD00120228 /* FiraSansCondensed-LightItalic.ttf in Resources */,
183722172A651CBD00120228 /* FiraSansCondensed-BoldItalic.ttf in Resources */,
81AB9BB82411601600AC10FF /* LaunchScreen.storyboard in Resources */,
13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */,
18BD1AA02834FA4100DB19E0 /* BuildFile in Resources */,
Expand Down Expand Up @@ -780,7 +814,7 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = hexa_keeper/hexa_keeper.entitlements;
CURRENT_PROJECT_VERSION = 206;
CURRENT_PROJECT_VERSION = 208;
DEVELOPMENT_TEAM = Y5TCB759QL;
ENABLE_BITCODE = NO;
HEADER_SEARCH_PATHS = (
Expand Down Expand Up @@ -887,7 +921,7 @@
"$(inherited)",
"\"$(SRCROOT)\"",
);
MARKETING_VERSION = 1.0.7;
MARKETING_VERSION = 1.0.8;
OTHER_LDFLAGS = (
"$(inherited)",
"-ObjC",
Expand All @@ -909,7 +943,7 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = hexa_keeper/hexa_keeper.entitlements;
CURRENT_PROJECT_VERSION = 206;
CURRENT_PROJECT_VERSION = 208;
DEVELOPMENT_TEAM = Y5TCB759QL;
HEADER_SEARCH_PATHS = (
"$(inherited)",
Expand Down Expand Up @@ -1015,7 +1049,7 @@
"$(inherited)",
"\"$(SRCROOT)\"",
);
MARKETING_VERSION = 1.0.7;
MARKETING_VERSION = 1.0.8;
OTHER_LDFLAGS = (
"$(inherited)",
"-ObjC",
Expand Down Expand Up @@ -1159,7 +1193,7 @@
ASSETCATALOG_COMPILER_APPICON_NAME = "dev-AppIcon";
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = hexa_keeper_dev.entitlements;
CURRENT_PROJECT_VERSION = 206;
CURRENT_PROJECT_VERSION = 208;
DEVELOPMENT_TEAM = Y5TCB759QL;
ENABLE_BITCODE = NO;
HEADER_SEARCH_PATHS = (
Expand Down Expand Up @@ -1267,7 +1301,7 @@
"$(PROJECT_DIR)",
"\"$(SRCROOT)\"",
);
MARKETING_VERSION = 1.0.7;
MARKETING_VERSION = 1.0.8;
OTHER_LDFLAGS = (
"$(inherited)",
"-ObjC",
Expand All @@ -1290,7 +1324,7 @@
ASSETCATALOG_COMPILER_APPICON_NAME = "dev-AppIcon";
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = hexa_keeper_dev.entitlements;
CURRENT_PROJECT_VERSION = 206;
CURRENT_PROJECT_VERSION = 208;
DEVELOPMENT_TEAM = Y5TCB759QL;
HEADER_SEARCH_PATHS = (
"$(inherited)",
Expand Down Expand Up @@ -1397,7 +1431,7 @@
"$(PROJECT_DIR)",
"\"$(SRCROOT)\"",
);
MARKETING_VERSION = 1.0.7;
MARKETING_VERSION = 1.0.8;
OTHER_LDFLAGS = (
"$(inherited)",
"-ObjC",
Expand Down
4 changes: 3 additions & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "hexa_keeper",
"version": "1.0.7",
"version": "1.0.8",
"private": true,
"scripts": {
"ios": "react-native run-ios",
Expand Down Expand Up @@ -66,6 +66,7 @@
"react-localization": "^1.0.18",
"react-native": "0.68.2",
"react-native-biometrics": "2.2.0",
"react-native-blob-util": "^0.18.3",
"react-native-camera": "^4.2.1",
"react-native-config": "^1.4.5",
"react-native-crypto": "^2.1.0",
Expand All @@ -92,6 +93,7 @@
"react-native-screens": "^3.13.1",
"react-native-send-intent": "^1.3.0",
"react-native-shadow-2": "^6.0.3",
"react-native-share": "^9.2.2",
"react-native-size-matters": "^0.4.0",
"react-native-svg": "^12.3.0",
"react-native-svg-transformer": "^1.0.0",
Expand Down
20 changes: 13 additions & 7 deletions src/assets/images/LETTER.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 10 additions & 0 deletions src/assets/images/LETTER_IKS.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
18 changes: 18 additions & 0 deletions src/assets/images/SafeguardingTips.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
18 changes: 18 additions & 0 deletions src/assets/images/SetupIK.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 32acb94

Please sign in to comment.