diff --git a/android/.gitignore b/android/.gitignore new file mode 100644 index 000000000..c6cbe562a --- /dev/null +++ b/android/.gitignore @@ -0,0 +1,8 @@ +*.iml +.gradle +/local.properties +/.idea/workspace.xml +/.idea/libraries +.DS_Store +/build +/captures diff --git a/android/app/.gitignore b/android/app/.gitignore deleted file mode 100644 index 796b96d1c..000000000 --- a/android/app/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/build diff --git a/android/app/build.gradle b/android/app/build.gradle deleted file mode 100644 index b8fb0ff6d..000000000 --- a/android/app/build.gradle +++ /dev/null @@ -1,26 +0,0 @@ -apply plugin: 'com.android.application' - -android { - compileSdkVersion 23 - buildToolsVersion "23.0.2" - - defaultConfig { - applicationId "org.nativescript.android_widgets_app" - minSdkVersion 17 - targetSdkVersion 23 - versionCode 1 - versionName "1.0" - } - buildTypes { - release { - minifyEnabled false - proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' - } - } -} - -dependencies { - compile fileTree(dir: 'libs', include: ['*.jar']) - testCompile 'junit:junit:4.12' - compile 'com.android.support:appcompat-v7:23.1.1' -} diff --git a/android/app/proguard-rules.pro b/android/app/proguard-rules.pro deleted file mode 100644 index 95065db74..000000000 --- a/android/app/proguard-rules.pro +++ /dev/null @@ -1,17 +0,0 @@ -# Add project specific ProGuard rules here. -# By default, the flags in this file are appended to flags specified -# in d:\Android\sdk/tools/proguard/proguard-android.txt -# You can edit the include path and order by changing the proguardFiles -# directive in build.gradle. -# -# For more details, see -# http://developer.android.com/guide/developing/tools/proguard.html - -# Add any project specific keep options here: - -# If your project uses WebView with JS, uncomment the following -# and specify the fully qualified class name to the JavaScript interface -# class: -#-keepclassmembers class fqcn.of.javascript.interface.for.webview { -# public *; -#} diff --git a/android/app/src/androidTest/java/org/nativescript/android_widgets_app/ApplicationTest.java b/android/app/src/androidTest/java/org/nativescript/android_widgets_app/ApplicationTest.java deleted file mode 100644 index 5977a0362..000000000 --- a/android/app/src/androidTest/java/org/nativescript/android_widgets_app/ApplicationTest.java +++ /dev/null @@ -1,13 +0,0 @@ -package org.nativescript.android_widgets_app; - -import android.app.Application; -import android.test.ApplicationTestCase; - -/** - * Testing Fundamentals - */ -public class ApplicationTest extends ApplicationTestCase { - public ApplicationTest() { - super(Application.class); - } -} \ No newline at end of file diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml deleted file mode 100644 index 9fcb5fd87..000000000 --- a/android/app/src/main/AndroidManifest.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - diff --git a/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/android/app/src/main/res/mipmap-hdpi/ic_launcher.png deleted file mode 100644 index cde69bccc..000000000 Binary files a/android/app/src/main/res/mipmap-hdpi/ic_launcher.png and /dev/null differ diff --git a/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/android/app/src/main/res/mipmap-mdpi/ic_launcher.png deleted file mode 100644 index c133a0cbd..000000000 Binary files a/android/app/src/main/res/mipmap-mdpi/ic_launcher.png and /dev/null differ diff --git a/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png deleted file mode 100644 index bfa42f0e7..000000000 Binary files a/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png and /dev/null differ diff --git a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png deleted file mode 100644 index 324e72cdd..000000000 Binary files a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png and /dev/null differ diff --git a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png deleted file mode 100644 index aee44e138..000000000 Binary files a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png and /dev/null differ diff --git a/android/app/src/main/res/values/colors.xml b/android/app/src/main/res/values/colors.xml deleted file mode 100644 index 3ab3e9cbc..000000000 --- a/android/app/src/main/res/values/colors.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - #3F51B5 - #303F9F - #FF4081 - diff --git a/android/app/src/main/res/values/strings.xml b/android/app/src/main/res/values/strings.xml deleted file mode 100644 index c2464c47f..000000000 --- a/android/app/src/main/res/values/strings.xml +++ /dev/null @@ -1,3 +0,0 @@ - - android-widgets-app - diff --git a/android/app/src/main/res/values/styles.xml b/android/app/src/main/res/values/styles.xml deleted file mode 100644 index 5885930df..000000000 --- a/android/app/src/main/res/values/styles.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - diff --git a/android/app/src/test/java/org/nativescript/android_widgets_app/ExampleUnitTest.java b/android/app/src/test/java/org/nativescript/android_widgets_app/ExampleUnitTest.java deleted file mode 100644 index 33889b265..000000000 --- a/android/app/src/test/java/org/nativescript/android_widgets_app/ExampleUnitTest.java +++ /dev/null @@ -1,15 +0,0 @@ -package org.nativescript.android_widgets_app; - -import org.junit.Test; - -import static org.junit.Assert.*; - -/** - * To work on unit tests, switch the Test Artifact in the Build Variants view. - */ -public class ExampleUnitTest { - @Test - public void addition_isCorrect() throws Exception { - assertEquals(4, 2 + 2); - } -} \ No newline at end of file diff --git a/android/build.gradle b/android/build.gradle index 0127e8312..aff4f415e 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -5,8 +5,7 @@ buildscript { jcenter() } dependencies { - // classpath 'com.android.tools.build:gradle:2.0.0-alpha3' - classpath 'com.android.tools.build:gradle:1.5.0' + classpath 'com.android.tools.build:gradle:2.1.2' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files @@ -21,4 +20,4 @@ allprojects { task clean(type: Delete) { delete rootProject.buildDir -} \ No newline at end of file +} diff --git a/android/gradle/wrapper/gradle-wrapper.jar b/android/gradle/wrapper/gradle-wrapper.jar index d3b83982b..13372aef5 100644 Binary files a/android/gradle/wrapper/gradle-wrapper.jar and b/android/gradle/wrapper/gradle-wrapper.jar differ diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties index 2d568b591..122a0dca2 100644 --- a/android/gradle/wrapper/gradle-wrapper.properties +++ b/android/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Wed Jun 29 19:27:15 EEST 2016 +#Mon Dec 28 10:00:20 PST 2015 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip diff --git a/android/gradlew b/android/gradlew index 27309d923..9d82f7891 100755 --- a/android/gradlew +++ b/android/gradlew @@ -6,30 +6,12 @@ ## ############################################################################## -# Attempt to set APP_HOME -# Resolve links: $0 may be a link -PRG="$0" -# Need this for relative symlinks. -while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi -done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS="" APP_NAME="Gradle" APP_BASE_NAME=`basename "$0"` -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS="" - # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD="maximum" @@ -48,7 +30,6 @@ die ( ) { cygwin=false msys=false darwin=false -nonstop=false case "`uname`" in CYGWIN* ) cygwin=true @@ -59,11 +40,26 @@ case "`uname`" in MINGW* ) msys=true ;; - NONSTOP* ) - nonstop=true - ;; esac +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null + CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar # Determine the Java command to use to start the JVM. @@ -89,7 +85,7 @@ location of your Java installation." fi # Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then +if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then MAX_FD_LIMIT=`ulimit -H -n` if [ $? -eq 0 ] ; then if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then diff --git a/android/gradlew.bat b/android/gradlew.bat old mode 100755 new mode 100644 index f6d5974e7..aec99730b --- a/android/gradlew.bat +++ b/android/gradlew.bat @@ -8,14 +8,14 @@ @rem Set local scope for the variables with windows NT shell if "%OS%"=="Windows_NT" setlocal +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS= + set DIRNAME=%~dp0 if "%DIRNAME%" == "" set DIRNAME=. set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% -@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS= - @rem Find java.exe if defined JAVA_HOME goto findJavaFromJavaHome @@ -46,7 +46,7 @@ echo location of your Java installation. goto fail :init -@rem Get command-line arguments, handling Windows variants +@rem Get command-line arguments, handling Windowz variants if not "%OS%" == "Windows_NT" goto win9xME_args if "%@eval[2+2]" == "4" goto 4NT_args diff --git a/android/settings.gradle b/android/settings.gradle index 55c206981..09ee5ce4c 100644 --- a/android/settings.gradle +++ b/android/settings.gradle @@ -1 +1 @@ -include ':app', ':widgets' +include ':widgets' diff --git a/android/widgets/.gitignore b/android/widgets/.gitignore index 58b78e565..796b96d1c 100644 --- a/android/widgets/.gitignore +++ b/android/widgets/.gitignore @@ -1,41 +1 @@ /build -/dist - -*.iml - -# Proguard folder generated by Eclipse -proguard/ - -# Log Files -*.log - -# Android Studio Navigation editor temp files -.navigation/ - -# Android Studio captures folder -captures/ - -# Built application files -/*/build/ - -## File-based project format: -*.ipr -*.iws - -# Crashlytics plugin (for Android Studio and IntelliJ) -com_crashlytics_export_strings.xml -crashlytics.properties -crashlytics-build.properties -fabric.properties - -## Directory-based project format: -.idea/ - -# Local configuration file (sdk path, etc) -local.properties - -# Gradle generated files -.gradle/ - -# Signing files -.signing/ \ No newline at end of file diff --git a/android/widgets/build.gradle b/android/widgets/build.gradle index 5467d5fd9..2c5d2ac85 100644 --- a/android/widgets/build.gradle +++ b/android/widgets/build.gradle @@ -7,67 +7,66 @@ def isWinOs = System.properties['os.name'].toLowerCase().contains('windows') apply plugin: 'com.android.library' def computeCompuleSdkVersion () { - if(project.hasProperty("compileSdk")) { - return compileSdk - } - else { - return 23 - } + if(project.hasProperty("compileSdk")) { + return compileSdk + } + else { + return 23 + } } def computeBuildToolsVersion() { - if(project.hasProperty("buildToolsVersion")) { - return buildToolsVersion - } - else { - return "22.0.1" - } + if(project.hasProperty("buildToolsVersion")) { + return buildToolsVersion + } + else { + return "22.0.1" + } } def computeTargetSdkVersion() { - if(project.hasProperty("targetSdk")) { - return targetSdk - } - else { - return 23 - } + if(project.hasProperty("targetSdk")) { + return targetSdk + } + else { + return 23 + } } android { - compileSdkVersion computeCompuleSdkVersion() - buildToolsVersion computeBuildToolsVersion() + compileSdkVersion computeCompuleSdkVersion() + buildToolsVersion computeBuildToolsVersion() - defaultConfig { - minSdkVersion 17 - targetSdkVersion computeTargetSdkVersion() - versionCode 1 - versionName "1.0" - } - buildTypes { - release { - minifyEnabled false - proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' - } - } + defaultConfig { + minSdkVersion 17 + targetSdkVersion computeTargetSdkVersion() + versionCode 1 + versionName "1.0" + } + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' + } + } } dependencies { - compile fileTree(include: ['*.jar'], dir: 'libs') - testCompile 'junit:junit:4.12' - compile 'com.android.support:support-v4:+' + compile fileTree(include: ['*.jar'], dir: 'libs') + compile 'com.android.support:support-v4:+' } task cleanBuildDir (type: Delete) { - delete "../build/" + delete "../build/" } task copyAar << { - copy { - from "build/outputs/aar/widgets-release.aar" - into "../build/" - } + copy { + from "build/outputs/aar/widgets-release.aar" + into "../build/" + } } assembleRelease.dependsOn(cleanBuildDir) copyAar.dependsOn(assembleRelease) -build.dependsOn(copyAar) +build.dependsOn(copyAar) \ No newline at end of file diff --git a/android/widgets/gradle/wrapper/gradle-wrapper.jar b/android/widgets/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 000000000..13372aef5 Binary files /dev/null and b/android/widgets/gradle/wrapper/gradle-wrapper.jar differ diff --git a/android/widgets/gradle/wrapper/gradle-wrapper.properties b/android/widgets/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 000000000..122a0dca2 --- /dev/null +++ b/android/widgets/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,6 @@ +#Mon Dec 28 10:00:20 PST 2015 +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip diff --git a/android/widgets/gradlew.bat b/android/widgets/gradlew.bat index 8a0b282aa..aec99730b 100644 --- a/android/widgets/gradlew.bat +++ b/android/widgets/gradlew.bat @@ -1,90 +1,90 @@ -@if "%DEBUG%" == "" @echo off -@rem ########################################################################## -@rem -@rem Gradle startup script for Windows -@rem -@rem ########################################################################## - -@rem Set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" setlocal - -@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS= - -set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. -set APP_BASE_NAME=%~n0 -set APP_HOME=%DIRNAME% - -@rem Find java.exe -if defined JAVA_HOME goto findJavaFromJavaHome - -set JAVA_EXE=java.exe -%JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto init - -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:findJavaFromJavaHome -set JAVA_HOME=%JAVA_HOME:"=% -set JAVA_EXE=%JAVA_HOME%/bin/java.exe - -if exist "%JAVA_EXE%" goto init - -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:init -@rem Get command-line arguments, handling Windowz variants - -if not "%OS%" == "Windows_NT" goto win9xME_args -if "%@eval[2+2]" == "4" goto 4NT_args - -:win9xME_args -@rem Slurp the command line arguments. -set CMD_LINE_ARGS= -set _SKIP=2 - -:win9xME_args_slurp -if "x%~1" == "x" goto execute - -set CMD_LINE_ARGS=%* -goto execute - -:4NT_args -@rem Get arguments from the 4NT Shell from JP Software -set CMD_LINE_ARGS=%$ - -:execute -@rem Setup the command line - -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar - -@rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% - -:end -@rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd - -:fail -rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of -rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS= + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto init + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto init + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:init +@rem Get command-line arguments, handling Windowz variants + +if not "%OS%" == "Windows_NT" goto win9xME_args +if "%@eval[2+2]" == "4" goto 4NT_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* +goto execute + +:4NT_args +@rem Get arguments from the 4NT Shell from JP Software +set CMD_LINE_ARGS=%$ + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/android/widgets/proguard-rules.pro b/android/widgets/proguard-rules.pro index 95065db74..dca5777d1 100644 --- a/android/widgets/proguard-rules.pro +++ b/android/widgets/proguard-rules.pro @@ -1,6 +1,6 @@ # Add project specific ProGuard rules here. # By default, the flags in this file are appended to flags specified -# in d:\Android\sdk/tools/proguard/proguard-android.txt +# in /home/plamen5kov/tools/android-sdk-linux/tools/proguard/proguard-android.txt # You can edit the include path and order by changing the proguardFiles # directive in build.gradle. # diff --git a/android/widgets/src/androidTest/java/org/nativescript/widgets/ApplicationTest.java b/android/widgets/src/androidTest/java/org/nativescript/widgets/ApplicationTest.java deleted file mode 100644 index 72ea62641..000000000 --- a/android/widgets/src/androidTest/java/org/nativescript/widgets/ApplicationTest.java +++ /dev/null @@ -1,13 +0,0 @@ -package org.nativescript.widgets; - -import android.app.Application; -import android.test.ApplicationTestCase; - -/** - * Testing Fundamentals - */ -public class ApplicationTest extends ApplicationTestCase { - public ApplicationTest() { - super(Application.class); - } -} \ No newline at end of file diff --git a/android/widgets/src/main/AndroidManifest.xml b/android/widgets/src/main/AndroidManifest.xml index 142e1226d..803685657 100644 --- a/android/widgets/src/main/AndroidManifest.xml +++ b/android/widgets/src/main/AndroidManifest.xml @@ -6,4 +6,4 @@ - + \ No newline at end of file diff --git a/android/widgets/src/main/java/org/nativescript/widgets/Async.java b/android/widgets/src/main/java/org/nativescript/widgets/Async.java index ffa59344f..f44aaa756 100644 --- a/android/widgets/src/main/java/org/nativescript/widgets/Async.java +++ b/android/widgets/src/main/java/org/nativescript/widgets/Async.java @@ -88,7 +88,7 @@ public class Async OutputStream outStream = connection.getOutputStream(); openedStreams.push(outStream); - OutputStreamWriter writer = new java.io.OutputStreamWriter(outStream); + OutputStreamWriter writer = new OutputStreamWriter(outStream); openedStreams.push(writer); writer.write((String) this.content); @@ -97,7 +97,7 @@ public class Async public static class RequestResult { - public static final class ByteArrayOutputStream2 extends java.io.ByteArrayOutputStream + public static final class ByteArrayOutputStream2 extends ByteArrayOutputStream { public ByteArrayOutputStream2() { @@ -171,7 +171,7 @@ public class Async openedStreams.push(inStream); - BufferedInputStream buffer = new java.io.BufferedInputStream(inStream, 4096); + BufferedInputStream buffer = new BufferedInputStream(inStream, 4096); openedStreams.push(buffer); ByteArrayOutputStream2 responseStream = contentLength != -1 ? new ByteArrayOutputStream2(contentLength) : new ByteArrayOutputStream2(); @@ -363,7 +363,7 @@ public class Async InputStream stream = null; try { - stream = new java.net.URL(params[0]).openStream(); + stream = new URL(params[0]).openStream(); Bitmap bmp = BitmapFactory.decodeStream(stream); return bmp; } diff --git a/android/widgets/src/main/java/org/nativescript/widgets/BorderDrawable.java b/android/widgets/src/main/java/org/nativescript/widgets/BorderDrawable.java index 551d3cc97..43363177e 100644 --- a/android/widgets/src/main/java/org/nativescript/widgets/BorderDrawable.java +++ b/android/widgets/src/main/java/org/nativescript/widgets/BorderDrawable.java @@ -159,9 +159,9 @@ public class BorderDrawable extends ColorDrawable { if (supportsPathOp) { // Path.Op can be used in API level 19+ to achieve the perfect geometry. Path backgroundPath = new Path(); - backgroundPath.addRoundRect(backgroundBoundsF, outerRadius, outerRadius, android.graphics.Path.Direction.CCW); + backgroundPath.addRoundRect(backgroundBoundsF, outerRadius, outerRadius, Path.Direction.CCW); Path backgroundNoRepeatPath = new Path(); - backgroundNoRepeatPath.addRect(params.posX, params.posY, params.posX + imageWidth, params.posY + imageHeight, android.graphics.Path.Direction.CCW); + backgroundNoRepeatPath.addRect(params.posX, params.posY, params.posX + imageWidth, params.posY + imageHeight, Path.Direction.CCW); intersect(backgroundPath, backgroundNoRepeatPath); canvas.drawPath(backgroundPath, backgroundImagePaint); } else { @@ -182,26 +182,26 @@ public class BorderDrawable extends ColorDrawable { borderPaint.setAntiAlias(true); if (this.clipPath != null && !this.clipPath.isEmpty()) { - borderPaint.setStyle(android.graphics.Paint.Style.STROKE); + borderPaint.setStyle(Paint.Style.STROKE); borderPaint.setStrokeWidth(borderWidth); drawClipPath(this.clipPath, canvas, borderPaint, backgroundBoundsF, density); } else { if (outerRadius <= 0) { - borderPaint.setStyle(android.graphics.Paint.Style.STROKE); + borderPaint.setStyle(Paint.Style.STROKE); borderPaint.setStrokeWidth(borderWidth); canvas.drawRect(middleBoundsF, borderPaint); } else if (outerRadius >= borderWidth) { - borderPaint.setStyle(android.graphics.Paint.Style.STROKE); + borderPaint.setStyle(Paint.Style.STROKE); borderPaint.setStrokeWidth(borderWidth); float middleRadius = Math.max(0, outerRadius - halfBorderWidth); canvas.drawRoundRect(middleBoundsF, middleRadius, middleRadius, borderPaint); } else { Path borderPath = new Path(); RectF borderOuterBoundsF = new RectF(bounds.left, bounds.top, bounds.right, bounds.bottom); - borderPath.addRoundRect(borderOuterBoundsF, outerRadius, outerRadius, android.graphics.Path.Direction.CCW); + borderPath.addRoundRect(borderOuterBoundsF, outerRadius, outerRadius, Path.Direction.CCW); RectF borderInnerBoundsF = new RectF(bounds.left + borderWidth, bounds.top + borderWidth, bounds.right - borderWidth, bounds.bottom - borderWidth); - borderPath.addRect(borderInnerBoundsF, android.graphics.Path.Direction.CW); - borderPaint.setStyle(android.graphics.Paint.Style.FILL); + borderPath.addRect(borderInnerBoundsF, Path.Direction.CW); + borderPaint.setStyle(Paint.Style.FILL); canvas.drawPath(borderPath, borderPaint); } } @@ -247,7 +247,7 @@ public class BorderDrawable extends ColorDrawable { top = cY - rY; right = (rX * 2) + left; bottom = (rY * 2) + top; - canvas.drawOval(new android.graphics.RectF(left, top, right, bottom), paint); + canvas.drawOval(new RectF(left, top, right, bottom), paint); break; case "polygon": Path path = new Path(); diff --git a/android/widgets/src/main/res/.gitkeep b/android/widgets/src/main/res/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/android/widgets/src/test/java/org/nativescript/widgets/ExampleUnitTest.java b/android/widgets/src/test/java/org/nativescript/widgets/ExampleUnitTest.java deleted file mode 100644 index 4f5c4921b..000000000 --- a/android/widgets/src/test/java/org/nativescript/widgets/ExampleUnitTest.java +++ /dev/null @@ -1,15 +0,0 @@ -package org.nativescript.widgets; - -import org.junit.Test; - -import static org.junit.Assert.*; - -/** - * To work on unit tests, switch the Test Artifact in the Build Variants view. - */ -public class ExampleUnitTest { - @Test - public void addition_isCorrect() throws Exception { - assertEquals(4, 2 + 2); - } -} \ No newline at end of file