From a23d5cd95ca25ac94484da13cc41bf5d35917edc Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Tue, 8 Dec 2020 11:42:40 +1100
Subject: [PATCH] fix theme for SessionRecording

---
 package.json                                  |  4 ++--
 stylesheets/_session_conversation.scss        |  1 +
 .../session/conversation/SessionRecording.tsx | 20 +++++++++----------
 3 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/package.json b/package.json
index f19d03600..fc2b8c9a6 100644
--- a/package.json
+++ b/package.json
@@ -16,7 +16,7 @@
   "scripts": {
     "prepare": "patch-package",
     "postinstall": "yarn custom-react-mentions-build && electron-builder install-app-deps && rimraf node_modules/dtrace-provider",
-    "custom-react-mentions-build": "cd node_modules/react-mentions && yarn install --node_modules=../node_modules && yarn build; rimraf node_modules/react node_modules/react-dom; cd -",
+    "custom-react-mentions-build": "cd node_modules/react-mentions && yarn install --node_modules=../node_modules && yarn build && rimraf node_modules/react node_modules/react-dom && cd ..",
     "start": "cross-env NODE_APP_INSTANCE=$MULTI electron .",
     "start-prod": "cross-env NODE_ENV=production NODE_APP_INSTANCE=devprod$MULTI electron .",
     "start-swarm-test": "cross-env NODE_ENV=swarm-testing NODE_APP_INSTANCE=$MULTI electron .",
@@ -334,4 +334,4 @@
       "!dev-app-update.yml"
     ]
   }
-}
+}
\ No newline at end of file
diff --git a/stylesheets/_session_conversation.scss b/stylesheets/_session_conversation.scss
index dab267065..bb84ae627 100644
--- a/stylesheets/_session_conversation.scss
+++ b/stylesheets/_session_conversation.scss
@@ -379,6 +379,7 @@
     justify-content: center;
     position: absolute;
     left: 0;
+    z-index: 2;
     right: 0;
     bottom: $composition-container-height + $session-margin-md;
 
diff --git a/ts/components/session/conversation/SessionRecording.tsx b/ts/components/session/conversation/SessionRecording.tsx
index 2c1ee0b7d..76f98e6ec 100644
--- a/ts/components/session/conversation/SessionRecording.tsx
+++ b/ts/components/session/conversation/SessionRecording.tsx
@@ -46,8 +46,6 @@ interface State {
     barRadius: number;
     barWidth: number;
     barPadding: number;
-    barColorInit: string;
-    barColorPlay: string;
     maxBarHeight: number;
     minBarHeight: number;
   };
@@ -63,7 +61,7 @@ class SessionRecordingInner extends React.Component<Props, State> {
   private readonly visualisationCanvas: React.RefObject<HTMLCanvasElement>;
   private readonly playbackCanvas: React.RefObject<HTMLCanvasElement>;
 
-  constructor(props: any) {
+  constructor(props: Props) {
     super(props);
 
     // Mouse interaction
@@ -118,8 +116,6 @@ class SessionRecordingInner extends React.Component<Props, State> {
         barRadius: 15,
         barWidth: 4,
         barPadding: 3,
-        barColorInit: Constants.UI.COLORS.WHITE_PALE,
-        barColorPlay: Constants.UI.COLORS.WHITE,
         maxBarHeight: 30,
         minBarHeight: 3,
       },
@@ -353,7 +349,8 @@ class SessionRecordingInner extends React.Component<Props, State> {
     // Draw sweeping timeline
     const drawSweepingTimeline = () => {
       const { isPaused } = this.state;
-      const { width, height, barColorPlay } = this.state.canvasParams;
+      const { textColor } = this.props.theme.colors;
+      const { width, height } = this.state.canvasParams;
 
       const canvas = this.playbackCanvas.current;
       if (!canvas || isPaused) {
@@ -373,7 +370,7 @@ class SessionRecordingInner extends React.Component<Props, State> {
       }
 
       canvasContext.beginPath();
-      canvasContext.fillStyle = barColorPlay;
+      canvasContext.fillStyle = textColor;
       canvasContext.globalCompositeOperation = 'source-atop';
       canvasContext.fillRect(0, 0, progress, height);
 
@@ -502,13 +499,13 @@ class SessionRecordingInner extends React.Component<Props, State> {
     processor.onaudioprocess = () => {
       const streamParams = { stream, media, input, processor };
       this.setState({ streamParams });
+      const { textColorSubtle } = this.props.theme.colors;
 
       const {
         width,
         height,
         barWidth,
         barPadding,
-        barColorInit,
         maxBarHeight,
         minBarHeight,
       } = this.state.canvasParams;
@@ -559,7 +556,7 @@ class SessionRecordingInner extends React.Component<Props, State> {
           const offsetY = Math.ceil(height / 2 - barHeight / 2);
 
           if (canvasContext) {
-            canvasContext.fillStyle = barColorInit;
+            canvasContext.fillStyle = textColorSubtle;
             this.drawRoundedRect(canvasContext, offsetX, offsetY, barHeight);
           }
         }
@@ -613,11 +610,12 @@ class SessionRecordingInner extends React.Component<Props, State> {
       height,
       barWidth,
       barPadding,
-      barColorInit,
       maxBarHeight,
       minBarHeight,
     } = this.state.canvasParams;
 
+    const { textColorSubtle } = this.props.theme.colors;
+
     const numBars = width / (barPadding + barWidth);
 
     // Scan through audio file getting average volume per bar
@@ -672,7 +670,7 @@ class SessionRecordingInner extends React.Component<Props, State> {
           const offsetX = Math.ceil(i * (barWidth + barPadding));
           const offsetY = Math.ceil(height / 2 - barHeight / 2);
 
-          canvasContext.fillStyle = barColorInit;
+          canvasContext.fillStyle = textColorSubtle;
 
           this.drawRoundedRect(canvasContext, offsetX, offsetY, barHeight);
         }