diff --git a/android/app/capacitor.build.gradle b/android/app/capacitor.build.gradle index 3f80fddfe..8dc57e7fc 100644 --- a/android/app/capacitor.build.gradle +++ b/android/app/capacitor.build.gradle @@ -25,7 +25,6 @@ dependencies { implementation project(':capacitor-share') implementation project(':capacitor-splash-screen') implementation project(':capacitor-storage') - implementation project(':numbersprotocol-preview-camera') implementation project(':numbersprotocol-preview-video') implementation project(':capacitor-blob-writer') diff --git a/android/app/src/main/assets/capacitor.plugins.json b/android/app/src/main/assets/capacitor.plugins.json index 952ae273f..c2efb9086 100644 --- a/android/app/src/main/assets/capacitor.plugins.json +++ b/android/app/src/main/assets/capacitor.plugins.json @@ -63,10 +63,6 @@ "pkg": "@capacitor/storage", "classpath": "com.capacitorjs.plugins.storage.StoragePlugin" }, - { - "pkg": "@numbersprotocol/preview-camera", - "classpath": "io.numbersprotocol.capturelite.plugins.previewcamera.PreviewCameraPlugin" - }, { "pkg": "@numbersprotocol/preview-video", "classpath": "io.numbersprotocol.capturelite.plugins.previewvideo.PreviewVideoPlugin" diff --git a/android/capacitor.settings.gradle b/android/capacitor.settings.gradle index 82f3a2aa4..00fd4567c 100644 --- a/android/capacitor.settings.gradle +++ b/android/capacitor.settings.gradle @@ -50,9 +50,6 @@ project(':capacitor-splash-screen').projectDir = new File('../node_modules/@capa include ':capacitor-storage' project(':capacitor-storage').projectDir = new File('../node_modules/@capacitor/storage/android') -include ':numbersprotocol-preview-camera' -project(':numbersprotocol-preview-camera').projectDir = new File('../node_modules/@numbersprotocol/preview-camera/android') - include ':numbersprotocol-preview-video' project(':numbersprotocol-preview-video').projectDir = new File('../node_modules/@numbersprotocol/preview-video/android') diff --git a/android/variables.gradle b/android/variables.gradle index 9819e2f16..080ca73a1 100644 --- a/android/variables.gradle +++ b/android/variables.gradle @@ -1,6 +1,6 @@ ext { minSdkVersion = 21 - compileSdkVersion = 31 + compileSdkVersion = 30 targetSdkVersion = 30 androidxActivityVersion = '1.2.0' androidxAppCompatVersion = '1.2.0' diff --git a/ios/App/Podfile b/ios/App/Podfile index 3a6b06b05..4af80fd62 100644 --- a/ios/App/Podfile +++ b/ios/App/Podfile @@ -25,7 +25,6 @@ def capacitor_pods pod 'CapacitorShare', :path => '../../node_modules/@capacitor/share' pod 'CapacitorSplashScreen', :path => '../../node_modules/@capacitor/splash-screen' pod 'CapacitorStorage', :path => '../../node_modules/@capacitor/storage' - pod 'NumbersprotocolPreviewCamera', :path => '../../node_modules/@numbersprotocol/preview-camera' pod 'NumbersprotocolPreviewVideo', :path => '../../node_modules/@numbersprotocol/preview-video' pod 'CapacitorBlobWriter', :path => '../../node_modules/capacitor-blob-writer' end diff --git a/package-lock.json b/package-lock.json index 292de3f3a..fc1c8d8ba 100644 --- a/package-lock.json +++ b/package-lock.json @@ -46,7 +46,6 @@ "@ngx-formly/core": "^5.10.22", "@ngx-formly/material": "^5.10.22", "@ngx-formly/schematics": "^5.10.22", - "@numbersprotocol/preview-camera": "github:numbersprotocol/preview-camera", "@numbersprotocol/preview-video": "github:numbersprotocol/preview-video", "async-mutex": "^0.3.2", "buffer": "^5.7.1", @@ -55,7 +54,6 @@ "immutable": "^4.0.0-rc.14", "lodash-es": "^4.17.21", "material-design-icons-iconfont": "^6.1.0", - "ng-circle-progress": "^1.6.0", "ngx-long-press2": "^2.0.0", "ngx-pinch-zoom": "^2.6.0", "process": "^0.11.10", @@ -4119,14 +4117,6 @@ "node": ">=10" } }, - "node_modules/@numbersprotocol/preview-camera": { - "version": "0.0.1", - "resolved": "git+ssh://git@github.com/numbersprotocol/preview-camera.git#6bbe8d2495d3b25238952ec442525405b0d9a48b", - "license": "MIT", - "peerDependencies": { - "@capacitor/core": "^3.0.0" - } - }, "node_modules/@numbersprotocol/preview-video": { "version": "0.0.1", "resolved": "git+ssh://git@github.com/numbersprotocol/preview-video.git#2d19456109c8c9d364324d9c08e766580256f1f7", @@ -14746,19 +14736,6 @@ "resolved": "https://registry.npmjs.org/next-tick/-/next-tick-1.0.0.tgz", "integrity": "sha1-yobR/ogoFpsBICCOPchCS524NCw=" }, - "node_modules/ng-circle-progress": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/ng-circle-progress/-/ng-circle-progress-1.6.0.tgz", - "integrity": "sha512-HD7Uthog/QjRBFKrrnbOrm313CrkkWiTxENR7PjUy9lSUkuys5HdT0+E8UiHDk8VLSxC/pMmrx3eyYLhNq7EnQ==", - "dependencies": { - "tslib": "^2.0.0" - }, - "peerDependencies": { - "@angular/common": ">=9.1.0", - "@angular/core": ">=9.1.0", - "rxjs": ">=6.4.0" - } - }, "node_modules/ngx-long-press2": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/ngx-long-press2/-/ngx-long-press2-2.0.0.tgz", @@ -27116,7 +27093,7 @@ }, "@capacitor-community/http": { "version": "git+ssh://git@github.com/numbersprotocol/http.git#a67d9fac94f8455a7fb00fc4b934ebff724afe9d", - "from": "@capacitor-community/http@github:numbersprotocol/http#fix-catch-disabled-Local-Network-case-on-iOS", + "from": "@capacitor-community/http@numbersprotocol/http#fix-catch-disabled-Local-Network-case-on-iOS", "requires": { "@capacitor/android": "^3.0.0", "@capacitor/core": "^3.0.0", @@ -28244,11 +28221,6 @@ } } }, - "@numbersprotocol/preview-camera": { - "version": "git+ssh://git@github.com/numbersprotocol/preview-camera.git#6bbe8d2495d3b25238952ec442525405b0d9a48b", - "from": "@numbersprotocol/preview-camera@github:numbersprotocol/preview-camera", - "requires": {} - }, "@numbersprotocol/preview-video": { "version": "git+ssh://git@github.com/numbersprotocol/preview-video.git#2d19456109c8c9d364324d9c08e766580256f1f7", "from": "@numbersprotocol/preview-video@github:numbersprotocol/preview-video", @@ -36563,14 +36535,6 @@ "resolved": "https://registry.npmjs.org/next-tick/-/next-tick-1.0.0.tgz", "integrity": "sha1-yobR/ogoFpsBICCOPchCS524NCw=" }, - "ng-circle-progress": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/ng-circle-progress/-/ng-circle-progress-1.6.0.tgz", - "integrity": "sha512-HD7Uthog/QjRBFKrrnbOrm313CrkkWiTxENR7PjUy9lSUkuys5HdT0+E8UiHDk8VLSxC/pMmrx3eyYLhNq7EnQ==", - "requires": { - "tslib": "^2.0.0" - } - }, "ngx-long-press2": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/ngx-long-press2/-/ngx-long-press2-2.0.0.tgz", diff --git a/package.json b/package.json index 8c72c5adf..f26844384 100644 --- a/package.json +++ b/package.json @@ -57,7 +57,6 @@ "@ngx-formly/core": "^5.10.22", "@ngx-formly/material": "^5.10.22", "@ngx-formly/schematics": "^5.10.22", - "@numbersprotocol/preview-camera": "github:numbersprotocol/preview-camera", "@numbersprotocol/preview-video": "github:numbersprotocol/preview-video", "async-mutex": "^0.3.2", "buffer": "^5.7.1", @@ -66,7 +65,6 @@ "immutable": "^4.0.0-rc.14", "lodash-es": "^4.17.21", "material-design-icons-iconfont": "^6.1.0", - "ng-circle-progress": "^1.6.0", "ngx-long-press2": "^2.0.0", "ngx-pinch-zoom": "^2.6.0", "process": "^0.11.10", diff --git a/src/app/features/home/custom-camera/custom-camera-routing.module.ts b/src/app/features/home/custom-camera/custom-camera-routing.module.ts deleted file mode 100644 index 471a97ef7..000000000 --- a/src/app/features/home/custom-camera/custom-camera-routing.module.ts +++ /dev/null @@ -1,17 +0,0 @@ -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 {} diff --git a/src/app/features/home/custom-camera/custom-camera.module.ts b/src/app/features/home/custom-camera/custom-camera.module.ts deleted file mode 100644 index 2b8996205..000000000 --- a/src/app/features/home/custom-camera/custom-camera.module.ts +++ /dev/null @@ -1,19 +0,0 @@ -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 {} diff --git a/src/app/features/home/custom-camera/custom-camera.page.html b/src/app/features/home/custom-camera/custom-camera.page.html deleted file mode 100644 index 0b25da128..000000000 --- a/src/app/features/home/custom-camera/custom-camera.page.html +++ /dev/null @@ -1,42 +0,0 @@ - -
- GoPro - featured_video -
- - - close - - -
- - video_collection - - - - - flip_camera_android -
- diff --git a/src/app/features/home/custom-camera/custom-camera.page.scss b/src/app/features/home/custom-camera/custom-camera.page.scss deleted file mode 100644 index 9cca8339f..000000000 --- a/src/app/features/home/custom-camera/custom-camera.page.scss +++ /dev/null @@ -1,55 +0,0 @@ -: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; -} diff --git a/src/app/features/home/custom-camera/custom-camera.page.spec.ts b/src/app/features/home/custom-camera/custom-camera.page.spec.ts deleted file mode 100644 index 2e7290140..000000000 --- a/src/app/features/home/custom-camera/custom-camera.page.spec.ts +++ /dev/null @@ -1,31 +0,0 @@ -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; - - 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(); - }); -}); diff --git a/src/app/features/home/custom-camera/custom-camera.page.ts b/src/app/features/home/custom-camera/custom-camera.page.ts deleted file mode 100644 index 2efeb98d6..000000000 --- a/src/app/features/home/custom-camera/custom-camera.page.ts +++ /dev/null @@ -1,160 +0,0 @@ -/* eslint-disable no-console */ -import { Location } from '@angular/common'; -import { Component, OnDestroy, OnInit } from '@angular/core'; -import { Router } from '@angular/router'; -import { PluginListenerHandle } from '@capacitor/core'; -import { UntilDestroy } from '@ngneat/until-destroy'; -import { CaptureResult, PreviewCamera } from '@numbersprotocol/preview-camera'; -import { ErrorService } from '../../../shared/error/error.service'; -import { GoProBluetoothService } from '../../settings/go-pro/services/go-pro-bluetooth.service'; -import { - CustomCameraMediaItem, - MAX_RECORD_TIME_IN_MILLISECONDS, -} from './custom-camera'; -import { CustomCameraService } from './custom-camera.service'; - -@UntilDestroy({ checkProperties: true }) -@Component({ - selector: 'app-custom-camera', - templateUrl: './custom-camera.page.html', - styleUrls: ['./custom-camera.page.scss'], -}) -export class CustomCameraPage implements OnInit, OnDestroy { - private captureVideoFinishedListener?: PluginListenerHandle; - private capturePhotoFinishedListener?: PluginListenerHandle; - - maxRecordTimeInMilliseconds = MAX_RECORD_TIME_IN_MILLISECONDS; - curRecordTimeInMilliseconds = 0; - curRecordTimeInPercent = 0; - - // eslint-disable-next-line @typescript-eslint/no-magic-numbers - scaleDownAnimationAfterDelay = 230; - - curSessionCaptureMediaItems: CustomCameraMediaItem[] = []; - - readonly lastConnectedGoProDevice$ = - this.goProBluetoothService.lastConnectedDevice$; - - constructor( - private readonly location: Location, - private readonly router: Router, - private readonly customCameraService: CustomCameraService, - private readonly goProBluetoothService: GoProBluetoothService, - private readonly errorService: ErrorService - ) {} - - ngOnInit(): void { - this.debugOnlyPreventContextMenuFromLongPressContextMenu(); - - PreviewCamera.addListener( - 'capturePhotoFinished', - this.onCapturePhotoFinished.bind(this) - ).then((listener: any) => (this.capturePhotoFinishedListener = listener)); - - PreviewCamera.addListener( - 'captureVideoFinished', - this.onCaptureVideoFinished.bind(this) - ).then((listener: any) => (this.captureVideoFinishedListener = listener)); - - this.startPreviewCamera(); - } - - ngOnDestroy(): void { - this.capturePhotoFinishedListener?.remove(); - this.captureVideoFinishedListener?.remove(); - this.stopPreviewCamera(); - } - - // PreviewCamera Plugin methods - private async onCapturePhotoFinished(data: CaptureResult): Promise { - this.uploadItem(data, 'image'); - } - - private async onCaptureVideoFinished(data: CaptureResult): Promise { - this.uploadItem(data, 'video'); - } - - private async uploadItem(data: CaptureResult, type: 'image' | 'video') { - if (data.errorMessage) { - await this.errorService.toastError$(data.errorMessage).toPromise(); - } else if (data.filePath) { - this.customCameraService.uploadToCapture(data.filePath, type); - } - } - - startPreviewCamera() { - this.customCameraService.startPreviewCamera(); - } - - // eslint-disable-next-line class-methods-use-this - stopPreviewCamera() { - this.customCameraService.stopPreviewCamera(); - } - - flipCamera() { - this.customCameraService.flipCamera(); - } - - onPress() { - this.customCameraService.takePhoto(); - } - - onLongPress() { - this.customCameraService.startRecord(); - } - - onLongPressing(longPressDurationInMilliSeconds: any) { - this.curRecordTimeInMilliseconds = longPressDurationInMilliSeconds; - - this.curRecordTimeInPercent = Math.floor( - (this.curRecordTimeInMilliseconds / this.maxRecordTimeInMilliseconds) * - // eslint-disable-next-line @typescript-eslint/no-magic-numbers - 100 - ); - } - - onReleasePressing() { - this.customCameraService.stopRecord(); - - if (this.curRecordTimeInMilliseconds > 0) { - this.curRecordTimeInMilliseconds = 0; - this.curRecordTimeInPercent = 0; - } - } - - async leaveCustomCamera() { - return this.location.back(); - } - - async captureFromGoPro() { - await this.customCameraService.stopPreviewCamera(); - this.router.navigate(['/settings', 'go-pro', 'media-list-on-camera'], { - state: { shouldStartPreviewCameraOnLeave: true }, - }); - } - - // eslint-disable-next-line class-methods-use-this - private debugOnlyPreventContextMenuFromLongPressContextMenu() { - // Prevent showing context menu on long press - window.oncontextmenu = function (event: any) { - const pointerEvent = event as PointerEvent; - if (pointerEvent.pointerType === 'touch') return false; - - return true; - }; - } - - // eslint-disable-next-line class-methods-use-this - private scaleUpGalleryButton() { - // TODO: use @ViewChild elementRef - const element = document.getElementById('gallery-icon'); - element?.classList.add('scaled-mat-icon'); - } - - // eslint-disable-next-line class-methods-use-this - private scaleDownGalleryButton() { - // TODO: use @ViewChild elementRef - const element = document.getElementById('gallery-icon'); - element?.classList.remove('scaled-mat-icon'); - } -} diff --git a/src/app/features/home/custom-camera/custom-camera.service.spec.ts b/src/app/features/home/custom-camera/custom-camera.service.spec.ts deleted file mode 100644 index 288da8ca1..000000000 --- a/src/app/features/home/custom-camera/custom-camera.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; -import { SharedTestingModule } from '../../../shared/shared-testing.module'; -import { CustomCameraService } from './custom-camera.service'; - -describe('CustomCameraService', () => { - let service: CustomCameraService; - - beforeEach(() => { - TestBed.configureTestingModule({ imports: [SharedTestingModule] }); - service = TestBed.inject(CustomCameraService); - }); - - it('should be created', () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/src/app/features/home/custom-camera/custom-camera.service.ts b/src/app/features/home/custom-camera/custom-camera.service.ts deleted file mode 100644 index 30febf614..000000000 --- a/src/app/features/home/custom-camera/custom-camera.service.ts +++ /dev/null @@ -1,101 +0,0 @@ -import { HttpClient } from '@angular/common/http'; -import { Injectable } from '@angular/core'; -import { DomSanitizer } from '@angular/platform-browser'; -import { Capacitor } from '@capacitor/core'; -import { TranslocoService } from '@ngneat/transloco'; -import { PreviewCamera } from '@numbersprotocol/preview-camera'; -import { BehaviorSubject } from 'rxjs'; -import { CaptureService } from '../../../shared/capture/capture.service'; -import { ErrorService } from '../../../shared/error/error.service'; -import { blobToBase64 } from '../../../utils/encoding/encoding'; -import { - CustomCameraMediaItem, - CustomCameraMediaType, - CustomCameraMimeType, -} from './custom-camera'; - -@Injectable({ - providedIn: 'root', -}) -export class CustomCameraService { - private readonly globalCSSClass = 'custom-camera-transparent-background'; - - uploadInProgress$ = new BehaviorSubject(false); - - constructor( - private readonly sanitizer: DomSanitizer, - private readonly httpClient: HttpClient, - private readonly captureService: CaptureService, - private readonly errorService: ErrorService, - private readonly translocoService: TranslocoService - ) {} - - private mediaItemFromFilePath( - filePath: string, - type: CustomCameraMediaType - ): CustomCameraMediaItem { - const src = Capacitor.convertFileSrc(filePath); - const safeUrl = this.sanitizer.bypassSecurityTrustUrl(src); - const mimeType: CustomCameraMimeType = - type === 'image' ? 'image/jpeg' : 'video/mp4'; - const newItem = { filePath, src, safeUrl, type, mimeType }; - return newItem; - } - - async uploadToCapture(filePath: string, type: CustomCameraMediaType) { - const itemToUpload = this.mediaItemFromFilePath(filePath, type); - - try { - const itemBlob = await this.httpClient - .get(itemToUpload.src, { responseType: 'blob' }) - .toPromise(); - const base64 = await blobToBase64(itemBlob); - const mimeType = itemToUpload.mimeType; - await this.captureService.capture({ base64, mimeType }); - } catch (error) { - const errMsg = this.translocoService.translate(`error.internetError`); - await this.errorService.toastError$(errMsg).toPromise(); - } - } - - async startPreviewCamera() { - return PreviewCamera.startPreview() - .then(this.changeGlobalCSSBackgroundToTransparent.bind(this)) - .catch(() => ({})); - } - - async stopPreviewCamera() { - this.changeGlobalCSSBackgroundToTransparentRevert(); - return PreviewCamera.stopPreview().catch(() => ({})); - } - - // eslint-disable-next-line class-methods-use-this - async flipCamera() { - return PreviewCamera.flipCamera().catch(() => ({})); - } - - // eslint-disable-next-line class-methods-use-this - async takePhoto() { - return PreviewCamera.takePhoto().catch(() => ({})); - } - - // eslint-disable-next-line class-methods-use-this - async startRecord() { - return PreviewCamera.startRecord().catch(() => ({})); - } - - // eslint-disable-next-line class-methods-use-this - async stopRecord() { - return PreviewCamera.stopRecord().catch(() => ({})); - } - - private changeGlobalCSSBackgroundToTransparent() { - document.querySelector('body')?.classList.add(this.globalCSSClass); - document.querySelector('ion-app')?.classList.add(this.globalCSSClass); - } - - private changeGlobalCSSBackgroundToTransparentRevert() { - document.querySelector('body')?.classList.remove(this.globalCSSClass); - document.querySelector('ion-app')?.classList.remove(this.globalCSSClass); - } -} diff --git a/src/app/features/home/custom-camera/custom-camera.ts b/src/app/features/home/custom-camera/custom-camera.ts deleted file mode 100644 index c380352ed..000000000 --- a/src/app/features/home/custom-camera/custom-camera.ts +++ /dev/null @@ -1,15 +0,0 @@ -import { SafeUrl } from '@angular/platform-browser'; - -export const MAX_RECORD_TIME_IN_MILLISECONDS = 15000; - -export type CustomCameraMediaType = 'image' | 'video'; - -export type CustomCameraMimeType = 'image/jpeg' | 'video/mp4'; - -export interface CustomCameraMediaItem { - filePath: string; - src: string; - safeUrl: SafeUrl; - type: CustomCameraMediaType; - mimeType: CustomCameraMimeType; -} diff --git a/src/app/features/home/home-routing.module.ts b/src/app/features/home/home-routing.module.ts index 9a9c9a305..53c62da9d 100644 --- a/src/app/features/home/home-routing.module.ts +++ b/src/app/features/home/home-routing.module.ts @@ -45,13 +45,6 @@ const routes: Routes = [ loadChildren: () => import('./details/details.module').then(m => m.DetailsPageModule), }, - { - path: 'custom-camera', - loadChildren: () => - import('./custom-camera/custom-camera.module').then( - m => m.CustomCameraPageModule - ), - }, ]; @NgModule({ diff --git a/src/app/features/home/home.page.html b/src/app/features/home/home.page.html index daebe9521..9095666a1 100644 --- a/src/app/features/home/home.page.html +++ b/src/app/features/home/home.page.html @@ -82,7 +82,7 @@ - diff --git a/src/app/features/home/home.page.ts b/src/app/features/home/home.page.ts index 1b660c59d..9015fabe2 100644 --- a/src/app/features/home/home.page.ts +++ b/src/app/features/home/home.page.ts @@ -166,12 +166,6 @@ export class HomePage { .subscribe(); } - captureWithCustomCamera() { - const captureIndex = 0; - this.selectedTabIndex = captureIndex; - this.router.navigate(['home', 'custom-camera']); - } - private presentCaptureActions$() { return combineLatest([ this.translocoService.selectTranslateObject({ diff --git a/src/app/features/settings/go-pro/go-pro-media-viewer-with-native-player/go-pro-media-viewer-with-native-player.component.spec.ts b/src/app/features/settings/go-pro/go-pro-media-viewer-with-native-player/go-pro-media-viewer-with-native-player.component.spec.ts index 1857b9b59..cc7bfa756 100644 --- a/src/app/features/settings/go-pro/go-pro-media-viewer-with-native-player/go-pro-media-viewer-with-native-player.component.spec.ts +++ b/src/app/features/settings/go-pro/go-pro-media-viewer-with-native-player/go-pro-media-viewer-with-native-player.component.spec.ts @@ -1,5 +1,6 @@ import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; -import { SharedTestingModule } from '../../../../shared/shared-testing.module'; +import { IonicModule } from '@ionic/angular'; + import { GoProMediaViewerWithNativePlayerComponent } from './go-pro-media-viewer-with-native-player.component'; describe('GoProMediaViewerWithNativePlayerComponent', () => { @@ -10,7 +11,7 @@ describe('GoProMediaViewerWithNativePlayerComponent', () => { waitForAsync(() => { TestBed.configureTestingModule({ declarations: [GoProMediaViewerWithNativePlayerComponent], - imports: [SharedTestingModule], + imports: [IonicModule.forRoot()], }).compileComponents(); fixture = TestBed.createComponent( diff --git a/src/global.scss b/src/global.scss index 7dc53dfea..3ea54acc2 100644 --- a/src/global.scss +++ b/src/global.scss @@ -140,7 +140,3 @@ body.dark .mat-tab-group { object-fit: cover; align-self: center; } - -.custom-camera-transparent-background { - background-color: transparent; -}