Skip to content

Commit 173f270

Browse files
hayzamjshayzamjs
authored
Merge pull request #35 from scala-network/2.0.0
2.0.0
2 parents e14ef31 + 050a48c commit 173f270

File tree

185 files changed

+11162
-3780
lines changed

Some content is hidden

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

185 files changed

+11162
-3780
lines changed

‎.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,5 @@ gradle/
77
/build
88
/captures
99
.externalNativeBuild
10+
11+
app/src/main/assets/xlarig/armeabi-v7a/xlarig.v1

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
A high performance and open-source application for mining Scala on Android mobile devices.
44

55
<p align="left">
6-
<img src="https://scalaproject.io/assets/img/mobile-miner.png" width="350" title="hover text">
6+
<img src="https://scalaproject.io/assets/img/mobile-minerv2.png" width="350" title="hover text">
77
</p>
88

99
## Supported CPU instruction sets

‎app.json

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
{
2+
"pools" : [
3+
{
4+
"key" : "Scala Project (Official Pool)",
5+
"pool" : "mine.scalaproject.io",
6+
"port" : "3333",
7+
"poolType" : 3,
8+
"poolUrl" : "https://pool.scalaproject.io",
9+
"poolIp" : "95.111.237.231"
10+
},
11+
{
12+
"key" : "PoolDeMineria",
13+
"pool" : "scala.pooldemineria.com",
14+
"port" : "3333",
15+
"poolType" : 3,
16+
"poolUrl" : "https://pooldemineria.com",
17+
"poolIp" : "168.119.229.63"
18+
},
19+
{
20+
"key" : "GNTL",
21+
"pool" : "xla.pool.gntl.co.uk",
22+
"port" : "40002",
23+
"poolType" : 1,
24+
"poolUrl" : "https://xla.pool.gntl.co.uk",
25+
"poolIp" : "83.151.238.34"
26+
},
27+
{
28+
"key" : "LuckyPool",
29+
"pool" : "scala.luckypool.io",
30+
"port" : "6677",
31+
"poolType" : 2,
32+
"poolUrl" : "https://scala.luckypool.io",
33+
"poolIp" : "51.89.96.162"
34+
},
35+
{
36+
"key" : "HeroMiners",
37+
"pool" : "scala.herominers.com",
38+
"port" : "10130",
39+
"poolType" : 2,
40+
"poolUrl" : "https://scala.herominers.com",
41+
"poolIp" : "138.201.217.40"
42+
},
43+
{
44+
"key" : "LetsHashIt",
45+
"pool" : "xla.letshash.online",
46+
"port" : "1559",
47+
"poolType" : 3,
48+
"poolUrl" : "https://xla.letshash.online",
49+
"poolIp" : "135.181.62.60"
50+
}
51+
]
52+
}

