lynx
/
NekoX
mirror of https://github.com/NekoX-Dev/NekoX.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

update to 9.4.1

This commit is contained in:
xaxtix 2023-02-04 20:13:50 +04:00
parent 135e3cc766
commit fb2d9f90bc
31 changed files with 613 additions and 220 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
TMessagesProj/src/main/java/org/telegram/messenger/BuildVars.java
View File

@ -24,8 +24,8 @@ public class BuildVars {
public static boolean USE_CLOUD_STRINGS = true; public static boolean USE_CLOUD_STRINGS = true;
public static boolean CHECK_UPDATES = true; public static boolean CHECK_UPDATES = true;
public static boolean NO_SCOPED_STORAGE = Build.VERSION.SDK_INT <= 29; public static boolean NO_SCOPED_STORAGE = Build.VERSION.SDK_INT <= 29;
public static int BUILD_VERSION = 3098; public static int BUILD_VERSION = 3102;
public static String BUILD_VERSION_STRING = "9.4.0"; public static String BUILD_VERSION_STRING = "9.4.1";
public static int APP_ID = 4; public static int APP_ID = 4;
public static String APP_HASH = "014b35b6184100b085b0d0572f9b5103"; public static String APP_HASH = "014b35b6184100b085b0d0572f9b5103";

4
TMessagesProj/src/main/java/org/telegram/messenger/CacheByChatsController.java
View File

@ -125,12 +125,12 @@ public class CacheByChatsController {
SharedConfig.getPreferences().edit().putInt("keep_media_type_" + type, keepMedia).apply(); SharedConfig.getPreferences().edit().putInt("keep_media_type_" + type, keepMedia).apply();
} }
public void lookupFiles(ArrayList<KeepMediaFile> keepMediaFiles) { public void lookupFiles(ArrayList<? extends KeepMediaFile> keepMediaFiles) {
LongSparseArray<ArrayList<KeepMediaFile>> filesByDialogId = FileLoader.getInstance(currentAccount).getFileDatabase().lookupFiles(keepMediaFiles); LongSparseArray<ArrayList<KeepMediaFile>> filesByDialogId = FileLoader.getInstance(currentAccount).getFileDatabase().lookupFiles(keepMediaFiles);
LongSparseArray<KeepMediaException> exceptionsByType = getKeepMediaExceptionsByDialogs(); LongSparseArray<KeepMediaException> exceptionsByType = getKeepMediaExceptionsByDialogs();
for (int i = 0; i < filesByDialogId.size(); i++) { for (int i = 0; i < filesByDialogId.size(); i++) {
long dialogId = filesByDialogId.keyAt(i); long dialogId = filesByDialogId.keyAt(i);
ArrayList<KeepMediaFile> files = filesByDialogId.valueAt(i); ArrayList<? extends KeepMediaFile> files = filesByDialogId.valueAt(i);
int type; int type;
if (dialogId >= 0) { if (dialogId >= 0) {
type = KEEP_MEDIA_TYPE_USER; type = KEEP_MEDIA_TYPE_USER;

2
TMessagesProj/src/main/java/org/telegram/messenger/FilePathDatabase.java
View File

@ -399,7 +399,7 @@ public class FilePathDatabase {
}); });
} }
public LongSparseArray<ArrayList<CacheByChatsController.KeepMediaFile>> lookupFiles(ArrayList<CacheByChatsController.KeepMediaFile> keepMediaFiles) { public LongSparseArray<ArrayList<CacheByChatsController.KeepMediaFile>> lookupFiles(ArrayList<? extends CacheByChatsController.KeepMediaFile> keepMediaFiles) {
CountDownLatch syncLatch = new CountDownLatch(1); CountDownLatch syncLatch = new CountDownLatch(1);
LongSparseArray<ArrayList<CacheByChatsController.KeepMediaFile>> filesByDialogId = new LongSparseArray<>(); LongSparseArray<ArrayList<CacheByChatsController.KeepMediaFile>> filesByDialogId = new LongSparseArray<>();
dispatchQueue.postRunnable(() -> { dispatchQueue.postRunnable(() -> {

3
TMessagesProj/src/main/java/org/telegram/messenger/FileUploadOperation.java
View File

@ -110,6 +110,7 @@ public class FileUploadOperation {
return; return;
} }
state = 1; state = 1;
SharedConfig.lockFile(uploadingFilePath);
Utilities.stageQueue.postRunnable(() -> { Utilities.stageQueue.postRunnable(() -> {
preferences = ApplicationLoader.applicationContext.getSharedPreferences("uploadinfo", Activity.MODE_PRIVATE); preferences = ApplicationLoader.applicationContext.getSharedPreferences("uploadinfo", Activity.MODE_PRIVATE);
slowNetwork = ApplicationLoader.isConnectionSlow(); slowNetwork = ApplicationLoader.isConnectionSlow();
@ -170,6 +171,7 @@ public class FileUploadOperation {
ConnectionsManager.getInstance(currentAccount).cancelRequest(requestTokens.valueAt(a), true); ConnectionsManager.getInstance(currentAccount).cancelRequest(requestTokens.valueAt(a), true);
} }
}); });
SharedConfig.unlockFile(uploadingFilePath);
delegate.didFailedUploadingFile(this); delegate.didFailedUploadingFile(this);
cleanup(); cleanup();
} }
@ -193,6 +195,7 @@ public class FileUploadOperation {
} catch (Exception e) { } catch (Exception e) {
FileLog.e(e); FileLog.e(e);
} }
SharedConfig.unlockFile(uploadingFilePath);
} }
protected void checkNewDataAvailable(final long newAvailableSize, final long finalSize) { protected void checkNewDataAvailable(final long newAvailableSize, final long finalSize) {

8
TMessagesProj/src/main/java/org/telegram/messenger/MediaController.java
View File

@ -3582,6 +3582,7 @@ public class MediaController implements AudioManager.OnAudioFocusChangeListener,
SharedConfig.saveConfig(); SharedConfig.saveConfig();
recordingAudioFile = new File(FileLoader.getDirectory(FileLoader.MEDIA_DIR_CACHE), FileLoader.getAttachFileName(recordingAudio)); recordingAudioFile = new File(FileLoader.getDirectory(FileLoader.MEDIA_DIR_CACHE), FileLoader.getAttachFileName(recordingAudio));
SharedConfig.lockFile(recordingAudioFile);
try { try {
if (startRecord(recordingAudioFile.getAbsolutePath(), sampleRate) == 0) { if (startRecord(recordingAudioFile.getAbsolutePath(), sampleRate) == 0) {
@ -3607,6 +3608,7 @@ public class MediaController implements AudioManager.OnAudioFocusChangeListener,
FileLog.e(e); FileLog.e(e);
recordingAudio = null; recordingAudio = null;
stopRecord(); stopRecord();
SharedConfig.unlockFile(recordingAudioFile);
recordingAudioFile.delete(); recordingAudioFile.delete();
recordingAudioFile = null; recordingAudioFile = null;
try { try {
@ -3670,9 +3672,13 @@ public class MediaController implements AudioManager.OnAudioFocusChangeListener,
if (send != 0) { if (send != 0) {
final TLRPC.TL_document audioToSend = recordingAudio; final TLRPC.TL_document audioToSend = recordingAudio;
final File recordingAudioFileToSend = recordingAudioFile; final File recordingAudioFileToSend = recordingAudioFile;
if (BuildVars.LOGS_ENABLED) {
FileLog.d("stop recording internal " + recordingAudioFileToSend.exists() + recordingAudioFileToSend.length());
}
fileEncodingQueue.postRunnable(() -> { fileEncodingQueue.postRunnable(() -> {
stopRecord(); stopRecord();
AndroidUtilities.runOnUIThread(() -> { AndroidUtilities.runOnUIThread(() -> {
audioToSend.date = ConnectionsManager.getInstance(recordingCurrentAccount).getCurrentTime(); audioToSend.date = ConnectionsManager.getInstance(recordingCurrentAccount).getCurrentTime();
audioToSend.size = (int) recordingAudioFileToSend.length(); audioToSend.size = (int) recordingAudioFileToSend.length();
TLRPC.TL_documentAttributeAudio attributeAudio = new TLRPC.TL_documentAttributeAudio(); TLRPC.TL_documentAttributeAudio attributeAudio = new TLRPC.TL_documentAttributeAudio();
@ -3691,12 +3697,14 @@ public class MediaController implements AudioManager.OnAudioFocusChangeListener,
NotificationCenter.getInstance(recordingCurrentAccount).postNotificationName(NotificationCenter.audioDidSent, recordingGuid, send == 2 ? audioToSend : null, send == 2 ? recordingAudioFileToSend.getAbsolutePath() : null); NotificationCenter.getInstance(recordingCurrentAccount).postNotificationName(NotificationCenter.audioDidSent, recordingGuid, send == 2 ? audioToSend : null, send == 2 ? recordingAudioFileToSend.getAbsolutePath() : null);
} else { } else {
NotificationCenter.getInstance(recordingCurrentAccount).postNotificationName(NotificationCenter.audioRecordTooShort, recordingGuid, false, (int) duration); NotificationCenter.getInstance(recordingCurrentAccount).postNotificationName(NotificationCenter.audioRecordTooShort, recordingGuid, false, (int) duration);
SharedConfig.unlockFile(recordingAudioFileToSend);
recordingAudioFileToSend.delete(); recordingAudioFileToSend.delete();
} }
requestAudioFocus(false); requestAudioFocus(false);
}); });
}); });
} else { } else {
SharedConfig.unlockFile(recordingAudioFile);
if (recordingAudioFile != null) { if (recordingAudioFile != null) {
recordingAudioFile.delete(); recordingAudioFile.delete();
} }

13
TMessagesProj/src/main/java/org/telegram/messenger/MessagesController.java
View File

@ -18,6 +18,7 @@ import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.content.SharedPreferences; import android.content.SharedPreferences;
import android.content.pm.PackageManager; import android.content.pm.PackageManager;
import android.graphics.Paint;
import android.location.Location; import android.location.Location;
import android.os.Build; import android.os.Build;
import android.os.Bundle; import android.os.Bundle;
@ -26,7 +27,6 @@ import android.os.SystemClock;
import android.telephony.TelephonyManager; import android.telephony.TelephonyManager;
import android.text.TextUtils; import android.text.TextUtils;
import android.util.Base64; import android.util.Base64;
import android.util.Log;
import android.util.SparseArray; import android.util.SparseArray;
import android.util.SparseBooleanArray; import android.util.SparseBooleanArray;
import android.util.SparseIntArray; import android.util.SparseIntArray;
@ -7264,11 +7264,14 @@ public class MessagesController extends BaseController implements NotificationCe
type = 0; type = 0;
} }
} }
if (text != null && ApplicationLoader.applicationContext != null) { if (text != null) {
if (Theme.dialogs_messageNamePaint == null) { Paint paint = Theme.dialogs_messageNamePaint;
Theme.createDialogsResources(ApplicationLoader.applicationContext); if (paint == null) {
paint = new Paint();
paint.setTypeface(AndroidUtilities.getTypeface("fonts/rmedium.ttf"));
paint.setTextSize(AndroidUtilities.dp(14));
} }
text = Emoji.replaceEmoji(text, Theme.dialogs_messageNamePaint.getFontMetricsInt(), false); text = Emoji.replaceEmoji(text, paint.getFontMetricsInt(), false);
newPrintingStrings.put(threadId, text); newPrintingStrings.put(threadId, text);
newPrintingStringsTypes.put(threadId, type); newPrintingStringsTypes.put(threadId, type);
} }

12
TMessagesProj/src/main/java/org/telegram/messenger/MessagesStorage.java
View File

@ -14043,7 +14043,17 @@ public class MessagesStorage extends BaseController {
} }
ArrayList<TLRPC.UserFull> fullUsers = null; ArrayList<TLRPC.UserFull> fullUsers = null;
if (!dialogUsers.isEmpty()) { if (!dialogUsers.isEmpty()) {
fullUsers = loadUserInfos(dialogUsers); HashSet<Long> fullUsersToLoad = new HashSet<>();
for (Long did : dialogUsers) {
for (int i = 0; i < dialogs.users.size(); i++) {
if (dialogs.users.get(i).id == did && dialogs.users.get(i).premium) {
fullUsersToLoad.add(did);
}
}
}
if (!fullUsersToLoad.isEmpty()) {
fullUsers = loadUserInfos(fullUsersToLoad);
}
} }
getMessagesController().processLoadedDialogs(dialogs, encryptedChats, fullUsers, folderId, offset, count, 1, false, false, true); getMessagesController().processLoadedDialogs(dialogs, encryptedChats, fullUsers, folderId, offset, count, 1, false, false, true);
} catch (Exception e) { } catch (Exception e) {

84
TMessagesProj/src/main/java/org/telegram/messenger/SharedConfig.java
View File

@ -43,6 +43,8 @@ import java.util.HashMap;
import java.util.Iterator; import java.util.Iterator;
import java.util.List; import java.util.List;
import java.util.Locale; import java.util.Locale;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
public class SharedConfig { public class SharedConfig {
/** /**
@ -197,6 +199,7 @@ public class SharedConfig {
public static boolean isFloatingDebugActive; public static boolean isFloatingDebugActive;
public static LiteMode liteMode; public static LiteMode liteMode;
public static Set<String> usingFilePaths = Collections.newSetFromMap(new ConcurrentHashMap<>());
static { static {
loadConfig(); loadConfig();
@ -776,13 +779,17 @@ public class SharedConfig {
public static void checkKeepMedia() { public static void checkKeepMedia() {
int time = (int) (System.currentTimeMillis() / 1000); int time = (int) (System.currentTimeMillis() / 1000);
if (!BuildVars.DEBUG_PRIVATE_VERSION && Math.abs(time - lastKeepMediaCheckTime) < 60 * 60) { if (!BuildVars.DEBUG_PRIVATE_VERSION && Math.abs(time - lastKeepMediaCheckTime) < 24 * 60 * 60) {
return; return;
} }
lastKeepMediaCheckTime = time; lastKeepMediaCheckTime = time;
File cacheDir = FileLoader.checkDirectory(FileLoader.MEDIA_DIR_CACHE); File cacheDir = FileLoader.checkDirectory(FileLoader.MEDIA_DIR_CACHE);
Utilities.cacheClearQueue.postRunnable(() -> { Utilities.cacheClearQueue.postRunnable(() -> {
long startTime = System.currentTimeMillis();
if (BuildVars.LOGS_ENABLED) {
FileLog.d("checkKeepMedia start task");
}
boolean hasExceptions = false; boolean hasExceptions = false;
ArrayList<CacheByChatsController> cacheByChatsControllers = new ArrayList<>(); ArrayList<CacheByChatsController> cacheByChatsControllers = new ArrayList<>();
for (int account = 0; account < UserConfig.MAX_ACCOUNT_COUNT; account++) { for (int account = 0; account < UserConfig.MAX_ACCOUNT_COUNT; account++) {
@ -811,6 +818,13 @@ public class SharedConfig {
if (hasExceptions) { if (hasExceptions) {
allKeepMediaTypesForever = false; allKeepMediaTypesForever = false;
} }
int autoDeletedFiles = 0;
long autoDeletedFilesSize = 0;
int deletedFilesBySize = 0;
long deletedFilesBySizeSize = 0;
int skippedFiles = 0;
if (!allKeepMediaTypesForever) { if (!allKeepMediaTypesForever) {
//long currentTime = time - 60 * 60 * 24 * days; //long currentTime = time - 60 * 60 * 24 * days;
final SparseArray<File> paths = ImageLoader.getInstance().createMediaPaths(); final SparseArray<File> paths = ImageLoader.getInstance().createMediaPaths();
@ -824,6 +838,9 @@ public class SharedConfig {
File[] files = dir.listFiles(); File[] files = dir.listFiles();
ArrayList<CacheByChatsController.KeepMediaFile> keepMediaFiles = new ArrayList<>(); ArrayList<CacheByChatsController.KeepMediaFile> keepMediaFiles = new ArrayList<>();
for (int i = 0; i < files.length; i++) { for (int i = 0; i < files.length; i++) {
if (usingFilePaths.contains(files[i].getAbsolutePath())) {
continue;
}
keepMediaFiles.add(new CacheByChatsController.KeepMediaFile(files[i])); keepMediaFiles.add(new CacheByChatsController.KeepMediaFile(files[i]));
} }
for (int i = 0; i < cacheByChatsControllers.size(); i++) { for (int i = 0; i < cacheByChatsControllers.size(); i++) {
@ -835,9 +852,7 @@ public class SharedConfig {
continue; continue;
} }
long seconds; long seconds;
boolean isException = false;
if (file.keepMedia >= 0) { if (file.keepMedia >= 0) {
isException = true;
seconds = CacheByChatsController.getDaysInSeconds(file.keepMedia); seconds = CacheByChatsController.getDaysInSeconds(file.keepMedia);
} else if (file.dialogType >= 0) { } else if (file.dialogType >= 0) {
seconds = CacheByChatsController.getDaysInSeconds(keepMediaByTypes[file.dialogType]); seconds = CacheByChatsController.getDaysInSeconds(keepMediaByTypes[file.dialogType]);
@ -854,6 +869,10 @@ public class SharedConfig {
boolean needDelete = lastUsageTime < timeLocal; boolean needDelete = lastUsageTime < timeLocal;
if (needDelete) { if (needDelete) {
try { try {
if (BuildVars.LOGS_ENABLED) {
autoDeletedFiles++;
autoDeletedFilesSize += file.file.length();
}
file.file.delete(); file.file.delete();
} catch (Exception exception) { } catch (Exception exception) {
FileLog.e(exception); FileLog.e(exception);
@ -885,6 +904,9 @@ public class SharedConfig {
File dir = paths.valueAt(a); File dir = paths.valueAt(a);
fillFilesRecursive(dir, allFiles); fillFilesRecursive(dir, allFiles);
} }
for (int i = 0; i < cacheByChatsControllers.size(); i++) {
cacheByChatsControllers.get(i).lookupFiles(allFiles);
}
Collections.sort(allFiles, (o1, o2) -> { Collections.sort(allFiles, (o1, o2) -> {
if (o2.lastUsageDate > o1.lastUsageDate) { if (o2.lastUsageDate > o1.lastUsageDate) {
return -1; return -1;
@ -893,10 +915,21 @@ public class SharedConfig {
} }
return 0; return 0;
}); });
for (int i = 0; i < allFiles.size(); i++) { for (int i = 0; i < allFiles.size(); i++) {
if (allFiles.get(i).keepMedia == CacheByChatsController.KEEP_MEDIA_FOREVER) {
continue;
}
if (allFiles.get(i).lastUsageDate <= 0) {
skippedFiles++;
continue;
}
long size = allFiles.get(i).file.length(); long size = allFiles.get(i).file.length();
totalSize -= size; totalSize -= size;
try { try {
deletedFilesBySize++;
deletedFilesBySizeSize += size;
allFiles.get(i).file.delete(); allFiles.get(i).file.delete();
} catch (Exception e) { } catch (Exception e) {
@ -907,12 +940,8 @@ public class SharedConfig {
} }
} }
} }
} }
//TODO now every day generating cache for reactions and cleared it after one day -\_(-_-)_/-
//need fix
File stickersPath = new File(cacheDir, "acache"); File stickersPath = new File(cacheDir, "acache");
if (stickersPath.exists()) { if (stickersPath.exists()) {
long currentTime = time - 60 * 60 * 24; long currentTime = time - 60 * 60 * 24;
@ -925,6 +954,10 @@ public class SharedConfig {
MessagesController.getGlobalMainSettings().edit() MessagesController.getGlobalMainSettings().edit()
.putInt("lastKeepMediaCheckTime", lastKeepMediaCheckTime) .putInt("lastKeepMediaCheckTime", lastKeepMediaCheckTime)
.apply(); .apply();
if (BuildVars.LOGS_ENABLED) {
FileLog.d("checkKeepMedia task end time " + (System.currentTimeMillis() - startTime) + "auto deleted info: files " + autoDeletedFiles + " size " + AndroidUtilities.formatFileSize(autoDeletedFilesSize) + " deleted by size limit info: files " + deletedFilesBySize + " size " + AndroidUtilities.formatFileSize(deletedFilesBySizeSize) + " unknownTimeFiles " + skippedFiles);
}
}); });
} }
@ -943,6 +976,9 @@ public class SharedConfig {
if (fileEntry.getName().equals(".nomedia")) { if (fileEntry.getName().equals(".nomedia")) {
continue; continue;
} }
if (usingFilePaths.contains(fileEntry.getAbsolutePath())) {
continue;
}
fileInfoList.add(new FileInfoInternal(fileEntry)); fileInfoList.add(new FileInfoInternal(fileEntry));
} }
} }
@ -1571,17 +1607,15 @@ public class SharedConfig {
return ApplicationLoader.applicationContext.getSharedPreferences("userconfing", Context.MODE_PRIVATE); return ApplicationLoader.applicationContext.getSharedPreferences("userconfing", Context.MODE_PRIVATE);
} }
private static class FileInfoInternal { private static class FileInfoInternal extends CacheByChatsController.KeepMediaFile {
final File file;
final long lastUsageDate; final long lastUsageDate;
private FileInfoInternal(File file) { private FileInfoInternal(File file) {
this.file = file; super(file);
this.lastUsageDate = Utilities.getLastUsageFileTime(file.getAbsolutePath()); this.lastUsageDate = Utilities.getLastUsageFileTime(file.getAbsolutePath());
} }
} }
public static class LiteMode { public static class LiteMode {
private boolean enabled; private boolean enabled;
@ -1617,4 +1651,32 @@ public class SharedConfig {
return !enabled; return !enabled;
} }
} }
public static void lockFile(File file) {
if (file == null) {
return;
}
lockFile(file.getAbsolutePath());
}
public static void unlockFile(File file) {
if (file == null) {
return;
}
unlockFile(file.getAbsolutePath());
}
public static void lockFile(String file) {
if (file == null) {
return;
}
usingFilePaths.add(file);
}
public static void unlockFile(String file) {
if (file == null) {
return;
}
usingFilePaths.remove(file);
}
} }

5
TMessagesProj/src/main/java/org/telegram/messenger/utils/BitmapsCache.java
View File

@ -36,6 +36,7 @@ public class BitmapsCache {
public final static int FRAME_RESULT_NO_FRAME = -1; public final static int FRAME_RESULT_NO_FRAME = -1;
public static final int COMPRESS_QUALITY_DEFAULT = 60; public static final int COMPRESS_QUALITY_DEFAULT = 60;
private final Cacheable source; private final Cacheable source;
private static boolean mkdir;
String fileName; String fileName;
int w; int w;
int h; int h;
@ -87,6 +88,10 @@ public class BitmapsCache {
} }
File fileTmo = new File(FileLoader.checkDirectory(FileLoader.MEDIA_DIR_CACHE), "acache"); File fileTmo = new File(FileLoader.checkDirectory(FileLoader.MEDIA_DIR_CACHE), "acache");
if (!mkdir) {
fileTmo.mkdir();
mkdir = true;
}
file = new File(fileTmo, fileName + "_" + w + "_" + h + (noLimit ? "_nolimit" : " ") + ".pcache2"); file = new File(fileTmo, fileName + "_" + w + "_" + h + (noLimit ? "_nolimit" : " ") + ".pcache2");
useSharedBuffers = w < AndroidUtilities.dp(60) && h < AndroidUtilities.dp(60); useSharedBuffers = w < AndroidUtilities.dp(60) && h < AndroidUtilities.dp(60);

21
TMessagesProj/src/main/java/org/telegram/ui/ActionBar/ActionBarLayout.java
View File

@ -1751,7 +1751,7 @@ public class ActionBarLayout extends FrameLayout implements INavigationLayout, F
layoutToIgnore = containerView; layoutToIgnore = containerView;
onCloseAnimationEndRunnable = () -> { onCloseAnimationEndRunnable = () -> {
removeFragmentFromStackInternal(currentFragment); removeFragmentFromStackInternal(currentFragment, false);
setVisibility(GONE); setVisibility(GONE);
if (backgroundView != null) { if (backgroundView != null) {
backgroundView.setVisibility(GONE); backgroundView.setVisibility(GONE);
@ -1784,7 +1784,7 @@ public class ActionBarLayout extends FrameLayout implements INavigationLayout, F
}); });
currentAnimation.start(); currentAnimation.start();
} else { } else {
removeFragmentFromStackInternal(currentFragment); removeFragmentFromStackInternal(currentFragment, false);
setVisibility(GONE); setVisibility(GONE);
if (backgroundView != null) { if (backgroundView != null) {
backgroundView.setVisibility(GONE); backgroundView.setVisibility(GONE);
@ -1853,29 +1853,40 @@ public class ActionBarLayout extends FrameLayout implements INavigationLayout, F
bringToFront(fragmentsStack.size() - 1); bringToFront(fragmentsStack.size() - 1);
} }
private void removeFragmentFromStackInternal(BaseFragment fragment) { private void removeFragmentFromStackInternal(BaseFragment fragment, boolean allowFinishFragment) {
if (!fragmentsStack.contains(fragment)) {
return;
}
if (allowFinishFragment && fragmentsStack.get(fragmentsStack.size() - 1) == fragment) {
fragment.finishFragment();
} else {
fragment.onPause(); fragment.onPause();
fragment.onFragmentDestroy(); fragment.onFragmentDestroy();
fragment.setParentLayout(null); fragment.setParentLayout(null);
fragmentsStack.remove(fragment); fragmentsStack.remove(fragment);
onFragmentStackChanged(); onFragmentStackChanged();
} }
}
@Override @Override
public void removeFragmentFromStack(BaseFragment fragment) { public void removeFragmentFromStack(BaseFragment fragment) {
if ((fragmentsStack.size() > 0 && fragmentsStack.get(fragmentsStack.size() - 1) == fragment) || (fragmentsStack.size() > 1 && fragmentsStack.get(fragmentsStack.size() - 2) == fragment)) {
onOpenAnimationEnd();
onCloseAnimationEnd();
}
if (useAlphaAnimations && fragmentsStack.size() == 1 && AndroidUtilities.isTablet()) { if (useAlphaAnimations && fragmentsStack.size() == 1 && AndroidUtilities.isTablet()) {
closeLastFragment(true); closeLastFragment(true);
} else { } else {
if (delegate != null && fragmentsStack.size() == 1 && AndroidUtilities.isTablet()) { if (delegate != null && fragmentsStack.size() == 1 && AndroidUtilities.isTablet()) {
delegate.needCloseLastFragment(this); delegate.needCloseLastFragment(this);
} }
removeFragmentFromStackInternal(fragment); removeFragmentFromStackInternal(fragment, true);
} }
} }
public void removeAllFragments() { public void removeAllFragments() {
for (int a = 0; a < fragmentsStack.size(); a++) { for (int a = 0; a < fragmentsStack.size(); a++) {
removeFragmentFromStackInternal(fragmentsStack.get(a)); removeFragmentFromStackInternal(fragmentsStack.get(a), false);
a--; a--;
} }
} }

38
TMessagesProj/src/main/java/org/telegram/ui/ActionBar/ActionBarPopupWindow.java
View File

@ -114,6 +114,7 @@ public class ActionBarPopupWindow extends PopupWindow {
private int gapEndY = -1000000; private int gapEndY = -1000000;
private Rect bgPaddings = new Rect(); private Rect bgPaddings = new Rect();
private onSizeChangedListener onSizeChangedListener; private onSizeChangedListener onSizeChangedListener;
private float reactionsEnterProgress = 1f;
private PopupSwipeBackLayout swipeBackLayout; private PopupSwipeBackLayout swipeBackLayout;
private ScrollView scrollView; private ScrollView scrollView;
@ -128,6 +129,7 @@ public class ActionBarPopupWindow extends PopupWindow {
protected ActionBarPopupWindow window; protected ActionBarPopupWindow window;
public int subtractBackgroundHeight; public int subtractBackgroundHeight;
Rect rect;
public ActionBarPopupWindowLayout(Context context) { public ActionBarPopupWindowLayout(Context context) {
this(context, null); this(context, null);
@ -440,11 +442,6 @@ public class ActionBarPopupWindow extends PopupWindow {
setTranslationY(yOffset); setTranslationY(yOffset);
} }
} }
super.dispatchDraw(canvas);
}
@Override
protected void onDraw(Canvas canvas) {
if (backgroundDrawable != null) { if (backgroundDrawable != null) {
int start = gapStartY - scrollView.getScrollY(); int start = gapStartY - scrollView.getScrollY();
int end = gapEndY - scrollView.getScrollY(); int end = gapEndY - scrollView.getScrollY();
@ -473,12 +470,12 @@ public class ActionBarPopupWindow extends PopupWindow {
backgroundDrawable.setAlpha(applyAlpha ? backAlpha : 255); backgroundDrawable.setAlpha(applyAlpha ? backAlpha : 255);
if (shownFromBottom) { if (shownFromBottom) {
final int height = getMeasuredHeight(); final int height = getMeasuredHeight();
backgroundDrawable.setBounds(0, (int) (height * (1.0f - backScaleY)), (int) (getMeasuredWidth() * backScaleX), height); AndroidUtilities.rectTmp2.set(0, (int) (height * (1.0f - backScaleY)), (int) (getMeasuredWidth() * backScaleX), height);
} else { } else {
if (start > -AndroidUtilities.dp(16)) { if (start > -AndroidUtilities.dp(16)) {
int h = (int) (getMeasuredHeight() * backScaleY); int h = (int) (getMeasuredHeight() * backScaleY);
if (a == 0) { if (a == 0) {
backgroundDrawable.setBounds(0, -scrollView.getScrollY() + (gapStartY != -1000000 ? AndroidUtilities.dp(1) : 0), (int) (getMeasuredWidth() * backScaleX), (gapStartY != -1000000 ? Math.min(h, start + AndroidUtilities.dp(16)) : h) - subtractBackgroundHeight); AndroidUtilities.rectTmp2.set(0, -scrollView.getScrollY() + (gapStartY != -1000000 ? AndroidUtilities.dp(1) : 0), (int) (getMeasuredWidth() * backScaleX), (gapStartY != -1000000 ? Math.min(h, start + AndroidUtilities.dp(16)) : h) - subtractBackgroundHeight);
} else { } else {
if (h < end) { if (h < end) {
if (gapStartY != -1000000) { if (gapStartY != -1000000) {
@ -486,13 +483,20 @@ public class ActionBarPopupWindow extends PopupWindow {
} }
continue; continue;
} }
backgroundDrawable.setBounds(0, end, (int) (getMeasuredWidth() * backScaleX), h - subtractBackgroundHeight); AndroidUtilities.rectTmp2.set(0, end, (int) (getMeasuredWidth() * backScaleX), h - subtractBackgroundHeight);
} }
} else { } else {
backgroundDrawable.setBounds(0, (gapStartY < 0 ? 0 : -AndroidUtilities.dp(16)), (int) (getMeasuredWidth() * backScaleX), (int) (getMeasuredHeight() * backScaleY) - subtractBackgroundHeight); AndroidUtilities.rectTmp2.set(0, (gapStartY < 0 ? 0 : -AndroidUtilities.dp(16)), (int) (getMeasuredWidth() * backScaleX), (int) (getMeasuredHeight() * backScaleY) - subtractBackgroundHeight);
} }
} }
if (reactionsEnterProgress != 1f) {
if (rect == null) {
rect = new Rect();
}
rect.set(AndroidUtilities.rectTmp2.right, AndroidUtilities.rectTmp2.top, AndroidUtilities.rectTmp2.right, AndroidUtilities.rectTmp2.top);
AndroidUtilities.lerp(rect, AndroidUtilities.rectTmp2, reactionsEnterProgress, AndroidUtilities.rectTmp2);
}
backgroundDrawable.setBounds(AndroidUtilities.rectTmp2);
backgroundDrawable.draw(canvas); backgroundDrawable.draw(canvas);
if (hasGap) { if (hasGap) {
canvas.save(); canvas.save();
@ -525,6 +529,15 @@ public class ActionBarPopupWindow extends PopupWindow {
} }
} }
} }
if (reactionsEnterProgress != 1f) {
canvas.saveLayerAlpha((float) AndroidUtilities.rectTmp2.left, (float) AndroidUtilities.rectTmp2.top, AndroidUtilities.rectTmp2.right, AndroidUtilities.rectTmp2.bottom, (int) (255 * reactionsEnterProgress), Canvas.ALL_SAVE_FLAG);
float scale = 0.5f + reactionsEnterProgress * 0.5f;
canvas.scale(scale, scale, AndroidUtilities.rectTmp2.right, AndroidUtilities.rectTmp2.top);
super.dispatchDraw(canvas);
canvas.restore();
} else {
super.dispatchDraw(canvas);
}
} }
public Drawable getBackgroundDrawable() { public Drawable getBackgroundDrawable() {
@ -618,6 +631,11 @@ public class ActionBarPopupWindow extends PopupWindow {
public void setParentWindow(ActionBarPopupWindow popupWindow) { public void setParentWindow(ActionBarPopupWindow popupWindow) {
window = popupWindow; window = popupWindow;
} }
public void setReactionsTransitionProgress(float transitionEnterProgress) {
this.reactionsEnterProgress = transitionEnterProgress;
invalidate();
}
} }
public ActionBarPopupWindow() { public ActionBarPopupWindow() {

20
TMessagesProj/src/main/java/org/telegram/ui/ChatActivity.java
View File

@ -6909,7 +6909,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
topViewSeparator2 = new View(context); topViewSeparator2 = new View(context);
topViewSeparator2.setVisibility(View.GONE); topViewSeparator2.setVisibility(View.GONE);
topViewSeparator2.setBackgroundColor(getThemedColor(Theme.key_divider)); topViewSeparator2.setBackgroundColor(getThemedColor(Theme.key_divider));
topChatPanelView.addView(topViewSeparator2, LayoutHelper.createFrame(LayoutHelper.MATCH_PARENT, 1f / AndroidUtilities.density, Gravity.LEFT | Gravity.TOP, 10, 50, 10, 1)); topChatPanelView.addView(topViewSeparator2, LayoutHelper.createFrame(LayoutHelper.MATCH_PARENT, 1f / AndroidUtilities.density, Gravity.LEFT | Gravity.TOP, 10, 48, 10, 1));
topViewSeparator3 = new View(context); topViewSeparator3 = new View(context);
topViewSeparator3.setVisibility(View.GONE); topViewSeparator3.setVisibility(View.GONE);
topViewSeparator3.setBackgroundColor(getThemedColor(Theme.key_divider)); topViewSeparator3.setBackgroundColor(getThemedColor(Theme.key_divider));
@ -14838,8 +14838,10 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
fillEditingMediaWithCaption(photos.get(0).caption, photos.get(0).entities); fillEditingMediaWithCaption(photos.get(0).caption, photos.get(0).entities);
SendMessagesHelper.prepareSendingMedia(getAccountInstance(), photos, dialog_id, replyingMessageObject, getThreadMessage(), null, forceDocument, true, null, notify, scheduleDate, photos.get(0).updateStickersOrder); SendMessagesHelper.prepareSendingMedia(getAccountInstance(), photos, dialog_id, replyingMessageObject, getThreadMessage(), null, forceDocument, true, null, notify, scheduleDate, photos.get(0).updateStickersOrder);
afterMessageSend(); afterMessageSend();
if (chatActivityEnterView != null) {
chatActivityEnterView.setFieldText(""); chatActivityEnterView.setFieldText("");
} }
}
if (scheduleDate != 0) { if (scheduleDate != 0) {
if (scheduledMessagesCount == -1) { if (scheduledMessagesCount == -1) {
scheduledMessagesCount = 0; scheduledMessagesCount = 0;
@ -21935,7 +21937,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
} }
emojiStatusSpamHint.setText(text); emojiStatusSpamHint.setText(text);
emojiStatusSpamHint.measure(View.MeasureSpec.makeMeasureSpec(AndroidUtilities.displaySize.x - AndroidUtilities.dp(50), View.MeasureSpec.AT_MOST), View.MeasureSpec.makeMeasureSpec(99999, View.MeasureSpec.AT_MOST)); emojiStatusSpamHint.measure(View.MeasureSpec.makeMeasureSpec(AndroidUtilities.displaySize.x - AndroidUtilities.dp(50), View.MeasureSpec.AT_MOST), View.MeasureSpec.makeMeasureSpec(99999, View.MeasureSpec.AT_MOST));
topChatPanelHeight += AndroidUtilities.dp(6); topChatPanelHeight += AndroidUtilities.dp(4);
emojiStatusSpamHint.setTranslationY(topChatPanelHeight); emojiStatusSpamHint.setTranslationY(topChatPanelHeight);
topChatPanelHeight += AndroidUtilities.dp(10) + emojiStatusSpamHint.getMeasuredHeight(); topChatPanelHeight += AndroidUtilities.dp(10) + emojiStatusSpamHint.getMeasuredHeight();
} else { } else {
@ -21944,10 +21946,11 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
topViewSeparator2.setVisibility(View.GONE); topViewSeparator2.setVisibility(View.GONE);
} }
if (showTranslate) { if (showTranslate) {
if (restartTopicButton.getVisibility() == View.VISIBLE) { if (restartTopicButton.getVisibility() == View.VISIBLE ||
// topChatPanelHeight += AndroidUtilities.dp(48); reportSpamButton.getVisibility() == View.VISIBLE ||
topViewSeparator3.setVisibility(View.VISIBLE); addToContactsButton.getVisibility() == View.VISIBLE ||
} else if (addToContactsButton.getVisibility() == View.VISIBLE || user != null && !TextUtils.isEmpty(chatWithAdmin)) { user != null && !TextUtils.isEmpty(chatWithAdmin)
) {
topViewSeparator3.setVisibility(View.VISIBLE); topViewSeparator3.setVisibility(View.VISIBLE);
} else { } else {
topChatPanelHeight -= AndroidUtilities.dp(48); topChatPanelHeight -= AndroidUtilities.dp(48);
@ -24336,6 +24339,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
} }
ReactionsContainerLayout finalReactionsLayout1 = reactionsLayout; ReactionsContainerLayout finalReactionsLayout1 = reactionsLayout;
reactionsLayout.setParentLayout(scrimPopupContainerLayout);
scrimPopupWindow = new ActionBarPopupWindow(scrimPopupContainerLayout, LayoutHelper.WRAP_CONTENT, LayoutHelper.WRAP_CONTENT) { scrimPopupWindow = new ActionBarPopupWindow(scrimPopupContainerLayout, LayoutHelper.WRAP_CONTENT, LayoutHelper.WRAP_CONTENT) {
@Override @Override
public void dismiss() { public void dismiss() {
@ -24373,7 +24377,11 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
scrimPopupWindow.setDismissAnimationDuration(220); scrimPopupWindow.setDismissAnimationDuration(220);
scrimPopupWindow.setOutsideTouchable(true); scrimPopupWindow.setOutsideTouchable(true);
scrimPopupWindow.setClippingEnabled(true); scrimPopupWindow.setClippingEnabled(true);
if (reactionsLayout == null) {
scrimPopupWindow.setAnimationStyle(R.style.PopupContextAnimation); scrimPopupWindow.setAnimationStyle(R.style.PopupContextAnimation);
} else {
scrimPopupWindow.setAnimationStyle(0);
}
scrimPopupWindow.setFocusable(true); scrimPopupWindow.setFocusable(true);
scrimPopupContainerLayout.measure(View.MeasureSpec.makeMeasureSpec(AndroidUtilities.dp(1000), View.MeasureSpec.AT_MOST), View.MeasureSpec.makeMeasureSpec(AndroidUtilities.dp(1000), View.MeasureSpec.AT_MOST)); scrimPopupContainerLayout.measure(View.MeasureSpec.makeMeasureSpec(AndroidUtilities.dp(1000), View.MeasureSpec.AT_MOST), View.MeasureSpec.makeMeasureSpec(AndroidUtilities.dp(1000), View.MeasureSpec.AT_MOST));
scrimPopupWindow.setInputMethodMode(ActionBarPopupWindow.INPUT_METHOD_NOT_NEEDED); scrimPopupWindow.setInputMethodMode(ActionBarPopupWindow.INPUT_METHOD_NOT_NEEDED);

2
TMessagesProj/src/main/java/org/telegram/ui/Components/AnimatedEmojiDrawable.java
View File

@ -522,7 +522,7 @@ public class AnimatedEmojiDrawable extends Drawable {
} else if (cacheType == STANDARD_LOTTIE_FRAME) { } else if (cacheType == STANDARD_LOTTIE_FRAME) {
imageReceiver.setImage(null, null, mediaLocation, mediaFilter, null, null, thumbDrawable, document.size, null, document, 1); imageReceiver.setImage(null, null, mediaLocation, mediaFilter, null, null, thumbDrawable, document.size, null, document, 1);
} else { } else {
if (SharedConfig.getLiteMode().enabled()) { if (SharedConfig.getLiteMode().enabled() && cacheType != CACHE_TYPE_AVATAR_CONSTRUCTOR_PREVIEW) {
if ("video/webm".equals(document.mime_type)) { if ("video/webm".equals(document.mime_type)) {
imageReceiver.setImage(null, null, ImageLocation.getForDocument(thumb, document), sizedp + "_" + sizedp, null, null, thumbDrawable, document.size, null, document, 1); imageReceiver.setImage(null, null, ImageLocation.getForDocument(thumb, document), sizedp + "_" + sizedp, null, null, thumbDrawable, document.size, null, document, 1);
} else { } else {

20
TMessagesProj/src/main/java/org/telegram/ui/Components/AvatarConstructorFragment.java
View File

@ -92,8 +92,15 @@ public class AvatarConstructorFragment extends BaseFragment {
Paint actionBarPaint = new Paint(); Paint actionBarPaint = new Paint();
private int gradientBackgroundItemWidth; private int gradientBackgroundItemWidth;
public String[] keys_avatar_background = {Theme.key_avatar_backgroundBlue, Theme.key_avatar_backgroundCyan, Theme.key_avatar_backgroundGreen, Theme.key_avatar_backgroundOrange, Theme.key_avatar_backgroundRed, Theme.key_avatar_backgroundPink, Theme.key_avatar_backgroundViolet}; public static final int[][] defaultColors = new int[][]{
public String[] keys_avatar_background2 = {Theme.key_avatar_background2Blue, Theme.key_avatar_background2Cyan, Theme.key_avatar_background2Green, Theme.key_avatar_background2Orange, Theme.key_avatar_background2Red, Theme.key_avatar_background2Pink, Theme.key_avatar_background2Violet}; new int[]{0xFF4D8DFF, 0xFF2BBFFF, 0xFF20E2CD, 0xFF0EE1F1},
new int[]{0xFF5EB6FB, 0xFF1FCEEB, 0xFF45F7B7, 0xFF1FF1D9},
new int[]{0xFF09D260, 0xFF5EDC40, 0xFFC1E526, 0xFF80DF2B},
new int[]{0xFFF5694E, 0xFFF5772C, 0xFFFFD412, 0xFFFFA743},
new int[]{0xFFF64884, 0xFFEF5B41, 0xFFF6A730, 0xFFFF7742},
new int[]{0xFFF94BA0, 0xFFFB5C80, 0xFFFFB23A, 0xFFFE7E62},
new int[]{0xFF837CFF, 0xFFB063FF, 0xFFFF72A9, 0xFFE269FF}
};
public boolean finishOnDone = true; public boolean finishOnDone = true;
private ActionBarMenuItem setPhotoItem; private ActionBarMenuItem setPhotoItem;
private BottomSheet bottomSheet; private BottomSheet bottomSheet;
@ -426,6 +433,7 @@ public class AvatarConstructorFragment extends BaseFragment {
wasChanged = true; wasChanged = true;
} }
}; };
selectAnimatedEmojiDialog.forUser = !forGroup;
selectAnimatedEmojiDialog.setAnimationsEnabled(fragmentBeginToShow); selectAnimatedEmojiDialog.setAnimationsEnabled(fragmentBeginToShow);
selectAnimatedEmojiDialog.setClipChildren(false); selectAnimatedEmojiDialog.setClipChildren(false);
@ -829,11 +837,13 @@ public class AvatarConstructorFragment extends BaseFragment {
LinearLayoutManager layoutManager = new LinearLayoutManager(context); LinearLayoutManager layoutManager = new LinearLayoutManager(context);
layoutManager.setOrientation(LinearLayoutManager.HORIZONTAL); layoutManager.setOrientation(LinearLayoutManager.HORIZONTAL);
setLayoutManager(layoutManager); setLayoutManager(layoutManager);
for (int i = 0; i < keys_avatar_background.length; i++) { for (int i = 0; i < defaultColors.length; i++) {
BackgroundGradient backgroundGradient = new BackgroundGradient(); BackgroundGradient backgroundGradient = new BackgroundGradient();
backgroundGradient.stableId = stableIdPointer++; backgroundGradient.stableId = stableIdPointer++;
backgroundGradient.color1 = Theme.getColor(keys_avatar_background[i]); backgroundGradient.color1 = defaultColors[i][0];
backgroundGradient.color2 = Theme.getColor(keys_avatar_background2[i]); backgroundGradient.color2 = defaultColors[i][1];
backgroundGradient.color3 = defaultColors[i][2];
backgroundGradient.color4 = defaultColors[i][3];
gradients.add(backgroundGradient); gradients.add(backgroundGradient);
} }
setOnItemClickListener((view, position) -> { setOnItemClickListener((view, position) -> {

45
TMessagesProj/src/main/java/org/telegram/ui/Components/AvatarConstructorPreviewCell.java
View File

@ -26,8 +26,8 @@ public class AvatarConstructorPreviewCell extends FrameLayout {
BackupImageView currentImage; BackupImageView currentImage;
BackupImageView nextImage; BackupImageView nextImage;
Drawable currentBackgroundDrawable; GradientTools currentBackgroundDrawable;
Drawable nextBackgroundDrawable; GradientTools nextBackgroundDrawable;
TextView textView; TextView textView;
TLRPC.TL_emojiList emojiList; TLRPC.TL_emojiList emojiList;
@ -54,17 +54,20 @@ public class AvatarConstructorPreviewCell extends FrameLayout {
if (emojiIndex > emojiList.document_id.size() - 1) { if (emojiIndex > emojiList.document_id.size() - 1) {
emojiIndex = 0; emojiIndex = 0;
} }
if (backgroundIndex > Theme.keys_avatar_background.length - 1) { if (backgroundIndex > AvatarConstructorFragment.defaultColors.length - 1) {
backgroundIndex = 0; backgroundIndex = 0;
} }
animatedEmojiDrawable = new AnimatedEmojiDrawable(AnimatedEmojiDrawable.CACHE_TYPE_ALERT_PREVIEW_LARGE, currentAccount, emojiList.document_id.get(emojiIndex)); animatedEmojiDrawable = new AnimatedEmojiDrawable(AnimatedEmojiDrawable.CACHE_TYPE_ALERT_PREVIEW_LARGE, currentAccount, emojiList.document_id.get(emojiIndex));
nextImage.setAnimatedEmojiDrawable(animatedEmojiDrawable); nextImage.setAnimatedEmojiDrawable(animatedEmojiDrawable);
int color1 = Theme.getColor(Theme.keys_avatar_background[backgroundIndex]); int color1 = AvatarConstructorFragment.defaultColors[backgroundIndex][0];
int color2 = Theme.getColor(Theme.keys_avatar_background2[backgroundIndex]); int color2 = AvatarConstructorFragment.defaultColors[backgroundIndex][1];
int color3 = AvatarConstructorFragment.defaultColors[backgroundIndex][2];
int color4 = AvatarConstructorFragment.defaultColors[backgroundIndex][3];
nextBackgroundDrawable = new GradientDrawable(GradientDrawable.Orientation.TOP_BOTTOM, new int[]{color1, color2}); nextBackgroundDrawable = new GradientTools();
nextBackgroundDrawable.setColors(color1, color2, color3, color4);
progressToNext = 0f; progressToNext = 0f;
invalidate(); invalidate();
@ -116,10 +119,14 @@ public class AvatarConstructorPreviewCell extends FrameLayout {
animatedEmojiDrawable = new AnimatedEmojiDrawable(AnimatedEmojiDrawable.CACHE_TYPE_ALERT_PREVIEW_LARGE, currentAccount, emojiList.document_id.get(0)); animatedEmojiDrawable = new AnimatedEmojiDrawable(AnimatedEmojiDrawable.CACHE_TYPE_ALERT_PREVIEW_LARGE, currentAccount, emojiList.document_id.get(0));
currentImage.setAnimatedEmojiDrawable(animatedEmojiDrawable); currentImage.setAnimatedEmojiDrawable(animatedEmojiDrawable);
} }
int color1 = Theme.getColor(Theme.keys_avatar_background[backgroundIndex]);
int color2 = Theme.getColor(Theme.keys_avatar_background2[backgroundIndex]);
currentBackgroundDrawable = new GradientDrawable(GradientDrawable.Orientation.TOP_BOTTOM, new int[]{color1, color2}); int color1 = AvatarConstructorFragment.defaultColors[backgroundIndex][0];
int color2 = AvatarConstructorFragment.defaultColors[backgroundIndex][1];
int color3 = AvatarConstructorFragment.defaultColors[backgroundIndex][2];
int color4 = AvatarConstructorFragment.defaultColors[backgroundIndex][3];
currentBackgroundDrawable = new GradientTools();
currentBackgroundDrawable.setColors(color1, color2, color3, color4);
textView = new TextView(context); textView = new TextView(context);
textView.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 12); textView.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 12);
@ -155,8 +162,8 @@ public class AvatarConstructorPreviewCell extends FrameLayout {
nextBackgroundDrawable.setBounds(0, 0, getMeasuredWidth(), getMeasuredHeight()); nextBackgroundDrawable.setBounds(0, 0, getMeasuredWidth(), getMeasuredHeight());
} }
if (progressToNext == 1f) { if (progressToNext == 1f) {
currentBackgroundDrawable.setAlpha(255); currentBackgroundDrawable.paint.setAlpha(255);
currentBackgroundDrawable.draw(canvas); canvas.drawRect(0, 0, getMeasuredWidth(), getMeasuredHeight(), currentBackgroundDrawable.paint);
currentImage.setAlpha(1f); currentImage.setAlpha(1f);
currentImage.setScaleX(1f); currentImage.setScaleX(1f);
currentImage.setScaleY(1f); currentImage.setScaleY(1f);
@ -164,10 +171,10 @@ public class AvatarConstructorPreviewCell extends FrameLayout {
} else { } else {
float progressInternal = CubicBezierInterpolator.DEFAULT.getInterpolation(progressToNext); float progressInternal = CubicBezierInterpolator.DEFAULT.getInterpolation(progressToNext);
currentBackgroundDrawable.setAlpha(255); currentBackgroundDrawable.paint.setAlpha(255);
currentBackgroundDrawable.draw(canvas); canvas.drawRect(0, 0, getMeasuredWidth(), getMeasuredHeight(), currentBackgroundDrawable.paint);
nextBackgroundDrawable.setAlpha((int) (255 * progressInternal)); nextBackgroundDrawable.paint.setAlpha((int) (255 * progressInternal));
nextBackgroundDrawable.draw(canvas); canvas.drawRect(0, 0, getMeasuredWidth(), getMeasuredHeight(), nextBackgroundDrawable.paint);
progressToNext += 16 / 250f; progressToNext += 16 / 250f;
@ -206,8 +213,12 @@ public class AvatarConstructorPreviewCell extends FrameLayout {
public AvatarConstructorFragment.BackgroundGradient getBackgroundGradient() { public AvatarConstructorFragment.BackgroundGradient getBackgroundGradient() {
AvatarConstructorFragment.BackgroundGradient backgroundGradient = new AvatarConstructorFragment.BackgroundGradient(); AvatarConstructorFragment.BackgroundGradient backgroundGradient = new AvatarConstructorFragment.BackgroundGradient();
backgroundGradient.color1 = Theme.getColor(Theme.keys_avatar_background[backgroundIndex]);
backgroundGradient.color2 = Theme.getColor(Theme.keys_avatar_background2[backgroundIndex]); backgroundGradient.color1 = AvatarConstructorFragment.defaultColors[backgroundIndex][0];
backgroundGradient.color2 = AvatarConstructorFragment.defaultColors[backgroundIndex][1];
backgroundGradient.color3 = AvatarConstructorFragment.defaultColors[backgroundIndex][2];
backgroundGradient.color4 = AvatarConstructorFragment.defaultColors[backgroundIndex][3];
return backgroundGradient; return backgroundGradient;
} }

1
TMessagesProj/src/main/java/org/telegram/ui/Components/CacheChart.java
View File

@ -357,6 +357,7 @@ public class CacheChart extends View {
public CacheChart(Context context, int count, String[] colorKeys, int type, int[] particles) { public CacheChart(Context context, int count, String[] colorKeys, int type, int[] particles) {
super(context); super(context);
setLayerType(LAYER_TYPE_HARDWARE, null);
this.sectionsCount = count; this.sectionsCount = count;
this.colorKeys = colorKeys; this.colorKeys = colorKeys;

4
TMessagesProj/src/main/java/org/telegram/ui/Components/ChatScrimPopupContainerLayout.java
View File

@ -168,4 +168,8 @@ public class ChatScrimPopupContainerLayout extends LinearLayout {
bottomView.setAlpha(aplha); bottomView.setAlpha(aplha);
} }
} }
public ActionBarPopupWindow.ActionBarPopupWindowLayout getPopupWindowLayout() {
return popupWindowLayout;
}
} }

9
TMessagesProj/src/main/java/org/telegram/ui/Components/DrawingInBackgroundThreadDrawable.java
View File

@ -28,7 +28,7 @@ public class DrawingInBackgroundThreadDrawable implements NotificationCenter.Not
private boolean bitmapUpdating; private boolean bitmapUpdating;
public int currentLayerNum = 1; private int currentLayerNum = 1;
private int currentOpenedLayerFlags; private int currentOpenedLayerFlags;
protected boolean paused; protected boolean paused;
@ -299,6 +299,13 @@ public class DrawingInBackgroundThreadDrawable implements NotificationCenter.Not
} }
return queue; return queue;
} }
}
public void setLayerNum(int value) {
currentLayerNum = value;
if (attachedToWindow) {
currentOpenedLayerFlags = NotificationCenter.getGlobalInstance().getCurrentHeavyOperationFlags();
currentOpenedLayerFlags &= ~currentLayerNum;
}
} }
} }

2
TMessagesProj/src/main/java/org/telegram/ui/Components/EmojiPacksAlert.java
View File

@ -361,7 +361,7 @@ public class EmojiPacksAlert extends BottomSheet implements NotificationCenter.N
drawable = unusedLineDrawables.remove(unusedLineDrawables.size() - 1); drawable = unusedLineDrawables.remove(unusedLineDrawables.size() - 1);
} else { } else {
drawable = new DrawingInBackgroundLine(); drawable = new DrawingInBackgroundLine();
drawable.currentLayerNum = 7; drawable.setLayerNum(7);
} }
drawable.position = position; drawable.position = position;
drawable.onAttachToWindow(); drawable.onAttachToWindow();

47
TMessagesProj/src/main/java/org/telegram/ui/Components/RLottieDrawable.java
View File

@ -236,19 +236,7 @@ public class RLottieDrawable extends BitmapDrawable implements Animatable, Bitma
if (destroyWhenDone) { if (destroyWhenDone) {
checkRunningTasks(); checkRunningTasks();
if (loadFrameTask == null && cacheGenerateTask == null && nativePtr != 0) { if (loadFrameTask == null && cacheGenerateTask == null && nativePtr != 0) {
long nativePtrFinal = nativePtr; recycleNativePtr();
long secondNativePtrFinal = secondNativePtr;
nativePtr = 0;
secondNativePtr = 0;
DispatchQueuePoolBackground.execute(() -> {
if (nativePtrFinal != 0) {
destroy(nativePtrFinal);
}
if (secondNativePtrFinal != 0) {
destroy(secondNativePtrFinal);
}
});
} }
} }
if ((nativePtr == 0 || fallbackCache) && secondNativePtr == 0 && bitmapsCache == null) { if ((nativePtr == 0 || fallbackCache) && secondNativePtr == 0 && bitmapsCache == null) {
@ -262,6 +250,22 @@ public class RLottieDrawable extends BitmapDrawable implements Animatable, Bitma
scheduleNextGetFrame(); scheduleNextGetFrame();
} }
private void recycleNativePtr() {
long nativePtrFinal = nativePtr;
long secondNativePtrFinal = secondNativePtr;
nativePtr = 0;
secondNativePtr = 0;
DispatchQueuePoolBackground.execute(() -> {
if (nativePtrFinal != 0) {
destroy(nativePtrFinal);
}
if (secondNativePtrFinal != 0) {
destroy(secondNativePtrFinal);
}
});
}
protected void recycleResources() { protected void recycleResources() {
ArrayList<Bitmap> bitmapToRecycle = new ArrayList<>(); ArrayList<Bitmap> bitmapToRecycle = new ArrayList<>();
bitmapToRecycle.add(renderingBitmap); bitmapToRecycle.add(renderingBitmap);
@ -531,7 +535,13 @@ public class RLottieDrawable extends BitmapDrawable implements Animatable, Bitma
try { try {
LottieMetadata lottieMetadata; LottieMetadata lottieMetadata;
if (file != null) { if (file != null) {
lottieMetadata = gson.fromJson(new FileReader(file.getAbsolutePath()), LottieMetadata.class); FileReader reader = new FileReader(file.getAbsolutePath());
lottieMetadata = gson.fromJson(reader, LottieMetadata.class);
try {
reader.close();
} catch (Exception e) {
}
} else { } else {
lottieMetadata = gson.fromJson(json, LottieMetadata.class); lottieMetadata = gson.fromJson(json, LottieMetadata.class);
} }
@ -814,14 +824,7 @@ public class RLottieDrawable extends BitmapDrawable implements Animatable, Bitma
if (loadingInBackground || secondLoadingInBackground) { if (loadingInBackground || secondLoadingInBackground) {
destroyAfterLoading = true; destroyAfterLoading = true;
} else if (loadFrameTask == null && cacheGenerateTask == null && !generatingCache) { } else if (loadFrameTask == null && cacheGenerateTask == null && !generatingCache) {
if (nativePtr != 0) { recycleNativePtr();
destroy(nativePtr);
nativePtr = 0;
}
if (secondNativePtr != 0) {
destroy(secondNativePtr);
secondNativePtr = 0;
}
if (bitmapsCache != null) { if (bitmapsCache != null) {
bitmapsCache.recycle(); bitmapsCache.recycle();
bitmapsCache = null; bitmapsCache = null;

147
TMessagesProj/src/main/java/org/telegram/ui/Components/Reactions/CustomEmojiReactionsWindow.java
View File

@ -18,6 +18,7 @@ import android.view.HapticFeedbackConstants;
import android.view.KeyEvent; import android.view.KeyEvent;
import android.view.View; import android.view.View;
import android.view.WindowManager; import android.view.WindowManager;
import android.view.animation.OvershootInterpolator;
import android.widget.FrameLayout; import android.widget.FrameLayout;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
@ -34,7 +35,6 @@ import org.telegram.tgnet.TLRPC;
import org.telegram.ui.ActionBar.BaseFragment; import org.telegram.ui.ActionBar.BaseFragment;
import org.telegram.ui.ActionBar.Theme; import org.telegram.ui.ActionBar.Theme;
import org.telegram.ui.ChatActivity; import org.telegram.ui.ChatActivity;
import org.telegram.ui.Components.BackupImageView;
import org.telegram.ui.Components.Bulletin; import org.telegram.ui.Components.Bulletin;
import org.telegram.ui.Components.BulletinFactory; import org.telegram.ui.Components.BulletinFactory;
import org.telegram.ui.Components.CubicBezierInterpolator; import org.telegram.ui.Components.CubicBezierInterpolator;
@ -44,6 +44,7 @@ import org.telegram.ui.Components.ReactionsContainerLayout;
import org.telegram.ui.PremiumPreviewFragment; import org.telegram.ui.PremiumPreviewFragment;
import org.telegram.ui.SelectAnimatedEmojiDialog; import org.telegram.ui.SelectAnimatedEmojiDialog;
import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.HashSet; import java.util.HashSet;
import java.util.List; import java.util.List;
@ -76,6 +77,9 @@ public class CustomEmojiReactionsWindow {
float yTranslation; float yTranslation;
float keyboardHeight; float keyboardHeight;
private boolean wasFocused; private boolean wasFocused;
private int account;
private boolean cascadeAnimation;
private ValueAnimator valueAnimator;
public CustomEmojiReactionsWindow(BaseFragment baseFragment, List<ReactionsLayoutInBubble.VisibleReaction> reactions, HashSet<ReactionsLayoutInBubble.VisibleReaction> selectedReactions, ReactionsContainerLayout reactionsContainerLayout, Theme.ResourcesProvider resourcesProvider) { public CustomEmojiReactionsWindow(BaseFragment baseFragment, List<ReactionsLayoutInBubble.VisibleReaction> reactions, HashSet<ReactionsLayoutInBubble.VisibleReaction> selectedReactions, ReactionsContainerLayout reactionsContainerLayout, Theme.ResourcesProvider resourcesProvider) {
this.reactions = reactions; this.reactions = reactions;
@ -242,7 +246,7 @@ public class CustomEmojiReactionsWindow {
reactionsContainerLayout.getLocationOnScreen(location); reactionsContainerLayout.getLocationOnScreen(location);
} }
windowView.getLocationOnScreen(windowLocation); windowView.getLocationOnScreen(windowLocation);
float y = location[1] - windowLocation[1] - AndroidUtilities.dp(44); float y = location[1] - windowLocation[1] - AndroidUtilities.dp(44) - AndroidUtilities.dp(52) - (selectAnimatedEmojiDialog.includeHint ? AndroidUtilities.dp(26) : 0);
if (y + containerView.getMeasuredHeight() > windowView.getMeasuredHeight() - AndroidUtilities.dp(32)) { if (y + containerView.getMeasuredHeight() > windowView.getMeasuredHeight() - AndroidUtilities.dp(32)) {
y = windowView.getMeasuredHeight() - AndroidUtilities.dp(32) - containerView.getMeasuredHeight(); y = windowView.getMeasuredHeight() - AndroidUtilities.dp(32) - containerView.getMeasuredHeight();
} }
@ -263,16 +267,28 @@ public class CustomEmojiReactionsWindow {
reactionsContainerLayout.setCustomEmojiEnterProgress(enterTransitionProgress); reactionsContainerLayout.setCustomEmojiEnterProgress(enterTransitionProgress);
if (enter) { if (enter) {
cascadeAnimation = false;//SharedConfig.getDevicePerformanceClass() >= SharedConfig.PERFORMANCE_CLASS_HIGH;
enterTransitionFinished = false; enterTransitionFinished = false;
} else {
cascadeAnimation = false;
} }
int account = UserConfig.selectedAccount; if (cascadeAnimation) {
updateCascadeEnter(0);
}
selectAnimatedEmojiDialog.setEnterAnimationInProgress(true);
account = UserConfig.selectedAccount;
animationIndex = NotificationCenter.getInstance(account).setAnimationInProgress(animationIndex, null); animationIndex = NotificationCenter.getInstance(account).setAnimationInProgress(animationIndex, null);
ValueAnimator valueAnimator = ValueAnimator.ofFloat(enterTransitionProgress, enter ? 1f : 0); valueAnimator = ValueAnimator.ofFloat(enterTransitionProgress, enter ? 1f : 0);
valueAnimator.addUpdateListener(animation -> { valueAnimator.addUpdateListener(animation -> {
valueAnimator = null;
enterTransitionProgress = (float) animation.getAnimatedValue(); enterTransitionProgress = (float) animation.getAnimatedValue();
reactionsContainerLayout.setCustomEmojiEnterProgress(enterTransitionProgress); reactionsContainerLayout.setCustomEmojiEnterProgress(Utilities.clamp(enterTransitionProgress,1f, 0));
invalidatePath = true; invalidatePath = true;
containerView.invalidate(); containerView.invalidate();
if (cascadeAnimation) {
updateCascadeEnter(enterTransitionProgress);
}
}); });
if (!enter) { if (!enter) {
syncReactionFrames(enter); syncReactionFrames(enter);
@ -280,7 +296,7 @@ public class CustomEmojiReactionsWindow {
valueAnimator.addListener(new AnimatorListenerAdapter() { valueAnimator.addListener(new AnimatorListenerAdapter() {
@Override @Override
public void onAnimationEnd(Animator animation) { public void onAnimationEnd(Animator animation) {
NotificationCenter.getInstance(account).onAnimationFinish(animationIndex); checkAnimationEnd();
enterTransitionProgress = enter ? 1f : 0f; enterTransitionProgress = enter ? 1f : 0f;
if (enter) { if (enter) {
enterTransitionFinished = true; enterTransitionFinished = true;
@ -288,7 +304,7 @@ public class CustomEmojiReactionsWindow {
reactionsContainerLayout.onCustomEmojiWindowOpened(); reactionsContainerLayout.onCustomEmojiWindowOpened();
containerView.invalidate(); containerView.invalidate();
} }
reactionsContainerLayout.setCustomEmojiEnterProgress(enterTransitionProgress); reactionsContainerLayout.setCustomEmojiEnterProgress(Utilities.clamp(enterTransitionProgress, 1f, 0f));
if (enter) { if (enter) {
syncReactionFrames(enter); syncReactionFrames(enter);
} }
@ -301,9 +317,100 @@ public class CustomEmojiReactionsWindow {
} }
}); });
valueAnimator.setStartDelay(30); valueAnimator.setStartDelay(30);
if (cascadeAnimation) {
valueAnimator.setDuration(450);
valueAnimator.setInterpolator(new OvershootInterpolator(1f));
} else {
valueAnimator.setDuration(350); valueAnimator.setDuration(350);
valueAnimator.setInterpolator(CubicBezierInterpolator.DEFAULT); valueAnimator.setInterpolator(CubicBezierInterpolator.DEFAULT);
}
valueAnimator.start(); valueAnimator.start();
containerView.invalidate();
}
HashSet<View> animatingEnterChild = new HashSet<>();
ArrayList<ValueAnimator> animators = new ArrayList<>();
private void updateCascadeEnter(float progress) {
int fullHeight = selectAnimatedEmojiDialog.contentView.getHeight();
int parentTop = (int) (selectAnimatedEmojiDialog.getY() + selectAnimatedEmojiDialog.contentView.getY() + selectAnimatedEmojiDialog.emojiGridView.getY());
ArrayList<View> animatedViews = null;
boolean updated = false;
for (int i = 0; i < selectAnimatedEmojiDialog.emojiGridView.getChildCount(); i++) {
View child = selectAnimatedEmojiDialog.emojiGridView.getChildAt(i);
if (animatingEnterChild.contains(child)) {
continue;
}
float cy = parentTop + child.getTop() + child.getMeasuredHeight() / 2f;
if (cy < drawingRect.bottom && cy > drawingRect.top && progress != 0) {
if (animatedViews == null) {
animatedViews = new ArrayList<>();
}
animatedViews.add(child);
animatingEnterChild.add(child);
} else {
child.setScaleX(0f);
child.setScaleY(0f);
updated = true;
}
}
parentTop = (int) (selectAnimatedEmojiDialog.getY() + selectAnimatedEmojiDialog.contentView.getY() + selectAnimatedEmojiDialog.emojiTabs.getY());
for (int i = 0; i < selectAnimatedEmojiDialog.emojiTabs.contentView.getChildCount(); i++) {
View child = selectAnimatedEmojiDialog.emojiTabs.contentView.getChildAt(i);
if (animatingEnterChild.contains(child)) {
continue;
}
float cy = parentTop + child.getTop() + child.getMeasuredHeight() / 2f;
if (cy < drawingRect.bottom && cy > drawingRect.top && progress != 0) {
if (animatedViews == null) {
animatedViews = new ArrayList<>();
}
animatedViews.add(child);
animatingEnterChild.add(child);
} else {
child.setScaleX(0f);
child.setScaleY(0f);
updated = true;
}
}
if (updated) {
selectAnimatedEmojiDialog.emojiGridView.invalidate();
selectAnimatedEmojiDialog.contentView.invalidate();
selectAnimatedEmojiDialog.emojiTabs.contentView.invalidate();
}
if (animatedViews != null) {
ValueAnimator valueAnimator = ValueAnimator.ofFloat(0, 1f);
ArrayList<View> finalAnimatedViews = animatedViews;
valueAnimator.addUpdateListener(animation -> {
float s = (float) animation.getAnimatedValue();
for (int i = 0; i < finalAnimatedViews.size(); i++) {
finalAnimatedViews.get(i).setScaleX(s);
finalAnimatedViews.get(i).setScaleY(s);
}
selectAnimatedEmojiDialog.emojiGridView.invalidate();
selectAnimatedEmojiDialog.contentView.invalidate();
selectAnimatedEmojiDialog.emojiTabs.contentView.invalidate();
});
animators.add(valueAnimator);
valueAnimator.addListener(new AnimatorListenerAdapter() {
@Override
public void onAnimationEnd(Animator animation) {
super.onAnimationEnd(animation);
animators.remove(valueAnimator);
checkAnimationEnd();
}
});
valueAnimator.setDuration(350);
valueAnimator.setInterpolator(new OvershootInterpolator(1f));
valueAnimator.start();
}
}
private void checkAnimationEnd() {
if (animators.isEmpty()) {
NotificationCenter.getInstance(account).onAnimationFinish(animationIndex);
selectAnimatedEmojiDialog.setEnterAnimationInProgress(false);
}
} }
private void syncReactionFrames(boolean enter) { private void syncReactionFrames(boolean enter) {
@ -419,13 +526,14 @@ public class CustomEmojiReactionsWindow {
if (!isShowing) { if (!isShowing) {
return; return;
} }
dimPaint.setAlpha((int) (0.2f * enterTransitionProgress * 255)); float progressClpamped = Utilities.clamp(enterTransitionProgress,1f, 0f);
dimPaint.setAlpha((int) (0.2f * progressClpamped * 255));
canvas.drawPaint(dimPaint); canvas.drawPaint(dimPaint);
AndroidUtilities.rectTmp.set(0, 0, getMeasuredWidth(), getMeasuredHeight()); AndroidUtilities.rectTmp.set(0, 0, getMeasuredWidth(), getMeasuredHeight());
AndroidUtilities.lerp(fromRect, AndroidUtilities.rectTmp, enterTransitionProgress, drawingRect); AndroidUtilities.lerp(fromRect, AndroidUtilities.rectTmp, enterTransitionProgress, drawingRect);
float radius = AndroidUtilities.lerp(fromRadius, AndroidUtilities.dp(8), enterTransitionProgress); float radius = AndroidUtilities.lerp(fromRadius, AndroidUtilities.dp(8), enterTransitionProgress);
shadow.setAlpha((int) (Utilities.clamp(enterTransitionProgress / 0.05f, 1f, 0f) * 255)); shadow.setAlpha((int) (Utilities.clamp(progressClpamped / 0.05f, 1f, 0f) * 255));
shadow.setBounds((int) drawingRect.left - shadowPad.left, (int) drawingRect.top - shadowPad.top, (int) drawingRect.right + shadowPad.right, (int) drawingRect.bottom + shadowPad.bottom); shadow.setBounds((int) drawingRect.left - shadowPad.left, (int) drawingRect.top - shadowPad.top, (int) drawingRect.right + shadowPad.right, (int) drawingRect.bottom + shadowPad.bottom);
shadow.draw(canvas); shadow.draw(canvas);
@ -579,7 +687,7 @@ public class CustomEmojiReactionsWindow {
} else { } else {
if (holderView.hasEnterAnimation && holderView.loopImageView.getImageReceiver().getLottieAnimation() == null) { if (holderView.hasEnterAnimation && holderView.loopImageView.getImageReceiver().getLottieAnimation() == null) {
float oldAlpha = holderView.enterImageView.getImageReceiver().getAlpha(); float oldAlpha = holderView.enterImageView.getImageReceiver().getAlpha();
holderView.enterImageView.getImageReceiver().setAlpha(oldAlpha * (1f - enterTransitionProgress)); holderView.enterImageView.getImageReceiver().setAlpha(oldAlpha * (1f - progressClpamped));
holderView.enterImageView.draw(canvas); holderView.enterImageView.draw(canvas);
holderView.enterImageView.getImageReceiver().setAlpha(oldAlpha); holderView.enterImageView.getImageReceiver().setAlpha(oldAlpha);
} else { } else {
@ -588,14 +696,14 @@ public class CustomEmojiReactionsWindow {
imageReceiver = holderView.loopImageView.animatedEmojiDrawable.getImageReceiver(); imageReceiver = holderView.loopImageView.animatedEmojiDrawable.getImageReceiver();
} }
float oldAlpha = imageReceiver.getAlpha(); float oldAlpha = imageReceiver.getAlpha();
imageReceiver.setAlpha(oldAlpha * (1f - enterTransitionProgress)); imageReceiver.setAlpha(oldAlpha * (1f - progressClpamped));
holderView.loopImageView.draw(canvas); holderView.loopImageView.draw(canvas);
imageReceiver.setAlpha(oldAlpha); imageReceiver.setAlpha(oldAlpha);
} }
} }
} else { } else {
canvas.translate(child.getX() + drawingRect.width() - reactionsContainerLayout.rect.width(), child.getY() + fromRect.top - drawingRect.top); canvas.translate(child.getX() + drawingRect.width() - reactionsContainerLayout.rect.width(), child.getY() + fromRect.top - drawingRect.top);
canvas.saveLayerAlpha(0, 0, child.getMeasuredWidth(), child.getMeasuredHeight(), (int) (255 * (1f - enterTransitionProgress)), Canvas.ALL_SAVE_FLAG); canvas.saveLayerAlpha(0, 0, child.getMeasuredWidth(), child.getMeasuredHeight(), (int) (255 * (1f - progressClpamped)), Canvas.ALL_SAVE_FLAG);
canvas.scale(1f - enterTransitionProgress, 1f - enterTransitionProgress, child.getMeasuredWidth() >> 1, child.getMeasuredHeight() >> 1); canvas.scale(1f - enterTransitionProgress, 1f - enterTransitionProgress, child.getMeasuredWidth() >> 1, child.getMeasuredHeight() >> 1);
child.draw(canvas); child.draw(canvas);
canvas.restore(); canvas.restore();
@ -612,9 +720,11 @@ public class CustomEmojiReactionsWindow {
} }
canvas.save(); canvas.save();
canvas.clipPath(pathToClip); canvas.clipPath(pathToClip);
canvas.translate(enterTransitionOffsetX, enterTransitionOffsetY); canvas.translate(cascadeAnimation ? 0 : enterTransitionOffsetX, enterTransitionOffsetY);
canvas.scale(enterTransitionScale, enterTransitionScale, enterTransitionScalePx, enterTransitionScalePy); canvas.scale(enterTransitionScale, enterTransitionScale, enterTransitionScalePx, enterTransitionScalePy);
if (!cascadeAnimation) {
selectAnimatedEmojiDialog.setAlpha(enterTransitionProgress); selectAnimatedEmojiDialog.setAlpha(enterTransitionProgress);
}
super.dispatchDraw(canvas); super.dispatchDraw(canvas);
canvas.restore(); canvas.restore();
@ -626,17 +736,10 @@ public class CustomEmojiReactionsWindow {
} }
selectAnimatedEmojiDialog.drawBigReaction(canvas, this); selectAnimatedEmojiDialog.drawBigReaction(canvas, this);
if (valueAnimator != null) {
invalidate();
} }
} }
private boolean imageIsEquals(BackupImageView loopImageView, SelectAnimatedEmojiDialog.ImageViewEmoji toImageView) {
if (toImageView.span == null && loopImageView.getImageReceiver().getLottieAnimation() != null && toImageView.imageReceiver.getLottieAnimation() != null) {
return true;
}
if (loopImageView.animatedEmojiDrawable != null) {
return toImageView.span.getDocumentId() == loopImageView.animatedEmojiDrawable.getDocumentId();
}
return false;
} }
public void setRecentReactions(List<ReactionsLayoutInBubble.VisibleReaction> reactions) { public void setRecentReactions(List<ReactionsLayoutInBubble.VisibleReaction> reactions) {

72
TMessagesProj/src/main/java/org/telegram/ui/Components/ReactionsContainerLayout.java
View File

@ -18,6 +18,7 @@ import android.graphics.Rect;
import android.graphics.RectF; import android.graphics.RectF;
import android.graphics.Shader; import android.graphics.Shader;
import android.graphics.drawable.Drawable; import android.graphics.drawable.Drawable;
import android.provider.Settings;
import android.util.Property; import android.util.Property;
import android.view.Gravity; import android.view.Gravity;
import android.view.HapticFeedbackConstants; import android.view.HapticFeedbackConstants;
@ -54,6 +55,7 @@ import org.telegram.messenger.SvgHelper;
import org.telegram.messenger.UserConfig; import org.telegram.messenger.UserConfig;
import org.telegram.messenger.Utilities; import org.telegram.messenger.Utilities;
import org.telegram.tgnet.TLRPC; import org.telegram.tgnet.TLRPC;
import org.telegram.ui.ActionBar.ActionBarPopupWindow;
import org.telegram.ui.ActionBar.AlertDialog; import org.telegram.ui.ActionBar.AlertDialog;
import org.telegram.ui.ActionBar.BaseFragment; import org.telegram.ui.ActionBar.BaseFragment;
import org.telegram.ui.ActionBar.Theme; import org.telegram.ui.ActionBar.Theme;
@ -90,6 +92,7 @@ public class ReactionsContainerLayout extends FrameLayout implements Notificatio
private final static float SCALE_PROGRESS = 0.75f; private final static float SCALE_PROGRESS = 0.75f;
private final static float CLIP_PROGRESS = 0.25f; private final static float CLIP_PROGRESS = 0.25f;
public final RecyclerListView recyclerListView; public final RecyclerListView recyclerListView;
public final float durationScale;
private Paint bgPaint = new Paint(Paint.ANTI_ALIAS_FLAG); private Paint bgPaint = new Paint(Paint.ANTI_ALIAS_FLAG);
private Paint leftShadowPaint = new Paint(Paint.ANTI_ALIAS_FLAG), private Paint leftShadowPaint = new Paint(Paint.ANTI_ALIAS_FLAG),
@ -158,9 +161,11 @@ public class ReactionsContainerLayout extends FrameLayout implements Notificatio
private boolean allReactionsAvailable; private boolean allReactionsAvailable;
private boolean allReactionsIsDefault; private boolean allReactionsIsDefault;
private Paint selectedPaint; private Paint selectedPaint;
ChatScrimPopupContainerLayout parentLayout;
public ReactionsContainerLayout(BaseFragment fragment, @NonNull Context context, int currentAccount, Theme.ResourcesProvider resourcesProvider) { public ReactionsContainerLayout(BaseFragment fragment, @NonNull Context context, int currentAccount, Theme.ResourcesProvider resourcesProvider) {
super(context); super(context);
durationScale = Settings.Global.getFloat(context.getContentResolver(), Settings.Global.ANIMATOR_DURATION_SCALE, 1.0f);
selectedPaint = new Paint(Paint.ANTI_ALIAS_FLAG); selectedPaint = new Paint(Paint.ANTI_ALIAS_FLAG);
selectedPaint.setColor(Theme.getColor(Theme.key_listSelector, resourcesProvider)); selectedPaint.setColor(Theme.getColor(Theme.key_listSelector, resourcesProvider));
this.resourcesProvider = resourcesProvider; this.resourcesProvider = resourcesProvider;
@ -591,9 +596,6 @@ public class ReactionsContainerLayout extends FrameLayout implements Notificatio
float cPr = (Math.max(CLIP_PROGRESS, Math.min(transitionProgress, 1f)) - CLIP_PROGRESS) / (1f - CLIP_PROGRESS); float cPr = (Math.max(CLIP_PROGRESS, Math.min(transitionProgress, 1f)) - CLIP_PROGRESS) / (1f - CLIP_PROGRESS);
float br = bigCircleRadius * cPr, sr = smallCircleRadius * cPr; float br = bigCircleRadius * cPr, sr = smallCircleRadius * cPr;
// if (customEmojiReactionsEnterProgress != 0) {
// return;
// }
lastVisibleViewsTmp.clear(); lastVisibleViewsTmp.clear();
lastVisibleViewsTmp.addAll(lastVisibleViews); lastVisibleViewsTmp.addAll(lastVisibleViews);
@ -620,8 +622,8 @@ public class ReactionsContainerLayout extends FrameLayout implements Notificatio
int s = canvas.save(); int s = canvas.save();
float pivotX = LocaleController.isRTL || mirrorX ? getWidth() * 0.125f : getWidth() * 0.875f; float pivotX = LocaleController.isRTL || mirrorX ? getWidth() * 0.125f : getWidth() * 0.875f;
if (transitionProgress <= SCALE_PROGRESS) { if (transitionProgress != 1f) {
float sc = transitionProgress / SCALE_PROGRESS; float sc = transitionProgress;
canvas.scale(sc, sc, pivotX, getHeight() / 2f); canvas.scale(sc, sc, pivotX, getHeight() / 2f);
} }
@ -636,7 +638,8 @@ public class ReactionsContainerLayout extends FrameLayout implements Notificatio
if (chatScrimPopupContainerLayout != null) { if (chatScrimPopupContainerLayout != null) {
chatScrimPopupContainerLayout.setExpandSize(expandSize); chatScrimPopupContainerLayout.setExpandSize(expandSize);
} }
rect.set(getPaddingLeft() + (getWidth() - getPaddingRight()) * lt, getPaddingTop() + recyclerListView.getMeasuredHeight() * (1f - otherViewsScale) - expandSize, (getWidth() - getPaddingRight()) * rt, getHeight() - getPaddingBottom() + expandSize); float transitionLeftOffset = (getWidth() - getPaddingRight()) * Math.min(1f, lt);
rect.set(getPaddingLeft() + transitionLeftOffset, getPaddingTop() + recyclerListView.getMeasuredHeight() * (1f - otherViewsScale) - expandSize, (getWidth() - getPaddingRight()) * rt, getHeight() - getPaddingBottom() + expandSize);
radius = (rect.height() - expandSize * 2f) / 2f; radius = (rect.height() - expandSize * 2f) / 2f;
shadow.setAlpha((int) (Utilities.clamp(1f - (customEmojiReactionsEnterProgress / 0.05f), 1f, 0f) * 255)); shadow.setAlpha((int) (Utilities.clamp(1f - (customEmojiReactionsEnterProgress / 0.05f), 1f, 0f) * 255));
shadow.setBounds((int) (getPaddingLeft() + (getWidth() - getPaddingRight() + shadowPad.right) * lt - shadowPad.left), getPaddingTop() - shadowPad.top - (int) expandSize, (int) ((getWidth() - getPaddingRight() + shadowPad.right) * rt), getHeight() - getPaddingBottom() + shadowPad.bottom + (int) expandSize); shadow.setBounds((int) (getPaddingLeft() + (getWidth() - getPaddingRight() + shadowPad.right) * lt - shadowPad.left), getPaddingTop() - shadowPad.top - (int) expandSize, (int) ((getWidth() - getPaddingRight() + shadowPad.right) * rt), getHeight() - getPaddingBottom() + shadowPad.bottom + (int) expandSize);
@ -646,8 +649,8 @@ public class ReactionsContainerLayout extends FrameLayout implements Notificatio
if (!skipDraw) { if (!skipDraw) {
s = canvas.save(); s = canvas.save();
if (transitionProgress <= SCALE_PROGRESS) { if (transitionProgress != 1f) {
float sc = transitionProgress / SCALE_PROGRESS; float sc = transitionProgress;
canvas.scale(sc, sc, pivotX, getHeight() / 2f); canvas.scale(sc, sc, pivotX, getHeight() / 2f);
} }
canvas.drawRoundRect(rect, radius, radius, bgPaint); canvas.drawRoundRect(rect, radius, radius, bgPaint);
@ -658,8 +661,8 @@ public class ReactionsContainerLayout extends FrameLayout implements Notificatio
mPath.addRoundRect(rect, radius, radius, Path.Direction.CW); mPath.addRoundRect(rect, radius, radius, Path.Direction.CW);
s = canvas.save(); s = canvas.save();
if (transitionProgress <= SCALE_PROGRESS) { if (transitionProgress != 1f) {
float sc = transitionProgress / SCALE_PROGRESS; float sc = transitionProgress;
canvas.scale(sc, sc, pivotX, getHeight() / 2f); canvas.scale(sc, sc, pivotX, getHeight() / 2f);
} }
@ -668,6 +671,10 @@ public class ReactionsContainerLayout extends FrameLayout implements Notificatio
int lastReactionX = 0; int lastReactionX = 0;
for (int i = 0; i < recyclerListView.getChildCount(); i++) { for (int i = 0; i < recyclerListView.getChildCount(); i++) {
View child = recyclerListView.getChildAt(i); View child = recyclerListView.getChildAt(i);
if (transitionProgress != 1f) {
float childCenterX = child.getLeft() + child.getMeasuredWidth() / 2f;
delay = (int) (200 * ((Math.abs(childCenterX / (float) recyclerListView.getMeasuredWidth() - 0.8f))));
}
if (child instanceof ReactionHolderView) { if (child instanceof ReactionHolderView) {
ReactionHolderView view = (ReactionHolderView) recyclerListView.getChildAt(i); ReactionHolderView view = (ReactionHolderView) recyclerListView.getChildAt(i);
checkPressedProgress(canvas, view); checkPressedProgress(canvas, view);
@ -690,6 +697,9 @@ public class ReactionsContainerLayout extends FrameLayout implements Notificatio
if (child == premiumLockContainer) { if (child == premiumLockContainer) {
if (child.getX() + child.getMeasuredWidth() / 2f > 0 && child.getX() + child.getMeasuredWidth() / 2f < recyclerListView.getWidth()) { if (child.getX() + child.getMeasuredWidth() / 2f > 0 && child.getX() + child.getMeasuredWidth() / 2f < recyclerListView.getWidth()) {
if (!lastVisibleViewsTmp.contains(child)) { if (!lastVisibleViewsTmp.contains(child)) {
if (transitionProgress != 1f) {
premiumLockIconView.resetAnimation();
}
premiumLockIconView.play(delay); premiumLockIconView.play(delay);
delay += 30; delay += 30;
} }
@ -701,6 +711,9 @@ public class ReactionsContainerLayout extends FrameLayout implements Notificatio
if (child == customReactionsContainer) { if (child == customReactionsContainer) {
if (child.getX() + child.getMeasuredWidth() / 2f > 0 && child.getX() + child.getMeasuredWidth() / 2f < recyclerListView.getWidth()) { if (child.getX() + child.getMeasuredWidth() / 2f > 0 && child.getX() + child.getMeasuredWidth() / 2f < recyclerListView.getWidth()) {
if (!lastVisibleViewsTmp.contains(child)) { if (!lastVisibleViewsTmp.contains(child)) {
if (transitionProgress != 1f) {
customEmojiReactionsIconView.resetAnimation();
}
customEmojiReactionsIconView.play(delay); customEmojiReactionsIconView.play(delay);
delay += 30; delay += 30;
} }
@ -726,7 +739,7 @@ public class ReactionsContainerLayout extends FrameLayout implements Notificatio
float scale = Utilities.clamp(progress, 1f, 0f); float scale = Utilities.clamp(progress, 1f, 0f);
nextRecentReaction.setScaleX(scale); nextRecentReaction.setScaleX(scale);
nextRecentReaction.setScaleY(scale); nextRecentReaction.setScaleY(scale);
nextRecentReaction.setTranslationX(recyclerListView.getLeft() + left - pullingOffsetX - AndroidUtilities.dp(20)); nextRecentReaction.setTranslationX(recyclerListView.getX() + left - pullingOffsetX - AndroidUtilities.dp(20));
nextRecentReaction.setVisibility(View.VISIBLE); nextRecentReaction.setVisibility(View.VISIBLE);
} else { } else {
nextRecentReaction.setVisibility(View.GONE); nextRecentReaction.setVisibility(View.GONE);
@ -739,9 +752,6 @@ public class ReactionsContainerLayout extends FrameLayout implements Notificatio
if (skipDraw && reactionsWindow != null) { if (skipDraw && reactionsWindow != null) {
int alpha = (int) (Utilities.clamp(1f - (customEmojiReactionsEnterProgress / 0.2f), 1f, 0f) * (1f - customEmojiReactionsEnterProgress) * 255); int alpha = (int) (Utilities.clamp(1f - (customEmojiReactionsEnterProgress / 0.2f), 1f, 0f) * (1f - customEmojiReactionsEnterProgress) * 255);
canvas.save(); canvas.save();
//canvas.translate(rect.left - reactionsWindow.drawingRect.left + (rect.width() - reactionsWindow.drawingRect.width()), rect.top - reactionsWindow.drawingRect.top + (rect.height() - reactionsWindow.drawingRect.height()));
// canvas.translate(rect.width() - reactionsWindow.drawingRect.width(), (reactionsWindow.drawingRect.bottom() - rect.height()));
drawBubbles(canvas, br, cPr, sr, alpha); drawBubbles(canvas, br, cPr, sr, alpha);
canvas.restore(); canvas.restore();
return; return;
@ -749,6 +759,7 @@ public class ReactionsContainerLayout extends FrameLayout implements Notificatio
canvas.clipPath(mPath); canvas.clipPath(mPath);
canvas.translate((LocaleController.isRTL || mirrorX ? -1 : 1) * getWidth() * (1f - transitionProgress), 0); canvas.translate((LocaleController.isRTL || mirrorX ? -1 : 1) * getWidth() * (1f - transitionProgress), 0);
recyclerListView.setTranslationX(-transitionLeftOffset);
super.dispatchDraw(canvas); super.dispatchDraw(canvas);
if (leftShadowPaint != null) { if (leftShadowPaint != null) {
@ -776,7 +787,8 @@ public class ReactionsContainerLayout extends FrameLayout implements Notificatio
private void drawBubbles(Canvas canvas, float br, float cPr, float sr, int alpha) { private void drawBubbles(Canvas canvas, float br, float cPr, float sr, int alpha) {
canvas.save(); canvas.save();
canvas.clipRect(0, AndroidUtilities.lerp(rect.bottom, 0, CubicBezierInterpolator.DEFAULT.getInterpolation(flipVerticalProgress)), getMeasuredWidth(), AndroidUtilities.lerp(getMeasuredHeight() + AndroidUtilities.dp(8), getPaddingTop() - expandSize(), CubicBezierInterpolator.DEFAULT.getInterpolation(flipVerticalProgress))); float scale = transitionProgress;
canvas.clipRect(0, AndroidUtilities.lerp(rect.bottom, 0, CubicBezierInterpolator.DEFAULT.getInterpolation(flipVerticalProgress)) - (int) Math.ceil(rect.height() / 2f * (1f - transitionProgress)), getMeasuredWidth(), AndroidUtilities.lerp(getMeasuredHeight() + AndroidUtilities.dp(8), getPaddingTop() - expandSize(), CubicBezierInterpolator.DEFAULT.getInterpolation(flipVerticalProgress)));
float cx = LocaleController.isRTL || mirrorX ? bigCircleOffset : getWidth() - bigCircleOffset; float cx = LocaleController.isRTL || mirrorX ? bigCircleOffset : getWidth() - bigCircleOffset;
float cy = getHeight() - getPaddingBottom() + expandSize(); float cy = getHeight() - getPaddingBottom() + expandSize();
cy = AndroidUtilities.lerp(cy, getPaddingTop() - expandSize(), CubicBezierInterpolator.DEFAULT.getInterpolation(flipVerticalProgress)); cy = AndroidUtilities.lerp(cy, getPaddingTop() - expandSize(), CubicBezierInterpolator.DEFAULT.getInterpolation(flipVerticalProgress));
@ -816,7 +828,6 @@ public class ReactionsContainerLayout extends FrameLayout implements Notificatio
view.setScaleY(otherViewsScale); view.setScaleY(otherViewsScale);
} }
private void checkPressedProgress(Canvas canvas, ReactionHolderView view) { private void checkPressedProgress(Canvas canvas, ReactionHolderView view) {
float pullingOffsetX = 0; float pullingOffsetX = 0;
if (pullingLeftOffset != 0) { if (pullingLeftOffset != 0) {
@ -913,10 +924,12 @@ public class ReactionsContainerLayout extends FrameLayout implements Notificatio
public void setTransitionProgress(float transitionProgress) { public void setTransitionProgress(float transitionProgress) {
this.transitionProgress = transitionProgress; this.transitionProgress = transitionProgress;
if (parentLayout != null && parentLayout.getPopupWindowLayout() != null) {
parentLayout.getPopupWindowLayout().setReactionsTransitionProgress(transitionProgress);
}
invalidate(); invalidate();
} }
public void setMessage(MessageObject message, TLRPC.ChatFull chatFull) { public void setMessage(MessageObject message, TLRPC.ChatFull chatFull) {
this.messageObject = message; this.messageObject = message;
TLRPC.ChatFull reactionsChat = chatFull; TLRPC.ChatFull reactionsChat = chatFull;
@ -971,7 +984,6 @@ public class ReactionsContainerLayout extends FrameLayout implements Notificatio
} }
} }
private void fillRecentReactionsList(List<ReactionsLayoutInBubble.VisibleReaction> visibleReactions) { private void fillRecentReactionsList(List<ReactionsLayoutInBubble.VisibleReaction> visibleReactions) {
if (!allReactionsAvailable) { if (!allReactionsAvailable) {
//fill default reactions //fill default reactions
@ -1037,8 +1049,8 @@ public class ReactionsContainerLayout extends FrameLayout implements Notificatio
public void startEnterAnimation() { public void startEnterAnimation() {
setTransitionProgress(0); setTransitionProgress(0);
setAlpha(1f); setAlpha(1f);
ObjectAnimator animator = ObjectAnimator.ofFloat(this, ReactionsContainerLayout.TRANSITION_PROGRESS_VALUE, 0f, 1f).setDuration(400); ObjectAnimator animator = ObjectAnimator.ofFloat(this, ReactionsContainerLayout.TRANSITION_PROGRESS_VALUE, 0f, 1f).setDuration(350);
animator.setInterpolator(new OvershootInterpolator(1.004f)); animator.setInterpolator(new OvershootInterpolator(0.5f));
animator.start(); animator.start();
} }
@ -1198,6 +1210,7 @@ public class ReactionsContainerLayout extends FrameLayout implements Notificatio
public boolean selected; public boolean selected;
public boolean drawSelected = true; public boolean drawSelected = true;
public int position; public int position;
public boolean waitingAnimation;
Runnable playRunnable = new Runnable() { Runnable playRunnable = new Runnable() {
@Override @Override
@ -1205,6 +1218,7 @@ public class ReactionsContainerLayout extends FrameLayout implements Notificatio
if (enterImageView.getImageReceiver().getLottieAnimation() != null && !enterImageView.getImageReceiver().getLottieAnimation().isRunning() && !enterImageView.getImageReceiver().getLottieAnimation().isGeneratingCache()) { if (enterImageView.getImageReceiver().getLottieAnimation() != null && !enterImageView.getImageReceiver().getLottieAnimation().isRunning() && !enterImageView.getImageReceiver().getLottieAnimation().isGeneratingCache()) {
enterImageView.getImageReceiver().getLottieAnimation().start(); enterImageView.getImageReceiver().getLottieAnimation().start();
} }
waitingAnimation = false;
} }
}; };
@ -1230,7 +1244,7 @@ public class ReactionsContainerLayout extends FrameLayout implements Notificatio
@Override @Override
protected void dispatchDraw(Canvas canvas) { protected void dispatchDraw(Canvas canvas) {
super.dispatchDraw(canvas); super.dispatchDraw(canvas);
if (imageReceiver.getLottieAnimation() != null) { if (imageReceiver.getLottieAnimation() != null && !waitingAnimation) {
imageReceiver.getLottieAnimation().start(); imageReceiver.getLottieAnimation().start();
} }
if (shouldSwitchToLoopView && !switchedToLoopView && imageReceiver.getLottieAnimation() != null && imageReceiver.getLottieAnimation().isLastFrame() && loopImageView.imageReceiver.getLottieAnimation() != null && loopImageView.imageReceiver.getLottieAnimation().hasBitmap()) { if (shouldSwitchToLoopView && !switchedToLoopView && imageReceiver.getLottieAnimation() != null && imageReceiver.getLottieAnimation().isLastFrame() && loopImageView.imageReceiver.getLottieAnimation() != null && loopImageView.imageReceiver.getLottieAnimation().hasBitmap()) {
@ -1336,6 +1350,7 @@ public class ReactionsContainerLayout extends FrameLayout implements Notificatio
} }
pressedBackupImageView.getImageReceiver().setImage(ImageLocation.getForDocument(defaultReaction.select_animation), ReactionsUtils.SELECT_ANIMATION_FILTER, null, null, svgThumb, 0, "tgs", react, 0); pressedBackupImageView.getImageReceiver().setImage(ImageLocation.getForDocument(defaultReaction.select_animation), ReactionsUtils.SELECT_ANIMATION_FILTER, null, null, svgThumb, 0, "tgs", react, 0);
preloadImageReceiver.setAllowStartLottieAnimation(false);
MediaDataController.getInstance(currentAccount).preloadImage(preloadImageReceiver, ImageLocation.getForDocument(defaultReaction.around_animation), ReactionsEffectOverlay.getFilterForAroundAnimation()); MediaDataController.getInstance(currentAccount).preloadImage(preloadImageReceiver, ImageLocation.getForDocument(defaultReaction.around_animation), ReactionsEffectOverlay.getFilterForAroundAnimation());
} }
} }
@ -1370,10 +1385,13 @@ public class ReactionsContainerLayout extends FrameLayout implements Notificatio
if (enterImageView.getImageReceiver().getLottieAnimation() != null && !enterImageView.getImageReceiver().getLottieAnimation().isGeneratingCache() && !isEnter) { if (enterImageView.getImageReceiver().getLottieAnimation() != null && !enterImageView.getImageReceiver().getLottieAnimation().isGeneratingCache() && !isEnter) {
isEnter = true; isEnter = true;
if (delay == 0) { if (delay == 0) {
waitingAnimation = false;
enterImageView.getImageReceiver().getLottieAnimation().stop(); enterImageView.getImageReceiver().getLottieAnimation().stop();
enterImageView.getImageReceiver().getLottieAnimation().setCurrentFrame(0, false); enterImageView.getImageReceiver().getLottieAnimation().setCurrentFrame(0, false);
playRunnable.run(); playRunnable.run();
} else { } else {
waitingAnimation = true;
enterImageView.getImageReceiver().getLottieAnimation().stop(); enterImageView.getImageReceiver().getLottieAnimation().stop();
enterImageView.getImageReceiver().getLottieAnimation().setCurrentFrame(0, false); enterImageView.getImageReceiver().getLottieAnimation().setCurrentFrame(0, false);
AndroidUtilities.runOnUIThread(playRunnable, delay); AndroidUtilities.runOnUIThread(playRunnable, delay);
@ -1389,7 +1407,7 @@ public class ReactionsContainerLayout extends FrameLayout implements Notificatio
if (!isEnter) { if (!isEnter) {
loopImageView.setScaleY(0); loopImageView.setScaleY(0);
loopImageView.setScaleX(0); loopImageView.setScaleX(0);
loopImageView.animate().scaleX(1f).scaleY(1).setDuration(150).setStartDelay(delay).start(); loopImageView.animate().scaleX(1f).scaleY(1).setDuration(150).setStartDelay((long) (delay * durationScale)).start();
isEnter = true; isEnter = true;
} }
} }
@ -1586,15 +1604,13 @@ public class ReactionsContainerLayout extends FrameLayout implements Notificatio
valueAnimator = ValueAnimator.ofFloat(getScaleX(), 1f); valueAnimator = ValueAnimator.ofFloat(getScaleX(), 1f);
valueAnimator.setInterpolator(AndroidUtilities.overshootInterpolator); valueAnimator.setInterpolator(AndroidUtilities.overshootInterpolator);
valueAnimator.addUpdateListener(new ValueAnimator.AnimatorUpdateListener() { valueAnimator.addUpdateListener(animation -> {
@Override
public void onAnimationUpdate(ValueAnimator animation) {
float s = (float) animation.getAnimatedValue(); float s = (float) animation.getAnimatedValue();
setScaleX(s); setScaleX(s);
setScaleY(s); setScaleY(s);
customReactionsContainer.invalidate(); customReactionsContainer.invalidate();
}
}); });
valueAnimator.setStartDelay((long) (delay * durationScale));
valueAnimator.setDuration(300); valueAnimator.setDuration(300);
valueAnimator.start(); valueAnimator.start();
} }
@ -1647,4 +1663,8 @@ public class ReactionsContainerLayout extends FrameLayout implements Notificatio
public float expandSize() { public float expandSize() {
return (int) (getPullingLeftProgress() * AndroidUtilities.dp(6)); return (int) (getPullingLeftProgress() * AndroidUtilities.dp(6));
} }
public void setParentLayout(ChatScrimPopupContainerLayout layout) {
parentLayout = layout;
}
} }

35
TMessagesProj/src/main/java/org/telegram/ui/Components/TranslateAlert2.java
View File

@ -975,16 +975,30 @@ public class TranslateAlert2 extends BottomSheet implements NotificationCenter.N
} }
public static String languageName(String locale) { public static String languageName(String locale) {
if (locale == null || locale.equals("und") || locale.equals("auto")) { return languageName(locale, null);
}
public static String languageName(String locale, boolean[] accusative) {
if (locale == null || locale.equals(TranslateController.UNKNOWN_LANGUAGE) || locale.equals("auto")) {
return null; return null;
} }
LocaleController.LocaleInfo currentLanguageInfo = LocaleController.getInstance().getCurrentLocaleInfo();
try {
Locale[] allLocales = Locale.getAvailableLocales();
String simplifiedLocale = locale.split("_")[0]; String simplifiedLocale = locale.split("_")[0];
if ("nb".equals(simplifiedLocale)) { if ("nb".equals(simplifiedLocale)) {
simplifiedLocale = "no"; simplifiedLocale = "no";
} }
// getting localized language name in accusative case
if (accusative != null) {
String localed = LocaleController.getString("TranslateLanguage" + simplifiedLocale.toUpperCase());
if (accusative[0] = (localed != null && !localed.startsWith("LOC_ERR"))) {
return localed;
}
}
// getting language name from system
try {
Locale[] allLocales = Locale.getAvailableLocales();
Locale found = null; Locale found = null;
for (int i = 0; i < allLocales.length; ++i) { for (int i = 0; i < allLocales.length; ++i) {
if (TextUtils.equals(simplifiedLocale, allLocales[i].getLanguage())) { if (TextUtils.equals(simplifiedLocale, allLocales[i].getLanguage())) {
@ -995,21 +1009,18 @@ public class TranslateAlert2 extends BottomSheet implements NotificationCenter.N
if (found != null) { if (found != null) {
return found.getDisplayLanguage(Locale.getDefault()); return found.getDisplayLanguage(Locale.getDefault());
} }
} catch (Exception e) {} } catch (Exception ignore) {}
// getting language name from lang packs
if ("no".equals(locale)) { if ("no".equals(locale)) {
locale = "nb"; locale = "nb";
} }
LocaleController.LocaleInfo thisLanguageInfo = LocaleController.getInstance().getBuiltinLanguageByPlural(locale); final LocaleController.LocaleInfo currentLanguageInfo = LocaleController.getInstance().getCurrentLocaleInfo();
final LocaleController.LocaleInfo thisLanguageInfo = LocaleController.getInstance().getBuiltinLanguageByPlural(locale);
if (thisLanguageInfo == null) { if (thisLanguageInfo == null) {
return null; return null;
} }
boolean isCurrentLanguageEnglish = currentLanguageInfo != null && "en".equals(currentLanguageInfo.pluralLangCode); boolean isCurrentLanguageEnglish = currentLanguageInfo != null && "en".equals(currentLanguageInfo.pluralLangCode);
// try {
// String lang = LocaleController.getString("PassportLanguage_" + thisLanguageInfo.pluralLangCode.toUpperCase());
// if (lang != null && !lang.startsWith("LOC_ERR")) {
// return lang;
// }
// } catch (Exception ignore) {}
if (isCurrentLanguageEnglish) { if (isCurrentLanguageEnglish) {
return thisLanguageInfo.nameEnglish; return thisLanguageInfo.nameEnglish;
} else { } else {

59
TMessagesProj/src/main/java/org/telegram/ui/Components/TranslateButton.java
View File

@ -1,6 +1,7 @@
package org.telegram.ui.Components; package org.telegram.ui.Components;
import android.content.Context; import android.content.Context;
import android.graphics.Canvas;
import android.graphics.PorterDuff; import android.graphics.PorterDuff;
import android.graphics.PorterDuffColorFilter; import android.graphics.PorterDuffColorFilter;
import android.graphics.drawable.Drawable; import android.graphics.drawable.Drawable;
@ -10,6 +11,7 @@ import android.text.TextUtils;
import android.text.style.DynamicDrawableSpan; import android.text.style.DynamicDrawableSpan;
import android.text.style.ImageSpan; import android.text.style.ImageSpan;
import android.view.Gravity; import android.view.Gravity;
import android.view.View;
import android.view.WindowManager; import android.view.WindowManager;
import android.widget.FrameLayout; import android.widget.FrameLayout;
import android.widget.ImageView; import android.widget.ImageView;
@ -45,6 +47,8 @@ public class TranslateButton extends FrameLayout {
private ImageView menuView; private ImageView menuView;
private boolean[] accusative = new boolean[1];
public TranslateButton(Context context, ChatActivity chatActivity, Theme.ResourcesProvider resourcesProvider) { public TranslateButton(Context context, ChatActivity chatActivity, Theme.ResourcesProvider resourcesProvider) {
this(context, chatActivity.getCurrentAccount(), chatActivity.getDialogId(), chatActivity, resourcesProvider); this(context, chatActivity.getCurrentAccount(), chatActivity.getDialogId(), chatActivity, resourcesProvider);
} }
@ -98,7 +102,38 @@ public class TranslateButton extends FrameLayout {
LinearLayout swipeBack = new LinearLayout(getContext()); LinearLayout swipeBack = new LinearLayout(getContext());
swipeBack.setOrientation(LinearLayout.VERTICAL); swipeBack.setOrientation(LinearLayout.VERTICAL);
ScrollView swipeBackScrollView = new ScrollView(getContext()); ScrollView swipeBackScrollView = new ScrollView(getContext()) {
Drawable topShadowDrawable;
AnimatedFloat alphaFloat = new AnimatedFloat(this, 350, CubicBezierInterpolator.EASE_OUT_QUINT);
private boolean wasCanScrollVertically;
@Override
public void onNestedScroll(View target, int dxConsumed, int dyConsumed, int dxUnconsumed, int dyUnconsumed) {
super.onNestedScroll(target, dxConsumed, dyConsumed, dxUnconsumed, dyUnconsumed);
boolean canScrollVertically = canScrollVertically(-1);
if (wasCanScrollVertically != canScrollVertically) {
invalidate();
wasCanScrollVertically = canScrollVertically;
}
}
@Override
protected void dispatchDraw(Canvas canvas) {
super.dispatchDraw(canvas);
float alpha = .5f * alphaFloat.set(canScrollVertically(-1) ? 1 : 0);
if (alpha > 0) {
if (topShadowDrawable == null) {
topShadowDrawable = getContext().getResources().getDrawable(R.drawable.header_shadow);
}
topShadowDrawable.setBounds(
0, getScrollY(), getWidth(), getScrollY() + topShadowDrawable.getIntrinsicHeight()
);
topShadowDrawable.setAlpha((int) (0xFF * alpha));
topShadowDrawable.draw(canvas);
}
}
};
LinearLayout swipeBackScroll = new LinearLayout(getContext()); LinearLayout swipeBackScroll = new LinearLayout(getContext());
swipeBackScrollView.addView(swipeBackScroll); swipeBackScrollView.addView(swipeBackScroll);
swipeBackScroll.setOrientation(LinearLayout.VERTICAL); swipeBackScroll.setOrientation(LinearLayout.VERTICAL);
@ -117,15 +152,16 @@ public class TranslateButton extends FrameLayout {
backButton.setOnClickListener(e -> popupLayout.getSwipeBack().closeForeground()); backButton.setOnClickListener(e -> popupLayout.getSwipeBack().closeForeground());
swipeBack.addView(backButton); swipeBack.addView(backButton);
swipeBack.addView(new ActionBarPopupWindow.GapView(getContext(), resourcesProvider), LayoutHelper.createLinear(LayoutHelper.MATCH_PARENT, 8));
swipeBack.addView(swipeBackScrollView, LayoutHelper.createLinear(LayoutHelper.MATCH_PARENT, 420)); swipeBack.addView(swipeBackScrollView, LayoutHelper.createLinear(LayoutHelper.MATCH_PARENT, 420));
String detectedLanguage = translateController.getDialogDetectedLanguage(dialogId); String detectedLanguage = translateController.getDialogDetectedLanguage(dialogId);
String detectedLanguageName = TranslateAlert2.languageName(detectedLanguage); String detectedLanguageName = TranslateAlert2.languageName(detectedLanguage);
String detectedLanguageNameAccusative = TranslateAlert2.languageName(detectedLanguage, accusative);
String currentTranslateTo = translateController.getDialogTranslateTo(dialogId); String currentTranslateTo = translateController.getDialogTranslateTo(dialogId);
ArrayList<TranslateController.Language> suggestedLanguages = TranslateController.getSuggestedLanguages(currentTranslateTo); ArrayList<TranslateController.Language> suggestedLanguages = TranslateController.getSuggestedLanguages(currentTranslateTo);
ArrayList<TranslateController.Language> allLanguages = TranslateController.getLanguages(); ArrayList<TranslateController.Language> allLanguages = TranslateController.getLanguages();
swipeBackScroll.addView(new ActionBarPopupWindow.GapView(getContext(), resourcesProvider), LayoutHelper.createLinear(LayoutHelper.MATCH_PARENT, 8));
if (currentTranslateTo != null) { if (currentTranslateTo != null) {
String displayName = TranslateAlert2.capitalFirst(TranslateAlert2.languageName(currentTranslateTo)); String displayName = TranslateAlert2.capitalFirst(TranslateAlert2.languageName(currentTranslateTo));
if (displayName != null) { if (displayName != null) {
@ -185,15 +221,13 @@ public class TranslateButton extends FrameLayout {
popupLayout.addView(new ActionBarPopupWindow.GapView(getContext(), resourcesProvider), LayoutHelper.createLinear(LayoutHelper.MATCH_PARENT, 8)); popupLayout.addView(new ActionBarPopupWindow.GapView(getContext(), resourcesProvider), LayoutHelper.createLinear(LayoutHelper.MATCH_PARENT, 8));
if (detectedLanguageName != null && detectedLanguage != null) { if (detectedLanguageNameAccusative != null) {
ActionBarMenuSubItem dontTranslateButton = new ActionBarMenuSubItem(getContext(), true, false, resourcesProvider); ActionBarMenuSubItem dontTranslateButton = new ActionBarMenuSubItem(getContext(), true, false, resourcesProvider);
String text; String text;
String lang = LocaleController.getString("TranslateLanguage" + detectedLanguage.toUpperCase()); if (accusative[0]) {
if (lang == null || lang.startsWith("LOC_ERR")) { text = LocaleController.formatString("DoNotTranslateLanguage", R.string.DoNotTranslateLanguage, detectedLanguageNameAccusative);
lang = detectedLanguageName;
text = LocaleController.formatString("DoNotTranslateLanguageOther", R.string.DoNotTranslateLanguageOther, lang);
} else { } else {
text = LocaleController.formatString("DoNotTranslateLanguage", R.string.DoNotTranslateLanguage, lang); text = LocaleController.formatString("DoNotTranslateLanguageOther", R.string.DoNotTranslateLanguageOther, detectedLanguageNameAccusative);
} }
dontTranslateButton.setTextAndIcon(text, R.drawable.msg_block2); dontTranslateButton.setTextAndIcon(text, R.drawable.msg_block2);
dontTranslateButton.setOnClickListener(e -> { dontTranslateButton.setOnClickListener(e -> {
@ -249,12 +283,11 @@ public class TranslateButton extends FrameLayout {
lng = "en"; lng = "en";
} }
String text; String text;
String lang = LocaleController.getString("TranslateLanguage" + lng.toUpperCase()); String lang = TranslateAlert2.languageName(lng, accusative);
if (lang == null || lang.startsWith("LOC_ERR")) { if (accusative[0]) {
lang = TranslateAlert2.languageName(lng);
text = LocaleController.formatString("TranslateToButtonOther", R.string.TranslateToButtonOther, lang);
} else {
text = LocaleController.formatString("TranslateToButton", R.string.TranslateToButton, lang); text = LocaleController.formatString("TranslateToButton", R.string.TranslateToButton, lang);
} else {
text = LocaleController.formatString("TranslateToButtonOther", R.string.TranslateToButtonOther, lang);
} }
textView.setText(TextUtils.concat(translateIcon, " ", text)); textView.setText(TextUtils.concat(translateIcon, " ", text));
} }

3
TMessagesProj/src/main/java/org/telegram/ui/DialogsActivity.java
View File

@ -6222,6 +6222,9 @@ public class DialogsActivity extends BaseFragment implements NotificationCenter.
if (fragmentView != null) { if (fragmentView != null) {
fragmentView.invalidate(); fragmentView.invalidate();
} }
if (dialogsHintCell != null) {
dialogsHintCell.setAlpha(1f - progress);
}
if (full) { if (full) {
// //
// if (show) { // if (show) {

24
TMessagesProj/src/main/java/org/telegram/ui/LanguageSelectActivity.java
View File

@ -219,11 +219,12 @@ public class LanguageSelectActivity extends BaseFragment implements Notification
} }
final boolean currentFullValue = getContextValue() || getChatValue(); final boolean currentFullValue = getContextValue() || getChatValue();
if (currentFullValue != prevFullValue) { if (currentFullValue != prevFullValue) {
listAdapter.notifyItemChanged(2); int start = 1 + (!getMessagesController().premiumLocked ? 1 : 0);
listAdapter.notifyItemChanged(start);
if (currentFullValue) { if (currentFullValue) {
listAdapter.notifyItemInserted(3); listAdapter.notifyItemInserted(start + 1);
} else { } else {
listAdapter.notifyItemRemoved(3); listAdapter.notifyItemRemoved(start + 1);
} }
} }
return; return;
@ -236,7 +237,7 @@ public class LanguageSelectActivity extends BaseFragment implements Notification
} }
boolean search = listView.getAdapter() == searchListViewAdapter; boolean search = listView.getAdapter() == searchListViewAdapter;
if (!search) { if (!search) {
position -= (getChatValue() || getContextValue()) ? 7 : 6; position -= (7 - (!(getChatValue() || getContextValue()) ? 1 : 0) - (getMessagesController().premiumLocked ? 1 : 0));
} }
LocaleController.LocaleInfo localeInfo; LocaleController.LocaleInfo localeInfo;
if (search) { if (search) {
@ -299,7 +300,7 @@ public class LanguageSelectActivity extends BaseFragment implements Notification
} }
boolean search = listView.getAdapter() == searchListViewAdapter; boolean search = listView.getAdapter() == searchListViewAdapter;
if (!search) { if (!search) {
position -= (getChatValue() || getContextValue()) ? 7 : 6; position -= (7 - (!(getChatValue() || getContextValue()) ? 1 : 0) - (getMessagesController().premiumLocked ? 1 : 0));
} }
LocaleController.LocaleInfo localeInfo; LocaleController.LocaleInfo localeInfo;
if (search) { if (search) {
@ -812,7 +813,7 @@ public class LanguageSelectActivity extends BaseFragment implements Notification
if (!unofficialLanguages.isEmpty()) { if (!unofficialLanguages.isEmpty()) {
count += unofficialLanguages.size() + 1; count += unofficialLanguages.size() + 1;
} }
return 5 + (getChatValue() || getContextValue() ? 1 : 0) + 1 + count; return 4 + (getMessagesController().premiumLocked ? 0 : 1) + (getChatValue() || getContextValue() ? 1 : 0) + 1 + count;
} }
} }
@ -858,7 +859,7 @@ public class LanguageSelectActivity extends BaseFragment implements Notification
switch (holder.getItemViewType()) { switch (holder.getItemViewType()) {
case VIEW_TYPE_LANGUAGE: { case VIEW_TYPE_LANGUAGE: {
if (!search) { if (!search) {
position -= (getChatValue() || getContextValue()) ? 7 : 6; position -= (7 - (!(getChatValue() || getContextValue()) ? 1 : 0) - (getMessagesController().premiumLocked ? 1 : 0));
} }
TextRadioCell textSettingsCell = (TextRadioCell) holder.itemView; TextRadioCell textSettingsCell = (TextRadioCell) holder.itemView;
LocaleController.LocaleInfo localeInfo = null; LocaleController.LocaleInfo localeInfo = null;
@ -907,8 +908,9 @@ public class LanguageSelectActivity extends BaseFragment implements Notification
final String doNotTranslateCellName = LocaleController.getString("DoNotTranslate", R.string.DoNotTranslate); final String doNotTranslateCellName = LocaleController.getString("DoNotTranslate", R.string.DoNotTranslate);
String doNotTranslateCellValue = null; String doNotTranslateCellValue = null;
try { try {
boolean[] accusative = new boolean[1];
if (langCodes.size() == 1) { if (langCodes.size() == 1) {
doNotTranslateCellValue = TranslateAlert2.capitalFirst(TranslateAlert2.languageName(langCodes.iterator().next())); doNotTranslateCellValue = TranslateAlert2.capitalFirst(TranslateAlert2.languageName(langCodes.iterator().next(), accusative));
} else { } else {
Iterator<String> iterator = langCodes.iterator(); Iterator<String> iterator = langCodes.iterator();
boolean first = true; boolean first = true;
@ -918,7 +920,7 @@ public class LanguageSelectActivity extends BaseFragment implements Notification
if (!first) { if (!first) {
string.append(", "); string.append(", ");
} }
string.append(TranslateAlert2.capitalFirst(TranslateAlert2.languageName(lang))); string.append(TranslateAlert2.capitalFirst(TranslateAlert2.languageName(lang, accusative)));
first = false; first = false;
} }
doNotTranslateCellValue = string.toString(); doNotTranslateCellValue = string.toString();
@ -973,14 +975,16 @@ public class LanguageSelectActivity extends BaseFragment implements Notification
} else { } else {
if (i-- == 0) return VIEW_TYPE_HEADER; if (i-- == 0) return VIEW_TYPE_HEADER;
if (i-- == 0) return VIEW_TYPE_SWITCH; if (i-- == 0) return VIEW_TYPE_SWITCH;
if (!getMessagesController().premiumLocked) {
if (i-- == 0) return VIEW_TYPE_SWITCH; if (i-- == 0) return VIEW_TYPE_SWITCH;
}
if (getChatValue() || getContextValue()) { if (getChatValue() || getContextValue()) {
if (i-- == 0) return VIEW_TYPE_SETTINGS; if (i-- == 0) return VIEW_TYPE_SETTINGS;
} }
if (i-- == 0) return VIEW_TYPE_INFO; if (i-- == 0) return VIEW_TYPE_INFO;
if (i-- == 0) return VIEW_TYPE_INFO; if (i-- == 0) return VIEW_TYPE_INFO;
if (i-- == 0) return VIEW_TYPE_HEADER; if (i-- == 0) return VIEW_TYPE_HEADER;
if (!unofficialLanguages.isEmpty() && (i == unofficialLanguages.size() || i == unofficialLanguages.size() + 1 + sortedLanguages.size() + 1) || unofficialLanguages.isEmpty() && i == sortedLanguages.size()) { if (!unofficialLanguages.isEmpty() && (i == unofficialLanguages.size() || i == unofficialLanguages.size() + sortedLanguages.size() + 1) || unofficialLanguages.isEmpty() && i == sortedLanguages.size()) {
return VIEW_TYPE_SHADOW; return VIEW_TYPE_SHADOW;
} }
return VIEW_TYPE_LANGUAGE; return VIEW_TYPE_LANGUAGE;

6
TMessagesProj/src/main/java/org/telegram/ui/ProfileActivity.java
View File

@ -6627,7 +6627,11 @@ public class ProfileActivity extends BaseFragment implements NotificationCenter.
} }
profileTransitionInProgress = true; profileTransitionInProgress = true;
ValueAnimator valueAnimator = ValueAnimator.ofFloat(0, 1f); ValueAnimator valueAnimator = ValueAnimator.ofFloat(0, 1f);
valueAnimator.addUpdateListener(valueAnimator1 -> fragmentView.invalidate()); valueAnimator.addUpdateListener(valueAnimator1 -> {
if (fragmentView != null) {
fragmentView.invalidate();
}
});
animatorSet.playTogether(valueAnimator); animatorSet.playTogether(valueAnimator);
animatorSet.addListener(new AnimatorListenerAdapter() { animatorSet.addListener(new AnimatorListenerAdapter() {

4
TMessagesProj/src/main/java/org/telegram/ui/QrActivity.java
View File

@ -374,7 +374,9 @@ public class QrActivity extends BaseFragment {
fragmentView = rootLayout; fragmentView = rootLayout;
Utilities.themeQueue.postRunnable(() -> { Utilities.themeQueue.postRunnable(() -> {
homeTheme.loadPreviewColors(currentAccount); homeTheme.loadPreviewColors(currentAccount);
if (fragmentView == null) {
return;
}
fragmentView.postDelayed(() -> { fragmentView.postDelayed(() -> {
onItemSelected(currentTheme, 0, true); onItemSelected(currentTheme, 0, true);
}, 17); }, 17);

42
TMessagesProj/src/main/java/org/telegram/ui/SelectAnimatedEmojiDialog.java
View File

@ -164,8 +164,9 @@ public class SelectAnimatedEmojiDialog extends FrameLayout implements Notificati
private ImageViewEmoji forumIconImage; private ImageViewEmoji forumIconImage;
private boolean animationsEnabled; private boolean animationsEnabled;
private boolean showStickers; private boolean showStickers;
private boolean forUser; public boolean forUser;
private ArrayList<TLRPC.TL_messages_stickerSet> stickerSets = new ArrayList<>(); private ArrayList<TLRPC.TL_messages_stickerSet> stickerSets = new ArrayList<>();
private boolean enterAnimationInProgress;
public void putAnimatedEmojiToCache(AnimatedEmojiDrawable animatedEmojiDrawable) { public void putAnimatedEmojiToCache(AnimatedEmojiDrawable animatedEmojiDrawable) {
emojiGridView.animatedEmojiDrawables.put(animatedEmojiDrawable.getDocumentId(), animatedEmojiDrawable); emojiGridView.animatedEmojiDrawables.put(animatedEmojiDrawable.getDocumentId(), animatedEmojiDrawable);
@ -326,10 +327,10 @@ public class SelectAnimatedEmojiDialog extends FrameLayout implements Notificati
private final static int currentAccount = UserConfig.selectedAccount; private final static int currentAccount = UserConfig.selectedAccount;
private int type; private int type;
private FrameLayout contentView; public FrameLayout contentView;
private View backgroundView; private View backgroundView;
private EmojiTabsStrip[] cachedEmojiTabs = new EmojiTabsStrip[2]; private EmojiTabsStrip[] cachedEmojiTabs = new EmojiTabsStrip[2];
private EmojiTabsStrip emojiTabs; public EmojiTabsStrip emojiTabs;
private View emojiTabsShadow; private View emojiTabsShadow;
private SearchBox searchBox; private SearchBox searchBox;
public FrameLayout gridViewContainer; public FrameLayout gridViewContainer;
@ -365,7 +366,7 @@ public class SelectAnimatedEmojiDialog extends FrameLayout implements Notificati
private ArrayList<TLRPC.TL_messages_stickerSet> frozenEmojiPacks = new ArrayList<>(); private ArrayList<TLRPC.TL_messages_stickerSet> frozenEmojiPacks = new ArrayList<>();
private ArrayList<EmojiView.EmojiPack> packs = new ArrayList<>(); private ArrayList<EmojiView.EmojiPack> packs = new ArrayList<>();
private boolean includeEmpty = false; private boolean includeEmpty = false;
private boolean includeHint = false; public boolean includeHint = false;
private Integer hintExpireDate; private Integer hintExpireDate;
private boolean drawBackground = true; private boolean drawBackground = true;
private List<ReactionsLayoutInBubble.VisibleReaction> recentReactionsToSet; private List<ReactionsLayoutInBubble.VisibleReaction> recentReactionsToSet;
@ -474,7 +475,7 @@ public class SelectAnimatedEmojiDialog extends FrameLayout implements Notificati
path.rewind(); path.rewind();
path.addRoundRect(AndroidUtilities.rectTmp, AndroidUtilities.dp(12), AndroidUtilities.dp(12), Path.Direction.CW); path.addRoundRect(AndroidUtilities.rectTmp, AndroidUtilities.dp(12), AndroidUtilities.dp(12), Path.Direction.CW);
canvas.drawPath(path, paint); canvas.drawPath(path, paint);
// if (showAnimator != null && showAnimator.isRunning()) { // if (enterAnimationInProgress() {
canvas.clipPath(path); canvas.clipPath(path);
// } // }
super.dispatchDraw(canvas); super.dispatchDraw(canvas);
@ -1288,6 +1289,7 @@ public class SelectAnimatedEmojiDialog extends FrameLayout implements Notificati
gridSwitchAnimator.start(); gridSwitchAnimator.start();
((View) emojiGridView.getParent()).animate() ((View) emojiGridView.getParent()).animate()
.translationY(gridSearch && liftUp ? -AndroidUtilities.dp(36) : 0) .translationY(gridSearch && liftUp ? -AndroidUtilities.dp(36) : 0)
.setUpdateListener(anm -> invalidateParent())
.setInterpolator(CubicBezierInterpolator.DEFAULT) .setInterpolator(CubicBezierInterpolator.DEFAULT)
.setDuration(160) .setDuration(160)
.start(); .start();
@ -1699,7 +1701,7 @@ public class SelectAnimatedEmojiDialog extends FrameLayout implements Notificati
} else { } else {
view = new ImageViewEmoji(getContext()); view = new ImageViewEmoji(getContext());
} }
if (showAnimator != null && showAnimator.isRunning()) { if (enterAnimationInProgress()) {
view.setScaleX(0); view.setScaleX(0);
view.setScaleY(0); view.setScaleY(0);
} }
@ -1982,7 +1984,7 @@ public class SelectAnimatedEmojiDialog extends FrameLayout implements Notificati
} else { } else {
view = new ImageViewEmoji(getContext()); view = new ImageViewEmoji(getContext());
} }
if (showAnimator != null && showAnimator.isRunning()) { if (enterAnimationInProgress()) {
view.setScaleX(0); view.setScaleX(0);
view.setScaleY(0); view.setScaleY(0);
} }
@ -2300,6 +2302,10 @@ public class SelectAnimatedEmojiDialog extends FrameLayout implements Notificati
} }
} }
private boolean enterAnimationInProgress() {
return enterAnimationInProgress || (showAnimator != null && showAnimator.isRunning());
}
private void clearRecent() { private void clearRecent() {
if (type == TYPE_REACTIONS && onRecentClearedListener != null) { if (type == TYPE_REACTIONS && onRecentClearedListener != null) {
onRecentClearedListener.onRecentCleared(); onRecentClearedListener.onRecentCleared();
@ -2565,6 +2571,7 @@ public class SelectAnimatedEmojiDialog extends FrameLayout implements Notificati
public int skewIndex; public int skewIndex;
public boolean isStaticIcon; public boolean isStaticIcon;
private float selectedProgress; private float selectedProgress;
final AnimatedEmojiSpan.InvalidateHolder invalidateHolder = new AnimatedEmojiSpan.InvalidateHolder() { final AnimatedEmojiSpan.InvalidateHolder invalidateHolder = new AnimatedEmojiSpan.InvalidateHolder() {
@Override @Override
public void invalidate() { public void invalidate() {
@ -3262,8 +3269,8 @@ public class SelectAnimatedEmojiDialog extends FrameLayout implements Notificati
SparseArray<ArrayList<ImageViewEmoji>> viewsGroupedByLines = new SparseArray<>(); SparseArray<ArrayList<ImageViewEmoji>> viewsGroupedByLines = new SparseArray<>();
ArrayList<ArrayList<ImageViewEmoji>> unusedArrays = new ArrayList<>(); ArrayList<ArrayList<ImageViewEmoji>> unusedArrays = new ArrayList<>();
ArrayList<DrawingInBackgroundLine> unusedLineDrawables = new ArrayList<>(); ArrayList<DrawingInBackgroundLine> unusedLineDrawables = new ArrayList<>();
ArrayList<EmojiListView.DrawingInBackgroundLine> lineDrawables = new ArrayList<>(); ArrayList<DrawingInBackgroundLine> lineDrawables = new ArrayList<>();
ArrayList<EmojiListView.DrawingInBackgroundLine> lineDrawablesTmp = new ArrayList<>(); ArrayList<DrawingInBackgroundLine> lineDrawablesTmp = new ArrayList<>();
private LongSparseArray<AnimatedEmojiDrawable> animatedEmojiDrawables = new LongSparseArray<>(); private LongSparseArray<AnimatedEmojiDrawable> animatedEmojiDrawables = new LongSparseArray<>();
@ -3424,6 +3431,7 @@ public class SelectAnimatedEmojiDialog extends FrameLayout implements Notificati
drawable = unusedLineDrawables.remove(unusedLineDrawables.size() - 1); drawable = unusedLineDrawables.remove(unusedLineDrawables.size() - 1);
} else { } else {
drawable = new DrawingInBackgroundLine(); drawable = new DrawingInBackgroundLine();
drawable.setLayerNum(7);
} }
drawable.position = position; drawable.position = position;
drawable.onAttachToWindow(); drawable.onAttachToWindow();
@ -3499,7 +3507,7 @@ public class SelectAnimatedEmojiDialog extends FrameLayout implements Notificati
skewAlpha = .25f + .75f * skewAlpha; skewAlpha = .25f + .75f * skewAlpha;
} }
} }
boolean drawInUi = skewAlpha < 1 || isAnimating() || imageViewEmojis.size() <= 4 || SharedConfig.getDevicePerformanceClass() == SharedConfig.PERFORMANCE_CLASS_LOW || (showAnimator != null && showAnimator.isRunning()) || SharedConfig.getLiteMode().enabled() || type == TYPE_AVATAR_CONSTRUCTOR; boolean drawInUi = skewAlpha < 1 || isAnimating() || imageViewEmojis.size() <= 4 || SharedConfig.getDevicePerformanceClass() == SharedConfig.PERFORMANCE_CLASS_LOW || enterAnimationInProgress() || SharedConfig.getLiteMode().enabled() || type == TYPE_AVATAR_CONSTRUCTOR;
if (!drawInUi) { if (!drawInUi) {
boolean animatedExpandIn = animateExpandStartTime > 0 && (SystemClock.elapsedRealtime() - animateExpandStartTime) < animateExpandDuration(); boolean animatedExpandIn = animateExpandStartTime > 0 && (SystemClock.elapsedRealtime() - animateExpandStartTime) < animateExpandDuration();
for (int i = 0; i < imageViewEmojis.size(); i++) { for (int i = 0; i < imageViewEmojis.size(); i++) {
@ -3824,6 +3832,16 @@ public class SelectAnimatedEmojiDialog extends FrameLayout implements Notificati
if (this == emojiGridView) { if (this == emojiGridView) {
bigReactionImageReceiver.onDetachedFromWindow(); bigReactionImageReceiver.onDetachedFromWindow();
} }
release(unusedLineDrawables);
release(lineDrawables);
release(lineDrawablesTmp);
}
private void release(ArrayList<DrawingInBackgroundLine> lineDrawables) {
for (int i = 0; i < lineDrawables.size(); i++) {
lineDrawables.get(i).onDetachFromWindow();
}
lineDrawables.clear();
} }
} }
@ -4986,4 +5004,8 @@ public class SelectAnimatedEmojiDialog extends FrameLayout implements Notificati
public void setAnimationsEnabled(boolean aniationsEnabled) { public void setAnimationsEnabled(boolean aniationsEnabled) {
this.animationsEnabled = aniationsEnabled; this.animationsEnabled = aniationsEnabled;
} }
public void setEnterAnimationInProgress(boolean enterAnimationInProgress) {
this.enterAnimationInProgress = enterAnimationInProgress;
}
} }

31
TMessagesProj/src/main/java/org/telegram/ui/TopicsFragment.java
View File

@ -39,6 +39,7 @@ import android.view.ViewOutlineProvider;
import android.view.animation.AccelerateDecelerateInterpolator; import android.view.animation.AccelerateDecelerateInterpolator;
import android.widget.EditText; import android.widget.EditText;
import android.widget.FrameLayout; import android.widget.FrameLayout;
import android.widget.ImageView;
import android.widget.TextView; import android.widget.TextView;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
@ -266,6 +267,7 @@ public class TopicsFragment extends BaseFragment implements NotificationCenter.N
private FrameLayout topView; private FrameLayout topView;
private RLottieImageView floatingButton; private RLottieImageView floatingButton;
private boolean canShowProgress; private boolean canShowProgress;
private ImageView closeReportSpam;
@Override @Override
public View getFullscreenView() { public View getFullscreenView() {
@ -875,6 +877,7 @@ public class TopicsFragment extends BaseFragment implements NotificationCenter.N
recyclerListView.setLayoutManager(layoutManager = new LinearLayoutManager(context) { recyclerListView.setLayoutManager(layoutManager = new LinearLayoutManager(context) {
private boolean fixOffset; private boolean fixOffset;
@Override @Override
public void scrollToPositionWithOffset(int position, int offset) { public void scrollToPositionWithOffset(int position, int offset) {
if (fixOffset) { if (fixOffset) {
@ -1190,6 +1193,20 @@ public class TopicsFragment extends BaseFragment implements NotificationCenter.N
bottomOverlayProgress.setVisibility(View.INVISIBLE); bottomOverlayProgress.setVisibility(View.INVISIBLE);
bottomOverlayContainer.addView(bottomOverlayProgress, LayoutHelper.createFrame(30, 30, Gravity.CENTER)); bottomOverlayContainer.addView(bottomOverlayProgress, LayoutHelper.createFrame(30, 30, Gravity.CENTER));
closeReportSpam = new ImageView(context);
closeReportSpam.setImageResource(R.drawable.miniplayer_close);
closeReportSpam.setContentDescription(LocaleController.getString("Close", R.string.Close));
if (Build.VERSION.SDK_INT >= 21) {
closeReportSpam.setBackground(Theme.AdaptiveRipple.circle(getThemedColor(Theme.key_chat_topPanelClose)));
}
closeReportSpam.setColorFilter(new PorterDuffColorFilter(getThemedColor(Theme.key_chat_topPanelClose), PorterDuff.Mode.MULTIPLY));
closeReportSpam.setScaleType(ImageView.ScaleType.CENTER);
bottomOverlayContainer.addView(closeReportSpam, LayoutHelper.createFrame(36, 36, Gravity.RIGHT | Gravity.TOP, 0, 6, 2, 0));
closeReportSpam.setOnClickListener(v -> {
getMessagesController().hidePeerSettingsBar(-chatId, null, getCurrentChat());
updateChatInfo();
});
updateChatInfo(); updateChatInfo();
fullscreenView = new FrameLayout(context) { fullscreenView = new FrameLayout(context) {
@ -1359,6 +1376,7 @@ public class TopicsFragment extends BaseFragment implements NotificationCenter.N
private AvatarDrawable parentAvatarDrawable; private AvatarDrawable parentAvatarDrawable;
private BackupImageView parentAvatarImageView; private BackupImageView parentAvatarImageView;
private void openParentSearch() { private void openParentSearch() {
if (parentDialogsActivity != null && parentDialogsActivity.getSearchItem() != null) { if (parentDialogsActivity != null && parentDialogsActivity.getSearchItem() != null) {
if (parentAvatarImageView == null) { if (parentAvatarImageView == null) {
@ -1392,6 +1410,7 @@ public class TopicsFragment extends BaseFragment implements NotificationCenter.N
} }
float transitionPadding; float transitionPadding;
public void setTransitionPadding(int transitionPadding) { public void setTransitionPadding(int transitionPadding) {
this.transitionPadding = transitionPadding; this.transitionPadding = transitionPadding;
updateFloatingButtonOffset(); updateFloatingButtonOffset();
@ -2319,7 +2338,9 @@ public class TopicsFragment extends BaseFragment implements NotificationCenter.N
avatarContainer.setChatAvatar(chatLocal); avatarContainer.setChatAvatar(chatLocal);
long dialog_id = -chatId;
SharedPreferences preferences = MessagesController.getNotificationsSettings(currentAccount); SharedPreferences preferences = MessagesController.getNotificationsSettings(currentAccount);
boolean show = preferences.getInt("dialog_bar_vis3" + dialog_id, 0) == 2;
boolean showReport = preferences.getBoolean("dialog_bar_report" + (-chatId), false); boolean showReport = preferences.getBoolean("dialog_bar_report" + (-chatId), false);
boolean showBlock = preferences.getBoolean("dialog_bar_block" + (-chatId), false); boolean showBlock = preferences.getBoolean("dialog_bar_block" + (-chatId), false);
@ -2376,7 +2397,7 @@ public class TopicsFragment extends BaseFragment implements NotificationCenter.N
AndroidUtilities.updateViewVisibilityAnimated(bottomOverlayProgress, showProgress, 0.5f, animated); AndroidUtilities.updateViewVisibilityAnimated(bottomOverlayProgress, showProgress, 0.5f, animated);
AndroidUtilities.updateViewVisibilityAnimated(bottomOverlayChatText, !showProgress, 0.5f, animated); AndroidUtilities.updateViewVisibilityAnimated(bottomOverlayChatText, !showProgress, 0.5f, animated);
setButtonType(BOTTOM_BUTTON_TYPE_JOIN); setButtonType(BOTTOM_BUTTON_TYPE_JOIN);
} else if (showBlock || showReport) { } else if (show && (showBlock || showReport)) {
bottomOverlayChatText.setText(LocaleController.getString("ReportSpamAndLeave", R.string.ReportSpamAndLeave)); bottomOverlayChatText.setText(LocaleController.getString("ReportSpamAndLeave", R.string.ReportSpamAndLeave));
bottomOverlayChatText.setClickable(true); bottomOverlayChatText.setClickable(true);
bottomOverlayChatText.setEnabled(true); bottomOverlayChatText.setEnabled(true);
@ -2421,6 +2442,8 @@ public class TopicsFragment extends BaseFragment implements NotificationCenter.N
if (this.bottomButtonType != bottomButtonType) { if (this.bottomButtonType != bottomButtonType) {
this.bottomButtonType = bottomButtonType; this.bottomButtonType = bottomButtonType;
bottomOverlayChatText.setTextColorKey(bottomButtonType == BOTTOM_BUTTON_TYPE_JOIN ? Theme.key_chat_fieldOverlayText : Theme.key_chat_reportSpam); bottomOverlayChatText.setTextColorKey(bottomButtonType == BOTTOM_BUTTON_TYPE_JOIN ? Theme.key_chat_fieldOverlayText : Theme.key_chat_reportSpam);
closeReportSpam.setVisibility(bottomButtonType == BOTTOM_BUTTON_TYPE_REPORT ? View.VISIBLE : View.GONE);
updateChatInfo();
} }
} }
@ -2612,7 +2635,8 @@ public class TopicsFragment extends BaseFragment implements NotificationCenter.N
} else if (id == NotificationCenter.closeChats) { } else if (id == NotificationCenter.closeChats) {
removeSelfFromStack(); removeSelfFromStack();
} if (id == NotificationCenter.openedChatChanged) { }
if (id == NotificationCenter.openedChatChanged) {
if (getParentActivity() == null || !(inPreviewMode && AndroidUtilities.isTablet())) { if (getParentActivity() == null || !(inPreviewMode && AndroidUtilities.isTablet())) {
return; return;
} }
@ -2692,6 +2716,7 @@ public class TopicsFragment extends BaseFragment implements NotificationCenter.N
} else if (viewType == VIEW_TYPE_EMPTY) { } else if (viewType == VIEW_TYPE_EMPTY) {
return new RecyclerListView.Holder(emptyView = new View(getContext()) { return new RecyclerListView.Holder(emptyView = new View(getContext()) {
HashMap<String, Boolean> precalcEllipsized = new HashMap<>(); HashMap<String, Boolean> precalcEllipsized = new HashMap<>();
@Override @Override
protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) { protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
int width = MeasureSpec.getSize(widthMeasureSpec); int width = MeasureSpec.getSize(widthMeasureSpec);
@ -2950,6 +2975,7 @@ public class TopicsFragment extends BaseFragment implements NotificationCenter.N
private Boolean hidden; private Boolean hidden;
private float hiddenT; private float hiddenT;
private ValueAnimator hiddenAnimator; private ValueAnimator hiddenAnimator;
private void updateHidden(boolean hidden, boolean animated) { private void updateHidden(boolean hidden, boolean animated) {
if (this.hidden == null) { if (this.hidden == null) {
animated = false; animated = false;
@ -2974,6 +3000,7 @@ public class TopicsFragment extends BaseFragment implements NotificationCenter.N
setHiddenT(); setHiddenT();
} }
} }
private void setHiddenT() { private void setHiddenT() {
if (forumIcon instanceof ForumUtilities.GeneralTopicDrawable) { if (forumIcon instanceof ForumUtilities.GeneralTopicDrawable) {
((ForumUtilities.GeneralTopicDrawable) forumIcon).setColor( ((ForumUtilities.GeneralTopicDrawable) forumIcon).setColor(

4
gradle.properties
View File

@ -13,8 +13,8 @@
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
# org.gradle.parallel=true # org.gradle.parallel=true
#Sat Mar 12 05:53:50 MSK 2016 #Sat Mar 12 05:53:50 MSK 2016
APP_VERSION_NAME=9.4.0 APP_VERSION_NAME=9.4.1
APP_VERSION_CODE=3098 APP_VERSION_CODE=3102
APP_PACKAGE=org.telegram.messenger APP_PACKAGE=org.telegram.messenger
RELEASE_KEY_PASSWORD=android RELEASE_KEY_PASSWORD=android
RELEASE_KEY_ALIAS=androidkey RELEASE_KEY_ALIAS=androidkey