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

[android] Implmented 'Create list' button in bookmark list

Browse source
This commit is contained in:
Александр Зацепин 2018-03-20 19:50:42 +03:00 • committed by Arsentiy Milchakov
parent 0ba811ad7c
commit 029933116a
8 changed files with 32 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
android/res/drawable/list_divider.xml
View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<size android:width="@dimen/divider_width" android:height="@dimen/divider_height"/>
<solid android:color="@color/bg_window"/>
<solid android:color="@color/black_12"/>
</shape>

2
android/res/drawable/list_divider_night.xml
View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<size android:width="@dimen/divider_width" android:height="@dimen/divider_height"/>
<solid android:color="@color/bg_window_night"/>
<solid android:color="@color/white_12"/>
</shape>

7
android/res/values/colors.xml
View file

@ -22,7 +22,8 @@
<color name="black_lightest">#61000000</color> <!-- 38% black -->
<color name="black_4">#0A000000</color> <!-- 4% black -->
<color name="black_8">#14000000</color> <!-- 8% black -->
<color name="black_11">#1E000000</color> <!-- 11% black -->
<color name="black_11">#1C000000</color> <!-- 11% black -->
<color name="black_12">#1E000000</color> <!-- 12% black -->
<color name="black_24">#3D000000</color> <!-- 24% black -->
<color name="black_60">#99000000</color> <!-- 24% black -->
<color name="white_primary">#FFFFFFFF</color> <!-- 100% white -->
@ -30,8 +31,8 @@
<color name="white_lightest">#4CFFFFFF</color> <!-- 50% white -->
<color name="white_4">#0AFFFFFF</color> <!-- 4% white -->
<color name="white_8">#14FFFFFF</color> <!-- 8% white -->
<color name="white_11">#1EFFFFFF</color> <!-- 11% white -->
<color name="white_12">#1Effffff</color> <!-- 12% white -->
<color name="white_11">#1CFFFFFF</color> <!-- 11% white -->
<color name="white_12">#1EFFFFFF</color> <!-- 12% white -->
<color name="white_24">#3DFFFFFF</color> <!-- 24% black -->
<color name="white_60">#99FFFFFF</color> <!-- 24% black -->
<color name="warm_gray">#FF999691</color>

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

@ -7,6 +7,7 @@ import android.support.annotation.LayoutRes;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.support.v7.widget.RecyclerView;
import android.text.TextUtils;
import android.view.MenuItem;
import android.view.View;
import android.widget.Toast;
@ -148,9 +149,20 @@ public class BookmarkCategoriesFragment extends BaseMwmRecyclerFragment
}
@Override
public void onSaveText(String text)
public void onSaveText(@Nullable String initialText, @Nullable String text)
{
BookmarkManager.INSTANCE.setCategoryName(mSelectedCatId, text);
if (TextUtils.isEmpty(text))
{
// TODO: translation is needed.
Toast.makeText(getContext(), "A list name couldn't be empty.", Toast.LENGTH_SHORT).show();
return;
}
if (TextUtils.isEmpty(initialText))
BookmarkManager.INSTANCE.createCategory(text);
else
BookmarkManager.INSTANCE.setCategoryName(mSelectedCatId, text);
if (getAdapter() != null)
getAdapter().notifyDataSetChanged();
}
@ -255,7 +267,9 @@ public class BookmarkCategoriesFragment extends BaseMwmRecyclerFragment
@Override
public void onAddCategory()
{
Toast.makeText(getContext(), "Coming soon", Toast.LENGTH_LONG).show();
EditTextDialogFragment.show(getString(R.string.bookmark_set_name),null,
getString(R.string.bookmarks_create_new_group),
getString(R.string.cancel), this);
}
@Override

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

@ -75,7 +75,7 @@ public class ChooseBookmarkCategoryFragment extends BaseMwmDialogFragment
}
@Override
public void onSaveText(String text)
public void onSaveText(@Nullable String initialText, @Nullable String text)
{
createCategory(text);
}

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

@ -6,6 +6,7 @@ import android.app.Dialog;
import android.content.DialogInterface;
import android.os.Bundle;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.support.design.widget.TextInputLayout;
import android.support.v4.app.Fragment;
import android.support.v7.app.AlertDialog;
@ -27,16 +28,17 @@ public class EditTextDialogFragment extends BaseMwmDialogFragment
public static final String EXTRA_HINT = "Hint";
private String mTitle;
@Nullable
private String mInitialText;
private String mHint;
private EditText mEtInput;
public interface OnTextSaveListener
{
void onSaveText(String text);
void onSaveText(@Nullable String initialText, @Nullable String text);
}
public static void show(String title, String initialText, String positiveBtn, String negativeBtn, Fragment parent)
public static void show(String title, @Nullable String initialText, String positiveBtn, String negativeBtn, Fragment parent)
{
show(title, initialText, "", positiveBtn, negativeBtn, parent);
}
@ -84,13 +86,13 @@ public class EditTextDialogFragment extends BaseMwmDialogFragment
if (parentFragment instanceof OnTextSaveListener)
{
dismiss();
((OnTextSaveListener) parentFragment).onSaveText(result);
((OnTextSaveListener) parentFragment).onSaveText(mInitialText, result);
return;
}
final Activity activity = getActivity();
if (activity instanceof OnTextSaveListener)
((OnTextSaveListener) activity).onSaveText(result);
((OnTextSaveListener) activity).onSaveText(mInitialText, result);
}
}).create();
}

2
android/src/com/mapswithme/maps/editor/EditorFragment.java
View file

@ -658,7 +658,7 @@ public class EditorFragment extends BaseMwmFragment implements View.OnClickListe
}
@Override
public void onSaveText(String text)
public void onSaveText(@Nullable String initialText, @Nullable String text)
{
Editor.nativePlaceDoesNotExist(text);
mParent.onBackPressed();

2
android/src/com/mapswithme/maps/editor/StreetFragment.java
View file

@ -51,7 +51,7 @@ public class StreetFragment extends BaseMwmRecyclerFragment implements EditTextD
}
@Override
public void onSaveText(String text)
public void onSaveText(@Nullable String initialText, @Nullable String text)
{
saveStreet(new LocalizedStreet(text, ""));
}