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

[android] Replaced more options textview with compound button

Browse source
This commit is contained in:
Alexander Zatsepin 2018-09-21 17:01:28 +03:00 • committed by yoksnod
parent a49118eb14
commit c649159062
2 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
android/res/layout/ads_removal_pay_button_container.xml
View file

@ -43,12 +43,13 @@
android:layout_marginTop="@dimen/margin_base"
android:background="?attr/adsRemovalOptionsBg"
android:orientation="vertical">
<TextView
<ToggleButton
android:id="@+id/options"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:minHeight="@dimen/primary_button_min_height"
android:text="@string/options_dropdown_title"
android:textOn="@string/options_dropdown_title"
android:textOff="@string/options_dropdown_title"
android:textAppearance="@style/MwmTextAppearance.Body4"
android:background="?attr/clickableBackground"
android:gravity="start|center_vertical"

16
android/src/com/mapswithme/maps/purchase/AdsRemovalPurchaseDialog.java
View file

@ -8,6 +8,7 @@ import android.support.annotation.Nullable;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.CompoundButton;
import android.widget.TextView;
import com.android.billingclient.api.SkuDetails;
@ -56,8 +57,8 @@ public class AdsRemovalPurchaseDialog extends BaseMwmDialogFragment implements A
private TextView mWeeklyButton;
@SuppressWarnings("NullableProblems")
@NonNull
private TextView mOptionsButton;
private boolean mOptionsOpened;
private CompoundButton mOptionsButton;
@Override
public void onCreate(@Nullable Bundle savedInstanceState)
{
@ -90,7 +91,7 @@ public class AdsRemovalPurchaseDialog extends BaseMwmDialogFragment implements A
mWeeklyButton.setOnClickListener(v -> onWeeklyProductClicked());
mOptionsButton = payButtonContainer.findViewById(R.id.options);
mOptionsButton.setCompoundDrawablesWithIntrinsicBounds(null, null, getOptionsToggle(), null);
mOptionsButton.setOnClickListener(v -> onOptionsClicked());
mOptionsButton.setOnCheckedChangeListener((buttonView, isChecked) -> onOptionsClicked());
view.findViewById(R.id.explanation).setOnClickListener(v -> onExplanationClick());
return view;
}
@ -119,8 +120,8 @@ public class AdsRemovalPurchaseDialog extends BaseMwmDialogFragment implements A
@NonNull
private Drawable getOptionsToggle()
{
return Graphics.tint(getContext(), mOptionsOpened ? R.drawable.ic_expand_less
: R.drawable.ic_expand_more,
return Graphics.tint(getContext(), mOptionsButton.isChecked() ? R.drawable.ic_expand_less
: R.drawable.ic_expand_more,
android.R.attr.textColorSecondary);
}
@ -160,11 +161,10 @@ public class AdsRemovalPurchaseDialog extends BaseMwmDialogFragment implements A
void onOptionsClicked()
{
mOptionsOpened = !mOptionsOpened;
mOptionsButton.setCompoundDrawablesWithIntrinsicBounds(null, null, getOptionsToggle(), null);
View payContainer = getViewOrThrow().findViewById(R.id.pay_button_container);
UiUtils.showIf(mOptionsOpened, payContainer, R.id.monthly_button, R.id.monthly_divider,
R.id.weekly_button, R.id.weekly_divider);
UiUtils.showIf(mOptionsButton.isChecked(), payContainer, R.id.monthly_button,
R.id.monthly_divider, R.id.weekly_button, R.id.weekly_divider);
}
private void launchPurchaseFlowForPeriod(@NonNull Period period)