diff --git a/TMessagesProj/build.gradle b/TMessagesProj/build.gradle index 1772ff6b5..a4db15d09 100644 --- a/TMessagesProj/build.gradle +++ b/TMessagesProj/build.gradle @@ -82,7 +82,7 @@ android { defaultConfig { minSdkVersion 8 targetSdkVersion 19 - versionCode 211 - versionName "1.4.8" + versionCode 212 + versionName "1.4.9" } } diff --git a/TMessagesProj/src/main/java/org/telegram/messenger/ConnectionsManager.java b/TMessagesProj/src/main/java/org/telegram/messenger/ConnectionsManager.java index 9eac980fd..4810aaafe 100644 --- a/TMessagesProj/src/main/java/org/telegram/messenger/ConnectionsManager.java +++ b/TMessagesProj/src/main/java/org/telegram/messenger/ConnectionsManager.java @@ -53,8 +53,7 @@ public class ConnectionsManager implements Action.ActionDelegate, TcpConnection. public int currentDatacenterId; public int movingToDatacenterId; private long lastOutgoingMessageId = 0; - private int useDifferentBackend = 0; - private final int SESSION_VERSION = 2; + private int isTestBackend = 0; public int timeDifference = 0; public int currentPingTime; private int lastDestroySessionRequestTime; @@ -228,7 +227,30 @@ public class ConnectionsManager implements Action.ActionDelegate, TcpConnection. } } - void loadSession() { + public void switchBackend() { + Utilities.stageQueue.postRunnable(new Runnable() { + @Override + public void run() { + if (isTestBackend == 0) { + isTestBackend = 1; + } else { + isTestBackend = 0; + } + datacenters.clear(); + fillDatacenters(); + saveSession(); + Utilities.stageQueue.postRunnable(new Runnable() { + @Override + public void run() { + UserConfig.clearConfig(); + System.exit(0); + } + }); + } + }); + } + + private void loadSession() { Utilities.stageQueue.postRunnable(new Runnable() { @Override public void run() { @@ -236,68 +258,61 @@ public class ConnectionsManager implements Action.ActionDelegate, TcpConnection. if (configFile.exists()) { try { SerializedData data = new SerializedData(configFile); - int datacenterSetId = data.readInt32(); + isTestBackend = data.readInt32(); int version = data.readInt32(); - - if (datacenterSetId == useDifferentBackend && version == SESSION_VERSION) { - sessionsToDestroy.clear(); - int count = data.readInt32(); - for (int a = 0; a < count; a++) { - sessionsToDestroy.add(data.readInt64()); - } - timeDifference = data.readInt32(); - count = data.readInt32(); - for (int a = 0; a < count; a++) { - Datacenter datacenter = new Datacenter(data, 0); - datacenters.put(datacenter.datacenterId, datacenter); - } - currentDatacenterId = data.readInt32(); - } else { - UserConfig.clearConfig(); + sessionsToDestroy.clear(); + int count = data.readInt32(); + for (int a = 0; a < count; a++) { + sessionsToDestroy.add(data.readInt64()); } + timeDifference = data.readInt32(); + count = data.readInt32(); + for (int a = 0; a < count; a++) { + Datacenter datacenter = new Datacenter(data, 0); + datacenters.put(datacenter.datacenterId, datacenter); + } + currentDatacenterId = data.readInt32(); } catch (Exception e) { UserConfig.clearConfig(); } } else { SharedPreferences preferences = ApplicationLoader.applicationContext.getSharedPreferences("dataconfig", Context.MODE_PRIVATE); - int datacenterSetId = preferences.getInt("datacenterSetId", 0); - if (datacenterSetId == useDifferentBackend) { - currentDatacenterId = preferences.getInt("currentDatacenterId", 0); - timeDifference = preferences.getInt("timeDifference", 0); - lastDcUpdateTime = preferences.getInt("lastDcUpdateTime", 0); - try { - sessionsToDestroy.clear(); - String sessionsString = preferences.getString("sessionsToDestroy", null); - if (sessionsString != null) { - byte[] sessionsBytes = Base64.decode(sessionsString, Base64.DEFAULT); - if (sessionsBytes != null) { - SerializedData data = new SerializedData(sessionsBytes); - int count = data.readInt32(); - for (int a = 0; a < count; a++) { - sessionsToDestroy.add(data.readInt64()); - } + isTestBackend = preferences.getInt("datacenterSetId", 0); + currentDatacenterId = preferences.getInt("currentDatacenterId", 0); + timeDifference = preferences.getInt("timeDifference", 0); + lastDcUpdateTime = preferences.getInt("lastDcUpdateTime", 0); + try { + sessionsToDestroy.clear(); + String sessionsString = preferences.getString("sessionsToDestroy", null); + if (sessionsString != null) { + byte[] sessionsBytes = Base64.decode(sessionsString, Base64.DEFAULT); + if (sessionsBytes != null) { + SerializedData data = new SerializedData(sessionsBytes); + int count = data.readInt32(); + for (int a = 0; a < count; a++) { + sessionsToDestroy.add(data.readInt64()); } } - } catch (Exception e) { - FileLog.e("tmessages", e); } + } catch (Exception e) { + FileLog.e("tmessages", e); + } - try { - String datacentersString = preferences.getString("datacenters", null); - if (datacentersString != null) { - byte[] datacentersBytes = Base64.decode(datacentersString, Base64.DEFAULT); - if (datacentersBytes != null) { - SerializedData data = new SerializedData(datacentersBytes); - int count = data.readInt32(); - for (int a = 0; a < count; a++) { - Datacenter datacenter = new Datacenter(data, 1); - datacenters.put(datacenter.datacenterId, datacenter); - } + try { + String datacentersString = preferences.getString("datacenters", null); + if (datacentersString != null) { + byte[] datacentersBytes = Base64.decode(datacentersString, Base64.DEFAULT); + if (datacentersBytes != null) { + SerializedData data = new SerializedData(datacentersBytes); + int count = data.readInt32(); + for (int a = 0; a < count; a++) { + Datacenter datacenter = new Datacenter(data, 1); + datacenters.put(datacenter.datacenterId, datacenter); } } - } catch (Exception e) { - FileLog.e("tmessages", e); } + } catch (Exception e) { + FileLog.e("tmessages", e); } } @@ -310,69 +325,7 @@ public class ConnectionsManager implements Action.ActionDelegate, TcpConnection. } } - if (datacenters.size() == 0) { - if (useDifferentBackend == 0) { - Datacenter datacenter = new Datacenter(); - datacenter.datacenterId = 1; - datacenter.addAddressAndPort("173.240.5.1", 443); - datacenters.put(datacenter.datacenterId, datacenter); - - datacenter = new Datacenter(); - datacenter.datacenterId = 2; - datacenter.addAddressAndPort("109.239.131.193", 443); - datacenters.put(datacenter.datacenterId, datacenter); - - datacenter = new Datacenter(); - datacenter.datacenterId = 3; - datacenter.addAddressAndPort("174.140.142.6", 443); - datacenters.put(datacenter.datacenterId, datacenter); - - datacenter = new Datacenter(); - datacenter.datacenterId = 4; - datacenter.addAddressAndPort("31.210.235.12", 443); - datacenters.put(datacenter.datacenterId, datacenter); - - datacenter = new Datacenter(); - datacenter.datacenterId = 5; - datacenter.addAddressAndPort("116.51.22.2", 443); - datacenters.put(datacenter.datacenterId, datacenter); - } else { - Datacenter datacenter = new Datacenter(); - datacenter.datacenterId = 1; - datacenter.addAddressAndPort("173.240.5.253", 443); - datacenters.put(datacenter.datacenterId, datacenter); - - datacenter = new Datacenter(); - datacenter.datacenterId = 2; - datacenter.addAddressAndPort("109.239.131.195", 443); - datacenters.put(datacenter.datacenterId, datacenter); - - datacenter = new Datacenter(); - datacenter.datacenterId = 3; - datacenter.addAddressAndPort("174.140.142.5", 443); - datacenters.put(datacenter.datacenterId, datacenter); - } - } else if (datacenters.size() == 1) { - Datacenter datacenter = new Datacenter(); - datacenter.datacenterId = 2; - datacenter.addAddressAndPort("109.239.131.193", 443); - datacenters.put(datacenter.datacenterId, datacenter); - - datacenter = new Datacenter(); - datacenter.datacenterId = 3; - datacenter.addAddressAndPort("174.140.142.6", 443); - datacenters.put(datacenter.datacenterId, datacenter); - - datacenter = new Datacenter(); - datacenter.datacenterId = 4; - datacenter.addAddressAndPort("31.210.235.12", 443); - datacenters.put(datacenter.datacenterId, datacenter); - - datacenter = new Datacenter(); - datacenter.datacenterId = 5; - datacenter.addAddressAndPort("116.51.22.2", 443); - datacenters.put(datacenter.datacenterId, datacenter); - } + fillDatacenters(); for (Datacenter datacenter : datacenters.values()) { datacenter.authSessionId = getNewSessionId(); @@ -387,14 +340,80 @@ public class ConnectionsManager implements Action.ActionDelegate, TcpConnection. }); } - void saveSession() { + private void fillDatacenters() { + if (datacenters.size() == 0) { + if (isTestBackend == 0) { + Datacenter datacenter = new Datacenter(); + datacenter.datacenterId = 1; + datacenter.addAddressAndPort("173.240.5.1", 443); + datacenters.put(datacenter.datacenterId, datacenter); + + datacenter = new Datacenter(); + datacenter.datacenterId = 2; + datacenter.addAddressAndPort("109.239.131.193", 443); + datacenters.put(datacenter.datacenterId, datacenter); + + datacenter = new Datacenter(); + datacenter.datacenterId = 3; + datacenter.addAddressAndPort("174.140.142.6", 443); + datacenters.put(datacenter.datacenterId, datacenter); + + datacenter = new Datacenter(); + datacenter.datacenterId = 4; + datacenter.addAddressAndPort("31.210.235.12", 443); + datacenters.put(datacenter.datacenterId, datacenter); + + datacenter = new Datacenter(); + datacenter.datacenterId = 5; + datacenter.addAddressAndPort("116.51.22.2", 443); + datacenters.put(datacenter.datacenterId, datacenter); + } else { + Datacenter datacenter = new Datacenter(); + datacenter.datacenterId = 1; + datacenter.addAddressAndPort("173.240.5.253", 443); + datacenters.put(datacenter.datacenterId, datacenter); + + datacenter = new Datacenter(); + datacenter.datacenterId = 2; + datacenter.addAddressAndPort("109.239.131.195", 443); + datacenters.put(datacenter.datacenterId, datacenter); + + datacenter = new Datacenter(); + datacenter.datacenterId = 3; + datacenter.addAddressAndPort("174.140.142.5", 443); + datacenters.put(datacenter.datacenterId, datacenter); + } + } else if (datacenters.size() == 1) { + Datacenter datacenter = new Datacenter(); + datacenter.datacenterId = 2; + datacenter.addAddressAndPort("109.239.131.193", 443); + datacenters.put(datacenter.datacenterId, datacenter); + + datacenter = new Datacenter(); + datacenter.datacenterId = 3; + datacenter.addAddressAndPort("174.140.142.6", 443); + datacenters.put(datacenter.datacenterId, datacenter); + + datacenter = new Datacenter(); + datacenter.datacenterId = 4; + datacenter.addAddressAndPort("31.210.235.12", 443); + datacenters.put(datacenter.datacenterId, datacenter); + + datacenter = new Datacenter(); + datacenter.datacenterId = 5; + datacenter.addAddressAndPort("116.51.22.2", 443); + datacenters.put(datacenter.datacenterId, datacenter); + } + } + + private void saveSession() { Utilities.stageQueue.postRunnable(new Runnable() { @Override public void run() { try { SharedPreferences preferences = ApplicationLoader.applicationContext.getSharedPreferences("dataconfig", Context.MODE_PRIVATE); SharedPreferences.Editor editor = preferences.edit(); - editor.putInt("datacenterSetId", useDifferentBackend); + editor.putInt("datacenterSetId", isTestBackend); Datacenter currentDatacenter = datacenterWithId(currentDatacenterId); if (currentDatacenter != null) { editor.putInt("currentDatacenterId", currentDatacenterId); diff --git a/TMessagesProj/src/main/java/org/telegram/ui/Cells/ChatOrUserCell.java b/TMessagesProj/src/main/java/org/telegram/ui/Cells/ChatOrUserCell.java index 3d8f526ae..93e70064f 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/Cells/ChatOrUserCell.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/Cells/ChatOrUserCell.java @@ -22,7 +22,6 @@ import org.telegram.PhoneFormat.PhoneFormat; import org.telegram.messenger.LocaleController; import org.telegram.messenger.TLRPC; import org.telegram.messenger.ConnectionsManager; -import org.telegram.messenger.ContactsController; import org.telegram.messenger.MessagesController; import org.telegram.messenger.R; import org.telegram.messenger.UserConfig; @@ -296,27 +295,16 @@ public class ChatOrUserCell extends BaseCell { if (chat != null) { nameString2 = chat.title; } else if (user != null) { - if (user.id / 1000 != 333 && ContactsController.getInstance().contactsDict.get(user.id) == null) { - if (ContactsController.getInstance().contactsDict.size() == 0 && ContactsController.getInstance().loadingContacts) { - nameString2 = Utilities.formatName(user.first_name, user.last_name); - } else { - if (user.phone != null && user.phone.length() != 0) { - nameString2 = PhoneFormat.getInstance().format("+" + user.phone); - } else { - nameString2 = Utilities.formatName(user.first_name, user.last_name); - } - } - } else { - nameString2 = Utilities.formatName(user.first_name, user.last_name); - } + nameString2 = Utilities.formatName(user.first_name, user.last_name); } nameString = nameString2.replace("\n", " "); } if (nameString.length() == 0) { if (user.phone != null && user.phone.length() != 0) { nameString = PhoneFormat.getInstance().format("+" + user.phone); + } else { + nameString = LocaleController.getString("HiddenName", R.string.HiddenName); } - nameString = LocaleController.getString("HiddenName", R.string.HiddenName); } if (encryptedChat != null) { currentNamePaint = nameEncryptedPaint; diff --git a/TMessagesProj/src/main/java/org/telegram/ui/Cells/DialogCell.java b/TMessagesProj/src/main/java/org/telegram/ui/Cells/DialogCell.java index 7662ea06a..b89617a49 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/Cells/DialogCell.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/Cells/DialogCell.java @@ -47,6 +47,7 @@ public class DialogCell extends BaseCell { private static Drawable errorDrawable; private static Drawable lockDrawable; private static Drawable countDrawable; + private static Drawable groupDrawable; private TLRPC.TL_dialog currentDialog; private ImageReceiver avatarImage; @@ -127,6 +128,10 @@ public class DialogCell extends BaseCell { countDrawable = getResources().getDrawable(R.drawable.dialogs_badge); } + if (groupDrawable == null) { + groupDrawable = getResources().getDrawable(R.drawable.grouplist); + } + if (avatarImage == null) { avatarImage = new ImageReceiver(); avatarImage.parentView = new WeakReference(this); @@ -260,6 +265,9 @@ public class DialogCell extends BaseCell { if (cellLayout.drawNameLock) { setDrawableBounds(lockDrawable, cellLayout.nameLockLeft, cellLayout.nameLockTop); lockDrawable.draw(canvas); + } else if (cellLayout.drawNameGroup) { + setDrawableBounds(groupDrawable, cellLayout.nameLockLeft, cellLayout.nameLockTop); + groupDrawable.draw(canvas); } canvas.save(); @@ -313,8 +321,9 @@ public class DialogCell extends BaseCell { private int nameWidth; private StaticLayout nameLayout; private boolean drawNameLock; + private boolean drawNameGroup; private int nameLockLeft; - private int nameLockTop = Utilities.dp(13); + private int nameLockTop; private int timeLeft; private int timeTop = Utilities.dp(13); @@ -359,6 +368,8 @@ public class DialogCell extends BaseCell { if (encryptedChat != null) { drawNameLock = true; + drawNameGroup = false; + nameLockTop = Utilities.dp(13); if (!LocaleController.isRTL) { nameLockLeft = Utilities.dp(77); nameLeft = Utilities.dp(81) + lockDrawable.getIntrinsicWidth(); @@ -368,10 +379,23 @@ public class DialogCell extends BaseCell { } } else { drawNameLock = false; - if (!LocaleController.isRTL) { - nameLeft = Utilities.dp(77); + if (chat != null) { + drawNameGroup = true; + nameLockTop = Utilities.dp(14); + if (!LocaleController.isRTL) { + nameLockLeft = Utilities.dp(77); + nameLeft = Utilities.dp(81) + groupDrawable.getIntrinsicWidth(); + } else { + nameLockLeft = width - Utilities.dp(77) - groupDrawable.getIntrinsicWidth(); + nameLeft = Utilities.dp(14); + } } else { - nameLeft = Utilities.dp(14); + drawNameGroup = false; + if (!LocaleController.isRTL) { + nameLeft = Utilities.dp(77); + } else { + nameLeft = Utilities.dp(14); + } } } @@ -547,6 +571,8 @@ public class DialogCell extends BaseCell { } if (drawNameLock) { nameWidth -= Utilities.dp(4) + lockDrawable.getIntrinsicWidth(); + } else if (drawNameGroup) { + nameWidth -= Utilities.dp(4) + groupDrawable.getIntrinsicWidth(); } if (drawClock) { int w = clockDrawable.getIntrinsicWidth() + Utilities.dp(2); diff --git a/TMessagesProj/src/main/java/org/telegram/ui/LanguageSelectActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/LanguageSelectActivity.java index 53cdb2125..76e837562 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/LanguageSelectActivity.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/LanguageSelectActivity.java @@ -263,11 +263,8 @@ public class LanguageSelectActivity extends BaseFragment { searching = false; searchWas = false; if (listView != null) { - listView.setEmptyView(emptyTextView); emptyTextView.setVisibility(View.GONE); - } - if (listAdapter != null) { - listAdapter.notifyDataSetChanged(); + listView.setAdapter(listAdapter); } ((LaunchActivity)parentActivity).fixBackButton(); return true; diff --git a/TMessagesProj/src/main/java/org/telegram/ui/SettingsActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/SettingsActivity.java index 210623414..53e3be4fe 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/SettingsActivity.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/SettingsActivity.java @@ -77,6 +77,7 @@ public class SettingsActivity extends BaseFragment implements NotificationCenter private int logoutRow; private int sendLogsRow; private int clearLogsRow; + private int switchBackendButtonRow; private int rowCount; private int messagesSectionRow; private int sendByEnterRow; @@ -175,6 +176,7 @@ public class SettingsActivity extends BaseFragment implements NotificationCenter if (BuildVars.DEBUG_VERSION) { sendLogsRow = rowCount++; clearLogsRow = rowCount++; + switchBackendButtonRow = rowCount++; } askQuestionRow = rowCount++; logoutRow = rowCount++; @@ -408,6 +410,18 @@ public class SettingsActivity extends BaseFragment implements NotificationCenter } } else if (i == languageRow) { ((LaunchActivity)parentActivity).presentFragment(new LanguageSelectActivity(), "settings_wallpapers", false); + } else if (i == switchBackendButtonRow) { + AlertDialog.Builder builder = new AlertDialog.Builder(parentActivity); + builder.setMessage(LocaleController.getString("AreYouSure", R.string.AreYouSure)); + builder.setTitle(LocaleController.getString("AppName", R.string.AppName)); + builder.setPositiveButton(LocaleController.getString("OK", R.string.OK), new DialogInterface.OnClickListener() { + @Override + public void onClick(DialogInterface dialogInterface, int i) { + ConnectionsManager.getInstance().switchBackend(); + } + }); + builder.setNegativeButton(LocaleController.getString("Cancel", R.string.Cancel), null); + builder.show().setCanceledOnTouchOutside(true); } // else if (i == 6) { // UserConfig.saveIncomingPhotos = !UserConfig.saveIncomingPhotos; @@ -542,7 +556,8 @@ public class SettingsActivity extends BaseFragment implements NotificationCenter public boolean isEnabled(int i) { return i == textSizeRow || i == enableAnimationsRow || i == blockedRow || i == notificationRow || i == backgroundRow || i == askQuestionRow || i == sendLogsRow || i == sendByEnterRow || i == terminateSessionsRow || i == photoDownloadPrivateRow || - i == photoDownloadChatRow || i == clearLogsRow || i == audioDownloadChatRow || i == audioDownloadPrivateRow || i == languageRow; + i == photoDownloadChatRow || i == clearLogsRow || i == audioDownloadChatRow || i == audioDownloadPrivateRow || i == languageRow || + i == switchBackendButtonRow; } @Override @@ -748,6 +763,9 @@ public class SettingsActivity extends BaseFragment implements NotificationCenter } else if (i == terminateSessionsRow) { textView.setText(LocaleController.getString("TerminateAllSessions", R.string.TerminateAllSessions)); divider.setVisibility(View.INVISIBLE); + } else if (i == switchBackendButtonRow) { + textView.setText("Switch Backend"); + divider.setVisibility(View.VISIBLE); } } else if (type == 3) { if (view == null) { @@ -883,7 +901,7 @@ public class SettingsActivity extends BaseFragment implements NotificationCenter return 5; } else if (i == enableAnimationsRow || i == sendByEnterRow || i == photoDownloadChatRow || i == photoDownloadPrivateRow || i == audioDownloadChatRow || i == audioDownloadPrivateRow) { return 3; - } else if (i == numberRow || i == notificationRow || i == blockedRow || i == backgroundRow || i == askQuestionRow || i == sendLogsRow || i == terminateSessionsRow || i == clearLogsRow) { + } else if (i == numberRow || i == notificationRow || i == blockedRow || i == backgroundRow || i == askQuestionRow || i == sendLogsRow || i == terminateSessionsRow || i == clearLogsRow || i == switchBackendButtonRow) { return 2; } else if (i == logoutRow) { return 4; diff --git a/TMessagesProj/src/main/res/drawable-hdpi/grouplist.png b/TMessagesProj/src/main/res/drawable-hdpi/grouplist.png new file mode 100755 index 000000000..d57569f74 Binary files /dev/null and b/TMessagesProj/src/main/res/drawable-hdpi/grouplist.png differ diff --git a/TMessagesProj/src/main/res/drawable-hdpi/photocancel.png b/TMessagesProj/src/main/res/drawable-hdpi/photocancel.png index 24328d568..7f5b708e7 100755 Binary files a/TMessagesProj/src/main/res/drawable-hdpi/photocancel.png and b/TMessagesProj/src/main/res/drawable-hdpi/photocancel.png differ diff --git a/TMessagesProj/src/main/res/drawable-hdpi/photocancel_pressed.png b/TMessagesProj/src/main/res/drawable-hdpi/photocancel_pressed.png index 39d9fbfe7..c96b2910b 100755 Binary files a/TMessagesProj/src/main/res/drawable-hdpi/photocancel_pressed.png and b/TMessagesProj/src/main/res/drawable-hdpi/photocancel_pressed.png differ diff --git a/TMessagesProj/src/main/res/drawable-hdpi/photogif.png b/TMessagesProj/src/main/res/drawable-hdpi/photogif.png new file mode 100755 index 000000000..26945dd9b Binary files /dev/null and b/TMessagesProj/src/main/res/drawable-hdpi/photogif.png differ diff --git a/TMessagesProj/src/main/res/drawable-hdpi/photogif_pressed.png b/TMessagesProj/src/main/res/drawable-hdpi/photogif_pressed.png new file mode 100755 index 000000000..5cc3e7c45 Binary files /dev/null and b/TMessagesProj/src/main/res/drawable-hdpi/photogif_pressed.png differ diff --git a/TMessagesProj/src/main/res/drawable-hdpi/photoload.png b/TMessagesProj/src/main/res/drawable-hdpi/photoload.png index c3c96fedd..8c8e0ea52 100755 Binary files a/TMessagesProj/src/main/res/drawable-hdpi/photoload.png and b/TMessagesProj/src/main/res/drawable-hdpi/photoload.png differ diff --git a/TMessagesProj/src/main/res/drawable-hdpi/photoload_pressed.png b/TMessagesProj/src/main/res/drawable-hdpi/photoload_pressed.png index 10a31edc3..dc1b5698e 100755 Binary files a/TMessagesProj/src/main/res/drawable-hdpi/photoload_pressed.png and b/TMessagesProj/src/main/res/drawable-hdpi/photoload_pressed.png differ diff --git a/TMessagesProj/src/main/res/drawable-ldpi/grouplist.png b/TMessagesProj/src/main/res/drawable-ldpi/grouplist.png new file mode 100755 index 000000000..aff6d7ab5 Binary files /dev/null and b/TMessagesProj/src/main/res/drawable-ldpi/grouplist.png differ diff --git a/TMessagesProj/src/main/res/drawable-ldpi/photocancel.png b/TMessagesProj/src/main/res/drawable-ldpi/photocancel.png index 0edd56984..e2efce8b5 100755 Binary files a/TMessagesProj/src/main/res/drawable-ldpi/photocancel.png and b/TMessagesProj/src/main/res/drawable-ldpi/photocancel.png differ diff --git a/TMessagesProj/src/main/res/drawable-ldpi/photocancel_pressed.png b/TMessagesProj/src/main/res/drawable-ldpi/photocancel_pressed.png index b616d1799..50050bee7 100755 Binary files a/TMessagesProj/src/main/res/drawable-ldpi/photocancel_pressed.png and b/TMessagesProj/src/main/res/drawable-ldpi/photocancel_pressed.png differ diff --git a/TMessagesProj/src/main/res/drawable-ldpi/photogif.png b/TMessagesProj/src/main/res/drawable-ldpi/photogif.png new file mode 100755 index 000000000..adae3f8d4 Binary files /dev/null and b/TMessagesProj/src/main/res/drawable-ldpi/photogif.png differ diff --git a/TMessagesProj/src/main/res/drawable-ldpi/photogif_pressed.png b/TMessagesProj/src/main/res/drawable-ldpi/photogif_pressed.png new file mode 100755 index 000000000..cffbbd2ba Binary files /dev/null and b/TMessagesProj/src/main/res/drawable-ldpi/photogif_pressed.png differ diff --git a/TMessagesProj/src/main/res/drawable-ldpi/photoload.png b/TMessagesProj/src/main/res/drawable-ldpi/photoload.png index c41e23978..de8b436af 100755 Binary files a/TMessagesProj/src/main/res/drawable-ldpi/photoload.png and b/TMessagesProj/src/main/res/drawable-ldpi/photoload.png differ diff --git a/TMessagesProj/src/main/res/drawable-ldpi/photoload_pressed.png b/TMessagesProj/src/main/res/drawable-ldpi/photoload_pressed.png index 0938a65e9..5209e3e98 100755 Binary files a/TMessagesProj/src/main/res/drawable-ldpi/photoload_pressed.png and b/TMessagesProj/src/main/res/drawable-ldpi/photoload_pressed.png differ diff --git a/TMessagesProj/src/main/res/drawable-mdpi/grouplist.png b/TMessagesProj/src/main/res/drawable-mdpi/grouplist.png new file mode 100755 index 000000000..d585fb875 Binary files /dev/null and b/TMessagesProj/src/main/res/drawable-mdpi/grouplist.png differ diff --git a/TMessagesProj/src/main/res/drawable-mdpi/photocancel.png b/TMessagesProj/src/main/res/drawable-mdpi/photocancel.png index 05c00e736..2a5aa52af 100755 Binary files a/TMessagesProj/src/main/res/drawable-mdpi/photocancel.png and b/TMessagesProj/src/main/res/drawable-mdpi/photocancel.png differ diff --git a/TMessagesProj/src/main/res/drawable-mdpi/photocancel_pressed.png b/TMessagesProj/src/main/res/drawable-mdpi/photocancel_pressed.png index 7d6499f8c..a6244f870 100755 Binary files a/TMessagesProj/src/main/res/drawable-mdpi/photocancel_pressed.png and b/TMessagesProj/src/main/res/drawable-mdpi/photocancel_pressed.png differ diff --git a/TMessagesProj/src/main/res/drawable-mdpi/photogif.png b/TMessagesProj/src/main/res/drawable-mdpi/photogif.png new file mode 100755 index 000000000..b3205005b Binary files /dev/null and b/TMessagesProj/src/main/res/drawable-mdpi/photogif.png differ diff --git a/TMessagesProj/src/main/res/drawable-mdpi/photogif_pressed.png b/TMessagesProj/src/main/res/drawable-mdpi/photogif_pressed.png new file mode 100755 index 000000000..66ad8db2e Binary files /dev/null and b/TMessagesProj/src/main/res/drawable-mdpi/photogif_pressed.png differ diff --git a/TMessagesProj/src/main/res/drawable-mdpi/photoload.png b/TMessagesProj/src/main/res/drawable-mdpi/photoload.png index 3fa62f4df..1f27b560c 100755 Binary files a/TMessagesProj/src/main/res/drawable-mdpi/photoload.png and b/TMessagesProj/src/main/res/drawable-mdpi/photoload.png differ diff --git a/TMessagesProj/src/main/res/drawable-mdpi/photoload_pressed.png b/TMessagesProj/src/main/res/drawable-mdpi/photoload_pressed.png index ed5601cbf..5cddd0810 100755 Binary files a/TMessagesProj/src/main/res/drawable-mdpi/photoload_pressed.png and b/TMessagesProj/src/main/res/drawable-mdpi/photoload_pressed.png differ diff --git a/TMessagesProj/src/main/res/drawable-xhdpi/grouplist.png b/TMessagesProj/src/main/res/drawable-xhdpi/grouplist.png new file mode 100755 index 000000000..fc062608b Binary files /dev/null and b/TMessagesProj/src/main/res/drawable-xhdpi/grouplist.png differ diff --git a/TMessagesProj/src/main/res/drawable-xhdpi/photocancel.png b/TMessagesProj/src/main/res/drawable-xhdpi/photocancel.png index 125138024..ed51e34e7 100755 Binary files a/TMessagesProj/src/main/res/drawable-xhdpi/photocancel.png and b/TMessagesProj/src/main/res/drawable-xhdpi/photocancel.png differ diff --git a/TMessagesProj/src/main/res/drawable-xhdpi/photocancel_pressed.png b/TMessagesProj/src/main/res/drawable-xhdpi/photocancel_pressed.png index 890a61b2b..99664ecc5 100755 Binary files a/TMessagesProj/src/main/res/drawable-xhdpi/photocancel_pressed.png and b/TMessagesProj/src/main/res/drawable-xhdpi/photocancel_pressed.png differ diff --git a/TMessagesProj/src/main/res/drawable-xhdpi/photogif.png b/TMessagesProj/src/main/res/drawable-xhdpi/photogif.png new file mode 100755 index 000000000..761339f01 Binary files /dev/null and b/TMessagesProj/src/main/res/drawable-xhdpi/photogif.png differ diff --git a/TMessagesProj/src/main/res/drawable-xhdpi/photogif_pressed.png b/TMessagesProj/src/main/res/drawable-xhdpi/photogif_pressed.png new file mode 100755 index 000000000..a02c37842 Binary files /dev/null and b/TMessagesProj/src/main/res/drawable-xhdpi/photogif_pressed.png differ diff --git a/TMessagesProj/src/main/res/drawable-xhdpi/photoload.png b/TMessagesProj/src/main/res/drawable-xhdpi/photoload.png index e302e1f9e..ca7dae9db 100755 Binary files a/TMessagesProj/src/main/res/drawable-xhdpi/photoload.png and b/TMessagesProj/src/main/res/drawable-xhdpi/photoload.png differ diff --git a/TMessagesProj/src/main/res/drawable-xhdpi/photoload_pressed.png b/TMessagesProj/src/main/res/drawable-xhdpi/photoload_pressed.png index 30bbf25a1..542616bc1 100755 Binary files a/TMessagesProj/src/main/res/drawable-xhdpi/photoload_pressed.png and b/TMessagesProj/src/main/res/drawable-xhdpi/photoload_pressed.png differ diff --git a/TMessagesProj/src/main/res/drawable-xxhdpi/grouplist.png b/TMessagesProj/src/main/res/drawable-xxhdpi/grouplist.png new file mode 100755 index 000000000..b63fa34e3 Binary files /dev/null and b/TMessagesProj/src/main/res/drawable-xxhdpi/grouplist.png differ diff --git a/TMessagesProj/src/main/res/drawable-xxhdpi/photocancel.png b/TMessagesProj/src/main/res/drawable-xxhdpi/photocancel.png index 2e6bc13dc..312e2afec 100755 Binary files a/TMessagesProj/src/main/res/drawable-xxhdpi/photocancel.png and b/TMessagesProj/src/main/res/drawable-xxhdpi/photocancel.png differ diff --git a/TMessagesProj/src/main/res/drawable-xxhdpi/photocancel_pressed.png b/TMessagesProj/src/main/res/drawable-xxhdpi/photocancel_pressed.png index c02928cde..91b39a419 100755 Binary files a/TMessagesProj/src/main/res/drawable-xxhdpi/photocancel_pressed.png and b/TMessagesProj/src/main/res/drawable-xxhdpi/photocancel_pressed.png differ diff --git a/TMessagesProj/src/main/res/drawable-xxhdpi/photogif.png b/TMessagesProj/src/main/res/drawable-xxhdpi/photogif.png new file mode 100755 index 000000000..9fc94f65b Binary files /dev/null and b/TMessagesProj/src/main/res/drawable-xxhdpi/photogif.png differ diff --git a/TMessagesProj/src/main/res/drawable-xxhdpi/photogif_pressed.png b/TMessagesProj/src/main/res/drawable-xxhdpi/photogif_pressed.png new file mode 100755 index 000000000..326deb6c1 Binary files /dev/null and b/TMessagesProj/src/main/res/drawable-xxhdpi/photogif_pressed.png differ diff --git a/TMessagesProj/src/main/res/drawable-xxhdpi/photoload.png b/TMessagesProj/src/main/res/drawable-xxhdpi/photoload.png index 0bc954438..cfa2ac2ce 100755 Binary files a/TMessagesProj/src/main/res/drawable-xxhdpi/photoload.png and b/TMessagesProj/src/main/res/drawable-xxhdpi/photoload.png differ diff --git a/TMessagesProj/src/main/res/drawable-xxhdpi/photoload_pressed.png b/TMessagesProj/src/main/res/drawable-xxhdpi/photoload_pressed.png index ed7a374b9..1e8c1a35e 100755 Binary files a/TMessagesProj/src/main/res/drawable-xxhdpi/photoload_pressed.png and b/TMessagesProj/src/main/res/drawable-xxhdpi/photoload_pressed.png differ diff --git a/TMessagesProj/src/main/res/layout/chat_group_incoming_photo_layout.xml b/TMessagesProj/src/main/res/layout/chat_group_incoming_photo_layout.xml index d08382573..28199c0cf 100644 --- a/TMessagesProj/src/main/res/layout/chat_group_incoming_photo_layout.xml +++ b/TMessagesProj/src/main/res/layout/chat_group_incoming_photo_layout.xml @@ -37,15 +37,15 @@ android:id="@+id/chat_photo_image"/>