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

[android] Changed behaviour of catalog closing btn

Browse source
This commit is contained in:
Dmitry Donskoy 2019-05-15 14:51:50 +03:00 • committed by Aleksandr Zatsepin
parent 51bf87efa7
commit 87717e0fa4
4 changed files with 41 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
android/res/menu/menu_top_bookmark_categories.xml Normal file
View file

@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<menu
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
<item android:id="@+id/close"
app:showAsAction="always"
android:icon="@drawable/ic_clear"/>
</menu>

8
android/src/com/mapswithme/maps/base/BaseToolbarActivity.java
View file

@ -2,6 +2,7 @@ package com.mapswithme.maps.base;
import android.os.Bundle;
import android.support.annotation.CallSuper;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.support.annotation.StringRes;
import android.support.v4.app.Fragment;
@ -28,11 +29,16 @@ public abstract class BaseToolbarActivity extends BaseMwmFragmentActivity
else
toolbar.setTitle(title);
UiUtils.showHomeUpButton(toolbar);
setupHomeButton(toolbar);
displayToolbarAsActionBar();
}
}
protected void setupHomeButton(@NonNull Toolbar toolbar)
{
UiUtils.showHomeUpButton(toolbar);
}
@StringRes
protected int getToolbarTitle()
{

7
android/src/com/mapswithme/maps/bookmarks/BookmarksCatalogActivity.java
View file

@ -5,6 +5,7 @@ import android.content.Context;
import android.content.Intent;
import android.support.annotation.NonNull;
import android.support.v4.app.Fragment;
import android.support.v7.widget.Toolbar;
import com.mapswithme.maps.base.BaseToolbarActivity;
@ -45,6 +46,12 @@ public class BookmarksCatalogActivity extends BaseToolbarActivity
return intent;
}
@Override
protected void setupHomeButton(@NonNull Toolbar toolbar)
{
}
@Override
protected Class<? extends Fragment> getFragmentClass()
{

19
android/src/com/mapswithme/maps/bookmarks/BookmarksCatalogFragment.java
View file

@ -10,6 +10,9 @@ import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.text.TextUtils;
import android.view.LayoutInflater;
import android.view.Menu;
import android.view.MenuInflater;
import android.view.MenuItem;
import android.view.View;
import android.view.ViewGroup;
import android.webkit.SslErrorHandler;
@ -107,6 +110,7 @@ public class BookmarksCatalogFragment extends BaseWebViewMwmFragment
public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container,
@Nullable Bundle savedInstanceState)
{
setHasOptionsMenu(true);
mFailedPurchaseController = PurchaseFactory.createFailedBookmarkPurchaseController(getContext());
mFailedPurchaseController.initialize(getActivity());
mFailedPurchaseController.validateExistingPurchases();
@ -176,6 +180,21 @@ public class BookmarksCatalogFragment extends BaseWebViewMwmFragment
mDelegate.onActivityResult(requestCode, resultCode, data);
}
@Override
public void onCreateOptionsMenu(Menu menu, MenuInflater inflater)
{
inflater.inflate(R.menu.menu_top_bookmark_categories, menu);
}
@Override
public boolean onOptionsItemSelected(MenuItem item)
{
if (item.getItemId() == R.id.close)
requireActivity().finish();
return super.onOptionsItemSelected(item);
}
@Override
public void onTargetFragmentResult(int resultCode, @Nullable Intent data)
{