From 97b33ec9c40fc866282dedc614521473e1aaf6be Mon Sep 17 00:00:00 2001 From: "B. Petersen" Date: Tue, 6 Dec 2016 12:56:17 +0100 Subject: [PATCH] Cleanup. --- .../java/com/b44t/messenger/MessageObject.java | 2 +- .../src/main/java/com/b44t/messenger/TLRPC.java | 6 ------ .../java/com/b44t/ui/Cells/ChatMessageCell.java | 11 +---------- .../com/b44t/ui/Cells/ProfileSearchCell.java | 15 --------------- .../main/java/com/b44t/ui/ProfileActivity.java | 2 -- .../src/main/res/drawable-hdpi/check_profile.png | Bin 600 -> 0 bytes .../src/main/res/drawable-mdpi/check_profile.png | Bin 513 -> 0 bytes .../main/res/drawable-xhdpi/check_profile.png | Bin 939 -> 0 bytes .../main/res/drawable-xxhdpi/check_profile.png | Bin 1246 -> 0 bytes .../main/res/drawable/check_profile_fixed.xml | 8 -------- MessengerProj/src/main/res/values-de/strings.xml | 7 ------- MessengerProj/src/main/res/values-es/strings.xml | 7 ------- MessengerProj/src/main/res/values-it/strings.xml | 7 ------- MessengerProj/src/main/res/values-nl/strings.xml | 7 ------- MessengerProj/src/main/res/values-pt/strings.xml | 7 ------- MessengerProj/src/main/res/values/strings.xml | 7 ------- 16 files changed, 2 insertions(+), 84 deletions(-) delete mode 100644 MessengerProj/src/main/res/drawable-hdpi/check_profile.png delete mode 100644 MessengerProj/src/main/res/drawable-mdpi/check_profile.png delete mode 100644 MessengerProj/src/main/res/drawable-xhdpi/check_profile.png delete mode 100644 MessengerProj/src/main/res/drawable-xxhdpi/check_profile.png delete mode 100644 MessengerProj/src/main/res/drawable/check_profile_fixed.xml diff --git a/MessengerProj/src/main/java/com/b44t/messenger/MessageObject.java b/MessengerProj/src/main/java/com/b44t/messenger/MessageObject.java index 28dbcf609..f7ac7250e 100644 --- a/MessengerProj/src/main/java/com/b44t/messenger/MessageObject.java +++ b/MessengerProj/src/main/java/com/b44t/messenger/MessageObject.java @@ -782,7 +782,7 @@ public class MessageObject { maxWidth = Math.min(AndroidUtilities.displaySize.x, AndroidUtilities.displaySize.y) - AndroidUtilities.dp(80); } } - if (fromUser != null && fromUser.bot || (messageOwner.fwd_from != null && messageOwner.fwd_from.channel_id != 0) && !isOut()) { + if ( (messageOwner.fwd_from != null && messageOwner.fwd_from.channel_id != 0) && !isOut()) { maxWidth -= AndroidUtilities.dp(20); } diff --git a/MessengerProj/src/main/java/com/b44t/messenger/TLRPC.java b/MessengerProj/src/main/java/com/b44t/messenger/TLRPC.java index a539b5ff5..a3ed8b043 100644 --- a/MessengerProj/src/main/java/com/b44t/messenger/TLRPC.java +++ b/MessengerProj/src/main/java/com/b44t/messenger/TLRPC.java @@ -209,9 +209,6 @@ public class TLRPC { public Document document; } - public static class TL_webPageEmpty extends WebPage { - } - public static class TL_webPage extends WebPage { } @@ -241,8 +238,6 @@ public class TLRPC { public boolean self; public boolean contact; public final boolean mutual_contact = false; - public final boolean bot = false; - public boolean verified; public boolean min; } @@ -453,7 +448,6 @@ public class TLRPC { public int date; public int version; public boolean editor; - public boolean verified; public String username; public boolean signatures; public boolean min; diff --git a/MessengerProj/src/main/java/com/b44t/ui/Cells/ChatMessageCell.java b/MessengerProj/src/main/java/com/b44t/ui/Cells/ChatMessageCell.java index eab198275..a89c96dab 100644 --- a/MessengerProj/src/main/java/com/b44t/ui/Cells/ChatMessageCell.java +++ b/MessengerProj/src/main/java/com/b44t/ui/Cells/ChatMessageCell.java @@ -3553,16 +3553,7 @@ public class ChatMessageCell extends BaseCell implements SeekBar.SeekBarDelegate if (hasSign && signUser == null) { hasSign = false; } - String timeString; - TLRPC.User author = null; - if (currentMessageObject.isFromUser()) { - author = MessagesController.getInstance().getUser(messageObject.messageOwner.from_id); - } - if (messageObject.messageOwner.via_bot_id == 0 && messageObject.messageOwner.via_bot_name == null && (author == null || !author.bot) && (messageObject.messageOwner.flags & TLRPC.MESSAGE_FLAG_EDITED) != 0) { - timeString = LocaleController.getString("EditedMessage", R.string.EditedMessage) + " " + LocaleController.getInstance().formatterDay.format((long) (messageObject.messageOwner.date) * 1000); - } else { - timeString = LocaleController.getInstance().formatterDay.format((long) (messageObject.messageOwner.date) * 1000); - } + String timeString = LocaleController.getInstance().formatterDay.format((long) (messageObject.messageOwner.date) * 1000); if (hasSign) { currentTimeString = ", " + timeString; } else { diff --git a/MessengerProj/src/main/java/com/b44t/ui/Cells/ProfileSearchCell.java b/MessengerProj/src/main/java/com/b44t/ui/Cells/ProfileSearchCell.java index 2b6274f6f..be384105b 100644 --- a/MessengerProj/src/main/java/com/b44t/ui/Cells/ProfileSearchCell.java +++ b/MessengerProj/src/main/java/com/b44t/ui/Cells/ProfileSearchCell.java @@ -41,7 +41,6 @@ public class ProfileSearchCell extends BaseCell { private static Drawable groupDrawable; private static Drawable countDrawable; private static Drawable countDrawableGrey; - private static Drawable checkDrawable; private static Paint linePaint; private CharSequence currentName; @@ -75,8 +74,6 @@ public class ProfileSearchCell extends BaseCell { private int countWidth; private StaticLayout countLayout; - private boolean drawCheck; - private int onlineLeft; private StaticLayout onlineLayout; @@ -108,7 +105,6 @@ public class ProfileSearchCell extends BaseCell { groupDrawable = getResources().getDrawable(R.drawable.list_group); countDrawable = getResources().getDrawable(R.drawable.dialogs_badge); countDrawableGrey = getResources().getDrawable(R.drawable.dialogs_badge2); - checkDrawable = getResources().getDrawable(R.drawable.check_list); } avatarImage = new ImageReceiver(this); @@ -173,7 +169,6 @@ public class ProfileSearchCell extends BaseCell { TextPaint currentNamePaint; drawNameGroup = false; - drawCheck = false; { if (chat != null) { @@ -191,7 +186,6 @@ public class ProfileSearchCell extends BaseCell { nameLockTop = AndroidUtilities.dp(30); } } - drawCheck = chat.verified; if (!LocaleController.isRTL) { nameLockLeft = AndroidUtilities.dp(AndroidUtilities.leftBaseline); nameLeft = AndroidUtilities.dp(AndroidUtilities.leftBaseline + 4) + (groupDrawable.getIntrinsicWidth()); @@ -207,7 +201,6 @@ public class ProfileSearchCell extends BaseCell { nameLeft = AndroidUtilities.dp(11); } nameLockTop = AndroidUtilities.dp(17); - drawCheck = user.verified; } } @@ -461,14 +454,6 @@ public class ProfileSearchCell extends BaseCell { canvas.translate(nameLeft, nameTop); nameLayout.draw(canvas); canvas.restore(); - if (drawCheck) { - if (LocaleController.isRTL) { - setDrawableBounds(checkDrawable, nameLeft - AndroidUtilities.dp(4) - checkDrawable.getIntrinsicWidth(), nameLockTop); - } else { - setDrawableBounds(checkDrawable, nameLeft + (int) nameLayout.getLineWidth(0) + AndroidUtilities.dp(4), nameLockTop); - } - checkDrawable.draw(canvas); - } } if (onlineLayout != null) { diff --git a/MessengerProj/src/main/java/com/b44t/ui/ProfileActivity.java b/MessengerProj/src/main/java/com/b44t/ui/ProfileActivity.java index 62b4b2cd3..0b560a081 100644 --- a/MessengerProj/src/main/java/com/b44t/ui/ProfileActivity.java +++ b/MessengerProj/src/main/java/com/b44t/ui/ProfileActivity.java @@ -1234,8 +1234,6 @@ public class ProfileActivity extends BaseFragment implements NotificationCenter. int rightIcon = 0; if (a == 0) { rightIcon = MessagesController.getInstance().isDialogMuted(dialog_id != 0 ? dialog_id : (long) user_id) ? R.drawable.mute_fixed : 0; - } else if (user.verified) { - rightIcon = R.drawable.check_profile_fixed; } nameTextView[a].setLeftDrawable(leftIcon); nameTextView[a].setRightDrawable(rightIcon); diff --git a/MessengerProj/src/main/res/drawable-hdpi/check_profile.png b/MessengerProj/src/main/res/drawable-hdpi/check_profile.png deleted file mode 100644 index 380a8ebff126f8ce367f4eebde8681b6ced51114..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 600 zcmV-e0;m0nP)Px%5=lfsR5%f>RnJRQQ5Ze$^xq7GX&3irv>Vuj4-E+=8@4oN;c)&SPt+$>n zH9Gg5b5={(Cr)1DIybr#^6EzCL2?|wW?uxm(o_u0dj~fu`C|u+kh25P!|Bn%H_Ub9 znl9DbHJQ;pEzHY}F&}2ehQ@oj)T@zPY_z8OF{G9{>Y3|EnNnb4ywZY;a_W1H{p+)a zE>2$dJHxyOu@ok_18c;&nqaty=QbZqFl@s~y%ubskw|Ftnu*09Jh zj5JX+VNDX>4S;U14VN)HaR=qnrM?Y0o_;c8py)&${Apq^vYAEUI31}IrHOF%rM{WH zqIEi#S#7!qPiJqIRs!y48aizK4JmF$8R{%32iw0000Px$yGcYrR45f~QoBk6Q4pQGo6RDqL=#Ya6oNsw5D^igV49`lZXV;zhPy0_)6BUu=WyqqxdJ?K^o-4=S8G#% zNQYa32UZpIvSrT#;COsMpBF-)qz5G6TrS#+l#&RTESBtV!Wveo4$(*e zhbD%9(9RRFP1d}brZ814I5HCz7S{!j_f@nP0AZO#?Ow7U3jy~C%0}0qwk`H9f47K` z^pm{j*N-oVgqqzFy>(S#BizbA;Pm_!cC$HneED#@3P4(6_ejh}IPqR`A+YG|<_`LM zJD@WXl9WQ+(9Z*GIaM6zZtkAoC}+adr~z-EWk(bx(e#)BG@29i&L%_@fs$QG(4HJ& zUsnV!+FBt?Vh+EEYlzUje^res3f5y>;LrjpBqoQUqrLTCQG>Px&Wl2OqR7ef2R?klpK@@&7ExQsAa>0P82SjK~A_oyP;h-icVw)H-@eeT37!vQs zXaYxX-b}m`W1R-Of^4nPfY&Z@%}w z&UsfLwu1zH-aQ5^8H?ywy>jQ> zmoUC6I>0u+pi$ic?{y9WKQ|iD7FBqz5=xn6JZOZBbc@WM^s}oxVdAq9wu`U~AT&S4 zT5`?;BhhfvoEKL?DBVaW19t0w$cO}EEI_~u7KDjtx1M&0B_U;_oiE%+k~@vM(J@#x zGiD?4l%{DDBV8=Z=$=`^epO2SD)_z$Fnf!5>T%A&+Sm`WpId)m?b{FEKZyPfg0MHG zOQ%!DM|5YeFS^DCktG&Zz$_Hu!kG~C9B-@Az|(DahO}0BEvSN2A@(S6$P6SCsPlGd z6?Xm_D(yrsW2Pjea-~AllDWwUi>H9$fe0LIuC5j6O35J!%e679BG}r_0U7oV71^c1 z2y}L|dZAcmSxy|%UeksolnBOhUL=uCFD%RWxJm0FBb(@Iv%MV(w3dWa^)XXVk-!;6 z%ZB*770BgHp!iTy5K+BkC3~Xfd!~4i){;=R7>B7m2Ll|2`nqIXNaT3La z0j?hbmh6=!m)f9goD>f-NQP+;Q6pq!-fLLJ0&FfTj+q7XE54MhmUrFL`sOcq^FD=M zr^K)CWNtga0_V9=FlDE%*zml#Pg;)~J!a5T_MkjfB5j_=e?N)kXVeRFztc%+s8ZjJ zt6DR*$OHUgw7Y4(!i~w4c~&-00mD^F4G7R1OTfjWSkHl^qh3Mi2oveTWdZi=ZgF+6 zelz3zZY-od_3kSP2^3Em&(XyeLiv#a3+*y3r5hODI1J zuv4oPsW#%}_^sN*Ke_0RnHS?rNI?25piWI|bkjCIQ@FSREn4f5uy&X}l&~f|!>5$K zh@)&Iyx;JRp`(CT<~DU|-lWfuo@B~KhshO)XNp5~&tf6{v7@V+{{iygca1c1Fq{AY N002ovPDHLkV1hhitHJ;P diff --git a/MessengerProj/src/main/res/drawable-xxhdpi/check_profile.png b/MessengerProj/src/main/res/drawable-xxhdpi/check_profile.png deleted file mode 100644 index 30bfdb4824c14f8ead0fe4293687ba52fbaeb165..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1246 zcmV<41R?v0P)Px(m`OxIR9FeknOkogMHI)+Y!b&b32KWPo&bSL6;le0C^vzS%0r718>sjsh-Xq! zo)Mpd2Og>h99vBvs6eg6r6?#ZxGDt%61TLWDRB~e6MH!SSdnDiIV<%scg+WL3RMK(~oiV?m){;d=8;&L8g$BY6~bcjkzF z1wuO&V9kD=gnHT|$P-k~z;|$`R^iLjM6H7xv&UK## zE@-*7eS&2B-MDiyT=8I91)sAdthY;r5p^yLe0O(tn&;T;FAQeNKD7$EJUl#l%9=b# zYxs8esm^%#4u4ZqC1wMobxeqDUjIzLI8h*ftlp&$&VNq7-CBzh3ABR^jOuuT7Zi}l zxB-xrOUty`u&Hu+*%(%{DNwj-M2^>!F`rVWA?=-(s$==hU`5?wBT}Fpf3o^tKft5JDX`??AgQt&6EqjVOfD##-i|*R7|=^Y66Exu z2V>QO1x#AV1?_m|+UeE(f&B0K7R`UUMC%*Tw~u}yJCk0}w*}N)&;U_LgM$3*8~XkB zUHXXgFxZSB1GBrIP~36qtM)B+NJ6g<8ggT+=_;Anlc(2SI!Y5`&X6o2vGn8jIYmNQ}c%z5H~64n1_gQWN*nKP0qsY=GHNQlN-npkk5~ z?6G**Y#<#P&1NAM#7kN-fz&c_uvtQ4KCpq&TK$3cAr_<|O!F|s%H=o(w?^z2mb9G9_Bz7(*iw->-paDd+Pwr5=yg5D}ljlLfSsOO3Wg^&YlFAvJH z40p9Sm3uM{5*+Tg9+j}96iAv2>&v8#qa#U>m?zPq5Q0_9HT!EWWgO8HOQk~YDHG5{ zi>jyLmm6Ugl(S6GX#$BkjV!9+b~7~oubZc7;&P4!k!<}gCDobZ~NKteYuKu zbd@6xe-eI#q?v%z16?UnDvLtzZvB0e;+Y)L#hY?+H~tX&2TdhMt1D&eu>b%707*qo IM6N<$f)#~a^Z)<= diff --git a/MessengerProj/src/main/res/drawable/check_profile_fixed.xml b/MessengerProj/src/main/res/drawable/check_profile_fixed.xml deleted file mode 100644 index 591ea9d5d..000000000 --- a/MessengerProj/src/main/res/drawable/check_profile_fixed.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - \ No newline at end of file diff --git a/MessengerProj/src/main/res/values-de/strings.xml b/MessengerProj/src/main/res/values-de/strings.xml index f0544f5a2..505a22cf6 100644 --- a/MessengerProj/src/main/res/values-de/strings.xml +++ b/MessengerProj/src/main/res/values-de/strings.xml @@ -23,7 +23,6 @@ Aktualisiere… Chat löschen Chat auswählen - Tippen und Halten NACHRICHTEN Suche Stummschalten @@ -35,12 +34,10 @@ CHATS Lösche %1$s aus Vorschlägen? Entwurf - Verlauf wurde gelöscht Mitglieder werden benachrichtigt Mitglieder werden nicht benachrichtigt - Listenname Bitte füge Musikdateien einfach deiner Android Musikbibliothek hinzu, um sie hier zu sehen. Musik @@ -90,15 +87,11 @@ URL kopieren %1$s senden URL %1$s öffnen? - Derzeit kannst du nur Kontakten schreiben, die auch deine Nummer haben. - Derzeit kannst du nur Kontakte hinzufügen, die auch deine Nummer haben. Mehr Infos Sende an... Hier tippen um gespeicherte GIFs zu sehen Zuletzt benutzte Emoji leeren? - Angeheftete Nachricht bearbeitet - Runterscrollen für Bots Widget hinzufügen Widget zum Startbildschirm hinzugefügt diff --git a/MessengerProj/src/main/res/values-es/strings.xml b/MessengerProj/src/main/res/values-es/strings.xml index 166ec22db..6010e500a 100644 --- a/MessengerProj/src/main/res/values-es/strings.xml +++ b/MessengerProj/src/main/res/values-es/strings.xml @@ -23,7 +23,6 @@ Actualizando... Eliminar chat Elige el chat - Mantén pulsado para ver MENSAJES Buscar Silenciar notificaciones @@ -35,12 +34,10 @@ CHATS ¿Eliminar a %1$s de las sugerencias? Borrador - Historial borrado Tu publicación será notificada Tu publicación no será notificada - Nombre de la lista Por favor, añade archivos a la carpeta de música en tu dispositivo para verlos aquí. Música @@ -90,15 +87,11 @@ Copiar URL Enviar %1$s ¿Abrir %1$s? - Lo sentimos, por ahora puedes enviar mensajes sólo a contactos mutuos. - Lo sentimos, por ahora sólo puedes añadir contactos mutuos a un grupo. Más información Enviar a... Toca y ve los GIF guardados ¿Borrar los emojis recientes? - Mensaje anclado editado - Ve abajo para los bots Añadir acceso directo Acceso directo añadido al escritorio diff --git a/MessengerProj/src/main/res/values-it/strings.xml b/MessengerProj/src/main/res/values-it/strings.xml index 8e5ebabc0..a05036c18 100644 --- a/MessengerProj/src/main/res/values-it/strings.xml +++ b/MessengerProj/src/main/res/values-it/strings.xml @@ -23,7 +23,6 @@ Aggiorno… Elimina chat Seleziona chat - Tieni premuto per vedere MESSAGGI Cerca Silenzia notifiche @@ -35,12 +34,10 @@ CHAT Eliminare %1$s dai suggerimenti? Bozza - Cronologia eliminata I post saranno notificati ai membri I post non saranno notificati ai membri - Inserisci il nome della lista Aggiungi file nella libreria musicale del tuo dispositivo per vederli qui. Musica @@ -90,15 +87,11 @@ Copia URL Invia %1$s Aprire url %1$s? - Spiacenti, ma al momento puoi scrivere solo ai contatti reciproci. - Spiacenti, ma al momento puoi aggiungere ai gruppi solo contatti reciproci. Maggiori info Invia a... Premi qui per accedere alle GIF salvate Cancellare le emoji recenti? - Messaggio fissato modificato - Scorri verso il basso per i bot Aggiungi scorciatoia Scorciatoia aggiunta alla schermata home diff --git a/MessengerProj/src/main/res/values-nl/strings.xml b/MessengerProj/src/main/res/values-nl/strings.xml index dc04a84bc..81aaf08a0 100644 --- a/MessengerProj/src/main/res/values-nl/strings.xml +++ b/MessengerProj/src/main/res/values-nl/strings.xml @@ -23,7 +23,6 @@ Bijwerken Chat verwijderen Kies een chat - Druk en houd ingedrukt BERICHTEN Zoeken Meldingen stil @@ -35,12 +34,10 @@ CHATS %1$s uit suggesties verwijderen? Concept - Geschiedenis gewist Berichtgeving voor leden Geen berichtgeving voor leden - Naam van lijst Voeg bestanden toe aan de muziekbibliotheek op je apparaat om ze hier te zien. Muziek @@ -90,15 +87,11 @@ Link kopiëren %1$s versturen URL %1$s openen? - Je kunt momenteel alleen berichten sturen aan onderlingen contacten. - Je kunt momenteel alleen onderlinge contacten aan groepen toevoegen Meer informatie Versturen naar... Tik hier om opgeslagen GIF\'s te bekijken Recente emoji\'s wissen? - Vastgezet bericht bewerkt - Scrollen voor bots Snelkoppeling toevoegen Snelkoppeling aan startscherm toegevoegd diff --git a/MessengerProj/src/main/res/values-pt/strings.xml b/MessengerProj/src/main/res/values-pt/strings.xml index 09b150583..fe1807f39 100644 --- a/MessengerProj/src/main/res/values-pt/strings.xml +++ b/MessengerProj/src/main/res/values-pt/strings.xml @@ -23,7 +23,6 @@ Atualizando... Apagar conversa Selecione um Chat - Toque e segure para ver MENSAGENS Busca Silenciar notificações @@ -35,12 +34,10 @@ CONVERSAS Apagar %1$s das sugestões? Rascunho - O histórico foi apagado Os membros serão notificados quando você postar Os membros não serão notificados quando você postar - Digite o nome da lista Por favor, adicione arquivos à biblioteca de música de seu dispositivo para vê-los aqui. Música @@ -90,15 +87,11 @@ Copiar URL Enviar %1$s Abrir URL em %1$s? - Desculpe, você pode enviar mensagens somente para contatos mútuos no momento. - Desculpe, você só pode adicionar contatos mútuos à grupos no momento. Mais informações Enviar para... Toque aqui para acessar os GIFs salvos Limpar emojis recentes? - Mensagem Fixada editado - Desça para ver os bots Adicionar atalho Atalho adicionado à tela de início diff --git a/MessengerProj/src/main/res/values/strings.xml b/MessengerProj/src/main/res/values/strings.xml index ae47f3f3a..6ffe87deb 100644 --- a/MessengerProj/src/main/res/values/strings.xml +++ b/MessengerProj/src/main/res/values/strings.xml @@ -23,7 +23,6 @@ Updating... Delete chat Select chat - Tap and hold to view MESSAGES Search Mute notifications @@ -35,12 +34,10 @@ CHATS Delete %1$s from suggestions? Draft - History was cleared Members will be notified when you post Members will not be notified when you post - Enter list name Please add files to the music library on your device to see them here. Music @@ -90,15 +87,11 @@ Copy URL Send %1$s Open url %1$s? - Sorry, you can only send messages to mutual contacts at the moment. - Sorry, you can only add mutual contacts to groups at the moment. More info Send to... Tap here to access saved GIFs Clear recent emoji? - Pinned Message edited - Scroll down for bots Add widget Widget added to home screen