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

[android] Fixed review notes

Browse source 
https://github.com/mapsme/omim/pull/11651#discussion_r322668391
https://github.com/mapsme/omim/pull/11651#discussion_r322668631
https://github.com/mapsme/omim/pull/11651#discussion_r322668819
https://github.com/mapsme/omim/pull/11651#discussion_r322670777
https://github.com/mapsme/omim/pull/11651#discussion_r322671616
This commit is contained in:
Dmitry Donskoy 2019-09-10 15:14:44 +03:00 • committed by Aleksandr Zatsepin
parent c04a5d9e31
commit ad6e632d65
2 changed files with 49 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -137,50 +137,65 @@
android:layout_marginTop="@dimen/margin_base_plus_quarter"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearance"
android:textSize="@dimen/text_size_terms_of_use"
android:textAppearance="?android:textAppearance"
android:textSize="@dimen/text_size_icon_title"
android:fontFamily="@string/robotoRegular"
android:textStyle="normal"
android:justificationMode="inter_word"
android:text="@string/subscription_terms_android"
android:textColor="?attr/secondary"
android:letterSpacing="-0.01"
android:lineSpacingExtra="@dimen/terms_of_use_line_spacing"
tools:targetApi="lollipop"/>
<RelativeLayout
tools:targetApi="o"/>
<LinearLayout
android:layout_marginTop="@dimen/margin_base"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<TextView
android:id="@+id/term_of_use_link"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="@dimen/text_size_body_5"
android:fontFamily="@string/robotoMedium"
android:textStyle="normal"
android:textColor="?attr/secondary"
android:letterSpacing="-0.01"
tools:text="Terms of Use"
tools:targetApi="lollipop"
android:text="@string/terms_of_use"
android:background="?attr/selectableItemBackground"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"/>
<TextView
android:id="@+id/privacy_policy_link"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="@dimen/text_size_body_5"
android:fontFamily="@string/robotoMedium"
android:textStyle="normal"
android:textColor="?attr/secondary"
android:letterSpacing="-0.01"
tools:targetApi="lollipop"
android:text="@string/privacy_policy"
android:background="?attr/selectableItemBackground"
android:layout_alignParentRight="true"
android:layout_alignParentEnd="true"/>
</RelativeLayout>
<LinearLayout
android:layout_weight="1"
android:layout_width="0dp"
android:layout_height="wrap_content">
<TextView
android:id="@+id/term_of_use_link"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="@dimen/text_size_body_5"
android:fontFamily="@string/robotoMedium"
android:singleLine="true"
android:ellipsize="end"
android:textStyle="normal"
android:textColor="?attr/secondary"
android:letterSpacing="-0.01"
tools:targetApi="lollipop"
tools:text="Terms of UseTerms of UseTerms of UseTerms of UseTerms of UseTerms of UseTerms of UseTerms of UseTerms of UseTerms of UseTerms of Use"
android:text="@string/terms_of_use"
android:background="?selectableItemBackground"/>
</LinearLayout>
<LinearLayout
android:layout_weight="1"
android:gravity="end"
android:layout_width="0dp"
android:layout_height="wrap_content">
<TextView
android:id="@+id/privacy_policy_link"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="@dimen/text_size_body_5"
android:fontFamily="@string/robotoMedium"
android:singleLine="true"
android:ellipsize="end"
android:textStyle="normal"
android:textColor="?attr/secondary"
android:layout_gravity="end"
android:gravity="end"
android:letterSpacing="-0.01"
tools:targetApi="lollipop"
tools:text="lollipoplollipoplollipoplollipoplollipoplollipoplollipoplollipoplollipoplollipoplollipoplollipoplollipoplollipoplollipoplollipoplollipop"
android:text="@string/privacy_policy"
android:background="?selectableItemBackground"/>
</LinearLayout>
</LinearLayout>
</LinearLayout>
</android.support.v4.widget.NestedScrollView>
</FrameLayout>

1
android/res/values/font_sizes.xml
View file

@ -48,6 +48,5 @@
<dimen name="text_size_nav_dimension">20sp</dimen>
<dimen name="text_size_banner">8sp</dimen>
<dimen name="text_size_terms_of_use">9sp</dimen>
<dimen name="terms_of_use_line_spacing">2sp</dimen>
</resources>