From 9d9afccc1168a2a62eebd029c607a572fe24f541 Mon Sep 17 00:00:00 2001 From: Julia Svinareva Date: Wed, 17 Apr 2019 10:32:32 +0300 Subject: [PATCH] [pe mobile] added color schemes in presentation settings and spellcheck moved to application settings --- .../mobile/app/controller/Settings.js | 33 ++++++++- .../mobile/app/template/Settings.template | 73 ++++++++++++++----- .../mobile/app/view/Settings.js | 9 ++- apps/presentationeditor/mobile/locale/en.json | 2 + .../mobile/resources/css/app-ios.css | 25 +++++++ .../mobile/resources/css/app-material.css | 25 +++++++ .../mobile/resources/less/app-ios.less | 1 + .../mobile/resources/less/app-material.less | 1 + 8 files changed, 147 insertions(+), 22 deletions(-) diff --git a/apps/presentationeditor/mobile/app/controller/Settings.js b/apps/presentationeditor/mobile/app/controller/Settings.js index 59c3e019c..be74cbd36 100644 --- a/apps/presentationeditor/mobile/app/controller/Settings.js +++ b/apps/presentationeditor/mobile/app/controller/Settings.js @@ -56,7 +56,8 @@ define([ inProgress, infoObj, modalView, - _licInfo; + _licInfo, + templateInsert; var _slideSizeArr = [ [254, 190.5], [254, 143] @@ -84,6 +85,7 @@ define([ this.api = api; this.api.asc_registerCallback('asc_onPresentationSize', _.bind(this.onApiPageSize, this)); + this.api.asc_registerCallback('asc_onSendThemeColorSchemes', _.bind(this.onSendThemeColorSchemes, this)); }, onLaunch: function () { @@ -158,7 +160,7 @@ define([ $('#settings-readermode input:checkbox').single('change', _.bind(me._onReaderMode, me)); $('#settings-spellcheck input:checkbox').single('change', _.bind(me._onSpellcheck, me)); $(modalView).find('.formats a').single('click', _.bind(me._onSaveFormat, me)); - $('#page-settings-setup-view li').single('click', _.bind(me._onSlideSize, me)); + $('#page-settings-setup-view #slide-size-block li').single('click', _.bind(me._onSlideSize, me)); $('#settings-print').single('click', _.bind(me._onPrint, me)); Common.Utils.addScrollIfNeed('.page[data-page=settings-download-view]', '.page[data-page=settings-download-view] .page-content'); @@ -177,6 +179,33 @@ define([ me.setLicInfo(_licInfo); } else if ('#settings-application-view' == pageId) { me.initPageApplicationSettings(); + } else if ('#color-schemes-view' == pageId) { + me.initPageColorSchemes(); + } + }, + + initPageColorSchemes: function () { + $('#color-schemes-content').html(templateInsert); + $('.color-schemes-menu').on('click', _.bind(this.onColorSchemaClick, this)); + }, + + onSendThemeColorSchemes: function (schemas) { + templateInsert = ""; + _.each(schemas, function (schema, index) { + var colors = schema.get_colors();//schema.colors; + templateInsert = templateInsert + "
"; + for (var j = 2; j < 7; j++) { + var clr = '#' + Common.Utils.ThemeColor.getHexColor(colors[j].get_r(), colors[j].get_g(), colors[j].get_b()); + templateInsert = templateInsert + "" + } + templateInsert = templateInsert + "" + schema.get_name() + "
"; + }, this); + }, + + onColorSchemaClick: function () { + if (this.api) { + var ind = $(event.currentTarget).children('input').val(); + this.api.ChangeColorScheme(ind); } }, diff --git a/apps/presentationeditor/mobile/app/template/Settings.template b/apps/presentationeditor/mobile/app/template/Settings.template index 6fd7a4afb..30d56a8f0 100644 --- a/apps/presentationeditor/mobile/app/template/Settings.template +++ b/apps/presentationeditor/mobile/app/template/Settings.template @@ -25,22 +25,6 @@ <% } %> -
  • -
    -
    - -
    -
    -
    <%= scope.textSpellcheck %>
    -
    - -
    -
    -
    -
  • @@ -48,7 +32,7 @@
    -
    <%= scope.textPresentSetup %>
    +
    <%= scope.textPresentSettings %>
     @@ -325,12 +309,13 @@
    <% if (!android) { %><%= scope.textBack %><% } %>
    -
    <%= scope.textSlideSize %>
    +
    <%= scope.textPresentSettings %>
    -
    +
    <%= scope.textSlideSize %>
    +
    + +
    + +
    +
    @@ -404,6 +404,41 @@
    • +
    + +
    + + + + + + +
    +
    +
    +
    <% if (!android) { %><%= scope.textBack %><% } %>
    +
    <%= scope.textColorSchemes %>
    +
    +
    +
    +
    +
    +
    + +
    +
    diff --git a/apps/presentationeditor/mobile/app/view/Settings.js b/apps/presentationeditor/mobile/app/view/Settings.js index a5510db8a..16929b4d0 100644 --- a/apps/presentationeditor/mobile/app/view/Settings.js +++ b/apps/presentationeditor/mobile/app/view/Settings.js @@ -161,6 +161,10 @@ define([ } }, + showColorSchemes: function () { + this.showPage('#color-schemes-view'); + }, + showInfo: function () { this.showPage('#settings-info-view'); @@ -191,6 +195,7 @@ define([ showSetup: function () { this.showPage('#settings-setup-view'); + $('#color-schemes').single('click', _.bind(this.showColorSchemes, this)); }, showSetApp: function () { @@ -214,6 +219,7 @@ define([ textDone: 'Done', textEditPresent: 'Edit Presentation', textPresentSetup: 'Presentation Setup', + textPresentSettings: 'Presentation Settings', textDownload: 'Download', textPresentInfo: 'Presentation Info', textHelp: 'Help', @@ -239,7 +245,8 @@ define([ textUnitOfMeasurement: 'Unit of Measurement', textCentimeter: 'Centimeter', textPoint: 'Point', - textInch: 'Inch' + textInch: 'Inch', + textColorSchemes: 'Color Schemes' } })(), PE.Views.Settings || {})) }); \ No newline at end of file diff --git a/apps/presentationeditor/mobile/locale/en.json b/apps/presentationeditor/mobile/locale/en.json index f9c720d89..b53d3eced 100644 --- a/apps/presentationeditor/mobile/locale/en.json +++ b/apps/presentationeditor/mobile/locale/en.json @@ -470,6 +470,8 @@ "PE.Views.Settings.textCentimeter": "Centimeter", "PE.Views.Settings.textPoint": "Point", "PE.Views.Settings.textInch": "Inch", + "PE.Views.Settings.textPresentSettings": "Presentation Settings", + "PE.Views.Settings.textColorSchemes": "Color Schemes", "PE.Views.Settings.unknownText": "Unknown", "PE.Views.Toolbar.textBack": "Back" } \ No newline at end of file diff --git a/apps/presentationeditor/mobile/resources/css/app-ios.css b/apps/presentationeditor/mobile/resources/css/app-ios.css index db9a40694..b1deee838 100644 --- a/apps/presentationeditor/mobile/resources/css/app-ios.css +++ b/apps/presentationeditor/mobile/resources/css/app-ios.css @@ -6239,6 +6239,31 @@ html.pixel-ratio-3 .document-menu .list-block li:last-child li .item-inner:after background: url('../../../../common/mobile/resources/img/about/logo.svg') no-repeat center; margin-top: 20px; } +.color-schemes-menu { + cursor: pointer; + display: block; + background-color: #fff; +} +.color-schemes-menu .item-content { + padding-left: 0; +} +.color-schemes-menu .item-inner { + justify-content: flex-start; + padding-left: 16px; +} +.color-schemes-menu .color-schema-block { + display: flex; +} +.color-schemes-menu .color { + min-width: 26px; + min-height: 26px; + margin: 0 2px 0 0; + box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.15) inset; +} +.color-schemes-menu .text { + margin-left: 20px; + color: #212121; +} .tablet .searchbar.document.replace .center .searchbar:first-child { margin-right: 10px; } diff --git a/apps/presentationeditor/mobile/resources/css/app-material.css b/apps/presentationeditor/mobile/resources/css/app-material.css index 12ccf7ffe..5944bbcba 100644 --- a/apps/presentationeditor/mobile/resources/css/app-material.css +++ b/apps/presentationeditor/mobile/resources/css/app-material.css @@ -5838,6 +5838,31 @@ html.phone .document-menu .list-block .item-link { .about .logo { background: url('../../../../common/mobile/resources/img/about/logo.svg') no-repeat center; } +.color-schemes-menu { + cursor: pointer; + display: block; + background-color: #fff; +} +.color-schemes-menu .item-content { + padding-left: 0; +} +.color-schemes-menu .item-inner { + justify-content: flex-start; + padding-left: 16px; +} +.color-schemes-menu .color-schema-block { + display: flex; +} +.color-schemes-menu .color { + min-width: 26px; + min-height: 26px; + margin: 0 2px 0 0; + box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.15) inset; +} +.color-schemes-menu .text { + margin-left: 20px; + color: #212121; +} .tablet .searchbar.document.replace .center > .replace { display: flex; } diff --git a/apps/presentationeditor/mobile/resources/less/app-ios.less b/apps/presentationeditor/mobile/resources/less/app-ios.less index da419eaa6..f81800cda 100644 --- a/apps/presentationeditor/mobile/resources/less/app-ios.less +++ b/apps/presentationeditor/mobile/resources/less/app-ios.less @@ -71,6 +71,7 @@ input, textarea { @import url('../../../../common/mobile/resources/less/ios/_contextmenu.less'); @import url('../../../../common/mobile/resources/less/ios/_color-palette.less'); @import url('../../../../common/mobile/resources/less/ios/_about.less'); +@import url('../../../../common/mobile/resources/less/ios/_color-schema.less'); @import url('ios/_search.less'); @import url('ios/_icons.less'); diff --git a/apps/presentationeditor/mobile/resources/less/app-material.less b/apps/presentationeditor/mobile/resources/less/app-material.less index 0a5285306..4b29b3d90 100644 --- a/apps/presentationeditor/mobile/resources/less/app-material.less +++ b/apps/presentationeditor/mobile/resources/less/app-material.less @@ -53,6 +53,7 @@ @import url('../../../../common/mobile/resources/less/material/_contextmenu.less'); @import url('../../../../common/mobile/resources/less/material/_color-palette.less'); @import url('../../../../common/mobile/resources/less/material/_about.less'); +@import url('../../../../common/mobile/resources/less/material/_color-schema.less'); @import url('material/_search.less'); @import url('material/_icons.less');