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

[android] Fixed restore bookmark subscribtion button, i.e. not to use html string and use existing string id 'restore'

Browse source
This commit is contained in:
Александр Зацепин 2019-07-10 14:33:54 +03:00 • committed by yoksnod
parent 1d06f6cc21
commit b578ffa8f9
2 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
android/res/layout/bookmark_subscription_fragment.xml
View file

@ -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"/>
</LinearLayout>

8
android/src/com/mapswithme/maps/purchase/BookmarkSubscriptionFragment.java
View file

@ -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());