Merge pull request #35 from scala-network/2.0.0

2.0.0
scala-network · Feb 17, 2021 · 173f270 · 173f270
2 parents e14ef31 + 050a48c
commit 173f270
Show file tree

Hide file tree

Showing 185 changed files with 11,162 additions and 3,780 deletions.
diff --git a/.gitignore b/.gitignore
@@ -7,3 +7,5 @@ gradle/
 /build
 /captures
 .externalNativeBuild
+
+app/src/main/assets/xlarig/armeabi-v7a/xlarig.v1
diff --git a/README.md b/README.md
@@ -3,7 +3,7 @@
 A high performance and open-source application for mining Scala on Android mobile devices.
 
 <p align="left">
-  <img src="https://scalaproject.io/assets/img/mobile-miner.png" width="350" title="hover text">
+  <img src="https://scalaproject.io/assets/img/mobile-minerv2.png" width="350" title="hover text">
 </p>
 
 ## Supported CPU instruction sets

diff --git a/app.json b/app.json
@@ -0,0 +1,52 @@
+{
+  "pools" : [
+    {
+      "key" : "Scala Project (Official Pool)",
+      "pool" : "mine.scalaproject.io",
+      "port" : "3333",
+      "poolType"  :  3,
+      "poolUrl" : "https://pool.scalaproject.io",
+      "poolIp" : "95.111.237.231"
+    },
+    {
+      "key" : "PoolDeMineria",
+      "pool" : "scala.pooldemineria.com",
+      "port" : "3333",
+      "poolType"  :  3,
+      "poolUrl" : "https://pooldemineria.com",
+      "poolIp" : "168.119.229.63"
+    },
+    {
+      "key" : "GNTL",
+      "pool" : "xla.pool.gntl.co.uk",
+      "port" : "40002",
+      "poolType"  :  1,
+      "poolUrl" : "https://xla.pool.gntl.co.uk",
+      "poolIp" : "83.151.238.34"
+    },
+    {
+      "key" : "LuckyPool",
+      "pool" : "scala.luckypool.io",
+      "port" : "6677",
+      "poolType"  :  2,
+      "poolUrl" : "https://scala.luckypool.io",
+      "poolIp" : "51.89.96.162"
+    },
+    {
+      "key" : "HeroMiners",
+      "pool" : "scala.herominers.com",
+      "port" : "10130",
+      "poolType"  :  2,
+      "poolUrl" : "https://scala.herominers.com",
+      "poolIp" : "138.201.217.40"
+    },
+    {
+      "key" : "LetsHashIt",
+      "pool" : "xla.letshash.online",
+      "port" : "1559",
+      "poolType"  :  3,
+      "poolUrl" : "https://xla.letshash.online",
+      "poolIp" : "135.181.62.60"
+    }
+  ]
+}
diff --git a/app/build.gradle b/app/build.gradle
@@ -12,10 +12,10 @@ android {
 
     defaultConfig {
         applicationId "io.scalaproject.androidminer"
-        minSdkVersion 21
+        minSdkVersion 19
         targetSdkVersion 28 // keep version 28 to avoid an error 13 when running exe in assets folder (sdk 29 gives the error)
-        versionCode 7
-        versionName "2.1.0"
+        versionCode 10
+        versionName "2.0.0"
         buildConfigField "long", "BUILD_TIME", System.currentTimeMillis() + "L"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true
@@ -42,4 +42,5 @@ dependencies {
     implementation 'com.android.volley:volley:1.1.1'
     implementation 'com.github.anastr:speedviewlib:1.5.2'
     implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.10'
+    implementation 'com.github.PhilJay:MPAndroidChart:v3.1.0'
 }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest package="io.scalaproject.androidminer"
-          xmlns:android="http://schemas.android.com/apk/res/android">
+    xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
@@ -11,6 +11,8 @@
     <application
         android:allowBackup="true"
         android:usesCleartextTraffic="true"
+        android:hardwareAccelerated="false"
+        android:largeHeap="true"
         android:icon="@mipmap/ic_launcher"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:label="@string/app_name"
@@ -22,63 +24,97 @@
 
         <meta-data
             android:name="com.google.firebase.messaging.default_notification_icon"
-            android:resource="@drawable/ic_notification" />
+            android:resource="@mipmap/ic_notification" />
 
         <meta-data
             android:name="com.google.firebase.messaging.default_notification_color"
             android:resource="@color/c_white" />
 
         <activity
-            android:name="io.scalaproject.androidminer.MainActivity"
-            android:configChanges="orientation|screenSize"
-            android:windowSoftInputMode="adjustPan|stateHidden"
-            android:theme="@style/AppTheme.NoActionBar">
+            android:name=".SplashActivity">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
         </activity>
 
         <activity
-            android:name="io.scalaproject.androidminer.SplashActivity">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN"/>
-                <category android:name="android.intent.category.LAUNCHER"/>
-            </intent-filter>
+            android:name=".MainActivity"
+            android:windowSoftInputMode="adjustPan|stateHidden"
+            android:theme="@style/AppTheme.NoActionBar"
+            android:launchMode="singleTask"
+            android:screenOrientation="behind">
         </activity>
 
 	    <activity
-            android:name="io.scalaproject.androidminer.QrCodeScannerActivity"
-            android:parentActivityName="io.scalaproject.androidminer.MainActivity">
-        </activity>
+            android:name=".QrCodeScannerActivity"
+            android:configChanges="orientation|keyboardHidden"
+            android:label="QrCode"
+            android:launchMode="singleTask"
+            android:screenOrientation="behind" />
 
         <activity
-            android:name="io.scalaproject.androidminer.WizardHomeActivity"
-            android:parentActivityName="io.scalaproject.androidminer.MainActivity">
-        </activity>
+            android:name=".WizardHomeActivity"
+            android:configChanges="orientation|keyboardHidden"
+            android:label="Welcome"
+            android:launchMode="singleTask"
+            android:screenOrientation="behind" />
 
         <activity
-            android:name="io.scalaproject.androidminer.WizardAddressActivity"
-            android:parentActivityName="io.scalaproject.androidminer.MainActivity">
-        </activity>
+            android:name=".VaultActivity"
+            android:configChanges="orientation|keyboardHidden"
+            android:label="Vault"
+            android:launchMode="singleTask"
+            android:screenOrientation="behind" />
 
         <activity
-            android:name="io.scalaproject.androidminer.WizardPoolActivity"
-            android:parentActivityName="io.scalaproject.androidminer.MainActivity">
-        </activity>
+            android:name=".WizardAddressActivity"
+            android:configChanges="orientation|keyboardHidden"
+            android:label="Address"
+            android:launchMode="singleTask"
+            android:screenOrientation="behind" />
 
         <activity
-            android:name="io.scalaproject.androidminer.WizardSettingsActivity"
-            android:parentActivityName="io.scalaproject.androidminer.MainActivity">
-        </activity>
+            android:name=".PoolActivity"
+            android:configChanges="orientation|keyboardHidden"
+            android:label="Pool"
+            android:launchMode="singleTask"
+            android:screenOrientation="behind" />
 
         <activity
-            android:name="io.scalaproject.androidminer.BaseActivity"
-            android:parentActivityName="io.scalaproject.androidminer.MainActivity">
-        </activity>
+            android:name=".WizardSettingsActivity"
+            android:configChanges="orientation|keyboardHidden"
+            android:label="Settings"
+            android:launchMode="singleTask"
+            android:screenOrientation="behind" />
+
+        <activity
+            android:name=".SupportActivity"
+            android:configChanges="orientation|keyboardHidden"
+            android:label="Support"
+            android:launchMode="singleTask"
+            android:screenOrientation="behind" />
+
+        <activity
+            android:name=".PaymentsActivity"
+            android:configChanges="orientation|keyboardHidden"
+            android:label="Payments"
+            android:launchMode="singleTask"
+            android:screenOrientation="behind" />
+
+        <activity
+            android:name=".BaseActivity"
+            android:configChanges="orientation|keyboardHidden"
+            android:label="Base"
+            android:launchMode="singleTask"
+            android:screenOrientation="behind" />
 
         <service
-            android:name="io.scalaproject.androidminer.MiningService"
+            android:name=".MiningService"
             android:enabled="true"/>
 
         <receiver
-            android:name="io.scalaproject.androidminer.NotificationsReceiver"
+            android:name=".NotificationsReceiver"
             android:enabled="true">
             <intent-filter>
                 <action android:name="OPEN_ACTION"/>

diff --git a/app/src/main/assets/xlarig/armeabi-v7a/xlarig b/app/src/main/assets/xlarig/armeabi-v7a/xlarig
diff --git a/app/src/main/assets/xlarig/x86_64/xlarig b/app/src/main/assets/xlarig/x86_64/xlarig