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

Merge pull request #9710 from osmandapp/show_hidden_folders

Browse source 
Fix  #9636
This commit is contained in:
Vitaliy 2020-09-03 13:51:37 +03:00 committed by GitHub
commit 28b03c14ce
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
OsmAnd/src/net/osmand/plus/mapcontextmenu/editors/SelectCategoryDialogFragment.java
View file

@ -84,18 +84,17 @@ public class SelectCategoryDialogFragment extends DialogFragment {
if (gpxCategories != null) { if (gpxCategories != null) {
for (Map.Entry<String, Integer> e : gpxCategories.entrySet()) { for (Map.Entry<String, Integer> e : gpxCategories.entrySet()) {
String categoryName = e.getKey(); String categoryName = e.getKey();
ll.addView(createCategoryItem(activity, nightMode, categoryName, e.getValue())); ll.addView(createCategoryItem(activity, nightMode, categoryName, e.getValue(), false));
} }
} }
} else { } else {
List<FavouritesDbHelper.FavoriteGroup> gs = helper.getFavoriteGroups(); List<FavouritesDbHelper.FavoriteGroup> gs = helper.getFavoriteGroups();
for (final FavouritesDbHelper.FavoriteGroup category : gs) { for (final FavouritesDbHelper.FavoriteGroup category : gs) {
if (category.isVisible()) { ll.addView(createCategoryItem(activity, nightMode, category.getDisplayName(getContext()),
ll.addView(createCategoryItem(activity, nightMode, category.getDisplayName(getContext()), category.getColor(), !category.isVisible()));
category.getColor()));
}
} }
} }
View itemView = UiUtilities.getInflater(activity, nightMode).inflate(R.layout.favorite_category_dialog_item, null); View itemView = UiUtilities.getInflater(activity, nightMode).inflate(R.layout.favorite_category_dialog_item, null);
Button button = (Button)itemView.findViewById(R.id.button); Button button = (Button)itemView.findViewById(R.id.button);
button.setCompoundDrawablesWithIntrinsicBounds(getIcon(activity, R.drawable.ic_zoom_in), null, null, null); button.setCompoundDrawablesWithIntrinsicBounds(getIcon(activity, R.drawable.ic_zoom_in), null, null, null);
@ -120,16 +119,20 @@ public class SelectCategoryDialogFragment extends DialogFragment {
return builder.create(); return builder.create();
} }
private View createCategoryItem(@NonNull final Activity activity, boolean nightMode, final String categoryName, final int categoryColor) { private View createCategoryItem(@NonNull final Activity activity, boolean nightMode, final String categoryName, final int categoryColor, boolean isHidden) {
View itemView = UiUtilities.getInflater(activity, nightMode).inflate(R.layout.favorite_category_dialog_item, null); View itemView = UiUtilities.getInflater(activity, nightMode).inflate(R.layout.favorite_category_dialog_item, null);
Button button = (Button)itemView.findViewById(R.id.button); Button button = (Button)itemView.findViewById(R.id.button);
if (categoryColor != 0) { if(isHidden){
button.setCompoundDrawablesWithIntrinsicBounds( button.setCompoundDrawablesWithIntrinsicBounds(getIcon(activity, R.drawable.ic_action_hide), null, null, null);
getIcon(activity, R.drawable.ic_action_folder, categoryColor), null, null, null);
} else { } else {
button.setCompoundDrawablesWithIntrinsicBounds( if (categoryColor != 0) {
getIcon(activity, R.drawable.ic_action_folder, ContextCompat.getColor(activity, button.setCompoundDrawablesWithIntrinsicBounds(
gpxFile != null ? R.color.gpx_color_point : R.color.color_favorite)), null, null, null); getIcon(activity, R.drawable.ic_action_folder, categoryColor), null, null, null);
} else {
button.setCompoundDrawablesWithIntrinsicBounds(
getIcon(activity, R.drawable.ic_action_folder, ContextCompat.getColor(activity,
gpxFile != null ? R.color.gpx_color_point : R.color.color_favorite)), null, null, null);
}
} }
button.setCompoundDrawablePadding(AndroidUtils.dpToPx(activity,15f)); button.setCompoundDrawablePadding(AndroidUtils.dpToPx(activity,15f));
String name = categoryName.length() == 0 ? getString(R.string.shared_string_favorites) : categoryName; String name = categoryName.length() == 0 ? getString(R.string.shared_string_favorites) : categoryName;