diff --git a/MessengerProj/src/main/java/com/b44t/messenger/MessageObject.java b/MessengerProj/src/main/java/com/b44t/messenger/MessageObject.java index 6b5f63849..28dbcf609 100644 --- a/MessengerProj/src/main/java/com/b44t/messenger/MessageObject.java +++ b/MessengerProj/src/main/java/com/b44t/messenger/MessageObject.java @@ -50,7 +50,6 @@ public class MessageObject { public int type = 1000; public int contentType; // one of ChatActivity.ROWTYPE_MESSAGE_CELL, .ROWTYPE_ACTION_CELL or .ROWTYPE_UNREAD_CELL public String dateKey; - public boolean deleted; public float audioProgress; public int audioProgressSec; public ArrayList photoThumbs; diff --git a/MessengerProj/src/main/java/com/b44t/ui/ActionBar/Theme.java b/MessengerProj/src/main/java/com/b44t/ui/ActionBar/Theme.java index fe334e52a..5772f6c65 100644 --- a/MessengerProj/src/main/java/com/b44t/ui/ActionBar/Theme.java +++ b/MessengerProj/src/main/java/com/b44t/ui/ActionBar/Theme.java @@ -53,7 +53,6 @@ public class Theme { public static final int DIALOGS_PRINTING_TEXT_COLOR = 0xff4d83b3; public static final int DIALOGS_DRAFT_TEXT_COLOR = 0xffdd4b39; - public static final int CHAT_UNREAD_TEXT_COLOR = 0xff888888; public static final int CHAT_BOTTOM_OVERLAY_TEXT_COLOR = 0xff7f7f7f; public static final int CHAT_GIF_HINT_TEXT_COLOR = 0xffffffff; public static final int CHAT_EMPTY_VIEW_TEXT_COLOR = 0xffffffff; diff --git a/MessengerProj/src/main/java/com/b44t/ui/Cells/ChatUnreadCell.java b/MessengerProj/src/main/java/com/b44t/ui/Cells/ChatUnreadCell.java index 9b7e96c03..e50fd8347 100644 --- a/MessengerProj/src/main/java/com/b44t/ui/Cells/ChatUnreadCell.java +++ b/MessengerProj/src/main/java/com/b44t/ui/Cells/ChatUnreadCell.java @@ -16,6 +16,7 @@ import android.widget.ImageView; import android.widget.TextView; import com.b44t.messenger.AndroidUtilities; +import com.b44t.messenger.MessagesController; import com.b44t.messenger.R; import com.b44t.ui.Components.LayoutHelper; import com.b44t.ui.ActionBar.Theme; @@ -33,8 +34,8 @@ public class ChatUnreadCell extends FrameLayout { textView = new TextView(context); textView.setPadding(0, 0, 0, AndroidUtilities.dp(1)); - textView.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 14); - textView.setTextColor(Theme.CHAT_UNREAD_TEXT_COLOR); + textView.setTextSize(TypedValue.COMPLEX_UNIT_DIP, MessagesController.getInstance().fontSize-2); + textView.setTextColor(Theme.MSG_IN_TIME_TEXT_COLOR); textView.setTypeface(AndroidUtilities.getTypeface("fonts/rmedium.ttf")); addView(textView, LayoutHelper.createFrame(LayoutHelper.WRAP_CONTENT, LayoutHelper.WRAP_CONTENT, Gravity.CENTER)); }