Merge feature/sticker into develop

hpi-swa-teaching · Jun 17, 2024 · 9a3caa0 · 9a3caa0
2 parents 64c318c + 3f0063c
commit 9a3caa0
Show file tree

Hide file tree

Showing 23 changed files with 199 additions and 80 deletions.
diff --git a/.squot-materialize b/.squot-materialize
@@ -1,109 +1,86 @@
 [
 	SquotPlaintextMapper {
 		#path : FSAbsolutePath [
-			'.github',
-			'discord_actions.yml'
+			'.squot'
 		],
 		#encoding : 'TXT'
 	},
 	SquotPlaintextMapper {
 		#path : FSAbsolutePath [
-			'.smalltalk.release.ston'
+			'.github',
+			'discord_actions.yml'
 		],
 		#encoding : 'TXT'
 	},
-	SquotCypressMapper {
-		#package : MCPackage {
-			#name : 'TelegramClientTests-Core'
-		},
-		#path : FSAbsolutePath [
-			'packages'
-		]
-	},
-	SquotCypressMapper {
-		#package : MCPackage {
-			#name : 'TelegramClientTests-Misc'
-		},
+	SquotPlaintextMapper {
 		#path : FSAbsolutePath [
-			'packages'
-		]
+			'.github',
+			'ISSUE_TEMPLATE',
+			'feature_request.md'
+		],
+		#encoding : 'TXT'
 	},
 	SquotPlaintextMapper {
 		#path : FSAbsolutePath [
-			'.smalltalk.lint.ston'
+			'.gitignore'
 		],
 		#encoding : 'TXT'
 	},
 	SquotPlaintextMapper {
 		#path : FSAbsolutePath [
-			'.github',
-			'ISSUE_TEMPLATE',
-			'bug_report.md'
+			'CONTRIBUTING.md'
 		],
 		#encoding : 'TXT'
 	},
 	SquotCypressMapper {
 		#package : MCPackage {
-			#name : 'TelegramClient-UI'
+			#name : 'TelegramClientTests-UI'
 		},
 		#path : FSAbsolutePath [
 			'packages'
 		]
 	},
 	SquotPlaintextMapper {
 		#path : FSAbsolutePath [
-			'.github',
-			'ISSUE_TEMPLATE',
-			'feature_request.md'
+			'.smalltalk.ston'
 		],
 		#encoding : 'TXT'
 	},
-	SquotImageMapper {
+	SquotCypressMapper {
+		#package : MCPackage {
+			#name : 'BaselineOfTelegramClient'
+		},
 		#path : FSAbsolutePath [
-			'assets',
-			'logo.png'
-		],
-		#encoding : Class [ #PNGReadWriter ]
+			'packages'
+		]
 	},
 	SquotPlaintextMapper {
 		#path : FSAbsolutePath [
-			'.gitignore'
+			'README.md'
 		],
 		#encoding : 'TXT'
 	},
 	SquotPlaintextMapper {
 		#path : FSAbsolutePath [
-			'LICENSE'
+			'.smalltalk.release.ston'
 		],
 		#encoding : 'TXT'
 	},
-	SquotImageMapper {
-		#path : FSAbsolutePath [
-			'assets',
-			'playbutton.jpg'
-		],
-		#encoding : Class [ #JPEGReadWriter2 ]
-	},
-	SquotImageMapper {
-		#path : FSAbsolutePath [
-			'assets',
-			'play_circle_outline_icon.png'
-		],
-		#encoding : @23
-	},
 	SquotPlaintextMapper {
 		#path : FSAbsolutePath [
-			'CONTRIBUTING.md'
+			'.github',
+			'ISSUE_TEMPLATE',
+			'bug_report.md'
 		],
 		#encoding : 'TXT'
 	},
-	SquotPlaintextMapper {
+	SquotCypressMapper {
+		#package : MCPackage {
+			#name : 'TelegramClient-UI'
+		},
 		#path : FSAbsolutePath [
-			'.github',
-			'workflows',
-			'ci-linter.yml'
-		],
-		#encoding : 'TXT'
+			'packages'
+		]
 	},
 	SquotPlaintextMapper {
 		#path : FSAbsolutePath [
@@ -115,43 +92,65 @@
 	},
 	SquotPlaintextMapper {
 		#path : FSAbsolutePath [
-			'README.md'
+			'.github',
+			'stale.yml'
 		],
 		#encoding : 'TXT'
 	},
+	SquotCypressMapper {
+		#package : MCPackage {
+			#name : 'TelegramClientTests-Misc'
+		},
+		#path : FSAbsolutePath [
+			'packages'
+		]
+	},
 	SquotPlaintextMapper {
 		#path : FSAbsolutePath [
 			'.github',
-			'stale.yml'
+			'pull_request_template.md'
 		],
 		#encoding : 'TXT'
 	},
