From 0c5f139d35d0c9b1c2a44a9096d0778e886491d3 Mon Sep 17 00:00:00 2001 From: Jannis Berndt Date: Sun, 13 Jun 2021 21:57:54 +0200 Subject: [PATCH] Refactor: Linter test for only class-sided default values (#392) * Creating Linter test for only class-sided default values and moved all default values to class side * Fixes from merge --- .../defaultNumberOfRequestedMessages.st | 0 .../TCCChat.class/instance/initialize.st | 2 +- .../TCCChat.class/methodProperties.json | 4 ++-- .../defaultMessageLimit.st | 0 .../methodProperties.json | 3 +-- .../instance/getChatHistoryFrom..st | 2 +- .../TCCCore.class/methodProperties.json | 2 +- .../{instance => class}/defaultExtent.st | 2 +- .../defaultHeaderHeight.st | 2 +- .../{instance => class}/defaultInputWidth.st | 2 +- .../instance/addHeader.st | 2 +- .../instance/createErrorLabel..st | 2 +- .../instance/createInputField..st | 2 +- .../instance/initialize.st | 2 +- .../methodProperties.json | 14 +++++------ .../defaultContentInset.st | 0 .../defaultContentLayoutInset.st | 0 .../defaultContentWidthPercentage.st | 0 .../defaultInfoBarHeight.st | 0 .../{instance => class}/defaultSpacing.st | 0 .../instance/addBackButton.st | 2 +- .../instance/createContentWrapper.st | 10 ++++---- .../instance/createDescription.st | 2 +- .../instance/createInfoBar.st | 2 +- .../methodProperties.json | 18 +++++++------- .../{instance => class}/defaultHeight.st | 0 .../defaultLastMessageOffset.st} | 2 +- .../class/defaultMessagePreviewLength.st | 4 ++++ .../defaultTitleLength.st} | 2 +- .../defaultTitleOffset.st} | 2 +- .../instance/addBorder.st | 2 +- .../instance/addLastMessage.st | 4 ++-- .../instance/addTitle.st | 4 ++-- .../instance/initialize.st | 2 +- .../instance/messageMarginTop.st | 4 ---- .../instance/messagePreviewLength.st | 4 ---- .../methodProperties.json | 21 ++++++++-------- .../defaultMessageMargin.st | 0 .../instance/addMessageAtBottom..st | 6 ++--- .../methodProperties.json | 5 ++-- .../defaultInputfieldHeight.st | 0 .../defaultTitleBarHeigth.st | 0 .../instance/addMessageWindow.st | 2 +- .../instance/addTextInputField.st | 2 +- .../instance/createInputBar.st | 2 +- .../instance/createTitleBar.st | 2 +- .../TCUChatWindow.class/methodProperties.json | 12 +++++----- .../{instance => class}/defaultScrollStep.st | 0 .../{instance => class}/defaultWidth.st | 0 .../TCUChatsList.class/instance/initialize.st | 2 +- .../TCUChatsList.class/instance/scrollDown.st | 2 +- .../TCUChatsList.class/instance/scrollUp.st | 2 +- .../TCUChatsList.class/methodProperties.json | 11 ++++----- .../{instance => class}/defaultHeight.st | 0 .../{instance => class}/defaultSpacing.st | 0 .../instance/addCloseButton.st | 2 +- .../instance/addLogoutButton.st | 2 +- .../instance/addNewChatButton.st | 2 +- .../TCUHeaderBar.class/instance/initialize.st | 2 +- .../TCUHeaderBar.class/methodProperties.json | 12 +++++----- .../{instance => class}/defaultExtent.st | 0 .../TCUMain.class/instance/initialize.st | 2 +- .../TCUMain.class/methodProperties.json | 5 ++-- .../defaultBottomMargin.st | 0 .../{instance => class}/defaultHeight.st | 0 .../{instance => class}/defaultLayoutInset.st | 0 .../{instance => class}/defaultMargins.st | 0 .../{instance => class}/defaultTextMorph.st | 0 .../{instance => class}/defaultWidth.st | 0 .../TCUMessage.class/instance/addDate.st | 2 +- .../TCUMessage.class/instance/addSender.st | 4 ++-- .../TCUMessage.class/instance/addText.st | 4 ++-- .../instance/initializeDefaults.st | 6 ++--- .../instance/maxContentWidth.st | 4 ++-- .../instance/shrinkToContent.st | 2 +- .../TCUMessage.class/methodProperties.json | 24 +++++++++---------- .../{instance => class}/defaultHeight.st | 0 .../{instance => class}/defaultOffset.st | 0 .../class}/defaultSpacing.st | 0 .../{instance => class}/defaultWidth.st | 0 .../TCUModal.class/instance/addCloseButton.st | 2 +- .../TCUModal.class/instance/defaultSpacing.st | 4 ---- .../TCUModal.class/instance/initialize.st | 4 ++-- .../TCUModal.class/instance/setText.st | 2 +- .../TCUModal.class/methodProperties.json | 10 ++++---- .../defaultAuthorOffset.st | 0 .../{instance => class}/defaultBorderWidth.st | 0 .../{instance => class}/defaultChatOffset.st | 0 .../{instance => class}/defaultHeight.st | 0 .../{instance => class}/defaultLineLength.st | 0 .../defaultMessageLength.st | 0 .../defaultMessageOffset.st | 0 .../defaultMessageWidth.st | 0 .../{instance => class}/defaultOffset.st | 2 +- .../defaultTimeOutDuration.st | 0 .../{instance => class}/defaultWidth.st | 0 .../instance/addContent.st | 10 ++++---- .../instance/calculatePosition.st | 2 +- .../instance/initializeDefaults.st | 6 ++--- .../instance/startTimeOut.st | 2 +- .../methodProperties.json | 24 +++++++++---------- .../instance/testDefaultValuesOnClassSide.st | 8 +++++++ .../methodProperties.json | 1 + 103 files changed, 160 insertions(+), 164 deletions(-) rename packages/TelegramClient-Core.package/TCCChat.class/{instance => class}/defaultNumberOfRequestedMessages.st (100%) rename packages/TelegramClient-Core.package/TCCChatsHandler.class/{instance => class}/defaultMessageLimit.st (100%) rename packages/TelegramClient-UI.package/TCUAuthentication.class/{instance => class}/defaultExtent.st (64%) rename packages/TelegramClient-UI.package/TCUAuthentication.class/{instance => class}/defaultHeaderHeight.st (63%) rename packages/TelegramClient-UI.package/TCUAuthentication.class/{instance => class}/defaultInputWidth.st (62%) rename packages/TelegramClient-UI.package/TCUChatInfoPage.class/{instance => class}/defaultContentInset.st (100%) rename packages/TelegramClient-UI.package/TCUChatInfoPage.class/{instance => class}/defaultContentLayoutInset.st (100%) rename packages/TelegramClient-UI.package/TCUChatInfoPage.class/{instance => class}/defaultContentWidthPercentage.st (100%) rename packages/TelegramClient-UI.package/TCUChatInfoPage.class/{instance => class}/defaultInfoBarHeight.st (100%) rename packages/TelegramClient-UI.package/TCUChatInfoPage.class/{instance => class}/defaultSpacing.st (100%) rename packages/TelegramClient-UI.package/TCUChatListItem.class/{instance => class}/defaultHeight.st (100%) rename packages/TelegramClient-UI.package/TCUChatListItem.class/{instance/lastMessageOffset.st => class/defaultLastMessageOffset.st} (52%) create mode 100644 packages/TelegramClient-UI.package/TCUChatListItem.class/class/defaultMessagePreviewLength.st rename packages/TelegramClient-UI.package/TCUChatListItem.class/{instance/titleLength.st => class/defaultTitleLength.st} (52%) rename packages/TelegramClient-UI.package/TCUChatListItem.class/{instance/titleOffset.st => class/defaultTitleOffset.st} (58%) delete mode 100644 packages/TelegramClient-UI.package/TCUChatListItem.class/instance/messageMarginTop.st delete mode 100644 packages/TelegramClient-UI.package/TCUChatListItem.class/instance/messagePreviewLength.st rename packages/TelegramClient-UI.package/TCUChatMessageList.class/{instance => class}/defaultMessageMargin.st (100%) rename packages/TelegramClient-UI.package/TCUChatWindow.class/{instance => class}/defaultInputfieldHeight.st (100%) rename packages/TelegramClient-UI.package/TCUChatWindow.class/{instance => class}/defaultTitleBarHeigth.st (100%) rename packages/TelegramClient-UI.package/TCUChatsList.class/{instance => class}/defaultScrollStep.st (100%) rename packages/TelegramClient-UI.package/TCUChatsList.class/{instance => class}/defaultWidth.st (100%) rename packages/TelegramClient-UI.package/TCUHeaderBar.class/{instance => class}/defaultHeight.st (100%) rename packages/TelegramClient-UI.package/TCUHeaderBar.class/{instance => class}/defaultSpacing.st (100%) rename packages/TelegramClient-UI.package/TCUMain.class/{instance => class}/defaultExtent.st (100%) rename packages/TelegramClient-UI.package/TCUMessage.class/{instance => class}/defaultBottomMargin.st (100%) rename packages/TelegramClient-UI.package/TCUMessage.class/{instance => class}/defaultHeight.st (100%) rename packages/TelegramClient-UI.package/TCUMessage.class/{instance => class}/defaultLayoutInset.st (100%) rename packages/TelegramClient-UI.package/TCUMessage.class/{instance => class}/defaultMargins.st (100%) rename packages/TelegramClient-UI.package/TCUMessage.class/{instance => class}/defaultTextMorph.st (100%) rename packages/TelegramClient-UI.package/TCUMessage.class/{instance => class}/defaultWidth.st (100%) rename packages/TelegramClient-UI.package/TCUModal.class/{instance => class}/defaultHeight.st (100%) rename packages/TelegramClient-UI.package/TCUModal.class/{instance => class}/defaultOffset.st (100%) rename packages/TelegramClient-UI.package/{TCUMain.class/instance => TCUModal.class/class}/defaultSpacing.st (100%) rename packages/TelegramClient-UI.package/TCUModal.class/{instance => class}/defaultWidth.st (100%) delete mode 100644 packages/TelegramClient-UI.package/TCUModal.class/instance/defaultSpacing.st rename packages/TelegramClient-UI.package/TCUNotification.class/{instance => class}/defaultAuthorOffset.st (100%) rename packages/TelegramClient-UI.package/TCUNotification.class/{instance => class}/defaultBorderWidth.st (100%) rename packages/TelegramClient-UI.package/TCUNotification.class/{instance => class}/defaultChatOffset.st (100%) rename packages/TelegramClient-UI.package/TCUNotification.class/{instance => class}/defaultHeight.st (100%) rename packages/TelegramClient-UI.package/TCUNotification.class/{instance => class}/defaultLineLength.st (100%) rename packages/TelegramClient-UI.package/TCUNotification.class/{instance => class}/defaultMessageLength.st (100%) rename packages/TelegramClient-UI.package/TCUNotification.class/{instance => class}/defaultMessageOffset.st (100%) rename packages/TelegramClient-UI.package/TCUNotification.class/{instance => class}/defaultMessageWidth.st (100%) rename packages/TelegramClient-UI.package/TCUNotification.class/{instance => class}/defaultOffset.st (71%) rename packages/TelegramClient-UI.package/TCUNotification.class/{instance => class}/defaultTimeOutDuration.st (100%) rename packages/TelegramClient-UI.package/TCUNotification.class/{instance => class}/defaultWidth.st (100%) create mode 100644 packages/TelegramClientTests-Misc.package/TCTMLinterTests.class/instance/testDefaultValuesOnClassSide.st diff --git a/packages/TelegramClient-Core.package/TCCChat.class/instance/defaultNumberOfRequestedMessages.st b/packages/TelegramClient-Core.package/TCCChat.class/class/defaultNumberOfRequestedMessages.st similarity index 100% rename from packages/TelegramClient-Core.package/TCCChat.class/instance/defaultNumberOfRequestedMessages.st rename to packages/TelegramClient-Core.package/TCCChat.class/class/defaultNumberOfRequestedMessages.st diff --git a/packages/TelegramClient-Core.package/TCCChat.class/instance/initialize.st b/packages/TelegramClient-Core.package/TCCChat.class/instance/initialize.st index 55f6f1607..d40a2c24c 100644 --- a/packages/TelegramClient-Core.package/TCCChat.class/instance/initialize.st +++ b/packages/TelegramClient-Core.package/TCCChat.class/instance/initialize.st @@ -6,4 +6,4 @@ initialize messages: (OrderedCollection newFrom: {TCCNullMessage new}); waitingForUpdate: false; positionKnown: false; - numberOfRequestedMessages: self defaultNumberOfRequestedMessages. + numberOfRequestedMessages: self class defaultNumberOfRequestedMessages. diff --git a/packages/TelegramClient-Core.package/TCCChat.class/methodProperties.json b/packages/TelegramClient-Core.package/TCCChat.class/methodProperties.json index 5b43710cc..fcaf4dcca 100644 --- a/packages/TelegramClient-Core.package/TCCChat.class/methodProperties.json +++ b/packages/TelegramClient-Core.package/TCCChat.class/methodProperties.json @@ -1,16 +1,16 @@ { "class" : { + "defaultNumberOfRequestedMessages" : "js 8/1/2020 18:52", "newFromChatEvent:" : "JB 5/31/2021 16:21" }, "instance" : { "addNewestMessage:" : "js 8/2/2020 12:58", "addOldestMessage:" : "js 8/2/2020 12:58", "canSendMessages" : "5/11/2021 10:09:15", "canSendMessages:" : "TR 5/5/2021 16:31", - "defaultNumberOfRequestedMessages" : "js 8/1/2020 18:52", "id" : "rs 6/7/2020 22:20", "id:" : "5/11/2021 10:09:15", "ifNotWaitingForUpdate:" : "js 8/2/2020 13:17", - "initialize" : "per 5/26/2021 14:02", + "initialize" : "JB 6/11/2021 18:31", "initializeFromChatEvent:" : "JB 5/31/2021 16:19", "isGroup" : "RS 5/29/2021 18:12", "isPrivate" : "per 5/13/2021 08:48", diff --git a/packages/TelegramClient-Core.package/TCCChatsHandler.class/instance/defaultMessageLimit.st b/packages/TelegramClient-Core.package/TCCChatsHandler.class/class/defaultMessageLimit.st similarity index 100% rename from packages/TelegramClient-Core.package/TCCChatsHandler.class/instance/defaultMessageLimit.st rename to packages/TelegramClient-Core.package/TCCChatsHandler.class/class/defaultMessageLimit.st diff --git a/packages/TelegramClient-Core.package/TCCChatsHandler.class/methodProperties.json b/packages/TelegramClient-Core.package/TCCChatsHandler.class/methodProperties.json index bced1df2b..5213ef8e6 100644 --- a/packages/TelegramClient-Core.package/TCCChatsHandler.class/methodProperties.json +++ b/packages/TelegramClient-Core.package/TCCChatsHandler.class/methodProperties.json @@ -1,6 +1,6 @@ { "class" : { - }, + "defaultMessageLimit" : "js 8/1/2020 18:24" }, "instance" : { "addChat:" : "JB 6/4/2021 21:34", "addNewMessage:" : "pk 6/8/2021 09:31", @@ -8,7 +8,6 @@ "client" : "per 5/21/2021 16:55", "core" : "per 5/21/2021 16:55", "core:" : "per 5/21/2021 16:55", - "defaultMessageLimit" : "js 8/1/2020 18:24", "getChatHistoryFrom:with:limit:" : "per 5/21/2021 16:55", "getChats" : "js 7/31/2020 22:50", "handleNewMessage:" : "pk 6/8/2021 09:32", diff --git a/packages/TelegramClient-Core.package/TCCCore.class/instance/getChatHistoryFrom..st b/packages/TelegramClient-Core.package/TCCCore.class/instance/getChatHistoryFrom..st index c94ed4061..5b0aa8e43 100644 --- a/packages/TelegramClient-Core.package/TCCCore.class/instance/getChatHistoryFrom..st +++ b/packages/TelegramClient-Core.package/TCCCore.class/instance/getChatHistoryFrom..st @@ -4,4 +4,4 @@ getChatHistoryFrom: aChatID self chatsHandler getChatHistoryFrom: aChatID with: (self chats getChat: aChatID) messages last id - limit: self chatsHandler defaultMessageLimit. \ No newline at end of file + limit: self chatsHandler class defaultMessageLimit. \ No newline at end of file diff --git a/packages/TelegramClient-Core.package/TCCCore.class/methodProperties.json b/packages/TelegramClient-Core.package/TCCCore.class/methodProperties.json index bfff79ba9..4f5f65949 100644 --- a/packages/TelegramClient-Core.package/TCCCore.class/methodProperties.json +++ b/packages/TelegramClient-Core.package/TCCCore.class/methodProperties.json @@ -13,7 +13,7 @@ "client" : "R.S 5/20/2020 16:08", "client:" : "js 6/13/2020 19:10", "freeClient" : "JB 6/7/2021 11:14", - "getChatHistoryFrom:" : "js 8/1/2020 18:19", + "getChatHistoryFrom:" : "JB 6/11/2021 18:27", "getOwnProfile" : "pk 5/13/2021 09:44", "handleEvent:" : "per 5/26/2021 14:04", "handleMessageEvent:" : "pk 6/11/2021 10:20", diff --git a/packages/TelegramClient-UI.package/TCUAuthentication.class/instance/defaultExtent.st b/packages/TelegramClient-UI.package/TCUAuthentication.class/class/defaultExtent.st similarity index 64% rename from packages/TelegramClient-UI.package/TCUAuthentication.class/instance/defaultExtent.st rename to packages/TelegramClient-UI.package/TCUAuthentication.class/class/defaultExtent.st index a087e83ee..b5b77dae6 100644 --- a/packages/TelegramClient-UI.package/TCUAuthentication.class/instance/defaultExtent.st +++ b/packages/TelegramClient-UI.package/TCUAuthentication.class/class/defaultExtent.st @@ -1,4 +1,4 @@ -defaultValues +default values defaultExtent ^ 600 @ 400 \ No newline at end of file diff --git a/packages/TelegramClient-UI.package/TCUAuthentication.class/instance/defaultHeaderHeight.st b/packages/TelegramClient-UI.package/TCUAuthentication.class/class/defaultHeaderHeight.st similarity index 63% rename from packages/TelegramClient-UI.package/TCUAuthentication.class/instance/defaultHeaderHeight.st rename to packages/TelegramClient-UI.package/TCUAuthentication.class/class/defaultHeaderHeight.st index 5f657d248..ff907d657 100644 --- a/packages/TelegramClient-UI.package/TCUAuthentication.class/instance/defaultHeaderHeight.st +++ b/packages/TelegramClient-UI.package/TCUAuthentication.class/class/defaultHeaderHeight.st @@ -1,4 +1,4 @@ -defaultValues +default values defaultHeaderHeight ^ 40 \ No newline at end of file diff --git a/packages/TelegramClient-UI.package/TCUAuthentication.class/instance/defaultInputWidth.st b/packages/TelegramClient-UI.package/TCUAuthentication.class/class/defaultInputWidth.st similarity index 62% rename from packages/TelegramClient-UI.package/TCUAuthentication.class/instance/defaultInputWidth.st rename to packages/TelegramClient-UI.package/TCUAuthentication.class/class/defaultInputWidth.st index 6aa96ed20..92adf0866 100644 --- a/packages/TelegramClient-UI.package/TCUAuthentication.class/instance/defaultInputWidth.st +++ b/packages/TelegramClient-UI.package/TCUAuthentication.class/class/defaultInputWidth.st @@ -1,4 +1,4 @@ -defaultValues +default values defaultInputWidth ^ 150 \ No newline at end of file diff --git a/packages/TelegramClient-UI.package/TCUAuthentication.class/instance/addHeader.st b/packages/TelegramClient-UI.package/TCUAuthentication.class/instance/addHeader.st index ac51e89ed..53c502538 100644 --- a/packages/TelegramClient-UI.package/TCUAuthentication.class/instance/addHeader.st +++ b/packages/TelegramClient-UI.package/TCUAuthentication.class/instance/addHeader.st @@ -5,7 +5,7 @@ addHeader header := RectangleMorph new borderWidth: 0; color: TCUDefaultValues colorGray; - extent: self width @ self defaultHeaderHeight. + extent: self width @ self class defaultHeaderHeight. self addMorph: header; diff --git a/packages/TelegramClient-UI.package/TCUAuthentication.class/instance/createErrorLabel..st b/packages/TelegramClient-UI.package/TCUAuthentication.class/instance/createErrorLabel..st index 87daa5046..4fa4f0c2c 100644 --- a/packages/TelegramClient-UI.package/TCUAuthentication.class/instance/createErrorLabel..st +++ b/packages/TelegramClient-UI.package/TCUAuthentication.class/instance/createErrorLabel..st @@ -4,7 +4,7 @@ createErrorLabel: aString self errorLabel: (TextMorph new contents: aString asText; - center: (self center + (0 @ (self defaultExtent y / 3))); + center: (self center + (0 @ (self class defaultExtent y / 3))); color: Color red; lock); addMorph: self errorLabel. \ No newline at end of file diff --git a/packages/TelegramClient-UI.package/TCUAuthentication.class/instance/createInputField..st b/packages/TelegramClient-UI.package/TCUAuthentication.class/instance/createInputField..st index c6c65000a..b8618b00b 100644 --- a/packages/TelegramClient-UI.package/TCUAuthentication.class/instance/createInputField..st +++ b/packages/TelegramClient-UI.package/TCUAuthentication.class/instance/createInputField..st @@ -4,7 +4,7 @@ createInputField: aString self inputField: (TextMorph new contentsWrapped: aString asText; - extent: self defaultInputWidth @ 50; + extent: self class defaultInputWidth @ 50; borderColor: TCUDefaultValues colorGray; borderWidth: 1; center: self instructionLabel center + (0 @ 30); diff --git a/packages/TelegramClient-UI.package/TCUAuthentication.class/instance/initialize.st b/packages/TelegramClient-UI.package/TCUAuthentication.class/instance/initialize.st index 7f1315fd1..481cfe6d0 100644 --- a/packages/TelegramClient-UI.package/TCUAuthentication.class/instance/initialize.st +++ b/packages/TelegramClient-UI.package/TCUAuthentication.class/instance/initialize.st @@ -4,7 +4,7 @@ initialize super initialize. self subscribeCore; - extent: self defaultExtent; + extent: self class defaultExtent; color: Color white; borderWidth: 1; borderColor: TCUDefaultValues colorGray; diff --git a/packages/TelegramClient-UI.package/TCUAuthentication.class/methodProperties.json b/packages/TelegramClient-UI.package/TCUAuthentication.class/methodProperties.json index dc081ef56..dd2d9bf81 100644 --- a/packages/TelegramClient-UI.package/TCUAuthentication.class/methodProperties.json +++ b/packages/TelegramClient-UI.package/TCUAuthentication.class/methodProperties.json @@ -1,8 +1,11 @@ { "class" : { + "defaultExtent" : "R.S 5/20/2020 13:51", + "defaultHeaderHeight" : "r.s 8/2/2020 21:29", + "defaultInputWidth" : "R.S 5/20/2020 13:51", "newWithCore:" : "R.S 5/31/2020 20:16" }, "instance" : { - "addHeader" : "r.s 8/2/2020 21:29", + "addHeader" : "JB 6/11/2021 18:28", "addTitle:to:" : "N.S. 7/26/2020 15:52", "buttonBack" : "rs 6/11/2020 18:53", "buttonBack:" : "rs 6/11/2020 18:53", @@ -18,16 +21,13 @@ "createButtonBack" : "js 7/31/2020 15:17", "createButtonNext" : "js 7/31/2020 15:17", "createButtonVerify" : "js 6/13/2020 18:44", - "createErrorLabel:" : "js 7/31/2020 15:18", - "createInputField:" : "js 7/31/2020 15:18", + "createErrorLabel:" : "JB 6/11/2021 18:28", + "createInputField:" : "JB 6/11/2021 18:28", "createLabel:" : "js 6/13/2020 18:13", - "defaultExtent" : "R.S 5/20/2020 13:51", - "defaultHeaderHeight" : "r.s 8/2/2020 21:29", - "defaultInputWidth" : "R.S 5/20/2020 13:51", "delete" : "JB 6/7/2021 11:11", "errorLabel" : "R.S 5/20/2020 13:51", "errorLabel:" : "R.S 5/20/2020 13:51", - "initialize" : "js 6/13/2020 18:44", + "initialize" : "JB 6/11/2021 18:36", "initializeMorphs" : "js 5/29/2020 20:11", "inputField" : "R.S 5/20/2020 13:51", "inputField:" : "js 5/31/2020 20:07", diff --git a/packages/TelegramClient-UI.package/TCUChatInfoPage.class/instance/defaultContentInset.st b/packages/TelegramClient-UI.package/TCUChatInfoPage.class/class/defaultContentInset.st similarity index 100% rename from packages/TelegramClient-UI.package/TCUChatInfoPage.class/instance/defaultContentInset.st rename to packages/TelegramClient-UI.package/TCUChatInfoPage.class/class/defaultContentInset.st diff --git a/packages/TelegramClient-UI.package/TCUChatInfoPage.class/instance/defaultContentLayoutInset.st b/packages/TelegramClient-UI.package/TCUChatInfoPage.class/class/defaultContentLayoutInset.st similarity index 100% rename from packages/TelegramClient-UI.package/TCUChatInfoPage.class/instance/defaultContentLayoutInset.st rename to packages/TelegramClient-UI.package/TCUChatInfoPage.class/class/defaultContentLayoutInset.st diff --git a/packages/TelegramClient-UI.package/TCUChatInfoPage.class/instance/defaultContentWidthPercentage.st b/packages/TelegramClient-UI.package/TCUChatInfoPage.class/class/defaultContentWidthPercentage.st similarity index 100% rename from packages/TelegramClient-UI.package/TCUChatInfoPage.class/instance/defaultContentWidthPercentage.st rename to packages/TelegramClient-UI.package/TCUChatInfoPage.class/class/defaultContentWidthPercentage.st diff --git a/packages/TelegramClient-UI.package/TCUChatInfoPage.class/instance/defaultInfoBarHeight.st b/packages/TelegramClient-UI.package/TCUChatInfoPage.class/class/defaultInfoBarHeight.st similarity index 100% rename from packages/TelegramClient-UI.package/TCUChatInfoPage.class/instance/defaultInfoBarHeight.st rename to packages/TelegramClient-UI.package/TCUChatInfoPage.class/class/defaultInfoBarHeight.st diff --git a/packages/TelegramClient-UI.package/TCUChatInfoPage.class/instance/defaultSpacing.st b/packages/TelegramClient-UI.package/TCUChatInfoPage.class/class/defaultSpacing.st similarity index 100% rename from packages/TelegramClient-UI.package/TCUChatInfoPage.class/instance/defaultSpacing.st rename to packages/TelegramClient-UI.package/TCUChatInfoPage.class/class/defaultSpacing.st diff --git a/packages/TelegramClient-UI.package/TCUChatInfoPage.class/instance/addBackButton.st b/packages/TelegramClient-UI.package/TCUChatInfoPage.class/instance/addBackButton.st index d18ca13a0..74a6def1c 100644 --- a/packages/TelegramClient-UI.package/TCUChatInfoPage.class/instance/addBackButton.st +++ b/packages/TelegramClient-UI.package/TCUChatInfoPage.class/instance/addBackButton.st @@ -10,4 +10,4 @@ addBackButton yourself. self infoBar addMorph: backButton. - backButton position: (self infoBar left + self defaultSpacing) @ (self infoBar top + self defaultSpacing). \ No newline at end of file + backButton position: (self infoBar left + self class defaultSpacing) @ (self infoBar top + self class defaultSpacing). \ No newline at end of file diff --git a/packages/TelegramClient-UI.package/TCUChatInfoPage.class/instance/createContentWrapper.st b/packages/TelegramClient-UI.package/TCUChatInfoPage.class/instance/createContentWrapper.st index 14523e90e..d3c353c69 100644 --- a/packages/TelegramClient-UI.package/TCUChatInfoPage.class/instance/createContentWrapper.st +++ b/packages/TelegramClient-UI.package/TCUChatInfoPage.class/instance/createContentWrapper.st @@ -4,12 +4,12 @@ createContentWrapper self contentWrapper: (RectangleMorph new borderWidth: 0; color: Color transparent; - width: self width * self defaultContentWidthPercentage; - height: self height - self defaultInfoBarHeight; - center: self center + (0 @ (self defaultInfoBarHeight / 2)); + width: self width * self class defaultContentWidthPercentage; + height: self height - self class defaultInfoBarHeight; + center: self center + (0 @ (self class defaultInfoBarHeight / 2)); layoutPolicy: TableLayout new; listDirection: #topToBottom; hResizing: #spaceFill; vResizing: #spaceFill; - layoutInset: self defaultContentLayoutInset; - cellInset: self defaultContentInset). \ No newline at end of file + layoutInset: self class defaultContentLayoutInset; + cellInset: self class defaultContentInset). \ No newline at end of file diff --git a/packages/TelegramClient-UI.package/TCUChatInfoPage.class/instance/createDescription.st b/packages/TelegramClient-UI.package/TCUChatInfoPage.class/instance/createDescription.st index e33442522..acfa6d1f6 100644 --- a/packages/TelegramClient-UI.package/TCUChatInfoPage.class/instance/createDescription.st +++ b/packages/TelegramClient-UI.package/TCUChatInfoPage.class/instance/createDescription.st @@ -8,6 +8,6 @@ createDescription listDirection: #topToBottom; hResizing: #spaceFill; vResizing: #shrinkWrap; - cellInset: self defaultContentInset; + cellInset: self class defaultContentInset; useRoundedCorners; yourself). \ No newline at end of file diff --git a/packages/TelegramClient-UI.package/TCUChatInfoPage.class/instance/createInfoBar.st b/packages/TelegramClient-UI.package/TCUChatInfoPage.class/instance/createInfoBar.st index 1dfcd068c..40cdf9c38 100644 --- a/packages/TelegramClient-UI.package/TCUChatInfoPage.class/instance/createInfoBar.st +++ b/packages/TelegramClient-UI.package/TCUChatInfoPage.class/instance/createInfoBar.st @@ -5,6 +5,6 @@ createInfoBar borderWidth: 0; color: Color white; width: self width; - height: self defaultInfoBarHeight; + height: self class defaultInfoBarHeight; topLeft: self topLeft; yourself). \ No newline at end of file diff --git a/packages/TelegramClient-UI.package/TCUChatInfoPage.class/methodProperties.json b/packages/TelegramClient-UI.package/TCUChatInfoPage.class/methodProperties.json index ae40e5744..2552a1b85 100644 --- a/packages/TelegramClient-UI.package/TCUChatInfoPage.class/methodProperties.json +++ b/packages/TelegramClient-UI.package/TCUChatInfoPage.class/methodProperties.json @@ -1,8 +1,13 @@ { "class" : { + "defaultContentInset" : "RS 5/29/2021 18:32", + "defaultContentLayoutInset" : "RS 5/29/2021 18:49", + "defaultContentWidthPercentage" : "RS 5/29/2021 18:49", + "defaultInfoBarHeight" : "RS 5/20/2021 21:30", + "defaultSpacing" : "RS 5/20/2021 20:57", "newFor:withBounds:" : "RS 5/29/2021 18:05" }, "instance" : { - "addBackButton" : "JB 6/4/2021 16:42", + "addBackButton" : "JB 6/11/2021 15:31", "addContent" : "RS 5/29/2021 18:12", "addDescription" : "RS 5/29/2021 18:00", "addDescriptionText" : "JB 5/31/2021 15:05", @@ -13,14 +18,9 @@ "chat:" : "RS 5/29/2021 18:46", "contentWrapper" : "RS 5/29/2021 18:46", "contentWrapper:" : "RS 5/29/2021 18:46", - "createContentWrapper" : "RS 5/29/2021 18:50", - "createDescription" : "RS 5/29/2021 18:32", - "createInfoBar" : "RS 5/20/2021 21:31", - "defaultContentInset" : "RS 5/29/2021 18:32", - "defaultContentLayoutInset" : "RS 5/29/2021 18:49", - "defaultContentWidthPercentage" : "RS 5/29/2021 18:49", - "defaultInfoBarHeight" : "RS 5/20/2021 21:30", - "defaultSpacing" : "RS 5/20/2021 20:57", + "createContentWrapper" : "JB 6/11/2021 15:31", + "createDescription" : "JB 6/11/2021 15:31", + "createInfoBar" : "JB 6/11/2021 18:35", "description" : "RS 5/29/2021 18:46", "description:" : "RS 5/29/2021 18:47", "infoBar" : "RS 5/20/2021 21:38", diff --git a/packages/TelegramClient-UI.package/TCUChatListItem.class/instance/defaultHeight.st b/packages/TelegramClient-UI.package/TCUChatListItem.class/class/defaultHeight.st similarity index 100% rename from packages/TelegramClient-UI.package/TCUChatListItem.class/instance/defaultHeight.st rename to packages/TelegramClient-UI.package/TCUChatListItem.class/class/defaultHeight.st diff --git a/packages/TelegramClient-UI.package/TCUChatListItem.class/instance/lastMessageOffset.st b/packages/TelegramClient-UI.package/TCUChatListItem.class/class/defaultLastMessageOffset.st similarity index 52% rename from packages/TelegramClient-UI.package/TCUChatListItem.class/instance/lastMessageOffset.st rename to packages/TelegramClient-UI.package/TCUChatListItem.class/class/defaultLastMessageOffset.st index 70a28f62b..333fe18ab 100644 --- a/packages/TelegramClient-UI.package/TCUChatListItem.class/instance/lastMessageOffset.st +++ b/packages/TelegramClient-UI.package/TCUChatListItem.class/class/defaultLastMessageOffset.st @@ -1,4 +1,4 @@ default values -lastMessageOffset +defaultLastMessageOffset ^ 20 @ -12 diff --git a/packages/TelegramClient-UI.package/TCUChatListItem.class/class/defaultMessagePreviewLength.st b/packages/TelegramClient-UI.package/TCUChatListItem.class/class/defaultMessagePreviewLength.st new file mode 100644 index 000000000..7f3c574f3 --- /dev/null +++ b/packages/TelegramClient-UI.package/TCUChatListItem.class/class/defaultMessagePreviewLength.st @@ -0,0 +1,4 @@ +default values +defaultMessagePreviewLength + + ^ 37 \ No newline at end of file diff --git a/packages/TelegramClient-UI.package/TCUChatListItem.class/instance/titleLength.st b/packages/TelegramClient-UI.package/TCUChatListItem.class/class/defaultTitleLength.st similarity index 52% rename from packages/TelegramClient-UI.package/TCUChatListItem.class/instance/titleLength.st rename to packages/TelegramClient-UI.package/TCUChatListItem.class/class/defaultTitleLength.st index 3b533c8ae..193972955 100644 --- a/packages/TelegramClient-UI.package/TCUChatListItem.class/instance/titleLength.st +++ b/packages/TelegramClient-UI.package/TCUChatListItem.class/class/defaultTitleLength.st @@ -1,4 +1,4 @@ default values -titleLength +defaultTitleLength ^ 32 \ No newline at end of file diff --git a/packages/TelegramClient-UI.package/TCUChatListItem.class/instance/titleOffset.st b/packages/TelegramClient-UI.package/TCUChatListItem.class/class/defaultTitleOffset.st similarity index 58% rename from packages/TelegramClient-UI.package/TCUChatListItem.class/instance/titleOffset.st rename to packages/TelegramClient-UI.package/TCUChatListItem.class/class/defaultTitleOffset.st index 1c813f836..5947e8194 100644 --- a/packages/TelegramClient-UI.package/TCUChatListItem.class/instance/titleOffset.st +++ b/packages/TelegramClient-UI.package/TCUChatListItem.class/class/defaultTitleOffset.st @@ -1,4 +1,4 @@ default values -titleOffset +defaultTitleOffset ^ 20 @ 20 diff --git a/packages/TelegramClient-UI.package/TCUChatListItem.class/instance/addBorder.st b/packages/TelegramClient-UI.package/TCUChatListItem.class/instance/addBorder.st index 7073c70bb..fba599fab 100644 --- a/packages/TelegramClient-UI.package/TCUChatListItem.class/instance/addBorder.st +++ b/packages/TelegramClient-UI.package/TCUChatListItem.class/instance/addBorder.st @@ -5,4 +5,4 @@ addBorder width: self width; color: Color black; height: 1; - position: (self position + (0 @ (self defaultHeight - 1)))). \ No newline at end of file + position: (self position + (0 @ (self class defaultHeight - 1)))). \ No newline at end of file diff --git a/packages/TelegramClient-UI.package/TCUChatListItem.class/instance/addLastMessage.st b/packages/TelegramClient-UI.package/TCUChatListItem.class/instance/addLastMessage.st index f4a1bd26d..23cf64526 100644 --- a/packages/TelegramClient-UI.package/TCUChatListItem.class/instance/addLastMessage.st +++ b/packages/TelegramClient-UI.package/TCUChatListItem.class/instance/addLastMessage.st @@ -2,6 +2,6 @@ drawing addLastMessage self addMorph: (TextMorph new - contents: (self chat lastMessage condensedIntoOneLine truncateWithElipsisTo: self messagePreviewLength) asText; - bottomLeft: self bottomLeft + self lastMessageOffset; + contents: (self chat lastMessage condensedIntoOneLine truncateWithElipsisTo: self class defaultMessagePreviewLength) asText; + bottomLeft: self bottomLeft + self class defaultLastMessageOffset; lock). diff --git a/packages/TelegramClient-UI.package/TCUChatListItem.class/instance/addTitle.st b/packages/TelegramClient-UI.package/TCUChatListItem.class/instance/addTitle.st index de4367a62..643deb26c 100644 --- a/packages/TelegramClient-UI.package/TCUChatListItem.class/instance/addTitle.st +++ b/packages/TelegramClient-UI.package/TCUChatListItem.class/instance/addTitle.st @@ -2,6 +2,6 @@ drawing addTitle self addMorph: (TextMorph new - position: self topLeft + self titleOffset; - contents: ((self chatName condensedIntoOneLine truncateWithElipsisTo: self titleLength) asText addAttribute: TextEmphasis bold); + position: self topLeft + self class defaultTitleOffset; + contents: ((self chatName condensedIntoOneLine truncateWithElipsisTo: self class defaultTitleLength) asText addAttribute: TextEmphasis bold); lock). diff --git a/packages/TelegramClient-UI.package/TCUChatListItem.class/instance/initialize.st b/packages/TelegramClient-UI.package/TCUChatListItem.class/instance/initialize.st index 9c5e90bb2..b12f09cc1 100644 --- a/packages/TelegramClient-UI.package/TCUChatListItem.class/instance/initialize.st +++ b/packages/TelegramClient-UI.package/TCUChatListItem.class/instance/initialize.st @@ -5,6 +5,6 @@ initialize self color: Color white; - height: self defaultHeight; + height: self class defaultHeight; borderWidth: 0; clipSubmorphs: true. \ No newline at end of file diff --git a/packages/TelegramClient-UI.package/TCUChatListItem.class/instance/messageMarginTop.st b/packages/TelegramClient-UI.package/TCUChatListItem.class/instance/messageMarginTop.st deleted file mode 100644 index e35b88516..000000000 --- a/packages/TelegramClient-UI.package/TCUChatListItem.class/instance/messageMarginTop.st +++ /dev/null @@ -1,4 +0,0 @@ -default values -messageMarginTop - - ^ 20 \ No newline at end of file diff --git a/packages/TelegramClient-UI.package/TCUChatListItem.class/instance/messagePreviewLength.st b/packages/TelegramClient-UI.package/TCUChatListItem.class/instance/messagePreviewLength.st deleted file mode 100644 index d2e385c61..000000000 --- a/packages/TelegramClient-UI.package/TCUChatListItem.class/instance/messagePreviewLength.st +++ /dev/null @@ -1,4 +0,0 @@ -default values -messagePreviewLength - - ^ 37 \ No newline at end of file diff --git a/packages/TelegramClient-UI.package/TCUChatListItem.class/methodProperties.json b/packages/TelegramClient-UI.package/TCUChatListItem.class/methodProperties.json index 078534540..8cffce5d1 100644 --- a/packages/TelegramClient-UI.package/TCUChatListItem.class/methodProperties.json +++ b/packages/TelegramClient-UI.package/TCUChatListItem.class/methodProperties.json @@ -1,20 +1,19 @@ { "class" : { + "defaultHeight" : "rs 7/4/2020 18:54", + "defaultLastMessageOffset" : "JB 6/11/2021 15:17", + "defaultMessagePreviewLength" : "JB 6/11/2021 15:17", + "defaultTitleLength" : "JB 6/11/2021 15:18", + "defaultTitleOffset" : "JB 6/11/2021 15:18", "newWithChat:width:" : "js 7/31/2020 18:48" }, "instance" : { - "addBorder" : "r.s 7/31/2020 14:43", - "addLastMessage" : "js 8/2/2020 09:58", - "addTitle" : "js 8/2/2020 09:58", + "addBorder" : "JB 6/11/2021 18:35", + "addLastMessage" : "JB 6/11/2021 15:18", + "addTitle" : "JB 6/11/2021 15:18", "chat" : "rs 6/17/2020 21:45", "chat:" : "rs 6/17/2020 21:45", "chatID" : "rs 6/17/2020 23:05", "chatName" : "rs 6/17/2020 21:45", - "defaultHeight" : "rs 7/4/2020 18:54", "deselect" : "rs 6/13/2020 09:02", - "initialize" : "r.s 7/31/2020 14:43", - "lastMessageOffset" : "r.s 7/31/2020 16:05", - "messageMarginTop" : "r.s 7/31/2020 14:18", - "messagePreviewLength" : "js 8/2/2020 10:06", - "select" : "rs 6/13/2020 08:49", - "titleLength" : "js 8/2/2020 10:00", - "titleOffset" : "r.s 7/31/2020 16:04" } } + "initialize" : "JB 6/11/2021 18:35", + "select" : "rs 6/13/2020 08:49" } } diff --git a/packages/TelegramClient-UI.package/TCUChatMessageList.class/instance/defaultMessageMargin.st b/packages/TelegramClient-UI.package/TCUChatMessageList.class/class/defaultMessageMargin.st similarity index 100% rename from packages/TelegramClient-UI.package/TCUChatMessageList.class/instance/defaultMessageMargin.st rename to packages/TelegramClient-UI.package/TCUChatMessageList.class/class/defaultMessageMargin.st diff --git a/packages/TelegramClient-UI.package/TCUChatMessageList.class/instance/addMessageAtBottom..st b/packages/TelegramClient-UI.package/TCUChatMessageList.class/instance/addMessageAtBottom..st index e42845eeb..514830097 100644 --- a/packages/TelegramClient-UI.package/TCUChatMessageList.class/instance/addMessageAtBottom..st +++ b/packages/TelegramClient-UI.package/TCUChatMessageList.class/instance/addMessageAtBottom..st @@ -4,10 +4,10 @@ addMessageAtBottom: aMessage | newMessage | newMessage := TCUMessage newFromTCCMessage: aMessage. - self messages do: [:message | message position: (message position - (0 @ (newMessage height + self defaultMessageMargin)))]. + self messages do: [:message | message position: (message position - (0 @ (newMessage height + self class defaultMessageMargin)))]. newMessage isOutgoing - ifTrue: [newMessage bottomRight: (self bottomRight - (self defaultMessageMargin asPoint))] - ifFalse: [newMessage bottomLeft: (self bottomLeft + (self defaultMessageMargin @ self defaultMessageMargin negated))]. + ifTrue: [newMessage bottomRight: (self bottomRight - (self class defaultMessageMargin asPoint))] + ifFalse: [newMessage bottomLeft: (self bottomLeft + (self class defaultMessageMargin @ self class defaultMessageMargin negated))]. self addMorph: newMessage. self messages add: newMessage. \ No newline at end of file diff --git a/packages/TelegramClient-UI.package/TCUChatMessageList.class/methodProperties.json b/packages/TelegramClient-UI.package/TCUChatMessageList.class/methodProperties.json index ceedaeca9..031122065 100644 --- a/packages/TelegramClient-UI.package/TCUChatMessageList.class/methodProperties.json +++ b/packages/TelegramClient-UI.package/TCUChatMessageList.class/methodProperties.json @@ -1,14 +1,13 @@ { "class" : { - }, + "defaultMessageMargin" : "js 7/31/2020 15:50" }, "instance" : { - "addMessageAtBottom:" : "JB 5/29/2021 20:42", + "addMessageAtBottom:" : "JB 6/11/2021 18:25", "addMessages" : "js 8/2/2020 22:16", "chat" : "js 7/31/2020 16:39", "chat:" : "js 7/31/2020 16:39", "clearMessages" : "js 7/31/2020 16:46", "core" : "js 8/2/2020 22:11", - "defaultMessageMargin" : "js 7/31/2020 15:50", "displayChat:" : "f.w. 8/1/2020 04:53", "handleMouseWheel:" : "f.w. 7/31/2020 23:53", "initialize" : "js 7/31/2020 17:19", diff --git a/packages/TelegramClient-UI.package/TCUChatWindow.class/instance/defaultInputfieldHeight.st b/packages/TelegramClient-UI.package/TCUChatWindow.class/class/defaultInputfieldHeight.st similarity index 100% rename from packages/TelegramClient-UI.package/TCUChatWindow.class/instance/defaultInputfieldHeight.st rename to packages/TelegramClient-UI.package/TCUChatWindow.class/class/defaultInputfieldHeight.st diff --git a/packages/TelegramClient-UI.package/TCUChatWindow.class/instance/defaultTitleBarHeigth.st b/packages/TelegramClient-UI.package/TCUChatWindow.class/class/defaultTitleBarHeigth.st similarity index 100% rename from packages/TelegramClient-UI.package/TCUChatWindow.class/instance/defaultTitleBarHeigth.st rename to packages/TelegramClient-UI.package/TCUChatWindow.class/class/defaultTitleBarHeigth.st diff --git a/packages/TelegramClient-UI.package/TCUChatWindow.class/instance/addMessageWindow.st b/packages/TelegramClient-UI.package/TCUChatWindow.class/instance/addMessageWindow.st index 73daa4ae9..857726709 100644 --- a/packages/TelegramClient-UI.package/TCUChatWindow.class/instance/addMessageWindow.st +++ b/packages/TelegramClient-UI.package/TCUChatWindow.class/instance/addMessageWindow.st @@ -3,7 +3,7 @@ addMessageWindow self messageListWindow: (TCUChatMessageList new - height: self height - self defaultInputfieldHeight; + height: self height - self class defaultInputfieldHeight; width: self width; color: Color white; lowestVisibleMessage: 0; diff --git a/packages/TelegramClient-UI.package/TCUChatWindow.class/instance/addTextInputField.st b/packages/TelegramClient-UI.package/TCUChatWindow.class/instance/addTextInputField.st index 5feccb258..6d8cb81b8 100644 --- a/packages/TelegramClient-UI.package/TCUChatWindow.class/instance/addTextInputField.st +++ b/packages/TelegramClient-UI.package/TCUChatWindow.class/instance/addTextInputField.st @@ -5,7 +5,7 @@ addTextInputField borderWidth: 2; borderColor: TCUDefaultValues colorLightBlue; contentsWrapped: '' asText; - extent: ((self inputBar width - 200) @ self defaultInputfieldHeight); + extent: ((self inputBar width - 200) @ self class defaultInputfieldHeight); crAction: [self buttonSendPressed]). self inputBar addMorph: self textInputField. \ No newline at end of file diff --git a/packages/TelegramClient-UI.package/TCUChatWindow.class/instance/createInputBar.st b/packages/TelegramClient-UI.package/TCUChatWindow.class/instance/createInputBar.st index 1f10283fe..623752f1f 100644 --- a/packages/TelegramClient-UI.package/TCUChatWindow.class/instance/createInputBar.st +++ b/packages/TelegramClient-UI.package/TCUChatWindow.class/instance/createInputBar.st @@ -5,7 +5,7 @@ createInputBar borderWidth: 0; color: TCUDefaultValues colorLightGray; width: self width; - height: self defaultInputfieldHeight; + height: self class defaultInputfieldHeight; bottomLeft: (self bottomLeft); layoutPolicy: TableLayout new; listDirection: #leftToRight; diff --git a/packages/TelegramClient-UI.package/TCUChatWindow.class/instance/createTitleBar.st b/packages/TelegramClient-UI.package/TCUChatWindow.class/instance/createTitleBar.st index 5aca8411d..6194415c3 100644 --- a/packages/TelegramClient-UI.package/TCUChatWindow.class/instance/createTitleBar.st +++ b/packages/TelegramClient-UI.package/TCUChatWindow.class/instance/createTitleBar.st @@ -5,7 +5,7 @@ createTitleBar borderWidth: 0; color: TCUDefaultValues colorLightGray; width: self width; - height: self defaultTitleBarHeigth; + height: self class defaultTitleBarHeigth; topLeft: self topLeft; layoutPolicy: TableLayout new; listDirection: #leftToRight; diff --git a/packages/TelegramClient-UI.package/TCUChatWindow.class/methodProperties.json b/packages/TelegramClient-UI.package/TCUChatWindow.class/methodProperties.json index b178d7f6b..7f1cab96f 100644 --- a/packages/TelegramClient-UI.package/TCUChatWindow.class/methodProperties.json +++ b/packages/TelegramClient-UI.package/TCUChatWindow.class/methodProperties.json @@ -1,23 +1,23 @@ { "class" : { + "defaultInputfieldHeight" : "rs 6/12/2020 20:03", + "defaultTitleBarHeigth" : "sp 8/2/2020 15:15", "newWithHeight:width:" : "RS 5/20/2021 21:18" }, "instance" : { "addChatTitle" : "RS 5/20/2021 18:31", "addHiddenInfoPage" : "JB 5/31/2021 15:11", "addInputBar" : "js 6/13/2020 17:59", "addMemberCount" : "JB 6/4/2021 21:48", - "addMessageWindow" : "f.w. 8/1/2020 02:37", + "addMessageWindow" : "JB 6/11/2021 18:33", "addSendButton" : "js 6/13/2020 18:46", - "addTextInputField" : "js 8/2/2020 23:19", + "addTextInputField" : "JB 6/11/2021 18:33", "addTitleBar" : "RS 5/29/2021 18:12", "addWelcomeMessage" : "N.S. 7/26/2020 15:57", "buttonSendPressed" : "js 8/2/2020 23:19", "clear" : "RS 5/20/2021 21:13", "core" : "js 8/2/2020 22:11", - "createInputBar" : "rs 6/17/2020 21:01", - "createTitleBar" : "RS 5/27/2021 21:10", - "defaultInputfieldHeight" : "rs 6/12/2020 20:03", - "defaultTitleBarHeigth" : "sp 8/2/2020 15:15", + "createInputBar" : "JB 6/11/2021 18:33", + "createTitleBar" : "JB 6/11/2021 18:33", "infoPage" : "RS 5/20/2021 21:14", "infoPage:" : "RS 5/20/2021 21:14", "initialize" : "RS 5/20/2021 19:29", diff --git a/packages/TelegramClient-UI.package/TCUChatsList.class/instance/defaultScrollStep.st b/packages/TelegramClient-UI.package/TCUChatsList.class/class/defaultScrollStep.st similarity index 100% rename from packages/TelegramClient-UI.package/TCUChatsList.class/instance/defaultScrollStep.st rename to packages/TelegramClient-UI.package/TCUChatsList.class/class/defaultScrollStep.st diff --git a/packages/TelegramClient-UI.package/TCUChatsList.class/instance/defaultWidth.st b/packages/TelegramClient-UI.package/TCUChatsList.class/class/defaultWidth.st similarity index 100% rename from packages/TelegramClient-UI.package/TCUChatsList.class/instance/defaultWidth.st rename to packages/TelegramClient-UI.package/TCUChatsList.class/class/defaultWidth.st diff --git a/packages/TelegramClient-UI.package/TCUChatsList.class/instance/initialize.st b/packages/TelegramClient-UI.package/TCUChatsList.class/instance/initialize.st index de6505293..4b06b5ef3 100644 --- a/packages/TelegramClient-UI.package/TCUChatsList.class/instance/initialize.st +++ b/packages/TelegramClient-UI.package/TCUChatsList.class/instance/initialize.st @@ -4,7 +4,7 @@ initialize super initialize. self - width: self defaultWidth; + width: self class defaultWidth; color: Color white; borderWidth: 0; initializeLayout; diff --git a/packages/TelegramClient-UI.package/TCUChatsList.class/instance/scrollDown.st b/packages/TelegramClient-UI.package/TCUChatsList.class/instance/scrollDown.st index 6163af055..104190a4b 100644 --- a/packages/TelegramClient-UI.package/TCUChatsList.class/instance/scrollDown.st +++ b/packages/TelegramClient-UI.package/TCUChatsList.class/instance/scrollDown.st @@ -1,4 +1,4 @@ event handling scrollDown - self position: self position - (0 @ self defaultScrollStep). \ No newline at end of file + self position: self position - (0 @ self class defaultScrollStep). \ No newline at end of file diff --git a/packages/TelegramClient-UI.package/TCUChatsList.class/instance/scrollUp.st b/packages/TelegramClient-UI.package/TCUChatsList.class/instance/scrollUp.st index 975366d3d..abb44162d 100644 --- a/packages/TelegramClient-UI.package/TCUChatsList.class/instance/scrollUp.st +++ b/packages/TelegramClient-UI.package/TCUChatsList.class/instance/scrollUp.st @@ -2,4 +2,4 @@ event handling scrollUp self position y >= self maxHeight ifFalse:[ - self position: self position + (0 @ self defaultScrollStep).]. \ No newline at end of file + self position: self position + (0 @ self class defaultScrollStep).]. \ No newline at end of file diff --git a/packages/TelegramClient-UI.package/TCUChatsList.class/methodProperties.json b/packages/TelegramClient-UI.package/TCUChatsList.class/methodProperties.json index cf00bedec..fd51df623 100644 --- a/packages/TelegramClient-UI.package/TCUChatsList.class/methodProperties.json +++ b/packages/TelegramClient-UI.package/TCUChatsList.class/methodProperties.json @@ -1,18 +1,17 @@ { "class" : { - }, + "defaultScrollStep" : "r.s 8/2/2020 21:24", + "defaultWidth" : "R.S 6/1/2020 14:24" }, "instance" : { "chatItemClicked:event:from:" : "js 8/2/2020 22:29", "chats" : "rs 6/17/2020 22:38", "chats:" : "f.w. 7/15/2020 23:57", "clearItems" : "rs 6/17/2020 22:39", "createChatListItem:" : "js 7/31/2020 23:05", - "defaultScrollStep" : "r.s 8/2/2020 21:24", - "defaultWidth" : "R.S 6/1/2020 14:24", "deselectChats" : "js 8/2/2020 22:29", "getChat:" : "per 5/13/2021 08:41", "handleMouseWheel:" : "JB 6/7/2021 12:22", - "initialize" : "f.w. 7/12/2020 04:29", + "initialize" : "JB 6/11/2021 18:31", "initializeLayout" : "js 6/13/2020 18:49", "items" : "js 6/13/2020 14:14", "items:" : "js 6/13/2020 19:09", @@ -20,7 +19,7 @@ "maxHeight:" : "f.w. 7/12/2020 04:56", "openNewChat:" : "f.w. 7/16/2020 00:02", "redrawItems" : "js 8/2/2020 13:31", - "scrollDown" : "r.s 8/2/2020 21:24", - "scrollUp" : "r.s 8/2/2020 21:24", + "scrollDown" : "JB 6/11/2021 18:30", + "scrollUp" : "JB 6/11/2021 18:30", "selectedChat" : "rs 6/13/2020 08:51", "selectedChat:" : "rs 6/17/2020 22:25" } } diff --git a/packages/TelegramClient-UI.package/TCUHeaderBar.class/instance/defaultHeight.st b/packages/TelegramClient-UI.package/TCUHeaderBar.class/class/defaultHeight.st similarity index 100% rename from packages/TelegramClient-UI.package/TCUHeaderBar.class/instance/defaultHeight.st rename to packages/TelegramClient-UI.package/TCUHeaderBar.class/class/defaultHeight.st diff --git a/packages/TelegramClient-UI.package/TCUHeaderBar.class/instance/defaultSpacing.st b/packages/TelegramClient-UI.package/TCUHeaderBar.class/class/defaultSpacing.st similarity index 100% rename from packages/TelegramClient-UI.package/TCUHeaderBar.class/instance/defaultSpacing.st rename to packages/TelegramClient-UI.package/TCUHeaderBar.class/class/defaultSpacing.st diff --git a/packages/TelegramClient-UI.package/TCUHeaderBar.class/instance/addCloseButton.st b/packages/TelegramClient-UI.package/TCUHeaderBar.class/instance/addCloseButton.st index e0be51f86..a7898c3aa 100644 --- a/packages/TelegramClient-UI.package/TCUHeaderBar.class/instance/addCloseButton.st +++ b/packages/TelegramClient-UI.package/TCUHeaderBar.class/instance/addCloseButton.st @@ -8,6 +8,6 @@ addCloseButton color: TCUDefaultValues colorRed; on: #mouseUp send: #delete to: self main. closeButton text color: Color white. - closeButton position: (self main position x + self defaultSpacing) @ self defaultSpacing. + closeButton position: (self main position x + self class defaultSpacing) @ self class defaultSpacing. self addMorph: closeButton. \ No newline at end of file diff --git a/packages/TelegramClient-UI.package/TCUHeaderBar.class/instance/addLogoutButton.st b/packages/TelegramClient-UI.package/TCUHeaderBar.class/instance/addLogoutButton.st index 5faf022cc..4ce516089 100644 --- a/packages/TelegramClient-UI.package/TCUHeaderBar.class/instance/addLogoutButton.st +++ b/packages/TelegramClient-UI.package/TCUHeaderBar.class/instance/addLogoutButton.st @@ -6,6 +6,6 @@ addLogoutButton logoutButton := TCUButton new text: 'logout'; on: #mouseUp send: #logout to: self main. - logoutButton position: (self main position x + self main width - logoutButton width - self defaultSpacing) @ self defaultSpacing. + logoutButton position: (self main position x + self main width - logoutButton width - self class defaultSpacing) @ self class defaultSpacing. self addMorph: logoutButton. \ No newline at end of file diff --git a/packages/TelegramClient-UI.package/TCUHeaderBar.class/instance/addNewChatButton.st b/packages/TelegramClient-UI.package/TCUHeaderBar.class/instance/addNewChatButton.st index 20443eacf..dc901a5c3 100644 --- a/packages/TelegramClient-UI.package/TCUHeaderBar.class/instance/addNewChatButton.st +++ b/packages/TelegramClient-UI.package/TCUHeaderBar.class/instance/addNewChatButton.st @@ -8,6 +8,6 @@ addNewChatButton on: #mouseUp send: #newChatButtonClicked to: self). newChatButton text color: Color white. - newChatButton position: (self main position x + newChatButton width + (4 * self defaultSpacing)) @ self defaultSpacing. + newChatButton position: (self main position x + newChatButton width + (4 * self class defaultSpacing)) @ self class defaultSpacing. self addMorph: newChatButton. \ No newline at end of file diff --git a/packages/TelegramClient-UI.package/TCUHeaderBar.class/instance/initialize.st b/packages/TelegramClient-UI.package/TCUHeaderBar.class/instance/initialize.st index 6922213b4..5eb4318ba 100644 --- a/packages/TelegramClient-UI.package/TCUHeaderBar.class/instance/initialize.st +++ b/packages/TelegramClient-UI.package/TCUHeaderBar.class/instance/initialize.st @@ -6,7 +6,7 @@ initialize self borderWidth: 0; color: TCUDefaultValues colorGray; - extent: self main width @ self defaultHeight. + extent: self main width @ self class defaultHeight. self addTitle: 'Telegram'; diff --git a/packages/TelegramClient-UI.package/TCUHeaderBar.class/methodProperties.json b/packages/TelegramClient-UI.package/TCUHeaderBar.class/methodProperties.json index 9684db5fc..74ffbf460 100644 --- a/packages/TelegramClient-UI.package/TCUHeaderBar.class/methodProperties.json +++ b/packages/TelegramClient-UI.package/TCUHeaderBar.class/methodProperties.json @@ -1,14 +1,14 @@ { "class" : { + "defaultHeight" : "r.s 8/2/2020 18:59", + "defaultSpacing" : "r.s 8/2/2020 18:54", "newForMain:" : "js 8/2/2020 22:34" }, "instance" : { - "addCloseButton" : "r.s 8/2/2020 19:02", - "addLogoutButton" : "r.s 8/2/2020 19:03", - "addNewChatButton" : "js 8/2/2020 22:21", + "addCloseButton" : "JB 6/11/2021 18:32", + "addLogoutButton" : "JB 6/11/2021 18:32", + "addNewChatButton" : "JB 6/11/2021 18:33", "addTitle:" : "JB 6/4/2021 21:00", - "defaultHeight" : "r.s 8/2/2020 18:59", - "defaultSpacing" : "r.s 8/2/2020 18:54", - "initialize" : "r.s 8/2/2020 19:02", + "initialize" : "JB 6/11/2021 18:32", "main" : "r.s 8/2/2020 19:02", "main:" : "r.s 8/2/2020 19:02", "newChatButtonClicked" : "js 8/2/2020 22:22" } } diff --git a/packages/TelegramClient-UI.package/TCUMain.class/instance/defaultExtent.st b/packages/TelegramClient-UI.package/TCUMain.class/class/defaultExtent.st similarity index 100% rename from packages/TelegramClient-UI.package/TCUMain.class/instance/defaultExtent.st rename to packages/TelegramClient-UI.package/TCUMain.class/class/defaultExtent.st diff --git a/packages/TelegramClient-UI.package/TCUMain.class/instance/initialize.st b/packages/TelegramClient-UI.package/TCUMain.class/instance/initialize.st index a846ca233..fa491b484 100644 --- a/packages/TelegramClient-UI.package/TCUMain.class/instance/initialize.st +++ b/packages/TelegramClient-UI.package/TCUMain.class/instance/initialize.st @@ -3,7 +3,7 @@ initialize super initialize. self - extent: self defaultExtent; + extent: self class defaultExtent; borderWidth: 0; addHeader; chatWindow: TCUChatWindow new; diff --git a/packages/TelegramClient-UI.package/TCUMain.class/methodProperties.json b/packages/TelegramClient-UI.package/TCUMain.class/methodProperties.json index 9d94d3a2e..dab302aff 100644 --- a/packages/TelegramClient-UI.package/TCUMain.class/methodProperties.json +++ b/packages/TelegramClient-UI.package/TCUMain.class/methodProperties.json @@ -1,5 +1,6 @@ { "class" : { + "defaultExtent" : "R.S 6/1/2020 14:27", "newWithCore:" : "f.w. 6/3/2020 20:31" }, "instance" : { "addChatsList" : "js 8/2/2020 22:05", @@ -10,13 +11,11 @@ "chatsList:" : "R.S 6/1/2020 14:27", "core" : "js 6/13/2020 18:51", "core:" : "r.s 8/2/2020 19:18", - "defaultExtent" : "R.S 6/1/2020 14:27", - "defaultSpacing" : "r.s 8/2/2020 18:44", "delete" : "JB 6/7/2021 11:18", "getChatHistoryFrom:" : "j 7/16/2020 12:05", "header" : "r.s 8/2/2020 19:07", "header:" : "r.s 8/2/2020 19:08", - "initialize" : "r.s 8/2/2020 19:09", + "initialize" : "JB 6/11/2021 18:29", "initializeChatWindow" : "r.s 8/2/2020 19:09", "logout" : "js 6/13/2020 18:11", "newChatSelected:" : "js 8/2/2020 22:33", diff --git a/packages/TelegramClient-UI.package/TCUMessage.class/instance/defaultBottomMargin.st b/packages/TelegramClient-UI.package/TCUMessage.class/class/defaultBottomMargin.st similarity index 100% rename from packages/TelegramClient-UI.package/TCUMessage.class/instance/defaultBottomMargin.st rename to packages/TelegramClient-UI.package/TCUMessage.class/class/defaultBottomMargin.st diff --git a/packages/TelegramClient-UI.package/TCUMessage.class/instance/defaultHeight.st b/packages/TelegramClient-UI.package/TCUMessage.class/class/defaultHeight.st similarity index 100% rename from packages/TelegramClient-UI.package/TCUMessage.class/instance/defaultHeight.st rename to packages/TelegramClient-UI.package/TCUMessage.class/class/defaultHeight.st diff --git a/packages/TelegramClient-UI.package/TCUMessage.class/instance/defaultLayoutInset.st b/packages/TelegramClient-UI.package/TCUMessage.class/class/defaultLayoutInset.st similarity index 100% rename from packages/TelegramClient-UI.package/TCUMessage.class/instance/defaultLayoutInset.st rename to packages/TelegramClient-UI.package/TCUMessage.class/class/defaultLayoutInset.st diff --git a/packages/TelegramClient-UI.package/TCUMessage.class/instance/defaultMargins.st b/packages/TelegramClient-UI.package/TCUMessage.class/class/defaultMargins.st similarity index 100% rename from packages/TelegramClient-UI.package/TCUMessage.class/instance/defaultMargins.st rename to packages/TelegramClient-UI.package/TCUMessage.class/class/defaultMargins.st diff --git a/packages/TelegramClient-UI.package/TCUMessage.class/instance/defaultTextMorph.st b/packages/TelegramClient-UI.package/TCUMessage.class/class/defaultTextMorph.st similarity index 100% rename from packages/TelegramClient-UI.package/TCUMessage.class/instance/defaultTextMorph.st rename to packages/TelegramClient-UI.package/TCUMessage.class/class/defaultTextMorph.st diff --git a/packages/TelegramClient-UI.package/TCUMessage.class/instance/defaultWidth.st b/packages/TelegramClient-UI.package/TCUMessage.class/class/defaultWidth.st similarity index 100% rename from packages/TelegramClient-UI.package/TCUMessage.class/instance/defaultWidth.st rename to packages/TelegramClient-UI.package/TCUMessage.class/class/defaultWidth.st diff --git a/packages/TelegramClient-UI.package/TCUMessage.class/instance/addDate.st b/packages/TelegramClient-UI.package/TCUMessage.class/instance/addDate.st index 3fca69ed5..12715b95c 100644 --- a/packages/TelegramClient-UI.package/TCUMessage.class/instance/addDate.st +++ b/packages/TelegramClient-UI.package/TCUMessage.class/instance/addDate.st @@ -1,7 +1,7 @@ drawing addDate - self addMorphBack: (self defaultTextMorph + self addMorphBack: (self class defaultTextMorph contents: self messageDateText; color: self dateColor; yourself). \ No newline at end of file diff --git a/packages/TelegramClient-UI.package/TCUMessage.class/instance/addSender.st b/packages/TelegramClient-UI.package/TCUMessage.class/instance/addSender.st index 1d031b55b..06ff348ca 100644 --- a/packages/TelegramClient-UI.package/TCUMessage.class/instance/addSender.st +++ b/packages/TelegramClient-UI.package/TCUMessage.class/instance/addSender.st @@ -1,8 +1,8 @@ drawing addSender - self addMorphFront: (self defaultTextMorph + self addMorphFront: (self class defaultTextMorph contents: self sender fullName; color: self dateColor; - margins: self defaultMargins; + margins: self class defaultMargins; yourself). \ No newline at end of file diff --git a/packages/TelegramClient-UI.package/TCUMessage.class/instance/addText.st b/packages/TelegramClient-UI.package/TCUMessage.class/instance/addText.st index f39aef3d8..5d01e1f26 100644 --- a/packages/TelegramClient-UI.package/TCUMessage.class/instance/addText.st +++ b/packages/TelegramClient-UI.package/TCUMessage.class/instance/addText.st @@ -1,8 +1,8 @@ drawing addText - self addMorph: (self defaultTextMorph + self addMorph: (self class defaultTextMorph contents: self text; color: Color white; - margins: self defaultMargins; + margins: self class defaultMargins; yourself). \ No newline at end of file diff --git a/packages/TelegramClient-UI.package/TCUMessage.class/instance/initializeDefaults.st b/packages/TelegramClient-UI.package/TCUMessage.class/instance/initializeDefaults.st index 469e6cb48..a49532203 100644 --- a/packages/TelegramClient-UI.package/TCUMessage.class/instance/initializeDefaults.st +++ b/packages/TelegramClient-UI.package/TCUMessage.class/instance/initializeDefaults.st @@ -2,11 +2,11 @@ initialization initializeDefaults self - width: self defaultWidth; - height: self defaultHeight; + width: self class defaultWidth; + height: self class defaultHeight; layoutPolicy: TableLayout new; cellPositioning: #topLeft; - layoutInset: self defaultLayoutInset; + layoutInset: self class defaultLayoutInset; color: self messageColor; hResizing: #shrinkWrap; vResizing: #shrinkWrap; diff --git a/packages/TelegramClient-UI.package/TCUMessage.class/instance/maxContentWidth.st b/packages/TelegramClient-UI.package/TCUMessage.class/instance/maxContentWidth.st index 013e171a4..fbc3bef85 100644 --- a/packages/TelegramClient-UI.package/TCUMessage.class/instance/maxContentWidth.st +++ b/packages/TelegramClient-UI.package/TCUMessage.class/instance/maxContentWidth.st @@ -1,4 +1,4 @@ -default values +drawing maxContentWidth - ^ self defaultWidth - (self layoutInset * 2) \ No newline at end of file + ^ self class defaultWidth - (self layoutInset * 2) \ No newline at end of file diff --git a/packages/TelegramClient-UI.package/TCUMessage.class/instance/shrinkToContent.st b/packages/TelegramClient-UI.package/TCUMessage.class/instance/shrinkToContent.st index f49fcbd02..7794dd16c 100644 --- a/packages/TelegramClient-UI.package/TCUMessage.class/instance/shrinkToContent.st +++ b/packages/TelegramClient-UI.package/TCUMessage.class/instance/shrinkToContent.st @@ -7,4 +7,4 @@ shrinkToContent self submorphsDo: [:textMorph | textMorph width: newWidth]. self width: newWidth + (self layoutInset * 2). - self height: (self submorphs detectSum: [:textMorph | textMorph height]) + (self layoutInset * 2 + (self submorphs size - 1 * self defaultBottomMargin)). \ No newline at end of file + self height: (self submorphs detectSum: [:textMorph | textMorph height]) + (self layoutInset * 2 + (self submorphs size - 1 * self class defaultBottomMargin)). \ No newline at end of file diff --git a/packages/TelegramClient-UI.package/TCUMessage.class/methodProperties.json b/packages/TelegramClient-UI.package/TCUMessage.class/methodProperties.json index 087758196..4ec0f2f7a 100644 --- a/packages/TelegramClient-UI.package/TCUMessage.class/methodProperties.json +++ b/packages/TelegramClient-UI.package/TCUMessage.class/methodProperties.json @@ -1,30 +1,30 @@ { "class" : { - "newFromTCCMessage:" : "pk 6/8/2021 09:36" }, - "instance" : { - "addDate" : "JB 5/29/2021 21:05", - "addSender" : "pk 6/13/2021 12:57", - "addText" : "JB 5/30/2021 11:24", - "date" : "RK 5/7/2021 10:11", - "date:" : "RK 5/7/2021 10:12", - "dateColor" : "JB 5/29/2021 21:05", "defaultBottomMargin" : "JB 5/30/2021 11:27", "defaultHeight" : "JB 5/29/2021 20:44", "defaultLayoutInset" : "JB 5/29/2021 21:08", - "defaultMargins" : "JB 6/4/2021 21:38", + "defaultMargins" : "JB 6/11/2021 18:36", "defaultTextMorph" : "JB 6/4/2021 21:38", "defaultWidth" : "r.s 7/31/2020 14:19", + "newFromTCCMessage:" : "pk 6/8/2021 09:36" }, + "instance" : { + "addDate" : "JB 6/11/2021 18:23", + "addSender" : "JB 6/13/2021 16:32", + "addText" : "JB 6/11/2021 18:23", + "date" : "RK 5/7/2021 10:11", + "date:" : "RK 5/7/2021 10:12", + "dateColor" : "JB 5/29/2021 21:05", "initialize" : "pk 6/8/2021 09:34", - "initializeDefaults" : "JB 5/30/2021 11:23", + "initializeDefaults" : "JB 6/11/2021 18:23", "isOutgoing" : "js 8/2/2020 22:02", "isOutgoing:" : "js 8/2/2020 22:02", - "maxContentWidth" : "JB 5/29/2021 20:32", + "maxContentWidth" : "JB 6/11/2021 18:36", "messageColor" : "JB 5/29/2021 21:06", "messageDateText" : "JB 5/17/2021 10:04", "sender" : "pk 6/8/2021 09:36", "sender:" : "pk 6/8/2021 09:36", "senderID" : "js 7/31/2020 16:11", "senderID:" : "js 7/31/2020 16:10", - "shrinkToContent" : "JB 5/30/2021 11:27", + "shrinkToContent" : "JB 6/11/2021 15:32", "text" : "rs 6/17/2020 19:48", "text:" : "rs 6/17/2020 19:52" } } diff --git a/packages/TelegramClient-UI.package/TCUModal.class/instance/defaultHeight.st b/packages/TelegramClient-UI.package/TCUModal.class/class/defaultHeight.st similarity index 100% rename from packages/TelegramClient-UI.package/TCUModal.class/instance/defaultHeight.st rename to packages/TelegramClient-UI.package/TCUModal.class/class/defaultHeight.st diff --git a/packages/TelegramClient-UI.package/TCUModal.class/instance/defaultOffset.st b/packages/TelegramClient-UI.package/TCUModal.class/class/defaultOffset.st similarity index 100% rename from packages/TelegramClient-UI.package/TCUModal.class/instance/defaultOffset.st rename to packages/TelegramClient-UI.package/TCUModal.class/class/defaultOffset.st diff --git a/packages/TelegramClient-UI.package/TCUMain.class/instance/defaultSpacing.st b/packages/TelegramClient-UI.package/TCUModal.class/class/defaultSpacing.st similarity index 100% rename from packages/TelegramClient-UI.package/TCUMain.class/instance/defaultSpacing.st rename to packages/TelegramClient-UI.package/TCUModal.class/class/defaultSpacing.st diff --git a/packages/TelegramClient-UI.package/TCUModal.class/instance/defaultWidth.st b/packages/TelegramClient-UI.package/TCUModal.class/class/defaultWidth.st similarity index 100% rename from packages/TelegramClient-UI.package/TCUModal.class/instance/defaultWidth.st rename to packages/TelegramClient-UI.package/TCUModal.class/class/defaultWidth.st diff --git a/packages/TelegramClient-UI.package/TCUModal.class/instance/addCloseButton.st b/packages/TelegramClient-UI.package/TCUModal.class/instance/addCloseButton.st index 98ef6a515..17eb2ebab 100644 --- a/packages/TelegramClient-UI.package/TCUModal.class/instance/addCloseButton.st +++ b/packages/TelegramClient-UI.package/TCUModal.class/instance/addCloseButton.st @@ -8,6 +8,6 @@ addCloseButton color: TCUDefaultValues colorRed; on: #mouseUp send: #delete to: self. closeButton text color: Color white. - closeButton position: (self position x + self defaultSpacing) @ self defaultSpacing. + closeButton position: (self position x + self class defaultSpacing) @ self class defaultSpacing. self addMorph: closeButton. \ No newline at end of file diff --git a/packages/TelegramClient-UI.package/TCUModal.class/instance/defaultSpacing.st b/packages/TelegramClient-UI.package/TCUModal.class/instance/defaultSpacing.st deleted file mode 100644 index 2f55932b1..000000000 --- a/packages/TelegramClient-UI.package/TCUModal.class/instance/defaultSpacing.st +++ /dev/null @@ -1,4 +0,0 @@ -default values -defaultSpacing - - ^ 5 \ No newline at end of file diff --git a/packages/TelegramClient-UI.package/TCUModal.class/instance/initialize.st b/packages/TelegramClient-UI.package/TCUModal.class/instance/initialize.st index 42eb61c97..1733317db 100644 --- a/packages/TelegramClient-UI.package/TCUModal.class/instance/initialize.st +++ b/packages/TelegramClient-UI.package/TCUModal.class/instance/initialize.st @@ -4,8 +4,8 @@ initialize super initialize. self - width: self defaultWidth; - height: self defaultHeight; + width: self class defaultWidth; + height: self class defaultHeight; borderWidth: 1; borderColor: TCUDefaultValues colorLightBlue; setColor; diff --git a/packages/TelegramClient-UI.package/TCUModal.class/instance/setText.st b/packages/TelegramClient-UI.package/TCUModal.class/instance/setText.st index 2711bd4fb..e6531d661 100644 --- a/packages/TelegramClient-UI.package/TCUModal.class/instance/setText.st +++ b/packages/TelegramClient-UI.package/TCUModal.class/instance/setText.st @@ -4,4 +4,4 @@ setText self addMorph: (TextMorph new contents: self text; lock; - center: (self position + ((self width / 2) @ self defaultOffset))). \ No newline at end of file + center: (self position + ((self width / 2) @ self class defaultOffset))). \ No newline at end of file diff --git a/packages/TelegramClient-UI.package/TCUModal.class/methodProperties.json b/packages/TelegramClient-UI.package/TCUModal.class/methodProperties.json index 2f3e780d7..900d61f6e 100644 --- a/packages/TelegramClient-UI.package/TCUModal.class/methodProperties.json +++ b/packages/TelegramClient-UI.package/TCUModal.class/methodProperties.json @@ -1,15 +1,15 @@ { "class" : { - "newWithText:type:" : "r.s 7/16/2020 09:07" }, - "instance" : { - "addCloseButton" : "r.s 8/2/2020 19:13", "defaultHeight" : "r.s 7/16/2020 09:04", "defaultOffset" : "r.s 8/2/2020 18:38", "defaultSpacing" : "r.s 8/2/2020 19:14", "defaultWidth" : "r.s 7/16/2020 09:04", - "initialize" : "r.s 8/2/2020 19:14", + "newWithText:type:" : "r.s 7/16/2020 09:07" }, + "instance" : { + "addCloseButton" : "JB 6/11/2021 18:26", + "initialize" : "JB 6/11/2021 18:25", "setColor" : "r.s 7/16/2020 09:17", - "setText" : "r.s 8/2/2020 18:38", + "setText" : "JB 6/11/2021 18:26", "text" : "r.s 7/16/2020 09:09", "text:" : "r.s 7/16/2020 09:09", "type" : "r.s 7/16/2020 09:09", diff --git a/packages/TelegramClient-UI.package/TCUNotification.class/instance/defaultAuthorOffset.st b/packages/TelegramClient-UI.package/TCUNotification.class/class/defaultAuthorOffset.st similarity index 100% rename from packages/TelegramClient-UI.package/TCUNotification.class/instance/defaultAuthorOffset.st rename to packages/TelegramClient-UI.package/TCUNotification.class/class/defaultAuthorOffset.st diff --git a/packages/TelegramClient-UI.package/TCUNotification.class/instance/defaultBorderWidth.st b/packages/TelegramClient-UI.package/TCUNotification.class/class/defaultBorderWidth.st similarity index 100% rename from packages/TelegramClient-UI.package/TCUNotification.class/instance/defaultBorderWidth.st rename to packages/TelegramClient-UI.package/TCUNotification.class/class/defaultBorderWidth.st diff --git a/packages/TelegramClient-UI.package/TCUNotification.class/instance/defaultChatOffset.st b/packages/TelegramClient-UI.package/TCUNotification.class/class/defaultChatOffset.st similarity index 100% rename from packages/TelegramClient-UI.package/TCUNotification.class/instance/defaultChatOffset.st rename to packages/TelegramClient-UI.package/TCUNotification.class/class/defaultChatOffset.st diff --git a/packages/TelegramClient-UI.package/TCUNotification.class/instance/defaultHeight.st b/packages/TelegramClient-UI.package/TCUNotification.class/class/defaultHeight.st similarity index 100% rename from packages/TelegramClient-UI.package/TCUNotification.class/instance/defaultHeight.st rename to packages/TelegramClient-UI.package/TCUNotification.class/class/defaultHeight.st diff --git a/packages/TelegramClient-UI.package/TCUNotification.class/instance/defaultLineLength.st b/packages/TelegramClient-UI.package/TCUNotification.class/class/defaultLineLength.st similarity index 100% rename from packages/TelegramClient-UI.package/TCUNotification.class/instance/defaultLineLength.st rename to packages/TelegramClient-UI.package/TCUNotification.class/class/defaultLineLength.st diff --git a/packages/TelegramClient-UI.package/TCUNotification.class/instance/defaultMessageLength.st b/packages/TelegramClient-UI.package/TCUNotification.class/class/defaultMessageLength.st similarity index 100% rename from packages/TelegramClient-UI.package/TCUNotification.class/instance/defaultMessageLength.st rename to packages/TelegramClient-UI.package/TCUNotification.class/class/defaultMessageLength.st diff --git a/packages/TelegramClient-UI.package/TCUNotification.class/instance/defaultMessageOffset.st b/packages/TelegramClient-UI.package/TCUNotification.class/class/defaultMessageOffset.st similarity index 100% rename from packages/TelegramClient-UI.package/TCUNotification.class/instance/defaultMessageOffset.st rename to packages/TelegramClient-UI.package/TCUNotification.class/class/defaultMessageOffset.st diff --git a/packages/TelegramClient-UI.package/TCUNotification.class/instance/defaultMessageWidth.st b/packages/TelegramClient-UI.package/TCUNotification.class/class/defaultMessageWidth.st similarity index 100% rename from packages/TelegramClient-UI.package/TCUNotification.class/instance/defaultMessageWidth.st rename to packages/TelegramClient-UI.package/TCUNotification.class/class/defaultMessageWidth.st diff --git a/packages/TelegramClient-UI.package/TCUNotification.class/instance/defaultOffset.st b/packages/TelegramClient-UI.package/TCUNotification.class/class/defaultOffset.st similarity index 71% rename from packages/TelegramClient-UI.package/TCUNotification.class/instance/defaultOffset.st rename to packages/TelegramClient-UI.package/TCUNotification.class/class/defaultOffset.st index c2634bb7a..05477a6d5 100644 --- a/packages/TelegramClient-UI.package/TCUNotification.class/instance/defaultOffset.st +++ b/packages/TelegramClient-UI.package/TCUNotification.class/class/defaultOffset.st @@ -1,4 +1,4 @@ default values defaultOffset - ^ (20 @ 20) \ No newline at end of file + ^ 20 @ 20 \ No newline at end of file diff --git a/packages/TelegramClient-UI.package/TCUNotification.class/instance/defaultTimeOutDuration.st b/packages/TelegramClient-UI.package/TCUNotification.class/class/defaultTimeOutDuration.st similarity index 100% rename from packages/TelegramClient-UI.package/TCUNotification.class/instance/defaultTimeOutDuration.st rename to packages/TelegramClient-UI.package/TCUNotification.class/class/defaultTimeOutDuration.st diff --git a/packages/TelegramClient-UI.package/TCUNotification.class/instance/defaultWidth.st b/packages/TelegramClient-UI.package/TCUNotification.class/class/defaultWidth.st similarity index 100% rename from packages/TelegramClient-UI.package/TCUNotification.class/instance/defaultWidth.st rename to packages/TelegramClient-UI.package/TCUNotification.class/class/defaultWidth.st diff --git a/packages/TelegramClient-UI.package/TCUNotification.class/instance/addContent.st b/packages/TelegramClient-UI.package/TCUNotification.class/instance/addContent.st index 38feb2311..0010728c9 100644 --- a/packages/TelegramClient-UI.package/TCUNotification.class/instance/addContent.st +++ b/packages/TelegramClient-UI.package/TCUNotification.class/instance/addContent.st @@ -1,13 +1,13 @@ drawing addContent - self addMorph: (TextMorph new position: self topLeft + self defaultAuthorOffset; + self addMorph: (TextMorph new position: self topLeft + self class defaultAuthorOffset; contents: ((self sender fullName)asText addAttribute: TextEmphasis bold); lock). - self addMorph: (TextMorph new position: (self topLeft + self defaultChatOffset); + self addMorph: (TextMorph new position: (self topLeft + self class defaultChatOffset); contents: ((self chatTitle) asText); lock). - self addMorph: (TextMorph new position: (self center + self defaultMessageOffset); - contents: ((self message message withNoLineLongerThan: self defaultLineLength) truncateWithElipsisTo: self defaultMessageLength) asText; - width: self defaultMessageWidth; + self addMorph: (TextMorph new position: (self center + self class defaultMessageOffset); + contents: ((self message message withNoLineLongerThan: self class defaultLineLength) truncateWithElipsisTo: self class defaultMessageLength) asText; + width: self class defaultMessageWidth; lock) \ No newline at end of file diff --git a/packages/TelegramClient-UI.package/TCUNotification.class/instance/calculatePosition.st b/packages/TelegramClient-UI.package/TCUNotification.class/instance/calculatePosition.st index 48f94c3a4..6c0b1c13d 100644 --- a/packages/TelegramClient-UI.package/TCUNotification.class/instance/calculatePosition.st +++ b/packages/TelegramClient-UI.package/TCUNotification.class/instance/calculatePosition.st @@ -1,4 +1,4 @@ accessing calculatePosition - ^ self currentWorld bottomRight - (self defaultWidth @ self defaultHeight) - self defaultOffset \ No newline at end of file + ^ self currentWorld bottomRight - (self class defaultWidth @ self class defaultHeight) - self class defaultOffset \ No newline at end of file diff --git a/packages/TelegramClient-UI.package/TCUNotification.class/instance/initializeDefaults.st b/packages/TelegramClient-UI.package/TCUNotification.class/instance/initializeDefaults.st index 8da8a7433..b1732ff45 100644 --- a/packages/TelegramClient-UI.package/TCUNotification.class/instance/initializeDefaults.st +++ b/packages/TelegramClient-UI.package/TCUNotification.class/instance/initializeDefaults.st @@ -4,8 +4,8 @@ initializeDefaults self color: Color white; borderColor: TCUDefaultValues colorLightBlue; - borderWidth: self defaultBorderWidth; + borderWidth: self class defaultBorderWidth; useRoundedCorners; - height: self defaultHeight; - width: self defaultWidth; + height: self class defaultHeight; + width: self class defaultWidth; addContent. \ No newline at end of file diff --git a/packages/TelegramClient-UI.package/TCUNotification.class/instance/startTimeOut.st b/packages/TelegramClient-UI.package/TCUNotification.class/instance/startTimeOut.st index 359a011f7..d0cdbe250 100644 --- a/packages/TelegramClient-UI.package/TCUNotification.class/instance/startTimeOut.st +++ b/packages/TelegramClient-UI.package/TCUNotification.class/instance/startTimeOut.st @@ -1,5 +1,5 @@ initialization startTimeOut - self defaultTimeOutDuration seconds wait. + self class defaultTimeOutDuration seconds wait. self fadeOut. \ No newline at end of file diff --git a/packages/TelegramClient-UI.package/TCUNotification.class/methodProperties.json b/packages/TelegramClient-UI.package/TCUNotification.class/methodProperties.json index 444ae30fd..91e72e81f 100644 --- a/packages/TelegramClient-UI.package/TCUNotification.class/methodProperties.json +++ b/packages/TelegramClient-UI.package/TCUNotification.class/methodProperties.json @@ -1,14 +1,5 @@ { "class" : { - "newWithMessage:" : "JB 6/4/2021 21:48" }, - "instance" : { - "addContent" : "per 5/16/2021 15:20", - "calculatePosition" : "JB 6/13/2021 10:42", - "chat" : "per 5/13/2021 08:50", - "chat:" : "per 5/13/2021 09:21", - "chatID" : "rs 7/5/2020 14:31", - "chatID:" : "rs 7/5/2020 14:31", - "chatTitle" : "JB 6/4/2021 21:51", "defaultAuthorOffset" : "per 5/15/2021 11:57", "defaultBorderWidth" : "r.s 8/2/2020 18:37", "defaultChatOffset" : "per 5/15/2021 11:57", @@ -17,14 +8,23 @@ "defaultMessageLength" : "per 5/15/2021 11:58", "defaultMessageOffset" : "per 5/16/2021 13:43", "defaultMessageWidth" : "per 5/16/2021 13:43", - "defaultOffset" : "rs 7/5/2020 14:43", + "defaultOffset" : "JB 6/11/2021 15:21", "defaultTimeOutDuration" : "per 5/11/2021 18:48", "defaultWidth" : "rs 7/5/2020 14:44", + "newWithMessage:" : "JB 6/4/2021 21:48" }, + "instance" : { + "addContent" : "JB 6/11/2021 15:19", + "calculatePosition" : "JB 6/13/2021 16:29", + "chat" : "per 5/13/2021 08:50", + "chat:" : "per 5/13/2021 09:21", + "chatID" : "rs 7/5/2020 14:31", + "chatID:" : "rs 7/5/2020 14:31", + "chatTitle" : "JB 6/4/2021 21:51", "initialize" : "per 5/16/2021 15:18", - "initializeDefaults" : "per 5/11/2021 19:04", + "initializeDefaults" : "JB 6/11/2021 15:21", "message" : "per 5/13/2021 08:50", "message:" : "per 5/13/2021 09:21", "openInWorld" : "JB 6/4/2021 21:52", "sender" : "per 5/13/2021 08:50", "sender:" : "per 5/13/2021 09:21", - "startTimeOut" : "r.s 8/2/2020 18:36" } } + "startTimeOut" : "JB 6/11/2021 15:21" } } diff --git a/packages/TelegramClientTests-Misc.package/TCTMLinterTests.class/instance/testDefaultValuesOnClassSide.st b/packages/TelegramClientTests-Misc.package/TCTMLinterTests.class/instance/testDefaultValuesOnClassSide.st new file mode 100644 index 000000000..a816ebaa4 --- /dev/null +++ b/packages/TelegramClientTests-Misc.package/TCTMLinterTests.class/instance/testDefaultValuesOnClassSide.st @@ -0,0 +1,8 @@ +tests +testDefaultValuesOnClassSide + + self methodTestObjects + reject: [:method | method methodName = 'defaultTimeout'] + thenDo: [:method | (method methodName beginsWith: 'default') ifTrue: + [self assert: method classSide] + ]. \ No newline at end of file diff --git a/packages/TelegramClientTests-Misc.package/TCTMLinterTests.class/methodProperties.json b/packages/TelegramClientTests-Misc.package/TCTMLinterTests.class/methodProperties.json index dedaa6601..583c21625 100644 --- a/packages/TelegramClientTests-Misc.package/TCTMLinterTests.class/methodProperties.json +++ b/packages/TelegramClientTests-Misc.package/TCTMLinterTests.class/methodProperties.json @@ -17,6 +17,7 @@ "methodsLinesDo:excludeClasses:" : "JB 6/10/2021 22:45", "testAssertOrder" : "JB 6/10/2021 22:44", "testCorrectClassPrefix" : "JB 6/7/2021 09:25", + "testDefaultValuesOnClassSide" : "JB 6/11/2021 15:28", "testIfTrueReturnsRule" : "js 6/13/2020 18:35", "testInstanceVarAccess" : "js 6/13/2020 16:54", "testLongMethods" : "JB 6/10/2021 22:45",