From a7e86f29de59710c8d4949fe72c28ef15fbdd1d9 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Thu, 12 Feb 2015 14:48:57 +0300
Subject: card layout updates

---
 .../src/main/java/org/fox/ttrss/FeedsActivity.java          | 11 ++++++++---
 org.fox.ttrss/src/main/res/layout/headlines_row.xml         | 13 +++++++------
 .../src/main/res/layout/headlines_row_selected.xml          | 13 +++++++------
 .../src/main/res/layout/headlines_row_selected_unread.xml   | 13 +++++++------
 org.fox.ttrss/src/main/res/layout/headlines_row_unread.xml  | 13 +++++++------
 org.fox.ttrss/src/main/res/values/style.xml                 |  4 ++--
 6 files changed, 38 insertions(+), 29 deletions(-)
 mode change 100644 => 100755 org.fox.ttrss/src/main/res/layout/headlines_row.xml
 mode change 100644 => 100755 org.fox.ttrss/src/main/res/layout/headlines_row_selected.xml
 mode change 100644 => 100755 org.fox.ttrss/src/main/res/layout/headlines_row_selected_unread.xml
 mode change 100644 => 100755 org.fox.ttrss/src/main/res/layout/headlines_row_unread.xml

(limited to 'org.fox.ttrss/src/main')

diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedsActivity.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedsActivity.java
index 9f7583e9..56ecafdd 100755
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedsActivity.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedsActivity.java
@@ -459,11 +459,16 @@ public class FeedsActivity extends OnlineActivity implements HeadlinesEventListe
                 startActivityForResult(intent, HEADLINES_REQUEST);
             } */
 
