diff --git a/TMessagesProj/build.gradle b/TMessagesProj/build.gradle
index 41ea4945..fc24c7d4 100644
--- a/TMessagesProj/build.gradle
+++ b/TMessagesProj/build.gradle
@@ -89,7 +89,7 @@ android {
applicationId "org.telegram.plus"
minSdkVersion 8
targetSdkVersion 23
- versionCode 660
+ versionCode 661
versionName "3.2.6.2"
}
}
diff --git a/TMessagesProj/src/main/java/org/telegram/ui/ChatActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/ChatActivity.java
index a95b265d..4cbaf4ec 100644
--- a/TMessagesProj/src/main/java/org/telegram/ui/ChatActivity.java
+++ b/TMessagesProj/src/main/java/org/telegram/ui/ChatActivity.java
@@ -1966,8 +1966,9 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
mentionListView.setVisibility(View.VISIBLE);
}
//plus
- if (mentionListView != null) {
- int height = AndroidUtilities.dp(37 * Math.min(10/(AndroidUtilities.displaySize.y / size), mentionsAdapter.getCount()));
+ if (mentionListView != null && size > 0) {
+ int y = AndroidUtilities.displaySize.y / size;
+ int height = AndroidUtilities.dp(37 * Math.min(10/y, mentionsAdapter.getCount()));//puede haber java.lang.ArithmeticException: divide by zero
FrameLayout.LayoutParams layoutParams3 = (FrameLayout.LayoutParams) mentionListView.getLayoutParams();
if(height != layoutParams3.height) {
layoutParams3.height = height;
@@ -2744,10 +2745,12 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
}
}
} else {
- //replyIconImageView.setImageResource(R.drawable.link);
- Drawable link = getParentActivity().getResources().getDrawable(R.drawable.link);
- link.setColorFilter(iColor, PorterDuff.Mode.SRC_IN);
- replyIconImageView.setImageDrawable(link);
+ replyIconImageView.setImageResource(R.drawable.link);
+ if(getParentActivity() != null ) {
+ Drawable link = getParentActivity().getResources().getDrawable(R.drawable.link);
+ link.setColorFilter(iColor, PorterDuff.Mode.SRC_IN);
+ replyIconImageView.setImageDrawable(link);
+ }
replyNameTextView.setTextColor(iColor);//
if (webPage instanceof TLRPC.TL_webPagePending) {
replyNameTextView.setText(LocaleController.getString("GettingLinkInfo", R.string.GettingLinkInfo));
diff --git a/TMessagesProj/src/main/java/org/telegram/ui/ProfileActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/ProfileActivity.java
index 976ef318..67acdd45 100644
--- a/TMessagesProj/src/main/java/org/telegram/ui/ProfileActivity.java
+++ b/TMessagesProj/src/main/java/org/telegram/ui/ProfileActivity.java
@@ -715,7 +715,10 @@ public class ProfileActivity extends BaseFragment implements NotificationCenter.
frameLayout.addView(shadowView, LayoutHelper.createFrame(LayoutHelper.MATCH_PARENT, 3));
avatarImage = new BackupImageView(context);
- avatarImage.setRoundRadius(AndroidUtilities.dp(21));
+ //avatarImage.setRoundRadius(AndroidUtilities.dp(21));
+ //Plus: user profile avatar
+ int radius = AndroidUtilities.dp(themePrefs.getInt("profileAvatarRadius", 32));
+ avatarImage.setRoundRadius(radius);
ViewProxy.setPivotX(avatarImage, 0);
ViewProxy.setPivotY(avatarImage, 0);
frameLayout.addView(avatarImage, LayoutHelper.createFrame(42, 42, Gravity.TOP | Gravity.LEFT, 64, 0, 0, 0));
diff --git a/TMessagesProj/src/main/res/values-ar/strings.xml b/TMessagesProj/src/main/res/values-ar/strings.xml
index 848a1105..f36b65ba 100644
--- a/TMessagesProj/src/main/res/values-ar/strings.xml
+++ b/TMessagesProj/src/main/res/values-ar/strings.xml
@@ -977,7 +977,7 @@
%1$s الساعة %2$s
تم تحديث تيليجرام على الأندرويد. الجديد في النسخة رقم 3.2.6:\n\n- تحسين للواجهة البصرية للتطبيق\n- دعم للإيموجي الجديدة\n- تحسينات أخرى وإصلاح للثغرات
- 660
+ 661
بلاس مسنجر للأندرويد
diff --git a/TMessagesProj/src/main/res/values-ca/strings.xml b/TMessagesProj/src/main/res/values-ca/strings.xml
index ac6dfd8b..32ff2025 100644
--- a/TMessagesProj/src/main/res/values-ca/strings.xml
+++ b/TMessagesProj/src/main/res/values-ca/strings.xml
@@ -982,7 +982,7 @@ Si no us interessa, us suggerim crear un canal privat.
- Animacions noves i moltes millores visuals
- Compatibilitat amb els emojis nous
- Altres millores i correcció d\'errors
-660
+661
Plus Messenger für Android wurde aktualisiert. Neu in Version 3.2.6:\n\n- Neue Animationen und optische Verbesserungen\n- Neue Emoji\n- Sonstige Verbesserungen und Fehlerbehebungen
- 660
+ 661
Plus Messenger für Android
diff --git a/TMessagesProj/src/main/res/values-es/strings.xml b/TMessagesProj/src/main/res/values-es/strings.xml
index 42cc8962..28fa5e2a 100644
--- a/TMessagesProj/src/main/res/values-es/strings.xml
+++ b/TMessagesProj/src/main/res/values-es/strings.xml
@@ -974,7 +974,7 @@
%1$s a las %2$s
Plus Messenger para Android ha sido actualizada. Novedades en la versión 3.2.6:\n\n- Nuevas animaciones y muchas mejoras visuales\n- Soporte para los nuevos emojis\n- Soporte para Android 6.0 (Now on Tap - Direct Share - Soporte para huella digital en el código de acceso)\n- Otras mejoras y correcciones de errores
- 660
+ 661
\n\nNovedades en 3.2.6.2:\n\n- Cabecera en lista de apps recientes ya toma color de cabecera principal (a partir de lollipop)\n- Tamaño de lista de menciones en pantalla chat aumentado\n- Ahora los canales también se pueden silenciar desde la pantalla principal\n- Añadido mod para ajustar radio de avatar de cabecera en pantalla chat\n- Añadido mod para cambiar color de texto \'escribiendo\' en pantalla chat\n- Corrección de errores
Plus Messenger para Android
diff --git a/TMessagesProj/src/main/res/values-fr/strings.xml b/TMessagesProj/src/main/res/values-fr/strings.xml
index e56c47d2..484ea928 100644
--- a/TMessagesProj/src/main/res/values-fr/strings.xml
+++ b/TMessagesProj/src/main/res/values-fr/strings.xml
@@ -974,7 +974,7 @@
%1$s à %2$s
Telegram pour Android a été mis à jour. Nouveau dans la version 3.2.6:\n\n- De nouvelles animations et de nombreuses améliorations visuelles.\n- Support pour de nouveaux emoji\n- Autres améliorations et corrections de bogues.
- 660
+ 661
Plus Messenger pour Android
Thème
diff --git a/TMessagesProj/src/main/res/values-gl/strings.xml b/TMessagesProj/src/main/res/values-gl/strings.xml
index d1865b4a..f47602a4 100644
--- a/TMessagesProj/src/main/res/values-gl/strings.xml
+++ b/TMessagesProj/src/main/res/values-gl/strings.xml
@@ -975,7 +975,7 @@ e introduce o teu número.
%1$s ás %2$s
Telegram para Android foi actualizada. Novidades na versión 3.2.6:\n\n- Novas animacións e moitas melloras visuais\n- Soporte para os novos emoji\n- Outras melloras e correccións de erros
- 660
+ 661
Plus Messenger para Android
diff --git a/TMessagesProj/src/main/res/values-hi/strings.xml b/TMessagesProj/src/main/res/values-hi/strings.xml
index 4ac0b82e..83845c50 100644
--- a/TMessagesProj/src/main/res/values-hi/strings.xml
+++ b/TMessagesProj/src/main/res/values-hi/strings.xml
@@ -515,7 +515,7 @@
%1$s पर %2$s
- 660
+ 661
Android के लिए प्लस मैसेंजर
diff --git a/TMessagesProj/src/main/res/values-hr/strings.xml b/TMessagesProj/src/main/res/values-hr/strings.xml
index 6e4a5857..fd60c4ee 100644
--- a/TMessagesProj/src/main/res/values-hr/strings.xml
+++ b/TMessagesProj/src/main/res/values-hr/strings.xml
@@ -750,7 +750,7 @@
h:mm a
%1$s u %2$s
- 660
+ 661
Plus Messenger za Android
Izrada teme
diff --git a/TMessagesProj/src/main/res/values-it/strings.xml b/TMessagesProj/src/main/res/values-it/strings.xml
index 7e445237..59897bab 100644
--- a/TMessagesProj/src/main/res/values-it/strings.xml
+++ b/TMessagesProj/src/main/res/values-it/strings.xml
@@ -974,7 +974,7 @@
%1$s alle %2$s
Plus Messenger per Android si è aggiornato. Nuovo nella versione 3.2.6:\n\n- Nuove animazioni e miglioramenti di interfaccia\n- Supporto per le nuove emoji\n- Altri miglioramenti e risoluzione di problemi
- 660
+ 661
diff --git a/TMessagesProj/src/main/res/values-ko/strings.xml b/TMessagesProj/src/main/res/values-ko/strings.xml
index cf3151b7..4f4ae3b9 100644
--- a/TMessagesProj/src/main/res/values-ko/strings.xml
+++ b/TMessagesProj/src/main/res/values-ko/strings.xml
@@ -977,5 +977,5 @@
%1$s %2$s
텔레그램 안드로이드 버전이 업데이트 되었습니다. 새로운 버전은 3.2.6 입니다:\n\n- 새로운 애니메이션 및 다양한 비쥬얼 향상\n- 신규 이모티콘 지원\n- 기타 기능 향상 및 버그 수정
- 660
+ 661
\ No newline at end of file
diff --git a/TMessagesProj/src/main/res/values-nl/strings.xml b/TMessagesProj/src/main/res/values-nl/strings.xml
index 15c7e770..b0315fa1 100644
--- a/TMessagesProj/src/main/res/values-nl/strings.xml
+++ b/TMessagesProj/src/main/res/values-nl/strings.xml
@@ -974,7 +974,7 @@
%1$s om %2$s
Plus Messenger voor Android is bijgewerkt. Nieuw in versie 3.2.6:\n\n- Nieuwe animaties en andere visuele verbeteringen\n- Ondersteuning voor nieuwe Emoji\n-Tijdsaanduiding voor laatst gezien gelijk aan iOS\n-Probleemoplossing en andere verbeteringen
- 660
+ 661
Plus Messenger voor Android
diff --git a/TMessagesProj/src/main/res/values-pt-rBR/strings.xml b/TMessagesProj/src/main/res/values-pt-rBR/strings.xml
index 62e4718d..0f1e29f8 100644
--- a/TMessagesProj/src/main/res/values-pt-rBR/strings.xml
+++ b/TMessagesProj/src/main/res/values-pt-rBR/strings.xml
@@ -974,10 +974,9 @@
%1$s às %2$s
Plus Messenger para Android foi atualizado. Novidades na versão 3.2.6:\n\n- Novas animações e melhorias no visual\n- Suporte para novos emojis\n- Outras melhorias e resoluções de bugs
- 660
-
+ 661
+
+ \n\nNovidades na versão 3.2.6.2:\n\n- Agora o cabeçalho adquire cor do tema na lista de Apps Recentes do Android\n- Tamanho da Lista de Menção aumentado na tela de chat\n- Agora canais também podem ser silenciados diretamente pela tela principal\n- Adicionada mod para definir raio do avatar no cabeçalho da tela de chat\n- Adicionada mod mod para definir cor do texto de digitação no cabeçalho da tela de chat\n- Correções de erros
Plus Messenger para Android
Personalização
Código de cor HEX inválido!
@@ -1048,7 +1047,7 @@
Cor do Lápis Flutuante
Cor do Botão Flutuante
Comunidade no G+
- Cor do \"digitando\"
+ Cor do Texto \"Escrevendo\"
Cor dos Ícones na Caixa de Texto
Menu de Navegação
Lista de Opções
@@ -1065,7 +1064,7 @@
Cor do Título do Cabeçalho
Cor dos Ícones do Cabeçalho
Cor das Linhas Divisórias
- Arredondamento do Avatar
+ Raio do Avatar
Definir Cor do Membro
Cor do Nome ao Encaminhar
Título do Cabeçalho
@@ -1114,7 +1113,7 @@
Alinhar Avatar Próprio no Topo
Cor do Título/Botão de Diálogo
Exibir Nome de Usuário
- Não Parar Áudio
+ Desativar Sensor de Proximidade
Cor do Divisor de Lista
Centralizar Avatar, Nome e Número
Degradê
diff --git a/TMessagesProj/src/main/res/values-pt-rPT/strings.xml b/TMessagesProj/src/main/res/values-pt-rPT/strings.xml
index 8dd300b8..536ecf4b 100644
--- a/TMessagesProj/src/main/res/values-pt-rPT/strings.xml
+++ b/TMessagesProj/src/main/res/values-pt-rPT/strings.xml
@@ -977,7 +977,7 @@
%1$s às %2$s
Plus Messenger para Android foi atualizado. Novidades na versão 3.2.6:\n\n- Novas animações e melhorias no visual\n- Suporte para novos emojis\n- Outras melhorias e resoluções de bugs
- 660
+ 661
Plus Messenger para Android
Temas
diff --git a/TMessagesProj/src/main/res/values-ru/strings.xml b/TMessagesProj/src/main/res/values-ru/strings.xml
index a0a3fb30..989cc0a0 100644
--- a/TMessagesProj/src/main/res/values-ru/strings.xml
+++ b/TMessagesProj/src/main/res/values-ru/strings.xml
@@ -974,7 +974,7 @@
%1$s в %2$s
Telegram для Android обновлён. Новое в версии 3.2.6:\n\n- Новые анимации и множество визуальных усовершенствований\n- Поддержка новых эмодзи\n- Прочие улучшения и исправления ошибок
- 660
+ 661
\n\nНовое в версии 3.2.6.2:\n\n- Теперь заголовок берёт цвет в списке недавних приложений Andriod\n- Увеличен размер списка упоминаний на экране чата\n- Теперь каналы можно перевести в беззвучный режим из основного экранаn\n- Добавлена настройка закругления аватара в заголовке экрана чата\n- Добавлена настройка цвета для уведомления печати в заголовке чата\n- Исправление ошибок
Plus Messenger для Android
diff --git a/TMessagesProj/src/main/res/values-tr/strings.xml b/TMessagesProj/src/main/res/values-tr/strings.xml
index eb4c863c..aee65a7e 100644
--- a/TMessagesProj/src/main/res/values-tr/strings.xml
+++ b/TMessagesProj/src/main/res/values-tr/strings.xml
@@ -830,7 +830,7 @@
%1$s %2$s
- 660
+ 661
diff --git a/TMessagesProj/src/main/res/values-zh-rCN/strings.xml b/TMessagesProj/src/main/res/values-zh-rCN/strings.xml
index d4ad0900..cc365d5a 100644
--- a/TMessagesProj/src/main/res/values-zh-rCN/strings.xml
+++ b/TMessagesProj/src/main/res/values-zh-rCN/strings.xml
@@ -897,7 +897,7 @@
%1$s 的 %2$s
- 660
+ 661
Plus Messenger for Android
diff --git a/TMessagesProj/src/main/res/values-zh-rTW/strings.xml b/TMessagesProj/src/main/res/values-zh-rTW/strings.xml
index a374a00a..7c51d060 100644
--- a/TMessagesProj/src/main/res/values-zh-rTW/strings.xml
+++ b/TMessagesProj/src/main/res/values-zh-rTW/strings.xml
@@ -947,7 +947,7 @@
於時間 %1$s %2$s
+ 661-->
diff --git a/TMessagesProj/src/main/res/values/strings.xml b/TMessagesProj/src/main/res/values/strings.xml
index a46bd2ad..3200789c 100644
--- a/TMessagesProj/src/main/res/values/strings.xml
+++ b/TMessagesProj/src/main/res/values/strings.xml
@@ -978,9 +978,9 @@
%1$s at %2$s
Plus Messenger for Android has been updated. New in version 3.2.6:\n\n- New animations and many visual improvements\n- Support for new emoji\n- Android 6.0 support (Now on Tap - Direct Share - Fingerprint support for Passcodes)\n- Other improvements and bug fixes
- 660
+ 661
- \n\nNew in version 3.2.6.2:\n\n- Now header gets color in android recent apps list (lollipop and up)\n- Mention list size increased in chat screen\n- Now also channels can be muted from main screen\n- Added mod to set header avatar radius in chat screen\n- Added mod to set typing text color in chat header\n- Bug fixes
+ \n\nNew in version 3.2.6.2:\n\n- Now header gets color in android recent apps list (lollipop and up)\n- Mention list size increased in chat screen\n- Now also channels can be muted from main screen\n- Added mod to set header avatar radius in chat screen\n- Added mod to set \'typing\' text color in chat header\n- Bug fixes
Plus Messenger for Android
Theming
Invalid color hex code!