Первая загрузка

config.xml

@@ -1,8 +1,9 @@
 <?xml version='1.0' encoding='utf-8'?>
-<widget android-versionCode="50000" id="com.moodle.moodlemobile" ios-CFBundleVersion="5.0.0.0" version="5.0.0" versionCode="50000" xmlns="http://www.w3.org/ns/widgets" xmlns:android="http://schemas.android.com/apk/res/android" xmlns:cdv="http://cordova.apache.org/ns/1.0">
+<widget android-packageName="com.vmeda.online" android-versionCode="50000" id="com.vmeda.online" ios-CFBundleVersion="5.0.0.0" version="5.0.0" versionCode="50000" xmlns="http://www.w3.org/ns/widgets" xmlns:android="http://schemas.android.com/apk/res/android" xmlns:cdv="http://cordova.apache.org/ns/1.0">
-    <name>Moodle</name>
+    <name>ВМедА Онлайн</name>
-    <description>Moodle official app</description>
+    <description>ВМедА Онлайн</description>
-    <author email="mobile@moodle.com" href="http://moodle.com">Moodle Mobile team</author>
+    <icon src="resources/android/icon/logo.png" />
+    <author email="mobile@vmeda.org" href="https://online.vmeda.org">Военная Медицинская Академия им. Кирова</author>
     <content src="index.html" />
     <access origin="*" />
     <access launch-external="yes" origin="tel:*" />
@@ -62,10 +63,6 @@
         <preference name="AndroidWindowSplashScreenBackground" value="#FFFFFF" />
         <preference name="AndroidWindowSplashScreenIconBackgroundColor" value="#FFFFFF" />
         <resource-file src="google-services.json" target="app/google-services.json" />
-        <resource-file src="resources/android/icon/drawable-ldpi-smallicon.png" target="app/src/main/res/mipmap-ldpi/smallicon.png" />
-        <resource-file src="resources/android/icon/drawable-mdpi-smallicon.png" target="app/src/main/res/mipmap-mdpi/smallicon.png" />
-        <resource-file src="resources/android/icon/drawable-hdpi-smallicon.png" target="app/src/main/res/mipmap-hdpi/smallicon.png" />
-        <resource-file src="resources/android/icon/drawable-xhdpi-smallicon.png" target="app/src/main/res/mipmap-xhdpi/smallicon.png" />
         <resource-file src="resources/android/xml/network_security_config.xml" target="app/src/main/res/xml/network_security_config.xml" />
         <resource-file src="resources/android/xml/backup_rules.xml" target="app/src/main/res/xml/backup_rules.xml" />
         <edit-config file="AndroidManifest.xml" mode="merge" target="/manifest/application">

google-services.json

@@ -10,7 +10,7 @@
       "client_info": {
         "mobilesdk_app_id": "1:111111111111:android:1111111111111111",
         "android_client_info": {
-          "package_name": "com.moodle.moodlemobile"
+          "package_name": "com.vmeda.online"
         }
       },
       "oauth_client": [
@@ -42,4 +42,4 @@
     }
   ],
   "configuration_version": "1"
-}
+}

ionic.config.json

