PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Update uploading state designs

Browse source
This commit is contained in:
Travis Ralston 2021-08-03 12:52:21 -06:00
parent c5d11a9f17
commit 7b565db02d
3 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
res/css/views/rooms/_VoiceRecordComposerTile.scss
View file

@ -46,9 +46,13 @@ limitations under the License.
mask-image: url('$(res)/img/element-icons/trashcan.svg'); mask-image: url('$(res)/img/element-icons/trashcan.svg');
} }
.mx_VoiceRecordComposerTile_uploadState { .mx_VoiceRecordComposerTile_uploadingState {
margin-right: 21px; margin-right: 10px;
color: $secondary-fg-color; color: $secondary-fg-color;
}
.mx_VoiceRecordComposerTile_failedState {
margin-right: 21px;
.mx_VoiceRecordComposerTile_uploadState_badge { .mx_VoiceRecordComposerTile_uploadState_badge {
display: inline-block; display: inline-block;

9
src/components/views/rooms/VoiceRecordComposerTile.tsx
View file

@ -246,20 +246,19 @@ export default class VoiceRecordComposerTile extends React.PureComponent<IProps,
} }
let uploadIndicator; let uploadIndicator;
if (this.state.recordingPhase === RecordingState.Uploading) { if (this.state.recordingPhase === RecordingState.Uploading || true) {
uploadIndicator = <span className='mx_VoiceRecordComposerTile_uploadState'> uploadIndicator = <span className='mx_VoiceRecordComposerTile_uploadingState'>
<InlineSpinner w={16} h={16} /> <InlineSpinner w={16} h={16} />
{ _t("Uploading...") }
</span>; </span>;
} else if (this.state.didUploadFail && this.state.recordingPhase === RecordingState.Ended) { } else if (this.state.didUploadFail && this.state.recordingPhase === RecordingState.Ended) {
uploadIndicator = <span className='mx_VoiceRecordComposerTile_uploadState'> uploadIndicator = <span className='mx_VoiceRecordComposerTile_failedState'>
<span className='mx_VoiceRecordComposerTile_uploadState_badge'> <span className='mx_VoiceRecordComposerTile_uploadState_badge'>
{ /* Need to stick the badge in a span to ensure it doesn't create a block component */ } { /* Need to stick the badge in a span to ensure it doesn't create a block component */ }
<NotificationBadge <NotificationBadge
notification={StaticNotificationState.forSymbol("!", NotificationColor.Red)} notification={StaticNotificationState.forSymbol("!", NotificationColor.Red)}
/> />
</span> </span>
<span className='text-warning'>{ _t("Failed to upload voice message") }</span> <span className='text-warning'>{ _t("Failed to send") }</span>
</span>; </span>;
} }

2
src/i18n/strings/en_EN.json
View file

@ -1708,8 +1708,6 @@
"Record a voice message": "Record a voice message", "Record a voice message": "Record a voice message",
"Stop the recording": "Stop the recording", "Stop the recording": "Stop the recording",
"Delete recording": "Delete recording", "Delete recording": "Delete recording",
"Uploading...": "Uploading...",
"Failed to upload voice message": "Failed to upload voice message",
"Error updating main address": "Error updating main address", "Error updating main address": "Error updating main address",
"There was an error updating the room's main address. It may not be allowed by the server or a temporary failure occurred.": "There was an error updating the room's main address. It may not be allowed by the server or a temporary failure occurred.", "There was an error updating the room's main address. It may not be allowed by the server or a temporary failure occurred.": "There was an error updating the room's main address. It may not be allowed by the server or a temporary failure occurred.",
"There was an error updating the room's alternative addresses. It may not be allowed by the server or a temporary failure occurred.": "There was an error updating the room's alternative addresses. It may not be allowed by the server or a temporary failure occurred.", "There was an error updating the room's alternative addresses. It may not be allowed by the server or a temporary failure occurred.": "There was an error updating the room's alternative addresses. It may not be allowed by the server or a temporary failure occurred.",