refactor: minor refactoring

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

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"></androidx.appcompat.widget.Toolbar>
+            app:popupTheme="@style/ToolbarTheme" />
 
         <com.google.android.material.tabs.TabLayout
             android:id="@+id/bookmark_tabs"

app/src/main/res/layout/activity_topic.xml

@@ -148,6 +148,7 @@
         android:layout_gravity="bottom|end"
         android:layout_marginEnd="@dimen/fab_margins"
         android:layout_marginBottom="50dp"
+        android:contentDescription="@string/reply_button"
         app:layout_behavior="gr.thmmy.mthmmy.utils.ui.ScrollAwareFABBehavior"
         app:srcCompat="@drawable/ic_reply" />
 </androidx.coordinatorlayout.widget.CoordinatorLayout>

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"></item>
+        android:title="@string/upload_button" />
 </menu>

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"></item>
+        android:title="@string/refresh" />
 </menu>

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"></item>
+        android:title="@string/bookmark" />
     <item
         android:id="@+id/menu_share"
         android:icon="@drawable/ic_share_white_24dp"
         app:showAsAction="ifRoom"
-        android:title="@string/share"></item>
+        android:title="@string/share" />
     <item
         android:id="@+id/menu_info"
         android:icon="@drawable/ic_info_outline_white_24dp"
         app:showAsAction="ifRoom"
-        android:title="@string/info"></item>
+        android:title="@string/info" />
 </menu>

app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@color/ic_launcher_background" />
+    <background android:drawable="@color/primary_light" />
     <foreground android:drawable="@drawable/ic_launcher_foreground" />
 </adaptive-icon>

app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@color/ic_launcher_background" />
+    <background android:drawable="@color/primary_light" />
     <foreground android:drawable="@drawable/ic_launcher_foreground" />
 </adaptive-icon>

app/src/main/res/values/ic_launcher_background.xml

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <color name="ic_launcher_background">#333333</color>
-</resources>

app/src/main/res/values/strings.xml

@@ -76,6 +76,7 @@
     </plurals>
     <string name="show_vote_options_button">hide results</string>
     <string name="pref_topic_drafts_key">preference-topic-drafts-key</string>
+    <string name="reply_button">Reply</string>
 
     <!--Profile Activity-->
     <string name="username">Username</string>