From 2c4e65e348449e2758bb455f9bf908bb1dc6ba57 Mon Sep 17 00:00:00 2001 From: Sarah Jamie Lewis Date: Fri, 4 Jun 2021 16:05:45 -0700 Subject: [PATCH] Update Icons --- assets/fonts/CwtchIcons.ttf | Bin 18488 -> 20140 bytes lib/cwtch_icons_icons.dart | 4 ++++ lib/views/addcontactview.dart | 2 +- lib/views/groupsettingsview.dart | 2 +- lib/views/messageview.dart | 2 +- lib/widgets/invitationbubble.dart | 3 ++- 6 files changed, 9 insertions(+), 4 deletions(-) diff --git a/assets/fonts/CwtchIcons.ttf b/assets/fonts/CwtchIcons.ttf index a2dd204283366254a2e49ada78961c0d12922983..ef83f2ec4b529c35bf8df8aef5dd16aada8c0846 100644 GIT binary patch delta 1986 zcmYLKU2NOd6+VZTyrf7<6m5y5BwMmbi%eu&F`Y<^n^>;fwF|NsYZklPQ!_1gn+{3r zI9Y#&0m{&IXp$Dlrosi*?V&}x^r3qg{L%u&Fl-oBq`+1TDB1?W&~?M$_Mv_0fB;+M z9a3IL;@qF_{M>WCdwKcBHGKUSc+Kq|6#(#A0C@1!+0OdS%cCy@D^=O=G@ z_bvmHEy>2@ADbtQ!~X(}Z4&~wK6>c(|N5Psoi6)?-A{7`sGj7B{g!bC%$|$C!mC^F z;NmzhBuw*nzy$V3M2!A0*PCbIK{lNCsxS(y=ekSheLDK!Qx4~Z3 zj>9+L1S}E6dsXp2y=hT4^w>m9S{f{GO-g@ajqPVB0tptGQN2C*zu{vp;9VUk{}abuN+ZZ)&B4I z9uf}MajrJ|yX*Cdg&t#ztO}hh5)s$A4F~Rg9ge$vlaJTPMR=7C3`-nvMoCwH=$)ywRujX zGPa`qmTg5dQP{>H9?wu1xkY?fwj4x(%;^n-);tD&;P1m-vRYASa|3PiwPimjW7nqj z<}rf?B@tCHB5`&CSF>)n#rOhLAQ{cBo*g@@G7i z&UEeJdVPv9$C4FwtjJi-Vv3}WR7K|Gxtb~$Vo2j^`Dw}4hpl@3ifouH_KH$URv{$I zWl@wl69p7*2?8>SNwO@m4p${vVgf=&XgGa zE7^+_LZT?`{z=n8bh6ZjF20kciTz3F^;>Q@?cohCTq0%va$;oS{FRYKYf5vgvSi(-dsU(#{&OPaa~PZU>VR5s2D z#1~5#SrJv8T#1kmi9%vbku>Q$#I#0e>@SqjG5dN#i7AxbFrn$SJ8yc^p(}jV3&Udr zU0)y20}_3n!2T>WAq5uHVHO^s>kRz^k)Od_8GGNH3%Y*Pq%%eb2z{65D(Ja<6m!-g zlzGmYnMWM+eSdM^zC~PgXTLJ*CQbix!NiwLrxDCY4@L7q<6S-VU8=oYI=cTbJDT>K zboIQE&l~5f>4K*}jd!)4YU#y=;|s;7+}#-NZ2!Hw*>xPV?pKQ0OeR~b`0bRgYHe@M z(nnlu>P1hl<_*oT#`JMV|1p(Azl5C+*rxDz7y|mcVAbVxP0|H1kGnS|ecTO!rk?B1 z;epm6`g+?!1=+%#hrKZ46jCP>vig5eiX%CGP}6FcOiJQXO%n>^nN8v2(7W?^I wTbX+F++&YkT-8sltv@-{Sy|awy>LN0v)XxVb?T9gwePK~gYl`;or?hf1-yYtq5uE@ delta 372 zcmZ28mvP4g#tBOGp2ry&7<(8P7{Zcs6AL~lynD>Rz^uW*zpiC#7&zxJ zFqrmaq$Z}w9Qu0!sP+L6n`Hn6*ln2?1KE3kSS2I3q{1fS|9_x)Pk`7ZCqFsS?17sU z0|Unop!|~D#EJsOOhyZ!oCJ`ske8U7x;~j>Fff5cfdHg0 zkWq($Z?Y2OTE>9Q7Z@WLCtENJSulP9%P}y#V_*iebbvG$P{S7n7KTGWT`WKd)cqm= z>v4p6tcBX!94&UenE~ Vt^v%9fs?m+EZUslDa8tO762GxV(I_@ diff --git a/lib/cwtch_icons_icons.dart b/lib/cwtch_icons_icons.dart index c9f51b0..8552f4d 100644 --- a/lib/cwtch_icons_icons.dart +++ b/lib/cwtch_icons_icons.dart @@ -102,4 +102,8 @@ class CwtchIcons { static const IconData add_group = IconData(0xe84e, fontFamily: _kFontFam, fontPackage: _kFontPkg); static const IconData add_peer = IconData(0xe84f, fontFamily: _kFontFam, fontPackage: _kFontPkg); static const IconData add_24px = IconData(0xe850, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData send_invite = IconData(0xe888, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData copy_address = IconData(0xe889, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData leave_group = IconData(0xe88a, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData leave_chat = IconData(0xe88b, fontFamily: _kFontFam, fontPackage: _kFontPkg); } diff --git a/lib/views/addcontactview.dart b/lib/views/addcontactview.dart index ead0518..3d9bc61 100644 --- a/lib/views/addcontactview.dart +++ b/lib/views/addcontactview.dart @@ -119,7 +119,7 @@ class _AddContactViewState extends State { CwtchButtonTextField( controller: ctrlrOnion, onPressed: _copyOnion, - icon: Icon(Icons.copy), + icon: Icon(CwtchIcons.copy_address), tooltip: AppLocalizations.of(context)!.copyBtn, ), SizedBox( diff --git a/lib/views/groupsettingsview.dart b/lib/views/groupsettingsview.dart index 422138e..03f52af 100644 --- a/lib/views/groupsettingsview.dart +++ b/lib/views/groupsettingsview.dart @@ -141,7 +141,7 @@ class _GroupSettingsViewState extends State { onPressed: () { showAlertDialog(context); }, - icon: Icon(CwtchIcons.delete_24px), + icon: Icon(CwtchIcons.leave_group), label: Text(AppLocalizations.of(context)!.leaveGroup), )) ]) diff --git a/lib/views/messageview.dart b/lib/views/messageview.dart index 6131854..ff465be 100644 --- a/lib/views/messageview.dart +++ b/lib/views/messageview.dart @@ -138,7 +138,7 @@ class _MessageViewState extends State { focusedBorder: InputBorder.none, enabled: true, prefixIcon: IconButton( - icon: Icon(Icons.insert_invitation, size: 24, color: Provider.of(context).theme.mainTextColor()), + icon: Icon(CwtchIcons.send_invite, size: 24, color: Provider.of(context).theme.mainTextColor()), tooltip: "Send a contact or group invite", onPressed: () => _modalSendInvitation(context)), suffixIcon: IconButton( diff --git a/lib/widgets/invitationbubble.dart b/lib/widgets/invitationbubble.dart index 00f6094..3e5e8d4 100644 --- a/lib/widgets/invitationbubble.dart +++ b/lib/widgets/invitationbubble.dart @@ -1,5 +1,6 @@ import 'dart:convert'; +import 'package:cwtch/cwtch_icons_icons.dart'; import 'package:flutter/material.dart'; import 'package:provider/provider.dart'; import '../main.dart'; @@ -95,7 +96,7 @@ class InvitationBubbleState extends State { child: Padding( padding: EdgeInsets.all(9.0), child: Row(mainAxisSize: MainAxisSize.min, children: [ - Center(widthFactor: 1, child: Padding(padding: EdgeInsets.all(4), child: Icon(Icons.group_add, size: 32))), + Center(widthFactor: 1, child: Padding(padding: EdgeInsets.all(4), child: Icon(CwtchIcons.send_invite, size: 32))), Center( widthFactor: 1.0, child: Column(