diff --git a/MessengerProj/src/main/java/com/b44t/ui/ChatActivity.java b/MessengerProj/src/main/java/com/b44t/ui/ChatActivity.java index c3bd8054e..f1b4fa813 100644 --- a/MessengerProj/src/main/java/com/b44t/ui/ChatActivity.java +++ b/MessengerProj/src/main/java/com/b44t/ui/ChatActivity.java @@ -202,6 +202,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not private final static int id_info = 20; private final static int id_search = 40; private final static int id_chat_compose_panel = 1000; + TextView m_replyMenuItem, m_infoMenuItem; public ChatActivity(Bundle args) { super(args); @@ -679,11 +680,15 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not actionModeSubTextView.setGravity(Gravity.LEFT); actionModeSubTextView.setTextColor(Theme.ACTION_BAR_ACTION_MODE_TEXT_COLOR); actionModeTitleContainer.addView(actionModeSubTextView, LayoutHelper.createFrame(LayoutHelper.MATCH_PARENT, LayoutHelper.MATCH_PARENT)); - actionModeViews.add(actionMode.addItem(id_info, R.drawable.ic_ab_info, Theme.ACTION_BAR_MODE_SELECTOR_COLOR, null, AndroidUtilities.dp(54))); - actionModeViews.add(actionMode.addItem(id_reply, R.drawable.ic_ab_reply, Theme.ACTION_BAR_MODE_SELECTOR_COLOR, null, AndroidUtilities.dp(54))); - actionModeViews.add(actionMode.addItem(id_copy, R.drawable.ic_ab_fwd_copy, Theme.ACTION_BAR_MODE_SELECTOR_COLOR, null, AndroidUtilities.dp(54))); actionModeViews.add(actionMode.addItem(id_delete_messages, R.drawable.ic_ab_fwd_delete, Theme.ACTION_BAR_MODE_SELECTOR_COLOR, null, AndroidUtilities.dp(54))); actionModeViews.add(actionMode.addItem(id_forward, R.drawable.ic_ab_fwd_forward, Theme.ACTION_BAR_MODE_SELECTOR_COLOR, null, AndroidUtilities.dp(54))); + ActionBarMenuItem submenu = actionMode.addItem(0, R.drawable.ic_ab_other_grey); + if( isChatWithDeaddrop ) { + m_replyMenuItem = submenu.addSubItem(id_reply, LocaleController.getString("Reply", R.string.Reply), 0); + } + submenu.addSubItem(id_copy, LocaleController.getString("CopyToClipboard", R.string.CopyToClipboard), 0); + m_infoMenuItem = submenu.addSubItem(id_info, LocaleController.getString("Info", R.string.Info), 0); + actionModeViews.add(submenu); checkActionBarMenu(); fragmentView = new SizeNotifierFrameLayout(context) { @@ -1702,41 +1707,9 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not if (selectedMessagesIds.isEmpty() ) { actionBar.hideActionMode(); } else { - final int newVisibility = selectedMessagesIds.size() == 1 ? View.VISIBLE : View.GONE; - - final ActionBarMenuItem infoItem = actionBar.createActionMode().getItem(id_info); - final ActionBarMenuItem replyItem = actionBar.createActionMode().getItem(id_reply); - - if (infoItem != null && replyItem != null - && (infoItem.getVisibility() != newVisibility || replyItem.getVisibility()!=newVisibility)) { - if( iconAnimator != null ) { - iconAnimator.cancel(); - iconAnimator = null; - } - iconAnimator = ObjectAnimator.ofFloat(this, "progress", 1, 0); - iconAnimator.setDuration(100); - iconAnimator.addListener(new AnimatorListenerAdapterProxy() { - @Override - public void onAnimationEnd(Animator animation) { - iconAnimator = null; - if( newVisibility==View.VISIBLE) { - infoItem.setVisibility(newVisibility); - } - else { - replyItem.setVisibility(newVisibility); - } - } - }); - iconAnimator.start(); - - if( newVisibility==View.VISIBLE) { - replyItem.setVisibility(newVisibility); - } - else { - infoItem.setVisibility(newVisibility); - } - } - + int newVisibility = selectedMessagesIds.size() == 1 ? View.VISIBLE : View.GONE; + if( m_infoMenuItem != null ) { m_infoMenuItem.setVisibility(newVisibility); } + if( m_replyMenuItem != null ) { m_replyMenuItem.setVisibility(newVisibility); } } } } diff --git a/MessengerProj/src/main/res/drawable-hdpi/ic_ab_fwd_copy.png b/MessengerProj/src/main/res/drawable-hdpi/ic_ab_fwd_copy.png deleted file mode 100755 index 64ed7cd05..000000000 Binary files a/MessengerProj/src/main/res/drawable-hdpi/ic_ab_fwd_copy.png and /dev/null differ diff --git a/MessengerProj/src/main/res/drawable-hdpi/ic_ab_info.png b/MessengerProj/src/main/res/drawable-hdpi/ic_ab_info.png deleted file mode 100644 index 905135a22..000000000 Binary files a/MessengerProj/src/main/res/drawable-hdpi/ic_ab_info.png and /dev/null differ diff --git a/MessengerProj/src/main/res/drawable-hdpi/ic_ab_new.png b/MessengerProj/src/main/res/drawable-hdpi/ic_ab_new.png deleted file mode 100755 index c06f2c593..000000000 Binary files a/MessengerProj/src/main/res/drawable-hdpi/ic_ab_new.png and /dev/null differ diff --git a/MessengerProj/src/main/res/drawable-hdpi/ic_ab_other_grey.png b/MessengerProj/src/main/res/drawable-hdpi/ic_ab_other_grey.png new file mode 100755 index 000000000..8e6972b65 Binary files /dev/null and b/MessengerProj/src/main/res/drawable-hdpi/ic_ab_other_grey.png differ diff --git a/MessengerProj/src/main/res/drawable-hdpi/ic_create.png b/MessengerProj/src/main/res/drawable-hdpi/ic_create.png deleted file mode 100644 index 82966ed28..000000000 Binary files a/MessengerProj/src/main/res/drawable-hdpi/ic_create.png and /dev/null differ diff --git a/MessengerProj/src/main/res/drawable-hdpi/ic_keyboard_w.png b/MessengerProj/src/main/res/drawable-hdpi/ic_keyboard_w.png deleted file mode 100755 index f0b6a5da5..000000000 Binary files a/MessengerProj/src/main/res/drawable-hdpi/ic_keyboard_w.png and /dev/null differ diff --git a/MessengerProj/src/main/res/drawable-mdpi/ic_ab_fwd_copy.png b/MessengerProj/src/main/res/drawable-mdpi/ic_ab_fwd_copy.png deleted file mode 100755 index f8bfd187f..000000000 Binary files a/MessengerProj/src/main/res/drawable-mdpi/ic_ab_fwd_copy.png and /dev/null differ diff --git a/MessengerProj/src/main/res/drawable-mdpi/ic_ab_info.png b/MessengerProj/src/main/res/drawable-mdpi/ic_ab_info.png deleted file mode 100644 index c79f3d9db..000000000 Binary files a/MessengerProj/src/main/res/drawable-mdpi/ic_ab_info.png and /dev/null differ diff --git a/MessengerProj/src/main/res/drawable-mdpi/ic_ab_new.png b/MessengerProj/src/main/res/drawable-mdpi/ic_ab_new.png deleted file mode 100755 index 5d8ee2cc9..000000000 Binary files a/MessengerProj/src/main/res/drawable-mdpi/ic_ab_new.png and /dev/null differ diff --git a/MessengerProj/src/main/res/drawable-mdpi/ic_ab_other_grey.png b/MessengerProj/src/main/res/drawable-mdpi/ic_ab_other_grey.png new file mode 100755 index 000000000..f4b570f0e Binary files /dev/null and b/MessengerProj/src/main/res/drawable-mdpi/ic_ab_other_grey.png differ diff --git a/MessengerProj/src/main/res/drawable-mdpi/ic_create.png b/MessengerProj/src/main/res/drawable-mdpi/ic_create.png deleted file mode 100644 index 289f7933e..000000000 Binary files a/MessengerProj/src/main/res/drawable-mdpi/ic_create.png and /dev/null differ diff --git a/MessengerProj/src/main/res/drawable-mdpi/ic_keyboard_w.png b/MessengerProj/src/main/res/drawable-mdpi/ic_keyboard_w.png deleted file mode 100755 index 1f4614aab..000000000 Binary files a/MessengerProj/src/main/res/drawable-mdpi/ic_keyboard_w.png and /dev/null differ diff --git a/MessengerProj/src/main/res/drawable-xhdpi/ic_ab_fwd_copy.png b/MessengerProj/src/main/res/drawable-xhdpi/ic_ab_fwd_copy.png deleted file mode 100755 index 4bc6df880..000000000 Binary files a/MessengerProj/src/main/res/drawable-xhdpi/ic_ab_fwd_copy.png and /dev/null differ diff --git a/MessengerProj/src/main/res/drawable-xhdpi/ic_ab_info.png b/MessengerProj/src/main/res/drawable-xhdpi/ic_ab_info.png deleted file mode 100755 index 800c83efb..000000000 Binary files a/MessengerProj/src/main/res/drawable-xhdpi/ic_ab_info.png and /dev/null differ diff --git a/MessengerProj/src/main/res/drawable-xhdpi/ic_ab_new.png b/MessengerProj/src/main/res/drawable-xhdpi/ic_ab_new.png deleted file mode 100755 index 71a5fc296..000000000 Binary files a/MessengerProj/src/main/res/drawable-xhdpi/ic_ab_new.png and /dev/null differ diff --git a/MessengerProj/src/main/res/drawable-xhdpi/ic_ab_other_grey.png b/MessengerProj/src/main/res/drawable-xhdpi/ic_ab_other_grey.png new file mode 100755 index 000000000..a41ba6870 Binary files /dev/null and b/MessengerProj/src/main/res/drawable-xhdpi/ic_ab_other_grey.png differ diff --git a/MessengerProj/src/main/res/drawable-xhdpi/ic_create.png b/MessengerProj/src/main/res/drawable-xhdpi/ic_create.png deleted file mode 100644 index 27579452d..000000000 Binary files a/MessengerProj/src/main/res/drawable-xhdpi/ic_create.png and /dev/null differ diff --git a/MessengerProj/src/main/res/drawable-xhdpi/ic_keyboard_w.png b/MessengerProj/src/main/res/drawable-xhdpi/ic_keyboard_w.png deleted file mode 100755 index 4866b74e4..000000000 Binary files a/MessengerProj/src/main/res/drawable-xhdpi/ic_keyboard_w.png and /dev/null differ diff --git a/MessengerProj/src/main/res/drawable-xxhdpi/ic_ab_fwd_copy.png b/MessengerProj/src/main/res/drawable-xxhdpi/ic_ab_fwd_copy.png deleted file mode 100755 index 31054c205..000000000 Binary files a/MessengerProj/src/main/res/drawable-xxhdpi/ic_ab_fwd_copy.png and /dev/null differ diff --git a/MessengerProj/src/main/res/drawable-xxhdpi/ic_ab_info.png b/MessengerProj/src/main/res/drawable-xxhdpi/ic_ab_info.png deleted file mode 100644 index 60d873eea..000000000 Binary files a/MessengerProj/src/main/res/drawable-xxhdpi/ic_ab_info.png and /dev/null differ diff --git a/MessengerProj/src/main/res/drawable-xxhdpi/ic_ab_new.png b/MessengerProj/src/main/res/drawable-xxhdpi/ic_ab_new.png deleted file mode 100755 index 57e0563e3..000000000 Binary files a/MessengerProj/src/main/res/drawable-xxhdpi/ic_ab_new.png and /dev/null differ diff --git a/MessengerProj/src/main/res/drawable-xxhdpi/ic_ab_other_grey.png b/MessengerProj/src/main/res/drawable-xxhdpi/ic_ab_other_grey.png new file mode 100755 index 000000000..936765654 Binary files /dev/null and b/MessengerProj/src/main/res/drawable-xxhdpi/ic_ab_other_grey.png differ diff --git a/MessengerProj/src/main/res/drawable-xxhdpi/ic_create.png b/MessengerProj/src/main/res/drawable-xxhdpi/ic_create.png deleted file mode 100644 index 54d4e808f..000000000 Binary files a/MessengerProj/src/main/res/drawable-xxhdpi/ic_create.png and /dev/null differ diff --git a/MessengerProj/src/main/res/drawable-xxhdpi/ic_keyboard_w.png b/MessengerProj/src/main/res/drawable-xxhdpi/ic_keyboard_w.png deleted file mode 100755 index f6bb99dc9..000000000 Binary files a/MessengerProj/src/main/res/drawable-xxhdpi/ic_keyboard_w.png and /dev/null differ