@@ -1,5 +1,5 @@
 {
-  "name": "moodlemobile",
+  "name": "vmedaonline",
   "integrations": {
     "cordova": {}
   },

moodle.config.json

@@ -1,71 +1,16 @@
 {
-    "app_id": "com.moodle.moodlemobile",
+    "app_id": "com.vmeda.online",
-    "appname": "Moodle Mobile",
+    "appname": "ВМедА Онлайн",
     "versioncode": 50000,
     "versionname": "5.0.0",
     "cache_update_frequency_usually": 420000,
     "cache_update_frequency_often": 1200000,
     "cache_update_frequency_sometimes": 3600000,
     "cache_update_frequency_rarely": 43200000,
-    "default_lang": "en",
+    "default_lang": "ru",
     "languages": {
-        "af": "Afrikaans",
-        "ar": "العربية",
-        "az": "Azərbaycanca",
-        "bg": "Български",
-        "ca": "Català",
-        "cs": "Čeština",
-        "da": "Dansk",
-        "de": "Deutsch",
-        "de-du": "Deutsch (du)",
-        "el": "Ελληνικά",
         "en": "English",
-        "en-us": "English (United States)",
+        "ru": "Русский"
-        "es": "Español - Internacional",
-        "es-mx": "Español - México",
-        "eu": "Euskara",
-        "fa": "فارسی",
-        "fi": "Suomi",
-        "fr": "Français",
-        "gl": "Galego",
-        "he": "עברית",
-        "hi": "हिंदी",
-        "hr": "Hrvatski",
-        "hsb": "Hornjoserbsce",
-        "hu": "magyar",
-        "hy": "Հայերեն",
-        "id": "Bahasa Indonesia",
-        "it": "Italiano",
-        "ja": "日本語",
-        "km": "ខ្មែរ",
-        "kn": "ಕನ್ನಡ",
-        "ko": "한국어",
-        "lo": "ລາວ",
-        "lt": "Lietuvių",
-        "lv": "Latviešu",
-        "mn": "Монгол",
-        "mr": "मराठी",
-        "nl": "Nederlands",
-        "no": "Norsk",
-        "pl": "Polski",
-        "ps": "لیسي",
-        "pt": "Português - Portugal",
-        "pt-br": "Português - Brasil",
-        "ro": "Română",
-        "ru": "Русский",
-        "sl": "Slovenščina",
-        "sq": "Shqip",
-        "sr-cr": "Српски",
-        "sr-lt": "Srpski",
-        "sv": "Svenska",
-        "szl": "Ślōnski",
-        "tg": "Тоҷикӣ",
-        "tr": "Türkçe",
-        "uk": "Українська",
-        "uz": "O'zbekcha",
-        "vi": "Vietnamese",
-        "zh-cn": "简体中文",
-        "zh-tw": "正體中文"
     },
     "wsservice": "moodle_mobile_app",
     "demo_sites": {
@@ -87,13 +32,15 @@
         "high": 120
     },
     "customurlscheme": "moodlemobile",
-    "sites": [],
+    "sites": [{
+        "url": "https://online.vmeda.org"
+    }],
     "multisitesdisplay": "",
     "sitefindersettings": {},
     "onlyallowlistedsites": false,
     "forcedefaultlanguage": false,
     "privacypolicy": "https://moodle.net/moodle-app-privacy/",
-    "notificoncolor": "#f98012",
+    "notificoncolor": "#007aff",
     "enableanalytics": false,
     "enableonboarding": true,
     "forceColorScheme": "",
@@ -101,7 +48,7 @@
     "showTopLogo": "hidden",
     "ioswebviewscheme": "moodleappfs",
     "appstores": {
-        "android": "com.moodle.moodlemobile",
+        "android": "com.vmeda.online",
         "ios": "id633359593"
     },
     "wsrequestqueuelimit": 10,

package-lock.json

@@ -60,7 +60,7 @@
                 "@types/dom-mediacapture-record": "1.0.7",
                 "chart.js": "^2.9.4",
                 "cordova": "^12.0.0",
-                "cordova-android": "^13.0.0",
+                "cordova-android": "13.0.0",
                 "cordova-clipboard": "^1.3.0",
                 "cordova-ios": "^7.1.1",
                 "cordova-plugin-add-swift-support": "^2.0.2",
@@ -10690,9 +10690,9 @@
             }
         },
         "node_modules/cordova-android/node_modules/fs-extra": {
-            "version": "11.2.0",
+            "version": "11.3.0",
-            "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.2.0.tgz",
+            "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.3.0.tgz",
-            "integrity": "sha512-PmDi3uwK5nFuXh7XDTlVnS17xJS7vW36is2+w3xcv8SVxiB4NyATf4ctkVY5bkSjX0Y4nbvZCq1/EjtEyr9ktw==",
+            "integrity": "sha512-Z4XaCL6dUDHfP/jT25jJKMmtxvuwbkrD1vNSMFlo9lNLY2c5FHYSQgHPRZUjAB26TpDEoW9HCOgplrdbaPV/ew==",
             "license": "MIT",
             "dependencies": {
                 "graceful-fs": "^4.2.0",

package.json

@@ -94,7 +94,7 @@
         "@types/dom-mediacapture-record": "1.0.7",
         "chart.js": "^2.9.4",
         "cordova": "^12.0.0",
-        "cordova-android": "^13.0.0",
+        "cordova-android": "13.0.0",
         "cordova-clipboard": "^1.3.0",
         "cordova-ios": "^7.1.1",
         "cordova-plugin-add-swift-support": "^2.0.2",
@@ -186,8 +186,8 @@
     },
     "cordova": {
         "platforms": [
-            "android",
+            "ios",
-            "ios"
+            "android"
         ],
         "plugins": {
             "@moodlehq/cordova-plugin-advanced-http": {
@@ -238,4 +238,4 @@
             "nl.kingsquare.cordova.background-audio": {}
         }
     }
-}
+}

src/core/components/site-logo/site-logo.html

@@ -1,4 +1,4 @@
-<div class="core-logo-container" *ngIf="showLogo && logoLoaded">
+<div class="core-logo-container"> <!--*ngIf="showLogo && logoLoaded"-->
     <img *ngIf="siteLogo" [src]="siteLogo" class="core-logo" [alt]="siteName" core-external-content [siteId]="siteId"
         (error)="imageError()">
     <img *ngIf="!siteLogo" [src]="fallbackLogo" class="core-logo" [alt]="siteName">

src/core/components/site-logo/site-logo.scss

@@ -4,8 +4,6 @@
 
 .core-logo-container {
     max-width: var(--core-site-logo-max-width, 100%);
-
-
     width: var(--core-site-logo-width, auto);
     margin: var(--core-site-logo-margin, 0px);
 }
@@ -14,6 +12,14 @@ img.core-logo {
     max-height: var(--core-site-logo-max-height);
 }
 
