diff --git a/android/res/layout/bookmark_subscription_fragment.xml b/android/res/layout/bookmark_subscription_fragment.xml index 23031ace1e..bca97778a0 100644 --- a/android/res/layout/bookmark_subscription_fragment.xml +++ b/android/res/layout/bookmark_subscription_fragment.xml @@ -105,16 +105,24 @@ android:id="@+id/restore_purchase_btn" android:background="?attr/selectableItemBackground" android:layout_gravity="center" - android:layout_marginTop="@dimen/margin_base_plus" + android:layout_marginTop="@dimen/margin_half_plus" android:layout_marginEnd="@dimen/margin_base_plus" android:layout_marginRight="@dimen/margin_base_plus" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:minHeight="@dimen/primary_button_min_height" + android:minWidth="@dimen/primary_button_min_width" + android:paddingLeft="@dimen/margin_half_plus" + android:paddingStart="@dimen/margin_half_plus" + android:paddingRight="@dimen/margin_half_plus" + android:paddingEnd="@dimen/margin_half_plus" android:gravity="center" android:fontFamily="@string/robotoMedium" android:layout_marginLeft="@dimen/margin_base_plus" android:layout_marginStart="@dimen/margin_base_plus" android:textAppearance="@style/MwmTextAppearance.Body3.Primary" + android:text="@string/restore" + android:textColor="?colorAccent" tools:text="Restore purchases" tools:ignore="UnusedAttribute"/> diff --git a/android/src/com/mapswithme/maps/purchase/BookmarkSubscriptionFragment.java b/android/src/com/mapswithme/maps/purchase/BookmarkSubscriptionFragment.java index d17eaa5a30..ac674ad2f9 100644 --- a/android/src/com/mapswithme/maps/purchase/BookmarkSubscriptionFragment.java +++ b/android/src/com/mapswithme/maps/purchase/BookmarkSubscriptionFragment.java @@ -8,7 +8,6 @@ import android.support.annotation.Nullable; import android.support.v7.widget.CardView; import android.text.Html; import android.text.Spanned; -import android.text.method.LinkMovementMethod; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -80,11 +79,8 @@ public class BookmarkSubscriptionFragment extends BaseMwmFragment monthlyPriceCard.setOnClickListener(monthlyCardListener); annualPriceCard.setCardElevation(getResources().getDimension(R.dimen.margin_base_plus_quarter)); - TextView restorePurchasesLink = root.findViewById(R.id.restore_purchase_btn); - final Spanned html = makeRestorePurchaseHtml(requireContext()); - restorePurchasesLink.setText(html); - restorePurchasesLink.setMovementMethod(LinkMovementMethod.getInstance()); - restorePurchasesLink.setOnClickListener(v -> openSubscriptionManagementSettings()); + TextView restorePurchasesBtn = root.findViewById(R.id.restore_purchase_btn); + restorePurchasesBtn.setOnClickListener(v -> openSubscriptionManagementSettings()); View continueBtn = root.findViewById(R.id.continue_btn); continueBtn.setOnClickListener(v -> onContinueButtonClicked());