Merge pull request #9712 from osmandapp/import_addresses_wrong_assigned

Fix #9676
This commit is contained in:
Vitaliy 2020-09-03 02:19:26 +03:00 committed by GitHub
commit f5548b9c73
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -1025,9 +1025,7 @@ public class FavoritesTreeFragment extends OsmandExpandableListFragment implemen
name.setText(model.getDisplayName(app), TextView.BufferType.SPANNABLE); name.setText(model.getDisplayName(app), TextView.BufferType.SPANNABLE);
name.setTypeface(Typeface.DEFAULT, visible ? Typeface.NORMAL : Typeface.ITALIC); name.setTypeface(Typeface.DEFAULT, visible ? Typeface.NORMAL : Typeface.ITALIC);
name.setTextColor(getResources().getColor(visible ? enabledColor : disabledColor)); name.setTextColor(getResources().getColor(visible ? enabledColor : disabledColor));
if (model.isAddressSpecified()) { addressText.setText(model.isAddressSpecified() ? model.getAddress() : null);
addressText.setText(model.getAddress());
}
int color = visible int color = visible
? app.getFavorites().getColorWithCategory(model, getResources().getColor(R.color.color_favorite)) ? app.getFavorites().getColorWithCategory(model, getResources().getColor(R.color.color_favorite))
: ContextCompat.getColor(app, disabledIconColor); : ContextCompat.getColor(app, disabledIconColor);