OpenSource/Telegram-Android
OpenSource/Telegram-Android
1
0
Fork 0
mirror of https://github.com/DrKLO/Telegram.git synced 2024-12-22 14:35:03 +01:00
Code Issues Projects Releases Packages Wiki Activity

Replace magic numbers with constants and move them to BlobDrawable.

Browse source
This commit is contained in:
Makhorin 2023-03-13 00:36:02 +03:00
parent 3433c786e6
commit 97c4ac68d9
5 changed files with 21 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
TMessagesProj/src/main/java/org/telegram/ui/Cells/GroupCallUserCell.java
View file

@ -952,8 +952,8 @@ public class GroupCallUserCell extends FrameLayout {
blobDrawable2.maxRadius = maxRadius; blobDrawable2.maxRadius = maxRadius;
blobDrawable.generateBlob(); blobDrawable.generateBlob();
blobDrawable2.generateBlob(); blobDrawable2.generateBlob();
blobDrawable.paint.setColor(ColorUtils.setAlphaComponent(Theme.getColor(Theme.key_voipgroup_speakingText), 76)); blobDrawable.paint.setColor(ColorUtils.setAlphaComponent(Theme.getColor(Theme.key_voipgroup_speakingText), BlobDrawable.ALPHA_2));
blobDrawable2.paint.setColor(ColorUtils.setAlphaComponent(Theme.getColor(Theme.key_voipgroup_speakingText), 76)); blobDrawable2.paint.setColor(ColorUtils.setAlphaComponent(Theme.getColor(Theme.key_voipgroup_speakingText), BlobDrawable.ALPHA_2));
} }
public void update() { public void update() {
@ -1011,7 +1011,7 @@ public class GroupCallUserCell extends FrameLayout {
if (invalidateColor) { if (invalidateColor) {
int color = ColorUtils.blendARGB(Theme.getColor(Theme.key_voipgroup_speakingText), isMuted == 2 ? Theme.getColor(Theme.key_voipgroup_mutedByAdminIcon) : Theme.getColor(Theme.key_voipgroup_listeningText), progressToMuted); int color = ColorUtils.blendARGB(Theme.getColor(Theme.key_voipgroup_speakingText), isMuted == 2 ? Theme.getColor(Theme.key_voipgroup_mutedByAdminIcon) : Theme.getColor(Theme.key_voipgroup_listeningText), progressToMuted);
blobDrawable.paint.setColor(ColorUtils.setAlphaComponent(color, 76)); blobDrawable.paint.setColor(ColorUtils.setAlphaComponent(color, BlobDrawable.ALPHA_2));
} }
} }

7
TMessagesProj/src/main/java/org/telegram/ui/Components/BlobDrawable.java
View file

@ -34,6 +34,13 @@ public class BlobDrawable {
public static float LIGHT_GRADIENT_SIZE = 0.5f; public static float LIGHT_GRADIENT_SIZE = 0.5f;
public static int MAX_AMPLITUDE = 1800;
public static float ANIMATION_SPEED = 0.55f;
public static int ALPHA_1 = 76;
public static int ALPHA_2 = 38;
public float minRadius; public float minRadius;
public float maxRadius; public float maxRadius;

12
TMessagesProj/src/main/java/org/telegram/ui/Components/ChatActivityEnterView.java
View file

@ -1002,11 +1002,11 @@ public class ChatActivityEnterView extends BlurredFrameLayout implements Notific
} }
public void setAmplitude(double value) { public void setAmplitude(double value) {
bigWaveDrawable.setValue((float) (Math.min(1800, value) / 1800), true); bigWaveDrawable.setValue((float) (Math.min(BlobDrawable.MAX_AMPLITUDE, value) / BlobDrawable.MAX_AMPLITUDE), true);
tinyWaveDrawable.setValue((float) (Math.min(1800, value) / 1800), false); tinyWaveDrawable.setValue((float) (Math.min(BlobDrawable.MAX_AMPLITUDE, value) / BlobDrawable.MAX_AMPLITUDE), false);
animateToAmplitude = (float) (Math.min(1800, value) / 1800); animateToAmplitude = (float) (Math.min(BlobDrawable.MAX_AMPLITUDE, value) / BlobDrawable.MAX_AMPLITUDE);
animateAmplitudeDiff = (animateToAmplitude - amplitude) / (100f + 500.0f * 0.55f); animateAmplitudeDiff = (animateToAmplitude - amplitude) / (100f + 500.0f * BlobDrawable.ANIMATION_SPEED);
invalidate(); invalidate();
} }
@ -1646,8 +1646,8 @@ public class ChatActivityEnterView extends BlurredFrameLayout implements Notific
public void updateColors() { public void updateColors() {
paint.setColor(getThemedColor(Theme.key_chat_messagePanelVoiceBackground)); paint.setColor(getThemedColor(Theme.key_chat_messagePanelVoiceBackground));
tinyWaveDrawable.paint.setColor(ColorUtils.setAlphaComponent(getThemedColor(Theme.key_chat_messagePanelVoiceBackground), 38)); tinyWaveDrawable.paint.setColor(ColorUtils.setAlphaComponent(getThemedColor(Theme.key_chat_messagePanelVoiceBackground), BlobDrawable.ALPHA_2));
bigWaveDrawable.paint.setColor(ColorUtils.setAlphaComponent(getThemedColor(Theme.key_chat_messagePanelVoiceBackground), 76)); bigWaveDrawable.paint.setColor(ColorUtils.setAlphaComponent(getThemedColor(Theme.key_chat_messagePanelVoiceBackground), BlobDrawable.ALPHA_1));
tooltipPaint.setColor(getThemedColor(Theme.key_chat_gifSaveHintText)); tooltipPaint.setColor(getThemedColor(Theme.key_chat_gifSaveHintText));
tooltipBackground = Theme.createRoundRectDrawable(AndroidUtilities.dp(5), getThemedColor(Theme.key_chat_gifSaveHintBackground)); tooltipBackground = Theme.createRoundRectDrawable(AndroidUtilities.dp(5), getThemedColor(Theme.key_chat_gifSaveHintBackground));
tooltipBackgroundArrow.setColorFilter(new PorterDuffColorFilter(getThemedColor(Theme.key_chat_gifSaveHintBackground), PorterDuff.Mode.MULTIPLY)); tooltipBackgroundArrow.setColorFilter(new PorterDuffColorFilter(getThemedColor(Theme.key_chat_gifSaveHintBackground), PorterDuff.Mode.MULTIPLY));

6
TMessagesProj/src/main/java/org/telegram/ui/Components/GroupCallFullscreenAdapter.java
View file

@ -509,7 +509,7 @@ public class GroupCallFullscreenAdapter extends RecyclerListView.SelectionAdapte
muteButton.setColorFilter(new PorterDuffColorFilter(newColor, PorterDuff.Mode.MULTIPLY)); muteButton.setColorFilter(new PorterDuffColorFilter(newColor, PorterDuff.Mode.MULTIPLY));
textPaint.setColor(lastColor); textPaint.setColor(lastColor);
selectionPaint.setColor(newWavesColor); selectionPaint.setColor(newWavesColor);
avatarWavesDrawable.setColor(ColorUtils.setAlphaComponent(newWavesColor, 76)); avatarWavesDrawable.setColor(ColorUtils.setAlphaComponent(newWavesColor, BlobDrawable.ALPHA_2));
invalidate(); invalidate();
} else { } else {
int colorFrom = lastColor; int colorFrom = lastColor;
@ -521,7 +521,7 @@ public class GroupCallFullscreenAdapter extends RecyclerListView.SelectionAdapte
muteButton.setColorFilter(new PorterDuffColorFilter(lastColor, PorterDuff.Mode.MULTIPLY)); muteButton.setColorFilter(new PorterDuffColorFilter(lastColor, PorterDuff.Mode.MULTIPLY));
textPaint.setColor(lastColor); textPaint.setColor(lastColor);
selectionPaint.setColor(lastWavesColor); selectionPaint.setColor(lastWavesColor);
avatarWavesDrawable.setColor(ColorUtils.setAlphaComponent(lastWavesColor, 76)); avatarWavesDrawable.setColor(ColorUtils.setAlphaComponent(lastWavesColor, BlobDrawable.ALPHA_2));
invalidate(); invalidate();
}); });
colorAnimator.addListener(new AnimatorListenerAdapter() { colorAnimator.addListener(new AnimatorListenerAdapter() {
@ -532,7 +532,7 @@ public class GroupCallFullscreenAdapter extends RecyclerListView.SelectionAdapte
muteButton.setColorFilter(new PorterDuffColorFilter(lastColor, PorterDuff.Mode.MULTIPLY)); muteButton.setColorFilter(new PorterDuffColorFilter(lastColor, PorterDuff.Mode.MULTIPLY));
textPaint.setColor(lastColor); textPaint.setColor(lastColor);
selectionPaint.setColor(lastWavesColor); selectionPaint.setColor(lastWavesColor);
avatarWavesDrawable.setColor(ColorUtils.setAlphaComponent(lastWavesColor, 76)); avatarWavesDrawable.setColor(ColorUtils.setAlphaComponent(lastWavesColor, BlobDrawable.ALPHA_2));
} }
}); });
colorAnimator.start(); colorAnimator.start();

