From 5f31e8c136968128da52d85a3da4c86351ed2f4a Mon Sep 17 00:00:00 2001 From: Richard Park Date: Mon, 25 Nov 2019 10:57:02 +0900 Subject: [PATCH 1/3] change theme is modified as temparary --- .../messenger-settings.dialog.component.html | 26 ++++++++++---- .../messenger-settings.dialog.component.ts | 11 ++++-- .../src/lib/components/general.component.html | 36 +++++++++++++++---- .../src/lib/components/general.component.scss | 30 +++++++++------- .../src/lib/components/general.component.ts | 15 +++++++- .../src/lib/ucap-ui-settings.module.ts | 4 ++- 6 files changed, 94 insertions(+), 28 deletions(-) diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/settings/messenger-settings.dialog.component.html b/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/settings/messenger-settings.dialog.component.html index 4dea90b7..7444dca5 100644 --- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/settings/messenger-settings.dialog.component.html +++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/settings/messenger-settings.dialog.component.html @@ -10,21 +10,29 @@ 일반 - + + 개인정보취급방침 - + 알림 - + @@ -38,7 +46,9 @@ 사용권한 - + @@ -86,11 +96,15 @@ - - \ No newline at end of file + diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/settings/messenger-settings.dialog.component.ts b/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/settings/messenger-settings.dialog.component.ts index 39d49939..c17dd029 100644 --- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/settings/messenger-settings.dialog.component.ts +++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/settings/messenger-settings.dialog.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit, Inject } from '@angular/core'; +import { Component, OnInit, Inject, Renderer2 } from '@angular/core'; import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material'; import { KEY_LOGIN_RES_INFO } from '@app/types/login-res-info.type'; import { KEY_VER_INFO } from '@app/types/ver-info.type'; @@ -10,6 +10,7 @@ import { DialogService } from '@ucap-webmessenger/ui'; import { VersionInfo2Response } from '@ucap-webmessenger/api-public'; import { LoginResponse } from '@ucap-webmessenger/protocol-authentication'; import { map } from 'rxjs/operators'; +import { DOCUMENT } from '@angular/common'; export interface MessengerSettingsDialogData {} @@ -32,7 +33,9 @@ export class MessengerSettingsDialogComponent implements OnInit { @Inject(MAT_DIALOG_DATA) public data: MessengerSettingsDialogData, private dialogService: DialogService, private sessionStorageService: SessionStorageService, - private store: Store + private store: Store, + @Inject(DOCUMENT) private document: Document, + private renderer2: Renderer2 ) { this.sessionVerinfo = this.sessionStorageService.get( KEY_VER_INFO @@ -44,6 +47,10 @@ export class MessengerSettingsDialogComponent implements OnInit { ngOnInit() {} + onSelectTheme(theme: string): void { + this.renderer2.setAttribute(this.document.body, 'class', theme); + } + onClickChoice(choice: boolean): void { this.dialogRef.close({}); } diff --git a/projects/ucap-webmessenger-ui-settings/src/lib/components/general.component.html b/projects/ucap-webmessenger-ui-settings/src/lib/components/general.component.html index 9d243fa9..98f25ae4 100644 --- a/projects/ucap-webmessenger-ui-settings/src/lib/components/general.component.html +++ b/projects/ucap-webmessenger-ui-settings/src/lib/components/general.component.html @@ -2,15 +2,39 @@

테마

