Merge pull request #131 from syscoin/dev

feat: dev

.gitattributes

@@ -1,3 +1,3 @@
-*.pbxproj -text
-# specific for windows script files
-*.bat text eol=crlf
+# Windows files should use crlf line endings
+# https://help.github.com/articles/dealing-with-line-endings/
+*.bat text eol=crlf

app/.prettierrc.js

@@ -2,6 +2,7 @@ module.exports = {
 	bracketSpacing: false,
 	jsxBracketSameLine: true,
 	singleQuote: true,
+	arrowParens: 'avoid',
 	trailingComma: 'all',
 	arrowParens: 'avoid'
 };

app/.ruby-version

@@ -0,0 +1 @@
+2.7.4

app/GemFile

@@ -0,0 +1,6 @@
+source 'https://rubygems.org'
+
+# You may use http://rbenv.org/ or https://rvm.io/ to install and use this version
+ruby '2.7.4'
+
+gem 'cocoapods', '~> 1.11', '>= 1.11.2'

app/Gemfile.lock

@@ -0,0 +1,100 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    CFPropertyList (3.0.5)
+      rexml
+    activesupport (6.1.4.4)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+      zeitwerk (~> 2.3)
+    addressable (2.8.0)
+      public_suffix (>= 2.0.2, < 5.0)
+    algoliasearch (1.27.5)
+      httpclient (~> 2.8, >= 2.8.3)
+      json (>= 1.5.1)
+    atomos (0.1.3)
+    claide (1.1.0)
+    cocoapods (1.11.2)
+      addressable (~> 2.8)
+      claide (>= 1.0.2, < 2.0)
+      cocoapods-core (= 1.11.2)
+      cocoapods-deintegrate (>= 1.0.3, < 2.0)
+      cocoapods-downloader (>= 1.4.0, < 2.0)
+      cocoapods-plugins (>= 1.0.0, < 2.0)
+      cocoapods-search (>= 1.0.0, < 2.0)
+      cocoapods-trunk (>= 1.4.0, < 2.0)
+      cocoapods-try (>= 1.1.0, < 2.0)
+      colored2 (~> 3.1)
+      escape (~> 0.0.4)
+      fourflusher (>= 2.3.0, < 3.0)
+      gh_inspector (~> 1.0)
+      molinillo (~> 0.8.0)
+      nap (~> 1.0)
+      ruby-macho (>= 1.0, < 3.0)
+      xcodeproj (>= 1.21.0, < 2.0)
+    cocoapods-core (1.11.2)
+      activesupport (>= 5.0, < 7)
+      addressable (~> 2.8)
+      algoliasearch (~> 1.0)
+      concurrent-ruby (~> 1.1)
+      fuzzy_match (~> 2.0.4)
+      nap (~> 1.0)
+      netrc (~> 0.11)
+      public_suffix (~> 4.0)
+      typhoeus (~> 1.0)
+    cocoapods-deintegrate (1.0.5)
+    cocoapods-downloader (1.5.1)
+    cocoapods-plugins (1.0.0)
+      nap
+    cocoapods-search (1.0.1)
+    cocoapods-trunk (1.6.0)
+      nap (>= 0.8, < 2.0)
+      netrc (~> 0.11)
+    cocoapods-try (1.2.0)
+    colored2 (3.1.2)
+    concurrent-ruby (1.1.9)
+    escape (0.0.4)
+    ethon (0.15.0)
+      ffi (>= 1.15.0)
+    ffi (1.15.5)
+    fourflusher (2.3.1)
+    fuzzy_match (2.0.4)
+    gh_inspector (1.1.3)
+    httpclient (2.8.3)
+    i18n (1.8.11)
+      concurrent-ruby (~> 1.0)
+    json (2.6.1)
+    minitest (5.15.0)
+    molinillo (0.8.0)
+    nanaimo (0.3.0)
+    nap (1.1.0)
+    netrc (0.11.0)
+    public_suffix (4.0.6)
+    rexml (3.2.5)
+    ruby-macho (2.5.1)
+    typhoeus (1.4.0)
+      ethon (>= 0.9.0)
+    tzinfo (2.0.4)
+      concurrent-ruby (~> 1.0)
+    xcodeproj (1.21.0)
+      CFPropertyList (>= 2.3.3, < 4.0)
+      atomos (~> 0.1.3)
+      claide (>= 1.0.2, < 2.0)
+      colored2 (~> 3.1)
+      nanaimo (~> 0.3.0)
+      rexml (~> 3.2.4)
+    zeitwerk (2.5.3)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  cocoapods (~> 1.11, >= 1.11.2)
+
+RUBY VERSION
+   ruby 2.7.4p191
+
+BUNDLED WITH
+   2.2.27

app/android/app/build.gradle

