From 055c3b11197dbe6c8c4bd98608fcca151ce25eca Mon Sep 17 00:00:00 2001 From: Chumva Date: Tue, 17 Apr 2018 13:13:01 +0300 Subject: [PATCH] change button text and clean imports --- .../SelectWptCategoriesBottomSheetDialogFragment.java | 4 ++-- .../mapmarkers/adapters/MapMarkerCategoriesViewHolder.java | 3 +-- .../plus/mapmarkers/adapters/MapMarkersGroupsAdapter.java | 7 ------- 3 files changed, 3 insertions(+), 11 deletions(-) diff --git a/OsmAnd/src/net/osmand/plus/mapmarkers/SelectWptCategoriesBottomSheetDialogFragment.java b/OsmAnd/src/net/osmand/plus/mapmarkers/SelectWptCategoriesBottomSheetDialogFragment.java index b428722e64..e7757649a3 100644 --- a/OsmAnd/src/net/osmand/plus/mapmarkers/SelectWptCategoriesBottomSheetDialogFragment.java +++ b/OsmAnd/src/net/osmand/plus/mapmarkers/SelectWptCategoriesBottomSheetDialogFragment.java @@ -112,9 +112,9 @@ public class SelectWptCategoriesBottomSheetDialogFragment extends MenuBottomShee @Override protected int getRightBottomButtonTextId() { if (isUpdateMode) { - return -1; - } else { return super.getRightBottomButtonTextId(); + } else { + return R.string.shared_string_add; } } diff --git a/OsmAnd/src/net/osmand/plus/mapmarkers/adapters/MapMarkerCategoriesViewHolder.java b/OsmAnd/src/net/osmand/plus/mapmarkers/adapters/MapMarkerCategoriesViewHolder.java index 675100f419..bce9010093 100644 --- a/OsmAnd/src/net/osmand/plus/mapmarkers/adapters/MapMarkerCategoriesViewHolder.java +++ b/OsmAnd/src/net/osmand/plus/mapmarkers/adapters/MapMarkerCategoriesViewHolder.java @@ -20,5 +20,4 @@ public class MapMarkerCategoriesViewHolder extends RecyclerView.ViewHolder { icon = (ImageView) itemView.findViewById(R.id.icon_right); title = (TextView) itemView.findViewById(R.id.title); } -} - +} \ No newline at end of file diff --git a/OsmAnd/src/net/osmand/plus/mapmarkers/adapters/MapMarkersGroupsAdapter.java b/OsmAnd/src/net/osmand/plus/mapmarkers/adapters/MapMarkersGroupsAdapter.java index 2aac660c9f..dbf297539e 100644 --- a/OsmAnd/src/net/osmand/plus/mapmarkers/adapters/MapMarkersGroupsAdapter.java +++ b/OsmAnd/src/net/osmand/plus/mapmarkers/adapters/MapMarkersGroupsAdapter.java @@ -1,24 +1,19 @@ package net.osmand.plus.mapmarkers.adapters; -import android.os.AsyncTask; import android.os.Bundle; import android.support.annotation.NonNull; import android.support.design.widget.Snackbar; import android.support.v4.content.ContextCompat; -import android.support.v7.app.AppCompatActivity; import android.support.v7.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.CompoundButton; import android.widget.ImageView; -import android.widget.Toast; import net.osmand.AndroidUtils; import net.osmand.IndexConstants; -import net.osmand.OsmAndCollator; import net.osmand.data.LatLon; -import net.osmand.plus.GPXDatabase; import net.osmand.plus.GPXUtilities.GPXFile; import net.osmand.plus.GpxSelectionHelper; import net.osmand.plus.GpxSelectionHelper.SelectedGpxFile; @@ -33,12 +28,10 @@ import net.osmand.plus.OsmandApplication; import net.osmand.plus.R; import net.osmand.plus.activities.MapActivity; import net.osmand.plus.dashboard.DashLocationFragment; -import net.osmand.plus.mapmarkers.AddTracksGroupBottomSheetDialogFragment; import net.osmand.plus.mapmarkers.SelectWptCategoriesBottomSheetDialogFragment; import net.osmand.plus.wikivoyage.article.WikivoyageArticleDialogFragment; import net.osmand.plus.wikivoyage.data.TravelArticle; import net.osmand.plus.wikivoyage.data.TravelDbHelper; -import net.osmand.plus.wikivoyage.data.TravelLocalDataHelper; import java.io.File; import java.text.SimpleDateFormat;