diff options
author | Andrew Dolgov <[email protected]> | 2015-06-02 00:00:14 +0300 |
---|---|---|
committer | Andrew Dolgov <[email protected]> | 2015-06-02 00:00:14 +0300 |
commit | 1281e7dd42e5ea6f534dc4b343f4449b5871c13c (patch) | |
tree | 1ef9957363cc633f1e2d27faa818381d8540c342 /org.fox.ttrss/src/main/res | |
parent | 56cb9c1eabef86f3bd2f0d0053fcbf51876244e5 (diff) |
move share button to article fragment body; reinstate dreaded mark unread back to the freed space
Diffstat (limited to 'org.fox.ttrss/src/main/res')
-rwxr-xr-x | org.fox.ttrss/src/main/res/layout/article_fragment.xml | 31 | ||||
-rwxr-xr-x | org.fox.ttrss/src/main/res/menu/main_menu.xml | 6 | ||||
-rwxr-xr-x | org.fox.ttrss/src/main/res/menu/offline_menu.xml | 4 | ||||
-rwxr-xr-x | org.fox.ttrss/src/main/res/values/attrs.xml | 1 | ||||
-rwxr-xr-x | org.fox.ttrss/src/main/res/values/style.xml | 3 |
5 files changed, 32 insertions, 13 deletions
diff --git a/org.fox.ttrss/src/main/res/layout/article_fragment.xml b/org.fox.ttrss/src/main/res/layout/article_fragment.xml index 662c9936..06db2999 100755 --- a/org.fox.ttrss/src/main/res/layout/article_fragment.xml +++ b/org.fox.ttrss/src/main/res/layout/article_fragment.xml @@ -40,14 +40,31 @@ android:orientation="vertical" android:paddingBottom="6dp"> - <TextView - android:id="@+id/title" + <LinearLayout + android:orientation="horizontal" android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_weight="1" - android:text="My simple headline" - android:textColor="?articleHeaderTextColor" - android:textSize="18sp" /> + android:layout_height="match_parent"> + + <TextView + android:id="@+id/title" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_weight="1" + android:text="My simple but hilariously and excessively long headline" + android:textColor="?articleHeaderTextColor" + android:textSize="18sp" /> + + <ImageView + android:id="@+id/share" + android:background="@drawable/ripple" + android:layout_width="wrap_content" + android:layout_height="24dp" + android:layout_weight="0" + android:layout_marginLeft="8dp" + android:clickable="true" + android:src="?ic_share" + android:layout_gravity="center_vertical|right" /> + </LinearLayout> <TextView android:id="@+id/comments" diff --git a/org.fox.ttrss/src/main/res/menu/main_menu.xml b/org.fox.ttrss/src/main/res/menu/main_menu.xml index 6e163a60..76ef4cbf 100755 --- a/org.fox.ttrss/src/main/res/menu/main_menu.xml +++ b/org.fox.ttrss/src/main/res/menu/main_menu.xml @@ -83,13 +83,13 @@ <item android:id="@+id/toggle_unread" android:icon="@drawable/ic_email" - app:showAsAction="" + app:showAsAction="ifRoom" android:title="@string/article_toggle_unread"/> - <item + <!-- <item android:id="@+id/share_article" android:icon="@drawable/ic_share" app:showAsAction="ifRoom" - android:title="@string/share_article"/> + android:title="@string/share_article"/> --> <item android:id="@+id/set_labels" app:showAsAction="" diff --git a/org.fox.ttrss/src/main/res/menu/offline_menu.xml b/org.fox.ttrss/src/main/res/menu/offline_menu.xml index 5cd45177..42c94acc 100755 --- a/org.fox.ttrss/src/main/res/menu/offline_menu.xml +++ b/org.fox.ttrss/src/main/res/menu/offline_menu.xml @@ -58,11 +58,11 @@ android:icon="@drawable/ic_email" app:showAsAction="ifRoom" android:title="@string/article_toggle_unread"/> --> - <item + <!-- <item android:id="@+id/share_article" android:icon="@drawable/ic_share" app:showAsAction="ifRoom" - android:title="@string/share_article"/> + android:title="@string/share_article"/> --> <item android:id="@+id/catchup_above" android:title="@string/article_mark_read_above"/> diff --git a/org.fox.ttrss/src/main/res/values/attrs.xml b/org.fox.ttrss/src/main/res/values/attrs.xml index 723b0db4..da0cf282 100755 --- a/org.fox.ttrss/src/main/res/values/attrs.xml +++ b/org.fox.ttrss/src/main/res/values/attrs.xml @@ -34,4 +34,5 @@ <attr name="ic_checkbox_marked" format="reference" /> <attr name="ic_star" format="reference" /> <attr name="ic_star_outline" format="reference" /> + <attr name="ic_share" format="reference" /> </resources>
\ No newline at end of file diff --git a/org.fox.ttrss/src/main/res/values/style.xml b/org.fox.ttrss/src/main/res/values/style.xml index 1dcca044..87035461 100755 --- a/org.fox.ttrss/src/main/res/values/style.xml +++ b/org.fox.ttrss/src/main/res/values/style.xml @@ -42,6 +42,7 @@ <item name="ic_checkbox_marked">@drawable/ic_checkbox_marked_dark</item> <item name="ic_star">@drawable/ic_star_dark</item> <item name="ic_star_outline">@drawable/ic_star_outline_dark</item> + <item name="ic_share">@drawable/ic_share_dark</item> </style> <style name="DarkTheme" parent="Theme.AppCompat"> @@ -86,7 +87,7 @@ <item name="ic_checkbox_marked">@drawable/ic_checkbox_marked</item> <item name="ic_star">@drawable/ic_star</item> <item name="ic_star_outline">@drawable/ic_star_outline</item> - + <item name="ic_share">@drawable/ic_share</item> </style> <style name="DarkDialogTheme" parent="android:Theme"></style> |