Merge branch 'dev' into chat_friend_request

Satellite-im · Nov 8, 2023 · ba419d3 · ba419d3
2 parents c136ef1 + 972635e
commit ba419d3
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 14 deletions.
diff --git a/common/locales/en-US/main.ftl b/common/locales/en-US/main.ftl
@@ -72,6 +72,7 @@ messages = Messages
     .replying = Replying to:
     .react = React
     .reply = Reply
+    .loading = Loading...
     .say-something-placeholder = Say Something...
     .user-sent-message = { $user } sent you a message.
     .unknown-sent-message = someone sent you a message.
@@ -321,6 +322,8 @@ remote-controls = Remote Controls
     .unmute = Unmute 
     .listen = Listen
     .silence = Silence
+    .start-recording = Start Recording
+    .stop-recording = Stop Recording
     .incoming-call = Incoming Transmission ...
     .outgoing-call = Outgoing Transmission ...
     .empty = Nobody is here

diff --git a/kit/src/elements/textarea/style.scss b/kit/src/elements/textarea/style.scss
@@ -4,6 +4,7 @@ textarea {
 	width: 100%;
 	height: "auto";
 	max-height: 250px; //Maybe make max variable?
+	min-height: 22px;
 	margin: 9px 0;
 	&.disabled {
 		cursor: not-allowed;

diff --git a/kit/src/layout/chatbar/mod.rs b/kit/src/layout/chatbar/mod.rs
@@ -154,7 +154,7 @@ pub fn Chatbar<'a>(cx: Scope<'a, Props<'a>>) -> Element<'a> {
                     placeholder: cx.props.placeholder.clone(),
                     ignore_focus: cx.props.ignore_focus,
                     show_char_counter: true,
-                    value: if cx.props.is_disabled { get_local_text("messages.not-friends")} else { cx.props.value.clone().unwrap_or_default()},
+                    value: if cx.props.is_disabled { get_local_text("messages.loading")} else { cx.props.value.clone().unwrap_or_default()},
                     onchange: move |(v, _)| cx.props.onchange.call(v),
                     onreturn: move |(v, is_valid, _)| {
                         if let Some(i) = selected_emoji.write_silent().take() {

diff --git a/kit/src/style.scss b/kit/src/style.scss
@@ -239,7 +239,7 @@ pre code {
   --text-color-bright: #ffffff;
   --text-color-link: #ff860d;
   --text-selection: #e0e0e0;
-  --placeholder: #fff;
+  --placeholder: #bcbcbc;
   --primary: #fcfbf4;
   --primary-dark: color-mix(in srgb, var(--primary) 50%, black);
   --primary-light: color-mix(in srgb, var(--primary) 50%, white);

diff --git a/ui/src/components/media/calling.rs b/ui/src/components/media/calling.rs
@@ -70,6 +70,8 @@ pub fn CallControl(cx: Scope<Props>) -> Element {
             unmute_text: get_local_text("remote-controls.unmute"),
             listen_text: get_local_text("remote-controls.listen"),
             silence_text: get_local_text("remote-controls.silence"),
+            start_recording_text: get_local_text("remote-controls.start-recording"),
+            stop_recording_text: get_local_text("remote-controls.stop-recording"),
         })),
         None => match state.read().ui.call_info.pending_calls().first() {
             Some(call) => cx.render(rsx!(PendingCallDialog {
@@ -89,6 +91,8 @@ pub struct ActiveCallProps {
     unmute_text: String,
     listen_text: String,
     silence_text: String,
+    start_recording_text: String,
+    stop_recording_text: String,
 }
 
 #[allow(non_snake_case)]
@@ -434,20 +438,32 @@ fn ActiveCallControl(cx: Scope<ActiveCallProps>) -> Element {
                     rsx!(Button {
                         icon: Icon::StopCircle,
                         appearance: Appearance::Danger,
-                        onpress: move |_| {
-                            ch.send(CallDialogCmd::StopRecording);
-                        },
-                    })
+                        tooltip: cx.render(rsx!(
+                            Tooltip {
+                                arrow_position: ArrowPosition::Bottom,
+                                text: cx.props.stop_recording_text.clone()
+                        }
+                      )),
+                   onpress: move |_| {
+                   ch.send(CallDialogCmd::StopRecording);
+                    },
+                  })
                 } else {
                     rsx!(Button {
-                        icon: Icon::RadioSelected,
-                        appearance: Appearance::Secondary,
-                        onpress: move |_| {
-                            ch.send(CallDialogCmd::RecordCall);
-                        },
-                    })
+            icon: Icon::RadioSelected,
+            appearance: Appearance::Secondary,
+            tooltip: cx.render(rsx!(
+                Tooltip {
+                    arrow_position: ArrowPosition::Bottom,
+                    text: cx.props.start_recording_text.clone()
                 }
-            }),
+            )),
+                        onpress: move |_| {
+                        ch.send(CallDialogCmd::RecordCall);
+               },
+            })
+         }
+      }),
             Button {
                 icon: Icon::PhoneXMark,
                 aria_label: "call-hangup-button".into(),
@@ -456,7 +472,7 @@ fn ActiveCallControl(cx: Scope<ActiveCallProps>) -> Element {
                     ch.send(CallDialogCmd::Hangup(call.id));
                 },
             },
-            //Currently not impl
+            //Currently not implemented
             /*Button {
                 icon: Icon::Cog6Tooth,
                 appearance: Appearance::Secondary,