iamthefij/tt-rss-android
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

experimental: move to tablelayout for headline rows to simplify things a bit

Browse Source
This commit is contained in:
Andrew Dolgov 2014-10-25 01:27:26 +04:00
parent 5778c3beff
commit 81282a29db
4 changed files with 488 additions and 440 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

106
org.fox.ttrss/src/main/res/layout/headlines_row.xml
View File

@ -10,74 +10,73 @@
card_view:cardBackgroundColor="?headlineNormalBackground"
tools:ignore="HardcodedText" >
<LinearLayout
android:id="@+id/inner_row"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:paddingBottom="2dp"
android:paddingLeft="6dp"
android:paddingRight="6dp"
android:paddingTop="6dp" >
<LinearLayout
android:id="@+id/linearLayout6"
android:layout_width="match_parent"
<TableLayout
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:orientation="horizontal" >
android:padding="4dp"
android:baselineAligned="false"
android:shrinkColumns="0,1"
android:stretchColumns="0,1">
<TableRow
android:layout_width="fill_parent"
android:layout_height="wrap_content">
<TextView
android:id="@+id/title"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center_vertical"
android:singleLine="false"
android:text="Sample entry title"
android:textColor="?headlineTextColor"
android:textSize="18sp" />
</LinearLayout>
android:textColor="?headlineUnreadTextColor"
android:textSize="18sp"
android:paddingBottom="4dp"
android:layout_span="2" />
</TableRow>
<LinearLayout
android:id="@+id/linearLayout1"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center_vertical"
android:orientation="horizontal"
android:paddingTop="3dp" >
<TableRow
android:layout_width="fill_parent"
android:layout_height="wrap_content">
<TextView
android:id="@+id/feed_title"
android:layout_width="wrap_content"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:ellipsize="end"
android:fontFamily="sans-serif-light"
android:gravity="center_vertical"
android:singleLine="true"
android:text="Example Feed"
android:fontFamily="sans-serif-light"
android:text="Example Feed AAA AAA AAAAAA AAAA AAAAA AA A A AA AA"
android:textColor="?headlineSecondaryTextColor"
android:textSize="12sp" />
android:textSize="12sp"
android:layout_weight="0.5" />
<TextView
android:id="@+id/date"
android:layout_width="wrap_content"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="right|center_vertical"
android:text="Jan 01, 12:00"
android:fontFamily="sans-serif-light"
android:gravity="right|center_vertical"
android:singleLine="true"
android:ellipsize="none"
android:text="Jan 01, 12:00, 1970"
android:textColor="?headlineSecondaryTextColor"
android:textSize="12sp" />
</LinearLayout>
android:textSize="12sp"
android:layout_weight="0.5" />
</TableRow>
<TableRow
android:layout_width="fill_parent"
android:layout_height="wrap_content">
<FrameLayout
android:id="@+id/flavorImageHolder"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="10dp" >
android:padding="10dp"
android:layout_span="2">
<org.fox.ttrss.util.EnlargingImageView
android:id="@+id/flavor_image"
@ -89,23 +88,35 @@
android:scaleType="fitCenter"
android:cropToPadding="true"
android:padding="2dp"
android:visibility="gone" />
android:visibility="visible" />
</FrameLayout>
</TableRow>
<TableRow
android:layout_width="fill_parent"
android:layout_height="wrap_content">
<TextView
android:id="@+id/excerpt"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:paddingTop="3dp"
android:lineSpacingExtra="2sp"
android:paddingTop="3dp"
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:textSize="13sp" />
android:textSize="13sp"
android:layout_span="2" />
</TableRow>
<TableRow
android:layout_width="fill_parent"
android:layout_height="wrap_content">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical" >
android:gravity="center_vertical"
android:layout_span="2">
<CheckBox
android:id="@+id/selected"
@ -120,13 +131,13 @@
android:layout_height="match_parent"
android:layout_weight="1"
android:ellipsize="end"
android:fontFamily="sans-serif-light"
android:gravity="center_vertical"
android:singleLine="true"
android:text="by Author"
android:fontFamily="sans-serif-light"
android:textStyle="italic"
android:textColor="?headlineSecondaryTextColor"
android:textSize="12sp" />
android:textSize="12sp"
android:textStyle="italic" />
<ImageView
android:id="@+id/marked"
@ -155,6 +166,7 @@
android:paddingRight="6dp"
android:src="@drawable/ic_action_overflow" />
</LinearLayout>
</LinearLayout>
</TableRow>
</TableLayout>
</android.support.v7.widget.CardView>

