From ad2c6eb9993134ac74f7a41da9de7708cf13e267 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Thu, 12 Feb 2015 15:17:11 +0300 Subject: more headline display margin adjustments remove condensed font option --- org.fox.ttrss/src/main/java/org/fox/ttrss/ArticleFragment.java | 8 ++++---- .../src/main/java/org/fox/ttrss/HeadlinesFragment.java | 10 +++++----- .../src/main/java/org/fox/ttrss/PreferencesActivity.java | 4 ++-- .../java/org/fox/ttrss/offline/OfflineArticleFragment.java | 10 +++++----- .../java/org/fox/ttrss/offline/OfflineHeadlinesFragment.java | 10 +++++----- org.fox.ttrss/src/main/res/layout/article_fragment.xml | 6 +++--- org.fox.ttrss/src/main/res/layout/headlines_row.xml | 2 +- org.fox.ttrss/src/main/res/layout/headlines_row_compact.xml | 7 ++++--- org.fox.ttrss/src/main/res/layout/headlines_row_loadmore.xml | 2 +- .../src/main/res/layout/headlines_row_selected_compact.xml | 7 ++++--- .../main/res/layout/headlines_row_selected_unread_compact.xml | 7 ++++--- org.fox.ttrss/src/main/res/layout/headlines_row_unread.xml | 4 ++-- .../src/main/res/layout/headlines_row_unread_compact.xml | 7 ++++--- org.fox.ttrss/src/main/res/xml/preferences.xml | 4 ++-- 14 files changed, 46 insertions(+), 42 deletions(-) mode change 100644 => 100755 org.fox.ttrss/src/main/java/org/fox/ttrss/PreferencesActivity.java mode change 100644 => 100755 org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineArticleFragment.java mode change 100644 => 100755 org.fox.ttrss/src/main/res/layout/headlines_row_compact.xml mode change 100644 => 100755 org.fox.ttrss/src/main/res/layout/headlines_row_loadmore.xml mode change 100644 => 100755 org.fox.ttrss/src/main/res/layout/headlines_row_selected_compact.xml mode change 100644 => 100755 org.fox.ttrss/src/main/res/layout/headlines_row_selected_unread_compact.xml mode change 100644 => 100755 org.fox.ttrss/src/main/res/layout/headlines_row_unread_compact.xml (limited to 'org.fox.ttrss/src') diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticleFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticleFragment.java index d531d483..3c740c91 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticleFragment.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticleFragment.java @@ -4,7 +4,6 @@ import android.annotation.SuppressLint; import android.app.Activity; import android.content.Intent; import android.content.SharedPreferences; -import android.graphics.Typeface; import android.net.Uri; import android.os.Build; import android.os.Bundle; @@ -31,7 +30,6 @@ import com.shamanland.fab.ShowHideOnScroll; import org.fox.ttrss.types.Article; import org.fox.ttrss.types.Attachment; -import org.fox.ttrss.util.TypefaceCache; import java.net.MalformedURLException; import java.net.URI; @@ -201,7 +199,7 @@ public class ArticleFragment extends Fragment { if (title != null) { - if (m_prefs.getBoolean("enable_condensed_fonts", false)) { + /* if (m_prefs.getBoolean("enable_condensed_fonts", false)) { Typeface tf = TypefaceCache.get(m_activity, "sans-serif-condensed", Typeface.NORMAL); if (tf != null && !tf.equals(title.getTypeface())) { @@ -211,7 +209,9 @@ public class ArticleFragment extends Fragment { title.setTextSize(TypedValue.COMPLEX_UNIT_SP, Math.min(21, articleFontSize + 5)); } else { title.setTextSize(TypedValue.COMPLEX_UNIT_SP, Math.min(21, articleFontSize + 3)); - } + } */ + + title.setTextSize(TypedValue.COMPLEX_UNIT_SP, Math.min(21, articleFontSize + 3)); String titleStr; 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 2b0e6db6..6e19b1d8 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 @@ -9,7 +9,6 @@ import android.content.SharedPreferences; import android.content.res.Resources.Theme; import android.graphics.Bitmap; import android.graphics.Paint; -import android.graphics.Typeface; import android.net.Uri; import android.os.Build; import android.os.Bundle; @@ -61,7 +60,6 @@ import org.fox.ttrss.types.Article; import org.fox.ttrss.types.ArticleList; import org.fox.ttrss.types.Feed; import org.fox.ttrss.util.HeadlinesRequest; -import org.fox.ttrss.util.TypefaceCache; import org.jsoup.Jsoup; import org.jsoup.nodes.Document; import org.jsoup.nodes.Element; @@ -794,7 +792,7 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener, if (holder.titleView != null) { holder.titleView.setText(Html.fromHtml(article.title)); - if (m_prefs.getBoolean("enable_condensed_fonts", false)) { + /* if (m_prefs.getBoolean("enable_condensed_fonts", false)) { Typeface tf = TypefaceCache.get(m_activity, "sans-serif-condensed", article.unread ? Typeface.BOLD : Typeface.NORMAL); if (tf != null && !tf.equals(holder.titleView.getTypeface())) { @@ -804,8 +802,10 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener, holder.titleView.setTextSize(TypedValue.COMPLEX_UNIT_SP, Math.min(21, headlineFontSize + 5)); } else { holder.titleView.setTextSize(TypedValue.COMPLEX_UNIT_SP, Math.min(21, headlineFontSize + 3)); - } - + } */ + + holder.titleView.setTextSize(TypedValue.COMPLEX_UNIT_SP, Math.min(21, headlineFontSize + 3)); + adjustTitleTextView(article.score, holder.titleView, position); } diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/PreferencesActivity.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/PreferencesActivity.java old mode 100644 new mode 100755 index 6b99b29b..deab88d8 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/PreferencesActivity.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/PreferencesActivity.java @@ -19,9 +19,9 @@ public class PreferencesActivity extends PreferenceActivity { addPreferencesFromResource(R.xml.preferences); - if (android.os.Build.VERSION.SDK_INT < android.os.Build.VERSION_CODES.JELLY_BEAN) { + /* if (android.os.Build.VERSION.SDK_INT < android.os.Build.VERSION_CODES.JELLY_BEAN) { findPreference("enable_condensed_fonts").setEnabled(false); - } + } */ String version = "?"; int versionCode = -1; diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineArticleFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineArticleFragment.java old mode 100644 new mode 100755 index 2fb2dc78..bf5af739 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineArticleFragment.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineArticleFragment.java @@ -5,7 +5,6 @@ import android.app.Activity; import android.content.Intent; import android.content.SharedPreferences; import android.database.Cursor; -import android.graphics.Typeface; import android.net.Uri; import android.os.Bundle; import android.preference.PreferenceManager; @@ -29,7 +28,6 @@ import com.shamanland.fab.ShowHideOnScroll; import org.fox.ttrss.R; import org.fox.ttrss.util.ImageCacheService; -import org.fox.ttrss.util.TypefaceCache; import org.jsoup.Jsoup; import org.jsoup.nodes.Document; import org.jsoup.nodes.Element; @@ -166,7 +164,7 @@ public class OfflineArticleFragment extends Fragment { if (title != null) { - if (m_prefs.getBoolean("enable_condensed_fonts", false)) { + /* if (m_prefs.getBoolean("enable_condensed_fonts", false)) { Typeface tf = TypefaceCache.get(m_activity, "sans-serif-condensed", Typeface.NORMAL); if (tf != null && !tf.equals(title.getTypeface())) { @@ -176,8 +174,10 @@ public class OfflineArticleFragment extends Fragment { title.setTextSize(TypedValue.COMPLEX_UNIT_SP, Math.min(21, articleFontSize + 5)); } else { title.setTextSize(TypedValue.COMPLEX_UNIT_SP, Math.min(21, articleFontSize + 3)); - } - + } */ + + title.setTextSize(TypedValue.COMPLEX_UNIT_SP, Math.min(21, articleFontSize + 3)); + String titleStr; if (m_cursor.getString(m_cursor.getColumnIndex("title")).length() > 200) 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 9257c29d..b47cf576 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 @@ -7,7 +7,6 @@ import android.content.res.Resources.Theme; import android.database.Cursor; import android.database.sqlite.SQLiteStatement; import android.graphics.Paint; -import android.graphics.Typeface; import android.os.Bundle; import android.preference.PreferenceManager; import android.provider.BaseColumns; @@ -42,7 +41,6 @@ import com.amulyakhare.textdrawable.util.ColorGenerator; import org.fox.ttrss.CommonActivity; import org.fox.ttrss.GlobalState; import org.fox.ttrss.R; -import org.fox.ttrss.util.TypefaceCache; import org.jsoup.Jsoup; import java.text.DateFormat; @@ -614,7 +612,7 @@ public class OfflineHeadlinesFragment extends Fragment implements OnItemClickLis holder.titleView.setText(Html.fromHtml(article.getString(article.getColumnIndex("title")))); - if (m_prefs.getBoolean("enable_condensed_fonts", false)) { + /* if (m_prefs.getBoolean("enable_condensed_fonts", false)) { Typeface tf = TypefaceCache.get(m_activity, "sans-serif-condensed", article.getInt(article.getColumnIndex("unread")) == 1 ? Typeface.BOLD : Typeface.NORMAL); if (tf != null && !tf.equals(holder.titleView.getTypeface())) { @@ -624,8 +622,10 @@ public class OfflineHeadlinesFragment extends Fragment implements OnItemClickLis holder.titleView.setTextSize(TypedValue.COMPLEX_UNIT_SP, Math.min(21, headlineFontSize + 5)); } else { holder.titleView.setTextSize(TypedValue.COMPLEX_UNIT_SP, Math.min(21, headlineFontSize + 3)); - } - + } */ + + holder.titleView.setTextSize(TypedValue.COMPLEX_UNIT_SP, Math.min(21, headlineFontSize + 3)); + int scoreIndex = article.getColumnIndex("score"); if (scoreIndex >= 0) adjustTitleTextView(article.getInt(scoreIndex), holder.titleView, position); diff --git a/org.fox.ttrss/src/main/res/layout/article_fragment.xml b/org.fox.ttrss/src/main/res/layout/article_fragment.xml index 51dd918c..64563ab4 100755 --- a/org.fox.ttrss/src/main/res/layout/article_fragment.xml +++ b/org.fox.ttrss/src/main/res/layout/article_fragment.xml @@ -49,7 +49,7 @@ android:fontFamily="sans-serif-light" android:paddingTop="8dp" android:text="24 comments" - android:textColor="?articleHeaderTextColor" + android:textColor="?headlineSecondaryTextColor" android:textSize="12sp" /> diff --git a/org.fox.ttrss/src/main/res/layout/headlines_row.xml b/org.fox.ttrss/src/main/res/layout/headlines_row.xml index 8edd35b3..ce9861aa 100755 --- 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 @@ 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 old mode 100644 new mode 100755 index c0240fda..9d927733 --- a/org.fox.ttrss/src/main/res/layout/headlines_row_compact.xml +++ b/org.fox.ttrss/src/main/res/layout/headlines_row_compact.xml @@ -58,10 +58,10 @@ 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:paddingTop="8dp" /> @@ -77,7 +77,8 @@ android:text="Example Feed AAA AAA AAAAAA AAAA AAAAA AA A A AA AA" android:textColor="?headlineSecondaryTextColor" android:textSize="12sp" - android:layout_weight="0.5" /> + android:layout_weight="0.5" + android:paddingTop="8dp" /> diff --git a/org.fox.ttrss/src/main/res/layout/headlines_row_loadmore.xml b/org.fox.ttrss/src/main/res/layout/headlines_row_loadmore.xml old mode 100644 new mode 100755 index 314ffd00..7ea41aae --- a/org.fox.ttrss/src/main/res/layout/headlines_row_loadmore.xml +++ b/org.fox.ttrss/src/main/res/layout/headlines_row_loadmore.xml @@ -5,7 +5,7 @@ android:layout_height="wrap_content" android:background="?headlineNormalBackground" android:gravity="center" - android:padding="5dp" + android:padding="16dp" android:orientation="horizontal" > 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 old mode 100644 new mode 100755 index 25a46b46..e05b4bf9 --- 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 @@ -58,10 +58,10 @@ 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:paddingTop="8dp" /> @@ -77,7 +77,8 @@ android:text="Example Feed AAA AAA AAAAAA AAAA AAAAA AA A A AA AA" android:textColor="?headlineSelectedSecondaryTextColor" android:textSize="12sp" - android:layout_weight="0.5" /> + android:layout_weight="0.5" + android:paddingTop="8dp" /> diff --git a/org.fox.ttrss/src/main/res/layout/headlines_row_selected_unread_compact.xml b/org.fox.ttrss/src/main/res/layout/headlines_row_selected_unread_compact.xml old mode 100644 new mode 100755 index 7b2a8983..27bfe9be --- a/org.fox.ttrss/src/main/res/layout/headlines_row_selected_unread_compact.xml +++ b/org.fox.ttrss/src/main/res/layout/headlines_row_selected_unread_compact.xml @@ -59,10 +59,10 @@ 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:paddingTop="8dp" /> @@ -78,7 +78,8 @@ android:text="Example Feed AAA AAA AAAAAA AAAA AAAAA AA A A AA AA" android:textColor="?headlineSelectedSecondaryTextColor" android:textSize="12sp" - android:layout_weight="0.5" /> + android:layout_weight="0.5" + android:paddingTop="8dp" /> 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 index 80eec604..a54043a1 100755 --- 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 @@ @@ -33,7 +33,7 @@ android:text="Sample entry title" android:textColor="?headlineUnreadTextColor" android:textSize="18sp" - android:fontFamily="sans-serif-medium" + android:textStyle="bold" android:paddingBottom="8dp" android:layout_span="2" /> 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 old mode 100644 new mode 100755 index 0a29e48e..5a07f81a --- 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 @@ -59,10 +59,10 @@ 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:paddingTop="8dp" /> @@ -78,7 +78,8 @@ android:text="Example Feed AAA AAA AAAAAA AAAA AAAAA AA A A AA AA" android:textColor="?headlineSecondaryTextColor" android:textSize="12sp" - android:layout_weight="0.5" /> + android:layout_weight="0.5" + android:paddingTop="8dp" /> diff --git a/org.fox.ttrss/src/main/res/xml/preferences.xml b/org.fox.ttrss/src/main/res/xml/preferences.xml index a97c2566..8909ee58 100755 --- a/org.fox.ttrss/src/main/res/xml/preferences.xml +++ b/org.fox.ttrss/src/main/res/xml/preferences.xml @@ -102,11 +102,11 @@ android:summary="@string/pref_headlines_mark_read_scroll_long" android:title="@string/pref_headlines_mark_read_scroll" /> - + android:title="@string/pref_headlines_use_condensed_fonts" /> -->