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

update articlefragment style

Browse Source
This commit is contained in:
Andrew Dolgov 2013-05-23 15:15:23 +04:00
parent 64c9467534
commit 2f428e843e
5 changed files with 77 additions and 182 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

103
res/layout-sw600dp/article_fragment.xml
View File

@ -1,103 +0,0 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/article_fragment"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:background="?articleBackground"
android:orientation="vertical"
android:padding="10sp" >
<org.fox.ttrss.TitleWebView
android:id="@+id/content"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1" >
<LinearLayout
android:id="@+id/article_header"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="0"
android:orientation="vertical"
android:paddingBottom="4sp" >
<TextView
android:id="@+id/title"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="There are many variations of passages of Lorem Ipsum available"
android:textColor="?linkColor"
android:textSize="21sp" />
<LinearLayout
android:id="@+id/comments_and_author"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="horizontal" >
<TextView
android:id="@+id/comments"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:paddingBottom="2sp"
android:paddingTop="2sp"
android:text="24 comments"
android:textColor="?linkColor"
android:textSize="13sp" />
<TextView
android:id="@+id/author"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:ellipsize="end"
android:gravity="right"
android:singleLine="true"
android:text="{Author}"
android:textColor="?headlineExcerptTextColor"
android:textSize="13sp" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1" >
<TextView
android:id="@+id/tags"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="0.7"
android:ellipsize="end"
android:textStyle="italic"
android:singleLine="true"
android:text="{TAGS}"
android:textColor="?headlineExcerptTextColor"
android:textSize="13sp" />
<TextView
android:id="@+id/date"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="0.2"
android:gravity="right"
android:text="{DATE}"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="?headlineExcerptTextColor"
android:textSize="13sp"
android:textStyle="italic" />
</LinearLayout>
<ImageView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="5sp"
android:layout_marginTop="5sp"
android:layout_weight="0"
android:background="?ttrssHorizontalDivider"
android:paddingTop="2dip" />
</LinearLayout>
</org.fox.ttrss.TitleWebView>
</LinearLayout>

83
res/layout/article_fragment.xml
View File

@ -1,4 +1,4 @@
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/article_fragment" android:id="@+id/article_fragment"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="fill_parent" android:layout_height="fill_parent"
@ -10,38 +10,25 @@
android:id="@+id/content" android:id="@+id/content"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="1" > android:layout_weight="1">
<LinearLayout <LinearLayout
android:id="@+id/article_header" android:id="@+id/article_header"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="0" android:layout_weight="0"
android:orientation="vertical" > android:orientation="vertical"
android:paddingBottom="2dp" >
<TextView <TextView
android:id="@+id/title" android:id="@+id/title"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" android:layout_weight="1"
android:text="There are many variations of passages of Lorem Ipsum available" android:paddingBottom="4dp"
android:text="My simple headline"
android:textColor="?linkColor" android:textColor="?linkColor"
android:textSize="16sp" /> android:textSize="18sp" />
<LinearLayout
android:id="@+id/comments_and_author"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="horizontal" >
<TextView
android:id="@+id/comments"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="24 comments"
android:textColor="?linkColor"
android:textSize="13sp" />
<TextView <TextView
android:id="@+id/author" android:id="@+id/author"
@ -51,49 +38,59 @@
android:ellipsize="end" android:ellipsize="end"
android:gravity="right" android:gravity="right"
android:singleLine="true" android:singleLine="true"
android:text="{Author}" android:text="by Author"
android:textColor="?headlineExcerptTextColor" android:textColor="?headlineSecondaryTextColor"
android:textSize="13sp" android:textSize="14sp" />
android:textStyle="italic" />
</LinearLayout> <TextView
android:id="@+id/comments"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="24 comments"
android:textColor="?linkColor"
android:textSize="12sp" />
<ImageView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="4dp"
android:layout_marginTop="4dp"
android:layout_weight="0"
android:background="?ttrssHorizontalDivider"
android:paddingTop="2dip" />
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingBottom="4dp"
android:layout_weight="1" > android:layout_weight="1" >
<TextView <TextView
android:id="@+id/tags" android:id="@+id/tags"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="0.7" android:layout_weight="0.5"
android:ellipsize="end" android:ellipsize="end"
android:singleLine="true" android:singleLine="true"
android:text="{TAGS}" android:text="Example Feed"
android:textColor="?headlineExcerptTextColor" android:textColor="?headlineSecondaryTextColor"
android:textSize="13sp" /> android:textSize="12sp" />
<TextView <TextView
android:id="@+id/date" android:id="@+id/date"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="0.2" android:layout_weight="0.5"
android:gravity="right" android:gravity="right"
android:text="{DATE}" android:text="Jan 01, 12:00"
android:textAppearance="?android:attr/textAppearanceSmall" android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="?headlineExcerptTextColor" android:textColor="?headlineSecondaryTextColor"
android:textSize="13sp" android:textSize="12sp" />
android:textStyle="italic" /> </LinearLayout>
</LinearLayout> </LinearLayout>
<ImageView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="5sp"
android:layout_weight="0"
android:background="?ttrssHorizontalDivider"
android:paddingTop="2dip" />
</LinearLayout>
</org.fox.ttrss.TitleWebView> </org.fox.ttrss.TitleWebView>
</FrameLayout> </LinearLayout>

1
res/values/strings.xml
View File

@ -197,4 +197,5 @@
<string name="pref_headlines_mark_read_scroll_long">Headlines will be marked read when scrolling past them</string> <string name="pref_headlines_mark_read_scroll_long">Headlines will be marked read when scrolling past them</string>
<string name="mark_num_headlines_as_read">Mark %1$d article(s) as read?</string> <string name="mark_num_headlines_as_read">Mark %1$d article(s) as read?</string>
<string name="prefs_confirm_headlines_catchup">Confirm marking articles as read</string> <string name="prefs_confirm_headlines_catchup">Confirm marking articles as read</string>
<string name="author_formatted">by %1$s</string>
</resources> </resources>

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

@ -334,7 +334,7 @@ public class ArticleFragment extends Fragment implements GestureDetector.OnDoubl
if (author != null) { if (author != null) {
if (m_article.author != null && m_article.author.length() > 0) { if (m_article.author != null && m_article.author.length() > 0) {
author.setText(m_article.author); author.setText(getString(R.string.author_formatted, m_article.author));
} else { } else {
author.setVisibility(View.GONE); author.setVisibility(View.GONE);
} }

2
src/org/fox/ttrss/HeadlinesFragment.java
View File

@ -680,7 +680,7 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener,
TextView author = (TextView)v.findViewById(R.id.author); TextView author = (TextView)v.findViewById(R.id.author);
if (author != null) { if (author != null) {
author.setText(articleAuthor); author.setText(getString(R.string.author_formatted, articleAuthor));
} }
/* ImageView separator = (ImageView)v.findViewById(R.id.headlines_separator); /* ImageView separator = (ImageView)v.findViewById(R.id.headlines_separator);