awesome-bookmarks/arcanechat-android
3
0
Fork 0
mirror of https://github.com/ArcaneChat/android.git synced 2026-07-03 14:05:24 +02:00
Code Issues Packages Projects Releases 3 Wiki Activity

Prefer the term 'contact' over 'user', unify usage.

Browse Source
This commit is contained in:
B. Petersen
2017-02-18 22:26:16 +01:00
parent 50dfe15f09
commit 31ba521244
13 changed files with 62 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MessengerProj/src/main/java/com/b44t/messenger/NotificationsController.java
+1 -1
View File
@@ -1397,7 +1397,7 @@ public class NotificationsController {
if (chat != null) {
replyToString = String.format(mContext.getString(R.string.ReplyToGroup), name);
} else {
replyToString = String.format(mContext.getString(R.string.ReplyToUser), name);
replyToString = String.format(mContext.getString(R.string.ReplyToContact), name);
}
wearReplyAction = new NotificationCompat.Action.Builder(R.drawable.ic_reply_icon, replyToString, replyPendingIntent).addRemoteInput(remoteInputWear).build();
}
MessengerProj/src/main/java/com/b44t/ui/BlockedUsersActivity.java
+2 -1
View File
@@ -36,6 +36,7 @@ import android.widget.FrameLayout;
import android.widget.ListView;
import android.widget.TextView;
import com.b44t.messenger.ApplicationLoader;
import com.b44t.messenger.LocaleController;
import com.b44t.messenger.MrContact;
import com.b44t.messenger.MrMailbox;
@@ -81,7 +82,7 @@ public class BlockedUsersActivity extends BaseFragment implements NotificationCe
public View createView(Context context) {
actionBar.setBackButtonImage(R.drawable.ic_ab_back);
actionBar.setAllowOverlayTitle(true);
actionBar.setTitle(LocaleController.getString("BlockedUsers", R.string.BlockedUsers));
actionBar.setTitle(ApplicationLoader.applicationContext.getString(R.string.BlockedContacts));
actionBar.setActionBarMenuOnItemClick(new ActionBar.ActionBarMenuOnItemClick() {
@Override
public void onItemClick(int id) {
MessengerProj/src/main/java/com/b44t/ui/ContactsActivity.java
+1 -1
View File
@@ -295,7 +295,7 @@ public class ContactsActivity extends BaseFragment implements NotificationCenter
AndroidUtilities.clearCursorDrawable(userSelectEditText);
frameLayout.addView(userSelectEditText, LayoutHelper.createFrame(LayoutHelper.MATCH_PARENT, LayoutHelper.WRAP_CONTENT, Gravity.TOP | Gravity.LEFT, 10, 0, 10, 0));
userSelectEditText.setHint(LocaleController.getString("SeachUser", R.string.SeachUser));
userSelectEditText.setHint(ApplicationLoader.applicationContext.getString(R.string.Search));
userSelectEditText.setTextIsSelectable(false);
userSelectEditText.addTextChangedListener(new TextWatcher() {
@Override
MessengerProj/src/main/java/com/b44t/ui/PrivacySettingsActivity.java
+1 -1
View File
@@ -291,7 +291,7 @@ public class PrivacySettingsActivity extends BaseFragment implements Notificatio
TextSettingsCell textCell = (TextSettingsCell) view;
if (i == blockedRow) {
String cntStr = String.format("%d", MrMailbox.getBlockedCount());
textCell.setTextAndValue(LocaleController.getString("BlockedUsers", R.string.BlockedUsers), cntStr, true);
textCell.setTextAndValue(ApplicationLoader.applicationContext.getString(R.string.BlockedContacts), cntStr, true);
} else if (i == passcodeRow) {
String val = UserConfig.passcodeHash.length() > 0? LocaleController.getString("Enabled", R.string.Enabled) : LocaleController.getString("Disabled", R.string.Disabled);
textCell.setTextAndValue(LocaleController.getString("Passcode", R.string.Passcode), val, true);
MessengerProj/src/main/java/com/b44t/ui/ProfileActivity.java
+2 -2
View File
@@ -446,7 +446,7 @@ public class ProfileActivity extends BaseFragment implements NotificationCenter.
public void didSelectContact(final int added_user_id) {
if( MrMailbox.isContactInChat(chat_id, added_user_id)!=0 )
{
Toast.makeText(getParentActivity(), ApplicationLoader.applicationContext.getString(R.string.UserAlreadyInGroup), Toast.LENGTH_SHORT).show();
Toast.makeText(getParentActivity(), ApplicationLoader.applicationContext.getString(R.string.ContactAlreadyInGroup), Toast.LENGTH_SHORT).show();
}
else {
AlertDialog.Builder builder = new AlertDialog.Builder(getParentActivity());
@@ -1205,7 +1205,7 @@ public class ProfileActivity extends BaseFragment implements NotificationCenter.
}
if (user_id != 0) {
item.addSubItem(ID_STOP_ENCRYPTION_FOR_THIS_USER, LocaleController.getString("ResetUserKey", R.string.ResetUserKey), 0);
item.addSubItem(ID_STOP_ENCRYPTION_FOR_THIS_USER, ApplicationLoader.applicationContext.getString(R.string.ResetContactsKey), 0);
item.addSubItem(ID_BLOCK_CONTACT, userBlocked()? LocaleController.getString("UnblockContact", R.string.UnblockContact) : LocaleController.getString("BlockContact", R.string.BlockContact), 0);
item.addSubItem(ID_DELETE_CONTACT, LocaleController.getString("DeleteContact", R.string.DeleteContact), 0);
}