Merge pull request #2783 from crazyserver/MOBILE-3320

Mobile 3320

.github/workflows/testing.yml

@@ -23,10 +23,12 @@ jobs:
           exit 1
         fi
         gulp
-        langlength=`jq -r '. | length' src/assets/lang/en.json`
+        langcount=`jq -r '. | length' src/assets/lang/en.json`
-        langindexlength=`jq -r '. | length' scripts/langindex.json`
+        freemiumcount=`jq 'keys' src/assets/lang/en.json | grep "freemium." | wc -l | xargs`
-        if [ $langlength -ne $langindexlength ]; then
+        allcount=$(($langcount - $freemiumcount))
-          echo "Lang file has $langlength while langindex $langindexlength"
+        langindexcount=`jq -r '. | length' scripts/langindex.json`
+        if [ $allcount -ne $langindexcount ]; then
+          echo "Lang file has $langcount ($freemiumcount) while langindex $langindexcount"
           exit 1
         fi
 

config.xml

@@ -39,6 +39,7 @@
     <preference name="SplashScreenDelay" value="15000" />
     <preference name="SplashMaintainAspectRatio" value="true" />
     <preference name="SplashShowOnlyFirstTime" value="false" />
+    <preference name="ShowSplashScreenSpinner" value="false" />
     <preference name="android-minSdkVersion" value="22" />
     <preference name="android-targetSdkVersion" value="30" />
     <preference name="AndroidPersistentFileLocation" value="Compatibility" />

src/core/features/editor/components/rich-text-editor/core-editor-rich-text-editor.html

@@ -1,11 +1,28 @@
 <div class="core-rte-editor-container" (click)="focusRTE()" [class.toolbar-hidden]="toolbarHidden">
-    <div [hidden]="!rteEnabled" #editor contenteditable="true" class="core-rte-editor" button (focus)="showToolbar($event)"
+    <div
-        (longPress)="showToolbar($event)" (blur)="hideToolbar($event)" [attr.data-placeholder-text]="placeholder" role="textbox">
+        [hidden]="!rteEnabled"
+        #editor
+        class="core-rte-editor"
+        role="textbox"
+        contenteditable="true"
+        [attr.data-placeholder-text]="placeholder"
+        (focus)="showToolbar($event)"
+        (blur)="hideToolbar($event)"
+    >
     </div>
 
-    <ion-textarea [hidden]="rteEnabled" #textarea class="core-textarea" [placeholder]="placeholder" [attr.name]="name"
+    <ion-textarea
-        ngControl="control" (ionChange)="onChange()" (focus)="showToolbar($event)" (longPress)="showToolbar($event)"
+        [hidden]="rteEnabled"
-        (blur)="hideToolbar($event)" role="textbox">
+        #textarea
+        class="core-textarea"
+        role="textbox"
+        [attr.name]="name"
+        ngControl="control"
+        [placeholder]="placeholder"
+        (ionChange)="onChange()"
+        (ionFocus)="showToolbar($event)"
+        (ionBlur)="hideToolbar($event)"
+    >
     </ion-textarea>
 
     <div class="core-rte-info-message" *ngIf="infoMessage">

src/core/features/editor/components/rich-text-editor/rich-text-editor.scss

@@ -29,8 +29,9 @@
     .core-rte-editor-container {
         max-height: calc(100% - 46px);
         display: flex;
-        flex-direction: column;
         flex-grow: 1;
+        flex-direction: column;
+        justify-content: space-between;
         &.toolbar-hidden {
             max-height: 100%;
         }
@@ -51,7 +52,7 @@
     .core-rte-editor, .core-textarea {
         padding: 2px;
         margin: 2px;
-        width: 100%;
+        width: calc(100% - 4px);
         resize: none;
         background-color: var(--background);
         color: var(--color);
@@ -59,8 +60,6 @@
     }
 
     .core-rte-editor {
-        flex-grow: 1;
-        flex-shrink: 1;
         -webkit-user-select: auto !important;
         user-select: auto !important;
         word-wrap: break-word;
@@ -86,8 +85,6 @@
     }
 
     .core-textarea {
-        flex-grow: 1;
-        flex-shrink: 1;
         position: relative;
 
         ::ng-deep textarea {
@@ -97,6 +94,7 @@
             overflow-x: hidden;
             overflow-y: auto;
             position: absolute;
+            height: auto;
             top: 0;
             bottom: 0;
         }
@@ -160,7 +158,7 @@
         }
 
         &.toolbar-hidden {
-            visibility: none;
+            visibility: hidden;
             height: 0;
             border: none;
         }