From 03a663324c82cf54ac3480f5f7c80ef0ca387796 Mon Sep 17 00:00:00 2001 From: jesjf Date: Wed, 28 Oct 2020 20:59:46 -0300 Subject: [PATCH 01/11] I have divided the project in two, one to build a library and the other to use the library and present results in the gui. --- .idea/.gitignore | 2 + .idea/codeStyles/Project.xml | 116 ++++++++++++++++++ .idea/libraries/gradle_wrapper.xml | 9 ++ .idea/libraries/gradle_wrapper2.xml | 9 ++ .idea/misc.xml | 6 + .idea/modules.xml | 8 ++ .idea/vcs.xml | 6 + Speedtest-Android/.idea/.name | 1 + .../.idea/codeStyles/Project.xml | 15 +-- Speedtest-Android/.idea/gradle.xml | 1 + Speedtest-Android/app/.gitignore | 2 +- Speedtest-Android/app/build.gradle | 29 +++-- Speedtest-Android/app/libs/core-debug.aar | Bin 0 -> 67238 bytes Speedtest-Android/app/proguard-rules.pro | 2 +- .../app/src/main/AndroidManifest.xml | 40 +++--- .../app/src/main/assets/ServerList.json | 3 +- .../speedtest/core/ExampleUnitTest.java | 19 +++ Speedtest-Android/build.gradle | 9 +- Speedtest-Android/core/.gitignore | 1 + Speedtest-Android/core/build.gradle | 32 +++++ Speedtest-Android/core/consumer-rules.pro | 0 Speedtest-Android/core/proguard-rules.pro | 21 ++++ .../core/ExampleInstrumentedTest.java | 28 +++++ .../core/src/main/AndroidManifest.xml | 5 + .../fdossena/speedtest/core/Speedtest.java | 0 .../speedtest/core/base/Connection.java | 0 .../fdossena/speedtest/core/base/Utils.java | 0 .../core/config/SpeedtestConfig.java | 0 .../core/config/TelemetryConfig.java | 0 .../core/download/DownloadStream.java | 0 .../speedtest/core/download/Downloader.java | 0 .../fdossena/speedtest/core/getIP/GetIP.java | 0 .../fdossena/speedtest/core/log/Logger.java | 0 .../speedtest/core/ping/PingStream.java | 0 .../fdossena/speedtest/core/ping/Pinger.java | 0 .../core/serverSelector/ServerSelector.java | 0 .../core/serverSelector/TestPoint.java | 0 .../speedtest/core/telemetry/Telemetry.java | 0 .../speedtest/core/upload/UploadStream.java | 0 .../speedtest/core/upload/Uploader.java | 0 .../core/worker/SpeedtestWorker.java | 0 .../speedtest/core/ExampleUnitTest.java | 19 +++ Speedtest-Android/gradle.properties | 10 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- Speedtest-Android/settings.gradle | 3 +- 45 files changed, 342 insertions(+), 56 deletions(-) create mode 100644 .idea/.gitignore create mode 100644 .idea/codeStyles/Project.xml create mode 100644 .idea/libraries/gradle_wrapper.xml create mode 100644 .idea/libraries/gradle_wrapper2.xml create mode 100644 .idea/misc.xml create mode 100644 .idea/modules.xml create mode 100644 .idea/vcs.xml create mode 100644 Speedtest-Android/.idea/.name create mode 100644 Speedtest-Android/app/libs/core-debug.aar create mode 100644 Speedtest-Android/app/src/test/java/com/fdossena/speedtest/core/ExampleUnitTest.java create mode 100644 Speedtest-Android/core/.gitignore create mode 100644 Speedtest-Android/core/build.gradle create mode 100644 Speedtest-Android/core/consumer-rules.pro create mode 100644 Speedtest-Android/core/proguard-rules.pro create mode 100644 Speedtest-Android/core/src/androidTest/java/com/fdossena/speedtest/core/ExampleInstrumentedTest.java create mode 100644 Speedtest-Android/core/src/main/AndroidManifest.xml rename Speedtest-Android/{app => core}/src/main/java/com/fdossena/speedtest/core/Speedtest.java (100%) rename Speedtest-Android/{app => core}/src/main/java/com/fdossena/speedtest/core/base/Connection.java (100%) rename Speedtest-Android/{app => core}/src/main/java/com/fdossena/speedtest/core/base/Utils.java (100%) rename Speedtest-Android/{app => core}/src/main/java/com/fdossena/speedtest/core/config/SpeedtestConfig.java (100%) rename Speedtest-Android/{app => core}/src/main/java/com/fdossena/speedtest/core/config/TelemetryConfig.java (100%) rename Speedtest-Android/{app => core}/src/main/java/com/fdossena/speedtest/core/download/DownloadStream.java (100%) rename Speedtest-Android/{app => core}/src/main/java/com/fdossena/speedtest/core/download/Downloader.java (100%) rename Speedtest-Android/{app => core}/src/main/java/com/fdossena/speedtest/core/getIP/GetIP.java (100%) rename Speedtest-Android/{app => core}/src/main/java/com/fdossena/speedtest/core/log/Logger.java (100%) rename Speedtest-Android/{app => core}/src/main/java/com/fdossena/speedtest/core/ping/PingStream.java (100%) rename Speedtest-Android/{app => core}/src/main/java/com/fdossena/speedtest/core/ping/Pinger.java (100%) rename Speedtest-Android/{app => core}/src/main/java/com/fdossena/speedtest/core/serverSelector/ServerSelector.java (100%) rename Speedtest-Android/{app => core}/src/main/java/com/fdossena/speedtest/core/serverSelector/TestPoint.java (100%) rename Speedtest-Android/{app => core}/src/main/java/com/fdossena/speedtest/core/telemetry/Telemetry.java (100%) rename Speedtest-Android/{app => core}/src/main/java/com/fdossena/speedtest/core/upload/UploadStream.java (100%) rename Speedtest-Android/{app => core}/src/main/java/com/fdossena/speedtest/core/upload/Uploader.java (100%) rename Speedtest-Android/{app => core}/src/main/java/com/fdossena/speedtest/core/worker/SpeedtestWorker.java (100%) create mode 100644 Speedtest-Android/core/src/test/java/com/fdossena/speedtest/core/ExampleUnitTest.java diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 0000000..5c98b42 --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,2 @@ +# Default ignored files +/workspace.xml \ No newline at end of file diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml new file mode 100644 index 0000000..681f41a --- /dev/null +++ b/.idea/codeStyles/Project.xml @@ -0,0 +1,116 @@ + + + + + + + +
+ + + + xmlns:android + + ^$ + + + +
+
+ + + + xmlns:.* + + ^$ + + + BY_NAME + +
+
+ + + + .*:id + + http://schemas.android.com/apk/res/android + + + +
+
+ + + + .*:name + + http://schemas.android.com/apk/res/android + + + +
+
+ + + + name + + ^$ + + + +
+
+ + + + style + + ^$ + + + +
+
+ + + + .* + + ^$ + + + BY_NAME + +
+
+ + + + .* + + http://schemas.android.com/apk/res/android + + + ANDROID_ATTRIBUTE_ORDER + +
+
+ + + + .* + + .* + + + BY_NAME + +
+ + + + + \ No newline at end of file diff --git a/.idea/libraries/gradle_wrapper.xml b/.idea/libraries/gradle_wrapper.xml new file mode 100644 index 0000000..dcde693 --- /dev/null +++ b/.idea/libraries/gradle_wrapper.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/gradle_wrapper2.xml b/.idea/libraries/gradle_wrapper2.xml new file mode 100644 index 0000000..dcde693 --- /dev/null +++ b/.idea/libraries/gradle_wrapper2.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..e208459 --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..d12e2ce --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..35eb1dd --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/Speedtest-Android/.idea/.name b/Speedtest-Android/.idea/.name new file mode 100644 index 0000000..96108fe --- /dev/null +++ b/Speedtest-Android/.idea/.name @@ -0,0 +1 @@ +speedtest-android-lib \ No newline at end of file diff --git a/Speedtest-Android/.idea/codeStyles/Project.xml b/Speedtest-Android/.idea/codeStyles/Project.xml index 0d15693..663459a 100644 --- a/Speedtest-Android/.idea/codeStyles/Project.xml +++ b/Speedtest-Android/.idea/codeStyles/Project.xml @@ -3,18 +3,9 @@ - diff --git a/Speedtest-Android/.idea/gradle.xml b/Speedtest-Android/.idea/gradle.xml index 5cd135a..6cbe220 100644 --- a/Speedtest-Android/.idea/gradle.xml +++ b/Speedtest-Android/.idea/gradle.xml @@ -11,6 +11,7 @@