summaryrefslogtreecommitdiff
path: root/res
diff options
context:
space:
mode:
authorAndrew Dolgov <[email protected]>2013-10-19 10:13:51 +0400
committerAndrew Dolgov <[email protected]>2013-10-19 10:13:51 +0400
commitb8ee3dab39193c38323439c8d455a2e4929a51db (patch)
tree569eb2c023f56d4bbc55bbc2a14372e0aa1ff5a0 /res
parent0a7c9640d72c156c5496326d802eaae89a9bf658 (diff)
do no ttry setting web software rendering before api 11
reimplement titlewebview as an alternative rendering option bump version
Diffstat (limited to 'res')
-rw-r--r--res/layout/article_fragment_compat.xml97
-rw-r--r--res/values/strings.xml2
-rw-r--r--res/xml/preferences.xml5
3 files changed, 104 insertions, 0 deletions
diff --git a/res/layout/article_fragment_compat.xml b/res/layout/article_fragment_compat.xml
new file mode 100644
index 00000000..8c37eb72
--- /dev/null
+++ b/res/layout/article_fragment_compat.xml
@@ -0,0 +1,97 @@
+<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.util.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.util.TitleWebView>
+
+</LinearLayout> \ No newline at end of file
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 7b475ddc..229a21e1 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -209,4 +209,6 @@
<string name="download_articles_and_go_offline">Download articles and go offline</string>
<string name="tasker_save_and_close">Save and close</string>
<string name="synchronize_read_articles_and_go_online">Synchronize read articles and go online</string>
+ <string name="prefs_compatible_article_layout">Compatible article layout</string>
+ <string name="prefs_compatible_layout_summary">Enable if you see glitches in article content</string>
</resources>
diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml
index 7f247d92..ec74841a 100644
--- a/res/xml/preferences.xml
+++ b/res/xml/preferences.xml
@@ -162,6 +162,11 @@
</PreferenceCategory>
<PreferenceCategory android:title="@string/debugging" >
<CheckBoxPreference
+ android:defaultValue="false"
+ android:key="article_compat_view"
+ android:title="@string/prefs_compatible_article_layout"
+ android:summary="@string/prefs_compatible_layout_summary" />
+ <CheckBoxPreference
android:defaultValue="true"
android:key="webview_hardware_accel"
android:summary="@string/accel_webview_summary"