diff --git a/app/src/main/java/gr/thmmy/mthmmy/activities/topic/TopicActivity.java b/app/src/main/java/gr/thmmy/mthmmy/activities/topic/TopicActivity.java
index 959a0939..7c2c5d96 100644
--- a/app/src/main/java/gr/thmmy/mthmmy/activities/topic/TopicActivity.java
+++ b/app/src/main/java/gr/thmmy/mthmmy/activities/topic/TopicActivity.java
@@ -228,42 +228,43 @@ public class TopicActivity extends BaseActivity implements TopicAdapter.OnPostFo
@Override
public boolean onOptionsItemSelected(MenuItem item) {
// Handle presses on the action bar items
- switch (item.getItemId()) {
- case R.id.menu_bookmark:
- topicMenuBookmarkClick();
- return true;
- case R.id.menu_info:
- AlertDialog.Builder builder = new AlertDialog.Builder(this, R.style.AppCompatAlertDialogStyleAccent);
- LayoutInflater inflater = this.getLayoutInflater();
- LinearLayout infoDialog = (LinearLayout) inflater.inflate(R.layout.dialog_topic_info
- , null);
- TextView treeAndMods = infoDialog.findViewById(R.id.topic_tree_and_mods);
- treeAndMods.setText(new SpannableStringBuilder("Loading..."));
- treeAndMods.setMovementMethod(LinkMovementMethod.getInstance());
- TextView usersViewing = infoDialog.findViewById(R.id.users_viewing);
- usersViewing.setText(new SpannableStringBuilder("Loading..."));
- usersViewing.setMovementMethod(LinkMovementMethod.getInstance());
- viewModel.getTopicTreeAndMods().observe(this, topicTreeAndMods -> {
- if (topicTreeAndMods == null) return;
- treeAndMods.setText(HTMLUtils.getSpannableFromHtml(this, topicTreeAndMods));
- });
- viewModel.getTopicViewers().observe(this, topicViewers -> {
- if (topicViewers == null) return;
- usersViewing.setText(HTMLUtils.getSpannableFromHtml(this, topicViewers));
- });
- builder.setView(infoDialog);
- topicInfoDialog = builder.create();
- topicInfoDialog.show();
- return true;
- case R.id.menu_share:
- Intent sendIntent = new Intent(android.content.Intent.ACTION_SEND);
- sendIntent.setType("text/plain");
- sendIntent.putExtra(android.content.Intent.EXTRA_TEXT, viewModel.getTopicUrl());
- startActivity(Intent.createChooser(sendIntent, "Share via"));
- return true; //invalidateOptionsMenu();
- default:
- return super.onOptionsItemSelected(item);
+ int itemId = item.getItemId();
+ if (itemId == R.id.menu_bookmark) {
+ topicMenuBookmarkClick();
+ return true;
+ }
+ else if (itemId == R.id.menu_info) {
+ AlertDialog.Builder builder = new AlertDialog.Builder(this, R.style.AppCompatAlertDialogStyleAccent);
+ LayoutInflater inflater = this.getLayoutInflater();
+ LinearLayout infoDialog = (LinearLayout) inflater.inflate(R.layout.dialog_topic_info
+ , null);
+ TextView treeAndMods = infoDialog.findViewById(R.id.topic_tree_and_mods);
+ treeAndMods.setText(new SpannableStringBuilder("Loading..."));
+ treeAndMods.setMovementMethod(LinkMovementMethod.getInstance());
+ TextView usersViewing = infoDialog.findViewById(R.id.users_viewing);
+ usersViewing.setText(new SpannableStringBuilder("Loading..."));
+ usersViewing.setMovementMethod(LinkMovementMethod.getInstance());
+ viewModel.getTopicTreeAndMods().observe(this, topicTreeAndMods -> {
+ if (topicTreeAndMods == null) return;
+ treeAndMods.setText(HTMLUtils.getSpannableFromHtml(this, topicTreeAndMods));
+ });
+ viewModel.getTopicViewers().observe(this, topicViewers -> {
+ if (topicViewers == null) return;
+ usersViewing.setText(HTMLUtils.getSpannableFromHtml(this, topicViewers));
+ });
+ builder.setView(infoDialog);
+ topicInfoDialog = builder.create();
+ topicInfoDialog.show();
+ return true;
+ }
+ else if (itemId == R.id.menu_share) {
+ Intent sendIntent = new Intent(Intent.ACTION_SEND);
+ sendIntent.setType("text/plain");
+ sendIntent.putExtra(Intent.EXTRA_TEXT, viewModel.getTopicUrl());
+ startActivity(Intent.createChooser(sendIntent, "Share via"));
+ return true; //invalidateOptionsMenu();
}
+ return super.onOptionsItemSelected(item);
}
@Override
diff --git a/app/src/main/res/layout/activity_bookmarks.xml b/app/src/main/res/layout/activity_bookmarks.xml
index a57f969d..44c29305 100644
--- a/app/src/main/res/layout/activity_bookmarks.xml
+++ b/app/src/main/res/layout/activity_bookmarks.xml
@@ -21,7 +21,7 @@
android:layout_height="?attr/actionBarSize"
android:background="?attr/colorPrimary"
android:gravity="center"
- app:popupTheme="@style/ToolbarTheme">
+ app:popupTheme="@style/ToolbarTheme" />
diff --git a/app/src/main/res/menu/downloads_menu.xml b/app/src/main/res/menu/downloads_menu.xml
index 04eb3822..be7150a4 100644
--- a/app/src/main/res/menu/downloads_menu.xml
+++ b/app/src/main/res/menu/downloads_menu.xml
@@ -5,5 +5,5 @@
android:id="@+id/menu_upload"
android:icon="@drawable/ic_file_upload_white_24dp"
app:showAsAction="ifRoom"
- android:title="@string/upload_button">
+ android:title="@string/upload_button" />
\ No newline at end of file
diff --git a/app/src/main/res/menu/shoutbox_menu.xml b/app/src/main/res/menu/shoutbox_menu.xml
index dc5c6ab0..c3e6dd5b 100644
--- a/app/src/main/res/menu/shoutbox_menu.xml
+++ b/app/src/main/res/menu/shoutbox_menu.xml
@@ -5,5 +5,5 @@
android:id="@+id/menu_refresh"
android:icon="@drawable/ic_refresh_white_24dp"
app:showAsAction="ifRoom"
- android:title="@string/refresh">
+ android:title="@string/refresh" />
\ No newline at end of file
diff --git a/app/src/main/res/menu/topic_menu.xml b/app/src/main/res/menu/topic_menu.xml
index 42a144ef..17352ba9 100644
--- a/app/src/main/res/menu/topic_menu.xml
+++ b/app/src/main/res/menu/topic_menu.xml
@@ -5,15 +5,15 @@
android:id="@+id/menu_bookmark"
android:icon="@drawable/ic_bookmark_false_accent_24dp"
app:showAsAction="ifRoom"
- android:title="@string/bookmark">
+ android:title="@string/bookmark" />