dappros · 4RGUS · Oct 25, 2021 · Aug 5, 2021 · Aug 5, 2021 · Aug 5, 2021
diff --git a/_editorconfig b/_editorconfig
@@ -0,0 +1,3 @@
+# Windows files
+[*.bat]
+end_of_line = crlf
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -120,6 +120,12 @@ def jscFlavor = 'org.webkit:android-jsc:+'
  */
 def enableHermes = project.ext.react.get("enableHermes", false);
 
+ext {    
+    react = [
+        nodeExecutableAndArgs:  ["/usr/local/bin/node"]
+    ]
+}
+
 android {
     ndkVersion rootProject.ext.ndkVersion
 
@@ -129,6 +135,9 @@ android {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
+    dexOptions {
+       javaMaxHeapSize "3g"
+    }
 
     defaultConfig {
         applicationId "com.ethora"

diff --git a/android/app/release/app-release.apk b/android/app/release/app-release.apk
diff --git a/android/app/release/output-metadata.json b/android/app/release/output-metadata.json
@@ -0,0 +1,18 @@
+{
+  "version": 2,
+  "artifactType": {
+    "type": "APK",
+    "kind": "Directory"
+  },
+  "applicationId": "com.ethora",
+  "variantName": "processReleaseResources",
+  "elements": [
+    {
+      "type": "SINGLE",
+      "filters": [],
+      "versionCode": 1,
+      "versionName": "1.0",
+      "outputFile": "app-release.apk"
+    }
+  ]
+}
diff --git a/android/app/src/debug/AndroidManifest.xml b/android/app/src/debug/AndroidManifest.xml
@@ -5,9 +5,9 @@
     <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
 
     <application
-    android:usesCleartextTraffic="true"
-    tools:targetApi="28"
-    tools:ignore="GoogleAppIndexingWarning">
+        android:usesCleartextTraffic="true"
+        tools:targetApi="28"
+        tools:ignore="GoogleAppIndexingWarning">
         <activity android:name="com.facebook.react.devsupport.DevSettingsActivity" />
     </application>
 </manifest>
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
@@ -2,7 +2,10 @@
   package="com.ethora">
 
     <uses-permission android:name="android.permission.INTERNET" />
-
+<uses-permission android:name="android.permission.RECORD_AUDIO" />
+<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+<uses-permission android:name="android.permission.CAMERA"/>
     <application
       android:name=".MainApplication"
       android:label="@string/app_name"
@@ -31,13 +34,23 @@
       <activity
         android:name=".MainActivity"
         android:label="@string/app_name"
+        android:screenOrientation="portrait"
         android:configChanges="keyboard|keyboardHidden|orientation|screenSize|uiMode"
         android:launchMode="singleTask"
         android:windowSoftInputMode="adjustResize">
         <intent-filter>
             <action android:name="android.intent.action.MAIN" />
             <category android:name="android.intent.category.LAUNCHER" />
         </intent-filter>
+        <intent-filter android:autoVerify="true">
+          <action android:name="android.intent.action.VIEW" />
+          <category android:name="android.intent.category.DEFAULT" />
+          <category android:name="android.intent.category.BROWSABLE" />
+          <data android:scheme="https"
+            android:host="www.eto.li"
+            android:pathPrefix="/go"
+          />
+        </intent-filter>
       </activity>
     </application>
 </manifest>
diff --git a/android/app/src/main/assets/fonts/Montserrat-Bold.ttf b/android/app/src/main/assets/fonts/Montserrat-Bold.ttf
diff --git a/android/app/src/main/assets/fonts/Montserrat-Light.ttf b/android/app/src/main/assets/fonts/Montserrat-Light.ttf
diff --git a/android/app/src/main/assets/fonts/Montserrat-Medium.ttf b/android/app/src/main/assets/fonts/Montserrat-Medium.ttf
diff --git a/android/app/src/main/assets/fonts/Montserrat-Regular.ttf b/android/app/src/main/assets/fonts/Montserrat-Regular.ttf
diff --git a/android/app/src/main/assets/fonts/Montserrat-SemiBold.ttf b/android/app/src/main/assets/fonts/Montserrat-SemiBold.ttf
diff --git a/android/app/src/main/assets/fonts/Montserrat-Thin.ttf b/android/app/src/main/assets/fonts/Montserrat-Thin.ttf
diff --git a/android/app/src/main/ic_launcher-playstore.png b/android/app/src/main/ic_launcher-playstore.png
diff --git a/android/app/src/main/java/com/ethora/MainActivity.java b/android/app/src/main/java/com/ethora/MainActivity.java
@@ -1,5 +1,8 @@
 package com.ethora;
 
+import com.zoontek.rnbootsplash.RNBootSplash; // <- add this necessary import
+import android.os.Bundle; // <- add this necessary import
+
 import com.facebook.react.ReactActivity;
 
 public class MainActivity extends ReactActivity {
@@ -8,6 +11,12 @@ public class MainActivity extends ReactActivity {
    * Returns the name of the main component registered from JavaScript. This is used to schedule
    * rendering of the component.
    */
+
+  @Override
+  protected void onCreate(Bundle savedInstanceState) {
+    super.onCreate(savedInstanceState);
+    RNBootSplash.init(R.drawable.bootsplash, MainActivity.this);
+  }
   @Override
   protected String getMainComponentName() {
     return "ethora";

diff --git a/android/app/src/main/res/drawable/background_splash.xml b/android/app/src/main/res/drawable/background_splash.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item
+        android:drawable="@color/splashscreen_bg"/>
+
+    <item
+        android:width="300dp"
+        android:height="300dp"
+        android:drawable="@mipmap/bootsplash_logo"
+        android:gravity="center" />
+
+</layer-list>
diff --git a/android/app/src/main/res/drawable/bootsplash.xml b/android/app/src/main/res/drawable/bootsplash.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android" android:opacity="opaque">
+    <item android:drawable="@color/bootsplash_background" />
+
+    <item>
+        <bitmap android:src="@mipmap/bootsplash_logo" android:gravity="center" />
+    </item>
+</layer-list>
diff --git a/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@color/ic_launcher_background"/>
+    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
+</adaptive-icon>
diff --git a/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@color/ic_launcher_background"/>
+    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
+</adaptive-icon>
diff --git a/android/app/src/main/res/mipmap-hdpi/bootsplash_logo.png b/android/app/src/main/res/mipmap-hdpi/bootsplash_logo.png
diff --git a/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/android/app/src/main/res/mipmap-hdpi/ic_launcher.png
diff --git a/android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png
diff --git a/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
diff --git a/android/app/src/main/res/mipmap-mdpi/bootsplash_logo.png b/android/app/src/main/res/mipmap-mdpi/bootsplash_logo.png
diff --git a/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/android/app/src/main/res/mipmap-mdpi/ic_launcher.png
diff --git a/android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png b/android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png
diff --git a/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
diff --git a/android/app/src/main/res/mipmap-xhdpi/bootsplash_logo.png b/android/app/src/main/res/mipmap-xhdpi/bootsplash_logo.png
diff --git a/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png
diff --git a/android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png b/android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png
diff --git a/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
diff --git a/android/app/src/main/res/mipmap-xxhdpi/bootsplash_logo.png b/android/app/src/main/res/mipmap-xxhdpi/bootsplash_logo.png
diff --git a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png
diff --git a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
diff --git a/android/app/src/main/res/mipmap-xxxhdpi/bootsplash_logo.png b/android/app/src/main/res/mipmap-xxxhdpi/bootsplash_logo.png
diff --git a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png
diff --git a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
diff --git a/android/app/src/main/res/values/colors.xml b/android/app/src/main/res/values/colors.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="splashscreen_bg">#FFFF</color>
+    <color name="app_bg">#FFFF</color>
+    <color name="bootsplash_background">#FFFFFF</color>
+</resources>
diff --git a/android/app/src/main/res/values/ic_launcher_background.xml b/android/app/src/main/res/values/ic_launcher_background.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="ic_launcher_background">#FFFFFF</color>
+</resources>
diff --git a/android/app/src/main/res/values/styles.xml b/android/app/src/main/res/values/styles.xml
@@ -1,9 +1,25 @@
+
 <resources>
 
     <!-- Base application theme. -->
     <style name="AppTheme" parent="Theme.AppCompat.DayNight.NoActionBar">
         <!-- Customize your theme here. -->
         <item name="android:textColor">#000000</item>
+
+        <!-- Add the following line to set the default status bar color for all the app. -->
+        <item name="android:statusBarColor">@color/app_bg</item>
+        <!-- Add the following line to set the default status bar text color for all the app 
+        to be a light color (false) or a dark color (true) -->
+        <item name="android:windowLightStatusBar">false</item>
+        <!-- Add the following line to set the default background color for all the app. -->
+        <item name="android:windowBackground">@color/app_bg</item>
     </style>
 
-</resources>
+    <!-- Adds the splash screen definition -->
+    <!-- Add the following lines (BootTheme should inherit from AppTheme) -->
+  <style name="BootTheme" parent="AppTheme">
+    <!-- set the generated bootsplash.xml drawable as activity background -->
+    <item name="android:background">@drawable/bootsplash</item>
+  </style>
+
+</resources>
diff --git a/android/build.gradle b/android/build.gradle
@@ -4,10 +4,11 @@ buildscript {
     ext {
         buildToolsVersion = "29.0.3"
         minSdkVersion = 21
-        compileSdkVersion = 29
-        targetSdkVersion = 29
+        compileSdkVersion = 31
+        targetSdkVersion = 31
         ndkVersion = "20.1.5948944"
         googlePlayServicesAuthVersion = "16.0.1"
+        //   kotlinVersion = "1.1.16"
     }
     repositories {
         google()
@@ -16,6 +17,8 @@ buildscript {
     dependencies {
         classpath("com.android.tools.build:gradle:4.1.0")
         classpath 'com.google.gms:google-services:4.3.8'
+        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.0") 
+        //  classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
     }

diff --git a/android/gradle.properties b/android/gradle.properties
@@ -26,3 +26,5 @@ android.enableJetifier=true
 
 # Version of flipper SDK to use with React Native
 FLIPPER_VERSION=0.75.1
+org.gradle.daemon=true
+org.gradle.jvmargs=-Xmx2560m
diff --git a/docs/config.js b/docs/config.js
@@ -6,17 +6,34 @@ const appTitle = "Ethora"; //done
 // App logo (displayed in login screen) image path: 
 import logoPath from "../src/assets/logo.png"; //done
 
+//images for tutorial screens
+import slide1Image1 from "../src/assets/tutorials/slide1Img1.png";
+import slide2Image1 from "../src/assets/tutorials/slide1Img1.png";
+import slide2Image2 from "../src/assets/tutorials/slide1Img1.png";
+import slide2Image3 from "../src/assets/tutorials/slide1Img1.png";
+import slide3Image1 from "../src/assets/tutorials/slide1Img1.png";
+import slide3Image2 from "../src/assets/tutorials/slide1Img1.png";
+import slide4Image1 from "../src/assets/tutorials/slide1Img1.png";
+import slide4Image2 from "../src/assets/tutorials/slide1Img1.png";
+
+import loginScreenBackgroundImage from "../src/assets/login_background.png";
+
+
 //Application token
-const APP_TOKEN = "JWT eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJkYXRhIjp7Il9pZCI6IjYwZmU2MmQyMDVkNjM4NDhlZmU2YTc2MCIsImFwcE5hbWUiOiJFdGhvcmEiLCJhcHBEZXNjcmlwdGlvbiI6InVuZGVmaW5lZCIsImFwcFVybCI6InVuZGVmaW5lZCIsImFwcExvZ29IYXNoIjpudWxsLCJjcmVhdG9ySWQiOiI2MGZlNjJiZDA1ZDYzODQ4ZWZlNmE3MWMiLCJjcmVhdGVkQXQiOiIyMDIxLTA3LTI2VDA3OjIyOjU4LjM0N1oiLCJfX3YiOjAsInJhbmRvbVN0cmluZyI6InU3aExnSFdLbnpVVU5lbkF5cE1hZ0t4cW9aZ2w2ZDJMam5VdisremkvbU1LSmhZNUJ2b1BwSEJrR2tIYy9Ub0l1YmRRRGtjTiswRWVWSE9hNVB4QUlzc2Rub010aFp2bW9FUGpYVk80MVVQelR2UmhtVkVkd3g2cFRwZVdKQ21IUnRYZml0UlNpVnZoV21Ka2VxYWhmNUYzY080ZWhQYXkxQ1A0NTk3Nlpnazk0bFF2d1JyMVFIV2oifSwiaWF0IjoxNjI3Mjg0MTkxfQ.qKwa8h_QD5CQR3WJaSYv7ZiGumCmqcDSOyapTgQKqz0"; //done
+const APP_TOKEN = 'JWT eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJkYXRhIjp7Il9pZCI6IjYxMTBlOTdiMWFjZWQ1MGE0ZGU3MDA0OSIsImFwcE5hbWUiOiJFdGhvcmEiLCJhcHBEZXNjcmlwdGlvbiI6InVuZGVmaW5lZCIsImFwcFVybCI6InVuZGVmaW5lZCIsImFwcExvZ29IYXNoIjpudWxsLCJjcmVhdG9ySWQiOiI2MTEwZTk2MDFhY2VkNTBhNGRlNzAwMDMiLCJjcmVhdGVkQXQiOiIyMDIxLTA4LTA5VDA4OjM4OjE5Ljk2OFoiLCJfX3YiOjAsInJhbmRvbVN0cmluZyI6IllqUzUvUmthMkNvcitFSStUNlRQUnV3ekZjNk8zZHZYaC8rRFBobHhITExKejlVaDZOSm1WcVNJQkRSYnBXSExuUEpoQzJLUDc0Y2NHZ21hKzFYUGJwcjFpNDV1RlhaeDNNMTdjZDRJTWtqS00yOS9yTERvN3IrYzdJRlpyckt0S3dsWUtwb3Nabi8yQmFEZjdISWRoWXUwdzVHaGp0VUlGcXdJKy94NFZrTyttRUtUIn0sImlhdCI6MTYyODQ5ODMwNX0.TzHlVy2bv-_gnrP9U7NyoYdNYvIBfVR9nUfH-RFg9e8'; //done
 
 // NAVBAR LOGO
 // If ’true’, same as above logo will also be displayed in the top left of the navbar before the app title
-const navbarLogoShow = true; //done
+const navbarLogoShow = false; //done
+
+//universal link url
+const unv_url = "https://www.eto.li/go?c=";
+const unv_url1 = "https://www.eto.li/go/?c=";
 
 // COLOUR THEME
 const commonColors = {
-    "primaryColor" : "#F0B310",
-    "primaryDarkColor" : "#C59002",
+    "primaryColor" : "#4E8AC2",
+    "primaryDarkColor" : "#3774AD",
     "secondaryColor" : "#133452"
 } //done
 
@@ -107,5 +124,16 @@ export{
     itemsMintingFee,
     appWalletName,
     APP_TOKEN,
-    coinsMainName
+    coinsMainName,
+    loginScreenBackgroundImage,
+    unv_url,
+    unv_url1,
+    slide1Image1,
+    slide2Image1,
+    slide2Image2,
+    slide2Image3,
+    slide3Image1,
+    slide3Image2,
+    slide4Image1,
+    slide4Image2
 }
diff --git a/ios/Podfile b/ios/Podfile
@@ -3,12 +3,12 @@ require_relative '../node_modules/@react-native-community/cli-platform-ios/nativ
 
 platform :ios, '10.0'
 
+permissions_path = '../node_modules/react-native-permissions/ios'
+pod 'Permission-Camera', :path => "#{permissions_path}/Camera"
+
 target 'ethora' do
   config = use_native_modules!
 
-  permissions_path = '../node_modules/react-native-permissions/ios'
-  pod 'Permission-Camera', :path => "#{permissions_path}/Camera"
-
   use_react_native!(
     :path => config[:reactNativePath],
     # to enable hermes on iOS, change `false` to `true` and then install pods
@@ -23,10 +23,10 @@ target 'ethora' do
   # Enables Flipper.
   #
   # Note that if you have use_frameworks! enabled, Flipper will not work and
-  # you should disable the next line.
-  use_flipper!()
 
+  # you should disable these next few lines.
+  use_flipper!({ 'Flipper-Folly' => '2.5.3', 'Flipper' => '0.87.0', 'Flipper-RSocket' => '1.3.1' })
   post_install do |installer|
-    react_native_post_install(installer)
+    flipper_post_install(installer)
   end
-end
+end