-
    -
  • -
  • +
      +
    • +
    - - 기본값 + + diff --git a/projects/ucap-webmessenger-ui-settings/src/lib/components/general.component.scss b/projects/ucap-webmessenger-ui-settings/src/lib/components/general.component.scss index a0121a63..3a190f10 100644 --- a/projects/ucap-webmessenger-ui-settings/src/lib/components/general.component.scss +++ b/projects/ucap-webmessenger-ui-settings/src/lib/components/general.component.scss @@ -5,24 +5,30 @@ margin: 10px; height: 120px; - .theme-box{ + .theme-box { width: 140px; - height:98px; - margin-right:10px; + height: 98px; + margin-right: 10px; border: 1px solid #dddddd; - background-size:100% auto; + background-size: 100% auto; background-repeat: no-repeat; opacity: 0.7; - &.default{ - background-image: url("../../../../ucap-webmessenger-app/src/assets/images/theme/theme-default.png"); + &.default { + background-image: url('../../../../ucap-webmessenger-app/src/assets/images/theme/theme-default.png'); } - &.lgRed{ - background-image: url("../../../../ucap-webmessenger-app/src/assets/images/theme/theme-lgRed.png"); - } - &.on{ - border:1px solid #333333; - opacity: 1; + &.lgRed { + background-image: url('../../../../ucap-webmessenger-app/src/assets/images/theme/theme-lgRed.png'); + } + &.on { + border: 1px solid #333333; + opacity: 1; } } + .default-theme { + background-image: url('../../../../ucap-webmessenger-app/src/assets/images/theme/theme-default.png'); + } + .lg-red-theme { + background-image: url('../../../../ucap-webmessenger-app/src/assets/images/theme/theme-lgRed.png'); + } } diff --git a/projects/ucap-webmessenger-ui-settings/src/lib/components/general.component.ts b/projects/ucap-webmessenger-ui-settings/src/lib/components/general.component.ts index acd41387..a64a5f71 100644 --- a/projects/ucap-webmessenger-ui-settings/src/lib/components/general.component.ts +++ b/projects/ucap-webmessenger-ui-settings/src/lib/components/general.component.ts @@ -1,4 +1,10 @@ -import { Component, OnInit, ChangeDetectorRef } from '@angular/core'; +import { + Component, + OnInit, + ChangeDetectorRef, + Output, + EventEmitter +} from '@angular/core'; import { FormGroup, FormBuilder } from '@angular/forms'; @Component({ @@ -9,6 +15,9 @@ import { FormGroup, FormBuilder } from '@angular/forms'; export class GeneralComponent implements OnInit { loginForm: FormGroup; + @Output() + selectTheme = new EventEmitter(); + constructor( private formBuilder: FormBuilder, private changeDetectorRef: ChangeDetectorRef @@ -16,5 +25,9 @@ export class GeneralComponent implements OnInit { ngOnInit() {} + onSelectedTabChange(theme: string) { + this.selectTheme.emit(theme); + } + onClickLogin() {} } diff --git a/projects/ucap-webmessenger-ui-settings/src/lib/ucap-ui-settings.module.ts b/projects/ucap-webmessenger-ui-settings/src/lib/ucap-ui-settings.module.ts index 5cd649e1..285eda3f 100644 --- a/projects/ucap-webmessenger-ui-settings/src/lib/ucap-ui-settings.module.ts +++ b/projects/ucap-webmessenger-ui-settings/src/lib/ucap-ui-settings.module.ts @@ -9,6 +9,7 @@ import { MatFormFieldModule } from '@angular/material/form-field'; import { MatListModule } from '@angular/material/list'; import { MatSelectModule } from '@angular/material/select'; import { MatSlideToggleModule } from '@angular/material/slide-toggle'; +import { MatTabsModule } from '@angular/material/tabs'; import { CallComponent } from './components/call.component'; import { DeviceComponent } from './components/device.component'; @@ -36,7 +37,8 @@ const SERVICES = []; MatFormFieldModule, MatListModule, MatSelectModule, - MatSlideToggleModule + MatSlideToggleModule, + MatTabsModule ], exports: [...COMPONENTS], declarations: [...COMPONENTS] From 5641f8b77744a0867082bfa87575392e04d17ca0 Mon Sep 17 00:00:00 2001 From: Richard Park Date: Mon, 25 Nov 2019 11:10:30 +0900 Subject: [PATCH 2/3] icon of app is changed --- electron-builder.json | 2 +- .../native/components/top-bar.component.html | 2 +- .../src/assets/images/logo/64_64.png | Bin 0 -> 1688 bytes 3 files changed, 2 insertions(+), 2 deletions(-) create mode 100644 projects/ucap-webmessenger-app/src/assets/images/logo/64_64.png diff --git a/electron-builder.json b/electron-builder.json index 311b5eac..6fb6b1fe 100644 --- a/electron-builder.json +++ b/electron-builder.json @@ -20,7 +20,7 @@ }, "win": { "target": ["zip", "nsis"], - "icon": "./dist/ucap-webmessenger-electron/resources/installer/woori_256x256.ico" + "icon": "./dist/ucap-webmessenger-electron/resources/image/16_16.ico" }, "linux": { "target": ["AppImage", "deb", "rpm", "zip", "tar.gz"], diff --git a/projects/ucap-webmessenger-app/src/app/layouts/native/components/top-bar.component.html b/projects/ucap-webmessenger-app/src/app/layouts/native/components/top-bar.component.html index 2c5edb47..68cdb2fc 100644 --- a/projects/ucap-webmessenger-app/src/app/layouts/native/components/top-bar.component.html +++ b/projects/ucap-webmessenger-app/src/app/layouts/native/components/top-bar.component.html @@ -1,6 +1,6 @@
    UCAP M Messenger
    diff --git a/projects/ucap-webmessenger-app/src/assets/images/logo/64_64.png b/projects/ucap-webmessenger-app/src/assets/images/logo/64_64.png new file mode 100644 index 0000000000000000000000000000000000000000..fa0bb81e6ab0af859b0adadf027a83e60ca7c857 GIT binary patch literal 1688 zcmV;J250$+P)Ixm-hg$8Mpv^3f!;Ic{_#y3xGd> z-M~yY+wE3C!mPIf`+-?Nz@>5{nF4G94ge3iQDC$Ji2UyXM}eo^Xpkb~fgQjaAT`y3?R|^V@(vx)rtaY+7&Dj2=XC;Cjb<27J^s zw>mAZGorwiKp0r7nn}k3#2lRs^mW?0g(Lg3Vcg)3&I@|@U7d+V!K-v;2vrO4NfXO- z(yE>TKdZ;2G5hx3-JS&lu6zQWNdh(kV}TO8#H#Yo10HqKn)F~IyC!BBcHTn<04r3A zR}nzCwVya?>x4eZJhT%o&tQ&V&rodRTvD z&DUHR0L@rz*GD@6#8mgPPK|yaEFLw0wPObn^xJ>mS6e)@0Kq+SL1v1b0I%pwmAwLf zz8{~?`@?TjS^<@Yn^lXBhIv+btvctE0w|G@oJe-o5XPjadw0bRF%dv`tD}I^Mh~ql zKrA?hsML^>;Aj7&Os&ofiW_4hfKM)=4Y9I-$8~BLXfxOuQ6w#3>74^f59;Orr98yS z!fMszkD1M6R<%B;TDq9Znp#^))b#65h8o-ceLJ(ScGRTl8ae`GnLV)j1V-yLs50E5 zle~>1wbuoxaFACM5i>|P%3>x!z$}9qPNuWNQh>@P&jk<+H@ayiKtJ83a$Sp_LsQt$ z#AP`Mir+E7FmhzpN$p65u1mY4qORljQE3StW9ZGgwiazg&jPkrggSm7j*S3@m-D7{syf7Yo$CA25poWINmH#v#R9&#Sj9z) z!EWp2TJmZtU=r7H_g zm2xr^*65!t2h9?w4Ba1y@yjYfza;aw|7R%7-27rKvldh3tV5R!XA6hyGRvkSfba)C zwn{L-M1Znz3)2r2I_k*rtBuS&bct~EVRPZo9W#5Vx)}P%>U_@NU}Cp>BHZ;z-UZIo zIXC6sDndM;Ulgqf*;Wr#1qjRdy5ZS|!kp2mC56p-W53 z!p*EJu4(J|8^=mK+3gWQlW}{_^JQTb8eha`cGI}igOX23(@L>R=mn#CCeb%BV7GQC zk_R(yBy#bfm<`q4+vrjNFkGCTP9LN@%KEhMS^zWZ{Kn22eut~UvB@sfSWYRgV=LT z%4`5$1KxGodBM#rKs%cZLRu%}XR<2V!v75dAO}=roN}=|@Zidy&-_zkfG#`bAo<}< i;Ag~%6DQ7p1mJJ%?!KI{sEFzS0000 Date: Mon, 25 Nov 2019 11:29:54 +0900 Subject: [PATCH 3/3] logo is changed --- .../src/app/layouts/native/components/top-bar.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/ucap-webmessenger-app/src/app/layouts/native/components/top-bar.component.html b/projects/ucap-webmessenger-app/src/app/layouts/native/components/top-bar.component.html index 68cdb2fc..b434a17d 100644 --- a/projects/ucap-webmessenger-app/src/app/layouts/native/components/top-bar.component.html +++ b/projects/ucap-webmessenger-app/src/app/layouts/native/components/top-bar.component.html @@ -1,6 +1,6 @@
    UCAP M Messenger