106
org.fox.ttrss/src/main/res/layout/headlines_row_selected.xml
View File

@ -10,74 +10,73 @@
card_view:cardBackgroundColor="?headlineSelectedBackground"
tools:ignore="HardcodedText" >
<LinearLayout
android:id="@+id/inner_row"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:paddingBottom="2dp"
android:paddingLeft="6dp"
android:paddingRight="6dp"
android:paddingTop="6dp" >
<LinearLayout
android:id="@+id/linearLayout6"
android:layout_width="match_parent"
<TableLayout
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:orientation="horizontal" >
android:padding="4dp"
android:baselineAligned="false"
android:shrinkColumns="0,1"
android:stretchColumns="0,1">
<TableRow
android:layout_width="fill_parent"
android:layout_height="wrap_content">
<TextView
android:id="@+id/title"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center_vertical"
android:singleLine="false"
android:text="Sample entry title"
android:textColor="?attr/headlineSelectedTextColor"
android:textSize="18sp" />
</LinearLayout>
android:textColor="?headlineSelectedTextColor"
android:textSize="18sp"
android:paddingBottom="4dp"
android:layout_span="2" />
</TableRow>
<LinearLayout
android:id="@+id/linearLayout1"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center_vertical"
android:orientation="horizontal"
android:paddingTop="3dp" >
<TableRow
android:layout_width="fill_parent"
android:layout_height="wrap_content">
<TextView
android:id="@+id/feed_title"
android:layout_width="wrap_content"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:ellipsize="end"
android:fontFamily="sans-serif-light"
android:gravity="center_vertical"
android:singleLine="true"
android:fontFamily="sans-serif-light"
android:text="Example Feed"
android:text="Example Feed AAA AAA AAAAAA AAAA AAAAA AA A A AA AA"
android:textColor="?headlineSelectedSecondaryTextColor"
android:textSize="12sp" />
android:textSize="12sp"
android:layout_weight="0.5" />
<TextView
android:id="@+id/date"
android:layout_width="wrap_content"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="right|center_vertical"
android:text="Jan 01, 12:00"
android:fontFamily="sans-serif-light"
android:gravity="right|center_vertical"
android:singleLine="true"
android:ellipsize="none"
android:text="Jan 01, 12:00, 1970"
android:textColor="?headlineSelectedSecondaryTextColor"
android:textSize="12sp" />
</LinearLayout>
android:textSize="12sp"
android:layout_weight="0.5" />
</TableRow>
<TableRow
android:layout_width="fill_parent"
android:layout_height="wrap_content">
<FrameLayout
android:id="@+id/flavorImageHolder"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="10dp" >
android:padding="10dp"
android:layout_span="2">
<org.fox.ttrss.util.EnlargingImageView
android:id="@+id/flavor_image"
@ -89,23 +88,35 @@
android:scaleType="fitCenter"
android:cropToPadding="true"
android:padding="2dp"
android:visibility="gone" />
android:visibility="visible" />
</FrameLayout>
</TableRow>
<TableRow
android:layout_width="fill_parent"
android:layout_height="wrap_content">
<TextView
android:id="@+id/excerpt"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:paddingTop="3dp"
android:lineSpacingExtra="2sp"
android:paddingTop="3dp"
android:text="Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua."
android:textColor="?headlineSelectedExcerptTextColor"
android:textSize="13sp" />
android:textSize="13sp"
android:layout_span="2" />
</TableRow>
<TableRow
android:layout_width="fill_parent"
android:layout_height="wrap_content">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical" >
android:gravity="center_vertical"
android:layout_span="2">
<CheckBox
android:id="@+id/selected"
@ -120,13 +131,13 @@
android:layout_height="match_parent"
android:layout_weight="1"
android:ellipsize="end"
android:fontFamily="sans-serif-light"
android:gravity="center_vertical"
android:singleLine="true"
android:text="by Author"
android:fontFamily="sans-serif-light"
android:textStyle="italic"
android:textColor="?headlineSelectedSecondaryTextColor"
android:textSize="12sp" />
android:textSize="12sp"
android:textStyle="italic" />
<ImageView
android:id="@+id/marked"
@ -155,6 +166,7 @@
android:paddingRight="6dp"
android:src="@drawable/ic_action_overflow" />
</LinearLayout>
</LinearLayout>
</TableRow>
</TableLayout>
</android.support.v7.widget.CardView>

