r4sas/tweb-i2p
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix returning to the same chat from inner one

Browse Source 
New icons
This commit is contained in:
Eduard Kuzmenko 2021-04-14 04:32:58 +04:00
parent 92fa0cf287
commit 357eb1a9c1
8 changed files with 869 additions and 769 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/components/popups/datePicker.ts
View File

@ -5,7 +5,6 @@
*/ */
import PopupElement, { PopupOptions } from "."; import PopupElement, { PopupOptions } from ".";
import { getFullDate } from "../../helpers/date";
import mediaSizes from "../../helpers/mediaSizes"; import mediaSizes from "../../helpers/mediaSizes";
import I18n, { i18n, LangPackKey } from "../../lib/langPack"; import I18n, { i18n, LangPackKey } from "../../lib/langPack";
import InputField from "../inputField"; import InputField from "../inputField";

8
src/components/sidebarLeft/index.ts
View File

@ -101,7 +101,7 @@ export class AppSidebarLeft extends SidebarSlider {
}; };
const menuButtons: (ButtonMenuItemOptions & {verify?: () => boolean})[] = [{ const menuButtons: (ButtonMenuItemOptions & {verify?: () => boolean})[] = [{
icon: 'savedmessages', icon: 'saved',
text: 'SavedMessages', text: 'SavedMessages',
onClick: () => { onClick: () => {
setTimeout(() => { // menu doesn't close if no timeout (lol) setTimeout(() => { // menu doesn't close if no timeout (lol)
@ -119,7 +119,7 @@ export class AppSidebarLeft extends SidebarSlider {
new AppSettingsTab(this).open(); new AppSettingsTab(this).open();
} }
}, { }, {
icon: 'colorize', icon: 'darkmode',
text: 'DarkMode', text: 'DarkMode',
onClick: () => { onClick: () => {
@ -129,7 +129,7 @@ export class AppSidebarLeft extends SidebarSlider {
stateKey: 'settings.nightTheme', stateKey: 'settings.nightTheme',
}) })
}, { }, {
icon: 'lamp', icon: 'animations',
text: 'Animations', text: 'Animations',
onClick: () => { onClick: () => {
@ -146,7 +146,7 @@ export class AppSidebarLeft extends SidebarSlider {
appImManager.openUsername('TelegramTips'); appImManager.openUsername('TelegramTips');
} }
}, { }, {
icon: 'help', icon: 'bug',
text: 'ReportBug', text: 'ReportBug',
onClick: () => { onClick: () => {
const a = document.createElement('a'); const a = document.createElement('a');

12
src/lib/appManagers/appImManager.ts
View File

@ -715,13 +715,19 @@ export class AppImManager {
this.createNewChat(); this.createNewChat();
this.chats.splice(0, 1); */ this.chats.splice(0, 1); */
const spliced = this.chats.splice(1, this.chats.length - 1); const spliced = this.chats.splice(1, this.chats.length - 1);
const ret = this.setPeer(peerId, lastMsgId); if(this.chat.peerId === peerId) {
this.spliceChats(0, false, false, spliced); this.spliceChats(0, true, true, spliced);
return;
} else {
const ret = this.setPeer(peerId, lastMsgId);
this.spliceChats(0, false, false, spliced);
return ret;
}
// } else { // } else {
// this.spliceChats(1, false, animate); // this.spliceChats(1, false, animate);
// } // }
return ret; //return ret;
} }
// * don't reset peer if returning // * don't reset peer if returning

6
src/lib/appManagers/appProfileManager.ts
View File

@ -556,7 +556,7 @@ export class AppProfileManager {
if(peerId === myId && isDialog) { if(peerId === myId && isDialog) {
div.innerHTML = ''; div.innerHTML = '';
div.dataset.color = ''; div.dataset.color = '';
div.classList.add('tgico-savedmessages'); div.classList.add('tgico-saved');
div.classList.remove('tgico-avatar_deletedaccount'); div.classList.remove('tgico-avatar_deletedaccount');
return; return;
} }
@ -567,7 +567,7 @@ export class AppProfileManager {
div.innerHTML = ''; div.innerHTML = '';
div.dataset.color = appPeersManager.getPeerColorById(peerId); div.dataset.color = appPeersManager.getPeerColorById(peerId);
div.classList.add('tgico-avatar_deletedaccount'); div.classList.add('tgico-avatar_deletedaccount');
div.classList.remove('tgico-savedmessages'); div.classList.remove('tgico-saved');
return; return;
} }
} }
@ -579,7 +579,7 @@ export class AppProfileManager {
} }
div.innerHTML = ''; div.innerHTML = '';
div.classList.remove('tgico-savedmessages', 'tgico-avatar_deletedaccount'); div.classList.remove('tgico-saved', 'tgico-avatar_deletedaccount');
div.dataset.color = color; div.dataset.color = color;
let abbr: string; let abbr: string;

4
src/scss/partials/_avatar.scss
View File

@ -65,6 +65,10 @@ avatar-element {
font-size: calc(36px / var(--multiplier)); font-size: calc(36px / var(--multiplier));
} }
&.tgico-saved:before {
font-size: calc(21px / var(--multiplier)) !important; // ! IMPORTANT IS TEMPORARY
}
&.tgico-savedmessages:before { &.tgico-savedmessages:before {
font-size: calc(25px / var(--multiplier)); font-size: calc(25px / var(--multiplier));
} }

1297
src/scss/partials/_fonts.scss
View File

File diff suppressed because it is too large Load Diff

297
src/scss/partials/_ico.scss
View File

@ -19,145 +19,158 @@ $tgico-font-path: "assets/fonts" !default;
.replace(/\.(.+?):before\{content:"(.+?);\}/g, `$$$1: "\\$2;\n`); .replace(/\.(.+?):before\{content:"(.+?);\}/g, `$$$1: "\\$2;\n`);
*/ */
$tgico-zoomout: "\e900"; $tgico-check: "\e900";
$tgico-username: "\e901"; $tgico-checks: "\e901";
$tgico-zoomin: "\e902"; $tgico-activesessions: "\e902";
$tgico-up: "\e903"; $tgico-add: "\e903";
$tgico-user: "\e904"; $tgico-addmember_filled: "\e904";
$tgico-unmute: "\e905"; $tgico-adduser: "\e905";
$tgico-unpin: "\e906"; $tgico-admin: "\e906";
$tgico-unread: "\e907"; $tgico-animals: "\e907";
$tgico-unlock: "\e908"; $tgico-animations: "\e908";
$tgico-unarchive: "\e909"; $tgico-archive: "\e909";
$tgico-underline: "\e90a"; $tgico-arrow_back: "\e90a";
$tgico-textedit: "\e90b"; $tgico-arrow_down: "\e90b";
$tgico-tip: "\e90c"; $tgico-arrow_next: "\e90c";
$tgico-stop: "\e90d"; $tgico-attach: "\e90d";
$tgico-strikethrough: "\e90e"; $tgico-bold: "\e90e";
$tgico-smile: "\e90f"; $tgico-botcom: "\e90f";
$tgico-sport: "\e910"; $tgico-bots: "\e910";
$tgico-stickers: "\e911"; $tgico-bug: "\e911";
$tgico-settings: "\e912"; $tgico-calendar: "\e912";
$tgico-smallscreen: "\e913"; $tgico-calendarfilter: "\e913";
$tgico-sendingerror: "\e914"; $tgico-camera: "\e914";
$tgico-send: "\e915"; $tgico-cameraadd: "\e915";
$tgico-sending: "\e916"; $tgico-car: "\e916";
$tgico-select: "\e917"; $tgico-channel: "\e917";
$tgico-send2: "\e918"; $tgico-channelviews: "\e918";
$tgico-scheduled: "\e919"; $tgico-chatspinned: "\e919";
$tgico-search: "\e91a"; $tgico-chatsplaceholder: "\e91a";
$tgico-revote: "\e91b"; $tgico-check1: "\e91b";
$tgico-savedmessages: "\e91c"; $tgico-checkbox: "\e91c";
$tgico-schedule: "\e91d"; $tgico-checkboxblock: "\e91d";
$tgico-replace: "\e91e"; $tgico-checkboxempty: "\e91e";
$tgico-reply: "\e91f"; $tgico-checkboxon: "\e91f";
$tgico-radioon: "\e920"; $tgico-checkretract: "\e920";
$tgico-readchats: "\e921"; $tgico-checkround: "\e921";
$tgico-recent: "\e922"; $tgico-close: "\e922";
$tgico-radiooff: "\e923"; $tgico-clouddownload: "\e923";
$tgico-poll: "\e924"; $tgico-colorize: "\e924";
$tgico-previous: "\e925"; $tgico-comments: "\e925";
$tgico-pinned_filled: "\e926"; $tgico-commentssticker: "\e926";
$tgico-pinnedchat: "\e927"; $tgico-copy: "\e927";
$tgico-play: "\e928"; $tgico-darkmode: "\e928";
$tgico-photo: "\e929"; $tgico-data: "\e929";
$tgico-pin: "\e92a"; $tgico-delete: "\e92a";
$tgico-pinlist: "\e92b"; $tgico-delete_filled: "\e92b";
$tgico-permissions: "\e92c"; $tgico-deleteleft: "\e92c";
$tgico-phone: "\e92d"; $tgico-deleteuser: "\e92d";
$tgico-pause: "\e92e"; $tgico-devices: "\e92e";
$tgico-noncontacts: "\e92f"; $tgico-document: "\e92f";
$tgico-nosound: "\e930"; $tgico-down: "\e930";
$tgico-passwordoff: "\e931"; $tgico-download: "\e931";
$tgico-newprivate: "\e932"; $tgico-dragfiles: "\e932";
$tgico-next: "\e933"; $tgico-dragmedia: "\e933";
$tgico-newchat_filled: "\e934"; $tgico-eats: "\e934";
$tgico-newgroup: "\e935"; $tgico-edit: "\e935";
$tgico-muted: "\e936"; $tgico-email: "\e936";
$tgico-newchannel: "\e937"; $tgico-enter: "\e937";
$tgico-more: "\e938"; $tgico-eye1: "\e938";
$tgico-mute: "\e939"; $tgico-eye2: "\e939";
$tgico-microphone: "\e93a"; $tgico-favourites: "\e93a";
$tgico-minus: "\e93b"; $tgico-flag: "\e93b";
$tgico-monospace: "\e93c"; $tgico-folder: "\e93c";
$tgico-message: "\e93d"; $tgico-fontsize: "\e93d";
$tgico-microphone2: "\e93e"; $tgico-forward: "\e93e";
$tgico-logout: "\e93f"; $tgico-fullscreen: "\e93f";
$tgico-mention: "\e940"; $tgico-gifs: "\e940";
$tgico-menu: "\e941"; $tgico-group: "\e941";
$tgico-loginlogomobile: "\e942"; $tgico-help: "\e942";
$tgico-lock: "\e943"; $tgico-image: "\e943";
$tgico-loginlogodesktop: "\e944"; $tgico-info: "\e944";
$tgico-livelocation: "\e945"; $tgico-info2: "\e945";
$tgico-location: "\e946"; $tgico-italic: "\e946";
$tgico-link: "\e947"; $tgico-keyboard: "\e947";
$tgico-language: "\e948"; $tgico-lamp: "\e948";
$tgico-largepause: "\e949"; $tgico-language: "\e949";
$tgico-largeplay: "\e94a"; $tgico-largepause: "\e94a";
$tgico-lamp: "\e94b"; $tgico-largeplay: "\e94b";
$tgico-keyboard: "\e94c"; $tgico-left: "\e94c";
$tgico-info: "\e94d"; $tgico-link: "\e94d";
$tgico-italic: "\e94e"; $tgico-livelocation: "\e94e";
$tgico-group: "\e94f"; $tgico-location: "\e94f";
$tgico-help: "\e950"; $tgico-lock: "\e950";
$tgico-info2: "\e951"; $tgico-loginlogodesktop: "\e951";
$tgico-forward: "\e952"; $tgico-loginlogomobile: "\e952";
$tgico-gifs: "\e953"; $tgico-logout: "\e953";
$tgico-flag: "\e954"; $tgico-mention: "\e954";
$tgico-folder: "\e955"; $tgico-menu: "\e955";
$tgico-eye1: "\e956"; $tgico-message: "\e956";
$tgico-eye2: "\e957"; $tgico-messageunread: "\e957";
$tgico-favourites: "\e958"; $tgico-microphone: "\e958";
$tgico-edit: "\e959"; $tgico-microphone2: "\e959";
$tgico-email: "\e95a"; $tgico-minus: "\e95a";
$tgico-eats: "\e95b"; $tgico-monospace: "\e95b";
$tgico-dragmedia: "\e95c"; $tgico-more: "\e95c";
$tgico-down: "\e95d"; $tgico-mute: "\e95d";
$tgico-download: "\e95e"; $tgico-muted: "\e95e";
$tgico-dragfiles: "\e95f"; $tgico-newchannel: "\e95f";
$tgico-deleteuser: "\e960"; $tgico-newchat_filled: "\e960";
$tgico-document: "\e961"; $tgico-newgroup: "\e961";
$tgico-delete_filled: "\e962"; $tgico-newprivate: "\e962";
$tgico-delete: "\e963"; $tgico-next: "\e963";
$tgico-deleteleft: "\e964"; $tgico-noncontacts: "\e964";
$tgico-copy: "\e965"; $tgico-nosound: "\e965";
$tgico-data: "\e966"; $tgico-notificationsoff: "\e966";
$tgico-commentssticker: "\e967"; $tgico-notificationson: "\e967";
$tgico-clouddownload: "\e968"; $tgico-passwordoff: "\e968";
$tgico-colorize: "\e969"; $tgico-pause: "\e969";
$tgico-comments: "\e96a"; $tgico-permissions: "\e96a";
$tgico-checkboxon: "\e96b"; $tgico-phone: "\e96b";
$tgico-close: "\e96c"; $tgico-photo: "\e96c";
$tgico-checkbox: "\e96d"; $tgico-pin: "\e96d";
$tgico-checkboxblock: "\e96e"; $tgico-pinlist: "\e96e";
$tgico-checkboxempty: "\e96f"; $tgico-pinned_filled: "\e96f";
$tgico-chatsplaceholder: "\e970"; $tgico-pinnedchat: "\e970";
$tgico-check: "\e971"; $tgico-play: "\e971";
$tgico-channel: "\e972"; $tgico-plus: "\e972";
$tgico-channelviews: "\e973"; $tgico-poll: "\e973";
$tgico-chatspinned: "\e974"; $tgico-previous: "\e974";
$tgico-cameraadd: "\e975"; $tgico-radiooff: "\e975";
$tgico-car: "\e976"; $tgico-radioon: "\e976";
$tgico-camera: "\e977"; $tgico-readchats: "\e977";
$tgico-bots: "\e978"; $tgico-recent: "\e978";
$tgico-calendar: "\e979"; $tgico-replace: "\e979";
$tgico-calendarfilter: "\e97a"; $tgico-reply: "\e97a";
$tgico-botcom: "\e97b"; $tgico-revote: "\e97b";
$tgico-avatar_deletedaccount: "\e97c"; $tgico-saved: "\e97c";
$tgico-avatar_savedmessages: "\e97d"; $tgico-savedmessages: "\e97d";
$tgico-bold: "\e97e"; $tgico-schedule: "\e97e";
$tgico-attach: "\e97f"; $tgico-scheduled: "\e97f";
$tgico-avatar_archivedchats: "\e980"; $tgico-search: "\e980";
$tgico-arrow_next: "\e981"; $tgico-select: "\e981";
$tgico-arrow_back: "\e982"; $tgico-send: "\e982";
$tgico-arrow_down: "\e983"; $tgico-send2: "\e983";
$tgico-animals: "\e984"; $tgico-sending: "\e984";
$tgico-archive: "\e985"; $tgico-sendingerror: "\e985";
$tgico-adduser: "\e986"; $tgico-settings: "\e986";
$tgico-admin: "\e987"; $tgico-smallscreen: "\e987";
$tgico-addmember_filled: "\e988"; $tgico-smile: "\e988";
$tgico-activesessions: "\e989"; $tgico-sport: "\e989";
$tgico-add: "\e98a"; $tgico-stickers: "\e98a";
$tgico-fullscreen: "\e98b"; $tgico-stop: "\e98b";
$tgico-check_svg1: "\e98c"; $tgico-strikethrough: "\e98c";
$tgico-checks: "\e98d"; $tgico-textedit: "\e98d";
$tgico-tip: "\e98e";
$tgico-unarchive: "\e98f";
$tgico-underline: "\e990";
$tgico-unlock: "\e991";
$tgico-unmute: "\e992";
$tgico-unpin: "\e993";
$tgico-unread: "\e994";
$tgico-up: "\e995";
$tgico-user: "\e996";
$tgico-username: "\e997";
$tgico-write: "\e998";
$tgico-zoomin: "\e999";
$tgico-zoomout: "\e99a";

13
src/scss/style.scss
View File

@ -1128,3 +1128,16 @@ middle-ellipsis-element {
background: linear-gradient(180deg, rgba(0, 0, 0, .06) 0%, rgba(0, 0, 0, 0) 20%, rgba(0, 0, 0, 0) 94%, rgba(0, 0, 0, .06) 100%); background: linear-gradient(180deg, rgba(0, 0, 0, .06) 0%, rgba(0, 0, 0, 0) 20%, rgba(0, 0, 0, 0) 94%, rgba(0, 0, 0, .06) 100%);
} }
} }
// ! TEMPORARY
.tgico-reply:before,
.tgico-attach:before,
.tgico-saved:before,
.tgico-phone:before,
.tgico-admin:before,
.tgico-message:before,
.tgico-fontsize:before,
.tgico-forward:before {
font-size: 20px !important;
padding: 0 2px;
}