PR merge fix, Fix for vector drawables

app/src/main/java/gr/thmmy/mthmmy/activities/topic/TopicActivity.java

@@ -7,6 +7,7 @@ import android.content.Context;
 import android.content.Intent;
 import android.graphics.Rect;
 import android.net.Uri;
+import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
 import android.support.design.widget.FloatingActionButton;

app/src/main/java/gr/thmmy/mthmmy/activities/topic/TopicAdapter.java

@@ -351,9 +351,7 @@ class TopicAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
                 holder.userExtraInfo.setOnClickListener(null);
             }
 
-            holder.overflowButton.setOnClickListener(new View.OnClickListener() {
+            holder.overflowButton.setOnClickListener(view -> {
-                @Override
-                public void onClick(View view) {
                 //Inflates the popup menu content
                 LayoutInflater layoutInflater = (LayoutInflater) context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
                 if (layoutInflater == null) {
@@ -371,19 +369,17 @@ class TopicAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
                 TextView shareButton = popUpContent.findViewById(R.id.post_share_button);
                 Drawable shareStartDrawable = AppCompatResources.getDrawable(context, R.drawable.ic_share_white_24dp);
                 shareButton.setCompoundDrawablesRelativeWithIntrinsicBounds(shareStartDrawable, null, null, null);
-                    shareButton.setOnClickListener(new View.OnClickListener() {
+                shareButton.setOnClickListener(v -> {
-                        @Override
+                    Intent sendIntent = new Intent(Intent.ACTION_SEND);
-                        public void onClick(View v) {
-                            Intent sendIntent = new Intent(android.content.Intent.ACTION_SEND);
                     sendIntent.setType("text/plain");
-                            sendIntent.putExtra(android.content.Intent.EXTRA_TEXT, currentPost.getPostURL());
+                    sendIntent.putExtra(Intent.EXTRA_TEXT, currentPost.getPostURL());
                     context.startActivity(Intent.createChooser(sendIntent, "Share via"));
                     popUp.dismiss();
-                        }
                 });
-                }
 
                 final TextView editPostButton = popUpContent.findViewById(R.id.edit_post);
+                Drawable editStartDrawable = AppCompatResources.getDrawable(context, R.drawable.ic_edit_white_24dp);
+                editPostButton.setCompoundDrawablesRelativeWithIntrinsicBounds(editStartDrawable, null, null, null);
 
                 if (viewModel.isEditingPost() || currentPost.getPostEditURL() == null || currentPost.getPostEditURL().equals("")) {
                     editPostButton.setVisibility(View.GONE);
@@ -401,23 +397,14 @@ class TopicAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
                 } else {
                     Drawable deleteStartDrawable = AppCompatResources.getDrawable(context, R.drawable.ic_delete_white_24dp);
                     deletePostButton.setCompoundDrawablesRelativeWithIntrinsicBounds(deleteStartDrawable, null, null, null);
-                        popUpContent.findViewById(R.id.delete_post).setOnClickListener(new View.OnClickListener() {
+                    popUpContent.findViewById(R.id.delete_post).setOnClickListener(v -> {
-                            @Override
-                            public void onClick(View v) {
                         new AlertDialog.Builder(holder.overflowButton.getContext())
                                 .setTitle("Delete post")
                                 .setMessage("Do you really want to delete this post?")
                                 .setIcon(android.R.drawable.ic_dialog_alert)
-                                        .setPositiveButton(android.R.string.yes, new DialogInterface.OnClickListener() {
+                                .setPositiveButton(android.R.string.yes, (dialog, whichButton) -> viewModel.deletePost(currentPost.getPostDeleteURL()))
-
-                                            @Override
-                                            public void onClick(DialogInterface dialog, int whichButton) {
-                                                deleteTask.execute(currentPost.getPostDeleteURL());
-                                            }
-                                        })
                                 .setNegativeButton(android.R.string.no, null).show();
                         popUp.dismiss();
-                            }
                     });
                 }
 

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

@@ -38,7 +38,6 @@
         android:layout_height="35dp"
         android:background="?android:attr/selectableItemBackground"
         android:drawablePadding="5dp"
-        android:drawableStart="@drawable/ic_edit_white_24dp"
         android:gravity="center_vertical"
         android:paddingBottom="6dp"
         android:paddingEnd="12dp"