From 258633b6728fa4811137e96b6bcd60c45a2c726f Mon Sep 17 00:00:00 2001 From: "B. Petersen" Date: Wed, 11 Jan 2017 14:36:43 +0100 Subject: [PATCH] Propose a message as a draft for new created groups. --- MessengerProj/jni/mrwrapper.c | 7 +++++++ .../src/main/java/com/b44t/messenger/MrChat.java | 3 +++ .../main/java/com/b44t/messenger/MrMailbox.java | 2 +- .../src/main/java/com/b44t/ui/ChatActivity.java | 14 ++++++++++++-- MessengerProj/src/main/res/values-de/strings.xml | 2 ++ MessengerProj/src/main/res/values/strings.xml | 2 ++ 6 files changed, 27 insertions(+), 3 deletions(-) diff --git a/MessengerProj/jni/mrwrapper.c b/MessengerProj/jni/mrwrapper.c index 5201a4a50..e368c8c82 100644 --- a/MessengerProj/jni/mrwrapper.c +++ b/MessengerProj/jni/mrwrapper.c @@ -558,6 +558,13 @@ JNIEXPORT jstring Java_com_b44t_messenger_MrChat_getSubtitle(JNIEnv *env, jclass } +JNIEXPORT jint Java_com_b44t_messenger_MrChat_getParamInt(JNIEnv *env, jclass cls, jint key, jint def) +{ + mrchat_t* ths = get_mrchat_t(env, cls); + return mrparam_get_int(ths? ths->m_param:NULL, key, def); +} + + JNIEXPORT jstring Java_com_b44t_messenger_MrChat_MrChatGetDraft(JNIEnv *env, jclass c, jlong hChat) /* returns NULL for "no draft" */ { mrchat_t* ths = (mrchat_t*)hChat; diff --git a/MessengerProj/src/main/java/com/b44t/messenger/MrChat.java b/MessengerProj/src/main/java/com/b44t/messenger/MrChat.java index d36e71618..f6db9c53a 100644 --- a/MessengerProj/src/main/java/com/b44t/messenger/MrChat.java +++ b/MessengerProj/src/main/java/com/b44t/messenger/MrChat.java @@ -50,6 +50,9 @@ public class MrChat { public native String getName(); public native String getSubtitle(); + public static int MR_CHAT_PARAM_UNPROMOTED = 'U'; + public native int getParamInt(int key, int def); + public String getDraft() { return MrChatGetDraft(m_hChat); } diff --git a/MessengerProj/src/main/java/com/b44t/messenger/MrMailbox.java b/MessengerProj/src/main/java/com/b44t/messenger/MrMailbox.java index 0e2195c6d..d08ea68d8 100644 --- a/MessengerProj/src/main/java/com/b44t/messenger/MrMailbox.java +++ b/MessengerProj/src/main/java/com/b44t/messenger/MrMailbox.java @@ -301,7 +301,7 @@ public class MrMailbox { MrStockAddStr(11, LocaleController.getString("AttachAudio", R.string.AttachAudio)); MrStockAddStr(12, LocaleController.getString("AttachDocument", R.string.AttachDocument)); MrStockAddStr(13, LocaleController.getString("DefaultStatusText", R.string.DefaultStatusText)); - MrStockAddStr(14, LocaleController.getString("SubjectPrefix", R.string.SubjectPrefix)); + MrStockAddStr(14, LocaleController.getString("MsgNewGroupDraft", R.string.MsgNewGroupDraft)); } public static String getInviteText() { diff --git a/MessengerProj/src/main/java/com/b44t/ui/ChatActivity.java b/MessengerProj/src/main/java/com/b44t/ui/ChatActivity.java index eaed32cd7..03ef6a80f 100644 --- a/MessengerProj/src/main/java/com/b44t/ui/ChatActivity.java +++ b/MessengerProj/src/main/java/com/b44t/ui/ChatActivity.java @@ -816,7 +816,14 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not }); TextView emptyView = new TextView(context); - emptyView.setText(LocaleController.getString("NoMessages", R.string.NoMessages)); + + if( m_mrChat.getParamInt(MrChat.MR_CHAT_PARAM_UNPROMOTED, 0)==1 ) { + emptyView.setText(LocaleController.getString("MsgNewGroupDraftHint", R.string.MsgNewGroupDraftHint)); + } + else { + emptyView.setText(LocaleController.getString("NoMessages", R.string.NoMessages)); + } + emptyView.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 14); emptyView.setGravity(Gravity.CENTER); emptyView.setTextColor(Theme.CHAT_EMPTY_VIEW_TEXT_COLOR); @@ -824,7 +831,10 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not emptyView.getBackground().setColorFilter(Theme.colorFilter); emptyView.setTypeface(AndroidUtilities.getTypeface("fonts/rmedium.ttf")); emptyView.setPadding(AndroidUtilities.dp(10), AndroidUtilities.dp(2), AndroidUtilities.dp(10), AndroidUtilities.dp(3)); - emptyViewContainer.addView(emptyView, new FrameLayout.LayoutParams(LayoutHelper.WRAP_CONTENT, LayoutHelper.WRAP_CONTENT, Gravity.CENTER)); + FrameLayout.LayoutParams fl = new FrameLayout.LayoutParams(LayoutHelper.WRAP_CONTENT, LayoutHelper.WRAP_CONTENT, Gravity.CENTER); + fl.leftMargin = AndroidUtilities.dp(24); + fl.rightMargin = AndroidUtilities.dp(24); + emptyViewContainer.addView(emptyView, fl); if (chatActivityEnterView != null) { chatActivityEnterView.onDestroy(); diff --git a/MessengerProj/src/main/res/values-de/strings.xml b/MessengerProj/src/main/res/values-de/strings.xml index 2d79dae99..7803084b0 100644 --- a/MessengerProj/src/main/res/values-de/strings.xml +++ b/MessengerProj/src/main/res/values-de/strings.xml @@ -568,4 +568,6 @@ Alle Benachrichtigungseinstellungen und Töne dieser Seite, der Kontakte und der Gruppen zurücksetzen? Dateien anhängen Bitte einen Namen für die Gruppe eingeben. + Hallo, ich habe die Gruppe \"_\" für uns erstellt. + Eine erste Nachricht schreiben; dann können die anderen in der Gruppe antworten. diff --git a/MessengerProj/src/main/res/values/strings.xml b/MessengerProj/src/main/res/values/strings.xml index 24c0140b8..3d260a4f6 100644 --- a/MessengerProj/src/main/res/values/strings.xml +++ b/MessengerProj/src/main/res/values/strings.xml @@ -568,4 +568,6 @@ Attach files Chats Please enter a name for the group. + Write a first message to allow others to reply in this group. + Hello, I\'ve just created the group \"_\" for us.