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

[android] Fixed review notes

Browse source 
https://github.com/mapsme/omim/pull/11131#discussion_r298288301
https://github.com/mapsme/omim/pull/11131#discussion_r298288388
https://github.com/mapsme/omim/pull/11131#discussion_r298289173
https://github.com/mapsme/omim/pull/11131#discussion_r298290057
https://github.com/mapsme/omim/pull/11131#discussion_r298290583
https://github.com/mapsme/omim/pull/11131#discussion_r298290862
https://github.com/mapsme/omim/pull/11131#discussion_r298290966
https://github.com/mapsme/omim/pull/11131#discussion_r298292957
https://github.com/mapsme/omim/pull/11131#discussion_r298294101
https://github.com/mapsme/omim/pull/11131#discussion_r298294330
This commit is contained in:
Dmitry Donskoy 2019-06-27 22:09:04 +03:00 • committed by Aleksandr Zatsepin
parent e6d4eb2cf2
commit 0179df6752
11 changed files with 97 additions and 96 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
android/AndroidManifest.xml
View file

@ -472,8 +472,10 @@
<activity
android:name="com.mapswithme.maps.settings.DrivingOptionsActivity"
android:label="@string/driving_options_title"/>
<activity android:name="com.mapswithme.maps.bookmarks.BookmarkSubscriptionActivity"
android:configChanges="keyboardHidden|orientation|screenSize" />
<activity
android:name="com.mapswithme.maps.bookmarks.BookmarkSubscriptionActivity"
android:screenOrientation="portrait"
android:configChanges="orientation|screenLayout|screenSize|keyboardHidden"/>
<service
android:name="com.mapswithme.maps.background.WorkerService"
android:permission="android.permission.BIND_JOB_SERVICE"

2
android/res/animator/lift_on_touch.xml
View file

@ -7,7 +7,7 @@
<objectAnimator
android:duration="@android:integer/config_shortAnimTime"
android:propertyName="translationZ"
android:valueTo="12dp"
android:valueTo="@dimen/margin_half_plus"
android:valueType="floatType"/>
</set>
</item>

BIN
android/res/drawable-hdpi/ic_close_blue.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 464 B

BIN
android/res/drawable-mdpi/ic_close_blue.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 322 B

BIN
android/res/drawable-xhdpi/ic_close_blue.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 539 B

BIN
android/res/drawable-xxhdpi/ic_close_blue.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 819 B

BIN
android/res/drawable-xxxhdpi/ic_close_blue.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 1 KiB

2
android/res/drawable/sale_view_bg.xml
View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="@color/sale_view_bg"/>
<corners android:radius="6dp"/>
<corners android:radius="@dimen/margin_quarter_plus"/>
</shape>

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

