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

Remove dependency

Browse source
This commit is contained in:
Victor Shcherb 2018-03-28 23:57:54 +02:00
parent 6d1a4e60db
commit 8285fb431f
4 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
OsmAnd/build.gradle
View file

@ -392,12 +392,14 @@ dependencies {
compile 'com.google.firebase:firebase-config:9.8.0'
implementation 'com.facebook.android:facebook-android-sdk:[4,5)'
}
compile 'com.android.support:multidex:1.0.1'
compile 'com.android.support:gridlayout-v7:27.1.0'
compile 'com.android.support:cardview-v7:27.1.0'
compile 'com.android.support:appcompat-v7:27.1.0'
compile 'com.android.support:design:27.1.0'
compile 'com.android.support:customtabs:27.1.0'
compile fileTree(include: ['*.jar'], exclude: ['QtAndroid-bundled.jar', 'QtAndroidAccessibility-bundled.jar', 'OsmAndCore_android.jar', 'OsmAndCore_wrapper.jar', 'android-support-multidex.jar'], dir: 'libs')
compile fileTree(include: ['bsh-core-2.0b4.jar', 'bzip2-20090327.jar', 'gnu-trove-osmand.jar', 'gson-2.5.jar', 'icu4j-49_1_patched.jar', 'jts-core-1.14.0.jar', 'junidecode-0.1.jar', 'simple-logging.jar', 'tuprolog.jar'], dir: 'libs')
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"

1
OsmAnd/project.properties
View file

@ -25,3 +25,4 @@ android.library.reference.9=aarDependencies/android.arch.core-runtime-1.1.0
android.library.reference.11=aarDependencies/com.android.support-support-v4-27.1.0
android.library.reference.12=aarDependencies/com.android.support-support-vector-drawable-27.1.0
android.library.reference.13=aarDependencies/com.android.support-animated-vector-drawable-27.1.0
android.library.reference.14=aarDependencies/com.android.support-multidex-1.0.1

3
OsmAnd/src/net/osmand/plus/wikivoyage/WikivoyageArticleDialogFragment.java
View file

@ -42,7 +42,8 @@ public class WikivoyageArticleDialogFragment extends BaseOsmAndDialogFragment {
});
TextView contentTv = (TextView) mainView.findViewById(R.id.content_text_view);
WikivoyageArticle article = getMyApplication().getWikivoyageDbHelper().getArticle(searchResult);
WikivoyageArticle article = getMyApplication().getWikivoyageDbHelper().getArticle(searchResult.getCityId(),
searchResult.getLang().get(0));
contentTv.setText(new SpannableString(Html.fromHtml(article.getContent())));
return mainView;

5
OsmAnd/src/net/osmand/plus/wikivoyage/search/SearchRecyclerViewAdapter.java
View file

@ -34,9 +34,10 @@ public class SearchRecyclerViewAdapter extends RecyclerView.Adapter<SearchRecycl
@Override
public void onBindViewHolder(ViewHolder viewHolder, int i) {
SearchResult item = items.get(i);
viewHolder.searchTerm.setText(item.getSearchTerm());
// FIXME
viewHolder.searchTerm.setText(item.getSearchTerm().toString());
viewHolder.cityId.setText(String.valueOf(item.getCityId()));
viewHolder.articleTitle.setText(item.getArticleTitle());
viewHolder.articleTitle.setText(item.getArticleTitle().toString());
viewHolder.lang.setText(item.getLang().toString());
}