Skip to content

Commit b7c9871

Browse files
ThalesBMCThalesBMC
authored
Merge pull request #131 from syscoin/dev
feat: dev
2 parents 1f8ab46 + a4f72fb commit b7c9871

File tree

97 files changed

+11947
-6848
lines changed

Some content is hidden

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

97 files changed

+11947
-6848
lines changed

‎.gitattributes

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
*.pbxproj -text
2-
# specific for windows script files
3-
*.bat text eol=crlf
1+
# Windows files should use crlf line endings
2+
# https://help.github.com/articles/dealing-with-line-endings/
3+
*.bat text eol=crlf

‎app/.prettierrc.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ module.exports = {
22
bracketSpacing: false,
33
jsxBracketSameLine: true,
44
singleQuote: true,
5+
arrowParens: 'avoid',
56
trailingComma: 'all',
67
arrowParens: 'avoid'
78
};

‎app/.ruby-version

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
2.7.4

‎app/GemFile

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
source 'https://rubygems.org'
2+
3+
# You may use http://rbenv.org/ or https://rvm.io/ to install and use this version
4+
ruby '2.7.4'
5+
6+
gem 'cocoapods', '~> 1.11', '>= 1.11.2'

‎app/Gemfile.lock

Lines changed: 100 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,100 @@
1+
GEM
2+
remote: https://rubygems.org/
3+
specs:
4+
CFPropertyList (3.0.5)
5+
rexml
6+
activesupport (6.1.4.4)
7+
concurrent-ruby (~> 1.0, >= 1.0.2)
8+
i18n (>= 1.6, < 2)
9+
minitest (>= 5.1)
10+
tzinfo (~> 2.0)
11+
zeitwerk (~> 2.3)
12+
addressable (2.8.0)
13+
public_suffix (>= 2.0.2, < 5.0)
14+
algoliasearch (1.27.5)
15+
httpclient (~> 2.8, >= 2.8.3)
16+
json (>= 1.5.1)
17+
atomos (0.1.3)
18+
claide (1.1.0)
19+
cocoapods (1.11.2)
20+
addressable (~> 2.8)
21+
claide (>= 1.0.2, < 2.0)
22+
cocoapods-core (= 1.11.2)
23+
cocoapods-deintegrate (>= 1.0.3, < 2.0)
24+
cocoapods-downloader (>= 1.4.0, < 2.0)
25+
cocoapods-plugins (>= 1.0.0, < 2.0)
26+
cocoapods-search (>= 1.0.0, < 2.0)
27+
cocoapods-trunk (>= 1.4.0, < 2.0)
28+
cocoapods-try (>= 1.1.0, < 2.0)
29+
colored2 (~> 3.1)
30+
escape (~> 0.0.4)
31+
fourflusher (>= 2.3.0, < 3.0)
32+
gh_inspector (~> 1.0)
33+
molinillo (~> 0.8.0)
34+
nap (~> 1.0)
35+
ruby-macho (>= 1.0, < 3.0)
36+
xcodeproj (>= 1.21.0, < 2.0)
37+
cocoapods-core (1.11.2)
38+
activesupport (>= 5.0, < 7)
39+
addressable (~> 2.8)
40+
algoliasearch (~> 1.0)
41+
concurrent-ruby (~> 1.1)
42+
fuzzy_match (~> 2.0.4)
43+
nap (~> 1.0)
44+
netrc (~> 0.11)
45+
public_suffix (~> 4.0)
46+
typhoeus (~> 1.0)
47+
cocoapods-deintegrate (1.0.5)
48+
cocoapods-downloader (1.5.1)
49+
cocoapods-plugins (1.0.0)
50+
nap
51+
cocoapods-search (1.0.1)
52+
cocoapods-trunk (1.6.0)
53+
nap (>= 0.8, < 2.0)
54+
netrc (~> 0.11)
55+
cocoapods-try (1.2.0)
56+
colored2 (3.1.2)
57+
concurrent-ruby (1.1.9)
58+
escape (0.0.4)
59+
ethon (0.15.0)
60+
ffi (>= 1.15.0)
61+
ffi (1.15.5)
62+
fourflusher (2.3.1)
63+
fuzzy_match (2.0.4)
64+
gh_inspector (1.1.3)
65+
httpclient (2.8.3)
66+
i18n (1.8.11)
67+
concurrent-ruby (~> 1.0)
68+
json (2.6.1)
69+
minitest (5.15.0)
70+
molinillo (0.8.0)
71+
nanaimo (0.3.0)
72+
nap (1.1.0)
73+
netrc (0.11.0)
74+
public_suffix (4.0.6)
75+
rexml (3.2.5)
76+
ruby-macho (2.5.1)
77+
typhoeus (1.4.0)
78+
ethon (>= 0.9.0)
79+
tzinfo (2.0.4)
80+
concurrent-ruby (~> 1.0)
81+
xcodeproj (1.21.0)
82+
CFPropertyList (>= 2.3.3, < 4.0)
83+
atomos (~> 0.1.3)
84+
claide (>= 1.0.2, < 2.0)
85+
colored2 (~> 3.1)
86+
nanaimo (~> 0.3.0)
87+
rexml (~> 3.2.4)
88+
zeitwerk (2.5.3)
89+
90+
PLATFORMS
91+
ruby
92+
93+
DEPENDENCIES
94+
cocoapods (~> 1.11, >= 1.11.2)
95+
96+
RUBY VERSION
97+
ruby 2.7.4p191
98+
99+
BUNDLED WITH
100+
2.2.27

