Add icons in front of sidebar lists

hpi-swa-teaching · Jun 6, 2022 · e48ee98 · e48ee98
1 parent 64a03e8
commit e48ee98
Show file tree

Hide file tree

Showing 14 changed files with 47 additions and 9 deletions.
diff --git a/Squello-Core.package/SPBBoard.class/instance/buildSidebarLabelListSpecWith..st b/Squello-Core.package/SPBBoard.class/instance/buildSidebarLabelListSpecWith..st
@@ -11,5 +11,6 @@ buildSidebarLabelListSpecWith: aBuilder
 		dragItem: #dragFromLabels:;
 		dropAccept: #wantsLabelDrop:;
 		dropItem: #dropOnLabels:at:;
+		icon: #labelIcon:;
 		yourself.
 
diff --git a/Squello-Core.package/SPBBoard.class/instance/buildSidebarPotentialLabelListSpecWith..st b/Squello-Core.package/SPBBoard.class/instance/buildSidebarPotentialLabelListSpecWith..st
@@ -11,5 +11,6 @@ buildSidebarPotentialLabelListSpecWith: aBuilder
 		dragItem: #dragFromPotentialLabels:;
 		dropAccept: #wantsLabelDrop:;
 		dropItem: #dropOnPotentialLabels:at:;
+		icon: #potentialLabelIcon:;
 		yourself.
 
diff --git a/Squello-Core.package/SPBBoard.class/instance/labelIcon..st b/Squello-Core.package/SPBBoard.class/instance/labelIcon..st
@@ -0,0 +1,5 @@
+accessing
+labelIcon: aNumber
+
+	aNumber = 1 ifTrue: [^ nil].
+	^ (self activeCard labels at: aNumber - 1) asForm.
diff --git a/Squello-Core.package/SPBBoard.class/instance/potentialLabelIcon..st b/Squello-Core.package/SPBBoard.class/instance/potentialLabelIcon..st
@@ -0,0 +1,5 @@
+accessing
+potentialLabelIcon: aNumber
+
+	aNumber = 1 ifTrue: [^ nil].
+	^ (self potentialLabelsList at: aNumber) asForm.
diff --git a/Squello-Core.package/SPBBoard.class/methodProperties.json b/Squello-Core.package/SPBBoard.class/methodProperties.json
@@ -25,10 +25,10 @@
 		"buildSidebarAssigneeListSpecWith:" : "mcr 5/27/2022 18:28",
 		"buildSidebarAssigneePanelSpecWith:" : "mcr 5/27/2022 19:05",
 		"buildSidebarDescriptionSpecWith:" : "lo 6/5/2022 14:45",
-		"buildSidebarLabelListSpecWith:" : "lo 6/5/2022 14:43",
+		"buildSidebarLabelListSpecWith:" : "lo 6/6/2022 12:20",
 		"buildSidebarLabelPanelSpecWith:" : "lo 6/5/2022 14:45",
 		"buildSidebarPotentialAssigneeListSpecWith:" : "mcr 5/27/2022 18:28",
-		"buildSidebarPotentialLabelListSpecWith:" : "lo 6/5/2022 15:12",
+		"buildSidebarPotentialLabelListSpecWith:" : "lo 6/6/2022 12:43",
 		"buildSidebarSpecWith:" : "lo 6/5/2022 14:45",
 		"buildSidebarTitleSpecWith:" : "mcr 5/27/2022 19:06",
 		"buildSyncButton:" : "mcr 5/31/2022 00:08",
@@ -46,6 +46,7 @@
 		"dropOnPotentialAssignees:at:" : "mcr 5/30/2022 21:47",
 		"dropOnPotentialLabels:at:" : "lo 6/5/2022 14:48",
 		"initialize" : "NTK 6/1/2022 16:39",
+		"labelIcon:" : "lo 6/6/2022 12:23",
 		"labelSelected" : "lo 6/5/2022 14:56",
 		"labelSelected:" : "lo 6/5/2022 15:14",
 		"lanes" : "lo 5/26/2022 23:15",
@@ -55,6 +56,7 @@
 		"potentialAssignees" : "mcr 5/28/2022 01:44",
 		"potentialAssignees:" : "mcr 5/27/2022 15:29",
 		"potentialAssigneesList" : "mcr 5/27/2022 19:17",
+		"potentialLabelIcon:" : "lo 6/6/2022 12:45",
 		"potentialLabelSelected" : "lo 6/5/2022 14:52",
 		"potentialLabelSelected:" : "lo 6/5/2022 14:53",
 		"potentialLabels" : "lo 6/5/2022 14:39",

diff --git a/Squello-Core.package/SPBGithubAPI.class/instance/deleteLabel.fromIssue.user.repo..st b/Squello-Core.package/SPBGithubAPI.class/instance/deleteLabel.fromIssue.user.repo..st
@@ -2,7 +2,9 @@ api calls delete request
 deleteLabel: aString fromIssue: aNumber user: anOtherString repo: aThirdString
 
 	| stream url |
-	url := 'https://api.github.com/repos/' , anOtherString , '/' , aThirdString, '/issues/' , aNumber , '/labels/' , aString.
+	url := ('https://api.github.com/repos/' , anOtherString , '/' , aThirdString, '/issues/' , aNumber , '/labels/' , aString) urlEncoded.
+
+	self halt.
 
 	stream := WriteStream with: OrderedCollection new.
 