@ -19,97 +19,98 @@
android:layout_height="match_parent"
android:layout_width="match_parent"
android:fillViewport="true">
<LinearLayout
android:orientation="vertical"
android:background="@drawable/bookmark_subscription_screen_bg"
android:padding="@dimen/margin_base"
<LinearLayout
android:orientation="vertical"
android:background="@drawable/bookmark_subscription_screen_bg"
android:padding="@dimen/margin_base"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<TextView
android:id="@+id/title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="@dimen/text_size_title"
android:textColor="?android:attr/textColorPrimary"
android:text="@string/native_screen_subscription_title"
android:fontFamily="@string/robotoMedium"
android:layout_marginRight="@dimen/height_item_oneline"
android:layout_marginStart="@dimen/height_item_oneline"
android:layout_marginEnd="@dimen/height_item_oneline"
android:layout_marginLeft="@dimen/height_item_oneline"
android:textAppearance="?android:attr/textAppearanceLarge"
android:gravity="center"
tools:text="Unlimited access to 5000+ guides!"
tools:ignore="UnusedAttribute"/>
<TextView
android:id="@+id/subtitle"
android:layout_marginTop="@dimen/margin_base"
tools:text="Every kind of journey. Whether alone or with friends, hiking or sunbathing"
android:text="@string/native_screen_subscription_message"
android:gravity="center"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:fontFamily="@string/robotoRegular"
android:textStyle="normal"
android:textColor="?android:attr/textColorPrimary"
android:textAppearance="?android:attr/textAppearanceMedium"
tools:ignore="UnusedAttribute"/>
<FrameLayout
android:layout_marginTop="@dimen/margin_base"
android:layout_width="match_parent"
android:gravity="center"
android:layout_height="wrap_content">
<TextView
android:id="@+id/title"
android:layout_width="wrap_content"
<include
android:layout_height="wrap_content"
android:textSize="@dimen/text_size_title"
android:textColor="@color/bookmark_subscription_subtitle"
android:text="@string/native_screen_subscription_title"
android:fontFamily="@string/robotoMedium"
android:layout_marginRight="@dimen/height_item_oneline"
android:layout_marginStart="@dimen/height_item_oneline"
android:layout_marginEnd="@dimen/height_item_oneline"
android:layout_marginLeft="@dimen/height_item_oneline"
android:textAppearance="?android:attr/textAppearanceLarge"
android:gravity="center"
tools:text="Unlimited access to 5000+ guides!"
tools:ignore="UnusedAttribute"/>
<TextView
android:id="@+id/subtitle"
android:layout_marginTop="@dimen/margin_base"
tools:text="Every kind of journey. Whether alone or with friends, hiking or sunbathing"
android:text="@string/native_screen_subscription_message"
android:gravity="center"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:fontFamily="@string/robotoRegular"
android:textStyle="normal"
android:textColor="@color/bookmark_subscription_subtitle"
android:textAppearance="?android:attr/textAppearanceMedium"
tools:ignore="UnusedAttribute"/>
<FrameLayout
android:layout_marginTop="@dimen/margin_base"
android:layout_width="match_parent"
android:gravity="center"
android:layout_height="wrap_content">
<include
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:layout_marginTop="@dimen/margin_base_plus"
layout="@layout/subscription_offer_card"/>
<include layout="@layout/subscription_offer_sale"/>
</FrameLayout>
<FrameLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/margin_double_and_half"
android:layout_marginEnd="@dimen/margin_double_and_half"
android:layout_marginLeft="@dimen/margin_double_and_half"
android:layout_marginRight="@dimen/margin_double_and_half"
android:layout_marginTop="@dimen/margin_double_and_half"
android:layout_marginBottom="@dimen/margin_base"
android:layout_gravity="center">
<Button
android:id="@+id/continue_btn"
style="@style/MwmWidget.Button.Primary"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:text="@string/continue_download"
tools:text="BUY FOR $1.99"/>
<ProgressBar
android:id="@+id/progress"
android:layout_width="@dimen/primary_button_min_height"
android:layout_height="@dimen/primary_button_min_height"
android:layout_gravity="center"
android:visibility="gone"
tools:visibility="visible"/>
</FrameLayout>
<TextView
android:id="@+id/restore_purchase_btn"
android:background="?attr/selectableItemBackground"
android:layout_marginTop="@dimen/margin_base_plus"
android:layout_marginEnd="@dimen/margin_base_plus"
android:layout_marginRight="@dimen/margin_base_plus"
layout="@layout/subscription_offer_card"/>
<include layout="@layout/subscription_offer_sale"/>
</FrameLayout>
<FrameLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/margin_double_and_half"
android:layout_marginEnd="@dimen/margin_double_and_half"
android:layout_marginLeft="@dimen/margin_double_and_half"
android:layout_marginRight="@dimen/margin_double_and_half"
android:layout_marginTop="@dimen/margin_double_and_half"
android:layout_marginBottom="@dimen/margin_base"
android:layout_gravity="center">
<Button
android:id="@+id/continue_btn"
style="@style/MwmWidget.Button.Primary"
android:layout_width="match_parent"
android:layout_height="wrap_content"
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"
tools:text="Restore purchases"
tools:ignore="UnusedAttribute"/>
</LinearLayout>
android:layout_height="match_parent"
android:text="@string/continue_download"
tools:text="BUY FOR $1.99"/>
<ProgressBar
android:id="@+id/progress"
android:layout_width="@dimen/primary_button_min_height"
android:layout_height="@dimen/primary_button_min_height"
android:layout_gravity="center"
android:visibility="gone"
tools:visibility="visible"/>
</FrameLayout>
<TextView
android:id="@+id/restore_purchase_btn"
android:background="?attr/selectableItemBackground"
android:layout_marginTop="@dimen/margin_base_plus"
android:layout_marginEnd="@dimen/margin_base_plus"
android:layout_marginRight="@dimen/margin_base_plus"
android:layout_width="match_parent"
android:layout_height="wrap_content"
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"
tools:text="Restore purchases"
tools:ignore="UnusedAttribute"/>
</LinearLayout>
</android.support.v4.widget.NestedScrollView>
</FrameLayout>

7
android/res/values/colors.xml
View file

@ -200,8 +200,9 @@
<color name="tips_and_triks_primary_text_night">#000000</color>
<color name="tips_and_triks_secondary_text">#B3FFFFFF</color>
<color name="tips_and_triks_secondary_text_night">@color/dark_gray</color>
<color name="turquoise">#d0f6ff</color>
<color name="bookmark_subscription_subtitle">#c6152b1c</color>
<color name="sale_view_bg">#a335f4</color>
<color name="turquoise">#D0F6FF</color>
<color name="bookmark_subscription_subtitle">#C6152B1C</color>
<color name="sale_view_bg">#A335F4</color>
</resources>

5
android/src/com/mapswithme/maps/bookmarks/BookmarkSubscriptionFragment.java
View file

@ -15,7 +15,6 @@ import android.widget.TextView;
import com.mapswithme.maps.R;
import com.mapswithme.maps.base.BaseMwmFragment;
import com.mapswithme.maps.discovery.DiscoveryManager;
public class BookmarkSubscriptionFragment extends BaseMwmFragment
{
@ -61,11 +60,9 @@ public class BookmarkSubscriptionFragment extends BaseMwmFragment
private static Spanned makeRestorePurchaseHtml(@NonNull Context context)
{
final String restorePurchaseSrc = context.getString(R.string.download);
final String restorePurchaseLink = "";
return Html.fromHtml(context.getString(R.string.restore_purchase_link,
restorePurchaseLink,
restorePurchaseSrc));
restorePurchaseLink));
}
private class AnnualCardClickListener implements View.OnClickListener