diff options
author | Andrew Dolgov <[email protected]> | 2013-10-16 19:53:32 +0400 |
---|---|---|
committer | Andrew Dolgov <[email protected]> | 2013-10-16 19:53:32 +0400 |
commit | cb18030f6b4aec8cd88aff333d7fbeea7572a347 (patch) | |
tree | b5e3e885969564374ca9115100f34f299fa2e3fd /res/layout | |
parent | ced4e4b089100920fe937cf4863553e504a35b90 (diff) |
Revert "use scrollview/webview instead of titlewebview hack"
This reverts commit 780629fff539128065970011931b141b1eb723ed.
Conflicts:
res/layout/article_fragment.xml
src/org/fox/ttrss/ArticleFragment.java
src/org/fox/ttrss/offline/OfflineArticleFragment.java
Diffstat (limited to 'res/layout')
-rw-r--r-- | res/layout/article_fragment.xml | 202 |
1 files changed, 97 insertions, 105 deletions
diff --git a/res/layout/article_fragment.xml b/res/layout/article_fragment.xml index 5caab8ae..60683838 100644 --- a/res/layout/article_fragment.xml +++ b/res/layout/article_fragment.xml @@ -1,105 +1,97 @@ -<RelativeLayout 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:padding="5sp" >
-
- <org.fox.ttrss.util.NoChildFocusScrollView
- android:id="@+id/scrollView1"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:fillViewport="false" >
-
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:orientation="vertical" >
-
- <LinearLayout
- android:id="@+id/article_header"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:orientation="vertical"
- android:paddingBottom="2dp" >
-
- <TextView
- android:id="@+id/title"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_weight="1"
- android:paddingBottom="4dp"
- android:text="My simple headline"
- android:textColor="?linkColor"
- android:textSize="18sp" />
-
- <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="by Author"
- android:textColor="?headlineSecondaryTextColor"
- android:textSize="12sp" />
-
- <TextView
- android:id="@+id/comments"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_weight="1"
- android:gravity="right"
- 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
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_weight="1"
- android:paddingBottom="4dp" >
-
- <TextView
- android:id="@+id/tags"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_weight="0.5"
- android:ellipsize="end"
- android:singleLine="true"
- android:text="Example Feed"
- android:textColor="?headlineSecondaryTextColor"
- android:textSize="12sp" />
-
- <TextView
- android:id="@+id/date"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_weight="0.5"
- android:gravity="right"
- android:text="Jan 01, 12:00"
- android:textAppearance="?android:attr/textAppearanceSmall"
- android:textColor="?headlineSecondaryTextColor"
- android:textSize="12sp" />
- </LinearLayout>
- </LinearLayout>
-
- <WebView
- android:id="@+id/content"
- android:layout_width="match_parent"
- android:layout_height="wrap_content" />
- </LinearLayout>
- </org.fox.ttrss.util.NoChildFocusScrollView>
-
-
-</RelativeLayout>
\ No newline at end of file +<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="5sp" > + + <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="2dp" > + + <TextView + android:id="@+id/title" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_weight="1" + android:paddingBottom="4dp" + android:text="My simple headline" + android:textColor="?linkColor" + android:textSize="18sp" /> + + <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="by Author" + android:textColor="?headlineSecondaryTextColor" + android:textSize="12sp" /> + + <TextView + android:id="@+id/comments" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_weight="1" + android:gravity="right" + 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 + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:paddingBottom="4dp" + android:layout_weight="1" > + + <TextView + android:id="@+id/tags" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_weight="0.5" + android:ellipsize="end" + android:singleLine="true" + android:text="Example Feed" + android:textColor="?headlineSecondaryTextColor" + android:textSize="12sp" /> + + <TextView + android:id="@+id/date" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_weight="0.5" + android:gravity="right" + android:text="Jan 01, 12:00" + android:textAppearance="?android:attr/textAppearanceSmall" + android:textColor="?headlineSecondaryTextColor" + android:textSize="12sp" /> + </LinearLayout> + </LinearLayout> + + + </org.fox.ttrss.TitleWebView> + +</LinearLayout> |