-            View sharedList = hf.getView().findViewById(R.id.headlines_list);
+            if (!isPortrait() && !isSmallScreen()) {
+                View sharedList = hf.getView().findViewById(R.id.headlines_list);
 
-            ActivityOptionsCompat options = ActivityOptionsCompat.makeSceneTransitionAnimation(this, sharedList, "TRANSITION:HEADLINES_LIST");
+                ActivityOptionsCompat options = ActivityOptionsCompat.makeSceneTransitionAnimation(this, sharedList, "TRANSITION:HEADLINES_LIST");
 
-            ActivityCompat.startActivityForResult(this, intent, HEADLINES_REQUEST, options.toBundle());
+                ActivityCompat.startActivityForResult(this, intent, HEADLINES_REQUEST, options.toBundle());
+            } else {
+                ActivityOptionsCompat options = ActivityOptionsCompat.makeSceneTransitionAnimation(this);
+                ActivityCompat.startActivityForResult(this, intent, HEADLINES_REQUEST, options.toBundle());
+            }
 
 		} else {
 			invalidateOptionsMenu();
diff --git a/org.fox.ttrss/src/main/res/layout/headlines_row.xml b/org.fox.ttrss/src/main/res/layout/headlines_row.xml
old mode 100644
new mode 100755
index 608161b9..8edd35b3
--- a/org.fox.ttrss/src/main/res/layout/headlines_row.xml
+++ b/org.fox.ttrss/src/main/res/layout/headlines_row.xml
@@ -14,7 +14,7 @@
     <TableLayout
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
-        android:padding="4dp"
+        android:padding="8dp"
         android:baselineAligned="false"
         android:shrinkColumns="0,1"
         android:stretchColumns="0,1">
@@ -33,7 +33,7 @@
                 android:text="Sample entry title"
                 android:textColor="?headlineUnreadTextColor"
                 android:textSize="18sp"
-                android:paddingBottom="4dp"
+                android:paddingBottom="8dp"
                 android:layout_span="2" />
         </TableRow>
 
@@ -76,8 +76,8 @@
                 android:id="@+id/flavorImageHolder"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:paddingBottom="4dp"
-                android:layout_span="2">
+                android:layout_span="2"
+                android:paddingTop="8dp">
 
                 <ProgressBar
                     android:layout_width="wrap_content"
@@ -114,13 +114,14 @@
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:lineSpacingExtra="2sp"
-                android:paddingTop="3dp"
                 android:maxLines="5"
                 android:ellipsize="end"
                 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:layout_span="2" />
+                android:layout_span="2"
+                android:paddingBottom="8dp"
+                android:paddingTop="8dp" />
         </TableRow>
 
         <TableRow
diff --git a/org.fox.ttrss/src/main/res/layout/headlines_row_selected.xml b/org.fox.ttrss/src/main/res/layout/headlines_row_selected.xml
old mode 100644
new mode 100755
index 5127c4dc..c53c53aa
--- a/org.fox.ttrss/src/main/res/layout/headlines_row_selected.xml
+++ b/org.fox.ttrss/src/main/res/layout/headlines_row_selected.xml
@@ -14,7 +14,7 @@
     <TableLayout
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
-        android:padding="4dp"
+        android:padding="8dp"
         android:baselineAligned="false"
         android:shrinkColumns="0,1"
         android:stretchColumns="0,1">
@@ -33,7 +33,7 @@
                 android:text="Sample entry title"
                 android:textColor="?headlineSelectedTextColor"
                 android:textSize="18sp"
-                android:paddingBottom="4dp"
+                android:paddingBottom="8dp"
                 android:layout_span="2" />
         </TableRow>
 
@@ -76,8 +76,8 @@
                 android:id="@+id/flavorImageHolder"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:paddingBottom="4dp"
-                android:layout_span="2">
+                android:layout_span="2"
+                android:paddingTop="8dp">
 
                 <ProgressBar
                     android:layout_width="wrap_content"
@@ -115,13 +115,14 @@
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:lineSpacingExtra="2sp"
-                android:paddingTop="3dp"
+                android:paddingTop="8dp"
                 android:maxLines="5"
                 android:ellipsize="end"
                 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:layout_span="2" />
+                android:layout_span="2"
+                android:paddingBottom="8dp" />
         </TableRow>
 
         <TableRow
diff --git a/org.fox.ttrss/src/main/res/layout/headlines_row_selected_unread.xml b/org.fox.ttrss/src/main/res/layout/headlines_row_selected_unread.xml
old mode 100644
new mode 100755
index 9c3802ed..466023ef
--- a/org.fox.ttrss/src/main/res/layout/headlines_row_selected_unread.xml
+++ b/org.fox.ttrss/src/main/res/layout/headlines_row_selected_unread.xml
@@ -14,7 +14,7 @@
     <TableLayout
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
-        android:padding="4dp"
+        android:padding="8dp"
         android:baselineAligned="false"
         android:shrinkColumns="0,1"
         android:stretchColumns="0,1">
@@ -33,8 +33,8 @@
                 android:text="Sample entry title"
                 android:textColor="?headlineSelectedTextColor"
                 android:textSize="18sp"
-                android:textStyle="bold"
-                android:paddingBottom="4dp"
+                android:fontFamily="sans-serif-medium"
+                android:paddingBottom="8dp"
                 android:layout_span="2" />
         </TableRow>
 
@@ -77,7 +77,7 @@
                 android:id="@+id/flavorImageHolder"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:paddingBottom="4dp"
+                android:paddingTop="8dp"
                 android:layout_span="2">
 
                 <ProgressBar
@@ -116,13 +116,14 @@
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:lineSpacingExtra="2sp"
-                android:paddingTop="3dp"
+                android:paddingTop="8dp"
                 android:maxLines="5"
                 android:ellipsize="end"
                 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:layout_span="2" />
+                android:layout_span="2"
+                android:paddingBottom="8dp" />
         </TableRow>
 
         <TableRow
diff --git a/org.fox.ttrss/src/main/res/layout/headlines_row_unread.xml b/org.fox.ttrss/src/main/res/layout/headlines_row_unread.xml
old mode 100644
new mode 100755
index 40cfc827..80eec604
--- a/org.fox.ttrss/src/main/res/layout/headlines_row_unread.xml
+++ b/org.fox.ttrss/src/main/res/layout/headlines_row_unread.xml
@@ -14,7 +14,7 @@
     <TableLayout
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
-        android:padding="4dp"
+        android:padding="8dp"
         android:baselineAligned="false"
         android:shrinkColumns="0,1"
         android:stretchColumns="0,1">
@@ -33,8 +33,8 @@
                 android:text="Sample entry title"
                 android:textColor="?headlineUnreadTextColor"
                 android:textSize="18sp"
-                android:textStyle="bold"
-                android:paddingBottom="4dp"
+                android:fontFamily="sans-serif-medium"
+                android:paddingBottom="8dp"
                 android:layout_span="2" />
         </TableRow>
 
@@ -77,7 +77,7 @@
                 android:id="@+id/flavorImageHolder"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:paddingBottom="4dp"
+                android:paddingTop="8dp"
                 android:layout_span="2">
 
                 <ProgressBar
@@ -115,13 +115,14 @@
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:lineSpacingExtra="2sp"
-                android:paddingTop="3dp"
                 android:maxLines="5"
                 android:ellipsize="end"
                 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:layout_span="2" />
+                android:layout_span="2"
+                android:paddingBottom="8dp"
+                android:paddingTop="8dp" />
         </TableRow>
 
         <TableRow
diff --git a/org.fox.ttrss/src/main/res/values/style.xml b/org.fox.ttrss/src/main/res/values/style.xml
index 12b68c97..e158a99d 100755
--- a/org.fox.ttrss/src/main/res/values/style.xml
+++ b/org.fox.ttrss/src/main/res/values/style.xml
@@ -7,14 +7,14 @@
         <item name="unreadCounterColor">#909090</item>
         <item name="headlinesBackground">#f0f0f0</item>
         <item name="articleBackground">@android:color/white</item>
-        <item name="headlineSelectedBackground">#88b0f0</item>
+        <item name="headlineSelectedBackground">?feedsSelectedBackground</item>
         <item name="headlineUnreadBackground">@android:color/white</item>
         <item name="headlineNormalBackground">#f5f5f5</item>
         <item name="feedsSelectedBackground">#cccccc</item>
         <item name="feedlistTextColor">@android:color/primary_text_light</item>
         <item name="feedlistSelectedTextColor">?feedlistTextColor</item>
         <item name="headlineUnreadTextColor">@android:color/primary_text_light</item>
-        <item name="headlineSelectedTextColor">#ffffff</item>
+        <item name="headlineSelectedTextColor">@android:color/primary_text_light</item>
         <item name="headlineExcerptTextColor">@android:color/secondary_text_light</item>
         <item name="headlineSecondaryTextColor">#909090</item>
         <item name="headlineSelectedSecondaryTextColor">?headlineSelectedExcerptTextColor</item>
-- 
cgit v1.2.3