From d64d087a7bb65aadbc5b97930293a993a54bb810 Mon Sep 17 00:00:00 2001 From: sultanmyrza Date: Fri, 8 Apr 2022 14:21:58 +0800 Subject: [PATCH 01/11] install fixed version for iOS of http plugin --- package-lock.json | 11 +++++------ package.json | 2 +- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/package-lock.json b/package-lock.json index c503a8b22..b851c4b80 100644 --- a/package-lock.json +++ b/package-lock.json @@ -18,7 +18,7 @@ "@angular/platform-browser-dynamic": "^12.2.4", "@angular/router": "^12.2.4", "@capacitor-community/bluetooth-le": "^1.7.0", - "@capacitor-community/http": "^1.4.1", + "@capacitor-community/http": "github:sultanmyrza/http#fix-catch-disabled-Local-Network-case-on-iOS", "@capacitor-community/wifi": "github:numbersprotocol/community-capacitor-wifi#capacitor3", "@capacitor/android": "https://gitpkg.now.sh/numbersprotocol/capacitor/android?release-3.4.1-range-request-fix", "@capacitor/app": "^1.1.0", @@ -2561,8 +2561,8 @@ }, "node_modules/@capacitor-community/http": { "version": "1.4.1", - "resolved": "https://registry.npmjs.org/@capacitor-community/http/-/http-1.4.1.tgz", - "integrity": "sha512-+pCkBXrwfm97UfjOgjV950H/qZ8SE36Mrcb46BlL1ps3VIsGuIO+AulL8GqTC6LewheRVtGJpRspNtneXQotNA==", + "resolved": "git+ssh://git@github.com/sultanmyrza/http.git#5be0ddd0d55b5ff99467d5da86c88a173a677001", + "license": "MIT", "dependencies": { "@capacitor/android": "^3.0.0", "@capacitor/core": "^3.0.0", @@ -27083,9 +27083,8 @@ } }, "@capacitor-community/http": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/@capacitor-community/http/-/http-1.4.1.tgz", - "integrity": "sha512-+pCkBXrwfm97UfjOgjV950H/qZ8SE36Mrcb46BlL1ps3VIsGuIO+AulL8GqTC6LewheRVtGJpRspNtneXQotNA==", + "version": "git+ssh://git@github.com/sultanmyrza/http.git#5be0ddd0d55b5ff99467d5da86c88a173a677001", + "from": "@capacitor-community/http@github:sultanmyrza/http#fix-catch-disabled-Local-Network-case-on-iOS", "requires": { "@capacitor/android": "^3.0.0", "@capacitor/core": "^3.0.0", diff --git a/package.json b/package.json index 8c8f20238..d8ad82c87 100644 --- a/package.json +++ b/package.json @@ -29,7 +29,7 @@ "@angular/platform-browser-dynamic": "^12.2.4", "@angular/router": "^12.2.4", "@capacitor-community/bluetooth-le": "^1.7.0", - "@capacitor-community/http": "^1.4.1", + "@capacitor-community/http": "github:sultanmyrza/http#fix-catch-disabled-Local-Network-case-on-iOS", "@capacitor-community/wifi": "github:numbersprotocol/community-capacitor-wifi#capacitor3", "@capacitor/android": "https://gitpkg.now.sh/numbersprotocol/capacitor/android?release-3.4.1-range-request-fix", "@capacitor/app": "^1.1.0", From bdac76ac2ff7f261a1eeda0f377c787899b0ec22 Mon Sep 17 00:00:00 2001 From: sultanmyrza Date: Fri, 8 Apr 2022 14:22:38 +0800 Subject: [PATCH 02/11] use observable pref key to get GoPro lastConnected Device --- src/app/features/home/home.page.ts | 2 +- .../settings/go-pro/services/go-pro-bluetooth.service.ts | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/app/features/home/home.page.ts b/src/app/features/home/home.page.ts index 685e67838..9015fabe2 100644 --- a/src/app/features/home/home.page.ts +++ b/src/app/features/home/home.page.ts @@ -172,7 +172,7 @@ export class HomePage { takePicture: null, recordVideo: null, }), - this.goProBluetoothService.connectedDevice$, + this.goProBluetoothService.lastConnectedDevice$, ]).pipe( first(), concatMap(([translations, connectedDevice]) => { diff --git a/src/app/features/settings/go-pro/services/go-pro-bluetooth.service.ts b/src/app/features/settings/go-pro/services/go-pro-bluetooth.service.ts index 8294fe2bc..1749c1150 100644 --- a/src/app/features/settings/go-pro/services/go-pro-bluetooth.service.ts +++ b/src/app/features/settings/go-pro/services/go-pro-bluetooth.service.ts @@ -65,6 +65,10 @@ export class GoProBluetoothService { undefined ); + readonly lastConnectedDevice$ = this.preferences.getString$( + PrefKeys.LAST_CONNECTED_BLUETOOTH_DEVICE + ); + constructor(private readonly preferenceManager: PreferenceManager) {} private async initialize() { From 24565c6f31ad4c63c6f7a86ae66c9807eaa76823 Mon Sep 17 00:00:00 2001 From: sultanmyrza Date: Fri, 8 Apr 2022 14:29:18 +0800 Subject: [PATCH 03/11] fix: go pro connection related iOS edge cases --- ...go-pro-media-list-on-camera.component.html | 1 + .../go-pro-media-list-on-camera.component.ts | 20 +++++++++++++++++-- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/src/app/features/settings/go-pro/go-pro-media-list-on-camera/go-pro-media-list-on-camera.component.html b/src/app/features/settings/go-pro/go-pro-media-list-on-camera/go-pro-media-list-on-camera.component.html index 7f3854597..48aeac7d5 100644 --- a/src/app/features/settings/go-pro/go-pro-media-list-on-camera/go-pro-media-list-on-camera.component.html +++ b/src/app/features/settings/go-pro/go-pro-media-list-on-camera/go-pro-media-list-on-camera.component.html @@ -26,6 +26,7 @@

