diff --git a/TMessagesProj/src/main/java/org/telegram/ui/ActionBar/ActionBar.java b/TMessagesProj/src/main/java/org/telegram/ui/ActionBar/ActionBar.java index 0902b3e18..05cd2f56e 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/ActionBar/ActionBar.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/ActionBar/ActionBar.java @@ -117,6 +117,7 @@ public class ActionBar extends FrameLayout { subtitleTextView = new SimpleTextView(getContext()); subtitleTextView.setGravity(Gravity.LEFT); subtitleTextView.setTextColor(Theme.ACTION_BAR_SUBTITLE_COLOR); + subtitleTextView.setTextSize(Theme.ACTION_BAR_SUBTITLE_TEXT_SIZE); addView(subtitleTextView, 0, LayoutHelper.createFrame(LayoutHelper.WRAP_CONTENT, LayoutHelper.WRAP_CONTENT, Gravity.LEFT | Gravity.TOP)); } @@ -419,7 +420,7 @@ public class ActionBar extends FrameLayout { } if (subtitleTextView != null && subtitleTextView.getVisibility() != GONE) { - subtitleTextView.setTextSize(!AndroidUtilities.isTablet() && getResources().getConfiguration().orientation == Configuration.ORIENTATION_LANDSCAPE ? 14 : 16); + //subtitleTextView.setTextSize(!AndroidUtilities.isTablet() && getResources().getConfiguration().orientation == Configuration.ORIENTATION_LANDSCAPE ? 14 : 16); subtitleTextView.measure(MeasureSpec.makeMeasureSpec(availableWidth, MeasureSpec.AT_MOST), MeasureSpec.makeMeasureSpec(AndroidUtilities.dp(20), MeasureSpec.AT_MOST)); } } diff --git a/TMessagesProj/src/main/java/org/telegram/ui/ActionBar/Theme.java b/TMessagesProj/src/main/java/org/telegram/ui/ActionBar/Theme.java index f3a699a57..a54911280 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/ActionBar/Theme.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/ActionBar/Theme.java @@ -35,6 +35,7 @@ public class Theme { public static final int ACTION_BAR_SUBTITLE_COLOR = 0xffd5e8f7; public static final int ACTION_BAR_ACTION_MODE_TEXT_COLOR = 0xff737373; public static final int ACTION_BAR_SELECTOR_COLOR = 0xff406d94; + public static final int ACTION_BAR_SUBTITLE_TEXT_SIZE = 14; public static final int INPUT_FIELD_SELECTOR_COLOR = 0xffd6d6d6; public static final int ACTION_BAR_PICKER_SELECTOR_COLOR = 0xff3d3d3d; diff --git a/TMessagesProj/src/main/java/org/telegram/ui/Components/ChatAvatarContainer.java b/TMessagesProj/src/main/java/org/telegram/ui/Components/ChatAvatarContainer.java index cc59c7bb6..1fc7a644d 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/Components/ChatAvatarContainer.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/Components/ChatAvatarContainer.java @@ -51,7 +51,7 @@ public class ChatAvatarContainer extends FrameLayout { subtitleTextView = new SimpleTextView(context); subtitleTextView.setTextColor(Theme.ACTION_BAR_SUBTITLE_COLOR); - subtitleTextView.setTextSize(14); + subtitleTextView.setTextSize(Theme.ACTION_BAR_SUBTITLE_TEXT_SIZE); subtitleTextView.setGravity(Gravity.LEFT); addView(subtitleTextView); diff --git a/TMessagesProj/src/main/java/org/telegram/ui/ContactsActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/ContactsActivity.java index 395e76f5f..8cec11420 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/ContactsActivity.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/ContactsActivity.java @@ -73,6 +73,7 @@ public class ContactsActivity extends BaseFragment implements NotificationCenter private ContactsActivityDelegate delegate; private String title; + private String subtitle; public interface ContactsActivityDelegate { void didSelectContact(TLRPC.User user, String param); @@ -100,6 +101,7 @@ public class ContactsActivity extends BaseFragment implements NotificationCenter if( arguments.getBoolean("do_create_new_chat", false) ) { title = LocaleController.getString("NewChat", R.string.NewChat); + subtitle = LocaleController.getString("SendMessageTo", R.string.SendMessageTo); } @@ -126,6 +128,9 @@ public class ContactsActivity extends BaseFragment implements NotificationCenter actionBar.setAllowOverlayTitle(true); if( title != null ) { actionBar.setTitle(title); + if( subtitle != null ) { + actionBar.setSubtitle(subtitle); + } } actionBar.setActionBarMenuOnItemClick(new ActionBar.ActionBarMenuOnItemClick() { diff --git a/TMessagesProj/src/main/java/org/telegram/ui/GroupCreateActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/GroupCreateActivity.java index 619c08454..2a2850d6b 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/GroupCreateActivity.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/GroupCreateActivity.java @@ -75,7 +75,6 @@ public class GroupCreateActivity extends BaseFragment implements NotificationCen private int beforeChangeIndex; private boolean ignoreChange; private CharSequence changeString; - private int maxCount = 5000; private int chatType = ChatObject.CHAT_TYPE_CHAT; private boolean isAlwaysShare; private boolean isNeverShare; @@ -97,7 +96,6 @@ public class GroupCreateActivity extends BaseFragment implements NotificationCen isAlwaysShare = args.getBoolean("isAlwaysShare", false); isNeverShare = args.getBoolean("isNeverShare", false); isGroup = args.getBoolean("isGroup", false); - maxCount = chatType == ChatObject.CHAT_TYPE_CHAT ? MessagesController.getInstance().maxMegagroupCount : MessagesController.getInstance().maxBroadcastCount; } @Override @@ -136,8 +134,8 @@ public class GroupCreateActivity extends BaseFragment implements NotificationCen actionBar.setTitle(LocaleController.getString("NeverShareWithTitle", R.string.NeverShareWithTitle)); } } else { - actionBar.setTitle(chatType == ChatObject.CHAT_TYPE_CHAT ? LocaleController.getString("NewGroup", R.string.NewGroup) : LocaleController.getString("NewBroadcastList", R.string.NewBroadcastList)); - actionBar.setSubtitle(LocaleController.formatString("MembersCount", R.string.MembersCount, selectedContacts.size(), maxCount)); + actionBar.setTitle(LocaleController.getString("NewGroup", R.string.NewGroup)); + actionBar.setSubtitle(LocaleController.formatPluralString("Members", selectedContacts.size())); } actionBar.setActionBarMenuOnItemClick(new ActionBar.ActionBarMenuOnItemClick() { @@ -253,7 +251,7 @@ public class GroupCreateActivity extends BaseFragment implements NotificationCen } } if (!isAlwaysShare && !isNeverShare) { - actionBar.setSubtitle(LocaleController.formatString("MembersCount", R.string.MembersCount, selectedContacts.size(), maxCount)); + actionBar.setSubtitle(LocaleController.formatPluralString("Members", selectedContacts.size())); } listView.invalidateViews(); } else { @@ -356,9 +354,6 @@ public class GroupCreateActivity extends BaseFragment implements NotificationCen FileLog.e("tmessages", e); } } else { - if (maxCount != 0 && selectedContacts.size() == maxCount) { - return; - } if (chatType == ChatObject.CHAT_TYPE_CHAT && selectedContacts.size() == MessagesController.getInstance().maxGroupCount - 1) { AlertDialog.Builder builder = new AlertDialog.Builder(getParentActivity()); builder.setMessage(LocaleController.getString("SoftUserLimitAlert", R.string.SoftUserLimitAlert)); @@ -372,7 +367,7 @@ public class GroupCreateActivity extends BaseFragment implements NotificationCen ignoreChange = false; } if (!isAlwaysShare && !isNeverShare) { - actionBar.setSubtitle(LocaleController.formatString("MembersCount", R.string.MembersCount, selectedContacts.size(), maxCount)); + actionBar.setSubtitle(LocaleController.formatPluralString("Members", selectedContacts.size())); } if (searching || searchWas) { ignoreChange = true;