fix: x logos

xsoulspace · Mar 5, 2024 · 1bd0a3e · 1bd0a3e
1 parent 7311e85
commit 1bd0a3e
Show file tree

Hide file tree

Showing 11 changed files with 104 additions and 93 deletions.
diff --git a/lib/settings/features/characters_limit.dart b/lib/settings/features/characters_limit.dart
@@ -76,12 +76,11 @@ class CharactersLimitSetting extends HookWidget {
     }
     // TODO(arenukvern): refactor to separate widget
 
-    SvgGenImage twitterIcon;
-    if (controller.isTwitterLimit) {
-      twitterIcon = Assets.icons.twitterLogoBlue;
+    AssetGenImage xIcon;
+    if (controller.isXLimit) {
+      xIcon = dark ? Assets.icons.xLogoBlack : Assets.icons.xLogoWhite;
     } else {
-      twitterIcon =
-          dark ? Assets.icons.twitterLogoWhite : Assets.icons.twitterLogoBlack;
+      xIcon = dark ? Assets.icons.xLogoWhite : Assets.icons.xLogoBlack;
     }
     // TODO(arenukvern): refactor to separate widget
 
@@ -107,25 +106,20 @@ class CharactersLimitSetting extends HookWidget {
       children: [
         CharactersLimitButton(
           onTap: controller.onSetInstagramLimit,
-          child: ImageGenIcon(
-            genImage: instagramIcon,
-            dimension: 18,
+          child: instagramIcon.image(
+            colorBlendMode: BlendMode.srcIn,
+            width: 18,
+            height: 18,
             color: controller.isInstagramLimit
                 ? null
                 : theme.textTheme.bodyMedium?.color,
           ),
         ),
         CharactersLimitButton(
           onTap: controller.onSetTwitterLimit,
-          child: twitterIcon.svg(
-            width: 16,
-            height: 16,
-            colorFilter: ColorFilter.mode(
-              controller.isTwitterLimit
-                  ? AppColors.twitterBlue
-                  : theme.textTheme.bodyMedium?.color ?? AppColors.twitterBlue,
-              BlendMode.src,
-            ),
+          child: ImageGenIcon(
+            genImage: xIcon,
+            dimension: 18,
           ),
         ),
         CharactersLimitButton(
@@ -165,14 +159,17 @@ class CharactersLimitButton extends StatelessWidget {
   final Widget child;
 
   @override
-  Widget build(final BuildContext context) => HoverableButton(
-        onPressed: onTap,
-        child: Padding(
-          padding: const EdgeInsets.symmetric(
-            vertical: 3,
-            horizontal: 3,
+  Widget build(final BuildContext context) => Card(
+        color: context.colorScheme.primaryContainer,
+        child: HoverableButton(
+          onPressed: onTap,
+          child: Padding(
+            padding: const EdgeInsets.symmetric(
+              vertical: 3,
+              horizontal: 3,
+            ),
+            child: child,
           ),
-          child: child,
         ),
       );
 }

diff --git a/lib/settings/features/characters_limit_state.dart b/lib/settings/features/characters_limit_state.dart
@@ -94,9 +94,9 @@ class CharactersLimitController extends ValueNotifier<CharacterLimitState> {
 
   static const int twitterLimit = 280;
   static const String twitterLimitStr = '$twitterLimit';
-  bool get isTwitterLimit => limit == twitterLimitStr;
+  bool get isXLimit => limit == twitterLimitStr;
   void onSetTwitterLimit() {
-    final newLimit = isTwitterLimit ? 0 : twitterLimit;
+    final newLimit = isXLimit ? 0 : twitterLimit;
     setLimit(newLimit);
   }
 

diff --git a/packages/core/assets/icons/twitter_logo_black.svg b/packages/core/assets/icons/twitter_logo_black.svg
diff --git a/packages/core/assets/icons/twitter_logo_blue.svg b/packages/core/assets/icons/twitter_logo_blue.svg
diff --git a/packages/core/assets/icons/twitter_logo_white.svg b/packages/core/assets/icons/twitter_logo_white.svg
diff --git a/packages/core/assets/icons/x_logo_black.png b/packages/core/assets/icons/x_logo_black.png
diff --git a/packages/core/assets/icons/x_logo_white.png b/packages/core/assets/icons/x_logo_white.png
diff --git a/packages/core/lib/src/data_sources/local_isar/collections/collections.g.dart b/packages/core/lib/src/data_sources/local_isar/collections/collections.g.dart
diff --git a/packages/core/lib/src/data_sources/local_isar/collections/project.dart b/packages/core/lib/src/data_sources/local_isar/collections/project.dart
@@ -5,7 +5,4 @@ class ProjectIsarCollection with IsarEquatableMixin {
   DateTime? updatedAt;
   List<String> tags = [];
   String type = ProjectTypes.note.name;
-
-  @Index()
-  List<String> get contentWords => jsonContent.split(' ');
 }
diff --git a/packages/core/lib/src/generated/assets.gen.dart b/packages/core/lib/src/generated/assets.gen.dart
diff --git a/packages/core/lib/src/theme/app_colors.dart b/packages/core/lib/src/theme/app_colors.dart
@@ -62,7 +62,4 @@ class AppColors {
 
   /// #FFBFBD
   static const accent5 = Color(0xFFFFBFBD);
-
-  /// #1D9BF0
-  static const twitterBlue = Color(0xFF1D9BF0);
 }