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

Merge branch 'r3.9'

Browse source
This commit is contained in:
Victor Shcherb 2021-02-20 13:23:21 +02:00
commit a5e062c849
3 changed files with 15 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
OsmAnd/assets/Default_wikivoyage.travel.obf
View file

Binary file not shown.

16
OsmAnd/build-common.gradle
View file

@ -106,6 +106,11 @@ android {
} }
} }
clean.doFirst {
delete fileTree('assets') {
include '*.obf'
}
}
task validateTranslate { task validateTranslate {
println "Validating translations" println "Validating translations"
@ -126,9 +131,15 @@ task validateTranslate {
} }
} }
task downloadDefaultWikivoyage {
doLast {
ant.get(src: 'https://builder.osmand.net/wikivoyage-gen/sqlite/Default_wikivoyage_2.travel.obf', dest: 'assets/Default_wikivoyage.travel.obf', skipexisting: 'true')
}
}
task downloadWorldMiniBasemap { task downloadWorldMiniBasemap {
doLast { doLast {
ant.get(src: 'http://builder.osmand.net/basemap/World_basemap_mini_2.obf', dest: 'assets/World_basemap_mini.obf', skipexisting: 'true') ant.get(src: 'https://builder.osmand.net/basemap/World_basemap_mini_2.obf', dest: 'assets/World_basemap_mini.obf', skipexisting: 'true')
} }
} }
@ -254,7 +265,8 @@ task collectExternalResources {
copyWidgetIconsHdpi, copyWidgetIconsHdpi,
copyWidgetIconsXhdpi, copyWidgetIconsXhdpi,
copyPoiCategories, copyPoiCategories,
downloadWorldMiniBasemap downloadWorldMiniBasemap,
downloadDefaultWikivoyage
} }
// Legacy core build // Legacy core build

2
OsmAnd/res/layout/two_line_with_images_list_item.xml
View file

@ -100,7 +100,7 @@
android:paddingRight="@dimen/bottom_sheet_exit_button_margin" android:paddingRight="@dimen/bottom_sheet_exit_button_margin"
android:text="@string/buy" android:text="@string/buy"
android:textColor="@color/text_color_tab_active_light" android:textColor="@color/text_color_tab_active_light"
android:visibility="visible" /> android:visibility="gone" />
</LinearLayout> </LinearLayout>