Skip to content
This repository was archived by the owner on Mar 23, 2023. It is now read-only.

Commit a5c9a63

Browse files
authored
chore: merge develop into master (#418)
chore: merge develop into master
2 parents 57cbeab + 6ce925b commit a5c9a63

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+472
-463
lines changed

β€Žconfig.xmlβ€Ž

Lines changed: 36 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version='1.0' encoding='utf-8'?>
2-
<widget id="io.ark.wallet.mobile" version="1.5.3" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
2+
<widget id="io.ark.wallet.mobile" version="1.5.5" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
33
<name>Ark Mobile</name>
44
<description>ARK</description>
55
<author email="lucio@ark.io" href="http://ark.io/">Ark Ecosystem</author>
@@ -15,7 +15,7 @@
1515
<preference name="fullscreen" value="false" />
1616
<preference name="UseSwiftLanguageVersion" value="5" />
1717
<preference name="android-minSdkVersion" value="19" />
18-
<preference name="android-targetSdkVersion" value="26" />
18+
<preference name="android-targetSdkVersion" value="28" />
1919
<preference name="BackupWebStorage" value="none" />
2020
<preference name="SplashMaintainAspectRatio" value="true" />
2121
<preference name="BackgroundColor" value="0xffedf2f5" />
@@ -28,6 +28,9 @@
2828
<preference name="KeyboardDisplayRequiresUserAction" value="false" />
2929
<preference name="KeyboardResizeMode" value="native" />
3030
<platform name="android">
31+
<edit-config file="app/src/main/AndroidManifest.xml" mode="merge" target="/manifest/application" xmlns:android="http://schemas.android.com/apk/res/android">
32+
<application android:usesCleartextTraffic="true" />
33+
</edit-config>
3134
<preference name="android-manifest/application/activity/@android:windowSoftInputMode" value="adjustPan" />
3235
<allow-intent href="market:*" />
3336
<icon density="ldpi" src="resources/android/icon/drawable-ldpi-icon.png" />
@@ -84,6 +87,19 @@
8487
<splash height="480" src="resources/ios/splash/Default~iphone.png" width="320" />
8588
<icon height="1024" src="resources/ios/icon/icon-1024.png" width="1024" />
8689
<splash height="2732" src="resources/ios/splash/Default@2x~universal~anyany.png" width="2732" />
90+
<icon height="20" src="resources/ios/icon/icon-20.png" width="20" />
91+
<icon height="40" src="resources/ios/icon/icon-20@2x.png" width="40" />
92+
<icon height="60" src="resources/ios/icon/icon-20@3x.png" width="60" />
93+
<icon height="29" src="resources/ios/icon/icon-29.png" width="29" />
94+
<icon height="58" src="resources/ios/icon/icon-29@2x.png" width="58" />
95+
<icon height="87" src="resources/ios/icon/icon-29@3x.png" width="87" />
96+
<icon height="48" src="resources/ios/icon/icon-24@2x.png" width="48" />
97+
<icon height="55" src="resources/ios/icon/icon-27.5@2x.png" width="55" />
98+
<icon height="88" src="resources/ios/icon/icon-44@2x.png" width="88" />
99+
<icon height="172" src="resources/ios/icon/icon-86@2x.png" width="172" />
100+
<icon height="196" src="resources/ios/icon/icon-98@2x.png" width="196" />
101+
<splash height="2436" src="resources/ios/splash/Default-2436h.png" width="1125" />
102+
<splash height="1125" src="resources/ios/splash/Default-Landscape-2436h.png" width="2436" />
87103
</platform>
88104
<feature name="StatusBar">
89105
<param name="ios-package" onload="true" value="CDVStatusBar" />
@@ -92,23 +108,25 @@
92108
<param name="ios-package" value="CDVWKWebViewEngine" />
93109
</feature>
94110
<allow-navigation href="http://localhost:8080/*" />
95-
<plugin name="cordova-plugin-whitelist" spec="^1.3.3" />
96-
<plugin name="cordova-plugin-qrscanner" spec="^2.6.0" />
97-
<plugin name="cordova-custom-config" spec="^5.0.2" />
98-
<plugin name="cordova-plugin-console" spec="^1.1.0" />
99-
<plugin name="cordova-plugin-network-information" spec="^2.0.1" />
100-
<plugin name="cordova-plugin-splashscreen" spec="^5.0.2" />
101-
<plugin name="cordova-plugin-screen-orientation" spec="^3.0.1" />
111+
<plugin name="cordova-plugin-whitelist" spec="^1.3.4" />
112+
<plugin name="cordova-plugin-qrscanner" spec="^3.0.1" />
113+
<plugin name="cordova-custom-config" spec="^5.1.0" />
114+
<plugin name="cordova-plugin-network-information" spec="^2.0.2" />
115+
<plugin name="cordova-plugin-splashscreen" spec="^5.0.3" />
116+
<plugin name="cordova-plugin-screen-orientation" spec="^3.0.2" />
102117
<plugin name="cordova-plugin-add-swift-support" spec="^1.7.2" />
103-
<plugin name="cordova-plugin-device" spec="^2.0.2" />
104-
<plugin name="cordova-plugin-statusbar" spec="^2.4.2" />
105-
<plugin name="cordova-plugin-vibration" spec="^3.1.0" />
106-
<plugin name="cordova-plugin-inappbrowser" spec="^3.0.0" />
107-
<plugin name="cordova-clipboard" spec="^1.2.1" />
108-
<plugin name="cordova-plugin-x-socialsharing" spec="^5.4.3" />
109-
<plugin name="cordova-plugin-ionic-keyboard" spec="^2.1.3" />
118+
<plugin name="cordova-plugin-device" spec="^2.0.3" />
119+
<plugin name="cordova-plugin-statusbar" spec="^2.4.3" />
120+
<plugin name="cordova-plugin-vibration" spec="^3.1.1" />
121+
<plugin name="cordova-plugin-inappbrowser" spec="^3.1.0" />
122+
<plugin name="cordova-clipboard" spec="^1.3.0" />
123+
<plugin name="cordova-plugin-x-socialsharing" spec="^5.6.0">
124+
<variable name="PHOTO_LIBRARY_ADD_USAGE_DESCRIPTION" value="This app requires photo library access to function properly." />
125+
<variable name="PHOTO_LIBRARY_USAGE_DESCRIPTION" value="This app requires photo library access to function properly." />
126+
<variable name="ANDROID_SUPPORT_V4_VERSION" value="24.1.1+" />
127+
</plugin>
128+
<plugin name="cordova-plugin-ionic-keyboard" spec="^2.2.0" />
110129
<plugin name="cordova-sqlite-storage" spec="git+https://github.com/litehelpers/Cordova-sqlite-storage.git" />
111130
<engine name="ios" spec="5.0.1" />
112-
<engine name="browser" spec="^5.0.4" />
113-
<engine name="android" spec="7.1.2" />
131+
<engine name="android" spec="8.1.0" />
114132
</widget>

β€Žpackage.jsonβ€Ž

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "ark-mobile",
3-
"version": "1.5.3",
3+
"version": "1.5.5",
44
"author": {
55
"name": "Lucio Rubens",
66
"email": "luciorubeens@gmail.com",
@@ -70,14 +70,12 @@
7070
"bip39": "^2.5.0",
7171
"chart.js": "^2.8.0",
7272
"cordova-allow-background-audio": "^1.0.2",
73-
"cordova-android": "7.1.2",
74-
"cordova-browser": "^5.0.4",
73+
"cordova-android": "8.1.0",
7574
"cordova-clipboard": "^1.3.0",
7675
"cordova-custom-config": "^5.1.0",
7776
"cordova-ios": "5.0.1",
7877
"cordova-plugin-add-swift-support": "^1.7.2",
7978
"cordova-plugin-compat": "^1.2.0",
80-
"cordova-plugin-console": "^1.1.0",
8179
"cordova-plugin-device": "^2.0.3",
8280
"cordova-plugin-inappbrowser": "^3.1.0",
8381
"cordova-plugin-ionic-keyboard": "^2.2.0",
@@ -154,7 +152,6 @@
154152
"cordova-plugin-whitelist": {},
155153
"cordova-plugin-qrscanner": {},
156154
"cordova-custom-config": {},
157-
"cordova-plugin-console": {},
158155
"cordova-plugin-network-information": {},
159156
"cordova-plugin-splashscreen": {},
160157
"cordova-plugin-screen-orientation": {},
@@ -174,7 +171,6 @@
174171
},
175172
"platforms": [
176173
"ios",
177-
"browser",
178174
"android"
179175
]
180176
}
-37.3 KB
909 Bytes
2.05 KB
3.32 KB
2.56 KB
2.96 KB
1.41 KB
3.2 KB

0 commit comments

Comments
Β (0)