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

[android] Moved padding to recycler

Browse source
This commit is contained in:
Dmitry Donskoy 2019-08-13 11:02:57 +03:00 • committed by Aleksandr Zatsepin
parent 247ce60d9c
commit 39b041571d
4 changed files with 27 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
android/res/layout/catalog_promo_container.xml
View file

@ -1,7 +1,27 @@
<?xml version="1.0" encoding="utf-8"?>
<merge xmlns:android="http://schemas.android.com/apk/res/android">
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
android:background="?attr/windowBackgroundForced"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<TextView
android:id="@+id/catalog_promo_title"
android:text="@string/gallery_pp_download_guides_title"
android:textAppearance="@style/MwmTextAppearance.Discovery.Subtitle"
style="@style/MwmWidget.Discovery.Subtitle"
android:layout_marginLeft="@dimen/margin_base"
android:layout_marginStart="@dimen/margin_base"
android:layout_marginRight="@dimen/margin_base"
android:layout_marginEnd="@dimen/margin_base"
android:layout_marginTop="@dimen/margin_half_plus"
android:layout_marginBottom="@dimen/margin_half_plus"
android:textAllCaps="true"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
<android.support.v7.widget.RecyclerView
android:id="@+id/catalog_promo_recycler"
android:layout_marginBottom="@dimen/margin_half_plus"
android:layout_width="match_parent"
android:layout_height="wrap_content"/>
</merge>
</LinearLayout>

24
android/res/layout/catalog_promo_container_wrapper.xml
View file

@ -1,24 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
android:paddingBottom="@dimen/margin_half_plus"
android:background="?attr/windowBackgroundForced"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<TextView
android:id="@+id/catalog_promo_title"
android:text="@string/gallery_pp_download_guides_title"
android:textAppearance="@style/MwmTextAppearance.Discovery.Subtitle"
style="@style/MwmWidget.Discovery.Subtitle"
android:layout_marginLeft="@dimen/margin_base"
android:layout_marginStart="@dimen/margin_base"
android:layout_marginRight="@dimen/margin_base"
android:layout_marginEnd="@dimen/margin_base"
android:layout_marginTop="@dimen/margin_half_plus"
android:layout_marginBottom="@dimen/margin_half_plus"
android:textAllCaps="true"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
<include layout="@layout/catalog_promo_container"/>
</LinearLayout>

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

@ -105,7 +105,10 @@
android:layout_marginBottom="@dimen/margin_half_plus"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
<include layout="@layout/catalog_promo_container"/>
<android.support.v7.widget.RecyclerView
android:id="@+id/catalog_promo_recycler"
android:layout_width="match_parent"
android:layout_height="wrap_content"/>
</LinearLayout>
<com.mapswithme.maps.widget.PlaceholderView
android:id="@+id/placeholder"

2
android/res/layout/place_page_details.xml
View file

@ -36,7 +36,7 @@
android:layout_marginBottom="@dimen/margin_half"
tools:visibility="gone"/>
<include layout="@layout/catalog_promo_container_wrapper"/>
<include layout="@layout/catalog_promo_container"/>
<include layout="@layout/place_page_hotel_gallery"/>