diff --git a/app/src/main/java/cy/agorise/bitsybitshareswallet/fragments/MerchantsFragment.kt b/app/src/main/java/cy/agorise/bitsybitshareswallet/fragments/MerchantsFragment.kt index cc453a6..6774286 100644 --- a/app/src/main/java/cy/agorise/bitsybitshareswallet/fragments/MerchantsFragment.kt +++ b/app/src/main/java/cy/agorise/bitsybitshareswallet/fragments/MerchantsFragment.kt @@ -2,7 +2,6 @@ package cy.agorise.bitsybitshareswallet.fragments import android.Manifest import android.annotation.SuppressLint -import android.content.Context import android.content.pm.PackageManager import android.os.Bundle import android.util.Log @@ -62,7 +61,6 @@ class MerchantsFragment : Fragment(), OnMapReadyCallback { private var mPopupWindow: PopupWindow? = null private var mToolbar: Toolbar? = null private var screenWidth: Int = 0 - private var popupWindowWidth: Int = 0 override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? { setHasOptionsMenu(true) @@ -94,7 +92,6 @@ class MerchantsFragment : Fragment(), OnMapReadyCallback { // TODO get references to the popup menu items mPopupWindow = PopupWindow(popupView, ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT) - popupWindowWidth = mPopupWindow?.width ?: popupWindowWidth } override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) { @@ -104,7 +101,7 @@ class MerchantsFragment : Fragment(), OnMapReadyCallback { override fun onOptionsItemSelected(item: MenuItem?): Boolean { if (item?.itemId == R.id.menu_filter) { if (mPopupWindow?.isShowing == false) - mPopupWindow?.showAsDropDown(mToolbar, screenWidth - popupWindowWidth, 0) + mPopupWindow?.showAsDropDown(mToolbar, screenWidth, -20) else mPopupWindow?.dismiss() return true @@ -346,4 +343,11 @@ class MerchantsFragment : Fragment(), OnMapReadyCallback { return null } } + + override fun onPause() { + super.onPause() + + if (mPopupWindow?.isShowing == true) + mPopupWindow?.dismiss() + } } diff --git a/app/src/main/res/drawable/ic_info_merchants.xml b/app/src/main/res/drawable/ic_info_merchants.xml new file mode 100644 index 0000000..e1e6bc8 --- /dev/null +++ b/app/src/main/res/drawable/ic_info_merchants.xml @@ -0,0 +1,5 @@ + + + diff --git a/app/src/main/res/layout/popup_menu_merchants.xml b/app/src/main/res/layout/popup_menu_merchants.xml index 2ecbd14..da2f2f3 100644 --- a/app/src/main/res/layout/popup_menu_merchants.xml +++ b/app/src/main/res/layout/popup_menu_merchants.xml @@ -31,7 +31,9 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="10dp" - android:text="About" + android:layout_marginEnd="8dp" + android:text="@string/title_about" + android:drawableEnd="@drawable/ic_info_merchants" android:clickable="true" android:focusable="true" android:textAppearance="@style/TextAppearance.Bitsy.Body1"/> diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 4351a77..d1081da 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -61,6 +61,7 @@ Comerciantes Tellers + Acerca de El permiso de localizaciĆ³n es necesario para mostrar tu ubicaciĆ³n actual en el mapa. diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 8b4eed1..e9959e4 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -61,6 +61,7 @@ Merchants Tellers + About Location permission is necessary to show your current location on the map.