104
org.fox.ttrss/src/main/res/layout/headlines_row_selected_unread.xml
View File

@ -10,75 +10,74 @@
card_view:cardBackgroundColor="?headlineSelectedBackground"
tools:ignore="HardcodedText" >
<LinearLayout
android:id="@+id/inner_row"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:paddingBottom="2dp"
android:paddingLeft="6dp"
android:paddingRight="6dp"
android:paddingTop="6dp" >
<LinearLayout
android:id="@+id/linearLayout6"
android:layout_width="match_parent"
<TableLayout
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:orientation="horizontal" >
android:padding="4dp"
android:baselineAligned="false"
android:shrinkColumns="0,1"
android:stretchColumns="0,1">
<TableRow
android:layout_width="fill_parent"
android:layout_height="wrap_content">
<TextView
android:id="@+id/title"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center_vertical"
android:singleLine="false"
android:text="Sample entry title"
android:textColor="?headlineSelectedTextColor"
android:textSize="18sp"
android:textStyle="bold" />
</LinearLayout>
android:textStyle="bold"
android:paddingBottom="4dp"
android:layout_span="2" />
</TableRow>
<LinearLayout
android:id="@+id/linearLayout1"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center_vertical"
android:orientation="horizontal"
android:paddingTop="3dp" >
<TableRow
android:layout_width="fill_parent"
android:layout_height="wrap_content">
<TextView
android:id="@+id/feed_title"
android:layout_width="wrap_content"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:ellipsize="end"
android:fontFamily="sans-serif-light"
android:gravity="center_vertical"
android:singleLine="true"
android:text="Example Feed"
android:fontFamily="sans-serif-light"
android:text="Example Feed AAA AAA AAAAAA AAAA AAAAA AA A A AA AA"
android:textColor="?headlineSelectedSecondaryTextColor"
android:textSize="12sp" />
android:textSize="12sp"
android:layout_weight="0.5" />
<TextView
android:id="@+id/date"
android:layout_width="wrap_content"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="right|center_vertical"
android:fontFamily="sans-serif-light"
android:text="Jan 01, 12:00"
android:gravity="right|center_vertical"
android:singleLine="true"
android:ellipsize="none"
android:text="Jan 01, 12:00, 1970"
android:textColor="?headlineSelectedSecondaryTextColor"
android:textSize="12sp" />
</LinearLayout>
android:textSize="12sp"
android:layout_weight="0.5" />
</TableRow>
<TableRow
android:layout_width="fill_parent"
android:layout_height="wrap_content">
<FrameLayout
android:id="@+id/flavorImageHolder"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="10dp" >
android:padding="10dp"
android:layout_span="2">
<org.fox.ttrss.util.EnlargingImageView
android:id="@+id/flavor_image"
@ -90,23 +89,35 @@
android:scaleType="fitCenter"
android:cropToPadding="true"
android:padding="2dp"
android:visibility="gone" />
android:visibility="visible" />
</FrameLayout>
</TableRow>
<TableRow
android:layout_width="fill_parent"
android:layout_height="wrap_content">
<TextView
android:id="@+id/excerpt"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:paddingTop="3dp"
android:lineSpacingExtra="2sp"
android:paddingTop="3dp"
android:text="Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua."
android:textColor="?headlineSelectedExcerptTextColor"
android:textSize="13sp" />
android:textSize="13sp"
android:layout_span="2" />
</TableRow>
<TableRow
android:layout_width="fill_parent"
android:layout_height="wrap_content">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical" >
android:gravity="center_vertical"
android:layout_span="2">
<CheckBox
android:id="@+id/selected"
@ -121,13 +132,13 @@
android:layout_height="match_parent"
android:layout_weight="1"
android:ellipsize="end"
android:fontFamily="sans-serif-light"
android:gravity="center_vertical"
android:singleLine="true"
android:text="by Author"
android:fontFamily="sans-serif-light"
android:textStyle="italic"
android:textColor="?headlineSelectedSecondaryTextColor"
android:textSize="12sp" />
android:textSize="12sp"
android:textStyle="italic" />
<ImageView
android:id="@+id/marked"
@ -156,6 +167,7 @@
android:paddingRight="6dp"
android:src="@drawable/ic_action_overflow" />
</LinearLayout>
</LinearLayout>
</TableRow>
</TableLayout>
</android.support.v7.widget.CardView>

