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

[android] [bookmarks] Add "OK" button in the bookmark's activity.

Browse source
This commit is contained in:
vng 2013-02-14 13:20:50 +03:00 • committed by Alex Zolotarev
parent 0e80bdc360
commit 4d959157bd
2 changed files with 19 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
android/res/layout/pin.xml
View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
@ -11,15 +11,12 @@
android:id="@+id/bmk_hack_view"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_alignParentTop="true"
android:focusable="true"
android:focusableInTouchMode="true" />
<ScrollView
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_above="@+id/bmk_delete"
android:layout_below="@id/bmk_hack_view" >
android:layout_height="wrap_content">
<LinearLayout
android:layout_width="fill_parent"
@ -133,14 +130,20 @@
android:background="@android:drawable/divider_horizontal_dark" />
<Button
android:id="@+id/bmk_delete"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_margin="5dp"
android:onClick="onOkClick"
android:text="@string/ok" />
<Button
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_margin="5dp"
android:onClick="onDeleteClick"
android:text="@string/remove_pin" />
</LinearLayout>
</ScrollView>
</RelativeLayout>
</LinearLayout>

10
android/src/com/mapswithme/maps/bookmarks/BookmarkActivity.java
View file

@ -119,8 +119,9 @@ public class BookmarkActivity extends AbstractBookmarkActivity
@Override
public void onTextChanged(CharSequence s, int start, int before, int count)
{
mPin.setName(s.toString());
setTitle(s.toString());
final String str = s.toString();
mPin.setName(str);
setTitle(str);
}
@Override
public void beforeTextChanged(CharSequence s, int start, int count, int after)
@ -252,6 +253,11 @@ public class BookmarkActivity extends AbstractBookmarkActivity
super.onActivityResult(requestCode, resultCode, data);
}
public void onOkClick(View v)
{
onBackPressed();
}
public void onDeleteClick(View v)
{
showDialog(CONFIRMATION_DIALOG);