@@ -32,27 +32,28 @@ def jscFlavor = 'org.webkit:android-jsc:+'
 /**
  * Whether to enable the Hermes VM.
  *
- * This should be set on project.ext.react and mirrored here.  If it is not set
+ * This should be set on project.ext.react and that value will be read here.  If it is not set
  * on project.ext.react, JavaScript will not be compiled to Hermes Bytecode
  * and the benefits of using Hermes will therefore be sharply reduced.
  */
 def enableHermes = project.ext.react.get("enableHermes", false)
 
+/**
+ * Architectures to build native code for in debug.
+ */
+def nativeArchitectures = project.getProperties().get("reactNativeDebugArchitectures")
+
 android {
 
 	compileSdkVersion rootProject.ext.compileSdkVersion
 
-	compileOptions {
-		sourceCompatibility JavaVersion.VERSION_1_8
-		targetCompatibility JavaVersion.VERSION_1_8
-	}
 
 	defaultConfig {
 		applicationId "io.paliwallet"
 		minSdkVersion rootProject.ext.minSdkVersion
 		targetSdkVersion rootProject.ext.targetSdkVersion
-		versionCode 19
-		versionName "1.0.8"
+		versionCode 30
+		versionName "1.1.4"
 		multiDexEnabled true
 		missingDimensionStrategy "minReactNative", "minReactNative46"
 		testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -93,6 +94,11 @@ android {
 		debug {
 			manifestPlaceholders = [isDebug:true]
 			signingConfig signingConfigs.debug
+			if (nativeArchitectures) {
+                ndk {
+                    abiFilters nativeArchitectures.split(',')
+                }
+            }
 		}
 		release {
 			manifestPlaceholders = [isDebug:false]
@@ -106,6 +112,7 @@ android {
 dependencies {
 	implementation fileTree(dir: 'libs', include: ['*.jar'])
 	implementation project(':lottie-react-native')
+	implementation project(':react-native-lottie-splash-screen')
 	implementation project(":react-native-haptic-feedback")
 	implementation project(':react-native-gesture-handler')
 	implementation project(path: ":@react-native-firebase_analytics")
@@ -117,7 +124,7 @@ dependencies {
 	implementation 'org.chromium:v8-android:+'
 
 	implementation 'com.google.android.gms:play-services-wallet:18.0.0'
-
+	
 	androidTestImplementation('com.wix:detox:+') { transitive = true }
 	androidTestImplementation 'junit:junit:4.12'
 

app/android/app/proguard-rules.pro

@@ -17,6 +17,10 @@
 #}
 
 
+# react-native-reanimated https://docs.swmansion.com/react-native-reanimated/docs/fundamentals/installation
+-keep class com.facebook.react.turbomodule.** { *; }
+
+
 # react native keychain https://github.com/oblador/react-native-keychain#proguard-rules
 -keep class com.facebook.crypto.** {
    *;

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

@@ -4,5 +4,10 @@
 
     <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
 
-    <application android:usesCleartextTraffic="true" tools:targetApi="28" tools:ignore="GoogleAppIndexingWarning" />
+  <application
+        android:usesCleartextTraffic="true"
+        tools:targetApi="28"
+        tools:ignore="GoogleAppIndexingWarning">
+
+    </application>
 </manifest>

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

@@ -1,10 +1,9 @@
 package io.paliwallet;
 
 import com.facebook.react.ReactActivityDelegate;
-import com.facebook.react.ReactFragmentActivity;
+import com.facebook.react.ReactActivity;
 import com.facebook.react.ReactRootView;
 import com.swmansion.gesturehandler.react.RNGestureHandlerEnabledRootView;
-
 import android.content.Intent;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageManager;
@@ -15,7 +14,8 @@
 
 import org.devio.rn.splashscreen.SplashScreen;
 
-public class MainActivity extends ReactFragmentActivity {
+
+public class MainActivity extends ReactActivity {
 
 	/**
 	* Returns the name of the main component registered from JavaScript. This is used to schedule
@@ -34,7 +34,8 @@ protected void onStart() {
 
 	@Override
 	protected void onCreate(Bundle savedInstanceState) {
-		SplashScreen.show(this);
+		SplashScreen.show(this, R.id.lottie); // here
+   		SplashScreen.setAnimationFinished(true);// If you want the animation dialog to be forced to close when hide is called, use this code
 		super.onCreate(null);
 	}
 	@Override

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

@@ -16,6 +16,8 @@
 import java.util.List;
 import io.invertase.firebase.analytics.ReactNativeFirebaseAnalyticsPackage;
 import io.paliwallet.nativeModules.PreventScreenshotPackage;
+import com.swmansion.reanimated.ReanimatedJSIModulePackage;
+import com.facebook.react.bridge.JSIModulePackage;
 
 import android.text.TextUtils;
 
@@ -103,6 +105,11 @@ protected List<ReactPackage> getPackages() {
 		protected String getJSMainModuleName() {
 			return "index";
 		}
+
+		@Override
+		protected JSIModulePackage getJSIModulePackage() {
+			return new ReanimatedJSIModulePackage();
+		}
   	};
 
 	@Override

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

@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<inset xmlns:android="http://schemas.android.com/apk/res/android"
+       android:insetLeft="@dimen/abc_edit_text_inset_horizontal_material"
+       android:insetRight="@dimen/abc_edit_text_inset_horizontal_material"
+       android:insetTop="@dimen/abc_edit_text_inset_top_material"
+       android:insetBottom="@dimen/abc_edit_text_inset_bottom_material">
+
+    <selector>
+        <!-- 
+          This file is a copy of abc_edit_text_material (https://bit.ly/3k8fX7I).
+          The item below with state_pressed="false" and state_focused="false" causes a NullPointerException.
+          NullPointerException:tempt to invoke virtual method 'android.graphics.drawable.Drawable android.graphics.drawable.Drawable$ConstantState.newDrawable(android.content.res.Resources)'
+
+          <item android:state_pressed="false" android:state_focused="false" android:drawable="@drawable/abc_textfield_default_mtrl_alpha"/>
+
+          For more info, see https://bit.ly/3CdLStv (react-native/pull/29452) and https://bit.ly/3nxOMoR.
+        -->
+        <item android:state_enabled="false" android:drawable="@drawable/abc_textfield_default_mtrl_alpha"/>
+        <item android:drawable="@drawable/abc_textfield_activated_mtrl_alpha"/>
+    </selector>
+
+</inset>

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

@@ -7,6 +7,7 @@
     android:layout_height="match_parent"
     android:background="#ffffffff">
     <com.airbnb.lottie.LottieAnimationView
+    android:id="@+id/lottie"
 		android:layout_centerHorizontal="true"
     android:layout_width="375dp"
 		android:layout_height="812dp"

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

@@ -3,7 +3,7 @@
 	<!-- Base application theme. -->
 	<style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
 		<!-- Customize your theme here. -->
-
+		<item name="android:editTextBackground">@drawable/rn_edit_text_material</item>
         <item name="android:windowIsTranslucent">true</item> 
 	</style>
 

app/android/build.gradle

@@ -4,29 +4,30 @@ def REACT_NATIVE_VERSION = new File(['node', '--print',"JSON.parse(require('fs')
 buildscript {
 
 	ext {
-		buildToolsVersion = "29.0.2"
-		minSdkVersion = 19
-        compileSdkVersion = 29
-        targetSdkVersion = 31
+		buildToolsVersion = "30.0.3"
+		minSdkVersion = 21
+       	compileSdkVersion = 33
+        targetSdkVersion = 33
 		kotlin_version = "1.3.50"
 		kotlinVersion = "$kotlin_version"
 	}
 	repositories {
 		google()
+		mavenCentral()
 		gradlePluginPortal()
-		maven { url 'https://repo1.maven.org/maven2/' }
+
 	}
 
 	dependencies {
-		classpath('com.android.tools.build:gradle:4.0.1')
+		classpath('com.android.tools.build:gradle:4.2.2')
 		classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
 		classpath('com.google.gms:google-services:4.3.3')
 	}
 }
 
 allprojects {
 	repositories {
-		mavenLocal()
+
 		maven {		// Replace AAR from original RN with AAR from react-native-v8
 			url("$rootDir/../node_modules/react-native-v8/dist")
 		}
@@ -49,11 +50,18 @@ allprojects {
 		maven {
       		url("${project(':react-native-minimizer').projectDir}/libs")
     	}
+		mavenCentral {
+            // We don't want to fetch react-native from Maven Central as there are
+            // older versions over there.
+            content {
+                excludeGroup "com.facebook.react"
+            }
+        }
 		google()
-		mavenCentral()
+
 		maven { url 'https://www.jitpack.io' }
 		gradlePluginPortal()
-		maven { url 'https://repo1.maven.org/maven2/' }
+
 	}
 
 	subprojects {

app/android/gradle.properties

@@ -9,7 +9,7 @@
 
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
-# Default value: -Xmx10248m -XX:MaxPermSize=256m
+# Default value: -Xmx1024m -XX:MaxPermSize=256m
 org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
 # org.gradle.daemon=false
 
@@ -23,4 +23,4 @@ android.disableResourceValidation=true
 android.useAndroidX=true
 android.enableJetifier=true
 # Version of flipper SDK to use with React Native
-FLIPPER_VERSION=0.82.0
+FLIPPER_VERSION=0.99.0