From 745bf41395d06909d0e9bc30d1d5bb340844ea2a Mon Sep 17 00:00:00 2001
From: Thodoris1999 <teotyrov@gmail.com>
Date: Tue, 31 Jul 2018 15:38:57 +0300
Subject: [PATCH] resolve conflicts

---
 .../java/gr/thmmy/mthmmy/activities/topic/TopicActivity.java | 1 +
 .../java/gr/thmmy/mthmmy/activities/topic/TopicAdapter.java  | 4 ++--
 .../main/java/gr/thmmy/mthmmy/viewmodel/TopicViewModel.java  | 2 +-
 app/src/main/res/layout/activity_topic_edit_row.xml          | 5 +++--
 4 files changed, 7 insertions(+), 5 deletions(-)

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 edb9069a..497e4b8f 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
@@ -11,6 +11,7 @@ import android.os.Bundle;
 import android.os.Handler;
 import android.support.design.widget.FloatingActionButton;
 import android.support.v7.app.AlertDialog;
+import android.support.v7.app.AppCompatDelegate;
 import android.support.v7.widget.RecyclerView;
 import android.text.SpannableStringBuilder;
 import android.text.TextUtils;
diff --git a/app/src/main/java/gr/thmmy/mthmmy/activities/topic/TopicAdapter.java b/app/src/main/java/gr/thmmy/mthmmy/activities/topic/TopicAdapter.java
index 828d1ca9..c6de5520 100644
--- a/app/src/main/java/gr/thmmy/mthmmy/activities/topic/TopicAdapter.java
+++ b/app/src/main/java/gr/thmmy/mthmmy/activities/topic/TopicAdapter.java
@@ -469,9 +469,9 @@ class TopicAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
                     .resize(THUMBNAIL_SIZE, THUMBNAIL_SIZE)
                     .centerCrop()
                     .error(ResourcesCompat.getDrawable(context.getResources()
-                            , R.drawable.ic_default_user_thumbnail, null))
+                            , R.drawable.ic_default_user_thumbnail_white_24dp, null))
                     .placeholder(ResourcesCompat.getDrawable(context.getResources()
-                            , R.drawable.ic_default_user_thumbnail, null))
+                            , R.drawable.ic_default_user_thumbnail_white_24dp, null))
                     .transform(new CircleTransform())
                     .into(holder.thumbnail);
             holder.username.setText(getSessionManager().getUsername());
diff --git a/app/src/main/java/gr/thmmy/mthmmy/viewmodel/TopicViewModel.java b/app/src/main/java/gr/thmmy/mthmmy/viewmodel/TopicViewModel.java
index d8328d7b..1fb97407 100644
--- a/app/src/main/java/gr/thmmy/mthmmy/viewmodel/TopicViewModel.java
+++ b/app/src/main/java/gr/thmmy/mthmmy/viewmodel/TopicViewModel.java
@@ -104,7 +104,7 @@ public class TopicViewModel extends BaseViewModel implements TopicTask.OnTopicTa
         SessionManager sessionManager = BaseActivity.getSessionManager();
         if (sessionManager.isLoggedIn()) {
             SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
-            includeAppSignature = prefs.getBoolean(SettingsActivity.APP_SIGNATURE_ENABLE_KEY, true);
+            includeAppSignature = prefs.getBoolean(SettingsActivity.POSTING_APP_SIGNATURE_ENABLE_KEY, true);
         }
         toQuoteList.clear();
         new ReplyTask(replyFinishListener, includeAppSignature).execute(subject, reply,
diff --git a/app/src/main/res/layout/activity_topic_edit_row.xml b/app/src/main/res/layout/activity_topic_edit_row.xml
index 8251e987..0e86a581 100644
--- a/app/src/main/res/layout/activity_topic_edit_row.xml
+++ b/app/src/main/res/layout/activity_topic_edit_row.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
@@ -52,7 +53,7 @@
                         android:contentDescription="@string/post_thumbnail"
                         android:maxHeight="@dimen/thumbnail_size"
                         android:maxWidth="@dimen/thumbnail_size"
-                        android:src="@drawable/ic_default_user_thumbnail" />
+                        app:srcCompat="@drawable/ic_default_user_thumbnail_white_24dp" />
                 </FrameLayout>
 
                 <TextView
@@ -110,7 +111,7 @@
                     android:layout_marginEnd="5dp"
                     android:background="@color/card_background"
                     android:contentDescription="@string/submit"
-                    android:src="@drawable/ic_send" />
+                    app:srcCompat="@drawable/ic_send_accent_24dp" />
             </LinearLayout>
         </LinearLayout>
     </android.support.v7.widget.CardView>