map-per/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[android] Removed per month/year views - subscription screens, adjusted views' heights

Browse source
This commit is contained in:
Dmitry Donskoy 2019-07-12 19:01:27 +03:00 • committed by Aleksandr Zatsepin
parent b14f6e0e48
commit ef90a431d4
4 changed files with 27 additions and 62 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

78
android/res/layout/subscription_offer_card.xml
View file

@ -17,7 +17,9 @@
android:layout_weight="1"
android:orientation="vertical"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_height="match_parent"
android:minHeight="@dimen/subs_card_min_height"
android:minWidth="@dimen/subs_card_min_width"
app:cardBackgroundColor="?attr/bookmarkSubscriptionCardBg"
app:cardCornerRadius="@dimen/margin_half_plus_eight"
@ -74,6 +76,8 @@
android:textAppearance="?android:attr/textAppearance"
android:fontFamily="@string/robotoRegular"
android:duplicateParentState="true"
android:lines="2"
android:ellipsize="middle"
android:textStyle="normal"
android:textColor="?attr/bookmarkSubscriptionCardTextColor"
android:text="@string/annual_subscription_message"
@ -100,39 +104,18 @@
android:textAppearance="?android:attr/textAppearanceLarge"
android:gravity="center"
android:duplicateParentState="true"
android:lines="1"
android:text="3.99$"
tools:text="3.99$"
tools:ignore="UnusedAttribute"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearance"
android:fontFamily="@string/robotoRegular"
android:textStyle="normal"
android:lines="1"
android:textColor="?attr/bookmarkSubscriptionCardTextColor"
android:text="@string/per_year"
android:duplicateParentState="true"
tools:text="/ mo"
tools:ignore="UnusedAttribute"
android:layout_marginStart="@dimen/margin_quarter"
android:layout_marginLeft="@dimen/margin_quarter"/>
</LinearLayout>
</LinearLayout>
<FrameLayout
android:id="@+id/annual_price_card_edge"
android:background="?attr/bookmarkSubscriptionCardEdge"
android:duplicateParentState="true"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignBottom="@id/annual_price_card_payload"
android:layout_alignTop="@id/annual_price_card_payload"
android:layout_alignRight="@id/annual_price_card_payload"
android:layout_alignEnd="@id/annual_price_card_payload"
android:layout_alignStart="@id/annual_price_card_payload"
android:layout_alignLeft="@id/annual_price_card_payload"/>
</RelativeLayout>
<FrameLayout
android:id="@+id/annual_price_card_edge"
android:background="?attr/bookmarkSubscriptionCardEdge"
android:duplicateParentState="true"
android:layout_width="match_parent"
android:layout_height="match_parent"/>
</android.support.v7.widget.CardView>
<android.support.v7.widget.CardView
@ -144,7 +127,9 @@
android:layout_weight="1"
android:orientation="vertical"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_height="match_parent"
android:minHeight="@dimen/subs_card_min_height"
android:minWidth="@dimen/subs_card_min_width"
app:cardBackgroundColor="?attr/bookmarkSubscriptionCardBg"
app:cardCornerRadius="@dimen/margin_half_plus_eight"
android:layout_marginStart="@dimen/margin_quarter"
@ -201,6 +186,8 @@
android:textColor="?attr/bookmarkSubscriptionCardTextColor"
android:fontFamily="@string/robotoRegular"
android:textStyle="normal"
android:ellipsize="middle"
android:lines="2"
android:text="@string/montly_subscription_message"
tools:text="1 month unlimited guides"
tools:ignore="UnusedAttribute"/>
@ -225,38 +212,17 @@
android:textAppearance="?android:attr/textAppearanceLarge"
android:gravity="center"
android:duplicateParentState="true"
android:lines="1"
android:text="3.99$"
tools:text="3.99$"
tools:ignore="UnusedAttribute"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearance"
android:textColor="?attr/bookmarkSubscriptionCardTextColor"
android:fontFamily="@string/robotoRegular"
android:textStyle="normal"
android:lines="1"
android:text="@string/per_month"
tools:text="/ mo"
android:duplicateParentState="true"
tools:ignore="UnusedAttribute"
android:layout_marginStart="@dimen/margin_quarter"
android:layout_marginLeft="@dimen/margin_quarter"/>
</LinearLayout>
</LinearLayout>
<FrameLayout
android:id="@+id/monthly_price_card_edge"
android:duplicateParentState="true"
android:background="?attr/bookmarkSubscriptionCardEdge"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignBottom="@id/monthly_price_card_payload"
android:layout_alignTop="@id/monthly_price_card_payload"
android:layout_alignRight="@id/monthly_price_card_payload"
android:layout_alignEnd="@id/monthly_price_card_payload"
android:layout_alignStart="@id/monthly_price_card_payload"
android:layout_alignLeft="@id/monthly_price_card_payload"/>
</RelativeLayout>
<FrameLayout
android:id="@+id/monthly_price_card_edge"
android:duplicateParentState="true"
android:background="?attr/bookmarkSubscriptionCardEdge"
android:layout_width="match_parent"
android:layout_height="match_parent"/>
</android.support.v7.widget.CardView>
</LinearLayout>

2
android/res/values/dimens.xml
View file

@ -266,4 +266,6 @@
<!-- Promo-->
<dimen name="promo_after_booking_width">288dp</dimen>
<dimen name="subs_card_min_height">226dp</dimen>
<dimen name="subs_card_min_width">164dp</dimen>
</resources>

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

@ -16,7 +16,6 @@ import com.mapswithme.maps.R;
import com.mapswithme.maps.base.BaseMwmFragment;
import com.mapswithme.maps.bookmarks.data.BookmarkManager;
import com.mapswithme.maps.dialog.AlertDialogCallback;
import com.mapswithme.maps.widget.placepage.PlacePageView;
import com.mapswithme.util.Utils;
import com.mapswithme.util.log.Logger;
import com.mapswithme.util.log.LoggerFactory;
@ -185,9 +184,7 @@ public class BookmarkSubscriptionFragment extends BaseMwmFragment
TextView priceView = getViewOrThrow().findViewById(R.id.annual_price);
priceView.setText(price);
TextView savingView = getViewOrThrow().findViewById(R.id.sale);
String text = getString(R.string.annual_save_component,
String.valueOf(calculateYearlySavingInPercents()))
+ PlacePageView.DISCOUNT_SUFFIX;
String text = getString(R.string.annual_save_component, calculateYearlySaving());
savingView.setText(text);
}
@ -199,7 +196,7 @@ public class BookmarkSubscriptionFragment extends BaseMwmFragment
priceView.setText(price);
}
private int calculateYearlySavingInPercents()
private int calculateYearlySaving()
{
float pricePerMonth = getProductDetailsForPeriod(PurchaseUtils.Period.P1M).getPrice();
float pricePerYear = getProductDetailsForPeriod(PurchaseUtils.Period.P1Y).getPrice();

2
android/src/com/mapswithme/maps/widget/placepage/PlacePageView.java
View file

@ -138,7 +138,7 @@ public class PlacePageView extends NestedScrollView
private static final String TAG = PlacePageView.class.getSimpleName();
private static final String PREF_USE_DMS = "use_dms";
private static final String DISCOUNT_PREFIX = "-";
public static final String DISCOUNT_SUFFIX = "%";
private static final String DISCOUNT_SUFFIX = "%";
private boolean mIsDocked;
private boolean mIsFloating;