+	SquotImageMapper {
+		#path : FSAbsolutePath [
+			'assets',
+			'logo.png'
+		],
+		#encoding : Class [ #PNGReadWriter ]
+	},
 	SquotCypressMapper {
 		#package : MCPackage {
-			#name : 'TelegramClientTests-UI'
+			#name : 'TelegramClientTests-Core'
 		},
 		#path : FSAbsolutePath [
 			'packages'
 		]
 	},
+	SquotPlaintextMapper {
+		#path : FSAbsolutePath [
+			'.smalltalk.lint.ston'
+		],
+		#encoding : 'TXT'
+	},
 	SquotPlaintextMapper {
 		#path : FSAbsolutePath [
 			'scripts',
 			'preLoading.st'
 		],
 		#encoding : 'TXT'
 	},
-	SquotCypressMapper {
-		#package : MCPackage {
-			#name : 'BaselineOfTelegramClient'
-		},
+	SquotPlaintextMapper {
 		#path : FSAbsolutePath [
-			'packages'
-		]
+			'LICENSE'
+		],
+		#encoding : 'TXT'
 	},
 	SquotPlaintextMapper {
 		#path : FSAbsolutePath [
-			'.smalltalk.ston'
+			'.github',
+			'workflows',
+			'release.yml'
 		],
 		#encoding : 'TXT'
 	},
@@ -163,25 +162,26 @@
 			'packages'
 		]
 	},
-	SquotPlaintextMapper {
+	SquotImageMapper {
 		#path : FSAbsolutePath [
-			'.squot'
+			'assets',
+			'playbutton.jpg'
 		],
-		#encoding : 'TXT'
+		#encoding : Class [ #JPEGReadWriter2 ]
 	},
 	SquotPlaintextMapper {
 		#path : FSAbsolutePath [
 			'.github',
 			'workflows',
-			'release.yml'
+			'ci-linter.yml'
 		],
 		#encoding : 'TXT'
 	},
-	SquotPlaintextMapper {
+	SquotImageMapper {
 		#path : FSAbsolutePath [
-			'.github',
-			'pull_request_template.md'
+			'assets',
+			'play_circle_outline_icon.png'
 		],
-		#encoding : 'TXT'
+		#encoding : @40
 	}
 ]
