Merge pull request #10 from sebastianconcept/9-SubclassResponsibility…

…-PharoDawnTheme-class-had-the-subclass-responsibility-to-implement-colorConfiguratorClass-encountered-while-attempting-to-load-with-Metacello-in-Pharo-11 9 subclass responsibility pharo dawn theme class had the subclass responsibility to implement color configurator class encountered while attempting to load with metacello in pharo 11
sebastianconcept · Feb 2, 2024 · 1391f10 · 1391f10
2 parents 876247b + ed47eea
commit 1391f10
Show file tree

Hide file tree

Showing 5 changed files with 396 additions and 121 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -5,23 +5,15 @@ env:
 
 # Controls when the action will run. Triggers the workflow on push or pull request
 # events but only for the development branch
-on:
-  pull_request:
-    types: [opened]
-
-  push:
-    branches:
-      - develop
-      - master
+on: [push]
 
 jobs:
   build:
     runs-on: ubuntu-latest
     strategy:
       matrix:
         smalltalk: 
-          - Pharo64-9.0
-          - Pharo64-10
+          - Pharo64-11
     name: ${{ matrix.smalltalk }}
     steps:
       - uses: actions/checkout@v2

diff --git a/PharoDawnTheme/DawnThemeColorConfigurator.class.st b/PharoDawnTheme/DawnThemeColorConfigurator.class.st
@@ -0,0 +1,328 @@
+Class {
+	#name : #DawnThemeColorConfigurator,
+	#superclass : #UIThemeColorConfigurator,
+	#category : #PharoDawnTheme
+}
+
+{ #category : #colors }
+DawnThemeColorConfigurator >> backgroundColor [
+
+	^ Color fromHexString: '262720'
+]
+
+{ #category : #colors }
+DawnThemeColorConfigurator >> badgeColor [
+
+	^ Color red alpha: 0.5
+]
+
+{ #category : #colors }
+DawnThemeColorConfigurator >> badgeTextColor [
+
+	^ self textColor
+]
+
+{ #category : #colors }
+DawnThemeColorConfigurator >> balloonBackgroundColor [
+
+	^ self backgroundColor
+]
+
+{ #category : #colors }
+DawnThemeColorConfigurator >> baseColor [
+
+	^ Color veryDarkGray
+]
+
+{ #category : #colors }
+DawnThemeColorConfigurator >> basePassiveBackgroundColor [
+
+	^ Color darkGray
+]
+
+{ #category : #colors }
+DawnThemeColorConfigurator >> baseSelectionColor [
+	^ Color fromHexString: '49483E'
+]
+
+{ #category : #colors }
+DawnThemeColorConfigurator >> borderColor [
+
+	^ Color darkGray darker darker darker
+]
+
+{ #category : #colors }
+DawnThemeColorConfigurator >> buttonColor [
+
+	^ self backgroundColor lighter lighter
+]
+
+{ #category : #colors }
+DawnThemeColorConfigurator >> buttonSelectedFillStyleFor: aButton [
+	"Return the normal button fillStyle for the given button."
+
+	^ SolidFillStyle color: self selectionColor
+]
+
+{ #category : #colors }
+DawnThemeColorConfigurator >> caretColor [
+
+	^ self backgroundColor muchLighter
+]
+
+{ #category : #colors }
+DawnThemeColorConfigurator >> classExtensionColor [
+
+	^ Color gray lighter lighter
+]
+
+{ #category : #colors }
+DawnThemeColorConfigurator >> dangerTextColor [
+
+	^ Color r: 239 g: 83 b: 80 range: 255
+]
+
+{ #category : #colors }
+DawnThemeColorConfigurator >> darkBaseColor [
+
+	^ Color veryDarkGray
+]
+
+{ #category : #colors }
+DawnThemeColorConfigurator >> desktopColor [
+
+	^ Color darkGray darker
+]
+
+{ #category : #colors }
+DawnThemeColorConfigurator >> diffAdditionalLineBackgroundColor [
+
+	^ Color r: 0.0 g: 0.76 b: 0.0 alpha: 0.2
+]
+
+{ #category : #colors }
+DawnThemeColorConfigurator >> diffEdgeColor [
+
+	^ Color white alpha: 0.5
+]
+
+{ #category : #colors }
+DawnThemeColorConfigurator >> diffModificatedLineBackgroundColor [
+
+	^ Color gray alpha: 0.2
+]
+
+{ #category : #colors }
+DawnThemeColorConfigurator >> diffRemovedLinesBackgroundColor [
+
+	^ Color r: 0.84 g: 0.0 b: 0.0 alpha: 0.2
+]
+
+{ #category : #colors }
+DawnThemeColorConfigurator >> disabledColor [
+
+	^ Color gray lighter
+]
+
+{ #category : #colors }
+DawnThemeColorConfigurator >> disabledLabelColor [
+
+	^ Color r: 0.7673509286412512
+		  g: 0.7673509286412512
+		  b: 0.7673509286412512
+		  alpha: 0.7647058823529411
+]
+
+{ #category : #colors }
+DawnThemeColorConfigurator >> dropListNormalFillStyleFor: aDropList [
+
+	^ self backgroundColor
+]
+
+{ #category : #colors }
+DawnThemeColorConfigurator >> dropListNormalListFillStyleFor: aDropList [
+
+	^ self backgroundColor
+]
+
+{ #category : #colors }
+DawnThemeColorConfigurator >> enabledColor [
+
+	^ self textColor
+]
+
+{ #category : #colors }
+DawnThemeColorConfigurator >> errorPopperBackgroundColor [
+
+	^ Color red muchDarker
+]
+
+{ #category : #colors }
+DawnThemeColorConfigurator >> lessConspicuousColorFrom: aColor [
+
+	^ aColor slightlyLighter
+]
+
+{ #category : #colors }
+DawnThemeColorConfigurator >> lightBackgroundColor [
+
+	^ Color r: 0.218 g: 0.217 b: 0.217
+]
+
+{ #category : #colors }
+DawnThemeColorConfigurator >> lightBaseColor [
+
+	^ Color darkGray
+]
+
+{ #category : #colors }
+DawnThemeColorConfigurator >> lineNumberColor [
+
+	^ Color gray lighter lighter
+]
+
+{ #category : #colors }
+DawnThemeColorConfigurator >> listNormalFillStyleFor: aList [
+
+	^ self backgroundColor
+]
+
+{ #category : #colors }
+DawnThemeColorConfigurator >> listTextColor [
+
+	^ self textColor
+]
+
+{ #category : #colors }
+DawnThemeColorConfigurator >> menuBorderColor [
+
+	^ self borderColor
+]
+
+{ #category : #colors }
+DawnThemeColorConfigurator >> menuItemDisabledTextColorFor: aMenuItem [
+
+	^ Color lightGray
+]
+
+{ #category : #colors }
+DawnThemeColorConfigurator >> mouseOverColor [
+
+	^ self lightBackgroundColor
+]
+
+{ #category : #colors }
+DawnThemeColorConfigurator >> paginatorSelectionColor [
+
+	^ self lightBaseColor alpha: 0.8
+]
+
+{ #category : #colors }
+DawnThemeColorConfigurator >> popoverButtonColor [
+
+	^ self lightBaseColor
+]
+
+{ #category : #colors }
+DawnThemeColorConfigurator >> scrollbarColor [
+
+	^ self buttonColor
+]
+
+{ #category : #colors }
+DawnThemeColorConfigurator >> scrollbarNormalFillStyleFor: aScrollbar [
+
+	"Return the normal scrollbar fillStyle for the given scrollbar."
+
+	^ SolidFillStyle color: self backgroundColor lighter
+]
+
+{ #category : #colors }
+DawnThemeColorConfigurator >> secondarySelectionColor [
+
+	^ Color r: 0.31 g: 0.31 b: 0.36 alpha: 1.0
+]
+
+{ #category : #colors }
+DawnThemeColorConfigurator >> selectionColor [
+
+	^ Color r: 16r07 g: 16r63 b: 16rAD range: 255
+]
+
+{ #category : #colors }
+DawnThemeColorConfigurator >> selectionTextColor [
+
+	^ Color r: 16rE0 g: 16rE2 b: 16rE4 range: 255
+]
+
+{ #category : #colors }
+DawnThemeColorConfigurator >> sliderNormalFillStyleFor: aSlider [
+
+	^ self backgroundColor
+]
+
+{ #category : #colors }
+DawnThemeColorConfigurator >> spotlightWindowColor [
+
+	^ self windowColor
+]
+
+{ #category : #colors }
+DawnThemeColorConfigurator >> successTextColor [
+
+	^ Color green darker darker darker
+]
+
+{ #category : #colors }
+DawnThemeColorConfigurator >> taskbarItemLabelColorForCollapsed: aButton [
+
+	^ Color lightGray
+]
+
+{ #category : #colors }
+DawnThemeColorConfigurator >> taskbarItemLabelColorForExpanded: aButton [
+
+	^ Color white
+]
+
+{ #category : #colors }
+DawnThemeColorConfigurator >> textColor [
+
+	^ Color white
+]
+
+{ #category : #colors }
+DawnThemeColorConfigurator >> textColorForNonStandardBackground [
+
+	^ Color black
+]
+
+{ #category : #colors }
+DawnThemeColorConfigurator >> textEditorNormalFillStyleFor: aTextEditor [
+
+	^ self backgroundColor
+]
+
+{ #category : #colors }
+DawnThemeColorConfigurator >> unfocusedSelectionColor [
+
+	^ self secondarySelectionColor
+]
+
+{ #category : #colors }
+DawnThemeColorConfigurator >> veryLightSelectionColor [
+
+	^ self lightSelectionColor muchLighter
+]
+
+{ #category : #colors }
+DawnThemeColorConfigurator >> warningTextColor [
+
+	^ Color yellow darker darker
+]
+
+{ #category : #colors }
+DawnThemeColorConfigurator >> windowActiveLabelFillStyleFor: aWindow [
+
+	^ self textColor
+]
diff --git a/PharoDawnTheme/PharoDawnTheme.class.st b/PharoDawnTheme/PharoDawnTheme.class.st
@@ -1,3 +1,6 @@
+"
+A warm dark theme for Pharo.
+"
 Class {
 	#name : #PharoDawnTheme,
 	#superclass : #UITheme,
@@ -14,9 +17,10 @@ PharoDawnTheme class >> basePassiveBackgroundColor [
 	^ Color darkGray
 ]
 
-{ #category : #accessing }
-PharoDawnTheme class >> baseSelectionColor [
-	^ Color fromHexString: '49483E'
+{ #category : #configuration }
+PharoDawnTheme class >> colorConfiguratorClass [
+
+	^ DawnThemeColorConfigurator
 ]
 
 { #category : #accessing }
@@ -56,13 +60,6 @@ PharoDawnTheme class >> lightSelectionColor [
 	^ Color fromHexString: '49483E'
 ]
 
-{ #category : #settings }
-PharoDawnTheme class >> setPreferredPreferences [
-	"NECPreferences 
-		expandPrefixes: true;
-		popupShowWithShortcut: Character tab asShortcut."
-]
-
 { #category : #accessing }
 PharoDawnTheme class >> themeName [
 	^ 'Pharo Dawn'