Skip to content

Commit d82ef02

Browse files
committed
feat(uploading-bar): match new UI design
1 parent 6600cc0 commit d82ef02

File tree

3 files changed

+21
-8
lines changed

3 files changed

+21
-8
lines changed

src/app/features/home/capture-tab/uploading-bar/uploading-bar.component.html

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
1-
<mat-toolbar color="background" class="thin-upload-bar" id="thin-upload-bar">
2-
<ng-container *ngrxLet="uploadingBarState$ as uploadingBarState">
1+
<ng-container *ngrxLet="uploadingBarState$ as uploadingBarState">
2+
<mat-toolbar
3+
color="background"
4+
class="thin-upload-bar"
5+
id="thin-upload-bar"
6+
*ngIf="uploadingBarState.hideUploadBar === false"
7+
>
38
<span class="text spacer-text" *ngIf="uploadingBarState.spacer">{{
49
uploadingBarState.text
510
}}</span>
@@ -18,5 +23,5 @@
1823
<mat-icon *ngIf="uploadingBarState.showResumeButton" (click)="resume()"
1924
>publish</mat-icon
2025
>
21-
</ng-container>
22-
</mat-toolbar>
26+
</mat-toolbar>
27+
</ng-container>

src/app/features/home/capture-tab/uploading-bar/uploading-bar.component.scss

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,13 @@
1+
mat-toolbar {
2+
margin: 16px;
3+
}
4+
15
.thin-upload-bar {
6+
margin: 16px auto;
7+
width: calc(100vw - 32px);
28
min-height: 32px;
3-
height: 32px;
9+
max-height: 48px;
10+
border-radius: 8px;
411
justify-content: stretch;
512
transition: all 1s;
613

@@ -22,9 +29,8 @@
2229
}
2330

2431
#thin-upload-bar {
25-
height: 32px;
26-
color: var(--ion-color-medium-tint);
27-
background-color: var(--ion-color-light);
32+
color: white;
33+
background-color: #212121;
2834
}
2935

3036
.spacer {

src/app/features/home/capture-tab/uploading-bar/uploading-bar.component.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ export class UploadingBarComponent {
4949
showProgressBar: tasks > 0 && networkConnected && !isPaused,
5050
showPauseButton: tasks > 0 && networkConnected && !isPaused,
5151
showResumeButton: tasks > 0 && networkConnected && isPaused,
52+
hideUploadBar: tasks === 0,
5253
};
5354
return uploadingBarState;
5455
})
@@ -85,4 +86,5 @@ interface UploadingBarState {
8586
readonly showProgressBar: boolean;
8687
readonly showPauseButton: boolean;
8788
readonly showResumeButton: boolean;
89+
readonly hideUploadBar: boolean;
8890
}

0 commit comments

Comments
 (0)