move share button to article fragment body; reinstate dreaded mark unread back to the freed space

10 files changed, 63 insertions, 21 deletions

diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticleFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticleFragment.java
index 58ffaa7a..05ee4896 100755
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticleFragment.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticleFragment.java
@@ -12,12 +12,10 @@ import android.preference.PreferenceManager;
 import android.support.v4.app.Fragment;
 import android.support.v7.app.ActionBar;
 import android.text.Html;
-import android.util.Log;
 import android.util.TypedValue;
 import android.view.ContextMenu;
 import android.view.ContextMenu.ContextMenuInfo;
 import android.view.LayoutInflater;
-import android.view.MotionEvent;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.view.ViewGroup;
@@ -27,6 +25,7 @@ import android.webkit.WebSettings;
 import android.webkit.WebView;
 import android.webkit.WebView.HitTestResult;
 import android.widget.FrameLayout;
+import android.widget.ImageView;
 import android.widget.ScrollView;
 import android.widget.TextView;
 
@@ -264,6 +263,17 @@ public class ArticleFragment extends Fragment  {
             registerForContextMenu(title);
         }
 
+        ImageView share = (ImageView)view.findViewById(R.id.share);
+
+        if (share != null) {
+            share.setOnClickListener(new OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    m_activity.shareArticle(m_article);
+                }
+            });
+        }
+
         TextView comments = (TextView)view.findViewById(R.id.comments);
 
         if (comments != null) {
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/OnlineActivity.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/OnlineActivity.java
index 765b64fc..3dcb6ff9 100755
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/OnlineActivity.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/OnlineActivity.java
@@ -907,11 +907,11 @@ public class OnlineActivity extends CommonActivity {
 				dialog.show();
 			}
 			return true;
-		case R.id.share_article:
+		/* case R.id.share_article:
 			if (ap != null) {
 				shareArticle(ap.getSelectedArticle());
 			}
-			return true;
+			return true; */
 		case R.id.toggle_marked:
 			if (ap != null & ap.getSelectedArticle() != null) {
 				Article a = ap.getSelectedArticle();
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineActivity.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineActivity.java
index a7bcacb2..aa61a496 100755
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineActivity.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineActivity.java
@@ -440,13 +440,13 @@ public class OfflineActivity extends CommonActivity {
 				}
 			}
 			return true;
-		case R.id.share_article:
+		/* case R.id.share_article:
 			if (true) {
 				int articleId = oap.getSelectedArticleId();
 				
 				shareArticle(articleId);
 			}
-			return true;
+			return true; */
 		case R.id.toggle_marked:
 			if (oap != null) {
 				int articleId = oap.getSelectedArticleId();
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineArticleFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineArticleFragment.java
index 0211167f..c0a101c7 100755
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineArticleFragment.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineArticleFragment.java
@@ -23,6 +23,7 @@ import android.view.ViewGroup;
 import android.webkit.WebSettings;
 import android.webkit.WebView;
 import android.webkit.WebView.HitTestResult;
+import android.widget.ImageView;
 import android.widget.ScrollView;
 import android.widget.TextView;
 
@@ -226,7 +227,19 @@ public class OfflineArticleFragment extends Fragment {
 				
 				registerForContextMenu(title);
 			}
-			
+
+			ImageView share = (ImageView)view.findViewById(R.id.share);
+
+			if (share != null) {
+				share.setOnClickListener(new OnClickListener() {
+					@Override
+					public void onClick(View v) {
+						m_activity.shareArticle(m_articleId);
+					}
+				});
+			}
+
+
 			TextView comments = (TextView)view.findViewById(R.id.comments);
 			
 			if (comments != null) {
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineHeadlinesFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineHeadlinesFragment.java
index a32a55a5..37cf627a 100755
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineHeadlinesFragment.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineHeadlinesFragment.java
@@ -171,7 +171,7 @@ public class OfflineHeadlinesFragment extends Fragment implements OnItemClickLis
 			}
 			refresh();			
 			return true;
-		case R.id.share_article:
+		case R.id.headlines_share_article:
 			if (true) {
 				int articleId = getArticleIdAtPosition(info.position);
 				m_activity.shareArticle(articleId);
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>