Skip to content

Commit fdc0f88

Browse files
ArsenyMalkovArsenyMalkov
committed
Update libraries
1 parent 100291b commit fdc0f88

File tree

60 files changed

+5237
-4783
lines changed

Some content is hidden

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

60 files changed

+5237
-4783
lines changed

‎anychart/build.gradle

+7-7
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,16 @@ apply plugin: 'com.android.library'
22
apply plugin: 'com.github.dcendents.android-maven'
33

44
android {
5-
compileSdkVersion 28
6-
buildToolsVersion "28.0.3"
5+
compileSdkVersion 30
6+
buildToolsVersion "30.0.3"
77

88
defaultConfig {
99
minSdkVersion 19
10-
targetSdkVersion 28
10+
targetSdkVersion 30
1111
versionCode 1
1212
versionName "1.0"
1313

14-
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
14+
testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
1515

1616
}
1717
buildTypes {
@@ -24,11 +24,11 @@ android {
2424

2525
dependencies {
2626
implementation fileTree(dir: 'libs', include: ['*.jar'])
27-
androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', {
27+
androidTestImplementation('androidx.test.espresso:espresso-core:3.1.0', {
2828
exclude group: 'com.android.support', module: 'support-annotations'
2929
})
30-
implementation 'com.android.support:appcompat-v7:28.0.0'
31-
testImplementation 'junit:junit:4.12'
30+
implementation 'androidx.appcompat:appcompat:1.2.0'
31+
testImplementation 'junit:junit:4.13.2'
3232
}
3333

3434
// build a jar with source files

‎anychart/src/androidTest/java/com/anychart/anychart/ExampleInstrumentedTest.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package com.anychart.anychart;
22

33
import android.content.Context;
4-
import android.support.test.InstrumentationRegistry;
5-
import android.support.test.runner.AndroidJUnit4;
4+
import androidx.test.platform.app.InstrumentationRegistry;
5+
import androidx.test.runner.AndroidJUnit4;
66

77
import org.junit.Test;
88
import org.junit.runner.RunWith;
@@ -19,7 +19,7 @@ public class ExampleInstrumentedTest {
1919
@Test
2020
public void useAppContext() throws Exception {
2121
// Context of the app under test.
22-
Context appContext = InstrumentationRegistry.getTargetContext();
22+
Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext();
2323

2424
assertEquals("com.anychart.anychart.test", appContext.getPackageName());
2525
}

‎anychart/src/main/assets/anychart-android.min.js

+5,089
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎anychart/src/main/assets/anychart-bundle.min.js

-4,677
This file was deleted.

‎anychart/src/main/java/com/anychart/AnyChartView.java

+47-7
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import android.os.Build;
77
import android.os.Bundle;
88
import android.os.Parcelable;
9-
import android.support.annotation.Nullable;
9+
import androidx.annotation.Nullable;
1010
import android.util.AttributeSet;
1111
import android.util.Log;
1212
import android.view.LayoutInflater;
@@ -23,6 +23,9 @@
2323
import com.anychart.chart.common.listener.ListenersInterface;
2424
import com.anychart.core.Chart;
2525

26+
import java.nio.charset.StandardCharsets;
27+
import java.security.NoSuchAlgorithmException;
28+
2629
public final class AnyChartView extends FrameLayout {
2730

2831
public interface JsListener {
@@ -100,6 +103,7 @@ private void init() {
100103

101104
webView = view.findViewById(R.id.web_view);
102105
WebSettings webSettings = webView.getSettings();
106+
webSettings.setDomStorageEnabled(true);
103107
webSettings.setLoadsImagesAutomatically(true);
104108
webSettings.setJavaScriptEnabled(true);
105109
webSettings.setLoadWithOverviewMode(true);
@@ -154,12 +158,20 @@ public boolean shouldOverrideUrlLoading(WebView view, WebResourceRequest request
154158
public void onPageFinished(WebView view, String url) {
155159
String resultJs = (isRestored)
156160
? js.toString()
157-
: js.append(chart.getJsBase()).append(".container(\"container\");")
158-
.append(chart.getJsBase()).append(".draw();")
161+
: js
162+
.append(androidCheck(licenceKey))
163+
.append(chart.getJsBase()).append(".container(\"container\");")
159164
.toString();
160165

161166
webView.evaluateJavascript(
162-
"anychart.licenseKey(\"" + licenceKey + "\");" +
167+
"anychart.theme({\n" +
168+
" chart: {\n" +
169+
" credits: {\n" +
170+
" logoSrc: 'https://static.anychart.com/logo-for-android.png',\n" +
171+
" text: 'AnyChart Trial Version'\n" +
172+
" }\n" +
173+
" }\n" +
174+
" });" +
163175
"anychart.onDocumentReady(function () {\n" +
164176
resultJs +
165177
"});",
@@ -196,14 +208,14 @@ private void loadHtml() {
196208
" </style>\n" +
197209
"</head>\n" +
198210
"<body>\n" +
199-
"<script src=\"file:///android_asset/anychart-bundle.min.js\"></script>" +
211+
"<script src=\"file:///android_asset/anychart-android.min.js\"></script>" +
200212
scripts.toString() +
201213
"<link rel=\"stylesheet\" href=\"file:///android_asset/anychart-ui.min.css\"/>\n" +
202214
"<div id=\"container\"></div>\n" +
203215
"</body>\n" +
204216
"</html>";
205-
206-
webView.loadDataWithBaseURL("", htmlData, "text/html", "UTF-8", null);
217+
218+
webView.loadDataWithBaseURL("https://www.google.com", htmlData, "text/html", "UTF-8", null);
207219
}
208220

209221
public void addScript(String url) {
@@ -277,4 +289,32 @@ public void setOnRenderedListener(OnRenderedListener onRenderedListener) {
277289
public void setDebug(boolean value) {
278290
this.isDebug = value;
279291
}
292+
293+
private String md5(String s) {
294+
try {
295+
java.security.MessageDigest md = java.security.MessageDigest.getInstance("MD5");
296+
byte[] array = md.digest(s.getBytes(StandardCharsets.UTF_8));
297+
StringBuilder sb = new StringBuilder();
298+
for (int i = 0; i < array.length; ++i) {
299+
sb.append(Integer.toHexString((array[i] & 0xFF) | 0x100).substring(1,3));
300+
}
301+
return sb.toString();
302+
} catch (NoSuchAlgorithmException e) {
303+
}
304+
return "";
305+
}
306+
307+
private String androidCheck(String l) {
308+
if (l == null || l.isEmpty() || md5(l) == "0df80e76aeca7dc40e01e876dca3542b") {
309+
return "var btoa = window.btoa(JSON.stringify({\n" +
310+
" chartType: '" + chart.getJsBase() + "',\n" +
311+
" apkName: \"" + getContext().getPackageName() + "\"\n" +
312+
"}));" +
313+
chart.getJsBase() + ".credits({\n" +
314+
" logoSrc: 'https://static.anychart.com/logo-for-android.png?data=' + btoa,\n" +
315+
" text: 'AnyChart Trial Version'\n" +
316+
" });\n";
317+
}
318+
return "";
319+
}
280320
}

‎anychart/src/main/java/com/anychart/chart/common/dataentry/DataEntry.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.anychart.chart.common.dataentry;
22

3-
import android.support.annotation.NonNull;
3+
import androidx.annotation.NonNull;
44

55
import java.util.HashMap;
66
import java.util.Locale;

‎build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ buildscript {
66
jcenter()
77
}
88
dependencies {
9-
classpath 'com.android.tools.build:gradle:3.2.1'
9+
classpath 'com.android.tools.build:gradle:4.1.3'
1010
classpath 'com.github.dcendents:android-maven-gradle-plugin:2.0'
1111

1212
// NOTE: Do not place your application dependencies here; they belong

‎gradle.properties

+2
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@ org.gradle.daemon=true
1414
org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
1515
org.gradle.parallel=true
1616
org.gradle.configureondemand=true
17+
android.useAndroidX=true
18+
android.enableJetifier=true
1719

1820
# When configured, Gradle will run in incubating parallel mode.
1921
# This option should only be used with decoupled projects. More details, visit

‎gradle/wrapper/gradle-wrapper.properties

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Wed Sep 26 10:41:06 IRKT 2018
1+
#Thu Apr 22 23:35:01 NZST 2021
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip

‎sample/build.gradle

+15-15
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
apply plugin: 'com.android.application'
22

33
android {
4-
compileSdkVersion 28
5-
buildToolsVersion "28.0.3"
4+
compileSdkVersion 30
5+
buildToolsVersion "30.0.3"
66
defaultConfig {
77
applicationId "com.anychart.anychart"
88
minSdkVersion 19
9-
targetSdkVersion 28
9+
targetSdkVersion 30
1010
versionCode 7
1111
versionName "1.4"
1212
multiDexEnabled true
13-
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
13+
testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
1414
}
1515
buildTypes {
1616
release {
@@ -33,20 +33,20 @@ android {
3333
dependencies {
3434
implementation fileTree(dir: 'libs', include: ['*.jar'])
3535
implementation project(":anychart")
36-
implementation 'com.android.support:appcompat-v7:28.0.0'
37-
implementation 'com.android.support.constraint:constraint-layout:1.1.3'
38-
implementation 'com.android.support:recyclerview-v7:28.0.0'
39-
implementation 'com.android.support:cardview-v7:28.0.0'
40-
testImplementation 'junit:junit:4.12'
41-
implementation 'com.android.support:support-annotations:28.0.0'
42-
androidTestImplementation 'com.android.support.test:runner:1.0.2'
43-
androidTestImplementation 'com.android.support.test:rules:1.0.2'
44-
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
45-
androidTestImplementation 'com.android.support.test.espresso:espresso-contrib:2.2.2', {
36+
implementation 'androidx.appcompat:appcompat:1.2.0'
37+
implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
38+
implementation 'androidx.recyclerview:recyclerview:1.2.0'
39+
implementation 'androidx.cardview:cardview:1.0.0'
40+
testImplementation 'junit:junit:4.13.2'
41+
implementation 'androidx.annotation:annotation:1.2.0'
42+
androidTestImplementation 'androidx.test.ext:junit:1.1.2'
43+
androidTestImplementation 'androidx.test:rules:1.3.0'
44+
androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
45+
androidTestImplementation 'androidx.test.espresso:espresso-contrib:3.1.0', {
4646
exclude group: 'com.android.support', module: 'support-annotations'
4747
exclude group: 'com.android.support', module: 'support-v4'
4848
exclude group: 'com.android.support', module: 'design'
4949
exclude group: 'com.android.support', module: 'recyclerview-v7'
5050
}
51-
androidTestImplementation 'com.android.support.test.espresso:espresso-web:3.0.2'
51+
androidTestImplementation 'androidx.test.espresso:espresso-web:3.3.0'
5252
}

‎sample/src/androidTest/java/com/anychart/sample/MainActivityTest.java

+14-14
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,25 @@
11
package com.anychart.sample;
22

33

4-
import android.support.test.espresso.contrib.RecyclerViewActions;
5-
import android.support.test.espresso.web.webdriver.Locator;
6-
import android.support.test.filters.LargeTest;
7-
import android.support.test.rule.ActivityTestRule;
8-
import android.support.test.runner.AndroidJUnit4;
4+
import androidx.test.espresso.contrib.RecyclerViewActions;
5+
import androidx.test.espresso.web.webdriver.Locator;
6+
import androidx.test.filters.LargeTest;
7+
import androidx.test.rule.ActivityTestRule;
8+
import androidx.test.ext.junit.runners.AndroidJUnit4;
99

1010
import org.junit.Rule;
1111
import org.junit.Test;
1212
import org.junit.runner.RunWith;
1313

14-
import static android.support.test.espresso.Espresso.onView;
15-
import static android.support.test.espresso.Espresso.pressBack;
16-
import static android.support.test.espresso.action.ViewActions.click;
17-
import static android.support.test.espresso.assertion.ViewAssertions.matches;
18-
import static android.support.test.espresso.matcher.ViewMatchers.isEnabled;
19-
import static android.support.test.espresso.matcher.ViewMatchers.withId;
20-
import static android.support.test.espresso.web.sugar.Web.onWebView;
21-
import static android.support.test.espresso.web.webdriver.DriverAtoms.findElement;
22-
import static android.support.test.espresso.web.webdriver.DriverAtoms.webClick;
14+
import static androidx.test.espresso.Espresso.onView;
15+
import static androidx.test.espresso.Espresso.pressBack;
16+
import static androidx.test.espresso.action.ViewActions.click;
17+
import static androidx.test.espresso.assertion.ViewAssertions.matches;
18+
import static androidx.test.espresso.matcher.ViewMatchers.isEnabled;
19+
import static androidx.test.espresso.matcher.ViewMatchers.withId;
20+
import static androidx.test.espresso.web.sugar.Web.onWebView;
21+
import static androidx.test.espresso.web.webdriver.DriverAtoms.findElement;
22+
import static androidx.test.espresso.web.webdriver.DriverAtoms.webClick;
2323

2424
@RunWith(AndroidJUnit4.class)
2525
@LargeTest

‎sample/src/main/java/com/anychart/sample/ChartsAdapter.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import android.content.Context;
44
import android.content.Intent;
5-
import android.support.v7.widget.RecyclerView;
5+
import androidx.recyclerview.widget.RecyclerView;
66
import android.view.LayoutInflater;
77
import android.view.View;
88
import android.view.ViewGroup;

‎sample/src/main/java/com/anychart/sample/MainActivity.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
package com.anychart.sample;
22

33
import android.os.Bundle;
4-
import android.support.v7.app.AppCompatActivity;
5-
import android.support.v7.widget.LinearLayoutManager;
6-
import android.support.v7.widget.RecyclerView;
7-
import android.support.v7.widget.SearchView;
4+
import androidx.appcompat.app.AppCompatActivity;
5+
import androidx.recyclerview.widget.LinearLayoutManager;
6+
import androidx.recyclerview.widget.RecyclerView;
7+
import androidx.appcompat.widget.SearchView;
88
import android.view.View;
99

1010
import java.util.List;

‎sample/src/main/java/com/anychart/sample/charts/Area3DChartActivity.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.anychart.sample.charts;
22

33
import android.os.Bundle;
4-
import android.support.v7.app.AppCompatActivity;
4+
import androidx.appcompat.app.AppCompatActivity;
55

66
import com.anychart.AnyChart;
77
import com.anychart.AnyChartView;

‎sample/src/main/java/com/anychart/sample/charts/AreaChartActivity.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.anychart.sample.charts;
22

33
import android.os.Bundle;
4-
import android.support.v7.app.AppCompatActivity;
4+
import androidx.appcompat.app.AppCompatActivity;
55

66
import com.anychart.AnyChart;
77
import com.anychart.AnyChartView;

‎sample/src/main/java/com/anychart/sample/charts/Bar3DChartActivity.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.anychart.sample.charts;
22

33
import android.os.Bundle;
4-
import android.support.v7.app.AppCompatActivity;
4+
import androidx.appcompat.app.AppCompatActivity;
55

66
import com.anychart.AnyChart;
77
import com.anychart.AnyChartView;

‎sample/src/main/java/com/anychart/sample/charts/BarChartActivity.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.anychart.sample.charts;
22

33
import android.os.Bundle;
4-
import android.support.v7.app.AppCompatActivity;
4+
import androidx.appcompat.app.AppCompatActivity;
55

66
import com.anychart.AnyChart;
77
import com.anychart.AnyChartView;

‎sample/src/main/java/com/anychart/sample/charts/BoxChartActivity.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.anychart.sample.charts;
22

33
import android.os.Bundle;
4-
import android.support.v7.app.AppCompatActivity;
4+
import androidx.appcompat.app.AppCompatActivity;
55

66
import com.anychart.AnyChart;
77
import com.anychart.AnyChartView;

‎sample/src/main/java/com/anychart/sample/charts/BubbleChartActivity.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.anychart.sample.charts;
22

33
import android.os.Bundle;
4-
import android.support.v7.app.AppCompatActivity;
4+
import androidx.appcompat.app.AppCompatActivity;
55

66
import com.anychart.AnyChart;
77
import com.anychart.AnyChartView;

‎sample/src/main/java/com/anychart/sample/charts/BubbleMapActivity.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.anychart.sample.charts;
22

33
import android.os.Bundle;
4-
import android.support.v7.app.AppCompatActivity;
4+
import androidx.appcompat.app.AppCompatActivity;
55

66
import com.anychart.AnyChart;
77
import com.anychart.AnyChartView;

‎sample/src/main/java/com/anychart/sample/charts/ChoroplethMapActivity.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.anychart.sample.charts;
22

33
import android.os.Bundle;
4-
import android.support.v7.app.AppCompatActivity;
4+
import androidx.appcompat.app.AppCompatActivity;
55

66
import com.anychart.AnyChart;
77
import com.anychart.AnyChartView;

‎sample/src/main/java/com/anychart/sample/charts/CircularGaugeActivity.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.anychart.sample.charts;
22

33
import android.os.Bundle;
4-
import android.support.v7.app.AppCompatActivity;
4+
import androidx.appcompat.app.AppCompatActivity;
55

66
import com.anychart.AnyChart;
77
import com.anychart.AnyChartView;

‎sample/src/main/java/com/anychart/sample/charts/Column3DChartActivity.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.anychart.sample.charts;
22

33
import android.os.Bundle;
4-
import android.support.v7.app.AppCompatActivity;
4+
import androidx.appcompat.app.AppCompatActivity;
55

66
import com.anychart.AnyChart;
77
import com.anychart.AnyChartView;

0 commit comments

Comments
 (0)