Skip to content

Add paper count in feed #257

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

Merged
merged 1 commit into from
Oct 5, 2025
Merged

Add paper count in feed #257

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 8 additions & 0 deletions lib/l10n/app_en.arb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,14 @@
"@notificationTitleJournal": {},
"notificationTitleQuery": "Queries were updated",
"@notificationTitleQuery": {},
"numberPublications": "{count, plural, =0{No publications} =1{1 publication} other{{count} publications}}",
"@numberPublications": {
"placeholders": {
"count": {}
}
},
"showPublicationCount": "Show publication count",
"@showPublicationCount":{},
"selectFeed": "Select a feed",
"@selectFeed": {},
"createCustomFeed": "Create a custom feed",
Expand Down
140 changes: 100 additions & 40 deletions lib/screens/display_settings_screen.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,16 @@ class DisplaySettingsScreen extends StatefulWidget {
const DisplaySettingsScreen({super.key});

@override
_DisplaySettingsScreenState createState() => _DisplaySettingsScreenState();
DisplaySettingsScreenState createState() => DisplaySettingsScreenState();
}

class _DisplaySettingsScreenState extends State<DisplaySettingsScreen> {
class DisplaySettingsScreenState extends State<DisplaySettingsScreen> {
int _publicationCardOption = 1;
int _pdfThemeOption = 0;
int _pdfOrientationOption = 0;

bool _showPublicationCount = false;

final Map<String, String> _languageLabels = {
'en': 'English',
'fr': 'Français',
Expand Down Expand Up @@ -57,6 +59,7 @@ class _DisplaySettingsScreenState extends State<DisplaySettingsScreen> {
_loadPublicationCardOption();
_loadPdfThemeOption();
_loadPdfOrientationOption();
_loadShowPublicationCount();
}

void _loadPublicationCardOption() async {
Expand Down Expand Up @@ -91,6 +94,18 @@ class _DisplaySettingsScreenState extends State<DisplaySettingsScreen> {
prefs.setInt('pdfOrientationOption', value);
}

void _loadShowPublicationCount() async {
final prefs = await SharedPreferences.getInstance();
setState(() {
_showPublicationCount = prefs.getBool('showPublicationCount') ?? false;
});
}

void _saveShowPublicationCount(bool value) async {
final prefs = await SharedPreferences.getInstance();
prefs.setBool('showPublicationCount', value);
}

@override
Widget build(BuildContext context) {
final items = [
Expand All @@ -115,6 +130,14 @@ class _DisplaySettingsScreenState extends State<DisplaySettingsScreen> {
"subtitle": _getPdfOrientationSubtitle(_pdfOrientationOption),
"onTap": () => _showPdfOrientationDialog(context),
},
{
"icon": Icons.format_list_numbered,
"label": AppLocalizations.of(context)!.showPublicationCount,
"subtitle": _showPublicationCount
? AppLocalizations.of(context)!.enabled
: AppLocalizations.of(context)!.disabled,
"onTap": () => {},
},
{
"icon": Icons.article_outlined,
"label": AppLocalizations.of(context)!.publicationCard,
Expand Down Expand Up @@ -148,52 +171,89 @@ class _DisplaySettingsScreenState extends State<DisplaySettingsScreen> {
final double minTileHeight = 100;

return GridView.builder(
padding: const EdgeInsets.all(16),
gridDelegate: SliverGridDelegateWithFixedCrossAxisCount(
crossAxisCount: crossAxisCount,
mainAxisSpacing: 16,
crossAxisSpacing: 16,
childAspectRatio: tileWidth / minTileHeight,
),
itemCount: items.length,
itemBuilder: (context, index) {
final item = items[index];
return Card(
elevation: 2,
child: InkWell(
onTap: item["onTap"] as VoidCallback,
child: Padding(
padding: const EdgeInsets.symmetric(
horizontal: 16, vertical: 14),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisAlignment: MainAxisAlignment.center,
children: [
Row(
padding: const EdgeInsets.all(16),
gridDelegate: SliverGridDelegateWithFixedCrossAxisCount(
crossAxisCount: crossAxisCount,
mainAxisSpacing: 16,
crossAxisSpacing: 16,
childAspectRatio: tileWidth / minTileHeight,
),
itemCount: items.length,
itemBuilder: (context, index) {
final item = items[index];

// Publication count tile
if (item["label"] ==
AppLocalizations.of(context)!.showPublicationCount) {
return Card(
elevation: 2,
child: InkWell(
onTap: () {
setState(() =>
_showPublicationCount = !_showPublicationCount);
_saveShowPublicationCount(_showPublicationCount);
},
child: Padding(
padding: const EdgeInsets.symmetric(
horizontal: 16, vertical: 14),
child: Row(
children: [
Icon(item["icon"] as IconData),
const SizedBox(width: 8),
Expanded(child: Text(item["label"] as String)),
const SizedBox(width: 12),
Expanded(
child: Text(
item["label"] as String,
),
),
Switch(
value: _showPublicationCount,
onChanged: (value) {
setState(() => _showPublicationCount = value);
_saveShowPublicationCount(value);
},
),
],
),
if (item["subtitle"] != null)
Padding(
padding: const EdgeInsets.only(top: 8, left: 32),
child: Text(
item["subtitle"] as String,
style: const TextStyle(
fontSize: 13,
color: Colors.grey,
),
),
);
}

// Default tiles
return Card(
elevation: 2,
child: InkWell(
onTap: item["onTap"] as VoidCallback,
child: Padding(
padding: const EdgeInsets.symmetric(
horizontal: 16, vertical: 14),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisAlignment: MainAxisAlignment.center,
children: [
Row(
children: [
Icon(item["icon"] as IconData),
const SizedBox(width: 8),
Expanded(child: Text(item["label"] as String)),
],
),
if (item["subtitle"] != null)
Padding(
padding:
const EdgeInsets.only(top: 8, left: 32),
child: Text(
item["subtitle"] as String,
style: const TextStyle(
fontSize: 13, color: Colors.grey),
),
),
),
],
],
),
),
),
),
);
},
);
);
});
},
),
),
Expand Down
30 changes: 23 additions & 7 deletions lib/screens/home_screen.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@ class HomeScreen extends StatefulWidget {
const HomeScreen({super.key});

@override
_HomeScreenState createState() => _HomeScreenState();
HomeScreenState createState() => HomeScreenState();
}

class _HomeScreenState extends State<HomeScreen> {
class HomeScreenState extends State<HomeScreen> {
final logger = LogsService().logger;
final DatabaseHelper dbHelper = DatabaseHelper();
final StreamController<List<PublicationCard>> _feedStreamController =
Expand All @@ -34,6 +34,7 @@ class _HomeScreenState extends State<HomeScreen> {
int sortOrder = 1; // Set the default sort order to descending
int fetchIntervalInHours = 6; // Default to 6 hours for API fetch
int _concurrentFetches = 3; // Default to 3 concurrent requests
bool _showPublicationCount = false;
List<String> _currentJournalNames = [];

// Variables related to the search bar in the appbar
Expand All @@ -47,7 +48,7 @@ class _HomeScreenState extends State<HomeScreen> {

List<Map<String, dynamic>> savedQueries = [];
bool _feedLoaded = false; // Needed to avoid conflicts wih onAbstractChanged
bool _useAndFilter = true;
final bool _useAndFilter = true;

@override
void initState() {
Expand All @@ -73,6 +74,7 @@ class _HomeScreenState extends State<HomeScreen> {
setState(() {
fetchIntervalInHours = prefs.getInt('fetchInterval') ?? 6;
_concurrentFetches = prefs.getInt('concurrentFetches') ?? 3;
_showPublicationCount = prefs.getBool('showPublicationCount') ?? false;
});

final lastFeedName = prefs.getString('lastSelectedFeed');
Expand Down Expand Up @@ -351,7 +353,7 @@ class _HomeScreenState extends State<HomeScreen> {
.where((j) => j.dateFollowed == null)
.map((j) => j.title)
.toList();

if (!mounted) return;
showModalBottomSheet(
context: context,
isScrollControlled: true,
Expand Down Expand Up @@ -536,11 +538,25 @@ class _HomeScreenState extends State<HomeScreen> {
),
);
} else {
final feedItems = snapshot.data!;

return ListView.builder(
itemCount: snapshot.data!.length,
itemCount: feedItems.length + (_showPublicationCount ? 1 : 0),
cacheExtent: 1000.0,
itemBuilder: (context, index) {
return snapshot.data![index];
if (_showPublicationCount && index == 0) {
return Padding(
padding: const EdgeInsets.all(8.0),
child: Center(
child: Text(
AppLocalizations.of(context)!
.numberPublications(feedItems.length),
style: Theme.of(context).textTheme.titleMedium,
),
),
);
}
return feedItems[index - (_showPublicationCount ? 1 : 0)];
},
);
}
Expand Down Expand Up @@ -645,7 +661,7 @@ class _HomeScreenState extends State<HomeScreen> {
];

bool isEditing = false;

if (!mounted) return;
await showDialog<void>(
context: context,
builder: (context) {
Expand Down