cwtch.im
/
cwtch-ui
10
11
Fork 17
Code Issues 89 Pull Requests 2 Projects 2 Releases 28 Wiki Activity

Fix scaling on Contact Row Accept/Reject / Fix Color Blending

This commit is contained in:
Sarah Jamie Lewis 2024-04-16 10:57:46 -07:00
parent 4cb59d6cbc
commit 3aa0042b71
Signed by: sarah
GPG Key ID: F27FD21A270837EF
3 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/cwtch/cwtchNotifier.dart
View File

@ -58,9 +58,6 @@ class CwtchNotifier {
// EnvironmentConfig.debugLog("NewEvent $type $data"); // EnvironmentConfig.debugLog("NewEvent $type $data");
switch (type) { switch (type) {
case "CwtchStarted": case "CwtchStarted":
if (data["Reload"] == "true" && profileCN.num > 0) { if (data["Reload"] == "true" && profileCN.num > 0) {
// don't reload... // don't reload...
// unless we have loaded no profiles...then there isnt a risk and this // unless we have loaded no profiles...then there isnt a risk and this

3
lib/views/splashView.dart
View File

@ -56,8 +56,7 @@ class _SplashViewState extends State<SplashView> {
: appState.modalState == ModalState.storageMigration : appState.modalState == ModalState.storageMigration
? AppLocalizations.of(context)!.storageMigrationModalMessage ? AppLocalizations.of(context)!.storageMigrationModalMessage
: AppLocalizations.of(context)!.shuttingDownApp, // Todo l10n AppLocalizations.of(context)!.storageMigrationModalMessage : AppLocalizations.of(context)!.shuttingDownApp, // Todo l10n AppLocalizations.of(context)!.storageMigrationModalMessage
style: defaultTextButtonStyle.copyWith( style: defaultTextButtonStyle.copyWith(fontSize: 16.0, fontFamily: "Inter", color: appState.appError == "" ? whiteishPurple : hotPink))),
fontSize: 16.0, fontFamily: "Inter", color: appState.appError == "" ? whiteishPurple : hotPink))),
Visibility( Visibility(
visible: appState.modalState == ModalState.storageMigration || appState.modalState == ModalState.shutdown, visible: appState.modalState == ModalState.storageMigration || appState.modalState == ModalState.shutdown,
child: LinearProgressIndicator( child: LinearProgressIndicator(

6
lib/widgets/contactrow.dart
View File

@ -63,7 +63,7 @@ class _ContactRowState extends State<ContactRow> {
enableFeedback: true, enableFeedback: true,
splashFactory: InkSplash.splashFactory, splashFactory: InkSplash.splashFactory,
child: Ink( 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: Container(
child: Row(mainAxisAlignment: MainAxisAlignment.spaceBetween, crossAxisAlignment: CrossAxisAlignment.center, children: [ child: Row(mainAxisAlignment: MainAxisAlignment.spaceBetween, crossAxisAlignment: CrossAxisAlignment.center, children: [
Padding( 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, 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 child: contact.isInvitation == true
? FittedBox( ? FittedBox(
fit: BoxFit.cover, fit: BoxFit.scaleDown,
child: Row(mainAxisAlignment: MainAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.center, children: <Widget>[ child: Wrap(children: <Widget>[
Padding( Padding(
padding: EdgeInsets.all(2), padding: EdgeInsets.all(2),
child: TextButton.icon( child: TextButton.icon(