From 3aa0042b712d309e2f715189e005d1c8a10ce86d Mon Sep 17 00:00:00 2001
From: Sarah Jamie Lewis <sarah@openprivacy.ca>
Date: Tue, 16 Apr 2024 10:57:46 -0700
Subject: [PATCH] Fix scaling on Contact Row Accept/Reject / Fix Color Blending

---
 lib/cwtch/cwtchNotifier.dart | 3 ---
 lib/views/splashView.dart    | 3 +--
 lib/widgets/contactrow.dart  | 6 +++---
 3 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/lib/cwtch/cwtchNotifier.dart b/lib/cwtch/cwtchNotifier.dart
index 65e67921..b17ee61c 100644
--- a/lib/cwtch/cwtchNotifier.dart
+++ b/lib/cwtch/cwtchNotifier.dart
@@ -58,9 +58,6 @@ class CwtchNotifier {
     // EnvironmentConfig.debugLog("NewEvent $type $data");
     switch (type) {
       case "CwtchStarted":
-
-
-
         if (data["Reload"] == "true" && profileCN.num > 0) {
           // don't reload...
           // unless we have loaded no profiles...then there isnt a risk and this
diff --git a/lib/views/splashView.dart b/lib/views/splashView.dart
index 9e3eb24d..36f0cd17 100644
--- a/lib/views/splashView.dart
+++ b/lib/views/splashView.dart
@@ -56,8 +56,7 @@ class _SplashViewState extends State<SplashView> {
                                       : appState.modalState == ModalState.storageMigration
                                           ? AppLocalizations.of(context)!.storageMigrationModalMessage
                                           : AppLocalizations.of(context)!.shuttingDownApp, // Todo l10n AppLocalizations.of(context)!.storageMigrationModalMessage
-                              style: defaultTextButtonStyle.copyWith(
-                                  fontSize: 16.0, fontFamily: "Inter", color: appState.appError == "" ? whiteishPurple : hotPink))),
+                              style: defaultTextButtonStyle.copyWith(fontSize: 16.0, fontFamily: "Inter", color: appState.appError == "" ? whiteishPurple : hotPink))),
                       Visibility(
                           visible: appState.modalState == ModalState.storageMigration || appState.modalState == ModalState.shutdown,
                           child: LinearProgressIndicator(
diff --git a/lib/widgets/contactrow.dart b/lib/widgets/contactrow.dart
index 1f118c2a..23f08e34 100644
--- a/lib/widgets/contactrow.dart
+++ b/lib/widgets/contactrow.dart
@@ -63,7 +63,7 @@ class _ContactRowState extends State<ContactRow> {
       enableFeedback: true,
       splashFactory: InkSplash.splashFactory,
       child: Ink(
-          color: selected ? Provider.of<Settings>(context).theme.backgroundHilightElementColor : Colors.transparent,
+          color: selected ? (Provider.of<Settings>(context).theme.backgroundHilightElementColor as Color).withOpacity(0.8) : Colors.transparent,
           child: Container(
               child: Row(mainAxisAlignment: MainAxisAlignment.spaceBetween, crossAxisAlignment: CrossAxisAlignment.center, children: [
             Padding(
@@ -123,8 +123,8 @@ class _ContactRowState extends State<ContactRow> {
                             height: contact.isInvitation ? Provider.of<Settings>(context).fontScaling * 14.0 + 35.0 : Provider.of<Settings>(context).fontScaling * 14.0 + 5.0,
                             child: contact.isInvitation == true
                                 ? FittedBox(
-                                    fit: BoxFit.cover,
-                                    child: Row(mainAxisAlignment: MainAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.center, children: <Widget>[
+                                    fit: BoxFit.scaleDown,
+                                    child: Wrap(children: <Widget>[
                                       Padding(
                                           padding: EdgeInsets.all(2),
                                           child: TextButton.icon(