From 637b604d0baa6ac3e3a145f584b3743b2aceab76 Mon Sep 17 00:00:00 2001
From: Warrick Corfe-Tan <warrickct@gmail.com>
Date: Tue, 3 Aug 2021 15:45:44 +1000
Subject: [PATCH] Adding fraction timer display, exaggerating recording
 animation,  moving delete button to toolbar, display full recording duration
 immediately after stop recording.

---
 stylesheets/_session_constants.scss           |  39 ++++++
 stylesheets/_session_conversation.scss        |  18 ++-
 .../session/conversation/SessionRecording.tsx | 126 +++++++++++-------
 3 files changed, 134 insertions(+), 49 deletions(-)

diff --git a/stylesheets/_session_constants.scss b/stylesheets/_session_constants.scss
index 364edc36e..2bae44ea0 100644
--- a/stylesheets/_session_constants.scss
+++ b/stylesheets/_session_constants.scss
@@ -153,6 +153,28 @@ $session-font-h4: 16px;
   color: subtle($color);
 }
 
+@mixin pulse-color($color) {
+
+  animation: pulseColor 2s infinite;
+
+  @keyframes pulseColor {
+    0% {
+      transform: scale(0.95);
+      box-shadow: 0 0 0 0 rgba($color, 0.7);
+    }
+    
+    70% {
+      transform: scale(1);
+      box-shadow: 0 0 0 10px rgba($color, 0);
+    }
+    
+    100% {
+      transform: scale(0.95);
+      box-shadow: 0 0 0 0 rgba($color, 0);
+    }
+  }
+}
+
 $session-subtle-factor: 0.6;
 
 @function subtle($color) {
@@ -195,6 +217,23 @@ $session-fadein-duration: 0.1s;
   }
 }
 
+@keyframes pulse-shadow {
+  0% {
+    transform: scale(0.95);
+    box-shadow: 0 0 0 0 rgba(0, 0, 0, 0.7);
+  }
+  
+  70% {
+    transform: scale(1);
+    box-shadow: 0 0 0 10px rgba(0, 0, 0, 0);
+  }
+  
+  100% {
+    transform: scale(0.95);
+    box-shadow: 0 0 0 0 rgba(0, 0, 0, 0);
+  }
+}
+
 // //////////////////////////////////////////////
 // ///////////////// Various ////////////////////
 // //////////////////////////////////////////////
diff --git a/stylesheets/_session_conversation.scss b/stylesheets/_session_conversation.scss
index 75011e6c3..7119ea5f8 100644
--- a/stylesheets/_session_conversation.scss
+++ b/stylesheets/_session_conversation.scss
@@ -329,6 +329,10 @@
   }
 }
 
