From dbd39122e7904916a1102017b63a9f38dba81853 Mon Sep 17 00:00:00 2001 From: Denis Date: Thu, 5 Mar 2015 12:48:38 +0200 Subject: [PATCH 1/8] Selected track. Fixed crash on long click. Fixed long click on track segment. Removed long click from track point --- OsmAnd/res/values/strings.xml | 1 + .../osmand/plus/activities/TrackActivity.java | 68 +++++++++++++++---- .../plus/myplaces/SelectedGPXFragment.java | 29 ++------ .../plus/myplaces/TrackPointFragment.java | 28 ++++++++ .../myplaces/TrackRoutePointFragment.java | 59 ++++++++++++++++ .../plus/myplaces/TrackSegmentFragment.java | 48 +++++++++++++ 6 files changed, 194 insertions(+), 39 deletions(-) create mode 100644 OsmAnd/src/net/osmand/plus/myplaces/TrackRoutePointFragment.java diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml index 3a987add45..70c976b9e2 100644 --- a/OsmAnd/res/values/strings.xml +++ b/OsmAnd/res/values/strings.xml @@ -9,6 +9,7 @@ 3. All your modified/created strings are in the top of the file (to make easier find what\'s translated). PLEASE: Have a look at http://code.google.com/p/osmand/wiki/UIConsistency, it may really improve your and our work :-) Thx - Hardy --> + Route points Track segments Track points Online maps diff --git a/OsmAnd/src/net/osmand/plus/activities/TrackActivity.java b/OsmAnd/src/net/osmand/plus/activities/TrackActivity.java index 7b6b6e9db4..628a8d1a46 100644 --- a/OsmAnd/src/net/osmand/plus/activities/TrackActivity.java +++ b/OsmAnd/src/net/osmand/plus/activities/TrackActivity.java @@ -10,10 +10,12 @@ import java.util.List; import net.osmand.plus.GPXUtilities; import net.osmand.plus.GPXUtilities.GPXFile; +import net.osmand.plus.GpxSelectionHelper; import net.osmand.plus.OsmandApplication; import net.osmand.plus.R; import net.osmand.plus.myplaces.SelectedGPXFragment; import net.osmand.plus.myplaces.TrackPointFragment; +import net.osmand.plus.myplaces.TrackRoutePointFragment; import net.osmand.plus.myplaces.TrackSegmentFragment; import net.osmand.plus.views.controls.PagerSlidingTabStrip; import android.content.Intent; @@ -23,6 +25,7 @@ import android.support.v4.app.Fragment; import android.support.v4.view.ViewPager; import android.support.v7.widget.Toolbar; import android.util.Log; +import android.view.Menu; import android.view.MenuItem; import android.view.View; @@ -36,6 +39,7 @@ public class TrackActivity extends TabActivity { protected List> fragList = new ArrayList>(); private File file = null; private GPXFile result; + ViewPager mViewPager; @Override public void onCreate(Bundle icicle) { @@ -55,17 +59,17 @@ public class TrackActivity extends TabActivity { setContentView(R.layout.tab_content); PagerSlidingTabStrip mSlidingTabLayout = (PagerSlidingTabStrip) findViewById(R.id.sliding_tabs); - - final ViewPager mViewPager = (ViewPager) findViewById(R.id.pager); + + mViewPager = (ViewPager) findViewById(R.id.pager); setViewPagerAdapter(mViewPager, new ArrayList()); mSlidingTabLayout.setViewPager(mViewPager); - + new AsyncTask() { protected void onPreExecute() { setSupportProgressBarIndeterminateVisibility(true); - + }; @Override protected GPXFile doInBackground(Void... params) { @@ -73,23 +77,28 @@ public class TrackActivity extends TabActivity { } protected void onPostExecute(GPXFile result) { setSupportProgressBarIndeterminateVisibility(false); -// List items = new ArrayList(); -// items.add(getTabIndicator(R.string.selected_track, SelectedGPXFragment.class)); + setResult(result); ((OsmandFragmentPagerAdapter) mViewPager.getAdapter()).addTab( getTabIndicator(R.string.track_segments, TrackSegmentFragment.class)); - ((OsmandFragmentPagerAdapter) mViewPager.getAdapter()).addTab( - getTabIndicator(R.string.track_points, TrackPointFragment.class)); -// setViewPagerAdapter(mViewPager, items ); + if (isHavingTrackPoints()){ + ((OsmandFragmentPagerAdapter) mViewPager.getAdapter()).addTab( + getTabIndicator(R.string.track_points, TrackPointFragment.class)); + } + if (isHavingRoutePoints()){ + ((OsmandFragmentPagerAdapter) mViewPager.getAdapter()).addTab( + getTabIndicator(R.string.route_points, TrackRoutePointFragment.class)); + } + }; }.execute((Void)null); - + } protected void setResult(GPXFile result) { this.result = result; } - + public GPXFile getResult() { return result; } @@ -122,10 +131,6 @@ public class TrackActivity extends TabActivity { return tb; } - public void setToolbarVisibility(boolean visible){ - findViewById(R.id.bottomControls).setVisibility(visible? View.VISIBLE : View.GONE); - } - @Override public boolean onOptionsItemSelected(MenuItem item) { int itemId = item.getItemId(); @@ -138,5 +143,38 @@ public class TrackActivity extends TabActivity { return false; } + public List getContent() { + GpxSelectionHelper selectedGpxHelper = getMyApplication().getSelectedGpxHelper(); + List displayGrous = new ArrayList(); + selectedGpxHelper.collectDisplayGroups(displayGrous, getResult()); + return displayGrous; + } + + boolean isHavingTrackPoints(){ + List groups = getContent(); + for (GpxSelectionHelper.GpxDisplayGroup group : groups){ + GpxSelectionHelper.GpxDisplayItemType type = group.getType(); + if (type == GpxSelectionHelper.GpxDisplayItemType.TRACK_POINTS && + !group.getModifiableList().isEmpty()){ + return true; + } + } + + return false; + } + + boolean isHavingRoutePoints(){ + List groups = getContent(); + for (GpxSelectionHelper.GpxDisplayGroup group : groups){ + GpxSelectionHelper.GpxDisplayItemType type = group.getType(); + if (type == GpxSelectionHelper.GpxDisplayItemType.TRACK_ROUTE_POINTS && + !group.getModifiableList().isEmpty()){ + return true; + } + } + + return false; + } + } diff --git a/OsmAnd/src/net/osmand/plus/myplaces/SelectedGPXFragment.java b/OsmAnd/src/net/osmand/plus/myplaces/SelectedGPXFragment.java index 187153eed3..127aa89044 100644 --- a/OsmAnd/src/net/osmand/plus/myplaces/SelectedGPXFragment.java +++ b/OsmAnd/src/net/osmand/plus/myplaces/SelectedGPXFragment.java @@ -46,11 +46,10 @@ import android.view.MenuInflater; import android.view.MenuItem; import android.view.View; import android.view.ViewGroup; +import android.widget.AdapterView; import android.widget.ArrayAdapter; import android.widget.CheckBox; import android.widget.EditText; -import android.widget.ExpandableListView; -import android.widget.ExpandableListView.ExpandableListContextMenuInfo; import android.widget.ImageView; import android.widget.ListView; import android.widget.Spinner; @@ -94,14 +93,7 @@ public class SelectedGPXFragment extends ListFragment { setContent(); } - private List getContent() { - GpxSelectionHelper selectedGpxHelper = app.getSelectedGpxHelper(); - List displayGrous = new ArrayList(); - if(getActivity() instanceof TrackActivity) { - selectedGpxHelper.collectDisplayGroups(displayGrous, getGpx()); - } - return displayGrous; - } + private GPXFile getGpx() { return ((TrackActivity) getActivity()).getResult(); @@ -109,7 +101,7 @@ public class SelectedGPXFragment extends ListFragment { protected List filterGroups() { - List groups = getContent(); + List groups = ((TrackActivity) getActivity()).getContent(); if (isArgumentTrue(ARG_TO_FILTER_SHORT_TRACKS)) { groups = new ArrayList(groups); Iterator it = groups.iterator(); @@ -150,17 +142,6 @@ public class SelectedGPXFragment extends ListFragment { View view = getActivity().getLayoutInflater().inflate(R.layout.update_index, container, false); view.findViewById(R.id.header_layout).setVisibility(View.GONE); ListView listView = (ListView) view.findViewById(android.R.id.list); - listView.setOnCreateContextMenuListener(new View.OnCreateContextMenuListener() { - @Override - public void onCreateContextMenu(ContextMenu menu, View v, ContextMenuInfo menuInfo) { - long packedPos = ((ExpandableListContextMenuInfo) menuInfo).packedPosition; - int group = ExpandableListView.getPackedPositionGroup(packedPos); - int child = ExpandableListView.getPackedPositionChild(packedPos); - if (child >= 0 && group >= 0) { - showContextMenu(adapter.getItem(child)); - } - } - }); TextView tv = new TextView(getActivity()); tv.setText(R.string.none_selected_gpx); tv.setTextSize(24); @@ -170,7 +151,7 @@ public class SelectedGPXFragment extends ListFragment { return view; } - private void showContextMenu(final GpxDisplayItem gpxDisplayItem) { + protected void showContextMenu(final GpxDisplayItem gpxDisplayItem) { Builder builder = new AlertDialog.Builder(getMyActivity()); final ContextMenuAdapter adapter = new ContextMenuAdapter(getMyActivity()); basicFileOperation(gpxDisplayItem, adapter); @@ -255,7 +236,7 @@ public class SelectedGPXFragment extends ListFragment { } - private void selectSplitDistance(final GpxDisplayGroup model) { + protected void selectSplitDistance(final GpxDisplayGroup model) { Builder bld = new AlertDialog.Builder(getMyActivity()); int[] checkedItem = new int[] {!model.isSplitDistance() && !model.isSplitTime()? 0 : -1}; List options = new ArrayList(); diff --git a/OsmAnd/src/net/osmand/plus/myplaces/TrackPointFragment.java b/OsmAnd/src/net/osmand/plus/myplaces/TrackPointFragment.java index 44d0c281a0..b0b910be73 100644 --- a/OsmAnd/src/net/osmand/plus/myplaces/TrackPointFragment.java +++ b/OsmAnd/src/net/osmand/plus/myplaces/TrackPointFragment.java @@ -1,6 +1,13 @@ package net.osmand.plus.myplaces; +import android.support.v4.view.MenuItemCompat; +import android.view.Menu; +import android.view.MenuInflater; +import android.view.MenuItem; + import net.osmand.plus.GpxSelectionHelper; +import net.osmand.plus.R; +import net.osmand.plus.activities.TrackActivity; import java.util.ArrayList; import java.util.List; @@ -10,6 +17,7 @@ import java.util.List; * on 04.03.2015. */ public class TrackPointFragment extends SelectedGPXFragment { + GpxSelectionHelper.GpxDisplayGroup group; @Override public void setContent() { List groups = filterGroups(); @@ -21,11 +29,31 @@ public class TrackPointFragment extends SelectedGPXFragment { if (group.getType() != GpxSelectionHelper.GpxDisplayItemType.TRACK_POINTS){ continue; } + this.group = group; for (GpxSelectionHelper.GpxDisplayItem item : group.getModifiableList()) { items.add(item); } } + adapter = new SelectedGPXAdapter(items); setListAdapter(adapter); } + + @Override + public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) { + menu.clear(); + ((TrackActivity) getActivity()).getClearToolbar(false); + if (isArgumentTrue(ARG_TO_HIDE_CONFIG_BTN)){ + return; + } + + MenuItem item = menu.add(R.string.settings).setIcon(R.drawable.ic_overflow_menu_light).setOnMenuItemClickListener(new MenuItem.OnMenuItemClickListener() { + @Override + public boolean onMenuItemClick(MenuItem item) { + saveAsFavorites(group); + return true; + } + }); + MenuItemCompat.setShowAsAction(item, MenuItemCompat.SHOW_AS_ACTION_ALWAYS); + } } diff --git a/OsmAnd/src/net/osmand/plus/myplaces/TrackRoutePointFragment.java b/OsmAnd/src/net/osmand/plus/myplaces/TrackRoutePointFragment.java new file mode 100644 index 0000000000..5ad61259e6 --- /dev/null +++ b/OsmAnd/src/net/osmand/plus/myplaces/TrackRoutePointFragment.java @@ -0,0 +1,59 @@ +package net.osmand.plus.myplaces; + +import android.support.v4.view.MenuItemCompat; +import android.view.Menu; +import android.view.MenuInflater; +import android.view.MenuItem; + +import net.osmand.plus.GpxSelectionHelper; +import net.osmand.plus.R; +import net.osmand.plus.activities.TrackActivity; + +import java.util.ArrayList; +import java.util.List; + +/** + * Created by Denis + * on 05.03.2015. + */ +public class TrackRoutePointFragment extends SelectedGPXFragment { + GpxSelectionHelper.GpxDisplayGroup group; + @Override + public void setContent() { + List groups = filterGroups(); + lightContent = app.getSettings().isLightContent(); + + + List items = new ArrayList<>(); + for (GpxSelectionHelper.GpxDisplayGroup group : groups) { + if (group.getType() != GpxSelectionHelper.GpxDisplayItemType.TRACK_ROUTE_POINTS){ + continue; + } + this.group = group; + for (GpxSelectionHelper.GpxDisplayItem item : group.getModifiableList()) { + items.add(item); + } + } + + adapter = new SelectedGPXAdapter(items); + setListAdapter(adapter); + } + + @Override + public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) { + menu.clear(); + ((TrackActivity) getActivity()).getClearToolbar(false); + if (isArgumentTrue(ARG_TO_HIDE_CONFIG_BTN)){ + return; + } + + MenuItem item = menu.add(R.string.settings).setIcon(R.drawable.ic_overflow_menu_light).setOnMenuItemClickListener(new MenuItem.OnMenuItemClickListener() { + @Override + public boolean onMenuItemClick(MenuItem item) { + saveAsFavorites(group); + return true; + } + }); + MenuItemCompat.setShowAsAction(item, MenuItemCompat.SHOW_AS_ACTION_ALWAYS); + } +} diff --git a/OsmAnd/src/net/osmand/plus/myplaces/TrackSegmentFragment.java b/OsmAnd/src/net/osmand/plus/myplaces/TrackSegmentFragment.java index 1d69ee54b7..182c872930 100644 --- a/OsmAnd/src/net/osmand/plus/myplaces/TrackSegmentFragment.java +++ b/OsmAnd/src/net/osmand/plus/myplaces/TrackSegmentFragment.java @@ -1,6 +1,20 @@ package net.osmand.plus.myplaces; +import android.os.Bundle; +import android.support.v4.view.MenuItemCompat; +import android.view.ContextMenu; +import android.view.LayoutInflater; +import android.view.Menu; +import android.view.MenuInflater; +import android.view.MenuItem; +import android.view.View; +import android.view.ViewGroup; +import android.widget.AdapterView; +import android.widget.ListView; + import net.osmand.plus.GpxSelectionHelper; +import net.osmand.plus.R; +import net.osmand.plus.activities.TrackActivity; import java.util.ArrayList; import java.util.List; @@ -10,6 +24,21 @@ import java.util.List; * on 04.03.2015. */ public class TrackSegmentFragment extends SelectedGPXFragment { + GpxSelectionHelper.GpxDisplayGroup group; + + @Override + public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { + View view = super.onCreateView(inflater, container, savedInstanceState); + ListView listView = (ListView) view.findViewById(android.R.id.list); + listView.setOnCreateContextMenuListener(new View.OnCreateContextMenuListener() { + @Override + public void onCreateContextMenu(ContextMenu menu, View v, ContextMenu.ContextMenuInfo menuInfo) { + long packedPos = ((AdapterView.AdapterContextMenuInfo) menuInfo).position; + showContextMenu(adapter.getItem((int)packedPos)); + } + }); + return view; + } @Override public void setContent() { @@ -22,6 +51,7 @@ public class TrackSegmentFragment extends SelectedGPXFragment { if (group.getType() != GpxSelectionHelper.GpxDisplayItemType.TRACK_SEGMENT){ continue; } + this.group = group; for (GpxSelectionHelper.GpxDisplayItem item : group.getModifiableList()) { items.add(item); } @@ -29,4 +59,22 @@ public class TrackSegmentFragment extends SelectedGPXFragment { adapter = new SelectedGPXAdapter(items); setListAdapter(adapter); } + + @Override + public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) { + menu.clear(); + ((TrackActivity) getActivity()).getClearToolbar(false); + if (isArgumentTrue(ARG_TO_HIDE_CONFIG_BTN)){ + return; + } + + MenuItem item = menu.add(R.string.settings).setIcon(R.drawable.ic_overflow_menu_light).setOnMenuItemClickListener(new MenuItem.OnMenuItemClickListener() { + @Override + public boolean onMenuItemClick(MenuItem item) { + selectSplitDistance(group); + return true; + } + }); + MenuItemCompat.setShowAsAction(item, MenuItemCompat.SHOW_AS_ACTION_ALWAYS); + } } From 0a7dd0598c1ec4975142205f1e8b781ba23f436a Mon Sep 17 00:00:00 2001 From: Denis Date: Thu, 5 Mar 2015 14:46:13 +0200 Subject: [PATCH 2/8] Updated dashboard over map loading indication --- OsmAnd/res/layout-land/dashboard_over_map.xml | 37 +++++++++++++++++++ OsmAnd/res/layout/application_loading.xml | 25 +++++++++++++ OsmAnd/res/layout/dash_map_fragment.xml | 21 +---------- OsmAnd/res/layout/dashboard_over_map.xml | 11 ++++-- OsmAnd/res/values-land/sizes.xml | 1 + OsmAnd/res/values/sizes.xml | 2 +- .../osmand/plus/activities/MapActivity.java | 20 +++++++++- .../osmand/plus/dashboard/DashboardOnMap.java | 3 ++ 8 files changed, 94 insertions(+), 26 deletions(-) create mode 100644 OsmAnd/res/layout-land/dashboard_over_map.xml create mode 100644 OsmAnd/res/layout/application_loading.xml diff --git a/OsmAnd/res/layout-land/dashboard_over_map.xml b/OsmAnd/res/layout-land/dashboard_over_map.xml new file mode 100644 index 0000000000..f439e83ca5 --- /dev/null +++ b/OsmAnd/res/layout-land/dashboard_over_map.xml @@ -0,0 +1,37 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/OsmAnd/res/layout/application_loading.xml b/OsmAnd/res/layout/application_loading.xml new file mode 100644 index 0000000000..1420976bff --- /dev/null +++ b/OsmAnd/res/layout/application_loading.xml @@ -0,0 +1,25 @@ + + + + + + + + + \ No newline at end of file diff --git a/OsmAnd/res/layout/dash_map_fragment.xml b/OsmAnd/res/layout/dash_map_fragment.xml index 4f10bd82da..5713f94dd3 100644 --- a/OsmAnd/res/layout/dash_map_fragment.xml +++ b/OsmAnd/res/layout/dash_map_fragment.xml @@ -6,26 +6,7 @@ android:layout_width="fill_parent" android:layout_height="wrap_content"> - - - - - - + - + + @@ -29,6 +34,6 @@ - + \ No newline at end of file diff --git a/OsmAnd/res/values-land/sizes.xml b/OsmAnd/res/values-land/sizes.xml index dd455bcff1..89f985a44d 100644 --- a/OsmAnd/res/values-land/sizes.xml +++ b/OsmAnd/res/values-land/sizes.xml @@ -2,4 +2,5 @@ 0dp 0dp + 125dp \ No newline at end of file diff --git a/OsmAnd/res/values/sizes.xml b/OsmAnd/res/values/sizes.xml index 2a75a1805b..6bb1b75378 100644 --- a/OsmAnd/res/values/sizes.xml +++ b/OsmAnd/res/values/sizes.xml @@ -44,7 +44,7 @@ 14dp 6dp 360dp - 200dp + @dimen/dashMapHeight 90dp diff --git a/OsmAnd/src/net/osmand/plus/activities/MapActivity.java b/OsmAnd/src/net/osmand/plus/activities/MapActivity.java index 6f5b8e7131..dcdc98518f 100644 --- a/OsmAnd/src/net/osmand/plus/activities/MapActivity.java +++ b/OsmAnd/src/net/osmand/plus/activities/MapActivity.java @@ -26,6 +26,7 @@ import android.view.Window; import android.view.WindowManager; import android.widget.FrameLayout; import android.widget.ProgressBar; +import android.widget.TextView; import android.widget.Toast; import net.osmand.Location; @@ -156,7 +157,18 @@ public class MapActivity extends AccessibleActivity { startProgressDialog = new ProgressDialog(this); startProgressDialog.setCancelable(true); - app.checkApplicationIsBeingInitialized(this, startProgressDialog); + if (getMyApplication().isApplicationInitializing()) { + getMyApplication().checkApplicationIsBeingInitialized(this, (TextView) findViewById(R.id.ProgressMessage), + (ProgressBar) findViewById(R.id.ProgressBar), new Runnable() { + @Override + public void run() { + applicationInitialized(); + } + }); + } else { + applicationInitialized(); + } + //app.checkApplicationIsBeingInitialized(this, null); parseLaunchIntentLocation(); @@ -241,7 +253,11 @@ public class MapActivity extends AccessibleActivity { wakeLockHelper = new WakeLockHelper(getMyApplication()); } - + + private void applicationInitialized() { + findViewById(R.id.init_progress).setVisibility(View.GONE); + } + public void addLockView(FrameLayout lockView) { this.lockView = lockView; } diff --git a/OsmAnd/src/net/osmand/plus/dashboard/DashboardOnMap.java b/OsmAnd/src/net/osmand/plus/dashboard/DashboardOnMap.java index 9cbfd9fdcf..2a9951a4bc 100644 --- a/OsmAnd/src/net/osmand/plus/dashboard/DashboardOnMap.java +++ b/OsmAnd/src/net/osmand/plus/dashboard/DashboardOnMap.java @@ -136,6 +136,9 @@ public class DashboardOnMap { private void addDashboardFragments(){ FragmentManager manager =ma. getSupportFragmentManager(); FragmentTransaction fragmentTransaction = manager.beginTransaction(); +// if (manager.findFragmentByTag(DashMapFragment.TAG) == null) { +// fragmentTransaction.add(R.id.content, new DashMapFragment(), DashMapFragment.TAG); +// } if (manager.findFragmentByTag(DashSearchFragment.TAG) == null) { fragmentTransaction.add(R.id.content, new DashSearchFragment(), DashSearchFragment.TAG); } From f1ecdea03fe7c9e3f748eafc078457439da96044 Mon Sep 17 00:00:00 2001 From: Denis Date: Thu, 5 Mar 2015 15:15:23 +0200 Subject: [PATCH 3/8] Updated icons for recents --- .../src/net/osmand/data/PointDescription.java | 17 +++++++++-- .../search/SearchHistoryFragment.java | 28 +++++++++++++------ .../plus/audionotes/AudioNotesLayer.java | 7 +++-- .../audionotes/AudioVideoNotesPlugin.java | 11 ++++++++ .../DashAudioVideoNotesFragment.java | 2 +- .../osmand/plus/audionotes/NotesFragment.java | 2 +- 6 files changed, 51 insertions(+), 16 deletions(-) diff --git a/OsmAnd/src/net/osmand/data/PointDescription.java b/OsmAnd/src/net/osmand/data/PointDescription.java index f018796679..bf01a5e2fa 100644 --- a/OsmAnd/src/net/osmand/data/PointDescription.java +++ b/OsmAnd/src/net/osmand/data/PointDescription.java @@ -26,7 +26,9 @@ public class PointDescription { public static final String POINT_TYPE_ADDRESS = "address"; public static final String POINT_TYPE_OSM_NOTE= "osm_note"; public static final String POINT_TYPE_MARKER = "marker"; - public static final String POINT_TYPE_NOTE = "avnote"; + public static final String POINT_TYPE_AUDIO_NOTE = "audionote"; + public static final String POINT_TYPE_VIDEO_NOTE = "videonote"; + public static final String POINT_TYPE_PHOTO_NOTE = "photonote"; public static final String POINT_TYPE_LOCATION = "location"; public static final String POINT_TYPE_ALARM = "alarm"; public static final String POINT_TYPE_TARGET = "destination"; @@ -111,10 +113,19 @@ public class PointDescription { return POINT_TYPE_FAVORITE.equals(type); } - public boolean isAvNote() { - return POINT_TYPE_NOTE.equals(type); + public boolean isAudioNote() { + return POINT_TYPE_AUDIO_NOTE.equals(type); } + public boolean isVideoNote() { + return POINT_TYPE_VIDEO_NOTE.equals(type); + } + + public boolean isPhotoNote() { + return POINT_TYPE_PHOTO_NOTE.equals(type); + } + + @Override public int hashCode() { final int prime = 31; diff --git a/OsmAnd/src/net/osmand/plus/activities/search/SearchHistoryFragment.java b/OsmAnd/src/net/osmand/plus/activities/search/SearchHistoryFragment.java index 367c339b46..b9e26374da 100644 --- a/OsmAnd/src/net/osmand/plus/activities/search/SearchHistoryFragment.java +++ b/OsmAnd/src/net/osmand/plus/activities/search/SearchHistoryFragment.java @@ -48,7 +48,9 @@ public class SearchHistoryFragment extends ListFragment implements SearchActivit private Drawable locationIcon; private Drawable poiIcon; private Drawable wptIcon; - private Drawable noteIcon; + private Drawable audioNoteIcon; + private Drawable videoNoteIcon; + private Drawable photoNoteIcon; @Override public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { @@ -72,8 +74,10 @@ public class SearchHistoryFragment extends ListFragment implements SearchActivit favoriteIcon = getResources().getDrawable(R.drawable.ic_type_favorites); locationIcon = getResources().getDrawable(R.drawable.ic_type_coordinates); poiIcon = getResources().getDrawable(R.drawable.ic_type_info); - wptIcon = getResources().getDrawable(R.drawable.ic_action_flage_dark); - noteIcon = getResources().getDrawable(R.drawable.ic_action_note_dark); + wptIcon = getResources().getDrawable(R.drawable.ic_type_waypoint); + audioNoteIcon = getResources().getDrawable(R.drawable.ic_type_audio); + videoNoteIcon = getResources().getDrawable(R.drawable.ic_type_video); + photoNoteIcon = getResources().getDrawable(R.drawable.ic_type_img); if (getMyApplication().getSettings().isLightContent()) { addressIcon = addressIcon.mutate(); addressIcon.setColorFilter(getResources().getColor(R.color.icon_color_light), PorterDuff.Mode.MULTIPLY); @@ -85,8 +89,12 @@ public class SearchHistoryFragment extends ListFragment implements SearchActivit poiIcon.setColorFilter(getResources().getColor(R.color.icon_color_light), PorterDuff.Mode.MULTIPLY); wptIcon = wptIcon.mutate(); wptIcon.setColorFilter(getResources().getColor(R.color.icon_color_light), PorterDuff.Mode.MULTIPLY); - noteIcon = noteIcon.mutate(); - noteIcon.setColorFilter(getResources().getColor(R.color.icon_color_light), PorterDuff.Mode.MULTIPLY); + audioNoteIcon = audioNoteIcon.mutate(); + audioNoteIcon.setColorFilter(getResources().getColor(R.color.icon_color_light), PorterDuff.Mode.MULTIPLY); + videoNoteIcon = videoNoteIcon.mutate(); + videoNoteIcon.setColorFilter(getResources().getColor(R.color.icon_color_light), PorterDuff.Mode.MULTIPLY); + photoNoteIcon = photoNoteIcon.mutate(); + photoNoteIcon.setColorFilter(getResources().getColor(R.color.icon_color_light), PorterDuff.Mode.MULTIPLY); } } @@ -224,9 +232,13 @@ public class SearchHistoryFragment extends ListFragment implements SearchActivit icon.setImageDrawable(poiIcon); } else if (historyEntry.getName().isWpt()) { icon.setImageDrawable(wptIcon); - } else if (historyEntry.getName().isAvNote()) { - icon.setImageDrawable(noteIcon); - } else { + } else if (historyEntry.getName().isAudioNote()) { + icon.setImageDrawable(audioNoteIcon); + } else if (historyEntry.getName().isVideoNote()) { + icon.setImageDrawable(videoNoteIcon); + }else if (historyEntry.getName().isPhotoNote()) { + icon.setImageDrawable(photoNoteIcon); + } else { icon.setImageDrawable(addressIcon); } diff --git a/OsmAnd/src/net/osmand/plus/audionotes/AudioNotesLayer.java b/OsmAnd/src/net/osmand/plus/audionotes/AudioNotesLayer.java index d7363e2873..4e5ca7d5d0 100644 --- a/OsmAnd/src/net/osmand/plus/audionotes/AudioNotesLayer.java +++ b/OsmAnd/src/net/osmand/plus/audionotes/AudioNotesLayer.java @@ -170,10 +170,11 @@ public class AudioNotesLayer extends OsmandMapLayer implements IContextMenuProvi @Override public PointDescription getObjectName(Object o) { if(o instanceof Recording){ - if(((Recording)o).getName(activity).isEmpty()) { - return new PointDescription(PointDescription.POINT_TYPE_NOTE, view.getResources().getString(R.string.recording_default_name)); + Recording rec = (Recording) o; + if(rec.getName(activity).isEmpty()) { + return new PointDescription(rec.getSearchHistoryType(), view.getResources().getString(R.string.recording_default_name)); } - return new PointDescription(PointDescription.POINT_TYPE_NOTE, ((Recording)o).getName(activity)); + return new PointDescription(rec.getSearchHistoryType(), ((Recording)o).getName(activity)); } return null; } diff --git a/OsmAnd/src/net/osmand/plus/audionotes/AudioVideoNotesPlugin.java b/OsmAnd/src/net/osmand/plus/audionotes/AudioVideoNotesPlugin.java index c5100fb029..cda70c6078 100644 --- a/OsmAnd/src/net/osmand/plus/audionotes/AudioVideoNotesPlugin.java +++ b/OsmAnd/src/net/osmand/plus/audionotes/AudioVideoNotesPlugin.java @@ -21,6 +21,7 @@ import net.osmand.PlatformUtil; import net.osmand.access.AccessibleAlertBuilder; import net.osmand.access.AccessibleToast; import net.osmand.data.DataTileManager; +import net.osmand.data.PointDescription; import net.osmand.plus.ApplicationMode; import net.osmand.plus.ContextMenuAdapter; import net.osmand.plus.ContextMenuAdapter.OnContextMenuClick; @@ -213,6 +214,16 @@ public class AudioVideoNotesPlugin extends OsmandPlugin { return ""; } + public String getSearchHistoryType(){ + if (isPhoto()){ + return PointDescription.POINT_TYPE_PHOTO_NOTE; + } else if (isVideo()) { + return PointDescription.POINT_TYPE_VIDEO_NOTE; + } else { + return PointDescription.POINT_TYPE_PHOTO_NOTE; + } + } + public boolean isPhoto() { return file.getName().endsWith(IMG_EXTENSION); } diff --git a/OsmAnd/src/net/osmand/plus/audionotes/DashAudioVideoNotesFragment.java b/OsmAnd/src/net/osmand/plus/audionotes/DashAudioVideoNotesFragment.java index 9574ba16f2..80860f42aa 100644 --- a/OsmAnd/src/net/osmand/plus/audionotes/DashAudioVideoNotesFragment.java +++ b/OsmAnd/src/net/osmand/plus/audionotes/DashAudioVideoNotesFragment.java @@ -115,7 +115,7 @@ public class DashAudioVideoNotesFragment extends DashBaseFragment { @Override public void onClick(View v) { getMyApplication().getSettings().setMapLocationToShow(recording.getLatitude(), recording.getLongitude(), 15, - new PointDescription(PointDescription.POINT_TYPE_NOTE, + new PointDescription(recording.getSearchHistoryType(), recording.getName(getActivity())), true, recording); //$NON-NLS-1$ MapActivity.launchMapActivityMoveToTop(getActivity()); diff --git a/OsmAnd/src/net/osmand/plus/audionotes/NotesFragment.java b/OsmAnd/src/net/osmand/plus/audionotes/NotesFragment.java index c43b4eb127..a4e6401c92 100644 --- a/OsmAnd/src/net/osmand/plus/audionotes/NotesFragment.java +++ b/OsmAnd/src/net/osmand/plus/audionotes/NotesFragment.java @@ -113,7 +113,7 @@ public class NotesFragment extends ListFragment { private void showOnMap(Recording recording) { getMyApplication().getSettings().setMapLocationToShow(recording.getLatitude(), recording.getLongitude(), 15, - new PointDescription(PointDescription.POINT_TYPE_NOTE, recording.getName(getActivity())), true, + new PointDescription(recording.getSearchHistoryType(), recording.getName(getActivity())), true, recording); //$NON-NLS-1$ MapActivity.launchMapActivityMoveToTop(getActivity()); } From bf73d4cc49f615c963a12dfd0c7ead50b67bd50d Mon Sep 17 00:00:00 2001 From: Denis Date: Thu, 5 Mar 2015 15:45:42 +0200 Subject: [PATCH 4/8] Updated notes icons colors --- .../audionotes/DashAudioVideoNotesFragment.java | 17 +++++++++++------ .../osmand/plus/audionotes/NotesFragment.java | 4 +++- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/OsmAnd/src/net/osmand/plus/audionotes/DashAudioVideoNotesFragment.java b/OsmAnd/src/net/osmand/plus/audionotes/DashAudioVideoNotesFragment.java index 80860f42aa..81957dbc62 100644 --- a/OsmAnd/src/net/osmand/plus/audionotes/DashAudioVideoNotesFragment.java +++ b/OsmAnd/src/net/osmand/plus/audionotes/DashAudioVideoNotesFragment.java @@ -15,7 +15,9 @@ import android.app.Activity; import android.content.Context; import android.content.Intent; import android.graphics.Color; +import android.graphics.PorterDuff; import android.graphics.Typeface; +import android.graphics.drawable.Drawable; import android.os.Bundle; import android.support.annotation.Nullable; import android.view.LayoutInflater; @@ -101,7 +103,8 @@ public class DashAudioVideoNotesFragment extends DashBaseFragment { LayoutInflater inflater = getActivity().getLayoutInflater(); View view = inflater.inflate(R.layout.note, null, false); - getNoteView(recording, view, getActivity()); + Drawable icon =getNoteView(recording, view, getActivity()); + icon.setColorFilter(getResources().getColor(R.color.color_distance), PorterDuff.Mode.MULTIPLY); view.setBackgroundColor(Color.TRANSPARENT); view.findViewById(R.id.play).setOnClickListener(new View.OnClickListener() { @Override @@ -125,7 +128,7 @@ public class DashAudioVideoNotesFragment extends DashBaseFragment { } } - public static void getNoteView(final AudioVideoNotesPlugin.Recording recording, View view, + public static Drawable getNoteView(final AudioVideoNotesPlugin.Recording recording, View view, final Context ctx) { String name = recording.getName(ctx); TextView nameText = ((TextView) view.findViewById(R.id.name)); @@ -133,14 +136,16 @@ public class DashAudioVideoNotesFragment extends DashBaseFragment { ((TextView) view.findViewById(R.id.descr)).setText(recording.getDescription(ctx)); ImageView icon = (ImageView) view.findViewById(R.id.icon); + Drawable iconDrawable; if (recording.isAudio()) { - icon.setImageResource(R.drawable.ic_type_audio); + iconDrawable = ctx.getResources().getDrawable(R.drawable.ic_type_audio); } else if (recording.isVideo()) { - icon.setImageResource(R.drawable.ic_type_video); + iconDrawable = ctx.getResources().getDrawable(R.drawable.ic_type_audio); } else { - icon.setImageResource(R.drawable.ic_type_img); + iconDrawable = ctx.getResources().getDrawable(R.drawable.ic_type_audio); } - + icon.setImageDrawable(iconDrawable); + return iconDrawable; } } diff --git a/OsmAnd/src/net/osmand/plus/audionotes/NotesFragment.java b/OsmAnd/src/net/osmand/plus/audionotes/NotesFragment.java index a4e6401c92..f0342179cf 100644 --- a/OsmAnd/src/net/osmand/plus/audionotes/NotesFragment.java +++ b/OsmAnd/src/net/osmand/plus/audionotes/NotesFragment.java @@ -4,6 +4,7 @@ import android.app.AlertDialog; import android.content.Context; import android.content.DialogInterface; import android.content.Intent; +import android.graphics.PorterDuff; import android.graphics.PorterDuff.Mode; import android.graphics.drawable.Drawable; import android.net.Uri; @@ -92,7 +93,8 @@ public class NotesFragment extends ListFragment { } final AudioVideoNotesPlugin.Recording recording = getItem(position); - DashAudioVideoNotesFragment.getNoteView(recording, row, getActivity()); + Drawable icon = DashAudioVideoNotesFragment.getNoteView(recording, row, getActivity()); + icon.setColorFilter(getResources().getColor(R.color.color_distance), Mode.MULTIPLY); row.findViewById(R.id.play).setVisibility(View.GONE); ImageButton options = (ImageButton) row.findViewById(R.id.options); options.setOnClickListener(new View.OnClickListener() { From 15f061e697488a8482b3497a56e5cdcd1f5e0873 Mon Sep 17 00:00:00 2001 From: Denis Date: Thu, 5 Mar 2015 17:19:15 +0200 Subject: [PATCH 5/8] Updated search history for address search --- .../src/net/osmand/data/PointDescription.java | 8 +++++++ .../search/SearchAddressFragment.java | 22 +++++++++++++------ .../plus/dashboard/DashRecentsFragment.java | 6 ++--- 3 files changed, 25 insertions(+), 11 deletions(-) diff --git a/OsmAnd/src/net/osmand/data/PointDescription.java b/OsmAnd/src/net/osmand/data/PointDescription.java index bf01a5e2fa..4b8e2ddd0a 100644 --- a/OsmAnd/src/net/osmand/data/PointDescription.java +++ b/OsmAnd/src/net/osmand/data/PointDescription.java @@ -53,6 +53,14 @@ public class PointDescription { } } + public void setTypeName(String typeName){ + this.typeName = typeName; + } + + public void setName(String name){ + this.name = name; + } + public String getTypeName() { return typeName; } diff --git a/OsmAnd/src/net/osmand/plus/activities/search/SearchAddressFragment.java b/OsmAnd/src/net/osmand/plus/activities/search/SearchAddressFragment.java index 3c66d2540d..62067ded20 100644 --- a/OsmAnd/src/net/osmand/plus/activities/search/SearchAddressFragment.java +++ b/OsmAnd/src/net/osmand/plus/activities/search/SearchAddressFragment.java @@ -82,7 +82,6 @@ public class SearchAddressFragment extends Fragment { @Override public void onCreateOptionsMenu(Menu onCreate, MenuInflater inflater) { - boolean light = getApplication().getSettings().isLightActionBar(); Menu menu = onCreate; int orientation = ScreenOrientationHelper.getScreenOrientation(getActivity()); boolean portrait = orientation == ActivityInfo.SCREEN_ORIENTATION_PORTRAIT || @@ -93,7 +92,6 @@ public class SearchAddressFragment extends Fragment { } else { ((SearchActivity) getActivity()).getClearToolbar(false); } - light = false; } if(getActivity() instanceof SearchAddressActivity) { MenuItem menuItem = menu.add(0, SELECT_POINT, 0, ""); @@ -353,21 +351,31 @@ public class SearchAddressFragment extends Fragment { return; } AddressInformation ai = new AddressInformation(); + PointDescription pointDescription = ai.getHistoryName(); if (!Algorithms.isEmpty(street2) && !Algorithms.isEmpty(street)) { ai = AddressInformation.build2StreetIntersection(getActivity(), osmandSettings); + pointDescription.setName(street2); + pointDescription.setTypeName(region + ", " + city); } else if (!Algorithms.isEmpty(building)) { ai = AddressInformation.buildBuilding(getActivity(), osmandSettings); + pointDescription.setName(street + ", " + building); + pointDescription.setTypeName(region + ", " + city); } else if (!Algorithms.isEmpty(street)) { ai = AddressInformation.buildStreet(getActivity(), osmandSettings); + pointDescription.setName(street); + pointDescription.setTypeName(region + ", " + city); } else if(!Algorithms.isEmpty(city)) { ai = AddressInformation.buildCity(getActivity(), osmandSettings); + pointDescription.setName(city); + pointDescription.setTypeName(region); } + if(mode == ADD_TO_FAVORITE) { Bundle b = new Bundle(); Dialog dlg = FavoriteDialogs.createAddFavouriteDialog(getActivity(), b); dlg.show(); - FavoriteDialogs.prepareAddFavouriteDialog(getActivity(), dlg, b, searchPoint.getLatitude(), searchPoint.getLongitude(), - ai.getHistoryName()); + FavoriteDialogs.prepareAddFavouriteDialog(getActivity(), dlg, b, searchPoint.getLatitude(), searchPoint.getLongitude(), + pointDescription); } else if(mode == SELECT_POINT ){ Intent intent = getActivity().getIntent(); intent.putExtra(SELECT_ADDRESS_POINT_INTENT_KEY, ai.objectName); @@ -377,11 +385,11 @@ public class SearchAddressFragment extends Fragment { getActivity().finish(); } else { if (mode == NAVIGATE_TO) { - DirectionsDialogs.directionsToDialogAndLaunchMap(getActivity(), searchPoint.getLatitude(), searchPoint.getLongitude(), ai.getHistoryName()); + DirectionsDialogs.directionsToDialogAndLaunchMap(getActivity(), searchPoint.getLatitude(), searchPoint.getLongitude(), pointDescription); } else if (mode == ADD_WAYPOINT) { - DirectionsDialogs.addWaypointDialogAndLaunchMap(getActivity(), searchPoint.getLatitude(), searchPoint.getLongitude(), ai.getHistoryName()); + DirectionsDialogs.addWaypointDialogAndLaunchMap(getActivity(), searchPoint.getLatitude(), searchPoint.getLongitude(), pointDescription); } else if (mode == SHOW_ON_MAP) { - osmandSettings.setMapLocationToShow(searchPoint.getLatitude(), searchPoint.getLongitude(), ai.zoom, ai.getHistoryName()); + osmandSettings.setMapLocationToShow(searchPoint.getLatitude(), searchPoint.getLongitude(), ai.zoom, pointDescription); MapActivity.launchMapActivityMoveToTop(getActivity()); } } diff --git a/OsmAnd/src/net/osmand/plus/dashboard/DashRecentsFragment.java b/OsmAnd/src/net/osmand/plus/dashboard/DashRecentsFragment.java index 7effa1fce7..016fdff414 100644 --- a/OsmAnd/src/net/osmand/plus/dashboard/DashRecentsFragment.java +++ b/OsmAnd/src/net/osmand/plus/dashboard/DashRecentsFragment.java @@ -11,7 +11,6 @@ import net.osmand.plus.OsmandApplication; import net.osmand.plus.R; import net.osmand.plus.activities.MapActivity; import net.osmand.plus.activities.search.SearchActivity; -import net.osmand.plus.base.FavoriteImageDrawable; import net.osmand.plus.dialogs.DirectionsDialogs; import net.osmand.plus.helpers.FontCache; import net.osmand.plus.helpers.SearchHistoryHelper; @@ -20,7 +19,6 @@ import net.osmand.util.Algorithms; import net.osmand.util.MapUtils; import android.app.Activity; import android.content.Intent; -import android.graphics.Color; import android.graphics.PorterDuff; import android.graphics.Typeface; import android.graphics.drawable.Drawable; @@ -90,7 +88,7 @@ public class DashRecentsFragment extends DashLocationFragment { } else { loc = new LatLon(0f, 0f); } - setupFavorites(); + setupRecents(); } @Override @@ -98,7 +96,7 @@ public class DashRecentsFragment extends DashLocationFragment { super.onPause(); } - public void setupFavorites(){ + public void setupRecents(){ View mainView = getView(); SearchHistoryHelper helper = SearchHistoryHelper.getInstance((OsmandApplication) getActivity().getApplicationContext()); points = helper.getHistoryEntries(); From 0a1c7efbe304e497c16e63b55687b9850fdb4776 Mon Sep 17 00:00:00 2001 From: Denis Date: Thu, 5 Mar 2015 17:32:58 +0200 Subject: [PATCH 6/8] Fixed action mode bug with select show on map in my tracks --- OsmAnd/src/net/osmand/plus/myplaces/AvailableGPXFragment.java | 1 - 1 file changed, 1 deletion(-) diff --git a/OsmAnd/src/net/osmand/plus/myplaces/AvailableGPXFragment.java b/OsmAnd/src/net/osmand/plus/myplaces/AvailableGPXFragment.java index 58af0c89a7..32b8a3ec69 100644 --- a/OsmAnd/src/net/osmand/plus/myplaces/AvailableGPXFragment.java +++ b/OsmAnd/src/net/osmand/plus/myplaces/AvailableGPXFragment.java @@ -464,7 +464,6 @@ public class AvailableGPXFragment extends OsmandExpandableListFragment { @Override public void onDestroyActionMode(ActionMode mode) { enableSelectionMode(false); - runSelection(false); allGpxAdapter.notifyDataSetChanged(); } From 0d0ceeff7a08223746842f31b46f7913c41e6617 Mon Sep 17 00:00:00 2001 From: Denis Date: Thu, 5 Mar 2015 17:39:18 +0200 Subject: [PATCH 7/8] Updated icons in selected gpx track --- OsmAnd/src/net/osmand/plus/myplaces/TrackPointFragment.java | 2 +- .../src/net/osmand/plus/myplaces/TrackRoutePointFragment.java | 2 +- OsmAnd/src/net/osmand/plus/myplaces/TrackSegmentFragment.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/OsmAnd/src/net/osmand/plus/myplaces/TrackPointFragment.java b/OsmAnd/src/net/osmand/plus/myplaces/TrackPointFragment.java index b0b910be73..77bb6fe221 100644 --- a/OsmAnd/src/net/osmand/plus/myplaces/TrackPointFragment.java +++ b/OsmAnd/src/net/osmand/plus/myplaces/TrackPointFragment.java @@ -47,7 +47,7 @@ public class TrackPointFragment extends SelectedGPXFragment { return; } - MenuItem item = menu.add(R.string.settings).setIcon(R.drawable.ic_overflow_menu_light).setOnMenuItemClickListener(new MenuItem.OnMenuItemClickListener() { + MenuItem item = menu.add(R.string.add_to_favourite).setIcon(R.drawable.ic_action_fav_dark).setOnMenuItemClickListener(new MenuItem.OnMenuItemClickListener() { @Override public boolean onMenuItemClick(MenuItem item) { saveAsFavorites(group); diff --git a/OsmAnd/src/net/osmand/plus/myplaces/TrackRoutePointFragment.java b/OsmAnd/src/net/osmand/plus/myplaces/TrackRoutePointFragment.java index 5ad61259e6..b9988d8c3d 100644 --- a/OsmAnd/src/net/osmand/plus/myplaces/TrackRoutePointFragment.java +++ b/OsmAnd/src/net/osmand/plus/myplaces/TrackRoutePointFragment.java @@ -47,7 +47,7 @@ public class TrackRoutePointFragment extends SelectedGPXFragment { return; } - MenuItem item = menu.add(R.string.settings).setIcon(R.drawable.ic_overflow_menu_light).setOnMenuItemClickListener(new MenuItem.OnMenuItemClickListener() { + MenuItem item = menu.add(R.string.add_to_favourite).setIcon(R.drawable.ic_action_fav_dark).setOnMenuItemClickListener(new MenuItem.OnMenuItemClickListener() { @Override public boolean onMenuItemClick(MenuItem item) { saveAsFavorites(group); diff --git a/OsmAnd/src/net/osmand/plus/myplaces/TrackSegmentFragment.java b/OsmAnd/src/net/osmand/plus/myplaces/TrackSegmentFragment.java index 182c872930..9f8fe6051a 100644 --- a/OsmAnd/src/net/osmand/plus/myplaces/TrackSegmentFragment.java +++ b/OsmAnd/src/net/osmand/plus/myplaces/TrackSegmentFragment.java @@ -68,7 +68,7 @@ public class TrackSegmentFragment extends SelectedGPXFragment { return; } - MenuItem item = menu.add(R.string.settings).setIcon(R.drawable.ic_overflow_menu_light).setOnMenuItemClickListener(new MenuItem.OnMenuItemClickListener() { + MenuItem item = menu.add(R.string.showed_on_map).setIcon(R.drawable.ic_show_on_map).setOnMenuItemClickListener(new MenuItem.OnMenuItemClickListener() { @Override public boolean onMenuItemClick(MenuItem item) { selectSplitDistance(group); From b682d78d8735162806b1e49fd6c7f6f694334a6e Mon Sep 17 00:00:00 2001 From: Zahnstocher Date: Thu, 5 Mar 2015 21:16:09 +0100 Subject: [PATCH 8/8] Fix strings --- OsmAnd/res/values-de/strings.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/OsmAnd/res/values-de/strings.xml b/OsmAnd/res/values-de/strings.xml index 8e4f9e2933..27c57db8a4 100644 --- a/OsmAnd/res/values-de/strings.xml +++ b/OsmAnd/res/values-de/strings.xml @@ -2047,8 +2047,8 @@ Afghanistan, Ägypten, Albanien, Algerien, Andorra, Angola, Anguilla, Antigua an Einen Proxy\'s Hostname einrichten (Bsp. 127.0.0.1) Proxy-Port Einen Proxy\'s Port einrichten (Bsp. 8118) - Deaktivieren - Aktivieren + Deaktiviert + Aktiviert Aktivieren Deaktivieren Beschreibung