Skip to content

Commit

Permalink
Merge pull request #3221 from numbersprotocol/v240220-capture-cam-ion…
Browse files Browse the repository at this point in the history
…ic-launch

v240220 capture cam ionic launch
  • Loading branch information
shc261392 authored Feb 22, 2024
2 parents e46d20e + f168e5a commit b32471d
Show file tree
Hide file tree
Showing 18 changed files with 108 additions and 139 deletions.
5 changes: 4 additions & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
name: test

on: [push, pull_request]
on:
push:
branches:
[master, 'feature-*', 'feat-*', 'fix-*', 'hotfix-*', 'milestone-*']

jobs:
lint:
Expand Down
14 changes: 13 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,17 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

## [0.89.2] - 2024-02-21

### Added

1. Feature track new app users shutter click (#3215)
1. Feature Disable upload feature on Capture Cam (#3216)

### Fixed

1. Hotfix test ci prevent actions run twice (#2989)

## [0.88.8] - 2024-01-31

### Changed
Expand Down Expand Up @@ -2246,7 +2257,8 @@ This is the first release! _Capture Lite_ is a cross-platform app adapted from [
- Web - see the demo [here](https://github.com/numbersprotocol/capture-lite#demo-app)
- Android - the APK file `app-debug.apk` is attached to this release

[unreleased]: https://github.com/numbersprotocol/capture-lite/compare/0.88.8...HEAD
[unreleased]: https://github.com/numbersprotocol/capture-lite/compare/0.89.2...HEAD
[0.89.2]: https://github.com/numbersprotocol/capture-lite/compare/0.88.8...0.89.2
[0.88.8]: https://github.com/numbersprotocol/capture-lite/compare/0.88.6...0.88.8
[0.88.6]: https://github.com/numbersprotocol/capture-lite/compare/0.87.1...0.88.6
[0.87.1]: https://github.com/numbersprotocol/capture-lite/compare/0.87.0...0.87.1
Expand Down
4 changes: 2 additions & 2 deletions android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ android {
applicationId "io.numbersprotocol.capturelite"
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 891
versionName "0.89.1"
versionCode 892
versionName "0.89.2"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}
buildFeatures {
Expand Down
1 change: 0 additions & 1 deletion android/app/capacitor.build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ dependencies {
implementation project(':capacitor-share')
implementation project(':capacitor-splash-screen')
implementation project(':capacitor-storage')
implementation project(':capawesome-capacitor-file-picker')
implementation project(':numbersprotocol-preview-camera')
implementation project(':numbersprotocol-preview-memory')
implementation project(':numbersprotocol-preview-video')
Expand Down
4 changes: 0 additions & 4 deletions android/app/src/main/assets/capacitor.plugins.json
Original file line number Diff line number Diff line change
Expand Up @@ -67,10 +67,6 @@
"pkg": "@capacitor/storage",
"classpath": "com.capacitorjs.plugins.storage.StoragePlugin"
},
{
"pkg": "@capawesome/capacitor-file-picker",
"classpath": "io.capawesome.capacitorjs.plugins.filepicker.FilePickerPlugin"
},
{
"pkg": "@numbersprotocol/preview-camera",
"classpath": "io.numbersprotocol.capturelite.plugins.previewcamera.PreviewCameraPlugin"
Expand Down
3 changes: 0 additions & 3 deletions android/capacitor.settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,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 ':capawesome-capacitor-file-picker'
project(':capawesome-capacitor-file-picker').projectDir = new File('../node_modules/@capawesome/capacitor-file-picker/android')

include ':numbersprotocol-preview-camera'
project(':numbersprotocol-preview-camera').projectDir = new File('../node_modules/@numbersprotocol/preview-camera/android')

Expand Down
8 changes: 4 additions & 4 deletions ios/App/App.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -368,13 +368,13 @@
CODE_SIGN_ENTITLEMENTS = App/App.entitlements;
CODE_SIGN_IDENTITY = "iPhone Distribution";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 891;
CURRENT_PROJECT_VERSION = 892;
DEVELOPMENT_TEAM = G7NB5YCKAP;
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = G7NB5YCKAP;
INFOPLIST_FILE = App/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 15.6;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
MARKETING_VERSION = 0.89.1;
MARKETING_VERSION = 0.89.2;
OTHER_SWIFT_FLAGS = "$(inherited) \"-D\" \"COCOAPODS\" \"-DDEBUG\"";
PRODUCT_BUNDLE_IDENTIFIER = io.numbersprotocol.capturelite;
PRODUCT_NAME = "$(TARGET_NAME)";
Expand All @@ -395,13 +395,13 @@
CODE_SIGN_ENTITLEMENTS = App/App.entitlements;
CODE_SIGN_IDENTITY = "iPhone Distribution";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 891;
CURRENT_PROJECT_VERSION = 892;
DEVELOPMENT_TEAM = G7NB5YCKAP;
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = G7NB5YCKAP;
INFOPLIST_FILE = App/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 15.6;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
MARKETING_VERSION = 0.89.1;
MARKETING_VERSION = 0.89.2;
PRODUCT_BUNDLE_IDENTIFIER = io.numbersprotocol.capturelite;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = NumbersAppDistributionV4;
Expand Down
1 change: 0 additions & 1 deletion ios/App/Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,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 'CapawesomeCapacitorFilePicker', :path => '../../node_modules/@capawesome/capacitor-file-picker'
pod 'NumbersprotocolPreviewCamera', :path => '../../node_modules/@numbersprotocol/preview-camera'
pod 'NumbersprotocolPreviewMemory', :path => '../../node_modules/@numbersprotocol/preview-memory'
pod 'NumbersprotocolPreviewVideo', :path => '../../node_modules/@numbersprotocol/preview-video'
Expand Down
8 changes: 1 addition & 7 deletions ios/App/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,6 @@ PODS:
- Capacitor
- CapacitorStorage (1.2.4):
- Capacitor
- CapawesomeCapacitorFilePicker (0.6.3):
- Capacitor
- CordovaPlugins (5.0.5):
- CapacitorCordova
- Firebase/CoreOnly (10.14.0):
Expand Down Expand Up @@ -134,7 +132,6 @@ DEPENDENCIES:
- "CapacitorShare (from `../../node_modules/@capacitor/share`)"
- "CapacitorSplashScreen (from `../../node_modules/@capacitor/splash-screen`)"
- "CapacitorStorage (from `../../node_modules/@capacitor/storage`)"
- "CapawesomeCapacitorFilePicker (from `../../node_modules/@capawesome/capacitor-file-picker`)"
- CordovaPlugins (from `../capacitor-cordova-ios-plugins`)
- Firebase/Messaging
- FirebaseCore
Expand Down Expand Up @@ -201,8 +198,6 @@ EXTERNAL SOURCES:
:path: "../../node_modules/@capacitor/splash-screen"
CapacitorStorage:
:path: "../../node_modules/@capacitor/storage"
CapawesomeCapacitorFilePicker:
:path: "../../node_modules/@capawesome/capacitor-file-picker"
CordovaPlugins:
:path: "../capacitor-cordova-ios-plugins"
NumbersprotocolPreviewCamera:
Expand Down Expand Up @@ -236,7 +231,6 @@ SPEC CHECKSUMS:
CapacitorShare: 427bba238a1e3f116b2b349019aec6ea7f42cebd
CapacitorSplashScreen: 93a389d4f7673c08214ae25bb6f21d867d5305c5
CapacitorStorage: 8ec2cf8fec179d829288b16c6fba6c3c43d2bdc9
CapawesomeCapacitorFilePicker: f354c9ec6e4722908876032939a85ffb94642630
CordovaPlugins: c905b3b4dfc87d2a11bdbdaf396289c4a22c39dd
Firebase: 6c1bf3f534bc422d52af2e41fe0d50bf08b6b773
FirebaseCore: 6fc17ac9f03509d51c131298aacb3ee5698b4f02
Expand All @@ -252,6 +246,6 @@ SPEC CHECKSUMS:
NumbersprotocolPreviewVideo: 2cfa3fa666c83850903a220d74dc855ac5b6a520
PromisesObjC: c50d2056b5253dadbd6c2bea79b0674bd5a52fa4

PODFILE CHECKSUM: 24ca1bcaa3932b2d964431fb23583535c4454ed9
PODFILE CHECKSUM: bc27c544feb7d8f533aeb72cadce60b633a90ab4

COCOAPODS: 1.14.3
28 changes: 2 additions & 26 deletions package-lock.json

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

3 changes: 1 addition & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "capture-lite",
"version": "0.89.1",
"version": "0.89.2",
"author": "numbersprotocol",
"homepage": "https://numbersprotocol.io/",
"scripts": {
Expand Down Expand Up @@ -50,7 +50,6 @@
"@capacitor/share": "^5.0.4",
"@capacitor/splash-screen": "^5.0.4",
"@capacitor/storage": "^1.2.4",
"@capawesome/capacitor-file-picker": "^0.6.3",
"@ionic/angular": "^6.2.5",
"@ionic/core": "^6.2.5",
"@ionic/pwa-elements": "^3.0.2",
Expand Down
4 changes: 3 additions & 1 deletion src/app/features/home/custom-camera/custom-camera.page.html
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,9 @@
</div>
</div>
<div class="footer-camera-buttons">
<mat-icon (click)="pickMedia()"> imagesmode </mat-icon>
<mat-icon (click)="redirectToCaptureDashboard()">
imagesmode
</mat-icon>

<circle-progress
(click)="onPress()"
Expand Down
Loading

0 comments on commit b32471d

Please sign in to comment.