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

Merge remote-tracking branch 'origin/master'

Browse source
This commit is contained in:
Weblate 2015-10-26 09:10:15 +01:00
commit 6d09404d70
2 changed files with 7 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
OsmAnd/res/values/styles.xml
View file

@ -114,7 +114,7 @@
<item name="appbar_layout_theme">@style/OsmandLightTheme.DarkActionbar</item>
<item name="toolbar_theme">@style/OsmandLightTheme.Toolbar</item>
<item name="new_app_theme">@style/OsmandLightTheme.NewAppTheme</item>
<item name="android:textColorSecondary">@color/icon_color</item>
<item name="android:textColorSecondary">@color/dashboard_black</item>
<item name="contextMenuButtonColor">@color/map_widget_blue</item>
</style>
@ -196,7 +196,7 @@
<item name="appbar_layout_theme">@style/OsmandDarkTheme.DarkActionbar</item>
<item name="toolbar_theme">@style/OsmandDarkTheme</item>
<item name="new_app_theme">@style/OsmandDarkTheme</item>
<item name="android:textColorSecondary">@color/dash_search_icon_dark</item>
<item name="android:textColorSecondary">@color/map_widget_light</item>
<item name="contextMenuButtonColor">@color/osmand_orange</item>
</style>

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

@ -36,7 +36,6 @@ import net.osmand.util.Algorithms;
import org.apache.commons.logging.Log;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
import java.util.Map.Entry;
@ -103,7 +102,7 @@ public class AdvancedDataFragment extends Fragment
mTagsChangedListener = new EditPoiData.TagsChangedListener() {
@Override
public void onTagsChanged(String anyTag) {
LOG.debug("onTagsChanged()");
LOG.debug("onTagsChanged(" + "anyTag=" + anyTag + ")");
final String value = getData().getTagValues().get(anyTag);
if (Algorithms.objectEquals(anyTag, OSMSettings.OSMTagKey.NAME.getValue())) {
nameTextView.setText(value);
@ -154,7 +153,6 @@ public class AdvancedDataFragment extends Fragment
private final Map<String, AbstractPoiType> allTypes;
private final HashSet<String> tagKeys;
private final HashSet<String> valueKeys;
private final HashMap<String, View> cachedViews = new HashMap<>();
public TagAdapterLinearLayoutHack(LinearLayout linearLayout,
EditPoiData editPoiData,
@ -181,7 +179,7 @@ public class AdvancedDataFragment extends Fragment
linearLayout.removeAllViews();
editPoiData.setIsInEdit(true);
for (Entry<String, String> tag : editPoiData.getTagValues().entrySet()) {
if(tag.getKey().equals(EditPoiData.POI_TYPE_TAG)
if (tag.getKey().equals(EditPoiData.POI_TYPE_TAG)
|| tag.getKey().equals(OSMSettings.OSMTagKey.NAME.getValue()))
continue;
addTagView(tag.getKey(), tag.getValue());
@ -191,17 +189,13 @@ public class AdvancedDataFragment extends Fragment
public void addTagView(String tg, String vl) {
View view = getView(tg, vl);
LOG.debug("tg=" + tg + "; view=" + view);
linearLayout.addView(view);
}
private View getView(String tg, String vl) {
View convertView = cachedViews.get(tg);
LOG.debug("convertView=" + convertView);
if (convertView == null) {
convertView = LayoutInflater.from(linearLayout.getContext())
View convertView = LayoutInflater.from(linearLayout.getContext())
.inflate(R.layout.poi_tag_list_item, null, false);
cachedViews.put(tg, convertView);
}
final AutoCompleteTextView tagEditText =
(AutoCompleteTextView) convertView.findViewById(R.id.tagEditText);
ImageButton deleteItemImageButton =