Transfer colors (back) to yaru.dart (#333)

* Transfer colors (back) to yaru.dart Fixes #332 * remove color pics and links and fix color hex * Use current jet * Update lib/src/colors.dart Co-authored-by: J-P Nurmi <jp.nurmi@canonical.com> * Update lib/src/colors.dart Co-authored-by: J-P Nurmi <jp.nurmi@canonical.com> * Update lib/src/colors.dart Co-authored-by: J-P Nurmi <jp.nurmi@canonical.com> * Update lib/src/colors.dart Co-authored-by: J-P Nurmi <jp.nurmi@canonical.com> --------- Co-authored-by: J-P Nurmi <jp.nurmi@canonical.com>
ubuntu · Apr 7, 2023 · 680cee8 · 680cee8
1 parent f2efd96
commit 680cee8
Show file tree

Hide file tree

Showing 18 changed files with 316 additions and 312 deletions.
diff --git a/example/lib/view/colors_view.dart b/example/lib/view/colors_view.dart
diff --git a/example/pubspec.yaml b/example/pubspec.yaml
@@ -12,7 +12,6 @@ dependencies:
   handy_window: ^0.1.2
   yaru:
     path: ../
-  yaru_colors: ^0.1.0
 
 dev_dependencies:
   flutter_lints: ^2.0.1

diff --git a/lib/src/colors.dart b/lib/src/colors.dart
@@ -0,0 +1,111 @@
+import 'package:flutter/material.dart';
+
+/// Available Yaru colors.
+class YaruColors {
+  YaruColors._();
+
+  /// Ubuntu Orange
+  static const Color orange = Color(0xFFE95420);
+
+  /// Warm Grey
+  ///
+  /// For balance. The addition of warm grey softens the combination of orange
+  /// and aubergine and provides a bridge between the two.
+  ///
+  /// Warm grey can be used for; backgrounds, graphics, dot patterns, charts and
+  /// diagrams. It can also be used for large size text.
+  static const Color warmGrey = Color(0xFFAEA79F);
+
+  /// Cool Grey
+  ///
+  /// For typography, particularly body copy. Black can be quite harsh in
+  /// combination with aubergine, but grey delivers more balance while still
+  /// being legible.
+  ///
+  /// Cool grey can also be used within charts and diagrams.
+  static const Color coolGrey = Color(0xFF333333);
+
+  /// Text Grey
+  ///
+  /// Text grey is used for small size headings, sub-headings and body copy text
+  /// only.
+  static const Color textGrey = Color(0xFF111111);
+
+  /// Error
+  static const Color error = Color(0xFFff0000);
+
+  /// Warning
+  static const Color warning = Color(0xFFf99b11);
+
+  /// Success
+  static const Color success = Color(0xFF0e8420);
+
+  /// Porcelain
+  static const Color porcelain = Color(0xFFFAFAFA);
+
+  /// Inkstone
+  static const Color inkstone = Color(0xFF3B3B3B);
+
+  /// Jet
+  static const Color jet = Color(0xFF2B2B2B);
+
+  /// Light title bar
+  static const Color titleBarLight = Color(0xFFEBEBEB);
+
+  /// Dark title bar
+  static const Color titleBarDark = Color(0xFF303030);
+
+  /// Olive
+  static const Color olive = Color(0xFF4B8501);
+
+  /// Bark
+  static const Color bark = Color(0xFF787859);
+
+  /// Sage
+  static const Color sage = Color(0xFF657B69);
+
+  /// Prussian Green
+  static const Color prussianGreen = Color(0xFF308280);
+
+  /// Viridian
+  static const Color viridian = Color(0xFF03875B);
+
+  /// Purple
+  static const Color purple = Color(0xFF7764D8);
+
+  /// Red
+  static const Color red = Color(0xFFDA3450);
+
+  /// Blue
+  static const Color blue = Color(0xFF0073E5);
+
+  /// Magenta
+  static const Color magenta = Color(0xFFB34CB3);
+
+  /// Kubuntu Blue
+  static const Color kubuntuBlue = Color(0xFF0079C1);
+
+  /// Lubuntu Blue
+  static const Color lubuntuBlue = Color(0xFF0068C8);
+
+  /// Ubuntu Budgie Blue
+  static const Color ubuntuBudgieBlue = Color(0xFF2196F3);
+
+  /// Ubuntu Butterfly Pink
+  static const Color ubuntuButterflyPink = Color(0xFFFF135B);
+
+  /// Ubuntu Cinnamon Brown
+  static const Color ubuntuCinnamonBrown = Color(0xFFDD682A);
+
+  /// Ubuntu MATE Green
+  static const Color ubuntuMateGreen = Color(0xFF73AF59);
+
+  /// Ubuntu Studio Blue
+  static const Color ubuntuStudioBlue = Color(0xFF009BF9);
+
+  /// Ubuntu Unity Purple
+  static const Color ubuntuUnityPurple = Color(0xFF9005D5);
+
+  /// Xubuntu Blue
+  static const Color xubuntuBlue = Color(0xFF0044AA);
+}
diff --git a/lib/src/themes/common_themes.dart b/lib/src/themes/common_themes.dart
@@ -1,9 +1,9 @@
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
+import 'package:yaru/src/colors.dart';
 import 'package:yaru/src/text/text_theme.dart';
 import 'package:yaru/src/themes/constants.dart';
 import 'package:yaru/src/themes/page_transitions.dart';
-import 'package:yaru_colors/yaru_colors.dart';
 
 const kDividerColorDark = Color.fromARGB(255, 65, 65, 65);
 const kDividerColorLight = Color(0xffdcdcdc);

diff --git a/lib/src/themes/extensions.dart b/lib/src/themes/extensions.dart
@@ -1,5 +1,5 @@
 import 'package:flutter/material.dart';
-import 'package:yaru_colors/yaru_colors.dart';
+import 'package:yaru/src/colors.dart';
 
 /// Yaru-specific theming extensions.
 extension YaruThemeDataExtension on ThemeData {

diff --git a/lib/src/themes/kubuntu.dart b/lib/src/themes/kubuntu.dart
@@ -1,4 +1,4 @@
-import 'package:yaru_colors/yaru_colors.dart';
+import 'package:yaru/src/colors.dart';
 import 'package:yaru/src/themes/common_themes.dart';
 
 const _primaryColor = YaruColors.kubuntuBlue;

diff --git a/lib/src/themes/lubuntu.dart b/lib/src/themes/lubuntu.dart
@@ -1,4 +1,4 @@
-import 'package:yaru_colors/yaru_colors.dart';
+import 'package:yaru/src/colors.dart';
 import 'package:yaru/src/themes/common_themes.dart';
 
 const _primaryColor = YaruColors.lubuntuBlue;

diff --git a/lib/src/themes/ubuntu_budgie.dart b/lib/src/themes/ubuntu_budgie.dart
@@ -1,4 +1,4 @@
-import 'package:yaru_colors/yaru_colors.dart';
+import 'package:yaru/src/colors.dart';
 import 'package:yaru/src/themes/common_themes.dart';
 
 const _primaryColor = YaruColors.ubuntuBudgieBlue;

diff --git a/lib/src/themes/ubuntu_butterfly.dart b/lib/src/themes/ubuntu_butterfly.dart
@@ -1,4 +1,4 @@
-import 'package:yaru_colors/yaru_colors.dart';
+import 'package:yaru/src/colors.dart';
 import 'package:yaru/src/themes/common_themes.dart';
 
 const _primaryColor = YaruColors.ubuntuButterflyPink;

diff --git a/lib/src/themes/ubuntu_cinnamon.dart b/lib/src/themes/ubuntu_cinnamon.dart
@@ -1,4 +1,4 @@
-import 'package:yaru_colors/yaru_colors.dart';
+import 'package:yaru/src/colors.dart';
 import 'package:yaru/src/themes/common_themes.dart';
 
 const _primaryColor = YaruColors.ubuntuCinnamonBrown;

diff --git a/lib/src/themes/ubuntu_mate.dart b/lib/src/themes/ubuntu_mate.dart
@@ -1,4 +1,4 @@
-import 'package:yaru_colors/yaru_colors.dart';
+import 'package:yaru/src/colors.dart';
 import 'package:yaru/src/themes/common_themes.dart';
 
 const _primaryColor = YaruColors.ubuntuMateGreen;

diff --git a/lib/src/themes/ubuntu_studio.dart b/lib/src/themes/ubuntu_studio.dart
@@ -1,4 +1,4 @@
-import 'package:yaru_colors/yaru_colors.dart';
+import 'package:yaru/src/colors.dart';
 import 'package:yaru/src/themes/common_themes.dart';
 
 const _primaryColor = YaruColors.ubuntuStudioBlue;

diff --git a/lib/src/themes/ubuntu_unity.dart b/lib/src/themes/ubuntu_unity.dart
@@ -1,4 +1,4 @@
-import 'package:yaru_colors/yaru_colors.dart';
+import 'package:yaru/src/colors.dart';
 import 'package:yaru/src/themes/common_themes.dart';
 
 const _primaryColor = YaruColors.ubuntuUnityPurple;

diff --git a/lib/src/themes/variant.dart b/lib/src/themes/variant.dart
@@ -1,5 +1,5 @@
 import 'package:flutter/material.dart';
-import 'package:yaru_colors/yaru_colors.dart';
+import 'package:yaru/src/colors.dart';
 import 'package:yaru/src/themes/kubuntu.dart';
 import 'package:yaru/src/themes/lubuntu.dart';
 import 'package:yaru/src/themes/ubuntu_budgie.dart';
@@ -54,7 +54,7 @@ enum YaruVariant {
   const YaruVariant(this.color);
 
   /// The primary color of the variant.
-  final MaterialColor color;
+  final Color color;
 
   /// A light theme for the variant.
   ThemeData get theme => _yaruLightThemes[this]!;

diff --git a/lib/src/themes/xubuntu.dart b/lib/src/themes/xubuntu.dart
@@ -1,4 +1,4 @@
-import 'package:yaru_colors/yaru_colors.dart';
+import 'package:yaru/src/colors.dart';
 import 'package:yaru/src/themes/common_themes.dart';
 
 const _primaryColor = YaruColors.xubuntuBlue;
@@ -8,5 +8,5 @@ final yaruXubuntuLight = createYaruLightTheme(
 );
 
 final yaruXubuntuDark = createYaruDarkTheme(
-  primaryColor: _primaryColor.shade500,
+  primaryColor: _primaryColor,
 );
diff --git a/lib/src/themes/yaru.dart b/lib/src/themes/yaru.dart
@@ -1,4 +1,4 @@
-import 'package:yaru_colors/yaru_colors.dart';
+import 'package:yaru/src/colors.dart';
 import 'package:yaru/src/themes/common_themes.dart';
 
 const _primaryColor = YaruColors.orange;
@@ -18,7 +18,7 @@ final yaruSageLight = createYaruLightTheme(
 );
 
 final yaruSageDark = createYaruDarkTheme(
-  primaryColor: YaruColors.sage.shade500,
+  primaryColor: YaruColors.sage,
 );
 
 final yaruPrussianGreenLight = createYaruLightTheme(
@@ -42,7 +42,7 @@ final yaruBarkLight = createYaruLightTheme(
 );
 
 final yaruBarkDark = createYaruDarkTheme(
-  primaryColor: YaruColors.bark.shade500,
+  primaryColor: YaruColors.bark,
 );
 
 final yaruViridianLight = createYaruLightTheme(

diff --git a/lib/yaru.dart b/lib/yaru.dart
@@ -1,5 +1,6 @@
 library yaru;
 
+export 'package:yaru/src/colors.dart';
 export 'package:yaru/src/themes/common_themes.dart';
 export 'package:yaru/src/themes/extensions.dart';
 export 'package:yaru/src/themes/high_contrast.dart';

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -24,7 +24,6 @@ dependencies:
     sdk: flutter
   gtk: ^2.0.0
   platform: ^3.1.0
-  yaru_colors: ^0.1.4
 
 dev_dependencies:
   build_runner: ^2.1.10