Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Revert "Search - introduce top visible types"

Browse source 
This reverts commit efde801caf.
This commit is contained in:
crimean 2018-11-02 19:01:16 +03:00
parent efde801caf
commit b2ef894e67
10 changed files with 10 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
OsmAnd-java/src/main/java/net/osmand/search/SearchUICore.java
View file

@ -731,8 +731,7 @@ public class SearchUICore {
@Override @Override
public int compare(SearchResult o1, SearchResult o2) { public int compare(SearchResult o1, SearchResult o2) {
if (!ObjectType.isTopVisible(o1.objectType) && !ObjectType.isTopVisible(o2.objectType) if (o1.getFoundWordCount() != o2.getFoundWordCount()) {
&& o1.getFoundWordCount() != o2.getFoundWordCount()) {
return -Algorithms.compare(o1.getFoundWordCount(), o2.getFoundWordCount()); return -Algorithms.compare(o1.getFoundWordCount(), o2.getFoundWordCount());
} }
if (!sortByName) { if (!sortByName) {

4
OsmAnd-java/src/main/java/net/osmand/search/core/ObjectType.java
View file

@ -34,10 +34,6 @@ public enum ObjectType {
return t == CITY || t == VILLAGE || t == POSTCODE || t == STREET || t == HOUSE || t == STREET_INTERSECTION; return t == CITY || t == VILLAGE || t == POSTCODE || t == STREET || t == HOUSE || t == STREET_INTERSECTION;
} }
public static boolean isTopVisible(ObjectType t) {
return t == POI_TYPE || t == FAVORITE || t == FAVORITE_GROUP || t == WPT || t == LOCATION || t == PARTIAL_LOCATION;
}
public static ObjectType getExclusiveSearchType(ObjectType t) { public static ObjectType getExclusiveSearchType(ObjectType t) {
if (t == FAVORITE_GROUP) { if (t == FAVORITE_GROUP) {
return FAVORITE; return FAVORITE;

2
OsmAnd/AndroidManifest.xml
View file

@ -39,7 +39,7 @@
<uses-feature android:name="android.hardware.bluetooth" android:required="false" /> <uses-feature android:name="android.hardware.bluetooth" android:required="false" />
<uses-feature android:name="com.sec.feature.spen_usp" android:required="false"/> <uses-feature android:name="com.sec.feature.spen_usp" android:required="false"/>
<uses-sdk android:targetSdkVersion="26" <uses-sdk android:targetSdkVersion="26" android:minSdkVersion="15"
tools:overrideLibrary="com.getkeepsafe.taptargetview, studio.carbonylgroup.textfieldboxes, android.support.customtabs"/> tools:overrideLibrary="com.getkeepsafe.taptargetview, studio.carbonylgroup.textfieldboxes, android.support.customtabs"/>
<supports-screens android:resizeable="true" android:smallScreens="true" android:normalScreens="true" android:largeScreens="true" <supports-screens android:resizeable="true" android:smallScreens="true" android:normalScreens="true" android:largeScreens="true"

26
OsmAnd/build.gradle
View file

@ -41,16 +41,10 @@ android {
} }
publishing { publishing {
storeFile file("../keystores/debug.keystore")
storePassword "android"
keyAlias "androiddebugkey"
keyPassword "android"
/*
storeFile file("/var/lib/jenkins/osmand_key") storeFile file("/var/lib/jenkins/osmand_key")
storePassword System.getenv("OSMAND_APK_PASSWORD") storePassword System.getenv("OSMAND_APK_PASSWORD")
keyAlias "osmand" keyAlias "osmand"
keyPassword System.getenv("OSMAND_APK_PASSWORD") keyPassword System.getenv("OSMAND_APK_PASSWORD")
*/
} }
} }
@ -363,16 +357,6 @@ task appStart(type: Exec) {
// commandLine 'cmd', '/c', 'adb', 'shell', 'am', 'start', '-n', 'net.osmand.plus/net.osmand.plus.activities.MapActivity' // commandLine 'cmd', '/c', 'adb', 'shell', 'am', 'start', '-n', 'net.osmand.plus/net.osmand.plus.activities.MapActivity'
} }
//configurations.all {
// resolutionStrategy.cacheChangingModulesFor 0, 'seconds'
//}
//
//repositories {
// // Local build
// flatDir {
// dirs 'libs'
// }
//}
project.logger.warn("Analytics enabled for free version: $analytics") project.logger.warn("Analytics enabled for free version: $analytics")
dependencies { dependencies {
@ -382,7 +366,7 @@ dependencies {
implementation 'com.google.firebase:firebase-messaging:12.0.1' implementation 'com.google.firebase:firebase-messaging:12.0.1'
implementation 'com.google.firebase:firebase-iid:12.0.1' implementation 'com.google.firebase:firebase-iid:12.0.1'
implementation 'com.google.firebase:firebase-config:12.0.1' implementation 'com.google.firebase:firebase-config:12.0.1'
//implementation 'com.facebook.android:facebook-android-sdk:4.31.0' implementation 'com.facebook.android:facebook-android-sdk:4.31.0'
} }
implementation 'com.android.support:multidex:1.0.1' implementation 'com.android.support:multidex:1.0.1'
implementation 'com.android.support:gridlayout-v7:27.1.1' implementation 'com.android.support:gridlayout-v7:27.1.1'
@ -413,18 +397,10 @@ dependencies {
qtcoredebugImplementation fileTree(include: ['QtAndroid.jar', 'QtAndroidBearer.jar'], dir: 'libs') qtcoredebugImplementation fileTree(include: ['QtAndroid.jar', 'QtAndroidBearer.jar'], dir: 'libs')
legacyImplementation "net.osmand:OsmAndCore_android:0.1-SNAPSHOT@jar" legacyImplementation "net.osmand:OsmAndCore_android:0.1-SNAPSHOT@jar"
qtcoredebugImplementation "net.osmand:OsmAndCore_androidNativeDebug:0.1-SNAPSHOT@aar" qtcoredebugImplementation "net.osmand:OsmAndCore_androidNativeDebug:0.1-SNAPSHOT@aar"
qtcoredebugImplementation "net.osmand:OsmAndCore_android:0.1-SNAPSHOT@aar" qtcoredebugImplementation "net.osmand:OsmAndCore_android:0.1-SNAPSHOT@aar"
qtcoreImplementation "net.osmand:OsmAndCore_androidNativeRelease:0.1-SNAPSHOT@aar" qtcoreImplementation "net.osmand:OsmAndCore_androidNativeRelease:0.1-SNAPSHOT@aar"
qtcoreImplementation "net.osmand:OsmAndCore_android:0.1-SNAPSHOT@aar" qtcoreImplementation "net.osmand:OsmAndCore_android:0.1-SNAPSHOT@aar"
// Test
//qtcoreImplementation (name: 'OsmAndCore_android-release', ext: 'aar') { changing = true }
//qtcoreImplementation (name: 'OsmAndCore_androidNativeRelease-release', ext: 'aar') { changing = true }
//qtcoredebugImplementation (name: 'OsmAndCore_android-debug', ext: 'aar') { changing = true }
//qtcoredebugImplementation (name: 'OsmAndCore_androidNativeDebug-debug', ext: 'aar') { changing = true }
implementation ("com.getkeepsafe.taptargetview:taptargetview:1.12.0"){ implementation ("com.getkeepsafe.taptargetview:taptargetview:1.12.0"){
exclude group: 'com.android.support' exclude group: 'com.android.support'
} }

4
build.gradle
View file

@ -1,5 +1,5 @@
buildscript { buildscript {
ext.kotlin_version = '1.2.71' ext.kotlin_version = '1.2.50'
repositories { repositories {
google() google()
mavenCentral() mavenCentral()
@ -7,7 +7,7 @@ buildscript {
} }
dependencies { dependencies {
//classpath 'com.android.tools.build:gradle:2.+' //classpath 'com.android.tools.build:gradle:2.+'
classpath 'com.android.tools.build:gradle:3.2.1' classpath 'com.android.tools.build:gradle:3.1.4'
classpath 'com.google.gms:google-services:3.0.0' classpath 'com.google.gms:google-services:3.0.0'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
} }

2
gradle.properties
View file

@ -18,4 +18,4 @@
# for enableD8=true min sdk must be > 22 # for enableD8=true min sdk must be > 22
# UPDATE: temporairly commented since gradle plugin updated to 3.1.3 and claims INSTALL_FAILED_DEXOPT is fixed # UPDATE: temporairly commented since gradle plugin updated to 3.1.3 and claims INSTALL_FAILED_DEXOPT is fixed
# UPDATE 2: D8 causes problems on arm64 devices with Android 6.0 (API 23) # UPDATE 2: D8 causes problems on arm64 devices with Android 6.0 (API 23)
#android.enableD8=false android.enableD8=false

2
plugins/Osmand-Nautical/AndroidManifest.xml
View file

@ -5,7 +5,7 @@
android:versionCode="9" android:versionCode="9"
android:versionName="1.0" > android:versionName="1.0" >
<uses-sdk android:targetSdkVersion="16" /> <uses-sdk android:minSdkVersion="9" android:targetSdkVersion="16" />
<uses-feature android:name="android.hardware.touchscreen" android:required="false"/> <uses-feature android:name="android.hardware.touchscreen" android:required="false"/>
<supports-screens android:resizeable="true" android:smallScreens="true" android:normalScreens="true" android:largeScreens="true" <supports-screens android:resizeable="true" android:smallScreens="true" android:normalScreens="true" android:largeScreens="true"
android:xlargeScreens="true" android:anyDensity="true" /> android:xlargeScreens="true" android:anyDensity="true" />

2
plugins/Osmand-ParkingPlugin/AndroidManifest.xml
View file

@ -4,7 +4,7 @@
android:versionCode="9" android:versionCode="9"
android:versionName="1.0" > android:versionName="1.0" >
<uses-sdk android:targetSdkVersion="16" /> <uses-sdk android:minSdkVersion="4" android:targetSdkVersion="16" />
<uses-feature android:name="android.hardware.touchscreen" android:required="false"/> <uses-feature android:name="android.hardware.touchscreen" android:required="false"/>
<supports-screens android:resizeable="true" android:smallScreens="true" android:normalScreens="true" android:largeScreens="true" <supports-screens android:resizeable="true" android:smallScreens="true" android:normalScreens="true" android:largeScreens="true"
android:xlargeScreens="true" android:anyDensity="true" /> android:xlargeScreens="true" android:anyDensity="true" />

2
plugins/Osmand-SRTMPlugin/AndroidManifest.xml
View file

@ -4,7 +4,7 @@
android:versionCode="9" android:versionCode="9"
android:versionName="1.0" > android:versionName="1.0" >
<uses-sdk android:targetSdkVersion="16" /> <uses-sdk android:minSdkVersion="4" android:targetSdkVersion="16" />
<uses-feature android:name="android.hardware.touchscreen" android:required="false"/> <uses-feature android:name="android.hardware.touchscreen" android:required="false"/>
<supports-screens android:resizeable="true" android:smallScreens="true" android:normalScreens="true" android:largeScreens="true" <supports-screens android:resizeable="true" android:smallScreens="true" android:normalScreens="true" android:largeScreens="true"
android:xlargeScreens="true" android:anyDensity="true" /> android:xlargeScreens="true" android:anyDensity="true" />

2
plugins/Osmand-Skimaps/AndroidManifest.xml
View file

@ -4,7 +4,7 @@
android:versionCode="9" android:versionCode="9"
android:versionName="1.0" > android:versionName="1.0" >
<uses-sdk android:targetSdkVersion="16" /> <uses-sdk android:minSdkVersion="9" android:targetSdkVersion="16" />
<uses-feature android:name="android.hardware.touchscreen" android:required="false"/> <uses-feature android:name="android.hardware.touchscreen" android:required="false"/>
<supports-screens android:resizeable="true" android:smallScreens="true" android:normalScreens="true" android:largeScreens="true" <supports-screens android:resizeable="true" android:smallScreens="true" android:normalScreens="true" android:largeScreens="true"
android:xlargeScreens="true" android:anyDensity="true" /> android:xlargeScreens="true" android:anyDensity="true" />