Skip to content

New feed scroll and refresher #93

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
foucblg wants to merge 10 commits into
base: dev
Choose a base branch
from
Open

New feed scroll and refresher #93

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
f01f28a
new feed scroll
foucblg Sep 16, 2025
7edb266
useless import
foucblg Sep 16, 2025
663d548
add navbar after auto scrolling
foucblg Sep 16, 2025
7d499fa
remove useless Stack
foucblg Sep 16, 2025
558bc4b
better display navbar after scroll
foucblg Sep 16, 2025
7b1f03b
Go from feed to right advert element
foucblg Sep 16, 2025
6cf0bfc
add navbar management
foucblg Sep 16, 2025
0434d52
Edit refresher
foucblg Sep 16, 2025
bc8c72b
use hookbuilder to prevent opening error
foucblg Sep 16, 2025
96367ed
clear params after consumption
foucblg Sep 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
208 changes: 144 additions & 64 deletions lib/advert/ui/pages/main_page/main_page.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
import 'package:collection/collection.dart';
import 'package:flutter/material.dart';
import 'package:flutter_hooks/flutter_hooks.dart';
import 'package:heroicons/heroicons.dart';
import 'package:hooks_riverpod/hooks_riverpod.dart';
import 'package:scrollable_positioned_list/scrollable_positioned_list.dart';
import 'package:titan/admin/providers/is_admin_provider.dart';
import 'package:titan/advert/providers/advert_list_provider.dart';
import 'package:titan/advert/providers/advert_posters_provider.dart';
Expand All @@ -12,9 +14,10 @@ import 'package:titan/advert/router.dart';
import 'package:titan/advert/ui/components/association_bar.dart';
import 'package:titan/advert/ui/pages/main_page/advert_card.dart';
import 'package:titan/feed/providers/is_user_a_member_of_an_association.dart';
import 'package:titan/navigation/providers/navbar_visibility_provider.dart';
import 'package:titan/tools/constants.dart';
import 'package:titan/tools/providers/path_forwarding_provider.dart';
import 'package:titan/tools/ui/builders/async_child.dart';
import 'package:titan/tools/ui/layouts/refresher.dart';
import 'package:qlevar_router/qlevar_router.dart';