+.send-message-button {
+  animation: fadein $session-transition-duration;
+}
+
 .session-recording {
   height: $composition-container-height;
   display: flex;
@@ -342,11 +346,14 @@
   &--actions {
     display: flex;
     align-items: center;
-    justify-content: center;
     width: $actions-element-size;
     height: $actions-element-size;
     border-radius: 50%;
 
+    .session-button {
+      animation: fadein $session-transition-duration;
+    }
+
     .session-icon-button {
       animation: fadein $session-transition-duration;
       opacity: 1;
@@ -415,6 +422,11 @@
 
     &.playback-timer {
       margin-right: $session-margin-sm;
+      animation: fadein $session-transition-duration;
+
+      @media (-webkit-min-device-pixel-ratio: 1.6) {
+        margin-left: auto;
+      }
     }
 
     &-light {
@@ -422,9 +434,9 @@
       width: $session-margin-sm;
       border-radius: 50%;
       background-color: $session-color-danger-alt;
-      margin-left: $session-margin-sm;
+      margin: 0 $session-margin-sm;
 
-      animation: pulseLight 4s infinite;
+      @include pulse-color($session-color-danger-alt);
     }
   }
 }
diff --git a/ts/components/session/conversation/SessionRecording.tsx b/ts/components/session/conversation/SessionRecording.tsx
index a38b31626..0392b35de 100644
--- a/ts/components/session/conversation/SessionRecording.tsx
+++ b/ts/components/session/conversation/SessionRecording.tsx
@@ -45,6 +45,7 @@ export interface StyledFlexWrapperProps {
 export const StyledFlexWrapper = styled.div`
   display: flex;
   flex-direction: ${(props: StyledFlexWrapperProps) => props.flexDirection};
+  align-items: center;
 
   .session-button {
     margin: ${(props: StyledFlexWrapperProps) => props.marginHorizontal};
@@ -104,10 +105,11 @@ class SessionRecordingInner extends React.Component<Props, State> {
       nowTimestamp,
     } = this.state;
 
-    const actionStopRecording = actionHover && isRecording;
-    const actionPlayAudio = !isRecording && !isPlaying;
+    const hasRecordingAndPaused = !isRecording && !isPlaying;
     const actionPauseAudio = !isRecording && !isPaused && isPlaying;
-    const actionDefault = !actionStopRecording && !actionPlayAudio && !actionPauseAudio;
+
+    // const actionDefault = !actionStopRecording && !actionPlayAudio && !actionPauseAudio;
+    const actionDefault = !isRecording && !hasRecordingAndPaused && !actionPauseAudio;
 
     // if we are recording, we base the time recording on our state values
     // if we are playing ( audioElement?.currentTime is !== 0, use that instead)
@@ -118,11 +120,19 @@ class SessionRecordingInner extends React.Component<Props, State> {
       : (this.audioElement &&
         (this.audioElement?.currentTime * 1000 || this.audioElement?.duration)) ||
       0;
+    let displayTimeString = moment.utc(displayTimeMs).format('m:ss');
 
-    const displayTimeString = moment.utc(displayTimeMs).format('m:ss');
-    const actionPauseFn = isPlaying ? this.pauseAudio : this.stopRecordingStream;
+    const recordingLengthMs = this.audioElement?.duration ? this.audioElement?.duration * 1000 : undefined;
 
-    const themeToUse = useTheme();
+    let remainingTimeString;
+    if (recordingLengthMs !== undefined) {
+      console.log({ recordingLengthMs });
+      console.log({ displayTimeMs });
+      remainingTimeString = ` / ${moment.utc(recordingLengthMs).format('m:ss')}`;
+      displayTimeString += remainingTimeString;
+    }
+
+    const actionPauseFn = isPlaying ? this.pauseAudio : this.stopRecordingStream;
 
     return (
       <div role="main" className="session-recording" tabIndex={0} onKeyDown={this.onKeyDown}>
@@ -131,7 +141,7 @@ class SessionRecordingInner extends React.Component<Props, State> {
           onMouseEnter={this.handleHoverActions}
           onMouseLeave={this.handleUnhoverActions}
         >
-          {actionStopRecording && (
+          {isRecording && (
             <SessionIconButton
               iconType={SessionIconType.Pause}
               iconSize={SessionIconSize.Medium}
@@ -146,12 +156,23 @@ class SessionRecordingInner extends React.Component<Props, State> {
               onClick={actionPauseFn}
             />
           )}
-          {actionPlayAudio && (
-            <SessionIconButton
-              iconType={SessionIconType.Play}
-              iconSize={SessionIconSize.Medium}
-              onClick={this.playAudio}
-            />
+          {hasRecordingAndPaused && (
+            <StyledFlexWrapper
+              flexDirection='row'
+              marginHorizontal={Constants.UI.SPACING.marginXs}
+            >
+              <SessionIconButton
+                iconType={SessionIconType.Play}
+                iconSize={SessionIconSize.Medium}
+                onClick={this.playAudio}
+              />
+              <SessionButton
+                text={window.i18n('delete')}
+                buttonType={SessionButtonType.Brand}
+                buttonColor={SessionButtonColor.Secondary}
+                onClick={this.onDeleteVoiceMessage}
+              />
+            </StyledFlexWrapper>
           )}
 
           {actionDefault && (
@@ -162,10 +183,14 @@ class SessionRecordingInner extends React.Component<Props, State> {
           )}
         </div>
 
-        <div className={classNames('session-recording--timer', !isRecording && 'playback-timer')}>
-          {displayTimeString}
-          {isRecording && <div className="session-recording--timer-light" />}
-        </div>
+        {isRecording || (!isRecording && remainingTimeString) ?
+          <div className={classNames('session-recording--timer', !isRecording && 'playback-timer')}>
+            {displayTimeString}
+            {isRecording && <div className="session-recording--timer-light" />}
+          </div>
+          :
+          null
+        }
 
         {!isRecording && (
           <div className="send-message-button">
@@ -178,35 +203,6 @@ class SessionRecordingInner extends React.Component<Props, State> {
           </div>
         )}
 
-        <div className="session-recording--status">
-          {isRecording ? (
-            <SessionButton
-              // text={window.i18n('recording')}
-              text={'Stop recording'}
-              buttonType={SessionButtonType.Brand}
-              buttonColor={SessionButtonColor.Primary}
-              onClick={this.stopRecordingStream}
-            />
-          ) : (
-            <StyledFlexWrapper
-              flexDirection='row'
-              marginHorizontal={themeToUse.common.margins.xs}
-            >
-              <SessionButton
-                text={window.i18n('delete')}
-                buttonType={SessionButtonType.Brand}
-                buttonColor={SessionButtonColor.DangerAlt}
-                onClick={this.onDeleteVoiceMessage}
-              />
-              <SessionButton
-                text={'Send'}
-                buttonType={SessionButtonType.Brand}
-                buttonColor={SessionButtonColor.Primary}
-                onClick={this.onSendVoiceMessage}
-              />
-            </StyledFlexWrapper>
-          )}
-        </div>
       </div>
     );
   }
@@ -351,10 +347,48 @@ class SessionRecordingInner extends React.Component<Props, State> {
     this.recorder = undefined;
 
     this.audioBlobMp3 = blob;
+    this.updateAudioElementAndDuration();
+
     // Stop recording
     this.stopRecordingState();
   }
 
+  private async onStopRecordingClick() {
+    this.stopRecordingStream();
+    this.updateAudioElementAndDuration();
+    this.stopRecordingState();
+  }
+
+
+
+  /**
+   * Creates an audio element using the recorded audio blob. 
+   * Updates the duration for displaying audio duration.
+   */
+  private updateAudioElementAndDuration() {
+    // init audio element
+    const audioURL = window.URL.createObjectURL(this.audioBlobMp3);
+    this.audioElement = new Audio(audioURL);
+
+    // ww adding record duration
+    this.setState({
+      recordDuration: this.audioElement.duration
+    })
+
+    this.audioElement.loop = false;
+    this.audioElement.onended = () => {
+      this.pauseAudio();
+    };
+
+    this.audioElement.oncanplaythrough = async () => {
+      const duration = this.state.recordDuration;
+
+      if (duration && this.audioElement && this.audioElement.currentTime < duration) {
+        await this.audioElement?.play();
+      }
+    };
+  }
+
   private async onKeyDown(event: any) {
     if (event.key === 'Escape') {
       await this.onDeleteVoiceMessage();