implemented stickerWindow to display sticker setwise and initialize installed stickers ids on startup

jkubuni · jkubuni · commit 6a8cb8aa2148 · 2024-06-21T00:11:41.000+02:00
diff --git a/assets/playbutton.jpg b/assets/playbutton.jpg
diff --git a/packages/TelegramClient-Core.package/TCCCore.class/instance/initialize.st b/packages/TelegramClient-Core.package/TCCCore.class/instance/initialize.st
@@ -10,8 +10,7 @@ initialize
 		imageStore: (TCCImageStore newWith: self);
 		videoStore: (TCCVideoStore newWith: self);
 		stickerStore: (TCCStickerStore newWith: self);
-		callbackCounter: 0.
-	
+		callbackCounter: 0.	
 
 	"Mac users report serious slowdowns when receiveLoop is running at lower priority"
 	"So we have to rely on just the delay"
diff --git a/packages/TelegramClient-Core.package/TCCCore.class/methodProperties.json b/packages/TelegramClient-Core.package/TCCCore.class/methodProperties.json
@@ -22,7 +22,7 @@
 		"handlePendingEvent:" : "per 8/2/2021 15:05",
 		"imageStore" : "pk 6/19/2021 17:15",
 		"imageStore:" : "TR 6/22/2021 09:33",
-		"initialize" : "TU 6/14/2024 09:38",
+		"initialize" : "JK 6/20/2024 22:16",
 		"initializeHandlers" : "RS 8/1/2021 12:53",
 		"isClientAlive" : "js 5/28/2020 17:18",
 		"loggedInUserId" : "pk 8/5/2021 17:04",
diff --git a/packages/TelegramClient-Core.package/TCCStickerStore.class/class/newWith..st b/packages/TelegramClient-Core.package/TCCStickerStore.class/class/newWith..st
@@ -4,4 +4,4 @@ newWith: aCore
 	^ self new
 		core: aCore;
 		stickerSets: Dictionary new;
-		yourself
+		yourself.
diff --git a/packages/TelegramClient-Core.package/TCCStickerStore.class/instance/loadStickerIds.st b/packages/TelegramClient-Core.package/TCCStickerStore.class/instance/loadStickerIds.st
@@ -0,0 +1,9 @@
+as yet unclassified
+loadStickerIds
+
+	| sets |
+	
+	self core send: (TCCRequest getInstalledStickerSets)
+		thenDo: [:stickerEvent | sets := stickerEvent at: 'sets'.
+			sets do: [:setInfo | self core send: (TCCRequest getStickerSetFor: (setInfo at: 'id'))
+				thenDo: [:set | (set at: 'is_animated') ifFalse: [self storeStickerSet: set.]]]].
diff --git a/packages/TelegramClient-Core.package/TCCStickerStore.class/methodProperties.json b/packages/TelegramClient-Core.package/TCCStickerStore.class/methodProperties.json
@@ -1,7 +1,7 @@
 {
 	"class" : {
 		"extractPathFrom:" : "pk 6/19/2021 16:23",
-		"newWith:" : "JK 6/19/2024 11:30",
+		"newWith:" : "JK 6/20/2024 22:18",
 		"stickerFormFrom:" : "JK 6/5/2024 11:15" },
 	"instance" : {
 		"core" : "pk 6/19/2021 16:13",
@@ -10,6 +10,7 @@
 		"getFormFor:" : "JK 6/5/2024 11:12",
 		"getFormPromiseFor:" : "JK 5/16/2024 21:21",
 		"getInstalledStickers" : "JK 6/5/2024 11:37",
+		"loadStickerIds" : "JK 6/20/2024 23:39",
 		"requestStickerFor:with:" : "JK 5/16/2024 21:40",
 		"stickerSets" : "JK 6/19/2024 11:30",
 		"stickerSets:" : "JK 6/19/2024 11:30",
diff --git a/packages/TelegramClient-UI.package/TCUChatWindow.class/instance/buttonStickerPressed.st b/packages/TelegramClient-UI.package/TCUChatWindow.class/instance/buttonStickerPressed.st
@@ -3,10 +3,9 @@ buttonStickerPressed
 
 	| stickerWindow |
 	self stickerWindow ifNil: [
-	stickerWindow := TCUStickerWindow new 
+	stickerWindow := (TCUStickerWindow newWith: (self owner core))
 		position: (self position + (700 @ 50));
-		selectedChat: self selectedChat;
-		core: (self owner core).
+		selectedChat: self selectedChat.
 	self stickerWindow: stickerWindow.
 	self addMorph: stickerWindow.
 	self stickerButton makeLighter.]
diff --git a/packages/TelegramClient-UI.package/TCUChatWindow.class/methodProperties.json b/packages/TelegramClient-UI.package/TCUChatWindow.class/methodProperties.json
@@ -18,7 +18,7 @@
 		"addTitleBar" : "RS 5/29/2021 18:12",
 		"addWelcomeMessage" : "RK 8/4/2021 12:07",
 		"buttonSendPressed" : "ek 6/19/2022 19:07",
-		"buttonStickerPressed" : "JK 6/5/2024 11:12",
+		"buttonStickerPressed" : "JK 6/20/2024 23:46",
 		"chatMessageList" : "JB 7/6/2021 14:02",
 		"chatMessageList:" : "JB 7/6/2021 14:02",
 		"clear" : "JK 5/29/2024 20:29",
diff --git a/packages/TelegramClient-UI.package/TCUMainWindow.class/instance/initialize.st b/packages/TelegramClient-UI.package/TCUMainWindow.class/instance/initialize.st
@@ -8,6 +8,7 @@ initialize
 		addHeader;
 		chatWindow: TCUChatWindow new;
 		addChatsList;
+		initializeStickerStore;
 		initializeChatWindow;
 		subscribeChatsList;
 		clipSubmorphs: true.
diff --git a/packages/TelegramClient-UI.package/TCUMainWindow.class/instance/initializeStickerStore.st b/packages/TelegramClient-UI.package/TCUMainWindow.class/instance/initializeStickerStore.st
@@ -0,0 +1,4 @@
+initialization
+initializeStickerStore
+
+	self core stickerStore loadStickerIds
diff --git a/packages/TelegramClient-UI.package/TCUMainWindow.class/methodProperties.json b/packages/TelegramClient-UI.package/TCUMainWindow.class/methodProperties.json
@@ -15,8 +15,9 @@
 		"deleteMorph" : "RS 7/17/2021 12:20",
 		"header" : "r.s 8/2/2020 19:07",
 		"header:" : "r.s 8/2/2020 19:08",
-		"initialize" : "RS 7/17/2021 17:47",
+		"initialize" : "JK 6/20/2024 22:24",
 		"initializeChatWindow" : "RS 7/17/2021 12:01",
+		"initializeStickerStore" : "JK 6/20/2024 22:28",
 		"logout" : "RS 7/31/2021 15:57",
 		"newMessageReceived:" : "per 6/16/2021 17:36",
 		"subscribeChatsList" : "RS 7/17/2021 11:48" } }
