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

[android] Added prototype of 'price selection' state in dialog

Browse source
This commit is contained in:
Alexander Zatsepin 2018-09-14 20:26:19 +03:00 • committed by yoksnod
parent 68c99a5819
commit cb15e71b9d
9 changed files with 52 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
android/res/drawable-hdpi/img_mappy_heart.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 22 KiB

BIN
android/res/drawable-mdpi/img_mappy_heart.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 14 KiB

BIN
android/res/drawable-xhdpi/img_mappy_heart.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 32 KiB

BIN
android/res/drawable-xxhdpi/img_mappy_heart.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 54 KiB

BIN
android/res/drawable-xxxhdpi/img_mappy_heart.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 79 KiB

12
android/res/layout-land/fragment_ads_removal_purchase_dialog.xml
View file

@ -9,7 +9,19 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:minHeight="@dimen/ads_removal_dialog_min_height"
android:padding="@dimen/margin_base_plus"
android:orientation="vertical">
<TextView
android:id="@+id/title"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentTop="true"
android:layout_centerHorizontal="true"
android:gravity="center"
android:layout_gravity="center_horizontal"
android:textAppearance="@style/MwmTextAppearance.Title"
android:visibility="invisible"
tools:visibility="visible"/>
<LinearLayout
android:id="@+id/progress_layout"
android:layout_width="match_parent"

27
android/res/layout/fragment_ads_removal_purchase_dialog.xml
View file

@ -6,10 +6,33 @@
android:layout_width="match_parent"
android:fillViewport="true">
<RelativeLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:minHeight="@dimen/ads_removal_dialog_min_height"
android:padding="@dimen/margin_base_plus"
android:orientation="vertical">
<TextView
android:id="@+id/title"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentTop="true"
android:layout_centerHorizontal="true"
android:gravity="center"
android:layout_gravity="center_horizontal"
android:textAppearance="@style/MwmTextAppearance.Title"
android:visibility="invisible"
tools:visibility="visible"/>
<ImageView
android:id="@+id/image"
android:layout_centerHorizontal="true"
android:layout_below="@id/title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginTop="@dimen/margin_half"
android:src="@drawable/img_mappy_heart"
android:visibility="invisible"
tools:visibility="visible"/>
<LinearLayout
android:id="@+id/progress_layout"
android:layout_width="match_parent"

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

@ -7,6 +7,7 @@ import android.support.annotation.Nullable;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.TextView;
import com.android.billingclient.api.SkuDetails;
import com.mapswithme.maps.R;
@ -110,6 +111,7 @@ public class AdsRemovalPurchaseDialog extends BaseMwmDialogFragment
@Override
void activate(@NonNull View view)
{
UiUtils.hide(view, R.id.title, R.id.image);
UiUtils.show(view, R.id.progress_layout);
}
},
@ -119,6 +121,9 @@ public class AdsRemovalPurchaseDialog extends BaseMwmDialogFragment
void activate(@NonNull View view)
{
UiUtils.hide(view, R.id.progress_layout);
UiUtils.show(view, R.id.title, R.id.image);
TextView title = view.findViewById(R.id.title);
title.setText(R.string.remove_ads_title);
}
},
EXPLANATION

12
android/src/com/mapswithme/util/UiUtils.java
View file

@ -134,7 +134,11 @@ public final class UiUtils
public static void hide(View frame, @IdRes int viewId)
{
hide(frame.findViewById(viewId));
View view = frame.findViewById(viewId);
if (view == null)
return;
hide(view);
}
public static void hide(View frame, @IdRes int... viewIds)
@ -156,7 +160,11 @@ public final class UiUtils
public static void show(View frame, @IdRes int viewId)
{
show(frame.findViewById(viewId));
View view = frame.findViewById(viewId);
if (view == null)
return;
show(view);
}
public static void show(View frame, @IdRes int... viewIds)