diff --git a/Squello-Core.package/SPBGithubAPI.class/methodProperties.json b/Squello-Core.package/SPBGithubAPI.class/methodProperties.json
@@ -18,7 +18,7 @@
 		"createPostRequestTo:" : "mcr 5/27/2022 23:08",
 		"deleteAssignees:fromIssue:user:repo:" : "mcr 5/28/2022 00:45",
 		"deleteColumn:" : "mcr 5/28/2022 00:45",
-		"deleteLabel:fromIssue:user:repo:" : "lo 6/5/2022 15:00",
+		"deleteLabel:fromIssue:user:repo:" : "lo 6/6/2022 12:40",
 		"deleteRequestToURL:" : "mcr 5/28/2022 00:31",
 		"deleteRequestToURL:withData:" : "mcr 5/28/2022 00:28",
 		"getRequestToURL:" : "mcr 5/27/2022 23:08",

diff --git a/Squello-Core.package/SPBGithubBoardProvider.class/instance/createCard.into..st b/Squello-Core.package/SPBGithubBoardProvider.class/instance/createCard.into..st
@@ -4,4 +4,4 @@ createCard: aDictionary into: aSPBLane
 	| cardJson payload |
 	cardJson := self api createIssue: aDictionary user: self user repo: self repo.
 	payload := Dictionary newFrom: {'content_id' -> (cardJson at: 'id') . 'content_type' -> 'Issue'}.
-	^ self api addIssue: payload toColumn: aSPBLane id.
+	^ self api addIssue: payload ToColumn: aSPBLane id.
diff --git a/Squello-Core.package/SPBGithubBoardProvider.class/methodProperties.json b/Squello-Core.package/SPBGithubBoardProvider.class/methodProperties.json
@@ -7,12 +7,12 @@
 		"api" : "mcr 5/28/2022 01:24",
 		"api:" : "mcr 5/28/2022 01:24",
 		"checkUser:" : "jh 6/1/2022 00:40",
-		"createCard:into:" : "mcr 5/31/2022 17:49",
+		"createCard:into:" : "lo 6/6/2022 11:34",
 		"createColumn:" : "mcr 5/31/2022 18:41",
 		"createLabel:" : "mcr 5/31/2022 14:29",
 		"deleteAssignees:fromCard:" : "mcr 5/31/2022 18:31",
 		"deleteColumn:" : "mcr 5/31/2022 14:29",
-		"deleteLabel:fromCard:" : "lo 6/5/2022 14:49",
+		"deleteLabel:fromCard:" : "lo 6/6/2022 12:38",
 		"error" : "lo 6/5/2022 14:34",
 		"error:" : "lo 6/5/2022 14:34",
 		"initialize" : "mcr 5/28/2022 01:23",

diff --git a/Squello-Core.package/SPBLabel.class/class/newFrom..st b/Squello-Core.package/SPBLabel.class/class/newFrom..st
@@ -6,7 +6,7 @@ newFrom: aJsonObject
 	instance 
 		title: (aJsonObject at: 'name');
 		id: (aJsonObject at: 'id');
-		color: (aJsonObject at: 'color');
+		color: (Color fromString: (aJsonObject at: 'color'));
 		description: (aJsonObject at: 'description').
 
 	^ instance.
diff --git a/Squello-Core.package/SPBLabel.class/instance/asForm.st b/Squello-Core.package/SPBLabel.class/instance/asForm.st
@@ -0,0 +1,11 @@
+as yet unclassified
+asForm
+
+	| array |
+	array := (1 to: self extent x * self extent y) collect: [:i | self color pixelValueForDepth: self formDepth].
+
+	^ Form
+		extent: self extent
+		depth: self formDepth
+		fromArray: array
+		offset: (0@0).
diff --git a/Squello-Core.package/SPBLabel.class/instance/extent.st b/Squello-Core.package/SPBLabel.class/instance/extent.st
@@ -0,0 +1,4 @@
+as yet unclassified
+extent
+
+	^ 12 @ 12.
diff --git a/Squello-Core.package/SPBLabel.class/instance/formDepth.st b/Squello-Core.package/SPBLabel.class/instance/formDepth.st
@@ -0,0 +1,4 @@
+as yet unclassified
+formDepth
+
+	^ 32.
diff --git a/Squello-Core.package/SPBLabel.class/methodProperties.json b/Squello-Core.package/SPBLabel.class/methodProperties.json
@@ -1,13 +1,16 @@
 {
 	"class" : {
-		"newFrom:" : "lo 6/5/2022 15:03" },
+		"newFrom:" : "lo 6/6/2022 12:25" },
 	"instance" : {
 		"=" : "lo 6/5/2022 14:59",
+		"asForm" : "lo 6/6/2022 12:19",
 		"asString" : "lo 6/5/2022 14:49",
 		"color" : "lo 5/16/2022 22:01",
 		"color:" : "lo 5/23/2022 16:52",
 		"description" : "lo 5/16/2022 22:01",
 		"description:" : "lo 5/16/2022 21:45",
+		"extent" : "lo 6/6/2022 12:19",
+		"formDepth" : "lo 6/6/2022 12:20",
 		"hash" : "lo 6/5/2022 14:59",
 		"id" : "lo 5/16/2022 22:01",
 		"id:" : "lo 5/16/2022 21:45",