diff --git a/OsmAnd/build.gradle b/OsmAnd/build.gradle index f7d2ca58f0..6478ce3521 100644 --- a/OsmAnd/build.gradle +++ b/OsmAnd/build.gradle @@ -301,7 +301,7 @@ repositories { dependencies { compile project(path: ":OsmAnd-java", configuration: "android") -// compile project(":eclipse-compile:appcompat") + compile project(":eclipse-compile:design") compile fileTree( dir: "libs", include: ["*.jar"], @@ -311,12 +311,12 @@ dependencies { "OsmAndCore_android.jar", "OsmAndCore_wrapper.jar"]) // compile "com.github.ksoichiro:android-observablescrollview:1.5.0" - compile "com.android.support:appcompat-v7:22.2.1" +// compile "com.android.support:appcompat-v7:22.2.1" // compile "com.github.shell-software:fab:1.0.5" legacyCompile "net.osmand:OsmAndCore_android:0.1-SNAPSHOT@jar" qtcoredebugCompile "net.osmand:OsmAndCore_androidNativeDebug:0.1-SNAPSHOT@aar" qtcoredebugCompile "net.osmand:OsmAndCore_android:0.1-SNAPSHOT@aar" qtcoreCompile "net.osmand:OsmAndCore_androidNativeRelease:0.1-SNAPSHOT@aar" qtcoreCompile "net.osmand:OsmAndCore_android:0.1-SNAPSHOT@aar" - compile 'com.android.support:design:22.2.1' +// compile 'com.android.support:design:22.2.1' } diff --git a/OsmAnd/project.properties b/OsmAnd/project.properties index fd62b55da2..146000a0b5 100644 --- a/OsmAnd/project.properties +++ b/OsmAnd/project.properties @@ -13,3 +13,4 @@ split.density=false target=android-21 dex.force.jumbo=true android.library.reference.1=../eclipse-compile/appcompat +android.library.reference.2=../eclipse-compile/design diff --git a/OsmAnd/res/drawable-xxhdpi/map_target_point.png b/OsmAnd/res/drawable-xxhdpi/map_target_point.png old mode 100755 new mode 100644 index bb6ec0fe84..f48d52c6ef Binary files a/OsmAnd/res/drawable-xxhdpi/map_target_point.png and b/OsmAnd/res/drawable-xxhdpi/map_target_point.png differ diff --git a/build.gradle b/build.gradle index c492d0fbec..73a4bc4761 100644 --- a/build.gradle +++ b/build.gradle @@ -4,12 +4,9 @@ buildscript { } dependencies { classpath 'com.android.tools.build:gradle:1.1.0' - classpath 'com.jakewharton.sdkmanager:gradle-plugin:0.12.+' } } -apply plugin: 'android-sdk-manager' - allprojects { repositories { mavenCentral() diff --git a/eclipse-compile/appcompat/libs/android-support-v4.jar b/eclipse-compile/appcompat/libs/android-support-v4.jar index e74b0d77d2..7b78bb8ee8 100644 Binary files a/eclipse-compile/appcompat/libs/android-support-v4.jar and b/eclipse-compile/appcompat/libs/android-support-v4.jar differ diff --git a/eclipse-compile/appcompat/libs/android-support-v7-appcompat.jar b/eclipse-compile/appcompat/libs/android-support-v7-appcompat.jar index b9dca8a789..830a4936a6 100644 Binary files a/eclipse-compile/appcompat/libs/android-support-v7-appcompat.jar and b/eclipse-compile/appcompat/libs/android-support-v7-appcompat.jar differ diff --git a/eclipse-compile/appcompat/res/values-v21/styles_base.xml b/eclipse-compile/appcompat/res/values-v21/styles_base.xml index 173a01c5d5..241cb04c59 100644 --- a/eclipse-compile/appcompat/res/values-v21/styles_base.xml +++ b/eclipse-compile/appcompat/res/values-v21/styles_base.xml @@ -71,6 +71,7 @@ + @@ -173,6 +174,8 @@ + - + + + diff --git a/eclipse-compile/design/src/main/res/values-sw600dp/config.xml b/eclipse-compile/design/src/main/res/values-sw600dp/config.xml new file mode 100644 index 0000000000..baac13bf28 --- /dev/null +++ b/eclipse-compile/design/src/main/res/values-sw600dp/config.xml @@ -0,0 +1,22 @@ + + + + + + 1 + + \ No newline at end of file diff --git a/eclipse-compile/design/src/main/res/values-sw600dp/dimens.xml b/eclipse-compile/design/src/main/res/values-sw600dp/dimens.xml new file mode 100644 index 0000000000..37c3ff5a29 --- /dev/null +++ b/eclipse-compile/design/src/main/res/values-sw600dp/dimens.xml @@ -0,0 +1,29 @@ + + + + + + 160dp + + 320dp + 576dp + @dimen/snackbar_padding_vertical + 24dp + 2dp + 0dp + + \ No newline at end of file diff --git a/eclipse-compile/design/src/main/res/values-sw600dp/styles.xml b/eclipse-compile/design/src/main/res/values-sw600dp/styles.xml new file mode 100644 index 0000000000..622a5e361e --- /dev/null +++ b/eclipse-compile/design/src/main/res/values-sw600dp/styles.xml @@ -0,0 +1,25 @@ + + + + + + + + diff --git a/eclipse-compile/design/src/main/res/values-v21/dimens.xml b/eclipse-compile/design/src/main/res/values-v21/dimens.xml new file mode 100644 index 0000000000..2a67937bb1 --- /dev/null +++ b/eclipse-compile/design/src/main/res/values-v21/dimens.xml @@ -0,0 +1,19 @@ + + + + 24dp + diff --git a/eclipse-compile/design/src/main/res/values/attrs.xml b/eclipse-compile/design/src/main/res/values/attrs.xml new file mode 100644 index 0000000000..e4c1bf02c8 --- /dev/null +++ b/eclipse-compile/design/src/main/res/values/attrs.xml @@ -0,0 +1,260 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/eclipse-compile/design/src/main/res/values/colors.xml b/eclipse-compile/design/src/main/res/values/colors.xml new file mode 100644 index 0000000000..216ad79930 --- /dev/null +++ b/eclipse-compile/design/src/main/res/values/colors.xml @@ -0,0 +1,40 @@ + + + + + + + #2EFFFFFF + + #1AFFFFFF + + #0F000000 + + #0A000000 + + + #44000000 + + #14000000 + + @android:color/transparent + + #FFDD2C00 + + #323232 + + \ No newline at end of file diff --git a/eclipse-compile/design/src/main/res/values/config.xml b/eclipse-compile/design/src/main/res/values/config.xml new file mode 100644 index 0000000000..2ff276a217 --- /dev/null +++ b/eclipse-compile/design/src/main/res/values/config.xml @@ -0,0 +1,22 @@ + + + + + + 2 + + \ No newline at end of file diff --git a/eclipse-compile/design/src/main/res/values/dimens.xml b/eclipse-compile/design/src/main/res/values/dimens.xml new file mode 100644 index 0000000000..45e83e6088 --- /dev/null +++ b/eclipse-compile/design/src/main/res/values/dimens.xml @@ -0,0 +1,56 @@ + + + + + 8dp + 6dp + 24dp + 56dp + 40dp + 0.5dp + + 320dp + 12dp + 32dp + 24dp + 8dp + 0dp + 8dp + + 72dp + 264dp + + -1px + -1px + 2dp + 0dp + + 12dp + 14dp + 24dp + + + 0dp + + 128dp + + 14sp + + 4dp + + diff --git a/eclipse-compile/design/src/main/res/values/ids.xml b/eclipse-compile/design/src/main/res/values/ids.xml new file mode 100644 index 0000000000..91acfd033f --- /dev/null +++ b/eclipse-compile/design/src/main/res/values/ids.xml @@ -0,0 +1,22 @@ + + + + + + + + diff --git a/eclipse-compile/design/src/main/res/values/strings.xml b/eclipse-compile/design/src/main/res/values/strings.xml new file mode 100644 index 0000000000..4c02de1609 --- /dev/null +++ b/eclipse-compile/design/src/main/res/values/strings.xml @@ -0,0 +1,21 @@ + + + + + android.support.design.widget.AppBarLayout$ScrollingViewBehavior + + diff --git a/eclipse-compile/design/src/main/res/values/styles.xml b/eclipse-compile/design/src/main/res/values/styles.xml new file mode 100644 index 0000000000..067846c0b1 --- /dev/null +++ b/eclipse-compile/design/src/main/res/values/styles.xml @@ -0,0 +1,116 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/import-summary.txt b/import-summary.txt new file mode 100644 index 0000000000..6b9133f411 --- /dev/null +++ b/import-summary.txt @@ -0,0 +1,35 @@ +ECLIPSE ANDROID PROJECT IMPORT SUMMARY +====================================== + +Ignored Files: +-------------- +The following files were *not* copied into the new Gradle project; you +should evaluate whether these are still needed in your project and if +so manually move them: + +* .DS_Store + +Moved Files: +------------ +Android Gradle projects use a different directory structure than ADT +Eclipse projects. Here's how the projects were restructured: + +* AndroidManifest.xml => design/src/main/AndroidManifest.xml +* res/ => design/src/main/res/ +* src/ => design/src/main/java +* src/.readme => design/src/main/resources/.readme + +Next Steps: +----------- +You can now build the project. The Gradle project needs network +connectivity to download dependencies. + +Bugs: +----- +If for some reason your project does not build, and you determine that +it is due to a bug or limitation of the Eclipse to Gradle importer, +please file a bug at http://b.android.com with category +Component-Tools. + +(This import summary is for your information only, and can be deleted +after import once you are satisfied with the results.) diff --git a/settings.gradle b/settings.gradle index a16f1fe104..f3187f5fa4 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,4 +1,4 @@ -include ':OsmAnd-java' +include ':OsmAnd-java', ':design' include ':OsmAnd' include ':eclipse-compile:appcompat' include ':plugins:OsmAnd-AddressPlugin'