From 2c97b946250ec58dbc3481889a7d79cc7d8bc15a Mon Sep 17 00:00:00 2001 From: Ray Hung Date: Tue, 22 Feb 2022 17:06:55 +0800 Subject: [PATCH 1/6] feat(sending-post-capture.page.ts): have message default to asset caption when send --- .../home/sending-post-capture/sending-post-capture.page.ts | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/app/features/home/sending-post-capture/sending-post-capture.page.ts b/src/app/features/home/sending-post-capture/sending-post-capture.page.ts index 58fc09e72..57fbf21d6 100644 --- a/src/app/features/home/sending-post-capture/sending-post-capture.page.ts +++ b/src/app/features/home/sending-post-capture/sending-post-capture.page.ts @@ -140,6 +140,12 @@ export class SendingPostCapturePage { private readonly navController: NavController ) {} + ionViewWillEnter() { + this.asset$.pipe(untilDestroyed(this)).subscribe(asset => { + this.message = asset.caption; + }); + } + preview() { this.isPreview = true; } From 71d46c738b4562b4654b11617115d7673624c658 Mon Sep 17 00:00:00 2001 From: Ray Hung Date: Tue, 22 Feb 2022 16:28:33 +0800 Subject: [PATCH 2/6] feat(src/app/features/home/details): display edit icon when no caption --- src/app/features/home/details/details.page.html | 8 +++++++- src/app/features/home/details/details.page.scss | 4 ++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/src/app/features/home/details/details.page.html b/src/app/features/home/details/details.page.html index 8199ee3e1..f100c1da0 100644 --- a/src/app/features/home/details/details.page.html +++ b/src/app/features/home/details/details.page.html @@ -102,7 +102,13 @@ {{ caption }} - No Caption + + No Caption + + diff --git a/src/app/features/home/details/details.page.scss b/src/app/features/home/details/details.page.scss index 341bb8475..3253a0cd1 100644 --- a/src/app/features/home/details/details.page.scss +++ b/src/app/features/home/details/details.page.scss @@ -43,4 +43,8 @@ .text-center { text-align: center; } + + #caption-edit-icon { + transform: translateY(3px); + } } From 12bc161c3b0f75843103ef5edaa349790cfe9729 Mon Sep 17 00:00:00 2001 From: Ray Date: Thu, 24 Feb 2022 09:48:33 -0500 Subject: [PATCH 3/6] Revert "New onboarding design" --- .../onboarding/tutorial/tutorial.page.html | 48 ------------------- .../onboarding/tutorial/tutorial.page.scss | 18 ------- .../images/NewOnboardingDesign_28Feb.svg | 36 -------------- .../images/NewOnboardingDesign_LogoCN.svg | 36 -------------- .../NewOnboardingDesign_blockchaincamera.svg | 47 ------------------ .../images/NewOnboardingDesign_giftphoto.svg | 48 ------------------- 6 files changed, 233 deletions(-) delete mode 100644 src/assets/images/NewOnboardingDesign_28Feb.svg delete mode 100644 src/assets/images/NewOnboardingDesign_LogoCN.svg delete mode 100644 src/assets/images/NewOnboardingDesign_blockchaincamera.svg delete mode 100644 src/assets/images/NewOnboardingDesign_giftphoto.svg diff --git a/src/app/features/home/onboarding/tutorial/tutorial.page.html b/src/app/features/home/onboarding/tutorial/tutorial.page.html index d67ee849f..a734abb2a 100644 --- a/src/app/features/home/onboarding/tutorial/tutorial.page.html +++ b/src/app/features/home/onboarding/tutorial/tutorial.page.html @@ -1,53 +1,5 @@ - - -
- - -
- - - - -
- - -
- - - - -
- - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/assets/images/NewOnboardingDesign_LogoCN.svg b/src/assets/images/NewOnboardingDesign_LogoCN.svg deleted file mode 100644 index f3fc65d99..000000000 --- a/src/assets/images/NewOnboardingDesign_LogoCN.svg +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/assets/images/NewOnboardingDesign_blockchaincamera.svg b/src/assets/images/NewOnboardingDesign_blockchaincamera.svg deleted file mode 100644 index 66584bfb9..000000000 --- a/src/assets/images/NewOnboardingDesign_blockchaincamera.svg +++ /dev/null @@ -1,47 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/assets/images/NewOnboardingDesign_giftphoto.svg b/src/assets/images/NewOnboardingDesign_giftphoto.svg deleted file mode 100644 index 15d377f8d..000000000 --- a/src/assets/images/NewOnboardingDesign_giftphoto.svg +++ /dev/null @@ -1,48 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - From 4caea332dec996d4fd9a42b43c37268204ff6898 Mon Sep 17 00:00:00 2001 From: waffle Date: Fri, 25 Feb 2022 14:12:53 +0800 Subject: [PATCH 4/6] fix(build.yml): fix wrong if expression --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 745a1b49b..b558f93fd 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -149,7 +149,7 @@ jobs: notification-failure: runs-on: ubuntu-latest needs: test - if: ${{ failure() }} && github.actor != 'dependabot[bot]' + if: ${{ failure() && github.actor != 'dependabot[bot]'}} steps: - uses: actions/checkout@v2 From 84b3321d6dd67eeca0eadcb89a87b6a3bd1739ad Mon Sep 17 00:00:00 2001 From: Ray Hung Date: Fri, 25 Feb 2022 09:40:49 +0800 Subject: [PATCH 5/6] feat: replace 'No Caption' with 'Click to Edit Caption' on Capture details page --- src/app/features/home/details/details.page.html | 2 +- src/assets/i18n/en-us.json | 1 + src/assets/i18n/zh-tw.json | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/app/features/home/details/details.page.html b/src/app/features/home/details/details.page.html index f100c1da0..08770970f 100644 --- a/src/app/features/home/details/details.page.html +++ b/src/app/features/home/details/details.page.html @@ -103,7 +103,7 @@ - No Caption + {{ 'clickToEditCaption' | transloco }} Date: Fri, 25 Feb 2022 16:32:50 +0800 Subject: [PATCH 6/6] build: bump version to 0.49.1 --- CHANGELOG.md | 12 ++++++++++++ android/app/build.gradle | 4 ++-- package-lock.json | 4 ++-- package.json | 2 +- 4 files changed, 17 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 56e394289..9716002d8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,18 @@ 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.49.1 - 2022-02-25 + +### Added + +- Have message default to asset caption when send +- Update edit asset caption help text +- Display edit icon when no caption + +### Fixed + +- Removed the new introductory UI/UX for new users + ## 0.49.0 - 2022-02-21 ### Added diff --git a/android/app/build.gradle b/android/app/build.gradle index bc2b94f4e..122a83782 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -6,8 +6,8 @@ android { applicationId "io.numbersprotocol.capturelite" minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion - versionCode 320 - versionName "0.49.0" + versionCode 321 + versionName "0.49.1" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } buildTypes { diff --git a/package-lock.json b/package-lock.json index b6cabfee8..fee70339b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,11 +1,11 @@ { "name": "capture-lite", - "version": "0.49.0", + "version": "0.49.1", "lockfileVersion": 2, "requires": true, "packages": { "": { - "version": "0.49.0", + "version": "0.49.1", "dependencies": { "@angular/animations": "^12.2.4", "@angular/cdk": "^12.2.4", diff --git a/package.json b/package.json index 3df1365bf..42a888351 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "capture-lite", - "version": "0.49.0", + "version": "0.49.1", "author": "numbersprotocol", "homepage": "https://numbersprotocol.io/", "scripts": {