From e76f0d6cc0bf3931c73ea209804eb332683f3643 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Fri, 2 Oct 2020 16:08:22 +0200
Subject: [PATCH 1/2] MOBILE-3523 login: Fix and simplify login style
 personalization

---
 src/core/login/login.scss                     | 33 ++++++++++++++++---
 .../login/pages/credentials/credentials.html  |  2 +-
 src/core/login/pages/reconnect/reconnect.html |  2 +-
 src/core/login/pages/reconnect/reconnect.scss | 25 +++++---------
 src/core/login/pages/site/site.html           |  4 +--
 src/core/login/pages/site/site.scss           | 20 ++++++++++-
 6 files changed, 60 insertions(+), 26 deletions(-)

diff --git a/src/core/login/login.scss b/src/core/login/login.scss
index 8206b3750..a91ae89c3 100644
--- a/src/core/login/login.scss
+++ b/src/core/login/login.scss
@@ -2,16 +2,16 @@ $core-login-page-background-color: $white !default;
 $core-login-page-text-color: $text-color !default;
 $core-login-button-outline: false !default;
 $core-login-loading-color: false !default;
-$core-login-item-inner-background-color: $white !default;
-$core-login-item-background-color: $white !default;
+$core-login-input-item-background-color: $core-login-page-background-color !default;
+$core-login-input-item-text-color: $core-login-page-text-color !default;
 
 // Dark.
 $core-dark-login-page-background-color: $black !default;
 $core-dark-login-page-text-color: $core-dark-text-color !default;
-$core-dark-login-item-inner-background-color: $core-dark-login-page-background-color !default;
-$core-dark-login-item-background-color: $core-dark-login-page-background-color !default;
 $core-dark-login-button-outline: $core-login-button-outline !default;
 $core-dark-login-loading-color: $core-dark-text-color !default;
+$core-dark-input-login-item-background-color: $core-dark-login-page-background-color !default;
+$core-dark-input-login-item-text-color: $core-dark-login-page-text-color !default;
 
 ion-app.app-root page-core-login-credentials,
 ion-app.app-root page-core-login-reconnect,
@@ -26,6 +26,13 @@ ion-app.app-root page-core-login-site {
         }
     }
 
+    .item p, .item h2, .item h3, .list .item.core-oauth-icon .label, .text-input {
+        color: $core-login-page-text-color;
+        @include darkmode() {
+            color: $core-dark-login-page-text-color;
+        }
+    }
+
     img {
         max-width: 100%;
     }
@@ -78,6 +85,22 @@ ion-app.app-root page-core-login-site {
         margin-bottom: 20px;
     }
 
+
+    .core-login-form .item,
+    .core-login-form .item-inner {
+        background-color: $core-login-input-item-background-color;
+        @include darkmode() {
+            background-color: $core-dark-input-login-item-background-color;
+        }
+
+        p, input {
+            color: $core-login-input-item-text-color;
+            @include darkmode() {
+                color: $core-dark-input-login-item-text-color;
+            }
+        }
+    }
+
     ion-list.core-login-forgotten-password {
         margin-top: 0;
         margin-bottom: 0;
@@ -89,6 +112,8 @@ ion-app.app-root page-core-login-site {
             @include darkmode() {
                 background: transparent;
             }
+
+            color: $core-login-page-text-color;
         }
     }
 
diff --git a/src/core/login/pages/credentials/credentials.html b/src/core/login/pages/credentials/credentials.html
index 690b3d93b..1d501a496 100644
--- a/src/core/login/pages/credentials/credentials.html
+++ b/src/core/login/pages/credentials/credentials.html
@@ -47,7 +47,7 @@
         </form>
 
         <!-- Forgotten password button. -->
-        <ion-list no-lines *ngIf="showForgottenPassword" class="core-login-forgotten-password">
+        <ion-list no-lines *ngIf="showForgottenPassword" class="core-login-forgotten-password core-login-link">
             <a ion-item text-center text-wrap (click)="forgottenPassword()" detail-none>
                 {{ 'core.login.forgotten' | translate }}
             </a>
diff --git a/src/core/login/pages/reconnect/reconnect.html b/src/core/login/pages/reconnect/reconnect.html
index afd1a75da..ae910ff77 100644
--- a/src/core/login/pages/reconnect/reconnect.html
+++ b/src/core/login/pages/reconnect/reconnect.html
@@ -47,7 +47,7 @@
     </form>
 
     <!-- Forgotten password button. -->
-    <ion-list no-lines *ngIf="showForgottenPassword && !isOAuth" class="core-login-forgotten-password">
+    <ion-list no-lines *ngIf="showForgottenPassword && !isOAuth" class="core-login-forgotten-password core-login-link">
         <a ion-item text-center text-wrap (click)="forgottenPassword()" detail-none>
             {{ 'core.login.forgotten' | translate }}
         </a>
