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

Move favourites constant to ui fragment

Browse source
This commit is contained in:
Chumva 2019-03-27 19:07:35 +02:00
parent a17db4dace
commit 9f0eed9a04
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
OsmAnd/src/net/osmand/plus/FavouritesDbHelper.java
View file

@ -43,7 +43,6 @@ public class FavouritesDbHelper {
public static final String BACKUP_FOLDER = "backup"; //$NON-NLS-1$
public static final int BACKUP_CNT = 20; //$NON-NLS-1$
public static final String FILE_TO_BACKUP = "favourites_bak.gpx"; //$NON-NLS-1$
public static final String FAVOURITES = "favourites"; //$NON-NLS-1$
private List<FavouritePoint> cachedFavoritePoints = new ArrayList<FavouritePoint>();
private List<FavoriteGroup> favoriteGroups = new ArrayList<FavouritesDbHelper.FavoriteGroup>();

11
OsmAnd/src/net/osmand/plus/routepreparationmenu/AddPointBottomSheetDialog.java
View file

@ -16,7 +16,6 @@ import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.TextView;
import net.osmand.AndroidUtils;
@ -55,6 +54,8 @@ public class AddPointBottomSheetDialog extends MenuBottomSheetDialogFragment {
public static final int ADD_FAVOURITE_TO_ROUTE_REQUEST_CODE = 1;
public static final String FAVOURITES = "favourites";
private PointType pointType = PointType.START;
@Override
@ -350,7 +351,7 @@ public class AddPointBottomSheetDialog extends MenuBottomSheetDialogFragment {
}
private void addMainScrollItems(List<Object> items) {
items.add(FavouritesDbHelper.FAVOURITES);
items.add(FAVOURITES);
items.add(PointType.HOME);
items.add(PointType.WORK);
}
@ -396,7 +397,7 @@ public class AddPointBottomSheetDialog extends MenuBottomSheetDialogFragment {
return;
}
Object item = items.get(position);
if (item.equals(FavouritesDbHelper.FAVOURITES)) {
if (item.equals(FAVOURITES)) {
openFavouritesDialog();
} else {
TargetPointsHelper helper = mapActivity.getMyApplication().getTargetPointsHelper();
@ -440,7 +441,7 @@ public class AddPointBottomSheetDialog extends MenuBottomSheetDialogFragment {
if (item == PointType.HOME) {
point = helper.getHomePoint();
} else if (item == PointType.WORK) {
point = helper.getHomePoint();
point = helper.getWorkPoint();
}
if (point != null) {
ll = new LatLon(point.getLatitude(), point.getLongitude());
@ -522,7 +523,7 @@ public class AddPointBottomSheetDialog extends MenuBottomSheetDialogFragment {
if (holder instanceof FavouritesViewHolder) {
Object item = getItem(position);
FavouritesViewHolder favouritesViewHolder = (FavouritesViewHolder) holder;
if (item.equals(FavouritesDbHelper.FAVOURITES)) {
if (item.equals(FAVOURITES)) {
favouritesViewHolder.title.setText(R.string.shared_string_favorites);
favouritesViewHolder.icon.setImageDrawable(getContentIcon(R.drawable.ic_action_fav_dark));
favouritesViewHolder.description.setVisibility(View.GONE);