{{ t('gopro.connectedWiFi') }}: {{ connectedWifiSSID }}

{{ t('gopro.connectToGoProWiFi') }} diff --git a/src/app/features/settings/go-pro/go-pro-media-list-on-camera/go-pro-media-list-on-camera.component.ts b/src/app/features/settings/go-pro/go-pro-media-list-on-camera/go-pro-media-list-on-camera.component.ts index f57c7538c..9febd7a56 100644 --- a/src/app/features/settings/go-pro/go-pro-media-list-on-camera/go-pro-media-list-on-camera.component.ts +++ b/src/app/features/settings/go-pro/go-pro-media-list-on-camera/go-pro-media-list-on-camera.component.ts @@ -4,6 +4,7 @@ import { Router } from '@angular/router'; import { AlertController, NavController, + Platform, ToastController, } from '@ionic/angular'; import { GoProFile } from '../go-pro-media-file'; @@ -25,6 +26,7 @@ export class GoProMediaListOnCameraComponent implements OnInit { connectedWifiSSID: string | null = null; isConnectedToGoProWifi: boolean | undefined; + isConnectingToGoProWifi: boolean | undefined; isScrollingContent = false; @@ -42,6 +44,7 @@ export class GoProMediaListOnCameraComponent implements OnInit { private readonly alertCtrl: AlertController, private readonly goProBluetoothService: GoProBluetoothService, private readonly goProWifiService: GoProWifiService, + private readonly platform: Platform, public toastController: ToastController ) {} @@ -64,21 +67,34 @@ export class GoProMediaListOnCameraComponent implements OnInit { this.fetchingFilesError = undefined; this.fetchingFiles = true; this.allMediaFiles = await this.goProMediaService.getFilesFromGoPro(); - this.fetchingFiles = false; } catch (error: any) { - this.fetchingFilesError = error.toString(); + this.fetchingFilesError = 'Failed to fetch media from GoPro'; + if (this.platform.is('ios')) { + this.fetchingFilesError = + 'Please check iOS Settings > Capture > Local Network, make sure the permission of Local Network is allowed Capture app.'; + } this.allMediaFiles = []; + } finally { this.fetchingFiles = false; } } async connectToGoProWifi() { try { + this.isConnectingToGoProWifi = true; + + if (!(await this.goProBluetoothService.getConnectedDevice())) { + alert('Connect to GoPro via bluetooth first'); + // I need to show alert because when catching error below for some reason it's empty + throw new Error('Connect to GoPro via bluetooth first'); + } this.connectedWifiSSID = await this.goProWifiService.connectToGoProWiFi(); this.isConnectedToGoProWifi = true; await this.fetchFilesFromGoProWiFi(); } catch (error) { this.presentToast(JSON.stringify(error)); + } finally { + this.isConnectingToGoProWifi = false; } } From 8fccf463d16c749c7f85deb37cef7b6be6c8eba1 Mon Sep 17 00:00:00 2001 From: sultanmyrza Date: Fri, 8 Apr 2022 14:34:47 +0800 Subject: [PATCH 04/11] install preview-video plugin for GoPro videos --- android/app/capacitor.build.gradle | 1 + android/app/src/main/assets/capacitor.plugins.json | 4 ++++ android/capacitor.settings.gradle | 3 +++ ios/App/Podfile | 1 + package-lock.json | 14 ++++++++++++++ package.json | 1 + 6 files changed, 24 insertions(+) diff --git a/android/app/capacitor.build.gradle b/android/app/capacitor.build.gradle index e390d9e4a..8dc57e7fc 100644 --- a/android/app/capacitor.build.gradle +++ b/android/app/capacitor.build.gradle @@ -25,6 +25,7 @@ dependencies { implementation project(':capacitor-share') implementation project(':capacitor-splash-screen') implementation project(':capacitor-storage') + 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 aa76ce170..c2efb9086 100644 --- a/android/app/src/main/assets/capacitor.plugins.json +++ b/android/app/src/main/assets/capacitor.plugins.json @@ -63,6 +63,10 @@ "pkg": "@capacitor/storage", "classpath": "com.capacitorjs.plugins.storage.StoragePlugin" }, + { + "pkg": "@numbersprotocol/preview-video", + "classpath": "io.numbersprotocol.capturelite.plugins.previewvideo.PreviewVideoPlugin" + }, { "pkg": "capacitor-blob-writer", "classpath": "com.equimaps.capacitorblobwriter.BlobWriter" diff --git a/android/capacitor.settings.gradle b/android/capacitor.settings.gradle index 72c6a0451..00fd4567c 100644 --- a/android/capacitor.settings.gradle +++ b/android/capacitor.settings.gradle @@ -50,5 +50,8 @@ 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-video' +project(':numbersprotocol-preview-video').projectDir = new File('../node_modules/@numbersprotocol/preview-video/android') + include ':capacitor-blob-writer' project(':capacitor-blob-writer').projectDir = new File('../node_modules/capacitor-blob-writer/android') diff --git a/ios/App/Podfile b/ios/App/Podfile index 39afafc75..4af80fd62 100644 --- a/ios/App/Podfile +++ b/ios/App/Podfile @@ -25,6 +25,7 @@ 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 '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 b851c4b80..75e4994e1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -46,6 +46,7 @@ "@ngx-formly/core": "^5.10.22", "@ngx-formly/material": "^5.10.22", "@ngx-formly/schematics": "^5.10.22", + "@numbersprotocol/preview-video": "github:sultanmyrza/preview-video", "async-mutex": "^0.3.2", "buffer": "^5.7.1", "capacitor-blob-writer": "^1.0.4", @@ -4116,6 +4117,14 @@ "node": ">=10" } }, + "node_modules/@numbersprotocol/preview-video": { + "version": "0.0.1", + "resolved": "git+ssh://git@github.com/sultanmyrza/preview-video.git#2d19456109c8c9d364324d9c08e766580256f1f7", + "license": "MIT", + "peerDependencies": { + "@capacitor/core": "^3.0.0" + } + }, "node_modules/@schematics/angular": { "version": "12.2.4", "resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-12.2.4.tgz", @@ -28212,6 +28221,11 @@ } } }, + "@numbersprotocol/preview-video": { + "version": "git+ssh://git@github.com/sultanmyrza/preview-video.git#2d19456109c8c9d364324d9c08e766580256f1f7", + "from": "@numbersprotocol/preview-video@github:sultanmyrza/preview-video", + "requires": {} + }, "@schematics/angular": { "version": "12.2.4", "resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-12.2.4.tgz", diff --git a/package.json b/package.json index d8ad82c87..209587919 100644 --- a/package.json +++ b/package.json @@ -57,6 +57,7 @@ "@ngx-formly/core": "^5.10.22", "@ngx-formly/material": "^5.10.22", "@ngx-formly/schematics": "^5.10.22", + "@numbersprotocol/preview-video": "github:sultanmyrza/preview-video", "async-mutex": "^0.3.2", "buffer": "^5.7.1", "capacitor-blob-writer": "^1.0.4", From ea9948351670e3268eb87f04ee2c4dc7ade84410 Mon Sep 17 00:00:00 2001 From: sultanmyrza Date: Fri, 8 Apr 2022 14:36:07 +0800 Subject: [PATCH 05/11] enable the dataBinding build option, needed for preview-video plugin --- android/app/build.gradle | 3 +++ 1 file changed, 3 insertions(+) diff --git a/android/app/build.gradle b/android/app/build.gradle index 874c579a3..1f74d8a69 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -10,6 +10,9 @@ android { versionName "0.54.1" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } + buildFeatures { + dataBinding true + } buildTypes { release { minifyEnabled false From a7d8e3a61ba6fb3850a7598e3f4518d28cdab48b Mon Sep 17 00:00:00 2001 From: sultanmyrza Date: Fri, 8 Apr 2022 14:39:54 +0800 Subject: [PATCH 06/11] use preivew-video plugin to play GoPro videos --- ...media-item-detail-on-camera.component.html | 29 +++++++---- ...media-item-detail-on-camera.component.scss | 22 ++++++++ ...o-media-item-detail-on-camera.component.ts | 21 ++++++++ ...a-viewer-with-native-player.component.html | 5 ++ ...a-viewer-with-native-player.component.scss | 15 ++++++ ...iewer-with-native-player.component.spec.ts | 28 ++++++++++ ...dia-viewer-with-native-player.component.ts | 52 +++++++++++++++++++ .../settings/go-pro/go-pro-routing.module.ts | 5 ++ .../features/settings/go-pro/go-pro.module.ts | 2 + 9 files changed, 170 insertions(+), 9 deletions(-) create mode 100644 src/app/features/settings/go-pro/go-pro-media-viewer-with-native-player/go-pro-media-viewer-with-native-player.component.html create mode 100644 src/app/features/settings/go-pro/go-pro-media-viewer-with-native-player/go-pro-media-viewer-with-native-player.component.scss create mode 100644 src/app/features/settings/go-pro/go-pro-media-viewer-with-native-player/go-pro-media-viewer-with-native-player.component.spec.ts create mode 100644 src/app/features/settings/go-pro/go-pro-media-viewer-with-native-player/go-pro-media-viewer-with-native-player.component.ts diff --git a/src/app/features/settings/go-pro/go-pro-media-item-detail-on-camera/go-pro-media-item-detail-on-camera.component.html b/src/app/features/settings/go-pro/go-pro-media-item-detail-on-camera/go-pro-media-item-detail-on-camera.component.html index 1ce9a20cf..1693cd425 100644 --- a/src/app/features/settings/go-pro/go-pro-media-item-detail-on-camera/go-pro-media-item-detail-on-camera.component.html +++ b/src/app/features/settings/go-pro/go-pro-media-item-detail-on-camera/go-pro-media-item-detail-on-camera.component.html @@ -15,15 +15,26 @@ loading="lazy" > - +
+
+ + play_circle_outline +
+ + + + + +

Blur image (remove after Q&A)

+

GoPro thumbnails come in low quality.

+ +
+ + + +

go-pro-media-viewer-with-native-player

diff --git a/src/app/features/settings/go-pro/go-pro-media-viewer-with-native-player/go-pro-media-viewer-with-native-player.component.scss b/src/app/features/settings/go-pro/go-pro-media-viewer-with-native-player/go-pro-media-viewer-with-native-player.component.scss new file mode 100644 index 000000000..70df54079 --- /dev/null +++ b/src/app/features/settings/go-pro/go-pro-media-viewer-with-native-player/go-pro-media-viewer-with-native-player.component.scss @@ -0,0 +1,15 @@ +:host { + background-color: black; +} + +.dismiss { + position: absolute; + left: 0; + z-index: 1; + width: 48px; + height: 48px; + + --border-radius: 50%; + --padding-end: 0; + --padding-start: 0; +} 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 new file mode 100644 index 000000000..cc7bfa756 --- /dev/null +++ b/src/app/features/settings/go-pro/go-pro-media-viewer-with-native-player/go-pro-media-viewer-with-native-player.component.spec.ts @@ -0,0 +1,28 @@ +import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; +import { IonicModule } from '@ionic/angular'; + +import { GoProMediaViewerWithNativePlayerComponent } from './go-pro-media-viewer-with-native-player.component'; + +describe('GoProMediaViewerWithNativePlayerComponent', () => { + let component: GoProMediaViewerWithNativePlayerComponent; + let fixture: ComponentFixture; + + beforeEach( + waitForAsync(() => { + TestBed.configureTestingModule({ + declarations: [GoProMediaViewerWithNativePlayerComponent], + imports: [IonicModule.forRoot()], + }).compileComponents(); + + fixture = TestBed.createComponent( + GoProMediaViewerWithNativePlayerComponent + ); + component = fixture.componentInstance; + fixture.detectChanges(); + }) + ); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/features/settings/go-pro/go-pro-media-viewer-with-native-player/go-pro-media-viewer-with-native-player.component.ts b/src/app/features/settings/go-pro/go-pro-media-viewer-with-native-player/go-pro-media-viewer-with-native-player.component.ts new file mode 100644 index 000000000..181740813 --- /dev/null +++ b/src/app/features/settings/go-pro/go-pro-media-viewer-with-native-player/go-pro-media-viewer-with-native-player.component.ts @@ -0,0 +1,52 @@ +import { Component, OnDestroy, OnInit } from '@angular/core'; +import { ActivatedRoute, Router } from '@angular/router'; +import { NavController } from '@ionic/angular'; +import { PreviewVideo } from '@numbersprotocol/preview-video'; +import { GoProFile } from '../go-pro-media-file'; + +@Component({ + selector: 'app-go-pro-media-viewer-with-native-player', + templateUrl: './go-pro-media-viewer-with-native-player.component.html', + styleUrls: ['./go-pro-media-viewer-with-native-player.component.scss'], +}) +export class GoProMediaViewerWithNativePlayerComponent + implements OnInit, OnDestroy +{ + mediaFile: GoProFile | undefined; + + onIOSPlayerDismissedListener?: any; + + constructor( + private readonly route: ActivatedRoute, + private readonly router: Router, + private readonly navController: NavController + ) { + this.route.queryParams.subscribe(_ => { + const state = this.router.getCurrentNavigation()?.extras.state; + if (state) { + this.mediaFile = state.goProMediaFile; + } + }); + } + + ngOnInit(): void { + if (!this.mediaFile?.url) return; + PreviewVideo.playFullScreenFromRemote({ url: this.mediaFile.url }); + PreviewVideo.addListener('iosPlayerDismissed', (_info: any) => { + // eslint-disable-next-line no-console + console.log('ITS WORKING'); + this.navController.back(); + }); + } + + ngOnDestroy(): void { + PreviewVideo.stopFullScreen(); + // TODO: check if .remove() really get called + this.onIOSPlayerDismissedListener?.remove(); + } + + dismiss() { + PreviewVideo.stopFullScreen(); + this.navController.back(); + } +} diff --git a/src/app/features/settings/go-pro/go-pro-routing.module.ts b/src/app/features/settings/go-pro/go-pro-routing.module.ts index 04bc09385..4c63210fc 100644 --- a/src/app/features/settings/go-pro/go-pro-routing.module.ts +++ b/src/app/features/settings/go-pro/go-pro-routing.module.ts @@ -2,6 +2,7 @@ import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; import { GoProMediaItemDetailOnCameraComponent } from './go-pro-media-item-detail-on-camera/go-pro-media-item-detail-on-camera.component'; import { GoProMediaListOnCameraComponent } from './go-pro-media-list-on-camera/go-pro-media-list-on-camera.component'; +import { GoProMediaViewerWithNativePlayerComponent } from './go-pro-media-viewer-with-native-player/go-pro-media-viewer-with-native-player.component'; import { GoProPage } from './go-pro.page'; const routes: Routes = [ @@ -17,6 +18,10 @@ const routes: Routes = [ path: 'media-item-detail-on-camera', component: GoProMediaItemDetailOnCameraComponent, }, + { + path: 'media-item-viewer', + component: GoProMediaViewerWithNativePlayerComponent, + }, ]; @NgModule({ diff --git a/src/app/features/settings/go-pro/go-pro.module.ts b/src/app/features/settings/go-pro/go-pro.module.ts index 8b8e739e6..b4f8d245c 100644 --- a/src/app/features/settings/go-pro/go-pro.module.ts +++ b/src/app/features/settings/go-pro/go-pro.module.ts @@ -5,6 +5,7 @@ import { GoProMediaItemDetailOnCameraComponent } from './go-pro-media-item-detai import { GoProMediaListItemOnCameraComponent } from './go-pro-media-list-item-on-camera/go-pro-media-list-item-on-camera.component'; import { GoProMediaListOnCameraComponent } from './go-pro-media-list-on-camera/go-pro-media-list-on-camera.component'; import { GoProMediaLoadingBarComponent } from './go-pro-media-loading-bar/go-pro-media-loading-bar.component'; +import { GoProMediaViewerWithNativePlayerComponent } from './go-pro-media-viewer-with-native-player/go-pro-media-viewer-with-native-player.component'; import { GoProPageRoutingModule } from './go-pro-routing.module'; import { GoProPage } from './go-pro.page'; @@ -16,6 +17,7 @@ import { GoProPage } from './go-pro.page'; GoProMediaListItemOnCameraComponent, GoProMediaItemDetailOnCameraComponent, GoProMediaLoadingBarComponent, + GoProMediaViewerWithNativePlayerComponent, ], }) export class GoProPageModule {} From 18a851d03230414f35bc1a4542201aa8afe3edb5 Mon Sep 17 00:00:00 2001 From: sultanmyrza Date: Fri, 8 Apr 2022 15:45:48 +0800 Subject: [PATCH 07/11] use preview-video plugin from numbersprotocol repo --- package-lock.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index 75e4994e1..b369d94ff 100644 --- a/package-lock.json +++ b/package-lock.json @@ -46,7 +46,7 @@ "@ngx-formly/core": "^5.10.22", "@ngx-formly/material": "^5.10.22", "@ngx-formly/schematics": "^5.10.22", - "@numbersprotocol/preview-video": "github:sultanmyrza/preview-video", + "@numbersprotocol/preview-video": "github:numbersprotocol/preview-video", "async-mutex": "^0.3.2", "buffer": "^5.7.1", "capacitor-blob-writer": "^1.0.4", @@ -4119,7 +4119,7 @@ }, "node_modules/@numbersprotocol/preview-video": { "version": "0.0.1", - "resolved": "git+ssh://git@github.com/sultanmyrza/preview-video.git#2d19456109c8c9d364324d9c08e766580256f1f7", + "resolved": "git+ssh://git@github.com/numbersprotocol/preview-video.git#2d19456109c8c9d364324d9c08e766580256f1f7", "license": "MIT", "peerDependencies": { "@capacitor/core": "^3.0.0" @@ -28222,8 +28222,8 @@ } }, "@numbersprotocol/preview-video": { - "version": "git+ssh://git@github.com/sultanmyrza/preview-video.git#2d19456109c8c9d364324d9c08e766580256f1f7", - "from": "@numbersprotocol/preview-video@github:sultanmyrza/preview-video", + "version": "git+ssh://git@github.com/numbersprotocol/preview-video.git#2d19456109c8c9d364324d9c08e766580256f1f7", + "from": "@numbersprotocol/preview-video@numbersprotocol/preview-video", "requires": {} }, "@schematics/angular": { diff --git a/package.json b/package.json index 209587919..b18cad46a 100644 --- a/package.json +++ b/package.json @@ -57,7 +57,7 @@ "@ngx-formly/core": "^5.10.22", "@ngx-formly/material": "^5.10.22", "@ngx-formly/schematics": "^5.10.22", - "@numbersprotocol/preview-video": "github:sultanmyrza/preview-video", + "@numbersprotocol/preview-video": "github:numbersprotocol/preview-video", "async-mutex": "^0.3.2", "buffer": "^5.7.1", "capacitor-blob-writer": "^1.0.4", From c7e22171e8a7c277160150e83cedb2efb5e980c3 Mon Sep 17 00:00:00 2001 From: sultanmyrza Date: Fri, 8 Apr 2022 15:46:57 +0800 Subject: [PATCH 08/11] use http plugin fix from numbersprotocol repo --- package-lock.json | 10 +++++----- package.json | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package-lock.json b/package-lock.json index b369d94ff..fc1c8d8ba 100644 --- a/package-lock.json +++ b/package-lock.json @@ -18,7 +18,7 @@ "@angular/platform-browser-dynamic": "^12.2.4", "@angular/router": "^12.2.4", "@capacitor-community/bluetooth-le": "^1.7.0", - "@capacitor-community/http": "github:sultanmyrza/http#fix-catch-disabled-Local-Network-case-on-iOS", + "@capacitor-community/http": "github:numbersprotocol/http#fix-catch-disabled-Local-Network-case-on-iOS", "@capacitor-community/wifi": "github:numbersprotocol/community-capacitor-wifi#capacitor3", "@capacitor/android": "https://gitpkg.now.sh/numbersprotocol/capacitor/android?release-3.4.1-range-request-fix", "@capacitor/app": "^1.1.0", @@ -2562,7 +2562,7 @@ }, "node_modules/@capacitor-community/http": { "version": "1.4.1", - "resolved": "git+ssh://git@github.com/sultanmyrza/http.git#5be0ddd0d55b5ff99467d5da86c88a173a677001", + "resolved": "git+ssh://git@github.com/numbersprotocol/http.git#a67d9fac94f8455a7fb00fc4b934ebff724afe9d", "license": "MIT", "dependencies": { "@capacitor/android": "^3.0.0", @@ -27092,8 +27092,8 @@ } }, "@capacitor-community/http": { - "version": "git+ssh://git@github.com/sultanmyrza/http.git#5be0ddd0d55b5ff99467d5da86c88a173a677001", - "from": "@capacitor-community/http@github:sultanmyrza/http#fix-catch-disabled-Local-Network-case-on-iOS", + "version": "git+ssh://git@github.com/numbersprotocol/http.git#a67d9fac94f8455a7fb00fc4b934ebff724afe9d", + "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", @@ -28223,7 +28223,7 @@ }, "@numbersprotocol/preview-video": { "version": "git+ssh://git@github.com/numbersprotocol/preview-video.git#2d19456109c8c9d364324d9c08e766580256f1f7", - "from": "@numbersprotocol/preview-video@numbersprotocol/preview-video", + "from": "@numbersprotocol/preview-video@github:numbersprotocol/preview-video", "requires": {} }, "@schematics/angular": { diff --git a/package.json b/package.json index b18cad46a..f26844384 100644 --- a/package.json +++ b/package.json @@ -29,7 +29,7 @@ "@angular/platform-browser-dynamic": "^12.2.4", "@angular/router": "^12.2.4", "@capacitor-community/bluetooth-le": "^1.7.0", - "@capacitor-community/http": "github:sultanmyrza/http#fix-catch-disabled-Local-Network-case-on-iOS", + "@capacitor-community/http": "github:numbersprotocol/http#fix-catch-disabled-Local-Network-case-on-iOS", "@capacitor-community/wifi": "github:numbersprotocol/community-capacitor-wifi#capacitor3", "@capacitor/android": "https://gitpkg.now.sh/numbersprotocol/capacitor/android?release-3.4.1-range-request-fix", "@capacitor/app": "^1.1.0", From c736859e4f0a8f19eb71f8715e72c203e8e7b344 Mon Sep 17 00:00:00 2001 From: sultanmyrza Date: Mon, 11 Apr 2022 18:30:36 +0800 Subject: [PATCH 09/11] fix: remove blurred effect on go pro cover image --- .../go-pro-media-item-detail-on-camera.component.html | 10 ---------- .../go-pro-media-item-detail-on-camera.component.scss | 5 ----- .../go-pro-media-item-detail-on-camera.component.ts | 3 --- 3 files changed, 18 deletions(-) diff --git a/src/app/features/settings/go-pro/go-pro-media-item-detail-on-camera/go-pro-media-item-detail-on-camera.component.html b/src/app/features/settings/go-pro/go-pro-media-item-detail-on-camera/go-pro-media-item-detail-on-camera.component.html index 1693cd425..20ebddae1 100644 --- a/src/app/features/settings/go-pro/go-pro-media-item-detail-on-camera/go-pro-media-item-detail-on-camera.component.html +++ b/src/app/features/settings/go-pro/go-pro-media-item-detail-on-camera/go-pro-media-item-detail-on-camera.component.html @@ -18,7 +18,6 @@
play_circle_outline
- - - - -

Blur image (remove after Q&A)

-

GoPro thumbnails come in low quality.

- - -
Date: Mon, 11 Apr 2022 18:51:30 +0800 Subject: [PATCH 10/11] fix(go-pro-media-item-detail-on-camera): remove unused comments --- .../go-pro-media-item-detail-on-camera.component.ts | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/src/app/features/settings/go-pro/go-pro-media-item-detail-on-camera/go-pro-media-item-detail-on-camera.component.ts b/src/app/features/settings/go-pro/go-pro-media-item-detail-on-camera/go-pro-media-item-detail-on-camera.component.ts index d735b6a6a..6971b3a4d 100644 --- a/src/app/features/settings/go-pro/go-pro-media-item-detail-on-camera/go-pro-media-item-detail-on-camera.component.ts +++ b/src/app/features/settings/go-pro/go-pro-media-item-detail-on-camera/go-pro-media-item-detail-on-camera.component.ts @@ -43,17 +43,6 @@ export class GoProMediaItemDetailOnCameraComponent implements OnInit { } ngOnInit() { - // TODO: git reset this function - // const goProMediaFile: GoProFile = { - // url: 'http://192.168.0.11:3000/thumbnail.mp4', - // name: 'thumbnail', - // size: 0, - // storageKey: '', - // thumbnailUrl: 'http://192.168.0.11:3000/thumbnail.jpeg', - // }; - // this.mediaFile = goProMediaFile; - // this.mediaType = getFileType(this.mediaFile.url); - this.mediaType = getFileType(this.mediaFile?.url); } From 3dc9cec5acf1d22c8d96d28818831b21715b2efc Mon Sep 17 00:00:00 2001 From: sultanmyrza Date: Mon, 11 Apr 2022 18:54:11 +0800 Subject: [PATCH 11/11] fix(go-pro-media-list-on-camera): remove unused comment --- .../go-pro-media-list-on-camera.component.html | 1 - 1 file changed, 1 deletion(-) diff --git a/src/app/features/settings/go-pro/go-pro-media-list-on-camera/go-pro-media-list-on-camera.component.html b/src/app/features/settings/go-pro/go-pro-media-list-on-camera/go-pro-media-list-on-camera.component.html index 48aeac7d5..03618e7a7 100644 --- a/src/app/features/settings/go-pro/go-pro-media-list-on-camera/go-pro-media-list-on-camera.component.html +++ b/src/app/features/settings/go-pro/go-pro-media-list-on-camera/go-pro-media-list-on-camera.component.html @@ -41,7 +41,6 @@

{{ t('gopro.connectedWiFi') }}: {{ connectedWifiSSID }}

{{ t('gopro.uploadToCapture') }} -

{{ t('gopro.makeSureYouAreConnectedToGoProWiFiFirst') }}