92
org.fox.ttrss/src/main/res/layout/headlines_row_unread.xml
View File

@ -10,75 +10,74 @@
card_view:cardBackgroundColor="?headlineUnreadBackground"
tools:ignore="HardcodedText" >
<LinearLayout
android:id="@+id/inner_row"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:paddingBottom="2dp"
android:paddingLeft="6dp"
android:paddingRight="6dp"
android:paddingTop="6dp" >
<LinearLayout
android:id="@+id/linearLayout6"
android:layout_width="match_parent"
<TableLayout
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:orientation="horizontal" >
android:padding="4dp"
android:baselineAligned="false"
android:shrinkColumns="0,1"
android:stretchColumns="0,1">
<TableRow
android:layout_width="fill_parent"
android:layout_height="wrap_content">
<TextView
android:id="@+id/title"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center_vertical"
android:singleLine="false"
android:text="Sample entry title"
android:textColor="?headlineUnreadTextColor"
android:textSize="18sp"
android:textStyle="bold" />
</LinearLayout>
android:textStyle="bold"
android:paddingBottom="4dp"
android:layout_span="2" />
</TableRow>
<LinearLayout
android:id="@+id/linearLayout1"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center_vertical"
android:orientation="horizontal"
android:paddingTop="3dp" >
<TableRow
android:layout_width="fill_parent"
android:layout_height="wrap_content">
<TextView
android:id="@+id/feed_title"
android:layout_width="wrap_content"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:ellipsize="end"
android:fontFamily="sans-serif-light"
android:gravity="center_vertical"
android:singleLine="true"
android:text="Example Feed"
android:text="Example Feed AAA AAA AAAAAA AAAA AAAAA AA A A AA AA"
android:textColor="?headlineSecondaryTextColor"
android:textSize="12sp" />
android:textSize="12sp"
android:layout_weight="0.5" />
<TextView
android:id="@+id/date"
android:layout_width="wrap_content"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:fontFamily="sans-serif-light"
android:gravity="right|center_vertical"
android:text="Jan 01, 12:00"
android:singleLine="true"
android:ellipsize="none"
android:text="Jan 01, 12:00, 1970"
android:textColor="?headlineSecondaryTextColor"
android:textSize="12sp" />
</LinearLayout>
android:textSize="12sp"
android:layout_weight="0.5" />
</TableRow>
<TableRow
android:layout_width="fill_parent"
android:layout_height="wrap_content">
<FrameLayout
android:id="@+id/flavorImageHolder"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="10dp" >
android:padding="10dp"
android:layout_span="2">
<org.fox.ttrss.util.EnlargingImageView
android:id="@+id/flavor_image"
@ -90,8 +89,13 @@
android:scaleType="fitCenter"
android:cropToPadding="true"
android:padding="2dp"
android:visibility="gone" />
android:visibility="visible" />
</FrameLayout>
</TableRow>
<TableRow
android:layout_width="fill_parent"
android:layout_height="wrap_content">
<TextView
android:id="@+id/excerpt"
@ -101,12 +105,19 @@
android:paddingTop="3dp"
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:textSize="13sp" />
android:textSize="13sp"
android:layout_span="2" />
</TableRow>
<TableRow
android:layout_width="fill_parent"
android:layout_height="wrap_content">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical" >
android:gravity="center_vertical"
android:layout_span="2">
<CheckBox
android:id="@+id/selected"
@ -156,6 +167,7 @@
android:paddingRight="6dp"
android:src="@drawable/ic_action_overflow" />
</LinearLayout>
</LinearLayout>
</TableRow>
</TableLayout>
</android.support.v7.widget.CardView>