Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
79b804a030
1 changed files with 8 additions and 2 deletions
|
@ -383,10 +383,16 @@ public class POIMapLayer extends OsmandMapLayer implements ContextMenuLayer.ICon
|
|||
topBar.setTitle(title);
|
||||
topBar.setBackgroundColor(ctx.getResources().getColor(getResIdFromAttribute(ctx, R.attr.pstsTabBackground)));
|
||||
topBar.setTitleTextColor(ctx.getResources().getColor(getResIdFromAttribute(ctx, R.attr.pstsTextColor)));
|
||||
String lng = a.getNameSelected(lang);
|
||||
if(Algorithms.isEmpty(lng)) {
|
||||
String lng = ""
|
||||
if(!Algorithms.isEmpty(a.getNameSelected(lang))) {
|
||||
lng = lang.toUpperCase();
|
||||
} else if (!Algorithms.isEmpty(a.getNameSelected("en"))) {
|
||||
lng = "EN";
|
||||
} else {
|
||||
//TODO: If no English article exists either, now pick the language for which the longest article exists for the Amenity
|
||||
lng = "XX";
|
||||
}
|
||||
|
||||
final String langSelected = lng;
|
||||
final Button bottomBar = new Button(ctx);
|
||||
bottomBar.setText(R.string.read_full_article);
|
||||
|
|
Loading…
Reference in a new issue