diff --git a/packages/TelegramClient-UI.package/TCUStickerWindow.class/class/newWith..st b/packages/TelegramClient-UI.package/TCUStickerWindow.class/class/newWith..st
@@ -0,0 +1,7 @@
+as yet unclassified
+newWith: aCore
+
+	^ self basicNew
+		core: aCore;
+		initialize;
+		yourself
diff --git a/packages/TelegramClient-UI.package/TCUStickerWindow.class/instance/buildStickerListItemsFor..st b/packages/TelegramClient-UI.package/TCUStickerWindow.class/instance/buildStickerListItemsFor..st
@@ -1,15 +1,15 @@
 drawing
-buildStickerListItemsFor: anOrderedCollection
+buildStickerListItemsFor: anArray
 
 	| stickers item |
 	
 	stickers := OrderedCollection new.
-	(self core stickerStore keys) do: [:sticker | 
+	anArray do: [:stickerId | 
 		item := (TCUStickerListItem new
-			image: ((self core stickerStore getFormFor: sticker) scaledToWidth: 100);
-			id: sticker;
+			image: ((self core stickerStore getFormFor: stickerId) scaledToWidth: 100);
+			id: stickerId;
 			selectedChat: self selectedChat).
-		item on: #mouseDown send: #sendStickerMessage:event:from: to: self selectedChat withValue: sticker.
+		item on: #mouseDown send: #sendStickerMessage:event:from: to: self selectedChat withValue: stickerId.
 		stickers add: item].
 	self items: stickers.
 	
diff --git a/packages/TelegramClient-UI.package/TCUStickerWindow.class/instance/initialize.st b/packages/TelegramClient-UI.package/TCUStickerWindow.class/instance/initialize.st
@@ -7,5 +7,4 @@ initialize
 		shouldRedraw: true;
 		addCloseButton;
 		addPreviousButton;
-		addNextButton.
-		"loadStickers."
+		addNextButton.
diff --git a/packages/TelegramClient-UI.package/TCUStickerWindow.class/instance/selectedSet..st b/packages/TelegramClient-UI.package/TCUStickerWindow.class/instance/selectedSet..st
@@ -0,0 +1,4 @@
+accessing
+selectedSet: aSetId
+
+	selectedSet := aSetId
diff --git a/packages/TelegramClient-UI.package/TCUStickerWindow.class/instance/selectedSet.st b/packages/TelegramClient-UI.package/TCUStickerWindow.class/instance/selectedSet.st
@@ -0,0 +1,4 @@
+accessing
+selectedSet
+
+	^ selectedSet
diff --git a/packages/TelegramClient-UI.package/TCUStickerWindow.class/instance/showNextSet.st b/packages/TelegramClient-UI.package/TCUStickerWindow.class/instance/showNextSet.st
@@ -1,2 +1,10 @@
 drawing
-showNextSet
+showNextSet
+	
+	| keyArray |
+	keyArray := self core stickerStore stickerSets keysInOrder.
+	(keyArray size > (keyArray indexOf: (self selectedSet))) ifTrue: [
+		self selectedSet: (keyArray at: ((keyArray indexOf: (self selectedSet)) + 1))]
+	ifFalse: [self selectedSet: (keyArray at: 1)].
+	self showSelectedSet
+	
diff --git a/packages/TelegramClient-UI.package/TCUStickerWindow.class/instance/showPreviousSet.st b/packages/TelegramClient-UI.package/TCUStickerWindow.class/instance/showPreviousSet.st
@@ -1,2 +1,10 @@
 drawing
-showPreviousSet
+showPreviousSet
+	
+	| keyArray |
+	
+	keyArray := self core stickerStore stickerSets keysInOrder.
+	(1 ~= (keyArray indexOf: (self selectedSet))) ifTrue: [
+		self selectedSet: ((keyArray at: (keyArray indexOf: (self selectedSet)) - 1))]
+	ifFalse: [self selectedSet: (keyArray at: keyArray size)].
+	self showSelectedSet
diff --git a/packages/TelegramClient-UI.package/TCUStickerWindow.class/instance/showSelectedSet.st b/packages/TelegramClient-UI.package/TCUStickerWindow.class/instance/showSelectedSet.st
@@ -0,0 +1,9 @@
+drawing
+showSelectedSet
+	
+	| stickers |
+	self clearItems.
+	stickers := self core stickerStore stickerSets at: self selectedSet.
+	self buildStickerListItemsFor: stickers.
+	self items do: [:anItem | self scroller addMorphBack: anItem].
+	
diff --git a/packages/TelegramClient-UI.package/TCUStickerWindow.class/instance/step.st b/packages/TelegramClient-UI.package/TCUStickerWindow.class/instance/step.st
@@ -1,8 +1,7 @@
 stepping and presenter
 step
-	
+
 	self shouldRedraw ifTrue: [
-		self core stickerStore getInstalledStickers.
-		self buildStickerListItems.
-		self items do: [:anItem | self scroller addMorphBack: anItem].
+		self selectedSet: ((self core stickerStore stickerSets keysInOrder) at: 1).
+		self showSelectedSet.
 		self shouldRedraw: false]
diff --git a/packages/TelegramClient-UI.package/TCUStickerWindow.class/methodProperties.json b/packages/TelegramClient-UI.package/TCUStickerWindow.class/methodProperties.json
@@ -1,21 +1,28 @@
 {
 	"class" : {
-		 },
+		"newWith:" : "JK 6/20/2024 23:46" },
 	"instance" : {
 		"addCloseButton" : "JK 5/21/2024 10:22",
 		"addNextButton" : "JK 6/19/2024 12:03",
 		"addPreviousButton" : "JK 6/19/2024 12:04",
 		"buildStickerListItems" : "JK 6/19/2024 11:27",
-		"buildStickerListItemsFor:" : "JK 6/19/2024 11:55",
+		"buildStickerListItemsFor:" : "JK 6/20/2024 12:40",
 		"close" : "JK 5/29/2024 20:09",
+		"collectInstalledStickers" : " 6/20/2024 11:30:00",
 		"core" : "JK 5/31/2024 14:29",
 		"core:" : "JK 5/31/2024 14:29",
-		"initialize" : "JK 6/19/2024 11:58",
+		"downloadStickerSetFrom:" : " 6/20/2024 11:30:00",
+		"initialize" : "JK 6/20/2024 23:42",
+		"loadStickers" : " 6/20/2024 11:30:00",
+		"loadStickersFromStore" : " 6/20/2024 11:30:00",
 		"selectedChat" : "JK 5/28/2024 10:22",
 		"selectedChat:" : "JK 5/28/2024 10:23",
+		"selectedSet" : "JK 6/20/2024 11:39",
+		"selectedSet:" : "JK 6/20/2024 11:39",
 		"shouldRedraw" : "JK 5/22/2024 20:12",
 		"shouldRedraw:" : "JK 5/22/2024 20:12",
-		"showNextSet" : "JK 6/19/2024 12:07",
-		"showPreviousSet" : "JK 6/19/2024 12:07",
-		"step" : "JK 6/5/2024 12:07",
+		"showNextSet" : "JK 6/21/2024 00:08",
+		"showPreviousSet" : "JK 6/21/2024 00:08",
+		"showSelectedSet" : "JK 6/21/2024 00:09",
+		"step" : "JK 6/21/2024 00:09",
 		"stepTime" : "JK 5/22/2024 19:59" } }
diff --git a/packages/TelegramClient-UI.package/TCUStickerWindow.class/properties.json b/packages/TelegramClient-UI.package/TCUStickerWindow.class/properties.json
@@ -9,7 +9,8 @@
 		"closeButton",
 		"shouldRedraw",
 		"selectedChat",
-		"core" ],
+		"core",
+		"selectedSet" ],
 	"name" : "TCUStickerWindow",
 	"pools" : [
 		 ],
