use styled warning for message error

6 files changed, 21 insertions, 15 deletions

diff --git a/src/main/java/de/pixart/messenger/ui/ConversationsOverviewFragment.java b/src/main/java/de/pixart/messenger/ui/ConversationsOverviewFragment.java
index 4ce263d0a..4f85c97c6 100644
--- a/src/main/java/de/pixart/messenger/ui/ConversationsOverviewFragment.java
+++ b/src/main/java/de/pixart/messenger/ui/ConversationsOverviewFragment.java
@@ -74,7 +74,7 @@ public class ConversationsOverviewFragment extends XmppFragment {
     public static Conversation getSuggestion(Activity activity) {
         final Conversation exception;
         Fragment fragment = activity.getFragmentManager().findFragmentById(R.id.main_fragment);
-        if (fragment != null && fragment instanceof ConversationsOverviewFragment) {
+        if (fragment instanceof ConversationsOverviewFragment) {
             exception = ((ConversationsOverviewFragment) fragment).swipedConversation.peek();
         } else {
             exception = null;
@@ -84,7 +84,7 @@ public class ConversationsOverviewFragment extends XmppFragment {
 
     public static Conversation getSuggestion(Activity activity, Conversation exception) {
         Fragment fragment = activity.getFragmentManager().findFragmentById(R.id.main_fragment);
-        if (fragment != null && fragment instanceof ConversationsOverviewFragment) {
+        if (fragment instanceof ConversationsOverviewFragment) {
             List<Conversation> conversations = ((ConversationsOverviewFragment) fragment).conversations;
             if (conversations.size() > 0) {
                 Conversation suggestion = conversations.get(0);
diff --git a/src/main/java/de/pixart/messenger/ui/PublishProfilePictureActivity.java b/src/main/java/de/pixart/messenger/ui/PublishProfilePictureActivity.java
index e38591848..db81e573b 100644
--- a/src/main/java/de/pixart/messenger/ui/PublishProfilePictureActivity.java
+++ b/src/main/java/de/pixart/messenger/ui/PublishProfilePictureActivity.java
@@ -68,7 +68,7 @@ public class PublishProfilePictureActivity extends XmppActivity implements XmppC
     public void onAvatarPublicationFailed(int res) {
         runOnUiThread(() -> {
             hintOrWarning.setText(res);
-            hintOrWarning.setTextColor(getWarningTextColor());
+            hintOrWarning.setTextAppearance(this, R.style.TextAppearance_Conversations_Body1_Warning);
             hintOrWarning.setVisibility(View.VISIBLE);
             publishing = false;
             togglePublishButton(true, R.string.publish);
@@ -208,7 +208,7 @@ public class PublishProfilePictureActivity extends XmppActivity implements XmppC
         if (bm == null) {
             togglePublishButton(false, R.string.publish);
             this.hintOrWarning.setVisibility(View.VISIBLE);
-            this.hintOrWarning.setTextColor(getWarningTextColor());
+            this.hintOrWarning.setTextAppearance(this, R.style.TextAppearance_Conversations_Body1_Warning);
             this.hintOrWarning.setText(R.string.error_publish_avatar_converting);
             return;
         }
@@ -219,7 +219,7 @@ public class PublishProfilePictureActivity extends XmppActivity implements XmppC
         } else {
             togglePublishButton(false, R.string.publish);
             this.hintOrWarning.setVisibility(View.VISIBLE);
-            this.hintOrWarning.setTextColor(getWarningTextColor());
+            this.hintOrWarning.setTextAppearance(this, R.style.TextAppearance_Conversations_Body1_Warning);
             if (account.getStatus() == Account.State.ONLINE) {
                 this.hintOrWarning.setText(R.string.error_publish_avatar_no_server_support);
             } else {
diff --git a/src/main/java/de/pixart/messenger/ui/XmppActivity.java b/src/main/java/de/pixart/messenger/ui/XmppActivity.java
index e482f3879..ef4882f43 100644
--- a/src/main/java/de/pixart/messenger/ui/XmppActivity.java
+++ b/src/main/java/de/pixart/messenger/ui/XmppActivity.java
@@ -112,7 +112,6 @@ public abstract class XmppActivity extends ActionBarActivity {
     public XmppConnectionService xmppConnectionService;
     public boolean xmppConnectionServiceBound = false;
 
-    protected int mColorRed;
     protected int mColorWarningButton;
     protected int mColorWhite;
 
@@ -405,7 +404,6 @@ public abstract class XmppActivity extends ActionBarActivity {
         ExceptionHelper.init(getApplicationContext());
         new EmojiService(this).init(getPreferences().getBoolean(USE_BUNDLED_EMOJIS, getResources().getBoolean(R.bool.use_bundled_emoji)));
         this.isCameraFeatureAvailable = getPackageManager().hasSystemFeature(PackageManager.FEATURE_CAMERA);
-        mColorRed = ContextCompat.getColor(this, R.color.red800);
         if (isDarkTheme()) {
             mColorWarningButton = ContextCompat.getColor(this, R.color.warning_button_dark);
         } else {
@@ -921,10 +919,6 @@ public abstract class XmppActivity extends ActionBarActivity {
         }
     }
 
-    public int getWarningTextColor() {
-        return this.mColorRed;
-    }
-
     public int getWarningButtonColor() {
         return this.mColorWarningButton;
     }
diff --git a/src/main/java/de/pixart/messenger/ui/adapter/MessageAdapter.java b/src/main/java/de/pixart/messenger/ui/adapter/MessageAdapter.java
index a97f68cd8..b3fd88041 100644
--- a/src/main/java/de/pixart/messenger/ui/adapter/MessageAdapter.java
+++ b/src/main/java/de/pixart/messenger/ui/adapter/MessageAdapter.java
@@ -290,7 +290,11 @@ public class MessageAdapter extends ArrayAdapter<Message> implements CopyTextVie
                 break;
         }
         if (error && type == SENT) {
-            viewHolder.time.setTextAppearance(getContext(), R.style.TextAppearance_Conversations_Caption_Warning);
+            if (darkBackground) {
+                viewHolder.time.setTextAppearance(getContext(), R.style.TextAppearance_Conversations_Caption_Warning_OnDark);
+            } else {
+                viewHolder.time.setTextAppearance(getContext(), R.style.TextAppearance_Conversations_Caption_Warning);
+            }
             DownloadableFile file = activity.xmppConnectionService.getFileBackend().getFile(message);
             if (file.exists()) {
                 if (activity.xmppConnectionService.mHttpConnectionManager.getAutoAcceptFileSize() >= message.getFileParams().size) {
diff --git a/src/main/res/values/colors.xml b/src/main/res/values/colors.xml
index 1d4c78b78..a3c95305c 100644
--- a/src/main/res/values/colors.xml
+++ b/src/main/res/values/colors.xml
@@ -29,7 +29,7 @@
     <color name="grey900_40">#66212121</color>
     <color name="red800">#ffc62828</color>  <!-- red 800 -->
     <color name="red500">#fff44336</color>  <!-- red 500 -->
-    <color name="red700">#ffd32f2f</color> <!-- red 700 -->
+    <color name="red700">#ffd50000</color> <!-- red 700 -->
     <color name="orange500">#ffff9800</color> <!-- orange 500 -->
     <color name="bubble">#ff37474f</color> <!-- blue grey 800 -->
     <color name="realwhite">#ffffffff</color> <!-- white -->
@@ -51,5 +51,5 @@
     <color name="warning_button_dark">#ffC62828</color> <!-- red 800 -->
 
     <!-- scanner -->
-    <color name="scan_result_dots">#ff4caf50</color>  <!-- green 500 -->
+    <color name="scan_result_dots">#ff4caf50</color>
 </resources>
diff --git a/src/main/res/values/styles.xml b/src/main/res/values/styles.xml
index 4418706e1..4b7b84c56 100644
--- a/src/main/res/values/styles.xml
+++ b/src/main/res/values/styles.xml
@@ -23,6 +23,10 @@
         <item name="android:textColorLink">?android:textColorPrimary</item>
     </style>
 
+    <style name="TextAppearance.Conversations.Body1.Warning" parent="TextAppearance.AppCompat.Body1">
+        <item name="android:textColor">?color_warning</item>
+    </style>
+
     <style name="TextAppearance.Conversations.Body1.Linkified" parent="TextAppearance.AppCompat.Body1">
         <item name="android:textSize">?TextSizeBody1</item>
     </style>
@@ -99,7 +103,11 @@
     </style>
 
     <style name="TextAppearance.Conversations.Caption.Warning" parent="TextAppearance.Conversations.Caption">
-        <item name="android:textColor">@color/red800</item>
+        <item name="android:textColor">@color/red700</item>
+    </style>
+
+    <style name="TextAppearance.Conversations.Caption.Warning.OnDark" parent="TextAppearance.Conversations.Caption">
+        <item name="android:textColor">@color/red500</item>
     </style>
 
     <style name="TextAppearance.Conversations.Caption.Highlight" parent="TextAppearance.Conversations.Caption">