diff --git a/src/core/login/pages/reconnect/reconnect.scss b/src/core/login/pages/reconnect/reconnect.scss
index f6012b95b..5292dda4f 100644
--- a/src/core/login/pages/reconnect/reconnect.scss
+++ b/src/core/login/pages/reconnect/reconnect.scss
@@ -1,20 +1,7 @@
+$core-login-reconnect-warning: $red !default;
+$core-dark-login-reconnect-warning: mix($red, white, 20%) !default;
+
 ion-app.app-root page-core-login-reconnect {
-    .box {
-        .core-login-form .item {
-            background-color: $core-login-item-background-color;
-            @include darkmode() {
-                background-color: $core-dark-login-item-background-color;
-            }
-        }
-
-        .core-login-form .item-inner {
-            background-color: $core-login-item-inner-background-color;
-            @include darkmode() {
-                background-color: $core-dark-login-item-inner-background-color;
-            }
-        }
-    }
-
     form .core-username.item p {
         @include padding-horizontal(8px);
         font-size: 16px;
@@ -31,6 +18,10 @@ ion-app.app-root page-core-login-reconnect {
     }
 
     .core-login-reconnect-warning {
-        color: $red;
+        color: $core-login-reconnect-warning;
+
+        @include darkmode() {
+            background-color: $core-dark-login-reconnect-warning;
+        }
     }
 }
diff --git a/src/core/login/pages/site/site.html b/src/core/login/pages/site/site.html
index 54203d58e..41ae86fc5 100644
--- a/src/core/login/pages/site/site.html
+++ b/src/core/login/pages/site/site.html
@@ -94,8 +94,8 @@
         </ng-container>
 
         <!-- Help. -->
-        <ion-list no-lines margin-top>
-            <a ion-item text-center text-wrap class="core-login-need-help" (click)="showHelp()" detail-none>
+        <ion-list no-lines margin-top class="core-login-need-help core-login-link">
+            <a ion-item text-center text-wrap (click)="showHelp()" detail-none>
                 {{ 'core.needhelp' | translate }}
             </a>
         </ion-list>
diff --git a/src/core/login/pages/site/site.scss b/src/core/login/pages/site/site.scss
index bde235732..adf46e97a 100644
--- a/src/core/login/pages/site/site.scss
+++ b/src/core/login/pages/site/site.scss
@@ -12,7 +12,8 @@ ion-app.app-root page-core-login-site {
     }
 
     .item.item-block {
-        &.core-login-need-help.item {
+        &.core-login-need-help .item {
+            color: $core-login-page-text-color;
             text-decoration: underline;
         }
         &.core-login-site-qrcode {
@@ -97,6 +98,19 @@ ion-app.app-root page-core-login-site {
         text-align: center;
     }
 
+    .core-login-site-list-loading,
+    .core-login-site-nolist-loading {
+        .spinner circle, .spinner line {
+            stroke: $core-login-loading-color;
+        }
+
+        @include darkmode() {
+            .spinner circle, .spinner line {
+                stroke: $core-dark-login-loading-color;
+            }
+        }
+    }
+
     .item.core-login-site-list-title {
         ion-label, ion-label h2.item-heading {
             margin-top: 0;
@@ -123,6 +137,10 @@ ion-app.app-root page-core-login-site {
         ion-thumbnail {
             box-shadow: 0 0 4px #ddd;
         }
+        color: $core-login-page-text-color;
+        @include darkmode() {
+            color: $core-dark-login-page-text-color;
+        }
     }
 
 

From f5d11a0e6d6aa1c1e1c136efac122053e2990d31 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Mon, 19 Oct 2020 11:19:28 +0200
Subject: [PATCH 2/2] MOBILE-3523 database: Fix database invalidate after
 autosync

---
 src/addon/mod/data/providers/sync.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/addon/mod/data/providers/sync.ts b/src/addon/mod/data/providers/sync.ts
index dbc3792dd..72995f623 100644
--- a/src/addon/mod/data/providers/sync.ts
+++ b/src/addon/mod/data/providers/sync.ts
@@ -208,7 +208,7 @@ export class AddonModDataSyncProvider extends CoreSyncBaseProvider {
             }).then(() => {
                 if (result.updated) {
                     // Data has been sent to server. Now invalidate the WS calls.
-                    return this.dataProvider.invalidateContent(data.cmid, courseId, siteId).catch(() => {
+                    return this.dataProvider.invalidateContent(data.coursemodule, courseId, siteId).catch(() => {
                         // Ignore errors.
                     });
                 }