Merge pull request #4400 from crazyserver/MOBILE-4653

Mobile 4653

Author: dpalou

scripts/langindex.json

@@ -2717,9 +2717,9 @@
   "core.viewer.increasetextsize": "local_moodlemobileapp",
   "core.viewer.openreadingmodesettings": "local_moodlemobileapp",
   "core.viewer.readingthemeauto": "local_moodlemobileapp",
-  "core.viewer.readingthemedark": "local_moodlemobileapp/core.settings.colorscheme-dark",
+  "core.viewer.readingthemedark": "local_moodlemobileapp",
   "core.viewer.readingthemehcm": "local_moodlemobileapp",
-  "core.viewer.readingthemelight": "local_moodlemobileapp/core.settings.colorscheme-light",
+  "core.viewer.readingthemelight": "local_moodlemobileapp",
   "core.viewer.readingthemesepia": "local_moodlemobileapp",
   "core.viewer.showmedia": "zoom",
   "core.viewer.theme": "moodle",

src/addons/block/onlineusers/components/onlineusers/onlineusers.scss

@@ -32,8 +32,9 @@
 
                     .userpicture {
                         border-radius: var(--core-avatar-radius);
-                        width: var(--core-avatar-size);
-                        height: var(--core-avatar-size);
+                        width: var(--core-avatar-size) !important;
+                        height: var(--core-avatar-size) !important;
+                        vertical-align: middle;
                     }
 
                     .userinitials {

src/addons/mod/choice/components/index/addon-mod-choice-index.html

@@ -82,9 +82,9 @@ <h2>{{ 'addon.mod_choice.responses' | translate }}</h2>
         }
 
         <core-loading [hideUntil]="!showResultsLoading" [fullscreen]="false">
-            <ion-grid class="ion-no-padding">
+            <ion-grid class="ion-no-padding addon-mod-choice-chart-results">
                 <ion-row>
-                    <ion-col size="12" size-lg="5">
+                    <ion-col size="12" size-lg="6">
                         <ion-item class="ion-text-wrap core-warning-item" *ngIf="hasOffline">
                             <ion-icon slot="start" name="fas-triangle-exclamation" color="warning" aria-hidden="true" />
                             <ion-label>{{ 'addon.mod_choice.resultsnotsynced' | translate }}</ion-label>
@@ -96,7 +96,7 @@ <h2>{{ 'addon.mod_choice.responses' | translate }}</h2>
                             </ion-label>
                         </ion-item>
                     </ion-col>
-                    <ion-col *ngIf="choice.publish && results" size="12" size-lg="7">
+                    <ion-col *ngIf="choice.publish && results" size="12" size-lg="6">
                         <ion-item-group *ngFor="let result of results">
                             <ion-item [button]="result.numberofuser > 0" class="divider ion-text-wrap" (click)="toggle(result)"
                                 [attr.aria-label]="(result.expanded ? 'core.collapse' : 'core.expand') | translate" [detail]="false">

src/addons/mod/choice/components/index/index.scss

@@ -0,0 +1,5 @@
+:host {
+    .addon-mod-choice-chart-results {
+        width: 100%;
+    }
+}

src/addons/mod/choice/components/index/index.ts

@@ -52,6 +52,7 @@ import { CoreGroupInfo, CoreGroups } from '@services/groups';
 @Component({
     selector: 'addon-mod-choice-index',
     templateUrl: 'addon-mod-choice-index.html',
+    styleUrl: 'index.scss',
     standalone: true,
     imports: [
         CoreSharedModule,

src/addons/mod/choice/tests/behat/snapshots/test-basic-usage-of-choice-activity-in-app-answer-a-choice-multi-or-single-update-answer--view-results_15.png

@@ -6,7 +6,7 @@
                 <p class="core-loading-message" role="status">{{message}}</p>
             }
         } @else {
-            <div class="{{placeholderType}} list-item-limited-width placeholder">
+            <div class="{{placeholderType}} placeholder" [class.list-item-limited-width]="placeholderType !== 'free'">
                 @if (placeholderType === 'free') {
                     <ng-content select="[placeholder]" />
                 } @else if (placeholderType === 'listwithicon' || placeholderType === 'listwithavatar') {

src/core/components/loading/core-loading.html

@@ -13,7 +13,7 @@ <h1>{{ user?.fullname }}</h1>
         <ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}" />
     </ion-refresher>
     <core-loading [hideUntil]="userLoaded" placeholderType="free">
-        <ion-list placeholder class="ion-padding">
+        <ion-list placeholder class="ion-padding list-item-limited-width">
             <ion-item>
                 <ion-avatar slot="start" style="width: 80px; height: 80px;">
                     <ion-skeleton-text [animated]="true" />