update color names with develop ones

2021-07-01 09:28:01 +02:00
parent 52e19e9bc1
commit 253e6caa1c
19 changed files with 430 additions and 374 deletions
@@ -40,18 +40,18 @@ class _ChatInfoScreenState extends State<ChatInfoScreen> {
  Widget build(BuildContext context) {
    final channel = StreamChannel.of(context).channel;
    return Scaffold(
-      backgroundColor: StreamChatTheme.of(context).colorTheme.whiteSnow,
+      backgroundColor: StreamChatTheme.of(context).colorTheme.appBg,
      body: ListView(
        children: [
          _buildUserHeader(),
          Container(
            height: 8.0,
-            color: StreamChatTheme.of(context).colorTheme.greyGainsboro,
+            color: StreamChatTheme.of(context).colorTheme.disabled,
          ),
          _buildOptionListTiles(),
          Container(
            height: 8.0,
-            color: StreamChatTheme.of(context).colorTheme.greyGainsboro,
+            color: StreamChatTheme.of(context).colorTheme.disabled,
          ),
          if ([
            'admin',
@@ -68,7 +68,7 @@ class _ChatInfoScreenState extends State<ChatInfoScreen> {

  Widget _buildUserHeader() {
    return Material(
-      color: StreamChatTheme.of(context).colorTheme.whiteSnow,
+      color: StreamChatTheme.of(context).colorTheme.appBg,
      child: SafeArea(
        child: Stack(
          children: [
@@ -96,7 +96,7 @@ class _ChatInfoScreenState extends State<ChatInfoScreen> {
                SizedBox(height: 15.0),
                OptionListTile(
                  title: '@${widget.user!.id}',
-                  tileColor: StreamChatTheme.of(context).colorTheme.whiteSnow,
+                  tileColor: StreamChatTheme.of(context).colorTheme.appBg,
                  trailing: Padding(
                    padding: const EdgeInsets.symmetric(horizontal: 8.0),
                    child: Text(
@@ -104,7 +104,7 @@ class _ChatInfoScreenState extends State<ChatInfoScreen> {
                      style: TextStyle(
                          color: StreamChatTheme.of(context)
                              .colorTheme
-                              .black
+                              .textHighEmphasis
                              .withOpacity(0.5),
                          fontSize: 16.0),
                    ),
@@ -134,7 +134,7 @@ class _ChatInfoScreenState extends State<ChatInfoScreen> {
        //   title: 'Notifications',
        //   leading: StreamSvgIcon.Icon_notification(
        //     size: 24.0,
-        //     color: StreamChatTheme.of(context).colorTheme.black.withOpacity(0.5),
+        //     color: StreamChatTheme.of(context).colorTheme.textHighEmphasis.withOpacity(0.5),
        //   ),
        //   trailing: CupertinoSwitch(
        //     value: true,
@@ -148,7 +148,7 @@ class _ChatInfoScreenState extends State<ChatInfoScreen> {
              mutedBool.value = snapshot.data;

              return OptionListTile(
-                tileColor: StreamChatTheme.of(context).colorTheme.whiteSnow,
+                tileColor: StreamChatTheme.of(context).colorTheme.appBg,
                title: 'Mute user',
                titleTextStyle: StreamChatTheme.of(context).textTheme.body,
                leading: Padding(
@@ -157,7 +157,7 @@ class _ChatInfoScreenState extends State<ChatInfoScreen> {
                    size: 24.0,
                    color: StreamChatTheme.of(context)
                        .colorTheme
-                        .black
+                        .textHighEmphasis
                        .withOpacity(0.5),
                  ),
                ),
@@ -186,7 +186,7 @@ class _ChatInfoScreenState extends State<ChatInfoScreen> {
        //   title: 'Block User',
        //   leading: StreamSvgIcon.Icon_user_delete(
        //     size: 24.0,
-        //     color: StreamChatTheme.of(context).colorTheme.black.withOpacity(0.5),
+        //     color: StreamChatTheme.of(context).colorTheme.textHighEmphasis.withOpacity(0.5),
        //   ),
        //   trailing: CupertinoSwitch(
        //     value: widget.user.banned,
@@ -202,18 +202,20 @@ class _ChatInfoScreenState extends State<ChatInfoScreen> {
        // ),
        OptionListTile(
          title: 'Pinned Messages',
-          tileColor: StreamChatTheme.of(context).colorTheme.whiteSnow,
+          tileColor: StreamChatTheme.of(context).colorTheme.appBg,
          titleTextStyle: StreamChatTheme.of(context).textTheme.body,
          leading: Padding(
            padding: const EdgeInsets.symmetric(horizontal: 22.0),
            child: StreamSvgIcon.pin(
              size: 24.0,
-              color:
-                  StreamChatTheme.of(context).colorTheme.black.withOpacity(0.5),
+              color: StreamChatTheme.of(context)
+                  .colorTheme
+                  .textHighEmphasis
+                  .withOpacity(0.5),
            ),
          ),
          trailing: StreamSvgIcon.right(
-            color: StreamChatTheme.of(context).colorTheme.grey,
+            color: StreamChatTheme.of(context).colorTheme.textLowEmphasis,
          ),
          onTap: () {
            final channel = StreamChannel.of(context).channel;
@@ -261,18 +263,20 @@ class _ChatInfoScreenState extends State<ChatInfoScreen> {
        ),
        OptionListTile(
          title: 'Photos & Videos',
-          tileColor: StreamChatTheme.of(context).colorTheme.whiteSnow,
+          tileColor: StreamChatTheme.of(context).colorTheme.appBg,
          titleTextStyle: StreamChatTheme.of(context).textTheme.body,
          leading: Padding(
            padding: const EdgeInsets.symmetric(horizontal: 16.0),
            child: StreamSvgIcon.pictures(
              size: 36.0,
-              color:
-                  StreamChatTheme.of(context).colorTheme.black.withOpacity(0.5),
+              color: StreamChatTheme.of(context)
+                  .colorTheme
+                  .textHighEmphasis
+                  .withOpacity(0.5),
            ),
          ),
          trailing: StreamSvgIcon.right(
-            color: StreamChatTheme.of(context).colorTheme.grey,
+            color: StreamChatTheme.of(context).colorTheme.textLowEmphasis,
          ),
          onTap: () {
            final channel = StreamChannel.of(context).channel;
@@ -320,18 +324,20 @@ class _ChatInfoScreenState extends State<ChatInfoScreen> {
        ),
        OptionListTile(
          title: 'Files',
-          tileColor: StreamChatTheme.of(context).colorTheme.whiteSnow,
+          tileColor: StreamChatTheme.of(context).colorTheme.appBg,
          titleTextStyle: StreamChatTheme.of(context).textTheme.body,
          leading: Padding(
            padding: const EdgeInsets.symmetric(horizontal: 18.0),
            child: StreamSvgIcon.files(
              size: 32.0,
-              color:
-                  StreamChatTheme.of(context).colorTheme.black.withOpacity(0.5),
+              color: StreamChatTheme.of(context)
+                  .colorTheme
+                  .textHighEmphasis
+                  .withOpacity(0.5),
            ),
          ),
          trailing: StreamSvgIcon.right(
-            color: StreamChatTheme.of(context).colorTheme.grey,
+            color: StreamChatTheme.of(context).colorTheme.textLowEmphasis,
          ),
          onTap: () {
            final channel = StreamChannel.of(context).channel;
@@ -359,18 +365,20 @@ class _ChatInfoScreenState extends State<ChatInfoScreen> {
        ),
        OptionListTile(
          title: 'Shared groups',
-          tileColor: StreamChatTheme.of(context).colorTheme.whiteSnow,
+          tileColor: StreamChatTheme.of(context).colorTheme.appBg,
          titleTextStyle: StreamChatTheme.of(context).textTheme.body,
          leading: Padding(
            padding: const EdgeInsets.symmetric(horizontal: 22.0),
            child: StreamSvgIcon.iconGroup(
              size: 24.0,
-              color:
-                  StreamChatTheme.of(context).colorTheme.black.withOpacity(0.5),
+              color: StreamChatTheme.of(context)
+                  .colorTheme
+                  .textHighEmphasis
+                  .withOpacity(0.5),
            ),
          ),
          trailing: StreamSvgIcon.right(
-            color: StreamChatTheme.of(context).colorTheme.grey,
+            color: StreamChatTheme.of(context).colorTheme.textLowEmphasis,
          ),
          onTap: () {
            Navigator.push(
@@ -387,21 +395,21 @@ class _ChatInfoScreenState extends State<ChatInfoScreen> {
  Widget _buildDeleteListTile() {
    return OptionListTile(
      title: 'Delete Conversation',
-      tileColor: StreamChatTheme.of(context).colorTheme.whiteSnow,
+      tileColor: StreamChatTheme.of(context).colorTheme.appBg,
      titleTextStyle: StreamChatTheme.of(context).textTheme.body.copyWith(
-            color: StreamChatTheme.of(context).colorTheme.accentRed,
+            color: StreamChatTheme.of(context).colorTheme.accentError,
          ),
      leading: Padding(
        padding: const EdgeInsets.symmetric(horizontal: 22.0),
        child: StreamSvgIcon.delete(
-          color: StreamChatTheme.of(context).colorTheme.accentRed,
+          color: StreamChatTheme.of(context).colorTheme.accentError,
          size: 24.0,
        ),
      ),
      onTap: () {
        _showDeleteDialog();
      },
-      titleColor: StreamChatTheme.of(context).colorTheme.accentRed,
+      titleColor: StreamChatTheme.of(context).colorTheme.accentError,
    );
  }

@@ -413,7 +421,7 @@ class _ChatInfoScreenState extends State<ChatInfoScreen> {
      question: 'Are you sure you want to delete this conversation?',
      cancelText: 'CANCEL',
      icon: StreamSvgIcon.delete(
-        color: StreamChatTheme.of(context).colorTheme.accentRed,
+        color: StreamChatTheme.of(context).colorTheme.accentError,
      ),
    );
    var channel = StreamChannel.of(context).channel;
@@ -437,7 +445,7 @@ class _ChatInfoScreenState extends State<ChatInfoScreen> {
          style: TextStyle(
              color: StreamChatTheme.of(context)
                  .colorTheme
-                  .black
+                  .textHighEmphasis
                  .withOpacity(0.5)),
        );
      } else {
@@ -446,7 +454,7 @@ class _ChatInfoScreenState extends State<ChatInfoScreen> {
          style: TextStyle(
              color: StreamChatTheme.of(context)
                  .colorTheme
-                  .black
+                  .textHighEmphasis
                  .withOpacity(0.5)),
        );
      }
@@ -466,10 +474,10 @@ class _ChatInfoScreenState extends State<ChatInfoScreen> {
              ),
              child: Material(
                shape: CircleBorder(),
-                color: StreamChatTheme.of(context).colorTheme.accentGreen,
+                color: StreamChatTheme.of(context).colorTheme.accentInfo,
              ),
            ),
-            color: StreamChatTheme.of(context).colorTheme.white,
+            color: StreamChatTheme.of(context).colorTheme.barsBg,
          ),
        alternativeWidget,
        if (widget.user!.online)
@@ -497,7 +505,7 @@ class __SharedGroupsScreenState extends State<_SharedGroupsScreen> {
    var chat = StreamChat.of(context);

    return Scaffold(
-      backgroundColor: StreamChatTheme.of(context).colorTheme.whiteSnow,
+      backgroundColor: StreamChatTheme.of(context).colorTheme.appBg,
      appBar: AppBar(
        brightness: Theme.of(context).brightness,
        elevation: 1,
@@ -505,11 +513,11 @@ class __SharedGroupsScreenState extends State<_SharedGroupsScreen> {
        title: Text(
          'Shared Groups',
          style: TextStyle(
-              color: StreamChatTheme.of(context).colorTheme.black,
+              color: StreamChatTheme.of(context).colorTheme.textHighEmphasis,
              fontSize: 16.0),
        ),
        leading: StreamBackButton(),
-        backgroundColor: StreamChatTheme.of(context).colorTheme.white,
+        backgroundColor: StreamChatTheme.of(context).colorTheme.barsBg,
      ),
      body: StreamBuilder<List<Channel>>(
        stream: chat.client.queryChannels(
@@ -532,14 +540,16 @@ class __SharedGroupsScreenState extends State<_SharedGroupsScreen> {
                children: [
                  StreamSvgIcon.message(
                    size: 136.0,
-                    color: StreamChatTheme.of(context).colorTheme.greyGainsboro,
+                    color: StreamChatTheme.of(context).colorTheme.disabled,
                  ),
                  SizedBox(height: 16.0),
                  Text(
                    'No Shared Groups',
                    style: TextStyle(
                      fontSize: 14.0,
-                      color: StreamChatTheme.of(context).colorTheme.black,
+                      color: StreamChatTheme.of(context)
+                          .colorTheme
+                          .textHighEmphasis,
                    ),
                  ),
                  SizedBox(height: 8.0),
@@ -550,7 +560,7 @@ class __SharedGroupsScreenState extends State<_SharedGroupsScreen> {
                      fontSize: 14.0,
                      color: StreamChatTheme.of(context)
                          .colorTheme
-                          .black
+                          .textHighEmphasis
                          .withOpacity(0.5),
                    ),
                  ),
@@ -643,7 +653,7 @@ class __SharedGroupsScreenState extends State<_SharedGroupsScreen> {
                      style: TextStyle(
                          color: StreamChatTheme.of(context)
                              .colorTheme
-                              .black
+                              .textHighEmphasis
                              .withOpacity(0.5)),
                    ),
                  )
@@ -652,8 +662,10 @@ class __SharedGroupsScreenState extends State<_SharedGroupsScreen> {
            ),
            Container(
              height: 1.0,
-              color:
-                  StreamChatTheme.of(context).colorTheme.black.withOpacity(.08),
+              color: StreamChatTheme.of(context)
+                  .colorTheme
+                  .textHighEmphasis
+                  .withOpacity(.08),
            ),
          ],
        );