diff --git a/Telegram/Resources/icons/voice_lock/record_lock_body.png b/Telegram/Resources/icons/voice_lock/record_lock_body.png
index 6204b88ce..e6e25e290 100644
Binary files a/Telegram/Resources/icons/voice_lock/record_lock_body.png and b/Telegram/Resources/icons/voice_lock/record_lock_body.png differ
diff --git a/Telegram/Resources/icons/voice_lock/record_lock_body@2x.png b/Telegram/Resources/icons/voice_lock/record_lock_body@2x.png
index cf955e291..2ac328fef 100644
Binary files a/Telegram/Resources/icons/voice_lock/record_lock_body@2x.png and b/Telegram/Resources/icons/voice_lock/record_lock_body@2x.png differ
diff --git a/Telegram/Resources/icons/voice_lock/record_lock_body@3x.png b/Telegram/Resources/icons/voice_lock/record_lock_body@3x.png
index 1da493f53..0f12933eb 100644
Binary files a/Telegram/Resources/icons/voice_lock/record_lock_body@3x.png and b/Telegram/Resources/icons/voice_lock/record_lock_body@3x.png differ
diff --git a/Telegram/Resources/icons/voice_lock/record_lock_body_shadow.png b/Telegram/Resources/icons/voice_lock/record_lock_body_shadow.png
index ee20e6c70..884d7a81c 100644
Binary files a/Telegram/Resources/icons/voice_lock/record_lock_body_shadow.png and b/Telegram/Resources/icons/voice_lock/record_lock_body_shadow.png differ
diff --git a/Telegram/Resources/icons/voice_lock/record_lock_body_shadow@2x.png b/Telegram/Resources/icons/voice_lock/record_lock_body_shadow@2x.png
index 3b01ea846..f2173f10d 100644
Binary files a/Telegram/Resources/icons/voice_lock/record_lock_body_shadow@2x.png and b/Telegram/Resources/icons/voice_lock/record_lock_body_shadow@2x.png differ
diff --git a/Telegram/Resources/icons/voice_lock/record_lock_body_shadow@3x.png b/Telegram/Resources/icons/voice_lock/record_lock_body_shadow@3x.png
index cef549789..cfefa592c 100644
Binary files a/Telegram/Resources/icons/voice_lock/record_lock_body_shadow@3x.png and b/Telegram/Resources/icons/voice_lock/record_lock_body_shadow@3x.png differ
diff --git a/Telegram/Resources/icons/voice_lock/record_lock_bottom.png b/Telegram/Resources/icons/voice_lock/record_lock_bottom.png
index 8be9d5e19..882e925e6 100644
Binary files a/Telegram/Resources/icons/voice_lock/record_lock_bottom.png and b/Telegram/Resources/icons/voice_lock/record_lock_bottom.png differ
diff --git a/Telegram/Resources/icons/voice_lock/record_lock_bottom@2x.png b/Telegram/Resources/icons/voice_lock/record_lock_bottom@2x.png
index 99296c69f..bad5a987a 100644
Binary files a/Telegram/Resources/icons/voice_lock/record_lock_bottom@2x.png and b/Telegram/Resources/icons/voice_lock/record_lock_bottom@2x.png differ
diff --git a/Telegram/Resources/icons/voice_lock/record_lock_bottom@3x.png b/Telegram/Resources/icons/voice_lock/record_lock_bottom@3x.png
index bd1cd6a8a..ce162a65d 100644
Binary files a/Telegram/Resources/icons/voice_lock/record_lock_bottom@3x.png and b/Telegram/Resources/icons/voice_lock/record_lock_bottom@3x.png differ
diff --git a/Telegram/Resources/icons/voice_lock/record_lock_bottom_shadow.png b/Telegram/Resources/icons/voice_lock/record_lock_bottom_shadow.png
index efa093063..b675e122c 100644
Binary files a/Telegram/Resources/icons/voice_lock/record_lock_bottom_shadow.png and b/Telegram/Resources/icons/voice_lock/record_lock_bottom_shadow.png differ
diff --git a/Telegram/Resources/icons/voice_lock/record_lock_bottom_shadow@2x.png b/Telegram/Resources/icons/voice_lock/record_lock_bottom_shadow@2x.png
index 2804459cd..073d169d5 100644
Binary files a/Telegram/Resources/icons/voice_lock/record_lock_bottom_shadow@2x.png and b/Telegram/Resources/icons/voice_lock/record_lock_bottom_shadow@2x.png differ
diff --git a/Telegram/Resources/icons/voice_lock/record_lock_bottom_shadow@3x.png b/Telegram/Resources/icons/voice_lock/record_lock_bottom_shadow@3x.png
index 542194980..3da360933 100644
Binary files a/Telegram/Resources/icons/voice_lock/record_lock_bottom_shadow@3x.png and b/Telegram/Resources/icons/voice_lock/record_lock_bottom_shadow@3x.png differ
diff --git a/Telegram/Resources/icons/voice_lock/record_lock_top.png b/Telegram/Resources/icons/voice_lock/record_lock_top.png
index a4ee1db1b..198615edf 100644
Binary files a/Telegram/Resources/icons/voice_lock/record_lock_top.png and b/Telegram/Resources/icons/voice_lock/record_lock_top.png differ
diff --git a/Telegram/Resources/icons/voice_lock/record_lock_top@2x.png b/Telegram/Resources/icons/voice_lock/record_lock_top@2x.png
index b578b3105..06ce004e2 100644
Binary files a/Telegram/Resources/icons/voice_lock/record_lock_top@2x.png and b/Telegram/Resources/icons/voice_lock/record_lock_top@2x.png differ
diff --git a/Telegram/Resources/icons/voice_lock/record_lock_top@3x.png b/Telegram/Resources/icons/voice_lock/record_lock_top@3x.png
index c8d63fe3c..00998824e 100644
Binary files a/Telegram/Resources/icons/voice_lock/record_lock_top@3x.png and b/Telegram/Resources/icons/voice_lock/record_lock_top@3x.png differ
diff --git a/Telegram/Resources/icons/voice_lock/record_lock_top_shadow.png b/Telegram/Resources/icons/voice_lock/record_lock_top_shadow.png
index 30d0aa4ec..69bf37e51 100644
Binary files a/Telegram/Resources/icons/voice_lock/record_lock_top_shadow.png and b/Telegram/Resources/icons/voice_lock/record_lock_top_shadow.png differ
diff --git a/Telegram/Resources/icons/voice_lock/record_lock_top_shadow@2x.png b/Telegram/Resources/icons/voice_lock/record_lock_top_shadow@2x.png
index bc3943e4e..f35d3240c 100644
Binary files a/Telegram/Resources/icons/voice_lock/record_lock_top_shadow@2x.png and b/Telegram/Resources/icons/voice_lock/record_lock_top_shadow@2x.png differ
diff --git a/Telegram/Resources/icons/voice_lock/record_lock_top_shadow@3x.png b/Telegram/Resources/icons/voice_lock/record_lock_top_shadow@3x.png
index 5aca3269c..96660d2d2 100644
Binary files a/Telegram/Resources/icons/voice_lock/record_lock_top_shadow@3x.png and b/Telegram/Resources/icons/voice_lock/record_lock_top_shadow@3x.png differ
diff --git a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp
index 74124766a..01dbed3c4 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp
+++ b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp
@@ -851,12 +851,15 @@ void RecordLock::drawProgress(Painter &p) {
void RecordLock::startLockingAnimation(float64 to) {
auto callback = [=](auto value) { setProgress(value); };
- const auto duration = st::historyRecordVoiceShowDuration;
+ const auto &duration = st::historyRecordVoiceShowDuration;
_lockEnderAnimation.start(std::move(callback), 0., to, duration);
}
void RecordLock::requestPaintProgress(float64 progress) {
- if (isHidden() || isLocked() || _lockEnderAnimation.animating()) {
+ if (isHidden()
+ || isLocked()
+ || _lockEnderAnimation.animating()
+ || (_progress.current() == progress)) {
return;
}
if (!_progress.current() && (progress > .3)) {
@@ -1028,7 +1031,7 @@ void VoiceRecordBar::init() {
) | rpl::start_with_next([=](bool show) {
const auto to = show ? 1. : 0.;
const auto from = show ? 0. : 1.;
- const auto duration = st::historyRecordLockShowDuration;
+ const auto &duration = st::historyRecordLockShowDuration;
_lock->show();
auto callback = [=](auto value) {
updateLockGeometry();
@@ -1138,7 +1141,7 @@ void VoiceRecordBar::init() {
void VoiceRecordBar::activeAnimate(bool active) {
const auto to = active ? 1. : 0.;
- const auto duration = st::historyRecordVoiceDuration;
+ const auto &duration = st::historyRecordVoiceDuration;
if (_activeAnimation.animating()) {
_activeAnimation.change(to, duration);
} else {
@@ -1154,7 +1157,7 @@ void VoiceRecordBar::activeAnimate(bool active) {
void VoiceRecordBar::visibilityAnimate(bool show, Fn<void()> &&callback) {
const auto to = show ? 1. : 0.;
const auto from = show ? 0. : 1.;
- const auto duration = st::historyRecordVoiceShowDuration;
+ const auto &duration = st::historyRecordVoiceShowDuration;
auto animationCallback = [=, callback = std::move(callback)](auto value) {
if (!_listen) {
_level->requestPaintProgress(value);
diff --git a/Telegram/SourceFiles/ui/chat/chat.style b/Telegram/SourceFiles/ui/chat/chat.style
index 8f893aa1c..efdd96ce6 100644
--- a/Telegram/SourceFiles/ui/chat/chat.style
+++ b/Telegram/SourceFiles/ui/chat/chat.style
@@ -325,6 +325,7 @@ historyScheduledToggle: IconButton(historyAttach) {
};
iconPosition: point(-1px, -1px);
}
+
historyRecordVoiceFg: historyComposeIconFg;
historyRecordVoiceFgOver: historyComposeIconFgOver;
historyRecordVoiceFgInactive: attentionButtonFg;
@@ -350,7 +351,6 @@ historyRecordMinorAmplitudeRadius: 7px;
historyRecordRandomAddition: 8px;
historyRecordRadiusDiff: 50px;
historyRecordRadiusDiffMin: 10px;
-historyRecordLevelMinRadius: 38px;
historyRecordLevelMaxRadius: 70px;
historyRecordTextStyle: TextStyle(defaultTextStyle) {
@@ -381,7 +381,7 @@ historyRecordLockBodyShadow: icon {{ "voice_lock/record_lock_body_shadow", histo
historyRecordLockBody: icon {{ "voice_lock/record_lock_body", historyToDownBg }};
historyRecordLockMargin: margins(4px, 4px, 4px, 4px);
historyRecordLockArrow: icon {{ "voice_lock/voice_arrow", historyToDownFg }};
-historyRecordLockRippleMargin: margins(5px, 5px, 5px, 5px);
+historyRecordLockRippleMargin: margins(6px, 6px, 6px, 6px);
historyRecordDelete: IconButton(historyAttach) {
icon: icon {{ "info_media_delete", historyComposeIconFg }};
@@ -392,7 +392,7 @@ historyRecordWaveformBgMargins: margins(5px, 7px, 5px, 7px);
historyRecordWaveformBar: 3px;
-historyRecordLockPosition: point(7px, 35px);
+historyRecordLockPosition: point(1px, 35px);
historySilentToggle: IconButton(historyBotKeyboardShow) {
icon: icon {{ "send_control_silent_off", historyComposeIconFg }};