Merge pull request #1310 from numbersprotocol/develop

Bump version to 0.49.1

.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

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

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 {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "capture-lite",
-  "version": "0.49.0",
+  "version": "0.49.1",
   "author": "numbersprotocol",
   "homepage": "https://numbersprotocol.io/",
   "scripts": {

src/app/features/home/details/details.page.html

@@ -102,7 +102,13 @@
                   {{ caption }}
                 </ion-label>
                 <ng-template #emptyCaption>
-                  <ion-label> No Caption </ion-label>
+                  <ion-label>
+                    {{ 'clickToEditCaption' | transloco }}
+                    <ion-icon
+                      name="pencil-outline"
+                      id="caption-edit-icon"
+                    ></ion-icon>
+                  </ion-label>
                 </ng-template>
               </ion-item>
             </ng-container>

src/app/features/home/details/details.page.scss

@@ -43,4 +43,8 @@
   .text-center {
     text-align: center;
   }
+
+  #caption-edit-icon {
+    transform: translateY(3px);
+  }
 }

src/app/features/home/onboarding/tutorial/tutorial.page.html

@@ -1,53 +1,5 @@
 <ion-content *transloco="let t">
   <ion-slides #slides pager>
-    <ion-slide>
-      <ng-container>
-        <div class="onboarding-container" (click)="slides.slideNext()">
-          <img
-            class="onboarding-text"
-            loading="lazy"
-            src="/assets/images/NewOnboardingDesign_blockchaincamera.svg"
-          />
-          <img
-            class="onboarding-logo"
-            loading="lazy"
-            src="/assets/images/NewOnboardingDesign_LogoCN.svg"
-          />
-        </div>
-      </ng-container>
-    </ion-slide>
-    <ion-slide>
-      <ng-container>
-        <div class="onboarding-container" (click)="slides.slideNext()">
-          <img
-            class="onboarding-text"
-            loading="lazy"
-            src="/assets/images/NewOnboardingDesign_giftphoto.svg"
-          />
-          <img
-            class="onboarding-logo"
-            loading="lazy"
-            src="/assets/images/NewOnboardingDesign_LogoCN.svg"
-          />
-        </div>
-      </ng-container>
-    </ion-slide>
-    <ion-slide>
-      <ng-container>
-        <div class="onboarding-container" (click)="slides.slideNext()">
-          <img
-            class="onboarding-text"
-            loading="lazy"
-            src="/assets/images/NewOnboardingDesign_28Feb.svg"
-          />
-          <img
-            class="onboarding-logo"
-            loading="lazy"
-            src="/assets/images/NewOnboardingDesign_LogoCN.svg"
-          />
-        </div>
-      </ng-container>
-    </ion-slide>
     <ion-slide>
       <ng-container>
         <svg

src/app/features/home/onboarding/tutorial/tutorial.page.scss

@@ -25,24 +25,6 @@ ion-content {
   }
 }
 
-.onboarding-container {
-  display: flex;
-  flex-direction: column;
-  height: 100vh;
-  width: 100vw;
-  background-color: #0000d8;
-}
-
-.onboarding-logo {
-  width: 95%;
-  margin: auto 20;
-  margin-bottom: 20px;
-}
-
-.onboarding-text {
-  flex: 1; // Fill remaining space of the flex-direction (column)
-}
-
 .pagination-bullets {
   bottom: 16px;
 }

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;
   }

src/assets/i18n/en-us.json

@@ -20,6 +20,7 @@
   "cancel": "Cancel",
   "ok": "Ok",
   "emptyInbox": "Empty Inbox",
+  "clickToEditCaption": "Click to Edit Caption",
   "editCaption": "Edit Caption",
   "selectAPublisher": "Select a Publisher",
   "about": "About",

src/assets/i18n/zh-tw.json

@@ -20,6 +20,7 @@
   "cancel": "取消",
   "ok": "確認",
   "emptyInbox": "空收件匣",
+  "clickToEditCaption": "點擊以編輯標題",
   "editCaption": "編輯標題",
   "selectAPublisher": "選擇發佈者",
   "about": "關於",