Skip to content

Commit

Permalink
Merge pull request #1547 from numbersprotocol/develop
Browse files Browse the repository at this point in the history
Bump version to 0.55.0
  • Loading branch information
shc261392 authored Apr 25, 2022
2 parents a6d1928 + d5a8a0e commit c72e737
Show file tree
Hide file tree
Showing 6 changed files with 36 additions and 22 deletions.
10 changes: 10 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,16 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## 0.55.0 - 2022-04-22

### Added

- Add custom camera ux

### Changed

- Show buy NUM button at wallets page

## 0.54.2 - 2022-04-21

### Changed
Expand Down
4 changes: 2 additions & 2 deletions android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ android {
applicationId "io.numbersprotocol.capturelite"
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 372
versionName "0.54.2"
versionCode 380
versionName "0.55.0"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}
buildFeatures {
Expand Down
8 changes: 4 additions & 4 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "capture-lite",
"version": "0.54.2",
"version": "0.55.0",
"author": "numbersprotocol",
"homepage": "https://numbersprotocol.io/",
"scripts": {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Component, OnDestroy, OnInit } from '@angular/core';
import { ActivatedRoute, Router } from '@angular/router';
import { NavController } from '@ionic/angular';
import { NavController, Platform } from '@ionic/angular';
import { PreviewVideo } from '@numbersprotocol/preview-video';
import { GoProFile } from '../go-pro-media-file';

Expand All @@ -19,7 +19,8 @@ export class GoProMediaViewerWithNativePlayerComponent
constructor(
private readonly route: ActivatedRoute,
private readonly router: Router,
private readonly navController: NavController
private readonly navController: NavController,
private readonly platform: Platform
) {
this.route.queryParams.subscribe(_ => {
const state = this.router.getCurrentNavigation()?.extras.state;
Expand All @@ -31,22 +32,26 @@ export class GoProMediaViewerWithNativePlayerComponent

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();
});
if (this.platform.is('hybrid')) {
PreviewVideo.playFullScreenFromRemote({ url: this.mediaFile.url });
this.onIOSPlayerDismissedListener = PreviewVideo.addListener(
'iosPlayerDismissed',
(_info: any) => this.navController.back()
);
}
}

ngOnDestroy(): void {
PreviewVideo.stopFullScreen();
// TODO: check if .remove() really get called
this.onIOSPlayerDismissedListener?.remove();
if (this.platform.is('hybrid')) {
PreviewVideo.stopFullScreen();
this.onIOSPlayerDismissedListener?.remove();
}
}

dismiss() {
PreviewVideo.stopFullScreen();
if (this.platform.is('hybrid')) {
PreviewVideo.stopFullScreen();
}
this.navController.back();
}
}
5 changes: 2 additions & 3 deletions src/app/features/wallets/wallets.page.html
Original file line number Diff line number Diff line change
Expand Up @@ -49,14 +49,13 @@ <h3 class="num-text">NUM</h3>
>
</ion-row>
<ion-row id="buy-deposit-withdraw-row">
<!-- TODO: uncomment buy button when purchase operations are fixed -->
<!-- <ion-button
<ion-button
(click)="onBuyNumBtnClicked()"
id="buy-num-btn"
size="small"
class="num-operation-btn"
>{{ t('buy') }} NUM</ion-button
> -->
>
<ion-button
class="deposit-withdraw-num-btn num-operation-btn"
color="#7E7E7E"
Expand Down

0 comments on commit c72e737

Please sign in to comment.