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

Fix Drawer/Dashboard night theme icon color

Browse source
This commit is contained in:
Alexey Kulish 2015-09-11 22:03:04 +03:00
parent 488cf523d0
commit c64d7b06bb
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
OsmAnd/src/net/osmand/plus/ContextMenuAdapter.java
View file

@ -346,7 +346,7 @@ public class ContextMenuAdapter {
if (layoutId == R.layout.simple_list_menu_item) { if (layoutId == R.layout.simple_list_menu_item) {
int color = activity.getResources() int color = activity.getResources()
.getColor(holoLight ? R.color.icon_color : R.color.dash_search_icon_dark); .getColor(holoLight ? R.color.icon_color : R.color.dashboard_subheader_text_dark);
Drawable imageId = app.getIconsCache().getPaintedContentIcon( Drawable imageId = app.getIconsCache().getPaintedContentIcon(
iconListLight.get(position), color); iconListLight.get(position), color);
float density = activity.getResources().getDisplayMetrics().density; float density = activity.getResources().getDisplayMetrics().density;

6
OsmAnd/src/net/osmand/plus/dashboard/DashSearchFragment.java
View file

@ -60,7 +60,7 @@ public class DashSearchFragment extends DashBaseFragment {
} }
}); });
btn.setCompoundDrawablesWithIntrinsicBounds(null, iconsCache.getIcon(R.drawable.ic_action_info2, btn.setCompoundDrawablesWithIntrinsicBounds(null, iconsCache.getIcon(R.drawable.ic_action_info2,
light ? R.color.dash_search_icon_light : R.color.dash_search_icon_dark), null, null); light ? R.color.dash_search_icon_light : R.color.dashboard_subheader_text_dark), null, null);
btn = (Button)view.findViewById(R.id.address); btn = (Button)view.findViewById(R.id.address);
btn.setOnClickListener(new View.OnClickListener() { btn.setOnClickListener(new View.OnClickListener() {
@ -71,7 +71,7 @@ public class DashSearchFragment extends DashBaseFragment {
} }
}); });
btn.setCompoundDrawablesWithIntrinsicBounds(null, iconsCache.getIcon(R.drawable.ic_action_home2, btn.setCompoundDrawablesWithIntrinsicBounds(null, iconsCache.getIcon(R.drawable.ic_action_home2,
light ? R.color.dash_search_icon_light : R.color.dash_search_icon_dark), null, null); light ? R.color.dash_search_icon_light : R.color.dashboard_subheader_text_dark), null, null);
btn = (Button) view.findViewById(R.id.coord); btn = (Button) view.findViewById(R.id.coord);
btn.setOnClickListener(new View.OnClickListener() { btn.setOnClickListener(new View.OnClickListener() {
@ -82,7 +82,7 @@ public class DashSearchFragment extends DashBaseFragment {
} }
}); });
btn.setCompoundDrawablesWithIntrinsicBounds(null, iconsCache.getIcon(R.drawable.ic_action_marker2, btn.setCompoundDrawablesWithIntrinsicBounds(null, iconsCache.getIcon(R.drawable.ic_action_marker2,
light ? R.color.dash_search_icon_light : R.color.dash_search_icon_dark), null, null); light ? R.color.dash_search_icon_light : R.color.dashboard_subheader_text_dark), null, null);
(view.findViewById(R.id.recents)).setOnClickListener(new View.OnClickListener() { (view.findViewById(R.id.recents)).setOnClickListener(new View.OnClickListener() {
@Override @Override

4
OsmAnd/src/net/osmand/plus/mapcontextmenu/MapContextMenuFragment.java
View file

@ -120,7 +120,7 @@ public class MapContextMenuFragment extends Fragment {
menuFullHeight = view.findViewById(R.id.context_menu_main).getHeight(); menuFullHeight = view.findViewById(R.id.context_menu_main).getHeight();
menuTitleHeight = menuTopShadowHeight + menuTopShadowAllHeight; menuTitleHeight = menuTopShadowHeight + menuTopShadowAllHeight;
menuFullHeightMax = menuTitleHeight + menuBottomViewHeight + dpToPx(2f); menuFullHeightMax = menuTitleHeight + (menuBottomViewHeight > 0 ? menuBottomViewHeight + dpToPx(2f) : -dpToPx(SHADOW_HEIGHT_BOTTOM_DP));
ViewTreeObserver obs = view.getViewTreeObserver(); ViewTreeObserver obs = view.getViewTreeObserver();
@ -223,7 +223,7 @@ public class MapContextMenuFragment extends Fragment {
velocity.recycle(); velocity.recycle();
if (menuController != null) { if (menuController != null) {
if (slidingUp) { if (menuBottomViewHeight > 0 && slidingUp) {
menuController.slideUp(); menuController.slideUp();
} else if (slidingDown) { } else if (slidingDown) {
menuController.slideDown(); menuController.slideDown();