diff options
| author | Andrew Dolgov <[email protected]> | 2013-11-23 20:31:37 +0400 |
|---|---|---|
| committer | Andrew Dolgov <[email protected]> | 2013-11-23 20:31:37 +0400 |
| commit | 3b3b79ade20b6b5e808faa262e868a04c6dd985d (patch) | |
| tree | b5f051fbcb81ebd277003f1e9534ae84381dc6f6 /res | |
| parent | 87d75a0d6c0109a4986ffe85d21ecff9ed91b750 (diff) | |
support displaying article notes (requires API 8)
Diffstat (limited to 'res')
| -rw-r--r-- | res/layout/article_fragment.xml | 14 | ||||
| -rw-r--r-- | res/values/attrs.xml | 2 | ||||
| -rw-r--r-- | res/values/style.xml | 9 |
3 files changed, 23 insertions, 2 deletions
diff --git a/res/layout/article_fragment.xml b/res/layout/article_fragment.xml index 8ea27c55..70016361 100644 --- a/res/layout/article_fragment.xml +++ b/res/layout/article_fragment.xml @@ -92,12 +92,26 @@ android:textColor="?headlineSecondaryTextColor"
android:textSize="12sp" />
</LinearLayout>
+
</LinearLayout>
+ <TextView
+ android:id="@+id/note"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:background="?articleNoteBackground"
+ android:textColor="?articleNoteTextColor"
+ android:textSize="13sp"
+ android:padding="2dp"
+ android:layout_marginBottom="4dp"
+ android:text="[Article note]" />
+
<org.fox.ttrss.util.LessBrokenWebView
android:id="@+id/content"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
+
</LinearLayout>
</org.fox.ttrss.util.NoChildFocusScrollView>
diff --git a/res/values/attrs.xml b/res/values/attrs.xml index 28c86d64..de72602a 100644 --- a/res/values/attrs.xml +++ b/res/values/attrs.xml @@ -25,4 +25,6 @@ <attr name="loadingBackground" format="reference|color" />
<attr name="unreadCounterBackground" format="reference|color" />
<attr name="unreadSelectedCounterBackground" format="reference|color" />
+ <attr name="articleNoteBackground" format="reference|color" />
+ <attr name="articleNoteTextColor" format="reference|color" />
</resources>
\ No newline at end of file diff --git a/res/values/style.xml b/res/values/style.xml index b84d69d2..f5cdda92 100644 --- a/res/values/style.xml +++ b/res/values/style.xml @@ -25,6 +25,8 @@ <item name="loadingBackground">@android:color/white</item> <item name="unreadCounterBackground">@drawable/counter_background</item> <item name="unreadSelectedCounterBackground">@drawable/counter_background_selected_light</item> + <item name="articleNoteTextColor">#9a8c59</item> + <item name="articleNoteBackground">#fff7d5</item> </style> <style name="SepiaTheme" parent="LightTheme"> @@ -70,6 +72,8 @@ <item name="loadingBackground">@android:color/black</item> <item name="unreadCounterBackground">@drawable/counter_background_dark</item> <item name="unreadSelectedCounterBackground">@drawable/counter_background_dark</item> + <item name="articleNoteTextColor">@android:color/secondary_text_dark</item> + <item name="articleNoteBackground">#303030</item> </style> <style name="SystemTheme" parent="Theme.Sherlock.DeviceDefault"> @@ -98,6 +102,8 @@ <item name="loadingBackground">@android:color/black</item> <item name="unreadCounterBackground">@drawable/counter_background_dark</item> <item name="unreadSelectedCounterBackground">@drawable/counter_background_dark</item> + <item name="articleNoteTextColor">@android:color/secondary_text_dark</item> + <item name="articleNoteBackground">#303030</item> </style> <style name="DarkGrayTheme" parent="DarkTheme"> @@ -115,8 +121,7 @@ <item name="headlineTextColor">@android:color/secondary_text_dark</item> <item name="actionBarStyle">@style/ActionBarDarkGray</item> <item name="android:actionBarStyle">@style/ActionBarDarkGray</item> - <item name="headlineSelectedSecondaryTextColor">#a0a0a0</item> - + <item name="headlineSelectedSecondaryTextColor">#a0a0a0</item> </style> <style name="ActionBarDarkGray" parent="Widget.Sherlock.ActionBar.Solid"> |