From 3f4c313d733dfa807a613e5fe2ab3041fe30ab4b Mon Sep 17 00:00:00 2001
From: Sarah Jamie Lewis <sarah@openprivacy.ca>
Date: Fri, 4 Jun 2021 15:00:09 -0700
Subject: [PATCH] Fix heart color

---
 assets/core/negative_heart_24px.svg | 16 ++++++++--------
 lib/widgets/messagelist.dart        | 11 +++++++----
 2 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/assets/core/negative_heart_24px.svg b/assets/core/negative_heart_24px.svg
index 6042d52..f25b904 100644
--- a/assets/core/negative_heart_24px.svg
+++ b/assets/core/negative_heart_24px.svg
@@ -17,10 +17,10 @@
    style="enable-background:new 0 0 24 24;"
    xml:space="preserve"
    sodipodi:docname="negative_heart_24px.svg"
-   inkscape:export-filename="/home/sarah/AndroidStudioProjects/flutter_app/assets/core/negative_heart_512px.png"
-   inkscape:export-xdpi="4096"
-   inkscape:export-ydpi="4096"
-   inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)"><metadata
+   inkscape:export-filename="/home/sarah/PARA/projects/cwtch/assets/core/negative_heart_256px.png"
+   inkscape:export-xdpi="1024"
+   inkscape:export-ydpi="1024"
+   inkscape:version="0.92.4 (5da689c313, 2019-01-14)"><metadata
    id="metadata14"><rdf:RDF><cc:Work
        rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
          rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
@@ -34,14 +34,14 @@
    inkscape:pageopacity="0"
    inkscape:pageshadow="2"
    inkscape:window-width="1920"
-   inkscape:window-height="1015"
+   inkscape:window-height="1020"
    id="namedview10"
    showgrid="false"
    inkscape:zoom="9.8333333"
-   inkscape:cx="12"
-   inkscape:cy="14.687942"
+   inkscape:cx="-5.8983051"
+   inkscape:cy="14.281162"
    inkscape:window-x="0"
-   inkscape:window-y="0"
+   inkscape:window-y="31"
    inkscape:window-maximized="1"
    inkscape:current-layer="Layer_1" />
 <style
diff --git a/lib/widgets/messagelist.dart b/lib/widgets/messagelist.dart
index e6d43d6..2b424d4 100644
--- a/lib/widgets/messagelist.dart
+++ b/lib/widgets/messagelist.dart
@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+import 'package:flutter/rendering.dart';
 import 'package:provider/provider.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import '../model.dart';
@@ -27,10 +28,11 @@ class _MessageListState extends State<MessageList> {
             padding: EdgeInsets.all(5.0),
             color: Provider.of<Settings>(context).theme.defaultButtonActiveColor(),
             child: showOfflineWarning
-                ? Text(Provider.of<ContactInfoState>(context).isGroup ? AppLocalizations.of(context)!.serverConnectivityDisconnected : AppLocalizations.of(context)!.peerOfflineMessage)
+                ? Text(Provider.of<ContactInfoState>(context).isGroup ? AppLocalizations.of(context)!.serverConnectivityDisconnected : AppLocalizations.of(context)!.peerOfflineMessage,
+                    textAlign: TextAlign.center)
                 // Only show the ephemeral status for peer conversations, not for groups...
                 : (showEphemeralWarning
-                    ? Text(AppLocalizations.of(context)!.chatHistoryDefault)
+                    ? Text(AppLocalizations.of(context)!.chatHistoryDefault, textAlign: TextAlign.center)
                     :
                     // We are not allowed to put null here, so put an empty text widge
                     Text("")),
@@ -45,9 +47,10 @@ class _MessageListState extends State<MessageList> {
                       image: Provider.of<ContactInfoState>(outerContext).isOnline()
                           ? null
                           : DecorationImage(
-                              fit: BoxFit.contain,
+                              fit: BoxFit.scaleDown,
+                              alignment: Alignment.center,
                               image: AssetImage("assets/core/negative_heart_512px.png"),
-                              colorFilter: ColorFilter.mode(Provider.of<Settings>(context).theme.mainTextColor(), BlendMode.srcIn))),
+                              colorFilter: ColorFilter.mode(Provider.of<Settings>(context).theme.hilightElementTextColor(), BlendMode.srcIn))),
                   child: ListView.builder(
                     controller: ctrlr1,
                     itemCount: Provider.of<ContactInfoState>(outerContext).totalMessages,