-
Notifications
You must be signed in to change notification settings - Fork 7
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #1555 from numbersprotocol/develop
Develop
- Loading branch information
Showing
22 changed files
with
533 additions
and
7 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
17 changes: 17 additions & 0 deletions
17
src/app/features/home/custom-camera/custom-camera-routing.module.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,17 @@ | ||
| import { NgModule } from '@angular/core'; | ||
| import { Routes, RouterModule } from '@angular/router'; | ||
|
|
||
| import { CustomCameraPage } from './custom-camera.page'; | ||
|
|
||
| const routes: Routes = [ | ||
| { | ||
| path: '', | ||
| component: CustomCameraPage, | ||
| }, | ||
| ]; | ||
|
|
||
| @NgModule({ | ||
| imports: [RouterModule.forChild(routes)], | ||
| exports: [RouterModule], | ||
| }) | ||
| export class CustomCameraPageRoutingModule {} |
19 changes: 19 additions & 0 deletions
19
src/app/features/home/custom-camera/custom-camera.module.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,19 @@ | ||
| import { NgModule } from '@angular/core'; | ||
| import { NgCircleProgressModule } from 'ng-circle-progress'; | ||
| import { NgxLongPress2Module } from 'ngx-long-press2'; | ||
| import { SharedModule } from '../../../shared/shared.module'; | ||
| import { CustomCameraPageRoutingModule } from './custom-camera-routing.module'; | ||
| import { CustomCameraPage } from './custom-camera.page'; | ||
| import { CustomCameraService } from './custom-camera.service'; | ||
|
|
||
| @NgModule({ | ||
| imports: [ | ||
| SharedModule, | ||
| CustomCameraPageRoutingModule, | ||
| NgxLongPress2Module, | ||
| NgCircleProgressModule.forRoot({}), | ||
| ], | ||
| providers: [CustomCameraService], | ||
| declarations: [CustomCameraPage], | ||
| }) | ||
| export class CustomCameraPageModule {} |
42 changes: 42 additions & 0 deletions
42
src/app/features/home/custom-camera/custom-camera.page.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,42 @@ | ||
| <ion-content [fullscreen]="true" [style.--background]="'transparent'"> | ||
| <div | ||
| class="select-from-go-pro-camera-button" | ||
| *ngIf="lastConnectedGoProDevice$ | ngrxPush" | ||
| (click)="captureFromGoPro()" | ||
| > | ||
| GoPro | ||
| <mat-icon> featured_video </mat-icon> | ||
| </div> | ||
|
|
||
| <mat-icon class="close-camera-button" (click)="leaveCustomCamera()"> | ||
| close | ||
| </mat-icon> | ||
|
|
||
| <div class="camera-buttons-container"> | ||
| <mat-icon class="temporarily-hidden" id="gallery-icon"> | ||
| video_collection | ||
| </mat-icon> | ||
|
|
||
| <circle-progress | ||
| (click)="onPress()" | ||
| [maxTime]="maxRecordTimeInMilliseconds" | ||
| ngxLongPress2 | ||
| (onLongPress)="onLongPress()" | ||
| (onLongPressing)="onLongPressing($event)" | ||
| (onReleasePressing)="onReleasePressing()" | ||
| [percent]="curRecordTimeInPercent" | ||
| [radius]="38" | ||
| [outerStrokeWidth]="6" | ||
| [innerStrokeWidth]="4" | ||
| [outerStrokeColor]="'#78C000'" | ||
| [innerStrokeColor]="'#F2F2F2'" | ||
| [showTitle]="false" | ||
| [showUnits]="false" | ||
| [showSubtitle]="false" | ||
| [animation]="false" | ||
| [animationDuration]="0" | ||
| ></circle-progress> | ||
|
|
||
| <mat-icon (click)="flipCamera()">flip_camera_android</mat-icon> | ||
| </div> | ||
| </ion-content> |
55 changes: 55 additions & 0 deletions
55
src/app/features/home/custom-camera/custom-camera.page.scss
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,55 @@ | ||
| :host { | ||
| background-color: transparent; | ||
| } | ||
|
|
||
| ion-content { | ||
| --background: transparent; | ||
| } | ||
|
|
||
| mat-icon { | ||
| color: #f2f2f2; | ||
| font-size: 36px; | ||
| height: 36px; | ||
| width: 36px; | ||
| } | ||
|
|
||
| mat-icon.close-camera-button { | ||
| position: absolute; | ||
| top: 16px; | ||
| right: 16px; | ||
| } | ||
|
|
||
| mat-icon.temporarily-hidden { | ||
| visibility: hidden; | ||
| } | ||
|
|
||
| // mat-icon | ||
| .select-from-go-pro-camera-button { | ||
| position: absolute; | ||
| top: 16px; | ||
| left: 16px; | ||
| color: var(--ion-color-primary); | ||
| display: flex; | ||
| align-items: center; | ||
| padding: 4px 8px; | ||
| font-size: 22px; | ||
|
|
||
| mat-icon { | ||
| margin-left: 4px; | ||
| font-size: 24px; | ||
| height: 24px; | ||
| width: 24px; | ||
| } | ||
| } | ||
|
|
||
| .camera-buttons-container { | ||
| display: flex; | ||
| flex-direction: row; | ||
| justify-content: space-around; | ||
| align-items: center; | ||
| position: absolute; | ||
| left: 0; | ||
| right: 0; | ||
| bottom: 0; | ||
| padding: 16px 8px; | ||
| } |
31 changes: 31 additions & 0 deletions
31
src/app/features/home/custom-camera/custom-camera.page.spec.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,31 @@ | ||
| import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; | ||
| import { NgCircleProgressModule } from 'ng-circle-progress'; | ||
| import { NgxLongPress2Module } from 'ngx-long-press2'; | ||
| import { SharedTestingModule } from '../../../shared/shared-testing.module'; | ||
| import { CustomCameraPage } from './custom-camera.page'; | ||
|
|
||
| describe('CustomCameraPage', () => { | ||
| let component: CustomCameraPage; | ||
| let fixture: ComponentFixture<CustomCameraPage>; | ||
|
|
||
| beforeEach( | ||
| waitForAsync(() => { | ||
| TestBed.configureTestingModule({ | ||
| declarations: [CustomCameraPage], | ||
| imports: [ | ||
| SharedTestingModule, | ||
| NgxLongPress2Module, | ||
| NgCircleProgressModule.forRoot({}), | ||
| ], | ||
| }).compileComponents(); | ||
|
|
||
| fixture = TestBed.createComponent(CustomCameraPage); | ||
| component = fixture.componentInstance; | ||
| fixture.detectChanges(); | ||
| }) | ||
| ); | ||
|
|
||
| it('should create', () => { | ||
| expect(component).toBeTruthy(); | ||
| }); | ||
| }); |
Oops, something went wrong.