diff --git a/packages/TelegramClient-UI.package/TCUChatPollEditor.class/README.md b/packages/TelegramClient-UI.package/TCUChatPollEditor.class/README.md
diff --git a/packages/TelegramClient-UI.package/TCUChatPollEditor.class/class/newFor.withBounds..st b/packages/TelegramClient-UI.package/TCUChatPollEditor.class/class/newFor.withBounds..st
@@ -0,0 +1,7 @@
+as yet unclassified
+newFor: aChat withBounds: aRectangle
+
+	^ (super newBounds: aRectangle)
+		chat: aChat;
+		addTypeOption;
+		yourself
diff --git a/packages/TelegramClient-UI.package/TCUChatPollEditor.class/instance/addTypeOption.st b/packages/TelegramClient-UI.package/TCUChatPollEditor.class/instance/addTypeOption.st
@@ -0,0 +1,12 @@
+as yet unclassified
+addTypeOption
+
+	self typeOption: (RectangleMorph new
+		color: Color red;
+		extent: 300@300;
+		useRoundedCorners;
+		yourself).
+
+	self addMorph: self typeOption.
+	self typeOption center: self center.
+
diff --git a/packages/TelegramClient-UI.package/TCUChatPollEditor.class/instance/chat..st b/packages/TelegramClient-UI.package/TCUChatPollEditor.class/instance/chat..st
@@ -0,0 +1,4 @@
+as yet unclassified
+chat: aChat
+
+	chat := aChat
diff --git a/packages/TelegramClient-UI.package/TCUChatPollEditor.class/instance/chat.st b/packages/TelegramClient-UI.package/TCUChatPollEditor.class/instance/chat.st
@@ -0,0 +1,4 @@
+as yet unclassified
+chat
+
+	^ chat
diff --git a/packages/TelegramClient-UI.package/TCUChatPollEditor.class/instance/initialize.st b/packages/TelegramClient-UI.package/TCUChatPollEditor.class/instance/initialize.st
@@ -0,0 +1,10 @@
+as yet unclassified
+initialize
+
+	super initialize.
+
+	self
+		color: (TCUDefaultValues colorLightGray alpha: 0.5);
+		borderWidth: 0;
+		on: #mouseUp send: #hide to: self.
+
diff --git a/packages/TelegramClient-UI.package/TCUChatPollEditor.class/instance/typeOption..st b/packages/TelegramClient-UI.package/TCUChatPollEditor.class/instance/typeOption..st
@@ -0,0 +1,4 @@
+as yet unclassified
+typeOption: aRectangleMorph
+
+	typeOption :=  aRectangleMorph
diff --git a/packages/TelegramClient-UI.package/TCUChatPollEditor.class/instance/typeOption.st b/packages/TelegramClient-UI.package/TCUChatPollEditor.class/instance/typeOption.st
@@ -0,0 +1,4 @@
+as yet unclassified
+typeOption
+
+	^ typeOption
diff --git a/packages/TelegramClient-UI.package/TCUChatPollEditor.class/methodProperties.json b/packages/TelegramClient-UI.package/TCUChatPollEditor.class/methodProperties.json
@@ -0,0 +1,10 @@
+{
+	"class" : {
+		"newFor:withBounds:" : "jkon 6/17/2024 11:14" },
+	"instance" : {
+		"addTypeOption" : "jkon 6/17/2024 11:17",
+		"chat" : "jkon 6/17/2024 10:29",
+		"chat:" : "jkon 6/17/2024 10:29",
+		"initialize" : "jkon 6/17/2024 11:13",
+		"typeOption" : "jkon 6/17/2024 11:03",
+		"typeOption:" : "jkon 6/17/2024 11:03" } }
diff --git a/packages/TelegramClient-UI.package/TCUChatPollEditor.class/properties.json b/packages/TelegramClient-UI.package/TCUChatPollEditor.class/properties.json
@@ -0,0 +1,15 @@
+{
+	"category" : "TelegramClient-UI",
+	"classinstvars" : [
+		 ],
+	"classvars" : [
+		 ],
+	"commentStamp" : "",
+	"instvars" : [
+		"chat",
+		"typeOption" ],
+	"name" : "TCUChatPollEditor",
+	"pools" : [
+		 ],
+	"super" : "RectangleMorph",
+	"type" : "normal" }
diff --git a/packages/TelegramClient-UI.package/TCUChatWindow.class/instance/addHiddenPollEditor.st b/packages/TelegramClient-UI.package/TCUChatWindow.class/instance/addHiddenPollEditor.st
@@ -0,0 +1,8 @@
+drawing
+addHiddenPollEditor
+
+	self
+		pollEditor: (TCUChatPollEditor newFor: self selectedChat withBounds: self bounds);
+		addMorphFront: self pollEditor.
+
+	self pollEditor hide.
diff --git a/packages/TelegramClient-UI.package/TCUChatWindow.class/instance/addPollButton.st b/packages/TelegramClient-UI.package/TCUChatWindow.class/instance/addPollButton.st
@@ -0,0 +1,10 @@
+drawing
+addPollButton
+
+	self pollButton: (TCUButton new
+		extent: 50 @ 30;
+		text: '|||';
+		on: #mouseUp send: #showPollEditor to: self;
+		name: 'openPollEditor';
+		yourself).
+	self inputBar addMorph: self pollButton.
diff --git 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 - 240) @ self class defaultInputfieldHeight);
+		extent: ((self inputBar width - 280) @ self class defaultInputfieldHeight);
 		crAction: [self buttonSendPressed];
 		yourself).
 

diff --git a/packages/TelegramClient-UI.package/TCUChatWindow.class/instance/createInputBar.st b/packages/TelegramClient-UI.package/TCUChatWindow.class/instance/createInputBar.st
@@ -13,6 +13,6 @@ createInputBar
 		wrapCentering: #topLeft;
 		layoutInset: 2;
 		vResizing: #shrinkWrap;
-		cellInset: 12;
+		cellInset: 8;
 		hide;
 		yourself).
diff --git a/packages/TelegramClient-UI.package/TCUChatWindow.class/instance/newChatSelected..st b/packages/TelegramClient-UI.package/TCUChatWindow.class/instance/newChatSelected..st
@@ -4,6 +4,7 @@ newChatSelected: aChat
 	self welcomeMessage hide.
 	self inputBar submorphsDo: #abandon.
 	self addStickerButton.
+	self addPollButton.
 	self addSendButton.
 	self addTextInputField.
 	self inputBar show.
@@ -12,7 +13,8 @@ newChatSelected: aChat
 	self
 		selectedChat: aChat;
 		addTitleBar;
-		addHiddenInfoPage.
+		addHiddenInfoPage;
+		addHiddenPollEditor.
 
-	self chatMessageList show.
+	self  chatMessageList show.
 	self chatMessageList displayChat: aChat.