Refactored for better colour and font expose and cleaned up unused code

5 files changed, 14 insertions, 18 deletions

diff --git a/config/quickshell/modules/common/widgets/DialogButton.qml b/config/quickshell/modules/common/widgets/DialogButton.qml
index 9e19a507..b799336a 100644
--- a/config/quickshell/modules/common/widgets/DialogButton.qml
+++ b/config/quickshell/modules/common/widgets/DialogButton.qml
@@ -18,7 +18,7 @@ RippleButton {
     buttonRadius: Appearance?.rounding.full ?? 9999
 
     property color colEnabled: Appearance?.colors.colPrimary
-    property color colDisabled: Appearance?.m3colors.m3outline
+    property color colDisabled: Appearance?.m3colors.m3borderPrimary
 
     contentItem: StyledText {
         id: buttonTextWidget
@@ -27,7 +27,7 @@ RippleButton {
         anchors.rightMargin: 15
         text: buttonText
         horizontalAlignment: Text.AlignHCenter
-        font.pixelSize: Appearance?.font.pixelSize.small ?? 12
+        font.pixelSize: Appearance?.font.pixelSize.textBase ?? 12
         color: button.enabled ? button.colEnabled : button.colDisabled
 
         Behavior on color {
diff --git a/config/quickshell/modules/common/widgets/MaterialSymbol.qml b/config/quickshell/modules/common/widgets/MaterialSymbol.qml
index dbbfff00..214f838e 100644
--- a/config/quickshell/modules/common/widgets/MaterialSymbol.qml
+++ b/config/quickshell/modules/common/widgets/MaterialSymbol.qml
@@ -1,17 +1,16 @@
 import "root:/modules/common/"
 import QtQuick
-import QtQuick.Layouts
 
 Text {
     id: root
-    property real iconSize: Appearance?.font.pixelSize.small ?? 16
+    property real iconSize: Appearance?.font.pixelSize.textBase ?? 16
     property real fill: 0
     renderType: Text.NativeRendering
     font.hintingPreference: Font.PreferFullHinting
     verticalAlignment: Text.AlignVCenter
-    font.family: Appearance?.font.family.iconMaterial ?? "Material Symbols Rounded"
+    font.family: Appearance?.font.family.iconFont ?? "Material Symbols Rounded"
     font.pixelSize: iconSize
-    color: Appearance.m3colors.m3onBackground
+    color: Appearance.m3colors.m3primaryText
 
     Behavior on fill {
         NumberAnimation {
@@ -23,8 +22,6 @@ Text {
 
     font.variableAxes: { 
         "FILL": fill,
-        // "wght": font.weight,
-        // "GRAD": 0,
         "opsz": iconSize,
     }
 }
diff --git a/config/quickshell/modules/common/widgets/StyledText.qml b/config/quickshell/modules/common/widgets/StyledText.qml
index 6eef5785..988c136d 100644
--- a/config/quickshell/modules/common/widgets/StyledText.qml
+++ b/config/quickshell/modules/common/widgets/StyledText.qml
@@ -1,14 +1,13 @@
 import "root:/modules/common"
 import QtQuick
-import QtQuick.Layouts
 
 Text {
     renderType: Text.NativeRendering
     verticalAlignment: Text.AlignVCenter
     font {
         hintingPreference: Font.PreferFullHinting
-        family: Appearance?.font.family.main ?? "sans-serif"
-        pixelSize: Appearance?.font.pixelSize.small ?? 15
+        family: Appearance?.font.family.uiFont ?? "sans-serif"
+        pixelSize: Appearance?.font.pixelSize.textBase ?? 15
     }
-    color: Appearance?.m3colors.m3onBackground ?? "black"
+    color: Appearance?.m3colors.m3primaryText ?? "black"
 }
diff --git a/config/quickshell/modules/common/widgets/StyledTextArea.qml b/config/quickshell/modules/common/widgets/StyledTextArea.qml
index 1ea9a349..af3cf34d 100644
--- a/config/quickshell/modules/common/widgets/StyledTextArea.qml
+++ b/config/quickshell/modules/common/widgets/StyledTextArea.qml
@@ -4,12 +4,12 @@ import QtQuick.Controls
 
 TextArea {
     renderType: Text.NativeRendering
-    selectedTextColor: Appearance.m3colors.m3onSecondaryContainer
-    selectionColor: Appearance.m3colors.m3secondaryContainer
-    placeholderTextColor: Appearance.m3colors.m3outline
+    selectedTextColor: Appearance.m3colors.m3selectionText
+    selectionColor: Appearance.m3colors.m3selectionBackground
+    placeholderTextColor: Appearance.m3colors.m3borderPrimary
     font {
-        family: Appearance?.font.family.main ?? "sans-serif"
-        pixelSize: Appearance?.font.pixelSize.small ?? 15
+        family: Appearance?.font.family.uiFont ?? "sans-serif"
+        pixelSize: Appearance?.font.pixelSize.textBase ?? 15
         hintingPreference: Font.PreferFullHinting
     }
 }
diff --git a/config/quickshell/modules/common/widgets/StyledToolTip.qml b/config/quickshell/modules/common/widgets/StyledToolTip.qml
index 2ca16df1..aaaad813 100644
--- a/config/quickshell/modules/common/widgets/StyledToolTip.qml
+++ b/config/quickshell/modules/common/widgets/StyledToolTip.qml
@@ -50,7 +50,7 @@ ToolTip {
                 id: tooltipTextObject
                 anchors.centerIn: parent
                 text: content
-                font.pixelSize: Appearance?.font.pixelSize.smaller ?? 14
+                font.pixelSize: Appearance?.font.pixelSize.textSmall ?? 14
                 font.hintingPreference: Font.PreferNoHinting // Prevent shaky text
                 color: Appearance?.m3colors.colOnTooltip ?? "#FFFFFF"
                 wrapMode: Text.Wrap