* build: Reenable shrink resources and minify in gradle * build: (deps): bump image from 4.6.0 to 4.7.1 Bumps [image](https://github.com/brendan-duncan/image) from 4.6.0 to 4.7.1. - [Changelog](https://github.com/brendan-duncan/image/blob/main/CHANGELOG.md) - [Commits](https://github.com/brendan-duncan/image/commits) --- updated-dependencies: - dependency-name: image dependency-version: 4.7.1 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * build: (deps): bump file_picker from 10.3.7 to 10.3.8 Bumps [file_picker](https://github.com/miguelpruivo/flutter_file_picker) from 10.3.7 to 10.3.8. - [Release notes](https://github.com/miguelpruivo/flutter_file_picker/releases) - [Changelog](https://github.com/miguelpruivo/flutter_file_picker/blob/master/CHANGELOG.md) - [Commits](https://github.com/miguelpruivo/flutter_file_picker/compare/v10.3.7...v10.3.8) --- updated-dependencies: - dependency-name: file_picker dependency-version: 10.3.8 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> * feat: Improved search * build: Use matrix sdk vom pub.dev again * chore: Follow up better search * build: (deps): bump image from 4.7.1 to 4.7.2 Bumps [image](https://github.com/brendan-duncan/image) from 4.7.1 to 4.7.2. - [Changelog](https://github.com/brendan-duncan/image/blob/main/CHANGELOG.md) - [Commits](https://github.com/brendan-duncan/image/commits) --- updated-dependencies: - dependency-name: image dependency-version: 4.7.2 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> * chore: Make cross signing self sign mandatory for bootstrap * chore: Update user device keys before creating bootstrap * fix: Better wait for secrets after verification bootstrap * refactor: Remove native imaging and enable web worker * refactor: Remove unused html onfocus streams * build: (deps): bump flutter_foreground_task from 9.1.0 to 9.2.0 Bumps [flutter_foreground_task](https://github.com/Dev-hwang/flutter_foreground_task) from 9.1.0 to 9.2.0. - [Changelog](https://github.com/Dev-hwang/flutter_foreground_task/blob/master/CHANGELOG.md) - [Commits](https://github.com/Dev-hwang/flutter_foreground_task/commits) --- updated-dependencies: - dependency-name: flutter_foreground_task dependency-version: 9.2.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * chore(translations): Translated using Weblate (Uzbek) Currently translated at 99.7% (823 of 825 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/uz/ * chore(translations): Translated using Weblate (Russian) Currently translated at 99.8% (824 of 825 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/ru/ * chore(translations): Translated using Weblate (Norwegian Bokmål) Currently translated at 90.9% (750 of 825 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/nb_NO/ * chore(translations): Translated using Weblate (Galician) Currently translated at 100.0% (825 of 825 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/gl/ * chore(translations): Translated using Weblate (Basque) Currently translated at 99.7% (823 of 825 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/eu/ * chore(translations): Translated using Weblate (Ukrainian) Currently translated at 100.0% (825 of 825 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/uk/ * chore(translations): Translated using Weblate (Estonian) Currently translated at 100.0% (825 of 825 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/et/ * chore(translations): Translated using Weblate (Dutch) Currently translated at 100.0% (825 of 825 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/nl/ * chore(translations): Translated using Weblate (Russian) Currently translated at 100.0% (825 of 825 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/ru/ * chore(translations): Translated using Weblate (Spanish) Currently translated at 95.2% (788 of 827 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/es/ * chore(translations): Translated using Weblate (Spanish) Currently translated at 96.3% (797 of 827 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/es/ * chore(translations): Translated using Weblate (Russian) Currently translated at 100.0% (825 of 825 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/ru/ * chore(translations): Translated using Weblate (Russian) Currently translated at 100.0% (825 of 825 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/ru/ * fix: Broken ruzzian plurals * chore(translations): Translated using Weblate (Norwegian Bokmål) Currently translated at 91.2% (753 of 825 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/nb_NO/ * chore(translations): Translated using Weblate (Bengali) Currently translated at 4.5% (38 of 827 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/bn/ * chore(translations): Translated using Weblate (French) Currently translated at 82.3% (679 of 825 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/fr/ * build: (deps): bump translations_cleaner from 0.0.5 to 0.1.0 Bumps [translations_cleaner](https://github.com/Chinmay-KB/translations_cleaner) from 0.0.5 to 0.1.0. - [Changelog](https://github.com/Chinmay-KB/translations_cleaner/blob/main/CHANGELOG.md) - [Commits](https://github.com/Chinmay-KB/translations_cleaner/commits) --- updated-dependencies: - dependency-name: translations_cleaner dependency-version: 0.1.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * chore(translations): Translated using Weblate (German) Currently translated at 99.2% (821 of 827 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/de/ * chore(translations): Translated using Weblate (Estonian) Currently translated at 100.0% (827 of 827 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/et/ * build: Bump version to 2.4.0 * build: (deps): bump sqflite_common_ffi from 2.3.6 to 2.3.7+1 Bumps [sqflite_common_ffi](https://github.com/tekartik/sqflite) from 2.3.6 to 2.3.7+1. - [Commits](https://github.com/tekartik/sqflite/compare/sqflite_common_ffi_v2.3.6...sqflite_common_ffi/v2.3.7) --- updated-dependencies: - dependency-name: sqflite_common_ffi dependency-version: 2.3.7+1 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> * chore(translations): Translated using Weblate (Czech) Currently translated at 66.1% (547 of 827 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/cs/ * chore(translations): Translated using Weblate (Czech) Currently translated at 72.7% (602 of 827 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/cs/ * chore(translations): Translated using Weblate (German) Currently translated at 99.8% (826 of 827 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/de/ * chore: Add security.md file * fix: Locale unlocalized strings * build: (deps): bump matrix from 4.1.0 to 5.0.0 Bumps [matrix](https://github.com/famedly/matrix-dart-sdk) from 4.1.0 to 5.0.0. - [Release notes](https://github.com/famedly/matrix-dart-sdk/releases) - [Changelog](https://github.com/famedly/matrix-dart-sdk/blob/main/CHANGELOG.md) - [Commits](https://github.com/famedly/matrix-dart-sdk/compare/v4.1.0...v5.0.0) --- updated-dependencies: - dependency-name: matrix dependency-version: 5.0.0 dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> * fix: Notifications on web correctly managed when tab not focused * chore: Add changelog for android * chore: Remove duplicated localization * fix: Sign in label * chore: Versionize fcm shared isolate * build: Remove unused packag * build: (deps): bump package_info_plus from 8.3.1 to 9.0.0 Bumps [package_info_plus](https://github.com/fluttercommunity/plus_plugins/tree/main/packages/package_info_plus) from 8.3.1 to 9.0.0. - [Release notes](https://github.com/fluttercommunity/plus_plugins/releases) - [Commits](https://github.com/fluttercommunity/plus_plugins/commits/package_info_plus-v9.0.0/packages/package_info_plus) --- updated-dependencies: - dependency-name: package_info_plus dependency-version: 9.0.0 dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> * feat: Display particle animation on login page * chore: Use fixed version of fcm shared isolate * fix: apk crash on some platforms due new flutter version * chore: Correct kotlin format * fix iOS notifications * fluffychat merge * fluffychat merge * fluffychat merge * fluffychat merge * fluffychat merge * fluffychat merge * add missing type annotations * update matrix version * fluffychat merge * fluffychat merge * fix notification on click actions --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: Christian Kußowski <c.kussowski@famedly.com> Co-authored-by: Krille-chan <christian-kussowski@posteo.de> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: BeMeritus <bemerituss@gmail.com> Co-authored-by: Frank Paul Silye <frankps@gmail.com> Co-authored-by: josé m. <correoxm@disroot.org> Co-authored-by: xabirequejo <xabi.rn@gmail.com> Co-authored-by: Ihor Hordiichuk <igor_ck@outlook.com> Co-authored-by: Priit Jõerüüt <jrthwlate@users.noreply.hosted.weblate.org> Co-authored-by: Jelv <post@jelv.nl> Co-authored-by: Дмитрий Михирев <bizdelnick@gmail.com> Co-authored-by: Kimby <kimbyqs@gmail.com> Co-authored-by: Christian <christian-pauly@posteo.de> Co-authored-by: Kom nake <kominak310@svcache.com> Co-authored-by: hugues de keyzer <komputilisto@hugues.info> Co-authored-by: nautilusx <translate@disroot.org> Co-authored-by: Šebestová <ka.sebestova.cz@gmail.com>
327 lines
14 KiB
Dart
327 lines
14 KiB
Dart
import 'package:flutter/material.dart';
|
|
|
|
import 'package:badges/badges.dart' as b;
|
|
import 'package:go_router/go_router.dart';
|
|
import 'package:matrix/matrix.dart';
|
|
|
|
import 'package:fluffychat/config/themes.dart';
|
|
import 'package:fluffychat/l10n/l10n.dart';
|
|
import 'package:fluffychat/pages/chat_list/navi_rail_item.dart';
|
|
import 'package:fluffychat/pangea/analytics_misc/analytics_navigation_util.dart';
|
|
import 'package:fluffychat/pangea/chat_list/utils/chat_list_handle_space_tap.dart';
|
|
import 'package:fluffychat/pangea/course_plans/map_clipper.dart';
|
|
import 'package:fluffychat/pangea/extensions/pangea_room_extension.dart';
|
|
import 'package:fluffychat/utils/matrix_sdk_extensions/matrix_locals.dart';
|
|
import 'package:fluffychat/utils/stream_extension.dart';
|
|
import 'package:fluffychat/widgets/avatar.dart';
|
|
import 'package:fluffychat/widgets/matrix.dart';
|
|
|
|
class SpacesNavigationRail extends StatelessWidget {
|
|
final String? activeSpaceId;
|
|
// #Pangea
|
|
// final void Function() onGoToChats;
|
|
// final void Function(String) onGoToSpaceId;
|
|
final String? path;
|
|
final double railWidth;
|
|
final bool expanded;
|
|
final VoidCallback collapse;
|
|
final Profile? profile;
|
|
final Function(Profile) onProfileUpdate;
|
|
// Pangea#
|
|
|
|
const SpacesNavigationRail({
|
|
required this.activeSpaceId,
|
|
// #Pangea
|
|
// required this.onGoToChats,
|
|
// required this.onGoToSpaceId,
|
|
required this.path,
|
|
required this.railWidth,
|
|
required this.collapse,
|
|
required this.onProfileUpdate,
|
|
this.expanded = false,
|
|
this.profile,
|
|
// Pangea#
|
|
super.key,
|
|
});
|
|
|
|
@override
|
|
Widget build(BuildContext context) {
|
|
final client = Matrix.of(context).client;
|
|
final isSettings = GoRouter.of(
|
|
context,
|
|
).routeInformationProvider.value.uri.path.startsWith('/rooms/settings');
|
|
// #Pangea
|
|
final isAnalytics = path?.contains('analytics') ?? false;
|
|
final isCourse = path?.contains('course') ?? false;
|
|
final isColumnMode = FluffyThemes.isColumnMode(context);
|
|
|
|
final width = isColumnMode
|
|
? FluffyThemes.navRailWidth
|
|
: FluffyThemes.navRailWidth - 8.0;
|
|
// return StreamBuilder(
|
|
return Material(
|
|
child: SafeArea(
|
|
child: StreamBuilder(
|
|
// Pangea#
|
|
key: ValueKey(client.userID.toString()),
|
|
stream: client.onSync.stream
|
|
.where((s) => s.hasRoomUpdate)
|
|
.rateLimit(const Duration(seconds: 1)),
|
|
builder: (context, _) {
|
|
final allSpaces = client.rooms
|
|
.where((room) => room.isSpace)
|
|
.toList();
|
|
|
|
// #Pangea
|
|
// return SizedBox(
|
|
return AnimatedContainer(
|
|
// width: FluffyThemes.navRailWidth,
|
|
width: railWidth,
|
|
duration: FluffyThemes.animationDuration,
|
|
// Pangea#
|
|
child: Column(
|
|
// #Pangea
|
|
crossAxisAlignment: CrossAxisAlignment.start,
|
|
// Pangea#
|
|
children: [
|
|
Expanded(
|
|
child: ListView.builder(
|
|
scrollDirection: Axis.vertical,
|
|
// #Pangea
|
|
// itemCount: allSpaces.length + 2,
|
|
itemCount: allSpaces.length + 3,
|
|
// Pangea#
|
|
itemBuilder: (context, i) {
|
|
// #Pangea
|
|
if (i == 0) {
|
|
return NaviRailItem(
|
|
isSelected: isAnalytics,
|
|
onTap: () {
|
|
collapse();
|
|
AnalyticsNavigationUtil.navigateToAnalytics(
|
|
context: context,
|
|
);
|
|
},
|
|
backgroundColor: Colors.transparent,
|
|
icon: FutureBuilder<Profile>(
|
|
// #Pangea
|
|
initialData: profile,
|
|
// Pangea#
|
|
future: client.fetchOwnProfile(),
|
|
// #Pangea
|
|
// builder: (context, snapshot) => Stack(
|
|
builder: (context, snapshot) {
|
|
if (snapshot.data?.avatarUrl != null &&
|
|
snapshot.data?.avatarUrl !=
|
|
profile?.avatarUrl) {
|
|
WidgetsBinding.instance.addPostFrameCallback(
|
|
(_) => onProfileUpdate(snapshot.data!),
|
|
);
|
|
}
|
|
return Stack(
|
|
// Pangea#
|
|
alignment: Alignment.center,
|
|
children: [
|
|
Material(
|
|
color: Colors.transparent,
|
|
borderRadius: BorderRadius.circular(99),
|
|
child: Avatar(
|
|
mxContent: snapshot.data?.avatarUrl,
|
|
name:
|
|
snapshot.data?.displayName ??
|
|
client.userID!.localpart,
|
|
size:
|
|
width -
|
|
(isColumnMode ? 32.0 : 24.0),
|
|
),
|
|
),
|
|
],
|
|
);
|
|
},
|
|
),
|
|
toolTip: L10n.of(context).home,
|
|
// #Pangea
|
|
expanded: expanded,
|
|
// Pangea#
|
|
);
|
|
}
|
|
i--;
|
|
// Pangea#
|
|
if (i == 0) {
|
|
return NaviRailItem(
|
|
// #Pangea
|
|
// isSelected: activeSpaceId == null && !isSettings,
|
|
isSelected:
|
|
activeSpaceId == null &&
|
|
!isSettings &&
|
|
!isAnalytics &&
|
|
!isCourse,
|
|
// onTap: onGoToChats,
|
|
// icon: const Padding(
|
|
// padding: EdgeInsets.all(10.0),
|
|
// child: Icon(Icons.forum_outlined),
|
|
// ),
|
|
// selectedIcon: const Padding(
|
|
// padding: EdgeInsets.all(10.0),
|
|
// child: Icon(Icons.forum),
|
|
// ),
|
|
// toolTip: L10n.of(context).chats,
|
|
// unreadBadgeFilter: (room) => true,
|
|
icon: const Icon(Icons.forum_outlined),
|
|
selectedIcon: const Icon(Icons.forum),
|
|
onTap: () {
|
|
collapse();
|
|
context.go("/rooms");
|
|
},
|
|
toolTip: L10n.of(context).allChats,
|
|
unreadBadgeFilter: (room) =>
|
|
room.firstSpaceParent == null,
|
|
expanded: expanded,
|
|
// Pangea#
|
|
);
|
|
}
|
|
i--;
|
|
if (i == allSpaces.length) {
|
|
return NaviRailItem(
|
|
// #Pangea
|
|
// isSelected: false,
|
|
// onTap: () => context.go('/rooms/newspace'),
|
|
// icon: const Padding(
|
|
// padding: EdgeInsets.all(8.0),
|
|
// child: Icon(Icons.add),
|
|
// ),
|
|
// toolTip: L10n.of(context).createNewSpace,
|
|
backgroundColor: Colors.transparent,
|
|
borderRadius: BorderRadius.circular(0),
|
|
isSelected: isCourse,
|
|
onTap: () {
|
|
collapse();
|
|
context.go('/rooms/course');
|
|
},
|
|
icon: ClipPath(
|
|
clipper: MapClipper(),
|
|
child: Container(
|
|
width: width - (isColumnMode ? 32.0 : 24.0),
|
|
height: width - (isColumnMode ? 32.0 : 24.0),
|
|
color: isCourse
|
|
? Theme.of(
|
|
context,
|
|
).colorScheme.primaryContainer
|
|
: Theme.of(
|
|
context,
|
|
).colorScheme.surfaceContainerHigh,
|
|
child: const Icon(Icons.add),
|
|
),
|
|
),
|
|
toolTip: L10n.of(context).findCourse,
|
|
expanded: expanded,
|
|
// Pangea#
|
|
);
|
|
}
|
|
final space = allSpaces[i];
|
|
final displayname = allSpaces[i]
|
|
.getLocalizedDisplayname(
|
|
MatrixLocals(L10n.of(context)),
|
|
);
|
|
final spaceChildrenIds = space.spaceChildren
|
|
.map((c) => c.roomId)
|
|
.toSet();
|
|
return NaviRailItem(
|
|
toolTip: displayname,
|
|
isSelected: activeSpaceId == space.id,
|
|
// #Pangea
|
|
backgroundColor: Colors.transparent,
|
|
borderRadius: BorderRadius.circular(0),
|
|
// onTap: () => onGoToSpaceId(allSpaces[i].id),
|
|
onTap: () {
|
|
collapse();
|
|
final room = client.getRoomById(allSpaces[i].id);
|
|
if (room != null) {
|
|
chatListHandleSpaceTap(context, room);
|
|
} else {
|
|
context.go(
|
|
"/rooms/spaces/${allSpaces[i].id}/details",
|
|
);
|
|
}
|
|
},
|
|
// Pangea#
|
|
unreadBadgeFilter: (room) =>
|
|
spaceChildrenIds.contains(room.id),
|
|
// #Pangea
|
|
// icon: Avatar(
|
|
// mxContent: allSpaces[i].avatar,
|
|
// name: displayname,
|
|
// border: BorderSide(
|
|
// width: 1,
|
|
// color: Theme.of(context).dividerColor,
|
|
// ),
|
|
// borderRadius: BorderRadius.circular(
|
|
// AppConfig.borderRadius / 2,
|
|
// ),
|
|
// ),
|
|
icon: b.Badge(
|
|
showBadge:
|
|
allSpaces[i].membership == Membership.invite,
|
|
badgeStyle: b.BadgeStyle(
|
|
badgeColor: Theme.of(context).colorScheme.error,
|
|
elevation: 4,
|
|
borderSide: BorderSide.none,
|
|
padding: const EdgeInsetsGeometry.all(0),
|
|
),
|
|
badgeContent: Icon(
|
|
Icons.error_outline,
|
|
color: Theme.of(context).colorScheme.onPrimary,
|
|
size: 16,
|
|
),
|
|
position: b.BadgePosition.topEnd(top: -5, end: -7),
|
|
child: ClipPath(
|
|
clipper: MapClipper(),
|
|
child: Avatar(
|
|
mxContent: allSpaces[i].avatar,
|
|
name: displayname,
|
|
border: BorderSide(
|
|
width: 1,
|
|
color: Theme.of(context).dividerColor,
|
|
),
|
|
borderRadius: BorderRadius.circular(0),
|
|
size: width - (isColumnMode ? 32.0 : 24.0),
|
|
),
|
|
),
|
|
),
|
|
expanded: expanded,
|
|
// Pangea#
|
|
);
|
|
},
|
|
),
|
|
),
|
|
NaviRailItem(
|
|
isSelected: isSettings,
|
|
// #Pangea
|
|
// onTap: () => context.go('/rooms/settings'),
|
|
// icon: const Padding(
|
|
// padding: EdgeInsets.all(10.0),
|
|
// child: Icon(Icons.settings_outlined),
|
|
// ),
|
|
// selectedIcon: const Padding(
|
|
// padding: EdgeInsets.all(10.0),
|
|
// child: Icon(Icons.settings),
|
|
// ),
|
|
onTap: () {
|
|
collapse();
|
|
context.go('/rooms/settings');
|
|
},
|
|
icon: const Icon(Icons.settings_outlined),
|
|
selectedIcon: const Icon(Icons.settings),
|
|
expanded: expanded,
|
|
// Pangea#
|
|
toolTip: L10n.of(context).settings,
|
|
),
|
|
],
|
|
),
|
|
);
|
|
},
|
|
),
|
|
),
|
|
);
|
|
}
|
|
}
|