From a25df2187fd4577d5bfc49d4a94c2b2fe004bc3c Mon Sep 17 00:00:00 2001
From: monsieurtanuki <fabrice_fontaine@hotmail.com>
Date: Tue, 15 Aug 2023 14:36:30 +0200
Subject: [PATCH] feat: 4533 - new twitter logo and label

Deleted file:
* `twitter-bird.svg`

New file:
* `x-logo.svg`

Impacted files:
* `app_en.arb`: edited twitter label
* `user_preferences_connect.dart`: now using the new tinted twitter logo
---
 .../assets/preferences/twitter-bird.svg       | 35 -------------------
 .../smooth_app/assets/preferences/x-logo.svg  |  3 ++
 packages/smooth_app/lib/l10n/app_en.arb       |  2 +-
 .../preferences/user_preferences_connect.dart |  8 ++++-
 4 files changed, 11 insertions(+), 37 deletions(-)
 delete mode 100644 packages/smooth_app/assets/preferences/twitter-bird.svg
 create mode 100644 packages/smooth_app/assets/preferences/x-logo.svg

diff --git a/packages/smooth_app/assets/preferences/twitter-bird.svg b/packages/smooth_app/assets/preferences/twitter-bird.svg
deleted file mode 100644
index 431fb4498fb..00000000000
--- a/packages/smooth_app/assets/preferences/twitter-bird.svg
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-    xmlns:dc="http://purl.org/dc/elements/1.1/"
-    xmlns:cc="http://creativecommons.org/ns#"
-    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-    xmlns:svg="http://www.w3.org/2000/svg"
-    xmlns="http://www.w3.org/2000/svg"
-    version="1.1"
-    id="svg3626"
-    viewBox="0 0 300.00006 244.18703"
-    height="244.18703"
-    width="300.00006">
-    <defs
-        id="defs3628" />
-    <metadata
-        id="metadata3631">
-        <rdf:RDF>
-            <cc:Work
-                rdf:about="">
-                <dc:format>image/svg+xml</dc:format>
-                <dc:type
-                    rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-                <dc:title></dc:title>
-            </cc:Work>
-        </rdf:RDF>
-    </metadata>
-    <g
-        transform="translate(-539.17946,-568.85777)"
-        id="layer1">
-        <path
-            id="path3611"
-            style="fill:#1da1f2;fill-opacity:1;fill-rule:nonzero;stroke:none"
-            d="m 633.89823,812.04479 c 112.46038,0 173.95627,-93.16765 173.95627,-173.95625 0,-2.64628 -0.0539,-5.28062 -0.1726,-7.90305 11.93799,-8.63016 22.31446,-19.39999 30.49762,-31.65984 -10.95459,4.86937 -22.74358,8.14741 -35.11071,9.62551 12.62341,-7.56929 22.31446,-19.54304 26.88583,-33.81739 -11.81284,7.00307 -24.89517,12.09297 -38.82383,14.84055 -11.15723,-11.88436 -27.04079,-19.31655 -44.62892,-19.31655 -33.76374,0 -61.14426,27.38052 -61.14426,61.13233 0,4.79784 0.5364,9.46458 1.58538,13.94057 -50.81546,-2.55686 -95.87353,-26.88582 -126.02546,-63.87991 -5.25082,9.03545 -8.27852,19.53111 -8.27852,30.73006 0,21.21186 10.79366,39.93837 27.20766,50.89296 -10.03077,-0.30992 -19.45363,-3.06348 -27.69044,-7.64676 -0.009,0.25652 -0.009,0.50661 -0.009,0.78077 0,29.60957 21.07478,54.3319 49.0513,59.93435 -5.13757,1.40062 -10.54335,2.15158 -16.12196,2.15158 -3.93364,0 -7.76596,-0.38716 -11.49099,-1.1026 7.78383,24.2932 30.35457,41.97073 57.11525,42.46543 -20.92578,16.40207 -47.28712,26.17062 -75.93712,26.17062 -4.92898,0 -9.79834,-0.28036 -14.58427,-0.84634 27.05868,17.34379 59.18936,27.46396 93.72193,27.46396" />
-    </g>
-</svg>
diff --git a/packages/smooth_app/assets/preferences/x-logo.svg b/packages/smooth_app/assets/preferences/x-logo.svg
new file mode 100644
index 00000000000..437e2bfddbb
--- /dev/null
+++ b/packages/smooth_app/assets/preferences/x-logo.svg
@@ -0,0 +1,3 @@
+<svg width="1200" height="1227" viewBox="0 0 1200 1227" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M714.163 519.284L1160.89 0H1055.03L667.137 450.887L357.328 0H0L468.492 681.821L0 1226.37H105.866L515.491 750.218L842.672 1226.37H1200L714.137 519.284H714.163ZM569.165 687.828L521.697 619.934L144.011 79.6944H306.615L611.412 515.685L658.88 583.579L1055.08 1150.3H892.476L569.165 687.854V687.828Z" fill="white"/>
+</svg>
diff --git a/packages/smooth_app/lib/l10n/app_en.arb b/packages/smooth_app/lib/l10n/app_en.arb
index 454d085c485..6bd35d2f4c1 100644
--- a/packages/smooth_app/lib/l10n/app_en.arb
+++ b/packages/smooth_app/lib/l10n/app_en.arb
@@ -861,7 +861,7 @@
     "connect_with_us": "Connect with us",
     "instagram": "Instagram",
     "instagram_link": "https://instagram.com/open.food.facts",
-    "twitter": "Twitter",
+    "twitter": "X (formerly Twitter)",
     "twitter_link": "https://www.twitter.com/openfoodfacts",
     "blog": "Blog",
     "faq": "FAQ",
diff --git a/packages/smooth_app/lib/pages/preferences/user_preferences_connect.dart b/packages/smooth_app/lib/pages/preferences/user_preferences_connect.dart
index 079befb2dde..6cb68e0161e 100644
--- a/packages/smooth_app/lib/pages/preferences/user_preferences_connect.dart
+++ b/packages/smooth_app/lib/pages/preferences/user_preferences_connect.dart
@@ -1,3 +1,5 @@
+import 'dart:ui' as ui;
+
 import 'package:device_info_plus/device_info_plus.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
@@ -64,8 +66,12 @@ class UserPreferencesConnect extends AbstractUserPreferences {
           title: appLocalizations.twitter,
           url: appLocalizations.twitter_link,
           leading: SvgPicture.asset(
-            'assets/preferences/twitter-bird.svg',
+            'assets/preferences/x-logo.svg',
             width: DEFAULT_ICON_SIZE,
+            colorFilter: ui.ColorFilter.mode(
+              Theme.of(context).colorScheme.onBackground,
+              ui.BlendMode.srcIn,
+            ),
             package: AppHelper.APP_PACKAGE,
           ),
         ),