remove additional buttons from article header, limit buttons to toolbar

7 files changed, 74 insertions, 138 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 7344480f..128d0484 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
@@ -224,87 +224,6 @@ public class ArticleFragment extends androidx.fragment.app.Fragment  {
 
         }
 
-        final MaterialButton scoreView = view.findViewById(R.id.score);
-
-        if (scoreView != null) {
-            setScoreImage(scoreView, m_article.score);
-
-            if (m_activity.getApiLevel() >= 16) {
-                scoreView.setOnClickListener(new OnClickListener() {
-                    @Override
-                    public void onClick(View v) {
-                        final EditText edit = new EditText(getActivity());
-                        edit.setText(String.valueOf(m_article.score));
-
-                        MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(getContext())
-                                .setTitle(R.string.score_for_this_article)
-                                .setPositiveButton(R.string.set_score,
-                                        new DialogInterface.OnClickListener() {
-
-                                            @Override
-                                            public void onClick(DialogInterface dialog,
-                                                                int which) {
-
-                                                try {
-                                                    int newScore = Integer.parseInt(edit.getText().toString());
-
-                                                    m_article.score = newScore;
-
-                                                    m_activity.saveArticleScore(m_article);
-
-                                                    setScoreImage(scoreView, newScore);
-                                                } catch (NumberFormatException e) {
-                                                    m_activity.toast(R.string.score_invalid);
-                                                    e.printStackTrace();
-                                                }
-                                            }
-                                        })
-                                .setNegativeButton(getString(R.string.cancel),
-                                        new DialogInterface.OnClickListener() {
-
-                                            @Override
-                                            public void onClick(DialogInterface dialog,
-                                                                int which) {
-
-                                                //
-
-                                            }
-                                        }).setView(edit);
-
-                        Dialog dialog = builder.create();
-                        dialog.show();
-                    }
-                });
-            }
-        }
-
-        MaterialButton attachments = view.findViewById(R.id.attachments);
-
-        if (attachments != null) {
-            if (m_article.attachments != null && m_article.attachments.size() > 0) {
-                attachments.setOnClickListener(new OnClickListener() {
-                    @Override
-                    public void onClick(View v) {
-                        m_activity.displayAttachments(m_article);
-                    }
-                });
-
-            } else {
-                attachments.setVisibility(View.GONE);
-            }
-        }
-
-        MaterialButton share = 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 = view.findViewById(R.id.comments);
 
         if (comments != null) {
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/DetailActivity.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/DetailActivity.java
index eda894dc..0edd6c10 100755
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/DetailActivity.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/DetailActivity.java
@@ -212,12 +212,12 @@ public class DetailActivity extends OnlineActivity implements HeadlinesEventList
 					/* if (!isCompatMode() && (isSmallScreen() || !isPortrait())) {
 						m_menu.findItem(R.id.toggle_attachments).setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
 					} */
-					//m_menu.findItem(R.id.toggle_attachments).setVisible(true);
+					m_menu.findItem(R.id.toggle_attachments).setVisible(true);
 				} else {
 					/* if (!isCompatMode()) {
 						m_menu.findItem(R.id.toggle_attachments).setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER);
 					} */
-					//m_menu.findItem(R.id.toggle_attachments).setVisible(false);
+					m_menu.findItem(R.id.toggle_attachments).setVisible(false);
 				}
 			}
 			
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 b8680c71..3af78ddf 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
@@ -531,18 +531,16 @@ public class OnlineActivity extends CommonActivity {
 
         int itemId = item.getItemId();
         if (itemId == R.id.subscribe_to_feed) {
-            Intent subscribe = new Intent(OnlineActivity.this, SubscribeActivity.class);
-            startActivityForResult(subscribe, 0);
-            return true;
-		/*case R.id.toggle_attachments:
-			if (true) {
-				Article article = ap.getSelectedArticle();
+			Intent subscribe = new Intent(OnlineActivity.this, SubscribeActivity.class);
+			startActivityForResult(subscribe, 0);
+			return true;
+		} else if (itemId ==  R.id.toggle_attachments) {
+			Article article = ap.getSelectedArticle();
 
-				if (article != null) {
-					displayAttachments(article);
-				}
+			if (article != null) {
+				displayAttachments(article);
 			}
-			return true; */
+			return true;
 		/*case R.id.logout:
 			logout();
 			return true;*/
@@ -748,11 +746,16 @@ public class OnlineActivity extends CommonActivity {
                 dialog.show();
             }
             return true;
-		/* case R.id.share_article:
+		} else if (itemId == R.id.share_article) {
 			if (ap != null) {
 				shareArticle(ap.getSelectedArticle());
 			}
-			return true; */
+			return true;
+		} else if (itemId == R.id.article_set_score) {
+			if (ap != null) {
+				setArticleScore(ap.getSelectedArticle());
+			}
+			return true;
         } else if (itemId == R.id.toggle_marked) {
             if (ap != null && ap.getSelectedArticle() != null) {
                 Article a = ap.getSelectedArticle();
@@ -1231,6 +1234,45 @@ public class OnlineActivity extends CommonActivity {
 		}
 	}
 
+	public void setArticleScore(Article article) {
+		final EditText edit = new EditText(this);
+		edit.setText(String.valueOf(article.score));
+
+		MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(this)
+				.setTitle(R.string.score_for_this_article)
+				.setPositiveButton(R.string.set_score,
+						new DialogInterface.OnClickListener() {
+
+							@Override
+							public void onClick(DialogInterface dialog,
+												int which) {
+
+								try {
+                                    article.score = Integer.parseInt(edit.getText().toString());
+
+									saveArticleScore(article);
+								} catch (NumberFormatException e) {
+									toast(R.string.score_invalid);
+									e.printStackTrace();
+								}
+							}
+						})
+				.setNegativeButton(getString(R.string.cancel),
+						new DialogInterface.OnClickListener() {
+
+							@Override
+							public void onClick(DialogInterface dialog,
+												int which) {
+
+								//
+
+							}
+						}).setView(edit);
+
+		Dialog dialog = builder.create();
+		dialog.show();
+	}
+
 	@Override
 	public boolean onKeyDown(int keyCode, KeyEvent event) {		
 		ArticlePager ap = (ArticlePager) getSupportFragmentManager().findFragmentByTag(FRAG_ARTICLE);
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 d7f487a1..96e0ee34 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
@@ -421,13 +421,12 @@ public class OfflineActivity extends CommonActivity {
                 }
             }
             return true;
-		/* case R.id.share_article:
-			if (true) {
-				int articleId = oap.getSelectedArticleId();
+        } else if (itemId == R.id.share_article) {
+            int articleId = oap.getSelectedArticleId();
 
-				shareArticle(articleId);
-			}
-			return true; */
+            shareArticle(articleId);
+
+			return true;
         } else if (itemId == 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 3b199d2a..5483cf60 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
@@ -235,7 +235,7 @@ public class OfflineArticleFragment extends Fragment {
 
 			}
 
-			MaterialButton score = view.findViewById(R.id.score);
+			/* MaterialButton score = view.findViewById(R.id.score);
 
 			if (score != null) {
 				score.setVisibility(View.GONE);
@@ -256,8 +256,7 @@ public class OfflineArticleFragment extends Fragment {
 						m_activity.shareArticle(m_articleId);
 					}
 				});
-			}
-
+			} */
 
 			TextView comments = view.findViewById(R.id.comments);
 			
diff --git a/org.fox.ttrss/src/main/res/layout/fragment_article.xml b/org.fox.ttrss/src/main/res/layout/fragment_article.xml
index e78ab258..990ede49 100755
--- a/org.fox.ttrss/src/main/res/layout/fragment_article.xml
+++ b/org.fox.ttrss/src/main/res/layout/fragment_article.xml
@@ -43,35 +43,9 @@
                         android:textAlignment="viewStart"
                         android:textColor="?colorPrimary"
                         tools:text="Unreasonably long article title blah blah blah blah blah blah"
-                        android:textSize="16sp"
+                        android:textSize="18sp"
                         android:gravity="start" />
 
-                    <com.google.android.material.button.MaterialButton
-                        style="?attr/materialIconButtonStyle"
-                        android:id="@+id/score"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="0"
-                        app:icon="?ic_action_trending_flat"
-                        android:layout_gravity="center_vertical|end" />
-
-                    <com.google.android.material.button.MaterialButton
-                        style="?attr/materialIconButtonStyle"
-                        android:id="@+id/attachments"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="0"
-                        app:icon="?ic_attachment_vert"
-                        android:layout_gravity="center_vertical|end" />
-
-                    <com.google.android.material.button.MaterialButton
-                        style="?attr/materialIconButtonStyle"
-                        android:id="@+id/share"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="0"
-                        app:icon="?ic_share"
-                        android:layout_gravity="center_vertical|end" />
                 </LinearLayout>
 
                 <TextView
diff --git a/org.fox.ttrss/src/main/res/menu/activity_main.xml b/org.fox.ttrss/src/main/res/menu/activity_main.xml
index 21676f17..f983e224 100755
--- a/org.fox.ttrss/src/main/res/menu/activity_main.xml
+++ b/org.fox.ttrss/src/main/res/menu/activity_main.xml
@@ -64,18 +64,17 @@
                 android:id="@+id/toggle_unread"
                 android:icon="@drawable/baseline_email_24"
                 app:iconTint="?attr/colorControlNormal"
-                app:showAsAction="ifRoom"
                 android:title="@string/article_toggle_unread"/>
-            <!-- <item
+            <item
                 android:id="@+id/toggle_attachments"
-                android:icon="@drawable/ic_attachment"
+                android:icon="@drawable/baseline_attach_file_24"
                 app:showAsAction=""
-                android:title="@string/attachments_prompt"/> -->
-            <!-- <item
+                android:title="@string/attachments_prompt"/>
+            <item
                 android:id="@+id/share_article"
-                android:icon="@drawable/ic_share"
+                android:icon="@drawable/baseline_share_24"
                 app:showAsAction="ifRoom"
-                android:title="@string/share_article"/> -->
+                android:title="@string/share_article"/>
             <item
                 android:id="@+id/set_labels"
                 app:showAsAction=""
@@ -84,6 +83,10 @@
                 android:id="@+id/article_set_note"
                 app:showAsAction=""
                 android:title="@string/article_set_note"/>
+            <item
+                android:id="@+id/article_set_score"
+                app:showAsAction=""
+                android:title="@string/set_score"/>
 
             <item
                 android:id="@+id/catchup_above"