‎app/build.gradle

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ android {
1212

1313
defaultConfig {
1414
applicationId "io.scalaproject.androidminer"
15-
minSdkVersion 21
15+
minSdkVersion 19
1616
targetSdkVersion 28 // keep version 28 to avoid an error 13 when running exe in assets folder (sdk 29 gives the error)
17-
versionCode 7
18-
versionName "2.1.0"
17+
versionCode 10
18+
versionName "2.0.0"
1919
buildConfigField "long", "BUILD_TIME", System.currentTimeMillis() + "L"
2020
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
2121
vectorDrawables.useSupportLibrary = true
@@ -42,4 +42,5 @@ dependencies {
4242
implementation 'com.android.volley:volley:1.1.1'
4343
implementation 'com.github.anastr:speedviewlib:1.5.2'
4444
implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.10'
45+
implementation 'com.github.PhilJay:MPAndroidChart:v3.1.0'
4546
}

‎app/src/main/AndroidManifest.xml

Lines changed: 67 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<manifest package="io.scalaproject.androidminer"
3-
xmlns:android="http://schemas.android.com/apk/res/android">
3+
xmlns:android="http://schemas.android.com/apk/res/android">
44

55
<uses-permission android:name="android.permission.INTERNET" />
66
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
@@ -11,6 +11,8 @@
1111
<application
1212
android:allowBackup="true"
1313
android:usesCleartextTraffic="true"
14+
android:hardwareAccelerated="false"
15+
android:largeHeap="true"
1416
android:icon="@mipmap/ic_launcher"
1517
android:roundIcon="@mipmap/ic_launcher_round"
1618
android:label="@string/app_name"
@@ -22,63 +24,97 @@
2224

2325
<meta-data
2426
android:name="com.google.firebase.messaging.default_notification_icon"
25-
android:resource="@drawable/ic_notification" />
27+
android:resource="@mipmap/ic_notification" />
2628

2729
<meta-data
2830
android:name="com.google.firebase.messaging.default_notification_color"
2931
android:resource="@color/c_white" />
3032

3133
<activity
32-
android:name="io.scalaproject.androidminer.MainActivity"
33-
android:configChanges="orientation|screenSize"
34-
android:windowSoftInputMode="adjustPan|stateHidden"
35-
android:theme="@style/AppTheme.NoActionBar">
34+
android:name=".SplashActivity">
35+
<intent-filter>
36+
<action android:name="android.intent.action.MAIN" />
37+
<category android:name="android.intent.category.LAUNCHER" />
38+
</intent-filter>
3639
</activity>
3740

3841
<activity
39-
android:name="io.scalaproject.androidminer.SplashActivity">
40-
<intent-filter>
41-
<action android:name="android.intent.action.MAIN"/>
42-
<category android:name="android.intent.category.LAUNCHER"/>
43-
</intent-filter>
42+
android:name=".MainActivity"
43+
android:windowSoftInputMode="adjustPan|stateHidden"
44+
android:theme="@style/AppTheme.NoActionBar"
45+
android:launchMode="singleTask"
46+
android:screenOrientation="behind">
4447
</activity>
4548

4649
<activity
47-
android:name="io.scalaproject.androidminer.QrCodeScannerActivity"
48-
android:parentActivityName="io.scalaproject.androidminer.MainActivity">
49-
</activity>
50+
android:name=".QrCodeScannerActivity"
51+
android:configChanges="orientation|keyboardHidden"
52+
android:label="QrCode"
53+
android:launchMode="singleTask"
54+
android:screenOrientation="behind" />
5055

5156
<activity
52-
android:name="io.scalaproject.androidminer.WizardHomeActivity"
53-
android:parentActivityName="io.scalaproject.androidminer.MainActivity">
54-
</activity>
57+
android:name=".WizardHomeActivity"
58+
android:configChanges="orientation|keyboardHidden"
59+
android:label="Welcome"
60+
android:launchMode="singleTask"
61+
android:screenOrientation="behind" />
5562

5663
<activity
57-
android:name="io.scalaproject.androidminer.WizardAddressActivity"
58-
android:parentActivityName="io.scalaproject.androidminer.MainActivity">
59-
</activity>
64+
android:name=".VaultActivity"
65+
android:configChanges="orientation|keyboardHidden"
66+
android:label="Vault"
67+
android:launchMode="singleTask"
68+
android:screenOrientation="behind" />
6069

6170
<activity
62-
android:name="io.scalaproject.androidminer.WizardPoolActivity"
63-
android:parentActivityName="io.scalaproject.androidminer.MainActivity">
64-
</activity>
71+
android:name=".WizardAddressActivity"
72+
android:configChanges="orientation|keyboardHidden"
73+
android:label="Address"
74+
android:launchMode="singleTask"
75+
android:screenOrientation="behind" />
6576

6677
<activity
67-
android:name="io.scalaproject.androidminer.WizardSettingsActivity"
68-
android:parentActivityName="io.scalaproject.androidminer.MainActivity">
69-
</activity>
78+
android:name=".PoolActivity"
79+
android:configChanges="orientation|keyboardHidden"
80+
android:label="Pool"
81+
android:launchMode="singleTask"
82+
android:screenOrientation="behind" />
7083

7184
<activity
72-
android:name="io.scalaproject.androidminer.BaseActivity"
73-
android:parentActivityName="io.scalaproject.androidminer.MainActivity">
74-
</activity>
85+
android:name=".WizardSettingsActivity"
86+
android:configChanges="orientation|keyboardHidden"
87+
android:label="Settings"
88+
android:launchMode="singleTask"
89+
android:screenOrientation="behind" />
90+
91+
<activity
92+
android:name=".SupportActivity"
93+
android:configChanges="orientation|keyboardHidden"
94+
android:label="Support"
95+
android:launchMode="singleTask"
96+
android:screenOrientation="behind" />
97+
98+
<activity
99+
android:name=".PaymentsActivity"
100+
android:configChanges="orientation|keyboardHidden"
101+
android:label="Payments"
102+
android:launchMode="singleTask"
103+
android:screenOrientation="behind" />
104+
105+
<activity
106+
android:name=".BaseActivity"
107+
android:configChanges="orientation|keyboardHidden"
108+
android:label="Base"
109+
android:launchMode="singleTask"
110+
android:screenOrientation="behind" />
75111

76112
<service
77-
android:name="io.scalaproject.androidminer.MiningService"
113+
android:name=".MiningService"
78114
android:enabled="true"/>
79115

80116
<receiver
81-
android:name="io.scalaproject.androidminer.NotificationsReceiver"
117+
android:name=".NotificationsReceiver"
82118
android:enabled="true">
83119
<intent-filter>
84120
<action android:name="OPEN_ACTION"/>

‎app/src/main/assets/xlarig/armeabi-v7a/xlarig

100644100755
-593 KB
Binary file not shown.

‎app/src/main/assets/xlarig/x86_64/xlarig

22.5 MB
Binary file not shown.

0 commit comments

Comments
 (0)