4
TMessagesProj/src/main/java/org/telegram/ui/GroupCallActivity.java
View file

@ -4065,8 +4065,8 @@ public class GroupCallActivity extends BottomSheet implements NotificationCenter
bigWaveDrawable.maxRadius = AndroidUtilities.dp(75); bigWaveDrawable.maxRadius = AndroidUtilities.dp(75);
bigWaveDrawable.generateBlob(); bigWaveDrawable.generateBlob();
tinyWaveDrawable.paint.setColor(ColorUtils.setAlphaComponent(Theme.getColor(Theme.key_voipgroup_unmuteButton), 38)); tinyWaveDrawable.paint.setColor(ColorUtils.setAlphaComponent(Theme.getColor(Theme.key_voipgroup_unmuteButton), BlobDrawable.ALPHA_2));
bigWaveDrawable.paint.setColor(ColorUtils.setAlphaComponent(Theme.getColor(Theme.key_voipgroup_unmuteButton),76)); bigWaveDrawable.paint.setColor(ColorUtils.setAlphaComponent(Theme.getColor(Theme.key_voipgroup_unmuteButton),BlobDrawable.ALPHA_1));
soundButton = new VoIPToggleButton(context); soundButton = new VoIPToggleButton(context);
soundButton.setCheckable(true); soundButton.setCheckable(true);