class AdvertMainPage extends HookConsumerWidget {
Expand All @@ -29,77 +32,154 @@ class AdvertMainPage extends HookConsumerWidget {
final selectedNotifier = ref.watch(selectedAssociationProvider.notifier);
final isAdvertAdmin = ref.watch(isUserAMemberOfAnAssociationProvider);
final isAdmin = ref.watch(isAdminProvider);
final pathForwarding = ref.watch(pathForwardingProvider);
final pathForwardingNotifier = ref.watch(pathForwardingProvider.notifier);
final advertId = pathForwarding.queryParameters?['advertId'];
final navbarVisibilityNotifier = ref.watch(
navbarVisibilityProvider.notifier,
);

final itemScrollController = ItemScrollController();
final itemPositionsListener = useMemoized(
() => ItemPositionsListener.create(),
);

useEffect(() {
WidgetsBinding.instance.addPostFrameCallback((_) {
pathForwardingNotifier.clearParams();
});
return null;
}, const []);

return AdvertTemplate(
child: Column(
children: [
Row(
children: [
Expanded(
child: const AssociationBar(
useUserAssociations: false,
multipleSelect: true,
child: RefreshIndicator(
color: ColorConstants.main,
onRefresh: () async {
await advertListNotifier.loadAdverts();
advertPostersNotifier.resetTData();
},
child: Column(
children: [
Row(
children: [
Expanded(
child: const AssociationBar(
useUserAssociations: false,
multipleSelect: true,
),
),
),

if (isAdmin || isAdvertAdmin) ...[
SizedBox(width: 5),
Container(
width: 2,
height: 60,
color: ColorConstants.secondary,
),
SizedBox(width: 5),
SpecialActionButton(
onTap: () {
selectedNotifier.clearAssociation();
QR.to(AdvertRouter.root + AdvertRouter.admin);
},
icon: HeroIcon(
HeroIcons.userGroup,
color: ColorConstants.background,
if (isAdmin || isAdvertAdmin) ...[
SizedBox(width: 5),
Container(
width: 2,
height: 60,
color: ColorConstants.secondary,
),
name: "Admin",
),
SizedBox(width: 10),
SizedBox(width: 5),
SpecialActionButton(
onTap: () {
selectedNotifier.clearAssociation();
QR.to(AdvertRouter.root + AdvertRouter.admin);
},
icon: HeroIcon(
HeroIcons.userGroup,
color: ColorConstants.background,
),
name: "Admin",
),
SizedBox(width: 10),
],
],
],
),
),

const SizedBox(height: 20),
const SizedBox(height: 20),

Expanded(
child: AsyncChild(
value: advertList,
builder: (context, advertData) {
final sortedAdvertData = advertData
.sortedBy((element) => element.date)
.reversed;
final filteredSortedAdvertData = sortedAdvertData.where(
(advert) =>
selected
.where((e) => advert.associationId == e.id)
.isNotEmpty ||
selected.isEmpty,
);
return Refresher(
controller: ScrollController(),
onRefresh: () async {
await advertListNotifier.loadAdverts();
advertPostersNotifier.resetTData();
},
child: Column(
children: [
...filteredSortedAdvertData.map(
(advert) => AdvertCard(advert: advert),
),
SizedBox(height: 80),
],
),
);
},
Expanded(
child: AsyncChild(
value: advertList,
builder: (context, adverts) {
return HookBuilder(
builder: (context) {
final sortedAdvertData = adverts
.sortedBy((element) => element.date)
.reversed;
final filteredSortedAdvertData = sortedAdvertData
.where(
(advert) =>
selected
.where((e) => advert.associationId == e.id)
.isNotEmpty ||
selected.isEmpty,
)
.toList();

final advertIndex = filteredSortedAdvertData.indexWhere(
(advert) => advert.id == advertId,
);
final lastFirstIndex = useRef<int?>(null);
if (advertIndex != -1) {
useEffect(() {
Future.microtask(() async {
if (itemScrollController.isAttached) {
await itemScrollController.scrollTo(
index: advertIndex,
duration: const Duration(milliseconds: 300),
);
navbarVisibilityNotifier.show();
}
});
void listener() {
final positions =
itemPositionsListener.itemPositions.value;
if (positions.isEmpty) return;
final visiblePositions = positions.where(
(p) =>
p.itemLeadingEdge >= 0 &&
p.itemLeadingEdge <= 1,
);

if (visiblePositions.isEmpty) return;

final firstVisible = visiblePositions.fold<int>(
999999,
(prev, e) => e.index < prev ? e.index : prev,
);

final lastIndex = lastFirstIndex.value;

if (lastIndex != null) {
if (firstVisible > lastIndex) {
navbarVisibilityNotifier.hide();
} else if (firstVisible < lastIndex) {
navbarVisibilityNotifier.show();
}
}

lastFirstIndex.value = firstVisible;
}

itemPositionsListener.itemPositions.addListener(
listener,
);
return () => itemPositionsListener.itemPositions
.removeListener(listener);
}, []);
}
return ScrollablePositionedList.builder(
itemCount: filteredSortedAdvertData.length,
itemBuilder: (context, index) =>
AdvertCard(advert: filteredSortedAdvertData[index]),
itemScrollController: itemScrollController,
itemPositionsListener: itemPositionsListener,
);
},
);
},
),
),
),
],
],
),
),
);
}
Expand Down
12 changes: 9 additions & 3 deletions lib/feed/class/news.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ class News {
final String module;
final String moduleObjectId;
final NewsStatus status;
final DateTime? displayDate;

const News({
required this.id,
Expand All @@ -24,6 +25,7 @@ class News {
required this.module,
required this.moduleObjectId,
required this.status,
this.displayDate,
});

News.fromJson(Map<String, dynamic> json)
Expand All @@ -38,7 +40,8 @@ class News {
: null,
module = json['module'],
moduleObjectId = json['module_object_id'],
status = stringToNewsStatus(json['status']);
status = stringToNewsStatus(json['status']),
displayDate = null;

Map<String, dynamic> toJson() {
return {
Expand Down Expand Up @@ -68,6 +71,7 @@ class News {
String? module,
String? moduleObjectId,
NewsStatus? status,
DateTime? displayDate,
}) {
return News(
id: id ?? this.id,
Expand All @@ -80,12 +84,13 @@ class News {
module: module ?? this.module,
moduleObjectId: moduleObjectId ?? this.moduleObjectId,
status: status ?? this.status,
displayDate: displayDate ?? this.displayDate,
);
}

@override
String toString() {
return 'News(id: $id, title: $title, start: $start, end: $end, entity: $entity, location: $location, actionStart: $actionStart, module: $module, moduleObjectId: $moduleObjectId, status: $status)';
return 'News(id: $id, title: $title, start: $start, end: $end, entity: $entity, location: $location, actionStart: $actionStart, module: $module, moduleObjectId: $moduleObjectId, status: $status, displayDate: $displayDate)';
}

News.empty()
Expand All @@ -98,5 +103,6 @@ class News {
actionStart = null,
module = '',
moduleObjectId = '',
status = NewsStatus.waitingApproval;
status = NewsStatus.waitingApproval,
displayDate = null;
}
5 changes: 4 additions & 1 deletion lib/feed/ui/pages/main_page/event_card.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,10 @@ class EventCard extends ConsumerWidget {
return GestureDetector(
onTap: () {
if (item.module == "advert") {
pathForwardingNotifier.forward(AdvertRouter.root);
pathForwardingNotifier.forward(
AdvertRouter.root,
queryParameters: {'advertId': item.moduleObjectId},
);
QR.to(AdvertRouter.root);
}
},
Expand Down
40 changes: 0 additions & 40 deletions lib/feed/ui/pages/main_page/feed_timeline.dart
View file
Open in desktop

This file was deleted.

Loading