From 3379bbf7928c561b5eb9d43e78abe94861588787 Mon Sep 17 00:00:00 2001 From: Victor Shcherb Date: Wed, 19 Aug 2015 00:04:46 +0200 Subject: [PATCH] Update project --- .../net/osmand/binary/BinaryInspector.java | 10 +++--- OsmAnd/build.gradle | 9 ++--- OsmAnd/project.properties | 1 + eclipse-compile/cardview/.classpath | 8 +++++ eclipse-compile/cardview/.gitignore | 4 +++ eclipse-compile/cardview/.project | 33 ++++++++++++++++++ eclipse-compile/cardview/AndroidManifest.xml | 1 + .../cardview}/build.gradle | 0 .../libs/android-support-v7-cardview.jar | Bin eclipse-compile/cardview/project.properties | 16 +++++++++ eclipse-compile/cardview/res | 1 + .../cardview}/src/main/AndroidManifest.xml | 0 .../cardview}/src/main/res/values/attrs.xml | 0 .../cardview}/src/main/res/values/colors.xml | 0 .../cardview}/src/main/res/values/dimens.xml | 0 .../cardview}/src/main/res/values/styles.xml | 0 .../cardview}/src/main/resources/.readme | 0 eclipse-compile/design/.classpath | 1 - eclipse-compile/design/.gitignore | 1 + .../design/bin/AndroidManifest.xml | 5 --- eclipse-compile/design/bin/jarlist.cache | 3 -- eclipse-compile/design/gen/.gitignore | 1 - .../android/support/design/BuildConfig.java | 6 ---- .../recyclerview}/.gitignore | 0 .../recyclerview}/build.gradle | 0 settings.gradle | 6 ++-- 26 files changed, 80 insertions(+), 26 deletions(-) create mode 100644 eclipse-compile/cardview/.classpath create mode 100644 eclipse-compile/cardview/.gitignore create mode 100644 eclipse-compile/cardview/.project create mode 120000 eclipse-compile/cardview/AndroidManifest.xml rename {cardview => eclipse-compile/cardview}/build.gradle (100%) rename {cardview => eclipse-compile/cardview}/libs/android-support-v7-cardview.jar (100%) create mode 100644 eclipse-compile/cardview/project.properties create mode 120000 eclipse-compile/cardview/res rename {cardview => eclipse-compile/cardview}/src/main/AndroidManifest.xml (100%) rename {cardview => eclipse-compile/cardview}/src/main/res/values/attrs.xml (100%) rename {cardview => eclipse-compile/cardview}/src/main/res/values/colors.xml (100%) rename {cardview => eclipse-compile/cardview}/src/main/res/values/dimens.xml (100%) rename {cardview => eclipse-compile/cardview}/src/main/res/values/styles.xml (100%) rename {cardview => eclipse-compile/cardview}/src/main/resources/.readme (100%) delete mode 100644 eclipse-compile/design/bin/AndroidManifest.xml delete mode 100644 eclipse-compile/design/bin/jarlist.cache delete mode 100644 eclipse-compile/design/gen/.gitignore delete mode 100644 eclipse-compile/design/gen/android/support/design/BuildConfig.java rename {recyclerview => eclipse-compile/recyclerview}/.gitignore (100%) rename {recyclerview => eclipse-compile/recyclerview}/build.gradle (100%) diff --git a/OsmAnd-java/src/net/osmand/binary/BinaryInspector.java b/OsmAnd-java/src/net/osmand/binary/BinaryInspector.java index 7a256a46eb..ddf3ea6b9a 100644 --- a/OsmAnd-java/src/net/osmand/binary/BinaryInspector.java +++ b/OsmAnd-java/src/net/osmand/binary/BinaryInspector.java @@ -66,15 +66,16 @@ public class BinaryInspector { // test cases show info if(args.length == 1 && "test".equals(args[0])) { in.inspector(new String[]{ - "-vpoi", -// "-vmap", "-vmapobjects", // "-vmapcoordinates", +// "-vpoi", + "-vmap", "-vmapobjects", // "-vmapcoordinates", // "-vrouting", // "-vaddress", "-vcities","-vstreetgroups", // "-vstreets", "-vbuildings", "-vintersections", // "-zoom=15", // "-bbox=1.74,51.17,1.75,51.16", // "-vstats", - "/Users/victorshcherb/osmand/maps/Synthetic_test_rendering.obf" + "/Users/victorshcherb/osmand/temp/Germany_bayern_europe_15_08_04.obf" +// "/Users/victorshcherb/osmand/maps/Synthetic_test_rendering.obf" // "/Users/victorshcherb/osmand/maps/Map.obf" // "/Users/victorshcherb/osmand/temp/Czech-republic_jihovychod_europe_2.road.obf" }); @@ -813,7 +814,8 @@ public class BinaryInspector { } catch (IOException e) { throw new RuntimeException(e); } - } else { + } else if(obj.getId() == 363826871l) { +// } else { printMapDetails(obj, b, vInfo.vmapCoordinates); println(b.toString()); } diff --git a/OsmAnd/build.gradle b/OsmAnd/build.gradle index d50b71a05e..1681e0199b 100644 --- a/OsmAnd/build.gradle +++ b/OsmAnd/build.gradle @@ -301,8 +301,8 @@ repositories { dependencies { compile project(path: ":OsmAnd-java", configuration: "android") compile project(":eclipse-compile:design") - compile project(":cardview") -// compile project(":recyclerview") + compile project(":eclipse-compile:cardview") +// compile project(":eclipse-compile:recyclerview") compile fileTree( dir: "libs", include: ["*.jar"], @@ -312,12 +312,13 @@ 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" + // compile 'com.android.support:design:22.2.1' 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' + } diff --git a/OsmAnd/project.properties b/OsmAnd/project.properties index 146000a0b5..1b49bef156 100644 --- a/OsmAnd/project.properties +++ b/OsmAnd/project.properties @@ -14,3 +14,4 @@ target=android-21 dex.force.jumbo=true android.library.reference.1=../eclipse-compile/appcompat android.library.reference.2=../eclipse-compile/design +android.library.reference.3=../eclipse-compile/cardview diff --git a/eclipse-compile/cardview/.classpath b/eclipse-compile/cardview/.classpath new file mode 100644 index 0000000000..92ab9b2c93 --- /dev/null +++ b/eclipse-compile/cardview/.classpath @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/eclipse-compile/cardview/.gitignore b/eclipse-compile/cardview/.gitignore new file mode 100644 index 0000000000..cb2011b87e --- /dev/null +++ b/eclipse-compile/cardview/.gitignore @@ -0,0 +1,4 @@ +/bin +/gen +/R +/classes diff --git a/eclipse-compile/cardview/.project b/eclipse-compile/cardview/.project new file mode 100644 index 0000000000..105072983e --- /dev/null +++ b/eclipse-compile/cardview/.project @@ -0,0 +1,33 @@ + + + android-cardview + + + + + + com.android.ide.eclipse.adt.ResourceManagerBuilder + + + + + com.android.ide.eclipse.adt.PreCompilerBuilder + + + + + org.eclipse.jdt.core.javabuilder + + + + + com.android.ide.eclipse.adt.ApkBuilder + + + + + + com.android.ide.eclipse.adt.AndroidNature + org.eclipse.jdt.core.javanature + + diff --git a/eclipse-compile/cardview/AndroidManifest.xml b/eclipse-compile/cardview/AndroidManifest.xml new file mode 120000 index 0000000000..ca5aa004cc --- /dev/null +++ b/eclipse-compile/cardview/AndroidManifest.xml @@ -0,0 +1 @@ +src/main/AndroidManifest.xml \ No newline at end of file diff --git a/cardview/build.gradle b/eclipse-compile/cardview/build.gradle similarity index 100% rename from cardview/build.gradle rename to eclipse-compile/cardview/build.gradle diff --git a/cardview/libs/android-support-v7-cardview.jar b/eclipse-compile/cardview/libs/android-support-v7-cardview.jar similarity index 100% rename from cardview/libs/android-support-v7-cardview.jar rename to eclipse-compile/cardview/libs/android-support-v7-cardview.jar diff --git a/eclipse-compile/cardview/project.properties b/eclipse-compile/cardview/project.properties new file mode 100644 index 0000000000..17e2d080fd --- /dev/null +++ b/eclipse-compile/cardview/project.properties @@ -0,0 +1,16 @@ +# This file is automatically generated by Android Tools. +# Do not modify this file -- YOUR CHANGES WILL BE ERASED! +# +# This file must be checked in Version Control Systems. +# +# To customize properties used by the Ant build system edit +# "ant.properties", and override values to adapt the script to your +# project structure. +# +# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home): +#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt + +# Project target. +target=android-21 +android.library=true +android.library.reference.1=../appcompat diff --git a/eclipse-compile/cardview/res b/eclipse-compile/cardview/res new file mode 120000 index 0000000000..c378ac05d9 --- /dev/null +++ b/eclipse-compile/cardview/res @@ -0,0 +1 @@ +src/main/res \ No newline at end of file diff --git a/cardview/src/main/AndroidManifest.xml b/eclipse-compile/cardview/src/main/AndroidManifest.xml similarity index 100% rename from cardview/src/main/AndroidManifest.xml rename to eclipse-compile/cardview/src/main/AndroidManifest.xml diff --git a/cardview/src/main/res/values/attrs.xml b/eclipse-compile/cardview/src/main/res/values/attrs.xml similarity index 100% rename from cardview/src/main/res/values/attrs.xml rename to eclipse-compile/cardview/src/main/res/values/attrs.xml diff --git a/cardview/src/main/res/values/colors.xml b/eclipse-compile/cardview/src/main/res/values/colors.xml similarity index 100% rename from cardview/src/main/res/values/colors.xml rename to eclipse-compile/cardview/src/main/res/values/colors.xml diff --git a/cardview/src/main/res/values/dimens.xml b/eclipse-compile/cardview/src/main/res/values/dimens.xml similarity index 100% rename from cardview/src/main/res/values/dimens.xml rename to eclipse-compile/cardview/src/main/res/values/dimens.xml diff --git a/cardview/src/main/res/values/styles.xml b/eclipse-compile/cardview/src/main/res/values/styles.xml similarity index 100% rename from cardview/src/main/res/values/styles.xml rename to eclipse-compile/cardview/src/main/res/values/styles.xml diff --git a/cardview/src/main/resources/.readme b/eclipse-compile/cardview/src/main/resources/.readme similarity index 100% rename from cardview/src/main/resources/.readme rename to eclipse-compile/cardview/src/main/resources/.readme diff --git a/eclipse-compile/design/.classpath b/eclipse-compile/design/.classpath index bb77a7f28f..92ab9b2c93 100644 --- a/eclipse-compile/design/.classpath +++ b/eclipse-compile/design/.classpath @@ -1,6 +1,5 @@ - diff --git a/eclipse-compile/design/.gitignore b/eclipse-compile/design/.gitignore index 455a9fb758..d94c11bf1b 100644 --- a/eclipse-compile/design/.gitignore +++ b/eclipse-compile/design/.gitignore @@ -1,3 +1,4 @@ /build /R /bin +/gen diff --git a/eclipse-compile/design/bin/AndroidManifest.xml b/eclipse-compile/design/bin/AndroidManifest.xml deleted file mode 100644 index 012c7bf894..0000000000 --- a/eclipse-compile/design/bin/AndroidManifest.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - diff --git a/eclipse-compile/design/bin/jarlist.cache b/eclipse-compile/design/bin/jarlist.cache deleted file mode 100644 index 0565465f22..0000000000 --- a/eclipse-compile/design/bin/jarlist.cache +++ /dev/null @@ -1,3 +0,0 @@ -# cache for current jar dependency. DO NOT EDIT. -# format is -# Encoding is UTF-8 diff --git a/eclipse-compile/design/gen/.gitignore b/eclipse-compile/design/gen/.gitignore deleted file mode 100644 index 3015774bfa..0000000000 --- a/eclipse-compile/design/gen/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/android/ diff --git a/eclipse-compile/design/gen/android/support/design/BuildConfig.java b/eclipse-compile/design/gen/android/support/design/BuildConfig.java deleted file mode 100644 index 454f6da7a2..0000000000 --- a/eclipse-compile/design/gen/android/support/design/BuildConfig.java +++ /dev/null @@ -1,6 +0,0 @@ -/** Automatically generated file. DO NOT MODIFY */ -package android.support.design; - -public final class BuildConfig { - public final static boolean DEBUG = true; -} \ No newline at end of file diff --git a/recyclerview/.gitignore b/eclipse-compile/recyclerview/.gitignore similarity index 100% rename from recyclerview/.gitignore rename to eclipse-compile/recyclerview/.gitignore diff --git a/recyclerview/build.gradle b/eclipse-compile/recyclerview/build.gradle similarity index 100% rename from recyclerview/build.gradle rename to eclipse-compile/recyclerview/build.gradle diff --git a/settings.gradle b/settings.gradle index fdb1beeeb4..1472966a6f 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,6 +1,8 @@ -include ':OsmAnd-java', ':eclipse-compile:design', ':cardview' -include ':OsmAnd' +include ':OsmAnd-java' +include ':eclipse-compile:cardview' +include ':eclipse-compile:design' include ':eclipse-compile:appcompat' +include ':OsmAnd' include ':plugins:OsmAnd-AddressPlugin' include ':plugins:Osmand-ParkingPlugin' include ':plugins:Osmand-Sherpafy'