headline layout fixes

This commit is contained in:
Andrew Dolgov 2015-07-10 23:09:02 +03:00
parent 91417fa3dd
commit d9e3c77419
3 changed files with 14 additions and 16 deletions

View File

@ -1395,8 +1395,6 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener,
lp.addRule(RelativeLayout.BELOW, R.id.headline_header); lp.addRule(RelativeLayout.BELOW, R.id.headline_header);
if (w < h) lp.topMargin = dpToPx(8);
} else { } else {
lp.addRule(RelativeLayout.BELOW, 0); lp.addRule(RelativeLayout.BELOW, 0);
lp.topMargin = 0; lp.topMargin = 0;

View File

@ -48,13 +48,14 @@
android:id="@+id/flavor_image" android:id="@+id/flavor_image"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:layout_gravity="center" android:layout_gravity="center"
android:adjustViewBounds="true" android:adjustViewBounds="true"
android:background="@android:color/transparent"
android:cropToPadding="true" android:cropToPadding="true"
android:scaleType="fitCenter" android:scaleType="fitCenter"
android:src="@drawable/drawer_header" android:src="@drawable/drawer_header"
android:visibility="visible" android:visibility="visible" />
android:layout_centerHorizontal="true" />
<RelativeLayout <RelativeLayout
android:id="@+id/headline_header" android:id="@+id/headline_header"

View File

@ -2,8 +2,8 @@
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/headlines_row" android:id="@+id/headlines_row"
android:layout_width="fill_parent" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="match_parent"
android:background="?headlineUnreadBackground" android:background="?headlineUnreadBackground"
tools:ignore="HardcodedText"> tools:ignore="HardcodedText">
@ -29,33 +29,34 @@
android:id="@+id/flavorImageLoadingBar" android:id="@+id/flavorImageLoadingBar"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center" /> android:layout_gravity="center"
android:visibility="visible" />
<ImageView <ImageView
android:id="@+id/flavor_video_play" android:id="@+id/flavor_video_play"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="fill_parent"
android:layout_gravity="center" android:layout_gravity="center"
android:scaleType="fitXY" android:scaleType="fitXY"
android:src="@drawable/flavor_video_play" android:src="@drawable/flavor_video_play"
android:visibility="gone" /> android:visibility="visible" />
<RelativeLayout <RelativeLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"> android:layout_height="wrap_content">
<org.fox.ttrss.util.EnlargingImageView <org.fox.ttrss.util.EnlargingImageView
android:id="@+id/flavor_image" android:id="@+id/flavor_image"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:layout_gravity="center" android:layout_gravity="center"
android:adjustViewBounds="true" android:adjustViewBounds="true"
android:background="@android:color/transparent"
android:cropToPadding="true" android:cropToPadding="true"
android:scaleType="fitCenter" android:scaleType="fitCenter"
android:src="@drawable/drawer_header" android:src="@drawable/drawer_header"
android:visibility="visible" android:visibility="visible" />
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true" />
<RelativeLayout <RelativeLayout
android:id="@+id/headline_header" android:id="@+id/headline_header"
@ -141,8 +142,6 @@
android:lineSpacingExtra="2sp" android:lineSpacingExtra="2sp"
android:maxLines="5" android:maxLines="5"
android:padding="16dp" android:padding="16dp"
android:paddingBottom="8dp"
android:paddingTop="8dp"
android:text="Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua." android:text="Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua."
android:textColor="?headlineExcerptTextColor" android:textColor="?headlineExcerptTextColor"
android:textSize="13sp" /> android:textSize="13sp" />
@ -202,7 +201,7 @@
android:clickable="true" android:clickable="true"
android:paddingLeft="4dp" android:paddingLeft="4dp"
android:paddingRight="4dp" android:paddingRight="4dp"
android:src="?ic_checkbox_marked" /> android:src="?ic_rss_box" />
<ImageView <ImageView
android:id="@+id/article_menu_button" android:id="@+id/article_menu_button"