‎app/android/app/build.gradle

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -32,27 +32,28 @@ def jscFlavor = 'org.webkit:android-jsc:+'
3232
/**
3333
* Whether to enable the Hermes VM.
3434
*
35-
* This should be set on project.ext.react and mirrored here. If it is not set
35+
* This should be set on project.ext.react and that value will be read here. If it is not set
3636
* on project.ext.react, JavaScript will not be compiled to Hermes Bytecode
3737
* and the benefits of using Hermes will therefore be sharply reduced.
3838
*/
3939
def enableHermes = project.ext.react.get("enableHermes", false)
4040

41+
/**
42+
* Architectures to build native code for in debug.
43+
*/
44+
def nativeArchitectures = project.getProperties().get("reactNativeDebugArchitectures")
45+
4146
android {
4247

4348
compileSdkVersion rootProject.ext.compileSdkVersion
4449

45-
compileOptions {
46-
sourceCompatibility JavaVersion.VERSION_1_8
47-
targetCompatibility JavaVersion.VERSION_1_8
48-
}
4950

5051
defaultConfig {
5152
applicationId "io.paliwallet"
5253
minSdkVersion rootProject.ext.minSdkVersion
5354
targetSdkVersion rootProject.ext.targetSdkVersion
54-
versionCode 19
55-
versionName "1.0.8"
55+
versionCode 30
56+
versionName "1.1.4"
5657
multiDexEnabled true
5758
missingDimensionStrategy "minReactNative", "minReactNative46"
5859
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -93,6 +94,11 @@ android {
9394
debug {
9495
manifestPlaceholders = [isDebug:true]
9596
signingConfig signingConfigs.debug
97+
if (nativeArchitectures) {
98+
ndk {
99+
abiFilters nativeArchitectures.split(',')
100+
}
101+
}
96102
}
97103
release {
98104
manifestPlaceholders = [isDebug:false]
@@ -106,6 +112,7 @@ android {
106112
dependencies {
107113
implementation fileTree(dir: 'libs', include: ['*.jar'])
108114
implementation project(':lottie-react-native')
115+
implementation project(':react-native-lottie-splash-screen')
109116
implementation project(":react-native-haptic-feedback")
110117
implementation project(':react-native-gesture-handler')
111118
implementation project(path: ":@react-native-firebase_analytics")
@@ -117,7 +124,7 @@ dependencies {
117124
implementation 'org.chromium:v8-android:+'
118125

119126
implementation 'com.google.android.gms:play-services-wallet:18.0.0'
120-
127+
121128
androidTestImplementation('com.wix:detox:+') { transitive = true }
122129
androidTestImplementation 'junit:junit:4.12'
123130

‎app/android/app/proguard-rules.pro

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,10 @@
1717
#}
1818

1919

20+
# react-native-reanimated https://docs.swmansion.com/react-native-reanimated/docs/fundamentals/installation
21+
-keep class com.facebook.react.turbomodule.** { *; }
22+
23+
2024
# react native keychain https://github.com/oblador/react-native-keychain#proguard-rules
2125
-keep class com.facebook.crypto.** {
2226
*;

‎app/android/app/src/debug/AndroidManifest.xml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,10 @@
44

55
<uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
66

7-
<application android:usesCleartextTraffic="true" tools:targetApi="28" tools:ignore="GoogleAppIndexingWarning" />
7+
<application
8+
android:usesCleartextTraffic="true"
9+
tools:targetApi="28"
10+
tools:ignore="GoogleAppIndexingWarning">
11+
12+
</application>
813
</manifest>

‎app/android/app/src/main/java/io/gopocket/MainActivity.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
package io.paliwallet;
22

33
import com.facebook.react.ReactActivityDelegate;
4-
import com.facebook.react.ReactFragmentActivity;
4+
import com.facebook.react.ReactActivity;
55
import com.facebook.react.ReactRootView;
66
import com.swmansion.gesturehandler.react.RNGestureHandlerEnabledRootView;
7-
87
import android.content.Intent;
98
import android.content.pm.ApplicationInfo;
109
import android.content.pm.PackageManager;
@@ -15,7 +14,8 @@
1514

1615
import org.devio.rn.splashscreen.SplashScreen;
1716

18-
public class MainActivity extends ReactFragmentActivity {
17+
18+
public class MainActivity extends ReactActivity {
1919

2020
/**
2121
* Returns the name of the main component registered from JavaScript. This is used to schedule
@@ -34,7 +34,8 @@ protected void onStart() {
3434

3535
@Override
3636
protected void onCreate(Bundle savedInstanceState) {
37-
SplashScreen.show(this);
37+
SplashScreen.show(this, R.id.lottie); // here
38+
SplashScreen.setAnimationFinished(true);// If you want the animation dialog to be forced to close when hide is called, use this code
3839
super.onCreate(null);
3940
}
4041
@Override

‎app/android/app/src/main/java/io/gopocket/MainApplication.java

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@
1616
import java.util.List;
1717
import io.invertase.firebase.analytics.ReactNativeFirebaseAnalyticsPackage;
1818
import io.paliwallet.nativeModules.PreventScreenshotPackage;
19+
import com.swmansion.reanimated.ReanimatedJSIModulePackage;
20+
import com.facebook.react.bridge.JSIModulePackage;
1921

2022
import android.text.TextUtils;
2123

@@ -103,6 +105,11 @@ protected List<ReactPackage> getPackages() {
103105
protected String getJSMainModuleName() {
104106
return "index";
105107
}
108+
109+
@Override
110+
protected JSIModulePackage getJSIModulePackage() {
111+
return new ReanimatedJSIModulePackage();
112+
}
106113
};
107114

108115
@Override

‎app/android/app/src/main/res/drawable/rn_edit_text_material.xml

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<!-- Copyright (C) 2014 The Android Open Source Project
3+
4+
Licensed under the Apache License, Version 2.0 (the "License");
5+
you may not use this file except in compliance with the License.
6+
You may obtain a copy of the License at
7+
8+
http://www.apache.org/licenses/LICENSE-2.0
9+
10+
Unless required by applicable law or agreed to in writing, software
11+
distributed under the License is distributed on an "AS IS" BASIS,
12+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
See the License for the specific language governing permissions and
14+
limitations under the License.
15+
-->
16+
<inset xmlns:android="http://schemas.android.com/apk/res/android"
17+
android:insetLeft="@dimen/abc_edit_text_inset_horizontal_material"
18+
android:insetRight="@dimen/abc_edit_text_inset_horizontal_material"
19+
android:insetTop="@dimen/abc_edit_text_inset_top_material"
20+
android:insetBottom="@dimen/abc_edit_text_inset_bottom_material">
21+
22+
<selector>
23+
<!--
24+
This file is a copy of abc_edit_text_material (https://bit.ly/3k8fX7I).
25+
The item below with state_pressed="false" and state_focused="false" causes a NullPointerException.
26+
NullPointerException:tempt to invoke virtual method 'android.graphics.drawable.Drawable android.graphics.drawable.Drawable$ConstantState.newDrawable(android.content.res.Resources)'
27+
28+
<item android:state_pressed="false" android:state_focused="false" android:drawable="@drawable/abc_textfield_default_mtrl_alpha"/>
29+
30+
For more info, see https://bit.ly/3CdLStv (react-native/pull/29452) and https://bit.ly/3nxOMoR.
31+
-->
32+
<item android:state_enabled="false" android:drawable="@drawable/abc_textfield_default_mtrl_alpha"/>
33+
<item android:drawable="@drawable/abc_textfield_activated_mtrl_alpha"/>
34+
</selector>
35+
36+
</inset>

‎app/android/app/src/main/res/layout/launch_screen.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
android:layout_height="match_parent"
88
android:background="#ffffffff">
99
<com.airbnb.lottie.LottieAnimationView
10+
android:id="@+id/lottie"
1011
android:layout_centerHorizontal="true"
1112
android:layout_width="375dp"
1213
android:layout_height="812dp"

‎app/android/app/src/main/res/values/styles.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<!-- Base application theme. -->
44
<style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
55
<!-- Customize your theme here. -->
6-
6+
<item name="android:editTextBackground">@drawable/rn_edit_text_material</item>
77
<item name="android:windowIsTranslucent">true</item>
88
</style>
99

‎app/android/build.gradle

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,29 +4,30 @@ def REACT_NATIVE_VERSION = new File(['node', '--print',"JSON.parse(require('fs')
44
buildscript {
55

66
ext {
7-
buildToolsVersion = "29.0.2"
8-
minSdkVersion = 19
9-
compileSdkVersion = 29
10-
targetSdkVersion = 31
7+
buildToolsVersion = "30.0.3"
8+
minSdkVersion = 21
9+
compileSdkVersion = 33
10+
targetSdkVersion = 33
1111
kotlin_version = "1.3.50"
1212
kotlinVersion = "$kotlin_version"
1313
}
1414
repositories {
1515
google()
16+
mavenCentral()
1617
gradlePluginPortal()
17-
maven { url 'https://repo1.maven.org/maven2/' }
18+
1819
}
1920

2021
dependencies {
21-
classpath('com.android.tools.build:gradle:4.0.1')
22+
classpath('com.android.tools.build:gradle:4.2.2')
2223
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
2324
classpath('com.google.gms:google-services:4.3.3')
2425
}
2526
}
2627

2728
allprojects {
2829
repositories {
29-
mavenLocal()
30+
3031
maven { // Replace AAR from original RN with AAR from react-native-v8
3132
url("$rootDir/../node_modules/react-native-v8/dist")
3233
}
@@ -49,11 +50,18 @@ allprojects {
4950
maven {
5051
url("${project(':react-native-minimizer').projectDir}/libs")
5152
}
53+
mavenCentral {
54+
// We don't want to fetch react-native from Maven Central as there are
55+
// older versions over there.
56+
content {
57+
excludeGroup "com.facebook.react"
58+
}
59+
}
5260
google()
53-
mavenCentral()
61+
5462
maven { url 'https://www.jitpack.io' }
5563
gradlePluginPortal()
56-
maven { url 'https://repo1.maven.org/maven2/' }
64+
5765
}
5866

5967
subprojects {

‎app/android/gradle.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
# Specifies the JVM arguments used for the daemon process.
1111
# The setting is particularly useful for tweaking memory settings.
12-
# Default value: -Xmx10248m -XX:MaxPermSize=256m
12+
# Default value: -Xmx1024m -XX:MaxPermSize=256m
1313
org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
1414
# org.gradle.daemon=false
1515

@@ -23,4 +23,4 @@ android.disableResourceValidation=true
2323
android.useAndroidX=true
2424
android.enableJetifier=true
2525
# Version of flipper SDK to use with React Native
26-
FLIPPER_VERSION=0.82.0
26+
FLIPPER_VERSION=0.99.0

‎app/android/gradle/wrapper/gradle-wrapper.jar

2.96 KB
Binary file not shown.

0 commit comments

Comments
 (0)