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

use line-spacing on headlines; increase default line-height on articles

Browse Source 
a bit
This commit is contained in:
Andrew Dolgov 2014-01-25 22:18:26 +04:00
parent d75dc81c0d
commit 8d279b67b6
7 changed files with 58 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
res/layout/article_fragment.xml
View File

@ -2,11 +2,10 @@
android:id="@+id/article_fragment"
android:layout_width="fill_parent"
android:layout_height="match_parent"
android:background="?articleBackground"
android:padding="5sp" >
android:background="?articleBackground">
<org.fox.ttrss.util.NoChildFocusScrollView
android:id="@+id/scrollView1"
android:id="@+id/article_scrollview"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fillViewport="false" >
@ -21,7 +20,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:paddingBottom="2dp" >
android:paddingBottom="6dp" >
<TextView
android:id="@+id/title"
@ -55,8 +54,8 @@
android:id="@+id/tags"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="0.5"
android:ellipsize="end"
android:layout_weight="1"
android:ellipsize="middle"
android:singleLine="true"
android:fontFamily="sans-serif-light"
android:text="Example Feed"
@ -67,8 +66,9 @@
android:id="@+id/date"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="0.5"
android:layout_weight="0"
android:gravity="right"
android:layout_marginLeft="10dp"
android:fontFamily="sans-serif-light"
android:text="Jan 01, 12:00"
android:textAppearance="?android:attr/textAppearanceSmall"
@ -88,7 +88,7 @@
android:textColor="?articleNoteTextColor"
android:textSize="13sp"
android:padding="2dp"
android:layout_marginBottom="4dp"
android:layout_marginBottom="6dp"
android:text="[Article note]" />
<org.fox.ttrss.util.LessBrokenWebView

1
res/layout/headlines_row.xml
View File

@ -79,6 +79,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:paddingTop="3dp"
android:lineSpacingExtra="2sp"
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" />

1
res/layout/headlines_row_selected.xml
View File

@ -77,6 +77,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:paddingTop="3dp"
android:lineSpacingExtra="2sp"
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" />

1
res/layout/headlines_row_selected_unread.xml
View File

@ -78,6 +78,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:paddingTop="3dp"
android:lineSpacingExtra="2sp"
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" />

1
res/layout/headlines_row_unread.xml
View File

@ -75,6 +75,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:paddingTop="3dp"
android:lineSpacingExtra="2sp"
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" />

24
src/org/fox/ttrss/ArticleFragment.java
View File

@ -96,6 +96,28 @@ public class ArticleFragment extends Fragment {
if (m_article != null) {
if (!useTitleWebView) {
View scroll = view.findViewById(R.id.article_scrollview);
if (scroll != null) {
final float scale = getResources().getDisplayMetrics().density;
if (m_activity.isSmallScreen()) {
scroll.setPadding((int)(8 * scale + 0.5f),
(int)(5 * scale + 0.5f),
(int)(8 * scale + 0.5f),
0);
} else {
scroll.setPadding((int)(25 * scale + 0.5f),
(int)(10 * scale + 0.5f),
(int)(25 * scale + 0.5f),
0);
}
}
}
int articleFontSize = Integer.parseInt(m_prefs.getString("article_font_size_sp", "16"));
int articleSmallFontSize = Math.max(10, Math.min(18, articleFontSize - 2));
@ -286,7 +308,7 @@ public class ArticleFragment extends Fragment {
"<meta content=\"text/html; charset=utf-8\" http-equiv=\"content-type\">" +
"<meta name=\"viewport\" content=\"width=device-width, user-scalable=no\" />" +
"<style type=\"text/css\">" +
"body { padding : 0px; margin : 0px; line-height : 120%; }" +
"body { padding : 0px; margin : 0px; line-height : 130%; }" +
"img { max-width : 100%; width : auto; height : auto; }" +
cssOverride +
"</style>" +

24
src/org/fox/ttrss/offline/OfflineArticleFragment.java
View File

@ -133,6 +133,28 @@ public class OfflineArticleFragment extends Fragment {
m_cursor.moveToFirst();
if (m_cursor.isFirst()) {
if (!useTitleWebView) {
View scroll = view.findViewById(R.id.article_scrollview);
if (scroll != null) {
final float scale = getResources().getDisplayMetrics().density;
if (m_activity.isSmallScreen()) {
scroll.setPadding((int)(8 * scale + 0.5f),
(int)(5 * scale + 0.5f),
(int)(8 * scale + 0.5f),
0);
} else {
scroll.setPadding((int)(25 * scale + 0.5f),
(int)(10 * scale + 0.5f),
(int)(25 * scale + 0.5f),
0);
}
}
}
int articleFontSize = Integer.parseInt(m_prefs.getString("article_font_size_sp", "16"));
int articleSmallFontSize = Math.max(10, Math.min(18, articleFontSize - 2));
@ -305,7 +327,7 @@ public class OfflineArticleFragment extends Fragment {
"<meta content=\"text/html; charset=utf-8\" http-equiv=\"content-type\">" +
"<meta name=\"viewport\" content=\"width=device-width, user-scalable=no\" />" +
"<style type=\"text/css\">" +
"body { padding : 0px; margin : 0px; line-height : 120%; }" +
"body { padding : 0px; margin : 0px; line-height : 130%; }" +
cssOverride +
"img { max-width : 100%; width : auto; height : auto; }" +
"</style>" +