From 49f820110d8c6a4520fc5e5e8b5c83e1b9eac0a1 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Wed, 8 Jul 2015 15:09:29 +0300 Subject: add not completely functional headline thumbnails for compact mode --- .../src/main/res/layout/headlines_row_compact.xml | 10 ++++++---- .../src/main/res/layout/headlines_row_selected_compact.xml | 14 ++++++++------ .../src/main/res/layout/headlines_row_unread_compact.xml | 14 ++++++++------ 3 files changed, 22 insertions(+), 16 deletions(-) (limited to 'org.fox.ttrss/src/main/res/layout') diff --git a/org.fox.ttrss/src/main/res/layout/headlines_row_compact.xml b/org.fox.ttrss/src/main/res/layout/headlines_row_compact.xml index 74184cd1..09106ef6 100755 --- a/org.fox.ttrss/src/main/res/layout/headlines_row_compact.xml +++ b/org.fox.ttrss/src/main/res/layout/headlines_row_compact.xml @@ -10,22 +10,24 @@ tools:ignore="HardcodedText" > + android:id="@+id/text_checked" + android:layout_gravity="center" /> diff --git a/org.fox.ttrss/src/main/res/layout/headlines_row_selected_compact.xml b/org.fox.ttrss/src/main/res/layout/headlines_row_selected_compact.xml index 5e6f3011..f963aa86 100755 --- a/org.fox.ttrss/src/main/res/layout/headlines_row_selected_compact.xml +++ b/org.fox.ttrss/src/main/res/layout/headlines_row_selected_compact.xml @@ -11,22 +11,24 @@ tools:ignore="HardcodedText" > + android:layout_width="64dp" + android:layout_height="64dp"> + android:id="@+id/text_checked" + android:layout_gravity="center" /> diff --git a/org.fox.ttrss/src/main/res/layout/headlines_row_unread_compact.xml b/org.fox.ttrss/src/main/res/layout/headlines_row_unread_compact.xml index 58317014..b9db0c48 100755 --- a/org.fox.ttrss/src/main/res/layout/headlines_row_unread_compact.xml +++ b/org.fox.ttrss/src/main/res/layout/headlines_row_unread_compact.xml @@ -11,22 +11,24 @@ tools:ignore="HardcodedText" > + android:layout_width="64dp" + android:layout_height="64dp"> + android:id="@+id/text_checked" + android:layout_gravity="center" /> -- cgit v1.2.3-54-g00ecf From 618fe0aa1d4ffddc22e2c9cbf018f6dc69273e63 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Wed, 8 Jul 2015 15:28:24 +0300 Subject: some more work on thumbnails --- org.fox.ttrss/src/main/java/org/fox/ttrss/CommonActivity.java | 6 ------ org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java | 7 ------- .../main/java/org/fox/ttrss/offline/OfflineHeadlinesFragment.java | 3 --- org.fox.ttrss/src/main/res/layout/headlines_row_compact.xml | 4 ++-- .../src/main/res/layout/headlines_row_selected_compact.xml | 8 ++++---- .../src/main/res/layout/headlines_row_unread_compact.xml | 8 ++++---- 6 files changed, 10 insertions(+), 26 deletions(-) (limited to 'org.fox.ttrss/src/main/res/layout') diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/CommonActivity.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/CommonActivity.java index f78ae6c1..c2fe90a1 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/CommonActivity.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/CommonActivity.java @@ -172,11 +172,5 @@ public class CommonActivity extends ActionBarActivity implements SharedPreferenc m_needRestart = Arrays.asList(filter).indexOf(key) != -1; } - public int dpToPx(int dp) { - DisplayMetrics displayMetrics = getResources().getDisplayMetrics(); - int px = Math.round(dp * (displayMetrics.xdpi / DisplayMetrics.DENSITY_DEFAULT)); - return px; - } - } diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java index 334e57f8..04cc564a 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java @@ -862,13 +862,6 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener, m_imageLoader.displayImage(imgSrc, imageAware, displayImageOptions); holder.textImage.setTag(imgSrc); } - - holder.textImage.getLayoutParams().width = m_activity.dpToPx(64); - holder.textImage.getLayoutParams().height = m_activity.dpToPx(64); - - } else { - holder.textImage.getLayoutParams().width = m_activity.dpToPx(48); - holder.textImage.getLayoutParams().height = m_activity.dpToPx(48); } holder.textImage.setOnClickListener(new OnClickListener() { diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineHeadlinesFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineHeadlinesFragment.java index f8868d70..9e12cc94 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineHeadlinesFragment.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineHeadlinesFragment.java @@ -603,9 +603,6 @@ public class OfflineHeadlinesFragment extends Fragment implements OnItemClickLis if (holder.textImage != null) { updateTextCheckedState(holder, article); - holder.textImage.getLayoutParams().width = m_activity.dpToPx(48); - holder.textImage.getLayoutParams().height = m_activity.dpToPx(48); - holder.textImage.setOnClickListener(new OnClickListener() { @Override public void onClick(View view) { diff --git a/org.fox.ttrss/src/main/res/layout/headlines_row_compact.xml b/org.fox.ttrss/src/main/res/layout/headlines_row_compact.xml index 09106ef6..8b645529 100755 --- a/org.fox.ttrss/src/main/res/layout/headlines_row_compact.xml +++ b/org.fox.ttrss/src/main/res/layout/headlines_row_compact.xml @@ -17,8 +17,8 @@ diff --git a/org.fox.ttrss/src/main/res/layout/headlines_row_selected_compact.xml b/org.fox.ttrss/src/main/res/layout/headlines_row_selected_compact.xml index f963aa86..306f87b4 100755 --- a/org.fox.ttrss/src/main/res/layout/headlines_row_selected_compact.xml +++ b/org.fox.ttrss/src/main/res/layout/headlines_row_selected_compact.xml @@ -13,13 +13,13 @@ + android:layout_width="wrap_content" + android:layout_height="wrap_content"> diff --git a/org.fox.ttrss/src/main/res/layout/headlines_row_unread_compact.xml b/org.fox.ttrss/src/main/res/layout/headlines_row_unread_compact.xml index b9db0c48..e5539b8d 100755 --- a/org.fox.ttrss/src/main/res/layout/headlines_row_unread_compact.xml +++ b/org.fox.ttrss/src/main/res/layout/headlines_row_unread_compact.xml @@ -13,13 +13,13 @@ + android:layout_width="wrap_content" + android:layout_height="wrap_content"> -- cgit v1.2.3-54-g00ecf