gpesquero/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[android] Fixed bookmark category rename.

Browse source
This commit is contained in:
Dmitry Yunitsky 2015-09-03 17:27:35 +03:00 • committed by Alex Zolotarev
parent 2e565ef2d7
commit 50dd22b914
3 changed files with 17 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
android/src/com/mapswithme/maps/bookmarks/BookmarkCategoriesFragment.java
View file

@ -2,7 +2,6 @@ package com.mapswithme.maps.bookmarks;
import android.content.Intent;
import android.os.Bundle;
import android.support.v4.app.Fragment;
import android.view.LayoutInflater;
import android.view.MenuItem;
import android.view.View;
@ -87,14 +86,9 @@ public class BookmarkCategoriesFragment extends BaseMwmRecyclerFragment
break;
case R.id.set_edit:
final Bundle args = new Bundle();
args.putString(EditTextDialogFragment.EXTRA_TITLE, getString(R.string.bookmark_set_name));
args.putString(EditTextDialogFragment.EXTRA_INITIAL, BookmarkManager.INSTANCE.getCategoryById(mSelectedPosition).getName());
args.putString(EditTextDialogFragment.EXTRA_POSITIVE_BUTTON, getString(R.string.rename));
args.putString(EditTextDialogFragment.EXTRA_NEGATIVE_BUTTON, getString(R.string.cancel));
final EditTextDialogFragment fragment = (EditTextDialogFragment) Fragment.instantiate(getActivity(), EditTextDialogFragment.class.getName());
fragment.setArguments(args);
fragment.show(getActivity().getSupportFragmentManager(), EditTextDialogFragment.class.getName());
EditTextDialogFragment.show(getString(R.string.bookmark_set_name),
BookmarkManager.INSTANCE.getCategoryById(mSelectedPosition).getName(),
getString(R.string.rename), getString(R.string.cancel), this);
break;
}

12
android/src/com/mapswithme/maps/bookmarks/ChooseBookmarkCategoryFragment.java
View file

@ -17,8 +17,6 @@ import com.mapswithme.maps.bookmarks.data.BookmarkManager;
import com.mapswithme.maps.dialog.EditTextDialogFragment;
import com.mapswithme.util.statistics.Statistics;
import static com.mapswithme.maps.dialog.EditTextDialogFragment.EXTRA_POSITIVE_BUTTON;
import static com.mapswithme.maps.dialog.EditTextDialogFragment.EXTRA_TITLE;
import static com.mapswithme.maps.dialog.EditTextDialogFragment.OnTextSaveListener;
public class ChooseBookmarkCategoryFragment extends BaseMwmDialogFragment implements OnTextSaveListener, ChooseBookmarkCategoryAdapter.CategoryListener
@ -110,13 +108,7 @@ public class ChooseBookmarkCategoryFragment extends BaseMwmDialogFragment implem
@Override
public void onCategoryCreate()
{
final Bundle args = new Bundle();
Activity activity = getActivity();
args.putString(EXTRA_TITLE, activity.getString(R.string.new_group));
args.putString(EXTRA_POSITIVE_BUTTON, activity.getString(R.string.ok));
final EditTextDialogFragment fragment = (EditTextDialogFragment) Fragment.
instantiate(activity, EditTextDialogFragment.class.getName());
fragment.setArguments(args);
fragment.show(getChildFragmentManager(), EditTextDialogFragment.class.getName());
EditTextDialogFragment.show(getString(R.string.bookmark_set_name), null,
getString(R.string.ok), null, this);
}
}

12
android/src/com/mapswithme/maps/dialog/EditTextDialogFragment.java
View file

@ -33,6 +33,18 @@ public class EditTextDialogFragment extends BaseMwmDialogFragment
void onSaveText(String text);
}
public static void show(String title, String initialText, String positiveBtn, String negativeBtn, Fragment parent)
{
final Bundle args = new Bundle();
args.putString(EXTRA_TITLE, title);
args.putString(EXTRA_INITIAL, initialText);
args.putString(EXTRA_POSITIVE_BUTTON, positiveBtn);
args.putString(EXTRA_NEGATIVE_BUTTON, negativeBtn);
final EditTextDialogFragment fragment = (EditTextDialogFragment) Fragment.instantiate(parent.getActivity(), EditTextDialogFragment.class.getName());
fragment.setArguments(args);
fragment.show(parent.getChildFragmentManager(), EditTextDialogFragment.class.getName());
}
@NonNull
@Override
public Dialog onCreateDialog(Bundle savedInstanceState)