From 345fdffdb8b6b62988258f1e49cf068f1a7b0eb5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Wed, 22 May 2024 14:04:13 +0200
Subject: [PATCH] MOBILE-4470 licenses: Fix url and styles

---
 .../features/settings/pages/licenses/licenses.html     | 10 ++++++----
 src/core/features/settings/pages/licenses/licenses.ts  |  2 +-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/core/features/settings/pages/licenses/licenses.html b/src/core/features/settings/pages/licenses/licenses.html
index 99d366555..7710faa0f 100644
--- a/src/core/features/settings/pages/licenses/licenses.html
+++ b/src/core/features/settings/pages/licenses/licenses.html
@@ -12,7 +12,7 @@
 <ion-content class="limited-width">
     <core-loading [hideUntil]="loaded">
         <ion-searchbar [(ngModel)]="textFilter" (ionInput)="filterChanged($event.target)" (ionCancel)="filterChanged($event.target)"
-            [placeholder]="'core.filter' | translate" class="ion-margin-top" />
+            [placeholder]="'core.filter' | translate" class="ion-margin-vertical" />
         <ion-list>
             <ion-item button *ngIf="error" class="ion-text-wrap" [href]="licensesUrl" core-link auto-login="no" [detail]="false">
                 <ion-label>
@@ -22,13 +22,13 @@
                     {{ 'core.view' | translate }}</ion-button>
             </ion-item>
             <ng-container *ngIf="!error">
-                <ion-item *ngFor="let license of licenses" class="ion-text-wrap">
+                <ion-item *ngFor="let license of licenses" class="ion-text-wrap" lines="inset">
                     <ion-label>
                         <p class="item-heading">
                             <a *ngIf="license.repository" [href]="license.repository" core-link auto-login="no">{{ license.name }}</a>
                             <ng-container *ngIf="!license.repository">{{ license.name }}</ng-container> - {{ license.version }}
                         </p>
-                        <p class="item-heading" *ngIf="license.publisher">
+                        <p *ngIf="license.publisher">
                             {{ 'core.settings.publisher' | translate }}{{ 'core.labelsep' | translate }} {{ license.publisher }}
                         </p>
                         <p>{{ 'core.settings.license' | translate }}{{ 'core.labelsep' | translate }} {{ license.licenses }}</p>
@@ -37,7 +37,9 @@
                                 [showBrowserWarning]="false">{{ license.email }}</a></p>
                     </ion-label>
                     <ion-button *ngIf="license.licenseUrl" [href]="license.licenseUrl" target="_blank" fill="clear" slot="end" core-link
-                        auto-login="no">{{ 'core.view' | translate }}</ion-button>
+                        auto-login="no" [ariaLabel]="'core.view' | translate">
+                        <ion-icon slot="icon-only" name="fas-up-right-from-square" aria-hidden="true" />
+                    </ion-button>
                 </ion-item>
             </ng-container>
         </ion-list>
diff --git a/src/core/features/settings/pages/licenses/licenses.ts b/src/core/features/settings/pages/licenses/licenses.ts
index 2df4cccb5..131ac3c67 100644
--- a/src/core/features/settings/pages/licenses/licenses.ts
+++ b/src/core/features/settings/pages/licenses/licenses.ts
@@ -52,7 +52,7 @@ export class CoreSettingsLicensesPage implements OnInit {
     protected allLicenses: CoreSettingsLicense[] = [];
 
     constructor() {
-        this.appLicenseVersion = CoreConstants.CONFIG.versionname.indexOf('-') > 0
+        this.appLicenseVersion = CoreConstants.BUILD.isDevelopment
             ? 'main'
             : 'v' + CoreConstants.CONFIG.versionname;