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 --- .../main/java/org/fox/ttrss/CommonActivity.java | 8 ++ .../main/java/org/fox/ttrss/HeadlinesFragment.java | 115 +++++++++++++-------- .../ttrss/offline/OfflineHeadlinesFragment.java | 9 +- .../src/main/res/layout/headlines_row_compact.xml | 10 +- .../res/layout/headlines_row_selected_compact.xml | 14 +-- .../res/layout/headlines_row_unread_compact.xml | 14 +-- org.fox.ttrss/src/main/res/values/arrays.xml | 2 + org.fox.ttrss/src/main/res/values/strings.xml | 1 + 8 files changed, 112 insertions(+), 61 deletions(-) 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 326b88f6..f78ae6c1 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 @@ -7,6 +7,7 @@ import android.database.sqlite.SQLiteDatabase; import android.os.Bundle; import android.preference.PreferenceManager; import android.support.v7.app.ActionBarActivity; +import android.util.DisplayMetrics; import android.util.Log; import android.view.Display; import android.widget.Toast; @@ -170,5 +171,12 @@ 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 2b031d3c..334e57f8 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 @@ -38,6 +38,7 @@ import android.widget.AdapterView.AdapterContextMenuInfo; import android.widget.AdapterView.OnItemClickListener; import android.widget.ArrayAdapter; import android.widget.CheckBox; +import android.widget.FrameLayout; import android.widget.ImageView; import android.widget.ListView; import android.widget.ProgressBar; @@ -341,7 +342,9 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener, m_compactLayoutMode = savedInstanceState.getBoolean("compactLayoutMode"); } - if ("HL_COMPACT".equals(m_prefs.getString("headline_mode", "HL_DEFAULT"))) + String headlineMode = m_prefs.getString("headline_mode", "HL_DEFAULT"); + + if ("HL_COMPACT".equals(headlineMode) || "HL_COMPACT_NOIMAGES".equals(headlineMode)) m_compactLayoutMode = true; DisplayMetrics metrics = new DisplayMetrics(); @@ -680,11 +683,15 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener, private ColorGenerator m_colorGenerator = ColorGenerator.DEFAULT; private TextDrawable.IBuilder m_drawableBuilder = TextDrawable.builder().round(); private final DisplayImageOptions displayImageOptions; + boolean showFlavorImage; public ArticleListAdapter(Context context, int textViewResourceId, ArrayList
items) { super(context, textViewResourceId, items); this.items = items; + String headlineMode = m_prefs.getString("headline_mode", "HL_DEFAULT"); + showFlavorImage = "HL_DEFAULT".equals(headlineMode) || "HL_COMPACT".equals(headlineMode); + Theme theme = context.getTheme(); TypedValue tv = new TypedValue(); theme.resolveAttribute(R.attr.headlineTitleHighScoreUnreadTextColor, tv, true); @@ -728,11 +735,13 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener, String tmp = item.title.length() > 0 ? item.title.substring(0, 1) : "?"; if (item.selected) { - holder.textImage.setImageDrawable(m_drawableBuilder.build(" ", 0xff616161)); + if (item.flavorImage == null) + holder.textImage.setImageDrawable(m_drawableBuilder.build(" ", 0xff616161)); holder.textChecked.setVisibility(View.VISIBLE); } else { - holder.textImage.setImageDrawable(m_drawableBuilder.build(tmp, m_colorGenerator.getColor(item.title))); + if (item.flavorImage == null) + holder.textImage.setImageDrawable(m_drawableBuilder.build(tmp, m_colorGenerator.getColor(item.title))); holder.textChecked.setVisibility(View.GONE); } @@ -800,7 +809,15 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener, holder = (HeadlineViewHolder) v.getTag(); } - // block footer clicks to make button/selection clicking easier + String articleContent = article.content != null ? article.content : ""; + + String articleContentReduced = articleContent.length() > CommonActivity.EXCERPT_MAX_QUERY_LENGTH ? + articleContent.substring(0, CommonActivity.EXCERPT_MAX_QUERY_LENGTH) : articleContent; + + if (article.articleDoc == null) + article.articleDoc = Jsoup.parse(articleContentReduced); + + // block footer clicks to make button/selection clicking easier if (holder.headlineFooter != null) { holder.headlineFooter.setOnClickListener(new OnClickListener() { @Override @@ -810,23 +827,64 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener, }); } + if (showFlavorImage && article.flavorImage == null) { + + Elements imgs = article.articleDoc.select("img"); + + for (Element tmp : imgs) { + try { + if (Integer.valueOf(tmp.attr("width")) > FLAVOR_IMG_MIN_WIDTH && Integer.valueOf(tmp.attr("width")) > FLAVOR_IMG_MIN_HEIGHT) { + article.flavorImage = tmp; + break; + } + } catch (NumberFormatException e) { + // + } + } + + if (article.flavorImage == null) + article.flavorImage = imgs.first(); + } + if (holder.textImage != null) { updateTextCheckedState(holder, article); - holder.textImage.setOnClickListener(new OnClickListener() { - @Override - public void onClick(View view) { - Log.d(TAG, "textImage : onclicked"); + if (article.flavorImage != null) { + String imgSrc = article.flavorImage.attr("src"); + final String imgSrcFirst = imgSrc; - article.selected = !article.selected; + // retarded schema-less urls + if (imgSrc.indexOf("//") == 0) + imgSrc = "http:" + imgSrc; - updateTextCheckedState(holder, article); + if (!imgSrc.equals(holder.textImage.getTag())) { + ImageAware imageAware = new ImageViewAware(holder.textImage, false); + m_imageLoader.displayImage(imgSrc, imageAware, displayImageOptions); + holder.textImage.setTag(imgSrc); + } - m_listener.onArticleListSelectionChange(getSelectedArticles()); + holder.textImage.getLayoutParams().width = m_activity.dpToPx(64); + holder.textImage.getLayoutParams().height = m_activity.dpToPx(64); - Log.d(TAG, "num selected: " + getSelectedArticles().size()); - } - }); + } else { + 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) { + Log.d(TAG, "textImage : onclicked"); + + article.selected = !article.selected; + + updateTextCheckedState(holder, article); + + m_listener.onArticleListSelectionChange(getSelectedArticles()); + + Log.d(TAG, "num selected: " + getSelectedArticles().size()); + } + }); } @@ -898,14 +956,6 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener, }); } - String articleContent = article.content != null ? article.content : ""; - - String articleContentReduced = articleContent.length() > CommonActivity.EXCERPT_MAX_QUERY_LENGTH ? - articleContent.substring(0, CommonActivity.EXCERPT_MAX_QUERY_LENGTH) : articleContent; - - if (article.articleDoc == null) - article.articleDoc = Jsoup.parse(articleContentReduced); - if (holder.excerptView != null) { if (!m_prefs.getBoolean("headlines_show_content", true)) { holder.excerptView.setVisibility(View.GONE); @@ -930,7 +980,6 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener, } if (!m_compactLayoutMode) { - boolean showFlavorImage = "HL_DEFAULT".equals(m_prefs.getString("headline_mode", "HL_DEFAULT")); if (showFlavorImage && holder.flavorImageView != null) { holder.flavorImageArrow.setVisibility(View.GONE); @@ -939,25 +988,6 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener, holder.flavorImageHolder.setVisibility(View.GONE); } else if (article.articleDoc != null) { - if (article.flavorImage == null) { - - Elements imgs = article.articleDoc.select("img"); - - for (Element tmp : imgs) { - try { - if (Integer.valueOf(tmp.attr("width")) > FLAVOR_IMG_MIN_WIDTH && Integer.valueOf(tmp.attr("width")) > FLAVOR_IMG_MIN_HEIGHT) { - article.flavorImage = tmp; - break; - } - } catch (NumberFormatException e) { - // - } - } - - if (article.flavorImage == null) - article.flavorImage = imgs.first(); - } - if (article.flavorImage != null) { String imgSrc = article.flavorImage.attr("src"); final String imgSrcFirst = imgSrc; @@ -1057,7 +1087,6 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener, String articleAuthor = article.author != null ? article.author : ""; - if (holder.authorView != null) { holder.authorView.setTextSize(TypedValue.COMPLEX_UNIT_SP, headlineSmallFontSize); 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 93e8e8a3..f8868d70 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 @@ -292,8 +292,10 @@ public class OfflineHeadlinesFragment extends Fragment implements OnItemClickLis m_activity.getDatabase().execSQL("UPDATE articles SET selected = 0 "); } - if ("HL_COMPACT".equals(m_prefs.getString("headline_mode", "HL_DEFAULT"))) - m_compactLayoutMode = true; + String headlineMode = m_prefs.getString("headline_mode", "HL_DEFAULT"); + + if ("HL_COMPACT".equals(headlineMode) || "HL_COMPACT_NOIMAGES".equals(headlineMode)) + m_compactLayoutMode = true; View view = inflater.inflate(R.layout.fragment_headlines, container, false); @@ -601,6 +603,9 @@ 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 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" /> diff --git a/org.fox.ttrss/src/main/res/values/arrays.xml b/org.fox.ttrss/src/main/res/values/arrays.xml index 1ac11814..aa14bd62 100644 --- a/org.fox.ttrss/src/main/res/values/arrays.xml +++ b/org.fox.ttrss/src/main/res/values/arrays.xml @@ -15,11 +15,13 @@ @string/headline_display_mode_default @string/headline_display_mode_no_images @string/headline_display_mode_compact + @string/headline_display_mode_compact_noimages HL_DEFAULT HL_NOIMAGES HL_COMPACT + HL_COMPACT_NOIMAGES 150 diff --git a/org.fox.ttrss/src/main/res/values/strings.xml b/org.fox.ttrss/src/main/res/values/strings.xml index 1d88f150..746451f8 100755 --- a/org.fox.ttrss/src/main/res/values/strings.xml +++ b/org.fox.ttrss/src/main/res/values/strings.xml @@ -215,6 +215,7 @@ Default No images Compact + Compact (no images) %1$s (%2$d) Version %1$s -- cgit v1.2.3