From ef5bcbee861779550cab2b12b67a21f42fc896fd Mon Sep 17 00:00:00 2001
From: Alfonso Salces <alfonso.salces@moodle.com>
Date: Mon, 5 Dec 2022 13:51:16 +0100
Subject: [PATCH 1/2] MOBILE-4081 reconnect: Order login-methods and qrlogin in
 the template

---
 .../login-methods/login-methods.html          |  7 +++----
 .../login-methods/login-methods.scss          | 12 ------------
 .../components/login-methods/login-methods.ts |  2 +-
 .../login/pages/reconnect/reconnect.html      | 19 +++++++++++--------
 4 files changed, 15 insertions(+), 25 deletions(-)
 delete mode 100644 src/core/features/login/components/login-methods/login-methods.scss

diff --git a/src/core/features/login/components/login-methods/login-methods.html b/src/core/features/login/components/login-methods/login-methods.html
index bccba83e1..1e6323288 100644
--- a/src/core/features/login/components/login-methods/login-methods.html
+++ b/src/core/features/login/components/login-methods/login-methods.html
@@ -1,8 +1,7 @@
-<core-spacer *ngIf="loginMethods?.length" class="core-login-methods__spacer"></core-spacer>
-<ion-list *ngIf="loginMethods?.length" class="ion-padding-top core-login-methods">
-    <ion-button [fill]="'clear'" class="ion-text-wrap" *ngFor="let method of loginMethods" (click)="method.action()"
+<ng-container *ngIf="loginMethods?.length">
+    <ion-button [fill]="'outline'" class="ion-text-wrap ion-margin" *ngFor="let method of loginMethods" (click)="method.action()"
         [attr.aria-label]="method.name" expand="block">
         <ion-icon *ngIf="method.icon" [name]="method.icon" slot="start"></ion-icon>
         <ion-label>{{ method.name }}</ion-label>
     </ion-button>
-</ion-list>
+</ng-container>
diff --git a/src/core/features/login/components/login-methods/login-methods.scss b/src/core/features/login/components/login-methods/login-methods.scss
deleted file mode 100644
index e417fd95f..000000000
--- a/src/core/features/login/components/login-methods/login-methods.scss
+++ /dev/null
@@ -1,12 +0,0 @@
-@import "~theme/globals";
-
-ion-item-divider {
-    --item-divider-border-width: 4px;
-    margin: 0 1em;
-}
-.core-login-methods {
-    margin: .5em 0;
-    &__spacer {
-        margin: .5em 1em;
-    }
-}
diff --git a/src/core/features/login/components/login-methods/login-methods.ts b/src/core/features/login/components/login-methods/login-methods.ts
index 08c85a47c..8e0654889 100644
--- a/src/core/features/login/components/login-methods/login-methods.ts
+++ b/src/core/features/login/components/login-methods/login-methods.ts
@@ -17,7 +17,7 @@ import { CoreLoginHelper, CoreLoginMethod } from '@features/login/services/login
 @Component({
     selector: 'core-login-methods',
     templateUrl: 'login-methods.html',
-    styleUrls: ['../../login.scss', 'login-methods.scss'],
+    styleUrls: ['../../login.scss'],
 })
 export class CoreLoginMethodsComponent implements OnInit {
 
diff --git a/src/core/features/login/pages/reconnect/reconnect.html b/src/core/features/login/pages/reconnect/reconnect.html
index 94d6a452c..c17164481 100644
--- a/src/core/features/login/pages/reconnect/reconnect.html
+++ b/src/core/features/login/pages/reconnect/reconnect.html
@@ -78,8 +78,18 @@
                     {{ 'core.login.loginbutton' | translate }}
                 </ion-button>
 
+                <!-- Forgotten password option. -->
+                <ion-button *ngIf="showForgottenPassword && !isOAuth" expand="block" fill="clear"
+                    class="core-login-forgotten-password core-button-as-link ion-text-wrap" (click)="forgottenPassword()">
+                    {{ 'core.login.forgotten' | translate }}
+                </ion-button>
+
+                <div class="ion-text-center ion-padding core-login-site-qrcode-separator">{{ 'core.login.or' | translate }}</div>
+
+                <!-- Login methods -->
+                <core-login-methods></core-login-methods>
+
                 <ng-container *ngIf="showScanQR && !isBrowserSSO">
-                    <div class="ion-text-center ion-padding core-login-site-qrcode-separator">{{ 'core.login.or' | translate }}</div>
                     <ion-button expand="block" fill="outline" class="ion-margin core-login-site-qrcode"
                         (click)="showInstructionsAndScanQR()">
                         <ion-icon slot="start" name="fas-qrcode" aria-hidden="true"></ion-icon>
@@ -88,14 +98,7 @@
                 </ng-container>
             </form>
 
-            <!-- Forgotten password option. -->
-            <ion-button *ngIf="showForgottenPassword && !isOAuth" expand="block" fill="clear"
-                class="core-login-forgotten-password core-button-as-link ion-text-wrap" (click)="forgottenPassword()">
-                {{ 'core.login.forgotten' | translate }}
-            </ion-button>
 
-            <!-- Login methods -->
-            <core-login-methods></core-login-methods>
 
             <!-- Identity providers. -->
             <ion-list *ngIf="identityProviders?.length" class="ion-padding-top core-login-identity-providers">

From 5c8a414e79c50630eb7760bbd0b955e3be6afd75 Mon Sep 17 00:00:00 2001
From: Alfonso Salces <alfonso.salces@moodle.com>
Date: Mon, 5 Dec 2022 13:52:06 +0100
Subject: [PATCH 2/2] MOBILE-4081 delegate: Make public updateHandlers method

---
 src/core/classes/delegate.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/core/classes/delegate.ts b/src/core/classes/delegate.ts
index 7d34c7450..7ae1fe819 100644
--- a/src/core/classes/delegate.ts
+++ b/src/core/classes/delegate.ts
@@ -306,7 +306,7 @@ export class CoreDelegate<HandlerType extends CoreDelegateHandler> {
      *
      * @return Resolved when done.
      */
-    protected async updateHandlers(): Promise<void> {
+    async updateHandlers(): Promise<void> {
         const promises: Promise<void>[] = [];
         const now = Date.now();