+core-site-logo{
+    display: flex;
+}
+
+core-format-text{
+    padding-top: 5px;
+}
+
 .core-logo-sitename {
     display: var(--core-site-logo-sitename-display, block);
     font: var(--core-site-logo-sitename-font);

src/core/components/site-logo/site-logo.ts

@@ -59,7 +59,7 @@ export class CoreSiteLogoComponent implements OnInit, OnDestroy {
             await this.loadInfo();
         }, this.siteId);
 
-        this.fallbackLogo = this.logoType === 'top' ? 'assets/img/top_logo.png' : 'assets/img/login_logo.png';
+        this.fallbackLogo = this.logoType === 'top' ? 'assets/img/top_logo.svg' : 'assets/img/login_logo.svg';
         this.showSiteName = this.logoType !== 'top';
 
         await this.loadInfo();
@@ -97,12 +97,12 @@ export class CoreSiteLogoComponent implements OnInit, OnDestroy {
     protected async loadInfo(): Promise<void> {
         const site = this.loadSite();
 
-        this.siteName = await site.getSiteName() || '';
+        this.siteName = "ВМЕДА ОНЛАЙН";
 
         this.showSiteName = this.logoType !== 'top' || site.getShowTopLogo() === 'hidden';
 
         if (this.logoType === 'top' && site.getShowTopLogo() === 'hidden') {
-            this.showLogo = false;
+            this.showLogo = true;
         } else {
             // Get the public config to avoid race conditions when retrieving the logo.
             const siteConfig = await CorePromiseUtils.ignoreErrors(site.getPublicConfig());

src/core/features/courses/pages/categories/categories.html

@@ -47,7 +47,7 @@
                 <ion-card *ngFor="let category of categories" [attr.data-category-id]="category.id">
                     <ion-item button class="ion-text-wrap" (click)="openCategory(category.id)" [attr.aria-label]="category.name"
                         [detail]="true">
-                        <ion-icon name="fas-folder" slot="start" [attr.aria-label]="'core.category' | translate" />
+                        <ion-icon name="fas-logo-color" slot="start" [attr.aria-label]="'core.category' | translate" />
                         <ion-label>
                             <p class="item-heading">
                                 <core-format-text [text]="category.name" contextLevel="coursecat" [contextInstanceId]="category.id" />

src/core/features/login/login.scss

@@ -30,6 +30,7 @@
 
         .core-login-site {
             core-site-logo {
+                display: flex;
                 --core-site-logo-max-height: 104px;
                 --core-site-logo-sitename-margin-bottom: 8px;
                 --core-site-logo-sitename-font: var(--mdl-typography-subtitle-font-lg);

src/core/features/mainmenu/components/user-menu/user-menu.scss

@@ -24,6 +24,7 @@
 
 core-site-logo {
     --core-site-logo-margin: 0px auto 8px auto;
+    display: flex;
     --core-site-logo-max-height: var(--core-user-menu-site-logo-max-height);
 
     --core-site-logo-sitename-font: var(--mdl-typography-subtitle-font-lg);

src/index.html

@@ -7,7 +7,7 @@
 
     <base href="/" />
 
-    <meta name="color-scheme" content="light dark" />
+    <meta name="color-scheme" content="light" />
     <meta name="viewport"
         content="viewport-fit=cover, width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=no, interactive-widget=resizes-content" />
     <meta http-equiv="Content-Security-Policy"
@@ -24,8 +24,8 @@
     <script src="assets/lib/mathjax/MathJax.js?delayStartupUntil=configured"></script>
 </head>
 
-<body>
+<body style="background: -webkit-linear-gradient(135deg,#039615 0%,#3452ff 100%)">
-    <app-root></app-root>
+    <app-root/>
 </body>
 
 </html>

src/theme/components/ion-header.scss

@@ -6,7 +6,7 @@ ion-header.header-md {
     transition: box-shadow 0.5s;
 
     ion-toolbar {
-        --color: var(--core-header-toolbar-color);
+        --color: white;
         --background: var(--core-header-toolbar-background);
         --border-width: 0 0 var(--core-header-toolbar-border-width) 0;
         --border-color: var(--core-header-toolbar-border-color);
@@ -70,6 +70,7 @@ ion-header.header-md {
         }
 
         h1 core-site-logo {
+            display: flex;
             --core-site-logo-max-height: var(--core-mainpage-headerlogo-maxheight);
         }
 

src/theme/globals.variables.scss

@@ -22,7 +22,7 @@ $green:       #357a32 !default;
 $red:         #ca3120 !default;
 $yellow:      #f0ad4e !default;
 
-$brand-color: #f98012 !default;
+$brand-color: #007aff !default;
 
 $text-color:               $gray-900 !default;
 $text-color-rgb:           color-to-rgb-list($text-color) !default;

src/theme/theme.light.scss

@@ -112,9 +112,9 @@
 
     --core-link-color: var(--info);
 
-    --core-header-toolbar-background: var(--white);
+    --core-header-toolbar-background: -webkit-linear-gradient(135deg,#039615 0%,#3452ff 100%);
     --core-header-toolbar-border-color: var(--stroke);
-    --core-header-toolbar-color: var(--text-color);
+    --core-header-toolbar-color: white;
     --core-header-buttons-background: transparent;
     --core-header-buttons-color: var(--core-header-toolbar-color);