diff --git a/lib/route.dart b/lib/route.dart index f0eb695..1cc0e73 100644 --- a/lib/route.dart +++ b/lib/route.dart @@ -433,14 +433,6 @@ final routerProvider = Provider((ref) { path: '/account/relationships', builder: (context, state) => const RelationshipScreen(), ), - GoRoute( - name: 'accountProfile', - path: '/account/:name', - builder: (context, state) { - final name = state.pathParameters['name']!; - return AccountProfileScreen(name: name); - }, - ), GoRoute( name: 'profileUpdate', path: '/account/me/update', @@ -463,6 +455,15 @@ final routerProvider = Provider((ref) { ), ], ), + + GoRoute( + name: 'accountProfile', + path: '/account/:name', + builder: (context, state) { + final name = state.pathParameters['name']!; + return AccountProfileScreen(name: name); + }, + ), ], ), ], diff --git a/lib/screens/chat/call.dart b/lib/screens/chat/call.dart index 0e87349..7a26027 100644 --- a/lib/screens/chat/call.dart +++ b/lib/screens/chat/call.dart @@ -31,7 +31,11 @@ class CallScreen extends HookConsumerWidget { (p) => !(p.hasVideo && p.remoteParticipant.trackPublications.values.any( - (pub) => pub.track != null && pub.kind == TrackType.VIDEO, + (pub) => + pub.track != null && + pub.kind == TrackType.VIDEO && + !pub.muted && + !pub.isDisposed, )), ); diff --git a/lib/screens/explore.dart b/lib/screens/explore.dart index c0bd5b9..6b1f607 100644 --- a/lib/screens/explore.dart +++ b/lib/screens/explore.dart @@ -344,6 +344,10 @@ class _DiscoveryActivityItem extends StatelessWidget { flexWeights: isWideScreen(context) ? [3, 2, 1] : [4, 1], consumeMaxWeight: false, + enableSplash: false, + shape: RoundedRectangleBorder( + borderRadius: BorderRadius.all(Radius.circular(8)), + ), children: [ for (final item in items) switch (type) { @@ -364,7 +368,7 @@ class _DiscoveryActivityItem extends StatelessWidget { ], ), ), - ).padding(bottom: 8), + ).padding(bottom: 8, horizontal: 8), ], ), ); diff --git a/lib/screens/posts/pub_profile.dart b/lib/screens/posts/pub_profile.dart index 6f420da..d0b0fb7 100644 --- a/lib/screens/posts/pub_profile.dart +++ b/lib/screens/posts/pub_profile.dart @@ -389,11 +389,13 @@ class PublisherProfileScreen extends HookConsumerWidget { ), error: (error, stackTrace) => AppScaffold( + noBackground: false, appBar: AppBar(leading: const PageBackButton()), body: Center(child: Text(error.toString())), ), loading: () => AppScaffold( + noBackground: false, appBar: AppBar(leading: const PageBackButton()), body: Center(child: CircularProgressIndicator()), ), diff --git a/lib/widgets/chat/call_overlay.dart b/lib/widgets/chat/call_overlay.dart index 46846c8..c33dfc2 100644 --- a/lib/widgets/chat/call_overlay.dart +++ b/lib/widgets/chat/call_overlay.dart @@ -76,7 +76,7 @@ class CallControlsBar extends HookConsumerWidget { title: Text('callLeave').tr(), onTap: () { callNotifier.disconnect(); - Navigator.of(context).pop(); + GoRouter.of(context).pop(); }, ), ListTile( @@ -91,7 +91,7 @@ class CallControlsBar extends HookConsumerWidget { ); callNotifier.dispose(); if (context.mounted) { - Navigator.of(context).pop(); + GoRouter.of(context).pop(); } }, ),