diff --git a/examples/boxes/Box.cpp b/examples/boxes/Box.cpp index a1de2035..4492ee13 100644 --- a/examples/boxes/Box.cpp +++ b/examples/boxes/Box.cpp @@ -32,8 +32,8 @@ void Box::setBackground( FillType type, QskRgbPalette::Theme theme, bool inverte const auto pal = QskRgbPalette::palette( theme ); - const QColor light = pal.color( QskRgbPalette::W300 ); - const QColor mid = pal.color( QskRgbPalette::W600 ); + const QColor light = pal.color( QskRgbPalette::W60 ); + const QColor mid = pal.color( QskRgbPalette::W30 ); switch ( type ) { @@ -64,9 +64,9 @@ void Box::setBorder( BorderType type, QskRgbPalette::Theme theme ) setBorderWidth( 5 ); - QColor dark = pal.color( QskRgbPalette::W700 ); - QColor mid = pal.color( QskRgbPalette::W500 ); - QColor light = pal.color( QskRgbPalette::W300 ); + QColor dark = pal.color( QskRgbPalette::W30 ); + QColor mid = pal.color( QskRgbPalette::W50 ); + QColor light = pal.color( QskRgbPalette::W70 ); #if 0 dark.setAlpha( 100 ); mid.setAlpha( 100 ); diff --git a/examples/boxes/main.cpp b/examples/boxes/main.cpp index 95261fc2..50fa82ba 100644 --- a/examples/boxes/main.cpp +++ b/examples/boxes/main.cpp @@ -55,7 +55,7 @@ static void addTestRectangle( QskLinearBox* parent ) auto box = new Box( parent ); box->setMargins( 50 ); - box->setBorder( Box::Flat, QskRgbPalette::DeepOrange ); + box->setBorder( Box::Flat, QskRgbPalette::DefaultMaterialPrimary ); box->setBorderWidth( 10, 20, 40, 20 ); QskBoxShapeMetrics shape( 50, Qt::RelativeSize ); @@ -63,7 +63,7 @@ static void addTestRectangle( QskLinearBox* parent ) shape.setRadius( Qt::TopRightCorner, 70 ); box->setShape( shape ); - box->setGradient( QskGradient::Diagonal, QskRgbPalette::Blue ); + box->setGradient( QskGradient::Diagonal, QskRgbPalette::DefaultMaterialSecondary ); } static void addRectangles1( QskLinearBox* parent ) @@ -72,7 +72,7 @@ static void addRectangles1( QskLinearBox* parent ) Box::Horizontal, Box::Vertical, Box::Diagonal } ) { auto* rectangle = new MyRectangle( parent ); - rectangle->setBackground( type, QskRgbPalette::Teal ); + rectangle->setBackground( type, QskRgbPalette::DefaultMaterialTertiary ); } } @@ -82,8 +82,8 @@ static void addRectangles2( QskLinearBox* parent ) Box::Horizontal, Box::Vertical, Box::Diagonal } ) { auto* rectangle = new MyRectangle( parent ); - rectangle->setBorder( Box::Flat, QskRgbPalette::Brown ); - rectangle->setBackground( type, QskRgbPalette::Yellow ); + rectangle->setBorder( Box::Flat, QskRgbPalette::DefaultMaterialPrimary ); + rectangle->setBackground( type, QskRgbPalette::DefaultMaterialSecondary ); } } @@ -91,22 +91,22 @@ static void addRectangles3( QskLinearBox* parent ) { using namespace QskRgb; - const auto borderTheme = QskRgbPalette::Grey; - const auto fillTheme = QskRgbPalette::Blue; + const auto borderTheme = QskRgbPalette::DefaultMaterialPrimary; + const auto fillTheme = QskRgbPalette::DefaultMaterialSecondary; Box* box; box = new MyRectangle( parent ); box->setBorder( Box::Raised1, borderTheme ); - box->setGradient( Grey400 ); + box->setGradient( DefaultMaterialNeutral60 ); box = new MyRectangle( parent ); box->setBorder( Box::Sunken1, borderTheme ); - box->setGradient( QskGradient::Diagonal, Grey400, Grey500 ); + box->setGradient( QskGradient::Diagonal, DefaultMaterialNeutral60, DefaultMaterialNeutral50 ); box = new MyRectangle( parent ); box->setBorder( Box::Raised2, borderTheme ); - box->setGradient( QskGradient::Vertical, Grey400, Grey500 ); + box->setGradient( QskGradient::Vertical, DefaultMaterialNeutral60, DefaultMaterialNeutral50 ); box = new MyRectangle( parent ); box->setBorder( Box::Raised2, borderTheme ); @@ -123,7 +123,7 @@ static void addRectangles4( QskLinearBox* parent ) Box::Horizontal, Box::Vertical, Box::Diagonal } ) { auto* box = new MyRoundedRectangle( parent ); - box->setBackground( type, QskRgbPalette::DeepOrange ); + box->setBackground( type, QskRgbPalette::DefaultMaterialError ); } } @@ -133,8 +133,8 @@ static void addRectangles5( QskLinearBox* parent ) Box::Horizontal, Box::Vertical, Box::Diagonal } ) { auto* box = new MyRoundedRectangle( parent ); - box->setBorder( Box::Flat, QskRgbPalette::Indigo ); - box->setBackground( type, QskRgbPalette::Pink ); + box->setBorder( Box::Flat, QskRgbPalette::DefaultMaterialPrimary ); + box->setBackground( type, QskRgbPalette::DefaultMaterialSecondary ); } } @@ -142,22 +142,22 @@ static void addRectangles6( QskLinearBox* parent ) { using namespace QskRgb; - const auto borderTheme = QskRgbPalette::Grey; - const auto fillTheme = QskRgbPalette::Lime; + const auto borderTheme = QskRgbPalette::DefaultMaterialPrimary; + const auto fillTheme = QskRgbPalette::DefaultMaterialSecondary; Box* box; box = new MyRoundedRectangle( parent ); box->setBorder( Box::Raised1, borderTheme ); - box->setGradient( Grey400 ); + box->setGradient( DefaultMaterialNeutral60 ); box = new MyRoundedRectangle( parent ); box->setBorder( Box::Sunken1, borderTheme ); - box->setGradient( QskGradient::Diagonal, Grey400, Grey500 ); + box->setGradient( QskGradient::Diagonal, DefaultMaterialNeutral60, DefaultMaterialNeutral50 ); box = new MyRoundedRectangle( parent ); box->setBorder( Box::Raised2, borderTheme ); - box->setGradient( QskGradient::Vertical, Grey400, Grey500 ); + box->setGradient( QskGradient::Vertical, DefaultMaterialNeutral60, DefaultMaterialNeutral50 ); box = new MyRoundedRectangle( parent ); box->setBorder( Box::Raised2, borderTheme ); @@ -174,7 +174,7 @@ static void addRectangles7( QskLinearBox* parent ) Box::Horizontal, Box::Vertical, Box::Diagonal } ) { auto* box = new MyEllipse( parent ); - box->setBackground( type, QskRgbPalette::BlueGrey ); + box->setBackground( type, QskRgbPalette::DefaultMaterialNeutralVariant ); } } @@ -184,8 +184,8 @@ static void addRectangles8( QskLinearBox* parent ) Box::Horizontal, Box::Vertical, Box::Diagonal } ) { auto* box = new MyEllipse( parent ); - box->setBorder( Box::Flat, QskRgbPalette::Indigo ); - box->setBackground( type, QskRgbPalette::Red ); + box->setBorder( Box::Flat, QskRgbPalette::DefaultMaterialPrimary ); + box->setBackground( type, QskRgbPalette::DefaultMaterialError ); } } @@ -193,22 +193,22 @@ static void addRectangles9( QskLinearBox* parent ) { using namespace QskRgb; - const auto borderTheme = QskRgbPalette::Grey; - const auto fillTheme = QskRgbPalette::Lime; + const auto borderTheme = QskRgbPalette::DefaultMaterialNeutral; + const auto fillTheme = QskRgbPalette::DefaultMaterialPrimary; Box* box; box = new MyEllipse( parent ); box->setBorder( Box::Raised1, borderTheme ); - box->setGradient( Grey400 ); + box->setGradient( DefaultMaterialNeutral60 ); box = new MyEllipse( parent ); box->setBorder( Box::Sunken1, borderTheme ); - box->setGradient( QskGradient::Diagonal, Grey400, Grey500 ); + box->setGradient( QskGradient::Diagonal, DefaultMaterialNeutral60, DefaultMaterialNeutral50 ); box = new MyEllipse( parent ); box->setBorder( Box::Raised2, borderTheme ); - box->setGradient( QskGradient::Vertical, Grey400, Grey500 ); + box->setGradient( QskGradient::Vertical, DefaultMaterialNeutral60, DefaultMaterialNeutral50 ); box = new MyEllipse( parent ); box->setBorder( Box::Raised2, borderTheme ); @@ -263,14 +263,14 @@ static void addRectangles11( QskLinearBox* parent ) { auto box = new MyRectangle( parent ); - box->setBorder( Box::Flat, QskRgbPalette::Teal ); + box->setBorder( Box::Flat, QskRgbPalette::DefaultMaterialTertiary ); qreal bw[ 4 ] = { border, border, border, border }; if ( i != 0 ) bw[ i - 1 ] = 0; box->setBorderWidth( bw[ 0 ], bw[ 1 ], bw[ 2 ], bw[ 3 ] ); - box->setBackground( fillType[ i ], QskRgbPalette::Brown, i >= 3 ); + box->setBackground( fillType[ i ], QskRgbPalette::DefaultMaterialSecondary, i >= 3 ); } } @@ -281,14 +281,14 @@ static void addRectangles12( QskLinearBox* parent ) { auto* box = new Box( parent ); box->setBorderWidth( 0 ); - box->setGradient( orientation, QskRgbPalette::Brown ); + box->setGradient( orientation, QskRgbPalette::DefaultMaterialSecondary ); } for ( auto orientation : { QskGradient::Vertical, QskGradient::Diagonal } ) { auto* box = new Box( parent ); - box->setBorder( Box::Flat, QskRgbPalette::DeepOrange ); - box->setGradient( orientation, QskRgbPalette::Blue ); + box->setBorder( Box::Flat, QskRgbPalette::DefaultMaterialPrimary ); + box->setGradient( orientation, QskRgbPalette::DefaultMaterialTertiary ); } for ( auto orientation : { QskGradient::Vertical, @@ -297,15 +297,15 @@ static void addRectangles12( QskLinearBox* parent ) auto* box = new Box( parent ); box->setBorderWidth( 0 ); box->setShape( 30, 40, Qt::RelativeSize ); - box->setGradient( orientation, QskRgbPalette::Brown ); + box->setGradient( orientation, QskRgbPalette::DefaultMaterialTertiary ); } for ( auto orientation : { QskGradient::Vertical, QskGradient::Diagonal } ) { auto* box = new Box( parent ); - box->setBorder( Box::Flat, QskRgbPalette::DeepOrange ); + box->setBorder( Box::Flat, QskRgbPalette::DefaultMaterialPrimary ); box->setShape( 30, 40, Qt::RelativeSize ); - box->setGradient( orientation, QskRgbPalette::Blue ); + box->setGradient( orientation, QskRgbPalette::DefaultMaterialSecondary ); } for ( auto orientation : { QskGradient::Vertical, @@ -314,15 +314,15 @@ static void addRectangles12( QskLinearBox* parent ) auto* box = new Box( parent ); box->setBorderWidth( 0 ); box->setShape( 100, 100, Qt::RelativeSize ); - box->setGradient( orientation, QskRgbPalette::Brown ); + box->setGradient( orientation, QskRgbPalette::DefaultMaterialTertiary ); } for ( auto orientation : { QskGradient::Vertical, QskGradient::Diagonal } ) { auto* box = new Box( parent ); - box->setBorder( Box::Flat, QskRgbPalette::DeepOrange ); + box->setBorder( Box::Flat, QskRgbPalette::DefaultMaterialPrimary ); box->setShape( 100, 100, Qt::RelativeSize ); - box->setGradient( orientation, QskRgbPalette::Blue ); + box->setGradient( orientation, QskRgbPalette::DefaultMaterialSecondary ); } } @@ -374,7 +374,7 @@ static void addColoredBorderRectangles1( QskLinearBox* parent, bool rounded, Box box->setBorderGradients( gradient1, gradient2, gradient3, gradient4 ); if( fillType != Box::Unfilled ) - box->setBackground( fillType, QskRgbPalette::Indigo ); + box->setBackground( fillType, QskRgbPalette::DefaultMaterialPrimary ); if( rounded ) box->setShape( 30, Qt::AbsoluteSize ); @@ -387,7 +387,7 @@ static void addColoredBorderRectangles2( QskLinearBox* parent, bool rounded, Box box->setBorderGradients( Qt::red, Qt::green, Qt::blue, Qt::yellow ); if( fillType != Box::Unfilled ) - box->setBackground( fillType, QskRgbPalette::Indigo ); + box->setBackground( fillType, QskRgbPalette::DefaultMaterialPrimary ); if( rounded ) box->setShape( 30, Qt::AbsoluteSize ); @@ -416,7 +416,7 @@ static void addColoredBorderRectangles3( QskLinearBox* parent, bool rounded, Box box->setBorderGradients( gradient3, gradient3, gradient3, gradient3 ); if( fillType != Box::Unfilled ) - box->setBackground( fillType, QskRgbPalette::Indigo ); + box->setBackground( fillType, QskRgbPalette::DefaultMaterialPrimary ); if( rounded ) box->setShape( 30, Qt::AbsoluteSize ); @@ -430,7 +430,7 @@ static void addColoredBorderRectangles4( QskLinearBox* parent, bool rounded, Box box->setBorderGradients( gradient, gradient, gradient, gradient ); if( fillType != Box::Unfilled ) - box->setBackground( fillType, QskRgbPalette::Indigo ); + box->setBackground( fillType, QskRgbPalette::DefaultMaterialPrimary ); if( rounded ) box->setShape( 30, Qt::AbsoluteSize ); @@ -447,7 +447,7 @@ static void addColoredBorderRectangles5( QskLinearBox* parent, bool rounded, Box box->setBorderGradients( gradient, gradient, gradient, gradient ); if( fillType != Box::Unfilled ) - box->setBackground( fillType, QskRgbPalette::Indigo ); + box->setBackground( fillType, QskRgbPalette::DefaultMaterialPrimary ); if( rounded ) box->setShape( { 10, 20, 20, 40 } ); diff --git a/examples/gallery/progressbar/ProgressBarPage.cpp b/examples/gallery/progressbar/ProgressBarPage.cpp index 18985ecf..3c2efaac 100644 --- a/examples/gallery/progressbar/ProgressBarPage.cpp +++ b/examples/gallery/progressbar/ProgressBarPage.cpp @@ -30,10 +30,10 @@ namespace const auto pal = QskRgbPalette::palette( theme ); QVector< QRgb > rgb; - rgb += pal.rgb( QskRgbPalette::W200 ); - rgb += pal.rgb( QskRgbPalette::W400 ); - rgb += pal.rgb( QskRgbPalette::W600 ); - rgb += pal.rgb( QskRgbPalette::W900 ); + rgb += pal.rgb( QskRgbPalette::W90 ); + rgb += pal.rgb( QskRgbPalette::W60 ); + rgb += pal.rgb( QskRgbPalette::W40 ); + rgb += pal.rgb( QskRgbPalette::W20 ); const auto stops = QskRgbPalette::colorStops( rgb, true ); @@ -62,19 +62,19 @@ void ProgressBarPage::populate() { auto bar = new ProgressBar( hBox ); - bar->setTheme( QskRgbPalette::BlueGrey ); + bar->setTheme( QskRgbPalette::DefaultMaterialPrimary ); bar->setValue( 100 ); } { auto bar = new ProgressBar( hBox ); - bar->setTheme( QskRgbPalette::Blue ); + bar->setTheme( QskRgbPalette::DefaultMaterialSecondary ); bar->setValue( 75 ); } { auto bar = new ProgressBar( hBox ); - bar->setTheme( QskRgbPalette::Blue ); + bar->setTheme( QskRgbPalette::DefaultMaterialSecondary ); bar->setOrigin( 60 ); bar->setValue( 25 ); } @@ -90,20 +90,20 @@ void ProgressBarPage::populate() { auto bar = new ProgressBar( vBox ); - bar->setTheme( QskRgbPalette::DeepOrange ); + bar->setTheme( QskRgbPalette::DefaultMaterialPrimary ); bar->setValue( 100 ); } { auto bar = new ProgressBar( vBox ); - bar->setTheme( QskRgbPalette::Pink ); + bar->setTheme( QskRgbPalette::DefaultMaterialSecondary ); bar->setMaximum( 40 ); bar->setValue( 25 ); } { auto bar = new ProgressBar( vBox ); - bar->setTheme( QskRgbPalette::Pink ); + bar->setTheme( QskRgbPalette::DefaultMaterialSecondary ); bar->setOrigin( 40 ); bar->setValue( 10 ); } diff --git a/examples/tabview/CustomSlider.cpp b/examples/tabview/CustomSlider.cpp index e8da8471..5a97f1c9 100644 --- a/examples/tabview/CustomSlider.cpp +++ b/examples/tabview/CustomSlider.cpp @@ -26,17 +26,17 @@ CustomSlider::CustomSlider( QQuickItem* parentItem ) QskSkinHintTableEditor ed( &hintTable() ); ed.setBoxShape( Fill, 0 ); - ed.setGradient( Fill, Grey700 ); + ed.setGradient( Fill, DefaultMaterialPrimary40 ); ed.setColor( Scale, qRgb( 178, 178, 178 ) ); // for the ticks ed.setStrutSize( Handle, 80, 80 ); - ed.setColor( Handle, Grey800 ); + ed.setColor( Handle, DefaultMaterialNeutral30 ); - ed.setColor( Handle | Pressed, Orange600 ); + ed.setColor( Handle | Pressed, DefaultMaterialPrimary30 ); const auto combinationMask = Focused | Hovered; - ed.setColor( Handle, Orange600, combinationMask ); + ed.setColor( Handle, 0xfffb8c00, combinationMask ); ed.setAnimation( Handle | QskAspect::Color, 300, combinationMask ); ed.setAnimation( Handle | QskAspect::Color, 1000 ); diff --git a/examples/tabview/CustomSliderSkinlet.cpp b/examples/tabview/CustomSliderSkinlet.cpp index 0766957d..1ae6b08a 100644 --- a/examples/tabview/CustomSliderSkinlet.cpp +++ b/examples/tabview/CustomSliderSkinlet.cpp @@ -307,7 +307,7 @@ QSGNode* CustomSliderSkinlet::updateDecorationNode( labelNode = QskSkinlet::updateTextNode( slider, labelNode, QRectF( x - 0.5 * w, y, w, h ), Qt::AlignHCenter, text, qskLabelFont, - QskTextOptions(), QskTextColors( QskRgb::Grey700 ), Qsk::Normal ); + QskTextOptions(), QskTextColors( QskRgb::DefaultMaterialNeutral30 ), Qsk::Normal ); if ( labelNode ) { diff --git a/examples/tabview/OtherSlider.cpp b/examples/tabview/OtherSlider.cpp index bba59381..4561ccb5 100644 --- a/examples/tabview/OtherSlider.cpp +++ b/examples/tabview/OtherSlider.cpp @@ -37,8 +37,8 @@ OtherSlider::OtherSlider( QQuickItem* parentItem ) ed.setMetric( aspect | A::Size, h ); ed.setBoxShape( aspect, 4 ); ed.setBoxBorderMetrics( aspect, 1 ); - ed.setBoxBorderColors( aspect, Grey900 ); - ed.setGradient( aspect, Grey400 ); + ed.setBoxBorderColors( aspect, DefaultMaterialNeutral10 ); + ed.setGradient( aspect, DefaultMaterialNeutral60 ); if ( placement == A::Horizontal ) ed.setPadding( aspect, QskMargins( paddingW, 0 ) ); @@ -84,8 +84,8 @@ OtherSlider::OtherSlider( QQuickItem* parentItem ) for ( auto state : { A::NoState, Pressed } ) { - ed.setBoxBorderColors( aspect | state, Grey600 ); - ed.setGradient( aspect | state, Blue400 ); + ed.setBoxBorderColors( aspect | state, DefaultMaterialNeutral40 ); + ed.setGradient( aspect | state, DefaultMaterialPrimary60 ); } } } diff --git a/skins/material/QskMaterialSkin.cpp b/skins/material/QskMaterialSkin.cpp index ac13de2c..0d01a6e2 100644 --- a/skins/material/QskMaterialSkin.cpp +++ b/skins/material/QskMaterialSkin.cpp @@ -64,8 +64,8 @@ namespace class ColorPalette { public: - ColorPalette( const QColor base = QColor::fromRgba( QskRgb::Grey100 ), - const QColor& accent = QColor::fromRgba( QskRgb::Blue500 ), + ColorPalette( const QColor base = QColor::fromRgba( QskRgb::DefaultMaterialPrimary90 ), + const QColor& accent = QColor::fromRgba( QskRgb::DefaultMaterialPrimary40 ), const QColor& contrast = QColor::fromRgba( QskRgb::White ) ) { baseColor = base; @@ -438,7 +438,7 @@ void Editor::setupPushButton() setMargin( Q::Panel, margin ); setPadding( Q::Panel, padding ); - const QskBoxBorderColors borderColors( Grey400, Grey300, Grey400, Grey600 ); + const QskBoxBorderColors borderColors( DefaultMaterialPrimary40 ); QskBoxBorderColors noBorderColors = borderColors; noBorderColors.setAlpha( 0 ); @@ -494,7 +494,7 @@ void Editor::setupDialogButton() setMargin( Q::Panel, QskMargins( 4, 3 ) ); setPadding( Q::Panel, QskMargins( 10, 6 ) ); - const QskBoxBorderColors borderColors( Grey400, Grey300, Grey400, Grey600 ); + const QskBoxBorderColors borderColors( DefaultMaterialPrimary40 ); QskBoxBorderColors noBorderColors = borderColors; noBorderColors.setAlpha( 0 ); @@ -597,7 +597,7 @@ void Editor::setupSlider() for ( auto state : { A::States(), Q::Pressed | A::NoState, Q::Pressed | Q::Hovered } ) { const auto aspect = Q::Handle | Q::Minimum | state; - setGradient( aspect, Grey300 ); + setGradient( aspect, DefaultMaterialPrimary40 ); setBoxBorderColors( aspect, Grey ); } @@ -910,8 +910,7 @@ QskMaterialSkin::QskMaterialSkin( QObject* parent ) : Inherited( parent ) , m_data( new PrivateData() ) { - m_data->palette = ColorPalette( QskRgb::Grey100, - QskRgb::Blue500, QskRgb::White ); + m_data->palette = ColorPalette(); // Default theme colors setupFonts( QStringLiteral( "Roboto" ) ); diff --git a/skins/squiek/QskSquiekSkin.cpp b/skins/squiek/QskSquiekSkin.cpp index 8d9a6173..ccf0110e 100644 --- a/skins/squiek/QskSquiekSkin.cpp +++ b/skins/squiek/QskSquiekSkin.cpp @@ -89,7 +89,7 @@ namespace contrasted = DarkGrey; contrastedText = White; - highlighted = BlueGrey500; + highlighted = 0xff607d8b; highlightedText = White; base = Black; diff --git a/src/common/QskRgbPalette.cpp b/src/common/QskRgbPalette.cpp index 79d715b6..4bc0b57c 100644 --- a/src/common/QskRgbPalette.cpp +++ b/src/common/QskRgbPalette.cpp @@ -11,8 +11,9 @@ #define RGBTABLE( c ) \ { \ - RGB( c, 50 ), RGB( c, 100 ), RGB( c, 200 ), RGB( c, 300 ), RGB( c, 400 ), \ - RGB( c, 500 ), RGB( c, 600 ), RGB( c, 700 ), RGB( c, 800 ), RGB( c, 900 ) \ + RGB( c, 0 ), RGB( c, 10 ), RGB( c, 20 ), RGB( c, 30 ), RGB( c, 40 ), \ + RGB( c, 50 ), RGB( c, 60 ), RGB( c, 70 ), RGB( c, 80 ), RGB( c, 90 ), \ + RGB( c, 95 ), RGB( c, 99 ), RGB( c, 100 ) \ } namespace @@ -26,25 +27,12 @@ namespace static constexpr QRgb table[][ Palette::NumWeights ] = { - RGBTABLE( Red ), - RGBTABLE( Pink ), - RGBTABLE( Purple ), - RGBTABLE( DeepPurple ), - RGBTABLE( Indigo ), - RGBTABLE( Blue ), - RGBTABLE( LightBlue ), - RGBTABLE( Cyan ), - RGBTABLE( Teal ), - RGBTABLE( Green ), - RGBTABLE( LightGreen ), - RGBTABLE( Lime ), - RGBTABLE( Yellow ), - RGBTABLE( Amber ), - RGBTABLE( Orange ), - RGBTABLE( DeepOrange ), - RGBTABLE( Brown ), - RGBTABLE( Grey ), - RGBTABLE( BlueGrey ), + RGBTABLE( DefaultMaterialPrimary ), + RGBTABLE( DefaultMaterialSecondary ), + RGBTABLE( DefaultMaterialTertiary ), + RGBTABLE( DefaultMaterialError ), + RGBTABLE( DefaultMaterialNeutral ), + RGBTABLE( DefaultMaterialNeutralVariant ), }; const int count = sizeof( table ) / sizeof( table[ 0 ] ); diff --git a/src/common/QskRgbPalette.h b/src/common/QskRgbPalette.h index 050dbe2b..69a8e100 100644 --- a/src/common/QskRgbPalette.h +++ b/src/common/QskRgbPalette.h @@ -19,16 +19,19 @@ class QSK_EXPORT QskRgbPalette public: enum Weight { + W0, + W10, + W20, + W30, + W40, W50, + W60, + W70, + W80, + W90, + W95, + W99, W100, - W200, - W300, - W400, - W500, - W600, - W700, - W800, - W900, NumWeights }; @@ -36,25 +39,12 @@ class QSK_EXPORT QskRgbPalette enum Theme { - Red, - Pink, - Purple, - DeepPurple, - Indigo, - Blue, - LightBlue, - Cyan, - Teal, - Green, - LightGreen, - Lime, - Yellow, - Amber, - Orange, - DeepOrange, - Brown, - Grey, - BlueGrey, + DefaultMaterialPrimary, + DefaultMaterialSecondary, + DefaultMaterialTertiary, + DefaultMaterialError, + DefaultMaterialNeutral, + DefaultMaterialNeutralVariant, NumThemes }; diff --git a/src/common/QskRgbValue.h b/src/common/QskRgbValue.h index 17302613..bbe3f540 100644 --- a/src/common/QskRgbValue.h +++ b/src/common/QskRgbValue.h @@ -157,279 +157,92 @@ RGBVALUE( Yellow, 0xffffff00 ) \ RGBVALUE( YellowGreen, 0xff9acd32 ) \ RGBVALUE( White, 0xffffffff ) \ - /* Material colors from https://material.google.com/style/color.html */ \ - RGBVALUE( Red50, 0xffffebee ) \ - RGBVALUE( Red100, 0xffffcdd2 ) \ - RGBVALUE( Red200, 0xffef9a9a ) \ - RGBVALUE( Red300, 0xffe57373 ) \ - RGBVALUE( Red400, 0xffef5350 ) \ - RGBVALUE( Red500, 0xfff44336 ) \ - RGBVALUE( Red600, 0xffe53935 ) \ - RGBVALUE( Red700, 0xffd32f2f ) \ - RGBVALUE( Red800, 0xffc62828 ) \ - RGBVALUE( Red900, 0xffb71c1c ) \ - RGBVALUE( RedA100, 0xffff8a80 ) \ - RGBVALUE( RedA200, 0xffff5252 ) \ - RGBVALUE( RedA400, 0xffff1744 ) \ - RGBVALUE( RedA700, 0xffd50000 ) \ \ - RGBVALUE( Pink50, 0xfffce4ec ) \ - RGBVALUE( Pink100, 0xfff8bbd0 ) \ - RGBVALUE( Pink200, 0xfff48fb1 ) \ - RGBVALUE( Pink300, 0xfff06292 ) \ - RGBVALUE( Pink400, 0xffec407a ) \ - RGBVALUE( Pink500, 0xffe91e63 ) \ - RGBVALUE( Pink600, 0xffd81b60 ) \ - RGBVALUE( Pink700, 0xffc2185b ) \ - RGBVALUE( Pink800, 0xffad1457 ) \ - RGBVALUE( Pink900, 0xff880e4f ) \ - RGBVALUE( PinkA100, 0xffff80ab ) \ - RGBVALUE( PinkA200, 0xffff4081 ) \ - RGBVALUE( PinkA400, 0xfff50057 ) \ - RGBVALUE( PinkA700, 0xffc51162 ) \ + /* Material colors from https://www.figma.com/file/TxkOtbaB4VoXta4ccRNi3b/Material-3-Design-Kit-(Community)?node-id=49823%3A12142 */ \ \ - RGBVALUE( Purple50, 0xfff3e5f5 ) \ - RGBVALUE( Purple100, 0xffe1bee7 ) \ - RGBVALUE( Purple200, 0xffce93d8 ) \ - RGBVALUE( Purple300, 0xffba68c8 ) \ - RGBVALUE( Purple400, 0xffab47bc ) \ - RGBVALUE( Purple500, 0xff9c27b0 ) \ - RGBVALUE( Purple600, 0xff8e24aa ) \ - RGBVALUE( Purple700, 0xff7b1fa2 ) \ - RGBVALUE( Purple800, 0xff6a1b9a ) \ - RGBVALUE( Purple900, 0xff4a148c ) \ - RGBVALUE( PurpleA100, 0xffea80fc ) \ - RGBVALUE( PurpleA200, 0xffe040fb ) \ - RGBVALUE( PurpleA400, 0xffd500f9 ) \ - RGBVALUE( PurpleA700, 0xffaa00ff ) \ + RGBVALUE( DefaultMaterialPrimary0, 0xff000000 ) \ + RGBVALUE( DefaultMaterialPrimary10, 0xff21005D ) \ + RGBVALUE( DefaultMaterialPrimary20, 0xff381E72 ) \ + RGBVALUE( DefaultMaterialPrimary30, 0xff4F378B ) \ + RGBVALUE( DefaultMaterialPrimary40, 0xff6750A4 ) \ + RGBVALUE( DefaultMaterialPrimary50, 0xff7F67BE ) \ + RGBVALUE( DefaultMaterialPrimary60, 0xffB69DF8 ) \ + RGBVALUE( DefaultMaterialPrimary70, 0xffB69DF8 ) \ + RGBVALUE( DefaultMaterialPrimary80, 0xffD0BCFF ) \ + RGBVALUE( DefaultMaterialPrimary90, 0xffEADDFF ) \ + RGBVALUE( DefaultMaterialPrimary95, 0xffF6EDFF ) \ + RGBVALUE( DefaultMaterialPrimary99, 0xffFFFBFE ) \ + RGBVALUE( DefaultMaterialPrimary100, 0xffFFFFFF ) \ \ - RGBVALUE( DeepPurple50, 0xffede7f6 ) \ - RGBVALUE( DeepPurple100, 0xffd1c4e9 ) \ - RGBVALUE( DeepPurple200, 0xffb39ddb ) \ - RGBVALUE( DeepPurple300, 0xff9575cd ) \ - RGBVALUE( DeepPurple400, 0xff7e57c2 ) \ - RGBVALUE( DeepPurple500, 0xff673ab7 ) \ - RGBVALUE( DeepPurple600, 0xff5e35b1 ) \ - RGBVALUE( DeepPurple700, 0xff512da8 ) \ - RGBVALUE( DeepPurple800, 0xff4527a0 ) \ - RGBVALUE( DeepPurple900, 0xff311b92 ) \ - RGBVALUE( DeepPurpleA100, 0xffb388ff ) \ - RGBVALUE( DeepPurpleA200, 0xff7c4dff ) \ - RGBVALUE( DeepPurpleA400, 0xff651fff ) \ - RGBVALUE( DeepPurpleA700, 0xff6200ea ) \ + RGBVALUE( DefaultMaterialSecondary0, 0xff000000 ) \ + RGBVALUE( DefaultMaterialSecondary10, 0xff1D192B ) \ + RGBVALUE( DefaultMaterialSecondary20, 0xff332D41 ) \ + RGBVALUE( DefaultMaterialSecondary30, 0xff4A4458 ) \ + RGBVALUE( DefaultMaterialSecondary40, 0xff625B71 ) \ + RGBVALUE( DefaultMaterialSecondary50, 0xff7A7289 ) \ + RGBVALUE( DefaultMaterialSecondary60, 0xff958DA5 ) \ + RGBVALUE( DefaultMaterialSecondary70, 0xffB0A7C0 ) \ + RGBVALUE( DefaultMaterialSecondary80, 0xffCCC2DC ) \ + RGBVALUE( DefaultMaterialSecondary90, 0xffE8DEF8 ) \ + RGBVALUE( DefaultMaterialSecondary95, 0xffF6EDFF ) \ + RGBVALUE( DefaultMaterialSecondary99, 0xffFFFBFE ) \ + RGBVALUE( DefaultMaterialSecondary100, 0xffFFFFFF ) \ \ - RGBVALUE( Indigo50, 0xffe8eaf6 ) \ - RGBVALUE( Indigo100, 0xffc5cae9 ) \ - RGBVALUE( Indigo200, 0xff9fa8da ) \ - RGBVALUE( Indigo300, 0xff7986cb ) \ - RGBVALUE( Indigo400, 0xff5c6bc0 ) \ - RGBVALUE( Indigo500, 0xff3f51b5 ) \ - RGBVALUE( Indigo600, 0xff3949ab ) \ - RGBVALUE( Indigo700, 0xff303f9f ) \ - RGBVALUE( Indigo800, 0xff283593 ) \ - RGBVALUE( Indigo900, 0xff1a237e ) \ - RGBVALUE( IndigoA100, 0xff8c9eff ) \ - RGBVALUE( IndigoA200, 0xff536dfe ) \ - RGBVALUE( IndigoA400, 0xff3d5afe ) \ - RGBVALUE( IndigoA700, 0xff304ffe ) \ + RGBVALUE( DefaultMaterialTertiary0, 0xff000000 ) \ + RGBVALUE( DefaultMaterialTertiary10, 0xff31111D ) \ + RGBVALUE( DefaultMaterialTertiary20, 0xff492532 ) \ + RGBVALUE( DefaultMaterialTertiary30, 0xff633B48 ) \ + RGBVALUE( DefaultMaterialTertiary40, 0xff7D5260 ) \ + RGBVALUE( DefaultMaterialTertiary50, 0xff986977 ) \ + RGBVALUE( DefaultMaterialTertiary60, 0xffB58392 ) \ + RGBVALUE( DefaultMaterialTertiary70, 0xffD29DAC ) \ + RGBVALUE( DefaultMaterialTertiary80, 0xffEFB8C8 ) \ + RGBVALUE( DefaultMaterialTertiary90, 0xffFFD8E4 ) \ + RGBVALUE( DefaultMaterialTertiary95, 0xffFFECF1 ) \ + RGBVALUE( DefaultMaterialTertiary99, 0xffFFFBFA ) \ + RGBVALUE( DefaultMaterialTertiary100, 0xffFFFFFF ) \ \ - RGBVALUE( Blue50, 0xffe3f2fd ) \ - RGBVALUE( Blue100, 0xffbbdefb ) \ - RGBVALUE( Blue200, 0xff90caf9 ) \ - RGBVALUE( Blue300, 0xff64b5f6 ) \ - RGBVALUE( Blue400, 0xff42a5f5 ) \ - RGBVALUE( Blue500, 0xff2196f3 ) \ - RGBVALUE( Blue600, 0xff1e88e5 ) \ - RGBVALUE( Blue700, 0xff1976d2 ) \ - RGBVALUE( Blue800, 0xff1565c0 ) \ - RGBVALUE( Blue900, 0xff0d47a1 ) \ - RGBVALUE( BlueA100, 0xff82b1ff ) \ - RGBVALUE( BlueA200, 0xff448aff ) \ - RGBVALUE( BlueA400, 0xff2979ff ) \ - RGBVALUE( BlueA700, 0xff2962ff ) \ + RGBVALUE( DefaultMaterialError0, 0xff000000 ) \ + RGBVALUE( DefaultMaterialError10, 0xff410E0B ) \ + RGBVALUE( DefaultMaterialError20, 0xff601410 ) \ + RGBVALUE( DefaultMaterialError30, 0xff8C1D18 ) \ + RGBVALUE( DefaultMaterialError40, 0xffB3261E ) \ + RGBVALUE( DefaultMaterialError50, 0xffDC362E ) \ + RGBVALUE( DefaultMaterialError60, 0xffE46962 ) \ + RGBVALUE( DefaultMaterialError70, 0xffEC928E ) \ + RGBVALUE( DefaultMaterialError80, 0xffF2B8B5 ) \ + RGBVALUE( DefaultMaterialError90, 0xffF9DEDC ) \ + RGBVALUE( DefaultMaterialError95, 0xffFCEEEE ) \ + RGBVALUE( DefaultMaterialError99, 0xffFFFBF9 ) \ + RGBVALUE( DefaultMaterialError100, 0xffFFFFFF ) \ \ - RGBVALUE( LightBlue50, 0xffe1f5fe ) \ - RGBVALUE( LightBlue100, 0xffb3e5fc ) \ - RGBVALUE( LightBlue200, 0xff81d4fa ) \ - RGBVALUE( LightBlue300, 0xff4fc3f7 ) \ - RGBVALUE( LightBlue400, 0xff29b6f6 ) \ - RGBVALUE( LightBlue500, 0xff03a9f4 ) \ - RGBVALUE( LightBlue600, 0xff039be5 ) \ - RGBVALUE( LightBlue700, 0xff0288d1 ) \ - RGBVALUE( LightBlue800, 0xff0277bd ) \ - RGBVALUE( LightBlue900, 0xff01579b ) \ - RGBVALUE( LightBlueA100, 0xff80d8ff ) \ - RGBVALUE( LightBlueA200, 0xff40c4ff ) \ - RGBVALUE( LightBlueA400, 0xff00b0ff ) \ - RGBVALUE( LightBlueA700, 0xff0091ea ) \ + RGBVALUE( DefaultMaterialNeutral0, 0xff000000 ) \ + RGBVALUE( DefaultMaterialNeutral10, 0xff1C1B1F ) \ + RGBVALUE( DefaultMaterialNeutral20, 0xff313033 ) \ + RGBVALUE( DefaultMaterialNeutral30, 0xff484649 ) \ + RGBVALUE( DefaultMaterialNeutral40, 0xff605D62 ) \ + RGBVALUE( DefaultMaterialNeutral50, 0xff787579 ) \ + RGBVALUE( DefaultMaterialNeutral60, 0xff939094 ) \ + RGBVALUE( DefaultMaterialNeutral70, 0xffAEAAAE ) \ + RGBVALUE( DefaultMaterialNeutral80, 0xffC9C5CA ) \ + RGBVALUE( DefaultMaterialNeutral90, 0xffE6E1E5 ) \ + RGBVALUE( DefaultMaterialNeutral95, 0xffF4EFF4 ) \ + RGBVALUE( DefaultMaterialNeutral99, 0xffFFFBFE ) \ + RGBVALUE( DefaultMaterialNeutral100, 0xffFFFFFF ) \ \ - RGBVALUE( Cyan50, 0xffe0f7fa ) \ - RGBVALUE( Cyan100, 0xffb2ebf2 ) \ - RGBVALUE( Cyan200, 0xff80deea ) \ - RGBVALUE( Cyan300, 0xff4dd0e1 ) \ - RGBVALUE( Cyan400, 0xff26c6da ) \ - RGBVALUE( Cyan500, 0xff00bcd4 ) \ - RGBVALUE( Cyan600, 0xff00acc1 ) \ - RGBVALUE( Cyan700, 0xff0097a7 ) \ - RGBVALUE( Cyan800, 0xff00838f ) \ - RGBVALUE( Cyan900, 0xff006064 ) \ - RGBVALUE( CyanA100, 0xff84ffff ) \ - RGBVALUE( CyanA200, 0xff18ffff ) \ - RGBVALUE( CyanA400, 0xff00e5ff ) \ - RGBVALUE( CyanA700, 0xff00b8d4 ) \ - \ - RGBVALUE( Teal50, 0xffe0f2f1 ) \ - RGBVALUE( Teal100, 0xffb2dfdb ) \ - RGBVALUE( Teal200, 0xff80cbc4 ) \ - RGBVALUE( Teal300, 0xff4db6ac ) \ - RGBVALUE( Teal400, 0xff26a69a ) \ - RGBVALUE( Teal500, 0xff009688 ) \ - RGBVALUE( Teal600, 0xff00897b ) \ - RGBVALUE( Teal700, 0xff00796b ) \ - RGBVALUE( Teal800, 0xff00695c ) \ - RGBVALUE( Teal900, 0xff004d40 ) \ - RGBVALUE( TealA100, 0xffa7ffeb ) \ - RGBVALUE( TealA200, 0xff64ffda ) \ - RGBVALUE( TealA400, 0xff1de9b6 ) \ - RGBVALUE( TealA700, 0xff00bfa5 ) \ - \ - RGBVALUE( Green50, 0xffe8f5e9 ) \ - RGBVALUE( Green100, 0xffc8e6c9 ) \ - RGBVALUE( Green200, 0xffa5d6a7 ) \ - RGBVALUE( Green300, 0xff81c784 ) \ - RGBVALUE( Green400, 0xff66bb6a ) \ - RGBVALUE( Green500, 0xff4caf50 ) \ - RGBVALUE( Green600, 0xff43a047 ) \ - RGBVALUE( Green700, 0xff388e3c ) \ - RGBVALUE( Green800, 0xff2e7d32 ) \ - RGBVALUE( Green900, 0xff1b5e20 ) \ - RGBVALUE( GreenA100, 0xffb9f6ca ) \ - RGBVALUE( GreenA200, 0xff69f0ae ) \ - RGBVALUE( GreenA400, 0xff00e676 ) \ - RGBVALUE( GreenA700, 0xff00c853 ) \ - \ - RGBVALUE( LightGreen50, 0xfff1f8e9 ) \ - RGBVALUE( LightGreen100, 0xffdcedc8 ) \ - RGBVALUE( LightGreen200, 0xffc5e1a5 ) \ - RGBVALUE( LightGreen300, 0xffaed581 ) \ - RGBVALUE( LightGreen400, 0xff9ccc65 ) \ - RGBVALUE( LightGreen500, 0xff8bc34a ) \ - RGBVALUE( LightGreen600, 0xff7cb342 ) \ - RGBVALUE( LightGreen700, 0xff689f38 ) \ - RGBVALUE( LightGreen800, 0xff558b2f ) \ - RGBVALUE( LightGreen900, 0xff33691e ) \ - RGBVALUE( LightGreenA100, 0xffccff90 ) \ - RGBVALUE( LightGreenA200, 0xffb2ff59 ) \ - RGBVALUE( LightGreenA400, 0xff76ff03 ) \ - RGBVALUE( LightGreenA700, 0xff64dd17 ) \ - \ - RGBVALUE( Lime50, 0xfff9fbe7 ) \ - RGBVALUE( Lime100, 0xfff0f4c3 ) \ - RGBVALUE( Lime200, 0xffe6ee9c ) \ - RGBVALUE( Lime300, 0xffdce775 ) \ - RGBVALUE( Lime400, 0xffd4e157 ) \ - RGBVALUE( Lime500, 0xffcddc39 ) \ - RGBVALUE( Lime600, 0xffc0ca33 ) \ - RGBVALUE( Lime700, 0xffafb42b ) \ - RGBVALUE( Lime800, 0xff9e9d24 ) \ - RGBVALUE( Lime900, 0xff827717 ) \ - RGBVALUE( LimeA100, 0xfff4ff81 ) \ - RGBVALUE( LimeA200, 0xffeeff41 ) \ - RGBVALUE( LimeA400, 0xffc6ff00 ) \ - RGBVALUE( LimeA700, 0xffaeea00 ) \ - \ - RGBVALUE( Yellow50, 0xfffffde7 ) \ - RGBVALUE( Yellow100, 0xfffff9c4 ) \ - RGBVALUE( Yellow200, 0xfffff59d ) \ - RGBVALUE( Yellow300, 0xfffff176 ) \ - RGBVALUE( Yellow400, 0xffffee58 ) \ - RGBVALUE( Yellow500, 0xffffeb3b ) \ - RGBVALUE( Yellow600, 0xfffdd835 ) \ - RGBVALUE( Yellow700, 0xfffbc02d ) \ - RGBVALUE( Yellow800, 0xfff9a825 ) \ - RGBVALUE( Yellow900, 0xfff57f17 ) \ - RGBVALUE( YellowA100, 0xffffff8d ) \ - RGBVALUE( YellowA200, 0xffffff00 ) \ - RGBVALUE( YellowA400, 0xffffea00 ) \ - RGBVALUE( YellowA700, 0xffffd600 ) \ - \ - RGBVALUE( Amber50, 0xfffff8e1 ) \ - RGBVALUE( Amber100, 0xffffecb3 ) \ - RGBVALUE( Amber200, 0xffffe082 ) \ - RGBVALUE( Amber300, 0xffffd54f ) \ - RGBVALUE( Amber400, 0xffffca28 ) \ - RGBVALUE( Amber500, 0xffffc107 ) \ - RGBVALUE( Amber600, 0xffffb300 ) \ - RGBVALUE( Amber700, 0xffffa000 ) \ - RGBVALUE( Amber800, 0xffff8f00 ) \ - RGBVALUE( Amber900, 0xffff6f00 ) \ - RGBVALUE( AmberA100, 0xffffe57f ) \ - RGBVALUE( AmberA200, 0xffffd740 ) \ - RGBVALUE( AmberA400, 0xffffc400 ) \ - RGBVALUE( AmberA700, 0xffffab00 ) \ - \ - RGBVALUE( Orange50, 0xfffff3e0 ) \ - RGBVALUE( Orange100, 0xffffe0b2 ) \ - RGBVALUE( Orange200, 0xffffcc80 ) \ - RGBVALUE( Orange300, 0xffffb74d ) \ - RGBVALUE( Orange400, 0xffffa726 ) \ - RGBVALUE( Orange500, 0xffff9800 ) \ - RGBVALUE( Orange600, 0xfffb8c00 ) \ - RGBVALUE( Orange700, 0xfff57c00 ) \ - RGBVALUE( Orange800, 0xffef6c00 ) \ - RGBVALUE( Orange900, 0xffe65100 ) \ - RGBVALUE( OrangeA100, 0xffffd180 ) \ - RGBVALUE( OrangeA200, 0xffffab40 ) \ - RGBVALUE( OrangeA400, 0xffff9100 ) \ - RGBVALUE( OrangeA700, 0xffff6d00 ) \ - \ - RGBVALUE( DeepOrange50, 0xfffbe9e7 ) \ - RGBVALUE( DeepOrange100, 0xffffccbc ) \ - RGBVALUE( DeepOrange200, 0xffffab91 ) \ - RGBVALUE( DeepOrange300, 0xffff8a65 ) \ - RGBVALUE( DeepOrange400, 0xffff7043 ) \ - RGBVALUE( DeepOrange500, 0xffff5722 ) \ - RGBVALUE( DeepOrange600, 0xfff4511e ) \ - RGBVALUE( DeepOrange700, 0xffe64a19 ) \ - RGBVALUE( DeepOrange800, 0xffd84315 ) \ - RGBVALUE( DeepOrange900, 0xffbf360c ) \ - RGBVALUE( DeepOrangeA100, 0xffff9e80 ) \ - RGBVALUE( DeepOrangeA200, 0xffff6e40 ) \ - RGBVALUE( DeepOrangeA400, 0xffff3d00 ) \ - RGBVALUE( DeepOrangeA700, 0xffdd2c00 ) \ - \ - RGBVALUE( Brown50, 0xffefebe9 ) \ - RGBVALUE( Brown100, 0xffd7ccc8 ) \ - RGBVALUE( Brown200, 0xffbcaaa4 ) \ - RGBVALUE( Brown300, 0xffa1887f ) \ - RGBVALUE( Brown400, 0xff8d6e63 ) \ - RGBVALUE( Brown500, 0xff795548 ) \ - RGBVALUE( Brown600, 0xff6d4c41 ) \ - RGBVALUE( Brown700, 0xff5d4037 ) \ - RGBVALUE( Brown800, 0xff4e342e ) \ - RGBVALUE( Brown900, 0xff3e2723 ) \ - \ - RGBVALUE( Grey50, 0xfffafafa ) \ - RGBVALUE( Grey100, 0xfff5f5f5 ) \ - RGBVALUE( Grey200, 0xffeeeeee ) \ - RGBVALUE( Grey300, 0xffe0e0e0 ) \ - RGBVALUE( Grey400, 0xffbdbdbd ) \ - RGBVALUE( Grey500, 0xff9e9e9e ) \ - RGBVALUE( Grey600, 0xff757575 ) \ - RGBVALUE( Grey700, 0xff616161 ) \ - RGBVALUE( Grey800, 0xff424242 ) \ - RGBVALUE( Grey900, 0xff212121 ) \ - \ - RGBVALUE( BlueGrey50, 0xffeceff1 ) \ - RGBVALUE( BlueGrey100, 0xffcfd8dc ) \ - RGBVALUE( BlueGrey200, 0xffb0bec5 ) \ - RGBVALUE( BlueGrey300, 0xff90a4ae ) \ - RGBVALUE( BlueGrey400, 0xff78909c ) \ - RGBVALUE( BlueGrey500, 0xff607d8b ) \ - RGBVALUE( BlueGrey600, 0xff546e7a ) \ - RGBVALUE( BlueGrey700, 0xff455a64 ) \ - RGBVALUE( BlueGrey800, 0xff37474f ) \ - RGBVALUE( BlueGrey900, 0xff263238 ) \ + RGBVALUE( DefaultMaterialNeutralVariant0, 0xff000000 ) \ + RGBVALUE( DefaultMaterialNeutralVariant10, 0xff1D1A22 ) \ + RGBVALUE( DefaultMaterialNeutralVariant20, 0xff322F37 ) \ + RGBVALUE( DefaultMaterialNeutralVariant30, 0xff49454F ) \ + RGBVALUE( DefaultMaterialNeutralVariant40, 0xff605D66 ) \ + RGBVALUE( DefaultMaterialNeutralVariant50, 0xff79747E ) \ + RGBVALUE( DefaultMaterialNeutralVariant60, 0xff938F99 ) \ + RGBVALUE( DefaultMaterialNeutralVariant70, 0xffAEA9B4 ) \ + RGBVALUE( DefaultMaterialNeutralVariant80, 0xffCAC4D0 ) \ + RGBVALUE( DefaultMaterialNeutralVariant90, 0xffE7E0EC ) \ + RGBVALUE( DefaultMaterialNeutralVariant95, 0xffF5EEFA ) \ + RGBVALUE( DefaultMaterialNeutralVariant99, 0xffFFFBFE ) \ + RGBVALUE( DefaultMaterialNeutralVariant100, 0xffFFFFFF ) \ \ RGBVALUE( Transparent, 0x00000000 ) \ RGBVALUE( AlphaMask, 0xff000000 ) \