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

OsmEdits design allmost done

Browse source
This commit is contained in:
GaidamakUA 2015-08-28 10:54:30 +03:00
parent 8f28903e46
commit 59def647a8
10 changed files with 23 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
OsmAnd/res/layout/fragment_edit_poi.xml
View file

@ -123,20 +123,22 @@
android:layout_gravity="bottom"
android:gravity="right">
<Button
<net.osmand.plus.widgets.ButtonEx
android:id="@+id/cancelButton"
style="?android:attr/borderlessButtonStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/shared_string_cancel"
android:textColor="@color/dashboard_general_button_text_light"/>
android:textColor="@color/dashboard_general_button_text_light"
app:textAllCapsCompat="true"/>
<Button
<net.osmand.plus.widgets.ButtonEx
android:id="@+id/saveButton"
style="?android:attr/borderlessButtonStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/dashboard_general_button_text_light"
tools:text="Save"/>
tools:text="Save"
app:textAllCapsCompat="true"/>
</LinearLayout>
</LinearLayout>

4
OsmAnd/res/layout/fragment_edit_poi_advanced.xml
View file

@ -98,9 +98,9 @@
<net.osmand.plus.widgets.ButtonEx
android:id="@+id/addTagButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_height="36dp"
android:text="Add tag"
android:textSize="12sp"
android:textSize="@dimen/default_sub_text_size"
osmand:typeface="@string/font_roboto_medium"/>
<!--XXX due to bug in NestedScroolView-->

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

@ -111,7 +111,7 @@
android:layout_below="@id/openHoursContainer"
android:layout_marginLeft="72dp"
android:text="Add opening hours"
android:textSize="12sp"
android:textSize="@dimen/default_sub_text_size"
osmand:typeface="@string/font_roboto_medium"/>
<!--XXX due to bug in NestedScroolView-->

3
OsmAnd/res/layout/open_time_list_item.xml
View file

@ -26,6 +26,7 @@
android:id="@+id/daysTextView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="@dimen/default_list_text_size"
tools:text="Mo-We"/>
<View
@ -51,6 +52,7 @@
android:id="@+id/openingTextView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="@dimen/default_list_text_size"
tools:text="08:00"/>
<View
@ -74,6 +76,7 @@
android:id="@+id/closingTextView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="@dimen/default_list_text_size"
tools:text="20:00"/>
<View

3
OsmAnd/res/values/colors.xml
View file

@ -55,7 +55,8 @@
<color name="search_background_dark">#292f33</color>
<color name="icon_color_light">#727272</color>
<color name="icon_color">#727272</color>
<color name="icon_color_light">#ccc</color>
<color name="dashboard_gpx_on_map">#448AFF</color>
<color name="dashboard_background">#eaeaea</color>

4
OsmAnd/src/net/osmand/plus/IconsCache.java
View file

@ -51,7 +51,7 @@ public class IconsCache {
public Drawable getContentIcon(int id) {
return getDrawable(id, app.getSettings().isLightContent() ? R.color.icon_color_light : 0);
return getDrawable(id, app.getSettings().isLightContent() ? R.color.icon_color : 0);
}
@ -60,7 +60,7 @@ public class IconsCache {
}
public Drawable getIcon(int id, boolean light) {
return getDrawable(id, light ? R.color.icon_color_light : 0);
return getDrawable(id, light ? R.color.icon_color : 0);
}
}

2
OsmAnd/src/net/osmand/plus/download/LocalIndexesFragment.java
View file

@ -135,7 +135,7 @@ public class LocalIndexesFragment extends OsmandExpandableListFragment {
backup = getActivity().getResources().getDrawable(R.drawable.ic_type_archive);
backup.mutate();
if (light) {
backup.setColorFilter(getResources().getColor(R.color.icon_color_light), PorterDuff.Mode.MULTIPLY);
backup.setColorFilter(getResources().getColor(R.color.icon_color), PorterDuff.Mode.MULTIPLY);
}
sdcard = getActivity().getResources().getDrawable(R.drawable.ic_sdcard);
sdcard.mutate();

2
OsmAnd/src/net/osmand/plus/osmedit/AdvancedDataFragment.java
View file

@ -64,7 +64,7 @@ public class AdvancedDataFragment extends Fragment {
}
});
deleteDrawable = ((MapActivity)getActivity()).getMyApplication().getIconsCache()
.getContentIcon(R.drawable.ic_action_remove_dark);
.getPaintedContentIcon(R.drawable.ic_action_remove_dark, R.color.icon_color_light);
deleteItemImageButton.setImageDrawable(deleteDrawable);
TextView nameTextView = (TextView) view.findViewById(R.id.nameTextView);
TextView amenityTagTextView = (TextView) view.findViewById(R.id.amenityTagTextView);

3
OsmAnd/src/net/osmand/plus/osmedit/BasicDataFragment.java
View file

@ -94,7 +94,8 @@ public class BasicDataFragment extends Fragment {
});
LinearLayout openHoursContainer = (LinearLayout) view.findViewById(R.id.openHoursContainer);
Drawable clockDrawable = iconsCache.getContentIcon(R.drawable.ic_action_time);
Drawable deleteDrawable = iconsCache.getContentIcon(R.drawable.ic_action_remove_dark);
Drawable deleteDrawable = iconsCache
.getPaintedContentIcon(R.drawable.ic_action_remove_dark, R.color.icon_color_light);
if (savedInstanceState != null && savedInstanceState.containsKey(OPENING_HOURS)) {
mOpeningHoursAdapter = new OpeningHoursAdapter(
(OpeningHoursParser.OpeningHours) savedInstanceState.getSerializable(OPENING_HOURS),

6
OsmAnd/src/net/osmand/plus/views/MapControlsLayer.java
View file

@ -660,7 +660,7 @@ public class MapControlsLayer extends OsmandMapLayer {
if (!enabled) {
backToLocationControl.setBg(R.drawable.btn_circle, R.drawable.btn_circle_night);
backToLocationControl.setIconColorId(R.color.icon_color_light, 0);
backToLocationControl.setIconColorId(R.color.icon_color, 0);
} else if (tracked) {
backToLocationControl.setBg(R.drawable.btn_circle, R.drawable.btn_circle_night);
backToLocationControl.setIconColorId(R.color.color_myloc_distance);
@ -751,7 +751,7 @@ public class MapControlsLayer extends OsmandMapLayer {
int resId;
int resLightId;
int resDarkId;
int resClrLight = R.color.icon_color_light;
int resClrLight = R.color.icon_color;
int resClrDark = 0;
@ -877,7 +877,7 @@ public class MapControlsLayer extends OsmandMapLayer {
Drawable[] icons = new Drawable[vls.size()];
int[] values = new int[vls.size()];
for (int k = 0; k < modes.length; k++) {
icons[k] = app.getIconsCache().getIcon(modes[k].getSmallIconDark(), R.color.icon_color_light);
icons[k] = app.getIconsCache().getIcon(modes[k].getSmallIconDark(), R.color.icon_color);
values[k] = modes[k].getStringResource();
}
for (int i = 0; i < modes.length; i++) {