diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 7a099068..6f7a6336 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -10,6 +10,8 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
+ - name: Install Ninja
+ run: sudo apt-get install -y ninja-build
- uses: actions/setup-java@v4
with:
distribution: 'zulu'
diff --git a/README.md b/README.md
index dd04692e..29187af1 100644
--- a/README.md
+++ b/README.md
@@ -19,14 +19,19 @@
## Screenshots
-| Followed journals (dark) | Search results (light) | Journal details (light) | Abstract (dark) |
-|----------------------------------------------------|---------------------------------------------------------|--------------------------------------------------------------|----------------------------------------------------|
-|  |  |  |  |
+
+| Home screen (light) | Search screen (light) | Journals screen(dark) |
+|---------------------------------------------------|------------------------------------------------------|---------------------------------------------------------|
+|  |  |  |
+
+| Queries screen (dark) | Journal latest works (dark) | Abstract (dark) |
+|---------------------------------------------------|------------------------------------------------------|---------------------------------------------------------|
+|  |  |  |
## Description
-Wispar is a user-friendly and privacy-friendly Android/iOS app that seamlessly searches scientific journals using the Crossref API. Stay updated on your preferred journals by following them and receive new article abstracts in your main feed. No account required. The integration of Unpaywall ensures convenient access to open-access articles, while EZproxy helps overcome subscription barriers.
+Wispar is a user-friendly and privacy-friendly Android/iOS app that seamlessly searches scientific journals and articles using the Crossref API. Stay updated on your preferred journals by following them and receive new article abstracts in your main feed. No account required. The integration of Unpaywall ensures convenient access to open-access articles, while EZproxy helps overcome subscription barriers.
Wispar is still under development and is not ready yet. APK files can be obtained from the workflow artifacts (must be signed in).
@@ -34,6 +39,7 @@ Wispar is a user-friendly and privacy-friendly Android/iOS app that seamlessly s
## Features overview
- [x] Search and follow journals
+ - [x] Search for articles and save the queries for easy access later
- [x] Download articles for offline access *
- [x] EZproxy and Unpaywall integration
- [x] Send articles to Zotero
@@ -45,9 +51,11 @@ Wispar is a user-friendly and privacy-friendly Android/iOS app that seamlessly s
Wispar uses Weblate to manage translations. You can find the hosted instance at https://hosted.weblate.org/engage/wispar/
-Translation status:
-
+A huge thank you to Weblate for hosting the translations for free :heart:
+
+Translation status:
+
diff --git a/android/app/build.gradle b/android/app/build.gradle
index e139288a..50446f4e 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -25,7 +25,7 @@ if (flutterVersionName == null) {
android {
namespace "app.wispar.wispar"
compileSdkVersion 34
- ndkVersion "25.1.8937393"
+ ndkVersion "27.0.12077973"
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
diff --git a/ios/Runner/Info.plist b/ios/Runner/Info.plist
index f1eea43b..0a051e8d 100644
--- a/ios/Runner/Info.plist
+++ b/ios/Runner/Info.plist
@@ -2,6 +2,8 @@
+ CADisableMinimumFrameDurationOnPhone
+
CFBundleDevelopmentRegion
$(DEVELOPMENT_LANGUAGE)
CFBundleDisplayName
@@ -24,6 +26,8 @@
$(FLUTTER_BUILD_NUMBER)
LSRequiresIPhoneOS
+ UIApplicationSupportsIndirectInputEvents
+
UILaunchStoryboardName
LaunchScreen
UIMainStoryboardFile
@@ -41,9 +45,5 @@
UIInterfaceOrientationLandscapeLeft
UIInterfaceOrientationLandscapeRight
- CADisableMinimumFrameDurationOnPhone
-
- UIApplicationSupportsIndirectInputEvents
-
diff --git a/lib/l10n/app_en.arb b/lib/l10n/app_en.arb
index 3b67f8ca..fedcdb5e 100644
--- a/lib/l10n/app_en.arb
+++ b/lib/l10n/app_en.arb
@@ -31,13 +31,18 @@
"@unfollow": {
"description": "The button text shown on journal cards when it is followed."
},
+ "library": "Library",
+ "@library": {
+ "description": "The library menu button and the app bar title when in the library screen."
+ },
+
"journals": "Journals",
"@journals": {
"description": "The journals menu button and the app bar title when in the journals screen."
},
- "search": "Search…",
+ "search": "Search",
"@search": {
- "description": "Placeholder text shown inside the search bar."
+ "description": "Text shown inside the search screen app bar and for the seach button."
},
"publisher": "Publisher",
"@publisher": {},
diff --git a/lib/main.dart b/lib/main.dart
index 92700bcb..f7f7bb70 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -5,8 +5,9 @@ import 'package:flutter_gen/gen_l10n/app_localizations.dart';
import 'package:salomon_bottom_bar/salomon_bottom_bar.dart';
import 'theme_provider.dart';
import 'screens/home_screen.dart';
+import 'screens/search_screen.dart';
import 'screens/favorites_screen.dart';
-import 'screens/journals_screen.dart';
+import 'screens/library_screen.dart';
import 'screens/downloads_screen.dart';
void main() {
@@ -34,6 +35,7 @@ class _WisparState extends State {
var _currentIndex = 0;
final List _pages = [
const HomeScreen(),
+ const SearchScreen(),
const LibraryScreen(),
const FavoritesScreen(),
const DownloadsScreen(),
@@ -42,8 +44,10 @@ class _WisparState extends State {
switch (key) {
case 'home':
return AppLocalizations.of(context)!.home;
- case 'journals':
- return AppLocalizations.of(context)!.journals;
+ case 'search':
+ return AppLocalizations.of(context)!.search;
+ case 'library':
+ return AppLocalizations.of(context)!.library;
case 'favorites':
return AppLocalizations.of(context)!.favorites;
case 'downloads':
@@ -99,8 +103,13 @@ class _WisparState extends State {
selectedColor: Colors.deepPurpleAccent,
),
SalomonBottomBarItem(
- icon: const Icon(Icons.library_books_outlined),
- title: Text(getLocalizedText(bottomBarContext, 'journals')),
+ icon: const Icon(Icons.search_outlined),
+ title: Text(getLocalizedText(bottomBarContext, 'search')),
+ selectedColor: Colors.deepPurpleAccent,
+ ),
+ SalomonBottomBarItem(
+ icon: const Icon(Icons.my_library_books_outlined),
+ title: Text(getLocalizedText(bottomBarContext, 'library')),
selectedColor: Colors.deepPurpleAccent,
),
SalomonBottomBarItem(
diff --git a/lib/models/crossref_journals_models.dart b/lib/models/crossref_journals_models.dart
index aa94cbbf..99cc5dc9 100644
--- a/lib/models/crossref_journals_models.dart
+++ b/lib/models/crossref_journals_models.dart
@@ -78,7 +78,6 @@ class Item {
String publisher;
Map coverage;
String title;
- List subjects;
CoverageType coverageType;
Map flags;
List issn;
@@ -91,7 +90,6 @@ class Item {
required this.publisher,
required this.coverage,
required this.title,
- required this.subjects,
required this.coverageType,
required this.flags,
required this.issn,
@@ -99,21 +97,20 @@ class Item {
});
factory Item.fromJson(Map json) => Item(
- lastStatusCheckTime: json["last-status-check-time"],
- counts: Counts.fromJson(json["counts"]),
- breakdowns: Breakdowns.fromJson(json["breakdowns"]),
- publisher: json["publisher"],
- coverage: Map.from(json["coverage"])
- .map((k, v) => MapEntry(k, v?.toDouble())),
- title: json["title"],
- subjects: List.from(
- json["subjects"].map((x) => Subject.fromJson(x))),
- coverageType: CoverageType.fromJson(json["coverage-type"]),
- flags:
- Map.from(json["flags"]).map((k, v) => MapEntry(k, v)),
- issn: List.from(json["ISSN"].map((x) => x)),
+ lastStatusCheckTime: json["last-status-check-time"] ?? 0,
+ counts: Counts.fromJson(json["counts"] ?? {}),
+ breakdowns: Breakdowns.fromJson(json["breakdowns"] ?? {}),
+ publisher: json["publisher"] ?? "Unknown",
+ coverage: Map.from(json["coverage"] ?? {})
+ .map((k, v) => MapEntry(k, (v ?? 0).toDouble())),
+ title: json["title"] ?? "Untitled",
+ coverageType: CoverageType.fromJson(json["coverage-type"] ?? {}),
+ flags: Map.from(json["flags"] ?? {})
+ .map((k, v) => MapEntry(k, v ?? false)),
+ issn: List.from(json["ISSN"]?.map((x) => x) ?? []),
issnType: List.from(
- json["issn-type"].map((x) => IssnType.fromJson(x))),
+ (json["issn-type"] ?? []).map((x) => IssnType.fromJson(x)),
+ ),
);
Map toJson() => {
@@ -124,7 +121,6 @@ class Item {
"coverage":
Map.from(coverage).map((k, v) => MapEntry(k, v)),
"title": title,
- "subjects": List.from(subjects.map((x) => x.toJson())),
"coverage-type": coverageType.toJson(),
"flags": Map.from(flags).map((k, v) => MapEntry(k, v)),
"ISSN": List.from(issn.map((x) => x)),
@@ -140,8 +136,10 @@ class Breakdowns {
});
factory Breakdowns.fromJson(Map json) => Breakdowns(
- doisByIssuedYear: List>.from(json["dois-by-issued-year"]
- .map((x) => List.from(x.map((x) => x)))),
+ doisByIssuedYear: List>.from(
+ (json["dois-by-issued-year"] ?? [])
+ .map((x) => List.from(x.map((x) => x ?? 0))),
+ ),
);
Map toJson() => {
@@ -162,9 +160,9 @@ class Counts {
});
factory Counts.fromJson(Map json) => Counts(
- currentDois: json["current-dois"],
- backfileDois: json["backfile-dois"],
- totalDois: json["total-dois"],
+ currentDois: json["current-dois"] ?? 0,
+ backfileDois: json["backfile-dois"] ?? 0,
+ totalDois: json["total-dois"] ?? 0,
);
Map toJson() => {
@@ -186,12 +184,12 @@ class CoverageType {
});
factory CoverageType.fromJson(Map json) => CoverageType(
- all: Map.from(json["all"])
- .map((k, v) => MapEntry(k, v?.toDouble())),
- backfile: Map.from(json["backfile"])
- .map((k, v) => MapEntry(k, v?.toDouble())),
- current: Map.from(json["current"])
- .map((k, v) => MapEntry(k, v?.toDouble())),
+ all: Map.from(json["all"] ?? {})
+ .map((k, v) => MapEntry(k, (v ?? 0).toDouble())),
+ backfile: Map.from(json["backfile"] ?? {})
+ .map((k, v) => MapEntry(k, (v ?? 0).toDouble())),
+ current: Map.from(json["current"] ?? {})
+ .map((k, v) => MapEntry(k, (v ?? 0).toDouble())),
);
Map toJson() => {
@@ -213,8 +211,8 @@ class IssnType {
});
factory IssnType.fromJson(Map json) => IssnType(
- value: json["value"],
- type: typeValues.map[json["type"]]!,
+ value: json["value"] ?? "",
+ type: typeValues.map[json["type"]] ?? Type.ELECTRONIC,
);
Map toJson() => {
@@ -228,26 +226,6 @@ enum Type { ELECTRONIC, PRINT }
final typeValues =
EnumValues({"electronic": Type.ELECTRONIC, "print": Type.PRINT});
-class Subject {
- int asjc;
- String name;
-
- Subject({
- required this.asjc,
- required this.name,
- });
-
- factory Subject.fromJson(Map json) => Subject(
- asjc: json["ASJC"],
- name: json["name"],
- );
-
- Map toJson() => {
- "ASJC": asjc,
- "name": name,
- };
-}
-
class Query {
int startIndex;
String searchTerms;
@@ -258,8 +236,8 @@ class Query {
});
factory Query.fromJson(Map json) => Query(
- startIndex: json["start-index"],
- searchTerms: json["search-terms"],
+ startIndex: json["start-index"] ?? 0,
+ searchTerms: json["search-terms"] ?? "",
);
Map toJson() => {
diff --git a/lib/models/crossref_journals_works_models.dart b/lib/models/crossref_journals_works_models.dart
index 86078ffe..c1312c2f 100644
--- a/lib/models/crossref_journals_works_models.dart
+++ b/lib/models/crossref_journals_works_models.dart
@@ -77,6 +77,7 @@ class Item {
final String primaryUrl;
final String license;
final String licenseName;
+ final String issn;
Item({
required this.publisher,
@@ -90,6 +91,7 @@ class Item {
required this.primaryUrl,
required this.license,
required this.licenseName,
+ required this.issn,
});
factory Item.fromJson(Map json) {
@@ -102,16 +104,23 @@ class Item {
String licenseUrl = '';
String licenseName = '';
- if (json.containsKey('license')) {
- if (json['license'] != null &&
- json['license'] is List &&
- (json['license'] as List).isNotEmpty) {
- licenseUrl = json['license'][0]['URL'] ?? '';
+
+ // Check if 'license' is available in the JSON and is a non-empty list
+ if (json.containsKey('license') &&
+ json['license'] is List &&
+ (json['license'] as List).isNotEmpty) {
+ final licenseData = json['license'][0];
+ if (licenseData is Map &&
+ licenseData.containsKey('URL')) {
+ licenseUrl = licenseData['URL'];
licenseName = licenseNames[normalizeLicenseUrl(licenseUrl)] ?? '';
}
- } else {
- licenseUrl = '';
- licenseName = '';
+ }
+
+ String journalTitle = '';
+ if (json['container-title'] is List &&
+ (json['container-title'] as List).isNotEmpty) {
+ journalTitle = (json['container-title'] as List).first ?? '';
}
return Item(
@@ -119,15 +128,14 @@ class Item {
abstract: _cleanAbstract(json['abstract'] ?? ''),
title: _extractTitle(json['title']),
publishedDate: _parseDate(json['created']),
- journalTitle: (json['container-title'] as List).isNotEmpty
- ? (json['container-title'] as List).first ?? ''
- : '',
+ journalTitle: journalTitle,
doi: json['DOI'] ?? '',
authors: authors,
url: json['URL'] ?? '',
primaryUrl: json['resource']['primary']['URL'] ?? '',
license: licenseUrl,
licenseName: licenseName,
+ issn: json['issn'] ?? '',
);
}
static Map licenseNames = {
@@ -151,7 +159,17 @@ class Item {
'https://opensource.org/licenses/Apache-2.0': 'Apache License 2.0',
'https://www.elsevier.com/tdm/userlicense/1.0':
'Elsevier Text and Data Mining (TDM) License',
- 'https://www.springer.com/tdm': 'Springer Nature TDM policy'
+ 'https://www.springer.com/tdm': 'Springer Nature TDM policy',
+ 'https://www.springernature.com/gp/researchers/text-and-data-mining':
+ 'Springer Nature TDM policy',
+ 'https://onlinelibrary.wiley.com/termsAndConditions#vor':
+ 'Wiley Online Library Terms of Use',
+ 'https://doi.wiley.com/10.1002/tdm_license_1.1': 'Wiley TDM policy',
+ 'https://iopscience.iop.org/page/copyright': 'IOP copyright protection',
+ 'https://ieeexplore.ieee.org/Xplorehelp/downloads/license-information/IEEE.html':
+ 'IEE copyright policy',
+ 'https://creativecommons.org/licenses/by-nc-nd/4.0':
+ 'Creative Commons Attribution-NonCommercial-Nonderivatives 4.0 International'
};
static String _cleanAbstract(String rawAbstract) {
rawAbstract = rawAbstract
@@ -165,10 +183,8 @@ class Item {
static String _extractTitle(dynamic title) {
// Extract the title if it's not null and is a non-empty list
- return (title != null &&
- title is List &&
- (title as List).isNotEmpty)
- ? (title as List).first ?? ''
+ return title != null && title is List && (title.isNotEmpty)
+ ? title.first ?? ''
: '';
}
diff --git a/lib/models/journal_entity.dart b/lib/models/journal_entity.dart
index 94d492c6..24801167 100644
--- a/lib/models/journal_entity.dart
+++ b/lib/models/journal_entity.dart
@@ -3,7 +3,6 @@ class Journal {
final String issn;
final String title;
final String publisher;
- final String subjects;
final String? dateFollowed;
final String? lastUpdated;
@@ -12,7 +11,6 @@ class Journal {
required this.issn,
required this.title,
required this.publisher,
- required this.subjects,
this.dateFollowed,
this.lastUpdated,
});
@@ -22,7 +20,6 @@ class Journal {
'issn': issn,
'title': title,
'publisher': publisher,
- 'subjects': subjects,
'dateFollowed': DateTime.now().toIso8601String().substring(0, 10),
'lastUpdated': lastUpdated,
};
diff --git a/lib/screens/article_screen.dart b/lib/screens/article_screen.dart
index 52241509..afabcd88 100644
--- a/lib/screens/article_screen.dart
+++ b/lib/screens/article_screen.dart
@@ -120,8 +120,6 @@ class _ArticleScreenState extends State {
if (journalInfo != null) {
String journalPublisher =
journalInfo['publisher'];
- List journalSubjects =
- (journalInfo['subjects'] ?? '').split(',');
Navigator.push(
context,
@@ -130,7 +128,6 @@ class _ArticleScreenState extends State {
title: widget.journalTitle,
publisher: journalPublisher,
issn: widget.issn,
- subjects: journalSubjects,
),
),
);
@@ -295,7 +292,7 @@ class _ArticleScreenState extends State {
final db = await databaseHelper.database;
final List> rows = await db.query(
'journals',
- columns: ['publisher', 'subjects'],
+ columns: ['publisher'],
where: 'issn = ?',
whereArgs: [issn],
);
diff --git a/lib/screens/article_search_results_screen.dart b/lib/screens/article_search_results_screen.dart
new file mode 100644
index 00000000..d99628ad
--- /dev/null
+++ b/lib/screens/article_search_results_screen.dart
@@ -0,0 +1,113 @@
+import 'package:flutter/material.dart';
+import '../widgets/publication_card.dart';
+import '../models/crossref_journals_works_models.dart' as journalsWorks;
+import '../services/crossref_api.dart';
+
+class ArticleSearchResultsScreen extends StatefulWidget {
+ final List initialSearchResults;
+ final bool initialHasMore;
+ final Map queryParams;
+
+ const ArticleSearchResultsScreen({
+ Key? key,
+ required this.initialSearchResults,
+ required this.initialHasMore,
+ required this.queryParams,
+ }) : super(key: key);
+
+ @override
+ _ArticleSearchResultsScreenState createState() =>
+ _ArticleSearchResultsScreenState();
+}
+
+class _ArticleSearchResultsScreenState
+ extends State {
+ late List _searchResults;
+ final ScrollController _scrollController = ScrollController();
+ bool _isLoadingMore = false;
+ bool _hasMoreResults = true;
+
+ @override
+ void initState() {
+ super.initState();
+ _searchResults = widget.initialSearchResults;
+
+ _scrollController.addListener(() {
+ if (_scrollController.position.pixels >=
+ _scrollController.position.maxScrollExtent - 70 &&
+ !_isLoadingMore &&
+ _hasMoreResults) {
+ _loadMoreResults();
+ }
+ });
+ }
+
+ Future _loadMoreResults() async {
+ if (_isLoadingMore) return; // Prevent multiple API calls
+
+ _isLoadingMore = true;
+
+ try {
+ final ListAndMore newResults =
+ await CrossRefApi.getWorksByQuery(widget.queryParams);
+
+ setState(() {
+ _searchResults.addAll(newResults.list);
+ _hasMoreResults = newResults.hasMore;
+ });
+ } catch (e) {
+ ScaffoldMessenger.of(context).showSnackBar(
+ SnackBar(content: Text('Failed to load more results')),
+ );
+ } finally {
+ _isLoadingMore = false;
+ }
+ }
+
+ @override
+ void dispose() {
+ _scrollController.dispose();
+ super.dispose();
+ }
+
+ @override
+ Widget build(BuildContext context) {
+ return Scaffold(
+ appBar: AppBar(
+ title: Text('Search results'),
+ ),
+ body: _searchResults.isNotEmpty
+ ? ListView.builder(
+ controller: _scrollController,
+ itemCount: _searchResults.length + (_hasMoreResults ? 1 : 0),
+ itemBuilder: (context, index) {
+ if (index == _searchResults.length) {
+ return Center(
+ child: Padding(
+ padding: const EdgeInsets.all(8.0),
+ child: CircularProgressIndicator(),
+ ),
+ );
+ }
+
+ final item = _searchResults[index];
+ return PublicationCard(
+ title: item.title,
+ abstract: item.abstract,
+ journalTitle: item.journalTitle,
+ issn: item.issn,
+ publishedDate: item.publishedDate,
+ doi: item.doi,
+ authors: item.authors,
+ url: item.url,
+ license: item.license,
+ licenseName: item.licenseName,
+ );
+ },
+ )
+ : Center(
+ child: Text('No results found'),
+ ),
+ );
+ }
+}
diff --git a/lib/screens/home_screen.dart b/lib/screens/home_screen.dart
index 9c9b674a..dc6455d1 100644
--- a/lib/screens/home_screen.dart
+++ b/lib/screens/home_screen.dart
@@ -31,13 +31,13 @@ class _HomeScreenState extends State {
centerTitle: false,
title: Text(AppLocalizations.of(context)!.home),
actions: [
- IconButton(
- icon: const Icon(Icons.search),
+ /*IconButton(
+ icon: const Icon(Icons.filter_alt_outlined),
//tooltip: 'Settings',
onPressed: () {
//_openSettingsScreen(context);
},
- ),
+ ),*/
PopupMenuButton(
icon: Icon(Icons.more_vert),
onSelected: (item) => handleMenuButton(item),
diff --git a/lib/screens/journals_details_screen.dart b/lib/screens/journals_details_screen.dart
index 781e76e2..70d8b6fd 100644
--- a/lib/screens/journals_details_screen.dart
+++ b/lib/screens/journals_details_screen.dart
@@ -10,14 +10,12 @@ class JournalDetailsScreen extends StatefulWidget {
final String title;
final String publisher;
final String issn;
- final List subjects;
const JournalDetailsScreen({
Key? key,
required this.title,
required this.publisher,
required this.issn,
- required this.subjects,
}) : super(key: key);
@override
@@ -69,7 +67,6 @@ class _JournalDetailsScreenState extends State {
delegate: JournalInfoHeader(
publisher: widget.publisher,
issn: widget.issn,
- subjects: widget.subjects,
),
pinned: false,
),
diff --git a/lib/screens/journals_screen.dart b/lib/screens/journals_screen.dart
deleted file mode 100644
index acccb77d..00000000
--- a/lib/screens/journals_screen.dart
+++ /dev/null
@@ -1,252 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:flutter_gen/gen_l10n/app_localizations.dart';
-import '../services/crossref_api.dart';
-import '../services/database_helper.dart';
-import '../widgets/sortbydialog.dart';
-import '../widgets/sortorderdialog.dart';
-import '../models/journal_entity.dart';
-import '../widgets/journal_card.dart';
-import './journals_search_results_screen.dart';
-import 'package:wispar/models/crossref_journals_models.dart' as Journals;
-
-class LibraryScreen extends StatefulWidget {
- const LibraryScreen({super.key});
-
- @override
- _LibraryScreenState createState() => _LibraryScreenState();
-}
-
-class _LibraryScreenState extends State {
- bool isSearching = false;
- TextEditingController searchController = TextEditingController();
- late DatabaseHelper dbHelper;
- late Journals.Item selectedJournal;
- late FocusNode searchFocusNode;
- int sortBy = 0; // Set the sort by option to Journal title by default
- int sortOrder = 0; // Set the sort order to Ascending by default
-
- @override
- void initState() {
- super.initState();
- dbHelper = DatabaseHelper();
- searchFocusNode = FocusNode();
- }
-
- @override
- Widget build(BuildContext context) {
- return Scaffold(
- appBar: AppBar(
- centerTitle: false,
- title: Row(
- children: [
- isSearching
- ? Expanded(
- child: TextField(
- controller: searchController,
- focusNode: searchFocusNode,
- decoration: InputDecoration(
- hintText: AppLocalizations.of(context)!.search,
- suffixIcon: IconButton(
- icon: Icon(Icons.backspace_outlined),
- onPressed: () {
- searchController.clear();
- searchFocusNode.requestFocus();
- },
- ),
- ),
- autofocus: true,
- textInputAction: TextInputAction.search,
- onSubmitted: (query) {
- handleSearch(query);
- },
- ),
- )
- : Text(AppLocalizations.of(context)!.journals),
- ],
- ),
- actions: [
- IconButton(
- icon: Icon(isSearching ? Icons.close : Icons.search),
- onPressed: () {
- setState(() {
- isSearching = !isSearching;
- if (!isSearching) {
- searchController.clear();
- }
- });
- },
- ),
- PopupMenuButton(
- icon: Icon(Icons.more_vert),
- onSelected: (item) => handleMenuButton(item),
- itemBuilder: (context) => [
- PopupMenuItem(
- value: 0,
- child: ListTile(
- leading: Icon(Icons.sort),
- title: Text(AppLocalizations.of(context)!.sortby),
- ),
- ),
- PopupMenuItem(
- value: 1,
- child: ListTile(
- leading: Icon(Icons.sort_by_alpha),
- title: Text(AppLocalizations.of(context)!.sortorder),
- ),
- ),
- ],
- ),
- ],
- ),
- body: _buildLibraryContent(),
- );
- }
-
- // Handles the sort by and sort order options
- void handleMenuButton(int item) {
- switch (item) {
- case 0:
- showSortByDialog(
- context: context,
- initialSortBy: sortBy,
- onSortByChanged: (int value) {
- setState(() {
- sortBy = value;
- });
- },
- sortOptions: [
- AppLocalizations.of(context)!.journaltitle,
- AppLocalizations.of(context)!.publisher,
- AppLocalizations.of(context)!.followingdate,
- 'ISSN',
- ],
- );
- break;
- case 1:
- showDialog(
- context: context,
- builder: (BuildContext context) {
- return SortOrderDialog(
- initialSortOrder: sortOrder,
- sortOrderOptions: [
- AppLocalizations.of(context)!.ascending,
- AppLocalizations.of(context)!.descending,
- ],
- onSortOrderChanged: (int value) {
- setState(() {
- sortOrder = value;
- });
- },
- );
- },
- );
- break;
- }
- }
-
- Widget _buildLibraryContent() {
- return FutureBuilder>(
- future: dbHelper.getJournals(),
- builder: (context, snapshot) {
- if (snapshot.connectionState == ConnectionState.waiting) {
- return CircularProgressIndicator();
- } else if (snapshot.hasError) {
- return Text('Error: ${snapshot.error}');
- } else if (!snapshot.hasData || snapshot.data!.isEmpty) {
- return Center(
- child: Wrap(
- alignment: WrapAlignment.center,
- children: [
- Text(AppLocalizations.of(context)!.journalnotfollowing1),
- Icon(Icons.search),
- Text(AppLocalizations.of(context)!.journalnotfollowing2),
- ],
- ),
- );
- } else {
- List journals = snapshot.data!;
- journals.sort((a, b) {
- switch (sortBy) {
- case 0:
- // Sort by Journal title
- return a.title.compareTo(b.title);
- case 1:
- // Sort by Publisher
- return a.publisher.compareTo(b.publisher);
- case 2:
- // Sort by Following date
- return a.dateFollowed!.compareTo(b.dateFollowed!);
- case 3:
- // Sort by ISSN
- return a.issn.compareTo(b.issn);
- default:
- return 0;
- }
- });
-
- // Reverse the order if sortOrder is Descending
- if (sortOrder == 1) {
- journals = journals.reversed.toList();
- }
-
- return ListView.builder(
- itemCount: journals.length,
- itemBuilder: (context, index) {
- final currentJournal = journals[index];
- return Column(
- children: [
- JournalCard(
- journal: currentJournal,
- unfollowCallback: _unfollowJournal,
- ),
- ],
- );
- },
- );
- }
- },
- );
- }
-
- void handleSearch(String query) async {
- try {
- showDialog(
- context: context,
- barrierDismissible: false,
- builder: (BuildContext context) {
- return Center(
- child: CircularProgressIndicator(),
- );
- },
- );
-
- CrossRefApi.resetJournalCursor();
- await Future.delayed(Duration(milliseconds: 100));
- Navigator.pop(context);
- ListAndMore searchResults =
- await CrossRefApi.queryJournals(query);
-
- Navigator.push(
- context,
- MaterialPageRoute(
- builder: (context) => SearchResultsScreen(
- searchResults: searchResults,
- searchQuery: query,
- ),
- ),
- );
- } catch (e) {
- print('Error handling search: $e');
- Navigator.pop(context);
- }
- }
-
- Future _unfollowJournal(BuildContext context, Journal journal) async {
- final dbHelper = DatabaseHelper();
- await dbHelper.removeJournal(journal.issn);
- // Clear the publication cache to force update the home screen
- //await dbHelper.clearCachedPublications();
- // Refresh the UI after unfollowing the journal
- setState(() {});
- }
-}
diff --git a/lib/screens/journals_search_results_screen.dart b/lib/screens/journals_search_results_screen.dart
index 984d98a0..6ee49ccb 100644
--- a/lib/screens/journals_search_results_screen.dart
+++ b/lib/screens/journals_search_results_screen.dart
@@ -96,7 +96,7 @@ class _SearchResultsScreenState extends State {
}
ListAndMore newItems =
- await CrossRefApi.queryJournals(query);
+ await CrossRefApi.queryJournalsByName(query);
setState(() {
items.addAll(newItems.list);
diff --git a/lib/screens/library_screen.dart b/lib/screens/library_screen.dart
new file mode 100644
index 00000000..59a982f9
--- /dev/null
+++ b/lib/screens/library_screen.dart
@@ -0,0 +1,117 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_gen/gen_l10n/app_localizations.dart';
+import '../services/database_helper.dart';
+import '../widgets/journals_tab_content.dart';
+//import '../widgets/authors_tab_content.dart';
+import '../widgets/queries_tab_content.dart';
+import '../widgets/search_query_card.dart';
+
+class LibraryScreen extends StatefulWidget {
+ const LibraryScreen({super.key});
+
+ @override
+ _LibraryScreenState createState() => _LibraryScreenState();
+}
+
+class _LibraryScreenState extends State
+ with TickerProviderStateMixin {
+ bool isSearching = false;
+ late DatabaseHelper dbHelper;
+ late FocusNode searchFocusNode;
+ late final TabController _tabController;
+
+ int journalsSortBy = 0; // Set the sort by option to Journal title by default
+ int journalsSortOrder = 0; // Set the sort order to Ascending by default
+ int authorsSortBy = 0; // Set the sort by option to Journal title by default
+ int authorsSortOrder = 0; // Set the sort order to Ascending by default
+ int queriesSortBy = 0; // Set the sort by option to Queriy name by default
+ int queriesSortOrder = 0; // Set the sort order to Ascending by default
+
+ @override
+ void initState() {
+ super.initState();
+ dbHelper = DatabaseHelper();
+ searchFocusNode = FocusNode();
+ _tabController = TabController(length: 2, vsync: this);
+ }
+
+ @override
+ void dispose() {
+ _tabController.dispose();
+ super.dispose();
+ }
+
+ @override
+ Widget build(BuildContext context) {
+ return Scaffold(
+ appBar: AppBar(
+ centerTitle: false,
+ title: Text(AppLocalizations.of(context)!.library),
+ bottom: TabBar(
+ controller: _tabController,
+ tabs: [
+ Tab(
+ icon: Icon(Icons.menu_book_rounded),
+ text: AppLocalizations.of(context)!.journals,
+ ),
+ /*ab(
+ icon: Icon(Icons.person_2_outlined),
+ text: AppLocalizations.of(context)!.authors,
+ ),*/
+ Tab(
+ icon: Icon(Icons.format_quote_rounded),
+ text: "Queries",
+ ),
+ ],
+ ),
+ ),
+ body: TabBarView(
+ controller: _tabController,
+ children: [
+ JournalsTabContent(
+ initialSortBy: journalsSortBy,
+ initialSortOrder: journalsSortOrder,
+ onSortByChanged: (int value) {
+ setState(() {
+ journalsSortBy = value;
+ });
+ },
+ onSortOrderChanged: (int value) {
+ setState(() {
+ journalsSortOrder = value;
+ });
+ },
+ ),
+ /*AuthorsTabContent(
+ initialSortBy: authorsSortBy,
+ initialSortOrder: authorsSortOrder,
+ onSortByChanged: (int value) {
+ setState(() {
+ authorsSortBy = value;
+ });
+ },
+ onSortOrderChanged: (int value) {
+ setState(() {
+ authorsSortOrder = value;
+ });
+ },
+ ),*/
+ QueriesTabContent(
+ initialSortBy: queriesSortBy,
+ initialSortOrder: queriesSortOrder,
+ onSortByChanged: (int value) {
+ setState(() {
+ queriesSortBy = value;
+ });
+ },
+ onSortOrderChanged: (int value) {
+ setState(() {
+ queriesSortOrder = value;
+ });
+ },
+ ),
+ ],
+ ),
+ );
+ }
+}
diff --git a/lib/screens/search_screen.dart b/lib/screens/search_screen.dart
new file mode 100644
index 00000000..70fad8d3
--- /dev/null
+++ b/lib/screens/search_screen.dart
@@ -0,0 +1,93 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_gen/gen_l10n/app_localizations.dart';
+import '../widgets/article_main_search_form.dart';
+import '../widgets/author_search_form.dart';
+import '../widgets/journal_search_form.dart';
+
+class SearchScreen extends StatefulWidget {
+ const SearchScreen({super.key});
+
+ @override
+ _SearchScreenState createState() => _SearchScreenState();
+}
+
+class _SearchScreenState extends State {
+ int selectedSearchType = 1; // Default to article type
+
+ // List of search category items
+ final List> dropdownItems = [
+ DropdownMenuItem(
+ value: 1,
+ child: Text(
+ 'Articles',
+ style: TextStyle(fontWeight: FontWeight.normal, fontSize: 16),
+ ),
+ ),
+ /*DropdownMenuItem(
+ value: 2,
+ child: Text(
+ 'Authors',
+ style: TextStyle(fontWeight: FontWeight.normal, fontSize: 16),
+ ),
+ ),*/
+ DropdownMenuItem(
+ value: 3,
+ child: Text(
+ 'Journals',
+ style: TextStyle(fontWeight: FontWeight.normal, fontSize: 16),
+ ),
+ ),
+ ];
+
+ @override
+ Widget build(BuildContext context) {
+ return Scaffold(
+ appBar: AppBar(
+ centerTitle: false,
+ title: Text(AppLocalizations.of(context)!.search),
+ ),
+ body: Padding(
+ padding: const EdgeInsets.all(16.0),
+ child: Column(
+ crossAxisAlignment: CrossAxisAlignment.start,
+ mainAxisAlignment: MainAxisAlignment.start,
+ children: [
+ DropdownButtonFormField(
+ decoration: InputDecoration(
+ labelText: 'Category',
+ ),
+ value: selectedSearchType,
+ isExpanded: true,
+ onChanged: (int? newValue) {
+ setState(() {
+ selectedSearchType = newValue ?? 1;
+ });
+ },
+ items: dropdownItems,
+ ),
+ SizedBox(height: 20),
+
+ // Show form based on selected category
+ Expanded(
+ child: _getSearchForm(),
+ ),
+ ],
+ ),
+ ),
+ );
+ }
+
+ // Returns the form based on the selected search type
+ Widget _getSearchForm() {
+ switch (selectedSearchType) {
+ case 1:
+ return ArticleSearchForm();
+ case 2:
+ return AuthorSearchForm();
+ case 3:
+ return JournalSearchForm();
+ default:
+ return ArticleSearchForm();
+ }
+ }
+}
diff --git a/lib/services/crossref_api.dart b/lib/services/crossref_api.dart
index 10dd95b3..5e84ed34 100644
--- a/lib/services/crossref_api.dart
+++ b/lib/services/crossref_api.dart
@@ -10,10 +10,12 @@ class CrossRefApi {
static const String email = 'mailto=wispar-app@protonmail.com';
static String? _journalCursor = '*';
static String? _journalWorksCursor = '*';
+ static String? _worksQueryCursor = '*';
static String? _currentQuery;
- // Query journals
- static Future> queryJournals(String query) async {
+ // Query journals by name
+ static Future> queryJournalsByName(
+ String query) async {
_currentQuery = query;
String apiUrl = '$baseUrl$journalsEndpoint?query=$query&rows=30&$email';
@@ -23,6 +25,30 @@ class CrossRefApi {
final response = await http.get(Uri.parse(apiUrl));
+ if (response.statusCode == 200) {
+ final crossrefJournals = Journals.crossrefjournalsFromJson(response.body);
+
+ List items = crossrefJournals.message.items;
+
+ // Update the journal cursor
+ _journalCursor = crossrefJournals.message.nextCursor;
+
+ // Use nextCursor to determine if there are more results
+ bool hasMoreResults = _journalCursor != null && _journalCursor != "";
+
+ return ListAndMore(items, hasMoreResults);
+ } else {
+ throw Exception('Failed to query journals');
+ }
+ }
+
+ // Query journals by ISSN
+ static Future> queryJournalsByISSN(
+ String query) async {
+ String apiUrl = '$baseUrl$journalsEndpoint/$query&$email';
+
+ final response = await http.get(Uri.parse(apiUrl));
+
if (response.statusCode == 200) {
final crossrefJournals = Journals.crossrefjournalsFromJson(response.body);
List items = crossrefJournals.message.items;
@@ -86,6 +112,10 @@ class CrossRefApi {
_journalWorksCursor = '*';
}
+ static void resetWorksQueryCursor() {
+ _worksQueryCursor = '*';
+ }
+
static String? getCurrentQuery() {
return _currentQuery;
}
@@ -106,6 +136,34 @@ class CrossRefApi {
throw Exception('Failed to load work by DOI');
}
}
+
+ static Future> getWorksByQuery(
+ Map queryParams) async {
+ String url = '$baseUrl$worksEndpoint';
+ // Construct the query parameters string by iterating over the queryParams map
+ String queryString = queryParams.entries
+ .map((entry) =>
+ '${Uri.encodeQueryComponent(entry.key)}=${Uri.encodeQueryComponent(entry.value.toString())}')
+ .join('&');
+ String apiUrl = '$url?$queryString&rows=50&$email';
+ if (_worksQueryCursor != null) {
+ apiUrl += '&cursor=$_worksQueryCursor';
+ }
+ final response = await http.get(Uri.parse(apiUrl));
+ //print('$url?$queryString');
+
+ if (response.statusCode == 200) {
+ final responseData =
+ journalsWorks.JournalWork.fromJson(json.decode(response.body));
+ List feedItems = responseData.message.items;
+ _worksQueryCursor = responseData.message.nextCursor;
+ bool hasMoreResults =
+ _worksQueryCursor != null && _worksQueryCursor != "";
+ return ListAndMore(feedItems, hasMoreResults);
+ } else {
+ throw Exception('Failed to fetch results');
+ }
+ }
}
class ListAndMore {
diff --git a/lib/services/database_helper.dart b/lib/services/database_helper.dart
index 7ba0dfd5..824ed879 100644
--- a/lib/services/database_helper.dart
+++ b/lib/services/database_helper.dart
@@ -31,7 +31,6 @@ class DatabaseHelper {
issn TEXT,
title TEXT,
publisher TEXT,
- subjects TEXT,
dateFollowed TEXT,
lastUpdated TEXT
)
@@ -57,6 +56,16 @@ class DatabaseHelper {
FOREIGN KEY (journal_id) REFERENCES journals(journal_id)
)
''');
+
+ // Create the table for saved queries
+ await db.execute('''
+ CREATE TABLE savedQueries (
+ query_id INTEGER PRIMARY KEY AUTOINCREMENT,
+ queryName TEXT,
+ queryParams TEXT,
+ dateSaved TEXT
+ )
+ ''');
},
);
}
@@ -84,7 +93,6 @@ class DatabaseHelper {
'dateFollowed': DateTime.now().toIso8601String().substring(0, 10),
'title': journal.title,
'publisher': journal.publisher,
- 'subjects': journal.subjects,
},
where: 'journal_id = ?',
whereArgs: [journalId],
@@ -108,7 +116,6 @@ class DatabaseHelper {
issn: maps[i]['issn'],
title: maps[i]['title'],
publisher: maps[i]['publisher'],
- subjects: maps[i]['subjects'],
dateFollowed: maps[i]['dateFollowed'],
lastUpdated: maps[i]['lastUpdated'],
);
@@ -217,7 +224,6 @@ class DatabaseHelper {
'issn': publicationCard.issn,
'title': publicationCard.journalTitle, // default title
'publisher': '',
- 'subjects': '',
};
journalId = await db.insert('journals', journalData);
@@ -433,4 +439,34 @@ class DatabaseHelper {
whereArgs: [doi],
);
}
+
+ // Insert function for the saved search queries
+ Future saveSearchQuery(String queryName, String queryParams) async {
+ final db = await database;
+ final String dateSaved = DateTime.now().toIso8601String();
+ await db.insert(
+ 'savedQueries',
+ {
+ 'queryName': queryName,
+ 'queryParams': queryParams,
+ 'dateSaved': dateSaved,
+ },
+ );
+ }
+
+ // Get the saved search queries
+ Future>> getSavedQueries() async {
+ final db = await database;
+ return await db.query('savedQueries', orderBy: 'dateSaved DESC');
+ }
+
+ // Remove a saved search query
+ Future deleteQuery(int id) async {
+ final db = await database;
+ await db.delete(
+ 'savedQueries',
+ where: 'query_id = ?',
+ whereArgs: [id],
+ );
+ }
}
diff --git a/lib/services/save_search_query.dart b/lib/services/save_search_query.dart
new file mode 100644
index 00000000..378226f8
--- /dev/null
+++ b/lib/services/save_search_query.dart
@@ -0,0 +1,5 @@
+class SaveSearchQuery {
+ static Future save(Map queryParams) async {
+ //final prefs = await SharedPreferences.getInstance();
+ }
+}
diff --git a/lib/widgets/article_doi_search_form.dart b/lib/widgets/article_doi_search_form.dart
new file mode 100644
index 00000000..571a980f
--- /dev/null
+++ b/lib/widgets/article_doi_search_form.dart
@@ -0,0 +1,23 @@
+import 'package:flutter/material.dart';
+
+class DOISearchForm extends StatelessWidget {
+ final TextEditingController doiController;
+
+ DOISearchForm({required this.doiController});
+
+ @override
+ Widget build(BuildContext context) {
+ return Column(
+ crossAxisAlignment: CrossAxisAlignment.start,
+ children: [
+ TextField(
+ controller: doiController,
+ decoration: InputDecoration(
+ labelText: 'DOI',
+ border: OutlineInputBorder(),
+ ),
+ ),
+ ],
+ );
+ }
+}
diff --git a/lib/widgets/article_main_search_form.dart b/lib/widgets/article_main_search_form.dart
new file mode 100644
index 00000000..fc6af3e6
--- /dev/null
+++ b/lib/widgets/article_main_search_form.dart
@@ -0,0 +1,143 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_gen/gen_l10n/app_localizations.dart';
+import 'article_doi_search_form.dart';
+import 'article_query_search_form.dart';
+import '../services/crossref_api.dart';
+import '../screens/article_screen.dart';
+
+class ArticleSearchForm extends StatefulWidget {
+ @override
+ _ArticleSearchFormState createState() => _ArticleSearchFormState();
+}
+
+class _ArticleSearchFormState extends State {
+ int selectedSearchIndex = 0; // 0 for Query, 1 for DOI
+ final TextEditingController doiController = TextEditingController();
+ final GlobalKey _queryFormKey =
+ GlobalKey(); // GlobalKey for QuerySearchForm
+
+ @override
+ void dispose() {
+ doiController.dispose();
+ super.dispose();
+ }
+
+ void _handleSearch() async {
+ try {
+ showDialog(
+ context: context,
+ barrierDismissible: false,
+ builder: (BuildContext context) {
+ return Center(
+ child: CircularProgressIndicator(),
+ );
+ },
+ );
+ if (selectedSearchIndex == 0) {
+ // Query search
+ if (_queryFormKey.currentState != null) {
+ _queryFormKey.currentState!
+ .submitForm(); // Call the search function in QuerySearchForm
+ } else {}
+ Navigator.pop(context);
+ } else {
+ // DOI-based search
+ String doi = doiController.text.trim();
+
+ if (doi.isEmpty) {
+ ScaffoldMessenger.of(context).showSnackBar(
+ SnackBar(content: Text('Please enter a DOI')),
+ );
+ return;
+ }
+ try {
+ final article = await CrossRefApi.getWorkByDOI(doi);
+
+ // Dismiss the loading dialog
+ Navigator.pop(context);
+ Navigator.push(
+ context,
+ MaterialPageRoute(
+ builder: (context) => ArticleScreen(
+ doi: article.doi,
+ title: article.title,
+ issn: article.issn,
+ abstract: article.abstract,
+ journalTitle: article.journalTitle,
+ publishedDate: article.publishedDate,
+ authors: article.authors,
+ url: article.url,
+ license: article.license,
+ licenseName: article.licenseName,
+ ),
+ ),
+ );
+ } catch (e) {
+ Navigator.pop(context); // Close loading dialog
+ ScaffoldMessenger.of(context).showSnackBar(
+ SnackBar(content: Text('Error: $e')),
+ );
+ print('Error: $e');
+ }
+ }
+ } catch (e) {
+ Navigator.pop(context); // Close loading dialog
+ ScaffoldMessenger.of(context).showSnackBar(
+ SnackBar(content: Text('Error: $e')),
+ );
+ print('Error: $e');
+ }
+ }
+
+ @override
+ Widget build(BuildContext context) {
+ Widget searchForm = selectedSearchIndex == 0
+ ? QuerySearchForm(key: _queryFormKey)
+ : DOISearchForm(doiController: doiController);
+
+ return Scaffold(
+ body: SingleChildScrollView(
+ padding: const EdgeInsets.all(16.0),
+ child: Column(
+ crossAxisAlignment: CrossAxisAlignment.start,
+ children: [
+ SizedBox(height: 8),
+ Center(
+ child: ToggleButtons(
+ isSelected: [
+ selectedSearchIndex == 0,
+ selectedSearchIndex == 1
+ ],
+ onPressed: (int index) {
+ setState(() {
+ selectedSearchIndex = index;
+ });
+ },
+ children: [
+ Padding(
+ padding: const EdgeInsets.symmetric(horizontal: 16.0),
+ child: Text('Search by query'),
+ ),
+ Padding(
+ padding: const EdgeInsets.symmetric(horizontal: 16.0),
+ child: Text('Search by DOI'),
+ ),
+ ],
+ borderRadius: BorderRadius.circular(8.0),
+ ),
+ ),
+ SizedBox(height: 16),
+ // Display the selected search form here
+ searchForm,
+ SizedBox(height: 16),
+ ],
+ ),
+ ),
+ floatingActionButton: FloatingActionButton(
+ onPressed: _handleSearch,
+ child: Icon(Icons.search),
+ shape: CircleBorder(),
+ ),
+ );
+ }
+}
diff --git a/lib/widgets/article_query_search_form.dart b/lib/widgets/article_query_search_form.dart
new file mode 100644
index 00000000..a37d33bc
--- /dev/null
+++ b/lib/widgets/article_query_search_form.dart
@@ -0,0 +1,628 @@
+import 'package:flutter/material.dart';
+import '../services/crossref_api.dart';
+import '../screens/article_search_results_screen.dart';
+import '../services/database_helper.dart';
+
+class QuerySearchForm extends StatefulWidget {
+ // The key allows to access the state of the form from outside
+ const QuerySearchForm({Key? key}) : super(key: key);
+
+ @override
+ QuerySearchFormState createState() => QuerySearchFormState();
+}
+
+class QuerySearchFormState extends State {
+ final GlobalKey _formKey = GlobalKey();
+ bool isAdvancedSearchVisible = false;
+ bool saveQuery = false;
+ int selectedSortBy = 0;
+ int selectedSortOrder = 0;
+
+ // Controllers for text fields
+ final TextEditingController titleController = TextEditingController();
+ final TextEditingController firstNameController = TextEditingController();
+ final TextEditingController lastNameController = TextEditingController();
+ final TextEditingController publisherController = TextEditingController();
+ final TextEditingController affiliationController = TextEditingController();
+ final TextEditingController bibliographicController = TextEditingController();
+ final TextEditingController degreeController = TextEditingController();
+ final TextEditingController descriptionController = TextEditingController();
+ final TextEditingController editorFirstNameController =
+ TextEditingController();
+ final TextEditingController editorLastNameController =
+ TextEditingController();
+ final TextEditingController eventAcronymController = TextEditingController();
+ final TextEditingController eventLocationController = TextEditingController();
+ final TextEditingController eventNameController = TextEditingController();
+ final TextEditingController eventSponsorController = TextEditingController();
+ final TextEditingController eventThemeController = TextEditingController();
+ final TextEditingController funderNameController = TextEditingController();
+ final TextEditingController publisherLocationController =
+ TextEditingController();
+ final TextEditingController standardsBodyAcronymController =
+ TextEditingController();
+ final TextEditingController standardsBodyNameController =
+ TextEditingController();
+
+ final TextEditingController queryNameController = TextEditingController();
+
+ // List of sort by options
+ final List> sortbyItems = [
+ DropdownMenuItem(
+ value: 0,
+ child: Text(
+ '-',
+ style: TextStyle(fontWeight: FontWeight.normal, fontSize: 16),
+ ),
+ ),
+ DropdownMenuItem(
+ value: 1,
+ child: Text(
+ 'created',
+ style: TextStyle(fontWeight: FontWeight.normal, fontSize: 16),
+ ),
+ ),
+ DropdownMenuItem(
+ value: 2,
+ child: Text(
+ 'deposited',
+ style: TextStyle(fontWeight: FontWeight.normal, fontSize: 16),
+ ),
+ ),
+ DropdownMenuItem(
+ value: 3,
+ child: Text(
+ 'indexed',
+ style: TextStyle(fontWeight: FontWeight.normal, fontSize: 16),
+ ),
+ ),
+ DropdownMenuItem(
+ value: 4,
+ child: Text(
+ 'is-referenced-by-count',
+ style: TextStyle(fontWeight: FontWeight.normal, fontSize: 16),
+ ),
+ ),
+ DropdownMenuItem(
+ value: 5,
+ child: Text(
+ 'issued',
+ style: TextStyle(fontWeight: FontWeight.normal, fontSize: 16),
+ ),
+ ),
+ DropdownMenuItem(
+ value: 6,
+ child: Text(
+ 'published',
+ style: TextStyle(fontWeight: FontWeight.normal, fontSize: 16),
+ ),
+ ),
+ DropdownMenuItem(
+ value: 7,
+ child: Text(
+ 'published-online',
+ style: TextStyle(fontWeight: FontWeight.normal, fontSize: 16),
+ ),
+ ),
+ DropdownMenuItem(
+ value: 8,
+ child: Text(
+ 'published-print',
+ style: TextStyle(fontWeight: FontWeight.normal, fontSize: 16),
+ ),
+ ),
+ DropdownMenuItem(
+ value: 9,
+ child: Text(
+ 'references-count',
+ style: TextStyle(fontWeight: FontWeight.normal, fontSize: 16),
+ ),
+ ),
+ DropdownMenuItem(
+ value: 10,
+ child: Text(
+ 'relevance',
+ style: TextStyle(fontWeight: FontWeight.normal, fontSize: 16),
+ ),
+ ),
+ DropdownMenuItem(
+ value: 11,
+ child: Text(
+ 'score',
+ style: TextStyle(fontWeight: FontWeight.normal, fontSize: 16),
+ ),
+ ),
+ DropdownMenuItem(
+ value: 12,
+ child: Text(
+ 'updated',
+ style: TextStyle(fontWeight: FontWeight.normal, fontSize: 16),
+ ),
+ ),
+ ];
+
+ // List of search order by items
+ final List> sortorderItems = [
+ DropdownMenuItem(
+ value: 0,
+ child: Text(
+ '-',
+ style: TextStyle(fontWeight: FontWeight.normal, fontSize: 16),
+ ),
+ ),
+ DropdownMenuItem(
+ value: 1,
+ child: Text(
+ 'Ascending',
+ style: TextStyle(fontWeight: FontWeight.normal, fontSize: 16),
+ ),
+ ),
+ DropdownMenuItem(
+ value: 2,
+ child: Text(
+ 'Descending',
+ style: TextStyle(fontWeight: FontWeight.normal, fontSize: 16),
+ ),
+ ),
+ ];
+
+ @override
+ void dispose() {
+ titleController.dispose();
+ firstNameController.dispose();
+ lastNameController.dispose();
+ publisherController.dispose();
+ affiliationController.dispose();
+ bibliographicController.dispose();
+ degreeController.dispose();
+ descriptionController.dispose();
+ editorFirstNameController.dispose();
+ editorLastNameController.dispose();
+ eventAcronymController.dispose();
+ eventLocationController.dispose();
+ eventNameController.dispose();
+ eventSponsorController.dispose();
+ eventThemeController.dispose();
+ funderNameController.dispose();
+ publisherLocationController.dispose();
+ standardsBodyAcronymController.dispose();
+ standardsBodyNameController.dispose();
+ queryNameController.dispose();
+ super.dispose();
+ }
+
+ void submitForm() async {
+ // Gather all input values, ignoring empty fields
+ final Map queryParams = {};
+
+ final title = titleController.text.trim();
+ if (title.isNotEmpty) queryParams['query.title'] = title;
+
+ final firstName = firstNameController.text.trim();
+ final lastName = lastNameController.text.trim();
+ if (firstName.isNotEmpty || lastName.isNotEmpty) {
+ final author =
+ '$firstName $lastName'.trim(); // Combine first and last name
+ queryParams['query.author'] = author;
+ }
+ final publisher = publisherController.text.trim();
+ if (publisher.isNotEmpty) queryParams['query.publisher'] = publisher;
+
+ final affiliation = affiliationController.text.trim();
+ if (affiliation.isNotEmpty) queryParams['query.affiliation'] = affiliation;
+
+ final bibliographic = bibliographicController.text.trim();
+ if (bibliographic.isNotEmpty)
+ queryParams['query.bibliographic'] = bibliographic;
+
+ final degree = degreeController.text.trim();
+ if (degree.isNotEmpty) queryParams['query.degree'] = degree;
+
+ final description = descriptionController.text.trim();
+ if (description.isNotEmpty) queryParams['query.description'] = description;
+
+ final editorFirstName = editorFirstNameController.text.trim();
+ final editorLastName = editorLastNameController.text.trim();
+ if (editorFirstName.isNotEmpty || editorLastName.isNotEmpty) {
+ final editor = '$editorFirstName $editorLastName'.trim();
+ queryParams['query.editor'] = editor;
+ }
+
+ final eventAcronym = eventAcronymController.text.trim();
+ if (eventAcronym.isNotEmpty)
+ queryParams['query.event-acronym'] = eventAcronym;
+
+ final eventLocation = eventLocationController.text.trim();
+ if (eventLocation.isNotEmpty)
+ queryParams['query.event-location'] = eventLocation;
+
+ final eventName = eventNameController.text.trim();
+ if (eventName.isNotEmpty) queryParams['query.event-name'] = eventName;
+
+ final eventSponsor = eventSponsorController.text.trim();
+ if (eventSponsor.isNotEmpty)
+ queryParams['query.event-sponsor'] = eventSponsor;
+
+ final eventTheme = eventThemeController.text.trim();
+ if (eventTheme.isNotEmpty) queryParams['query.event-theme'] = eventTheme;
+
+ final funderName = funderNameController.text.trim();
+ if (funderName.isNotEmpty) queryParams['query.funder-name'] = funderName;
+
+ final publisherLocation = publisherLocationController.text.trim();
+ if (publisherLocation.isNotEmpty)
+ queryParams['query.publisher-location'] = publisherLocation;
+
+ final standardsBodyAcronym = standardsBodyAcronymController.text.trim();
+ if (standardsBodyAcronym.isNotEmpty)
+ queryParams['query.standards-body-acronym'] = standardsBodyAcronym;
+
+ final standardsBodyName = standardsBodyNameController.text.trim();
+ if (standardsBodyName.isNotEmpty)
+ queryParams['query.standards-body-name'] = standardsBodyName;
+
+ // Handle sorting options
+ if (selectedSortBy != 0) {
+ // Map the sortbyItems to the API request format
+ final sortOptions = [
+ '-',
+ 'created',
+ 'deposited',
+ 'indexed',
+ 'is-referenced-by-count',
+ 'issued',
+ 'published',
+ 'published-online',
+ 'published-print',
+ 'references-count',
+ 'relevance',
+ 'score',
+ 'updated'
+ ];
+ queryParams['sort'] = sortOptions[selectedSortBy];
+ }
+
+ if (selectedSortOrder != 0) {
+ // Map the sortorderItems to the API request format
+ final orderOptions = ['-', 'asc', 'desc'];
+ queryParams['order'] = orderOptions[selectedSortOrder];
+ }
+
+ // Show loading indicator
+ showDialog(
+ context: context,
+ barrierDismissible: false,
+ builder: (BuildContext context) {
+ return const Center(child: CircularProgressIndicator());
+ },
+ );
+
+ try {
+ final dbHelper = DatabaseHelper();
+ late final response;
+ CrossRefApi.resetWorksQueryCursor(); // Reset the cursor on new search
+ if (saveQuery) {
+ final queryName = queryNameController.text.trim();
+ if (queryName != '') {
+ String queryString = queryParams.entries
+ .map((entry) =>
+ '${Uri.encodeQueryComponent(entry.key)}=${Uri.encodeQueryComponent(entry.value.toString())}')
+ .join('&');
+
+ // Call the save query function
+ await dbHelper.saveSearchQuery(queryName, queryString);
+ // Makes the API call
+ response = await CrossRefApi.getWorksByQuery(queryParams);
+ } else {
+ // Close the loading indicator
+ Navigator.pop(context);
+ ScaffoldMessenger.of(context).showSnackBar(
+ SnackBar(
+ content:
+ Text('You must enter a query name in order to save it.')),
+ );
+ }
+ } else {
+ response = await CrossRefApi.getWorksByQuery(queryParams);
+ }
+
+ // Close the loading indicator
+ Navigator.pop(context);
+
+ // Navigate to the results screen
+ Navigator.push(
+ context,
+ MaterialPageRoute(
+ builder: (context) => ArticleSearchResultsScreen(
+ initialSearchResults: response.list,
+ initialHasMore: response.hasMore,
+ queryParams: queryParams,
+ ),
+ ),
+ );
+ } catch (error) {
+ // Close the loading indicator
+ Navigator.pop(context);
+
+ // Show error message
+ ScaffoldMessenger.of(context).showSnackBar(
+ SnackBar(content: Text('Error: $error')),
+ );
+ }
+ }
+
+ @override
+ Widget build(BuildContext context) {
+ return SingleChildScrollView(
+ child: Padding(
+ padding: const EdgeInsets.all(16.0),
+ child: Form(
+ key: _formKey,
+ child: Column(
+ crossAxisAlignment: CrossAxisAlignment.start,
+ children: [
+ // Title field
+ TextFormField(
+ controller: titleController,
+ decoration: InputDecoration(
+ labelText: 'Article Title',
+ border: OutlineInputBorder(),
+ ),
+ ),
+ SizedBox(height: 16),
+ // Author name fields
+ Row(
+ children: [
+ Expanded(
+ child: TextFormField(
+ controller: firstNameController,
+ decoration: InputDecoration(
+ labelText: "Author's first name",
+ border: OutlineInputBorder(),
+ ),
+ ),
+ ),
+ SizedBox(width: 5),
+ Expanded(
+ child: TextFormField(
+ controller: lastNameController,
+ decoration: InputDecoration(
+ labelText: "Author's last name",
+ border: OutlineInputBorder(),
+ ),
+ ),
+ ),
+ ],
+ ),
+ SizedBox(height: 16),
+ // Affiliation field
+ TextFormField(
+ controller: affiliationController,
+ decoration: InputDecoration(
+ labelText: 'Affiliation',
+ border: OutlineInputBorder(),
+ ),
+ ),
+ SizedBox(height: 16),
+ // Sort by and sort order fields
+ Row(
+ children: [
+ Expanded(
+ child: DropdownButtonFormField(
+ decoration: InputDecoration(
+ labelText: 'Sort by',
+ ),
+ value: selectedSortBy,
+ isExpanded: true,
+ onChanged: (int? newValue) {
+ setState(() {
+ selectedSortBy = newValue ?? 0;
+ });
+ },
+ items: sortbyItems,
+ ),
+ ),
+ SizedBox(width: 16),
+ Expanded(
+ child: DropdownButtonFormField(
+ decoration: InputDecoration(
+ labelText: 'Sort order',
+ ),
+ value: selectedSortOrder,
+ isExpanded: true,
+ onChanged: (int? newValue) {
+ setState(() {
+ selectedSortOrder = newValue ?? 0;
+ });
+ },
+ items: sortorderItems,
+ ),
+ ),
+ ],
+ ),
+ SizedBox(height: 16),
+ // Collapsible section that shows more search options
+ ExpansionTile(
+ title: Text('More options'),
+ leading: Icon(
+ isAdvancedSearchVisible
+ ? Icons.expand_less
+ : Icons.expand_more,
+ ),
+ trailing: SizedBox(),
+ onExpansionChanged: (bool expanded) {
+ setState(() {
+ isAdvancedSearchVisible = expanded;
+ });
+ },
+ children: [
+ SizedBox(height: 8),
+ // Publisher field
+ TextFormField(
+ controller: publisherController,
+ decoration: InputDecoration(
+ labelText: 'Publisher',
+ border: OutlineInputBorder(),
+ ),
+ ),
+ SizedBox(height: 16),
+ TextFormField(
+ controller: affiliationController,
+ decoration: InputDecoration(
+ labelText: 'Affiliation',
+ border: OutlineInputBorder(),
+ ),
+ ),
+ SizedBox(height: 16),
+ TextFormField(
+ controller: bibliographicController,
+ decoration: InputDecoration(
+ labelText: "Bibliographic",
+ border: OutlineInputBorder(),
+ ),
+ ),
+ SizedBox(height: 16),
+ TextFormField(
+ controller: degreeController,
+ decoration: InputDecoration(
+ labelText: "Degree",
+ border: OutlineInputBorder(),
+ ),
+ ),
+ SizedBox(height: 16),
+ TextFormField(
+ controller: descriptionController,
+ decoration: InputDecoration(
+ labelText: "Description",
+ border: OutlineInputBorder(),
+ ),
+ ),
+ SizedBox(height: 16),
+ Row(
+ children: [
+ Expanded(
+ child: TextFormField(
+ controller: editorFirstNameController,
+ decoration: InputDecoration(
+ labelText: "Editor first name",
+ border: OutlineInputBorder(),
+ ),
+ ),
+ ),
+ SizedBox(width: 5),
+ Expanded(
+ child: TextFormField(
+ controller: editorLastNameController,
+ decoration: InputDecoration(
+ labelText: "Editor last name",
+ border: OutlineInputBorder(),
+ ),
+ ),
+ ),
+ ],
+ ),
+ SizedBox(height: 16),
+ TextFormField(
+ controller: eventAcronymController,
+ decoration: InputDecoration(
+ labelText: "Event acronym",
+ border: OutlineInputBorder(),
+ ),
+ ),
+ SizedBox(height: 16),
+ TextFormField(
+ controller: eventLocationController,
+ decoration: InputDecoration(
+ labelText: "Event location",
+ border: OutlineInputBorder(),
+ ),
+ ),
+ SizedBox(height: 16),
+ TextFormField(
+ controller: eventNameController,
+ decoration: InputDecoration(
+ labelText: "Event name",
+ border: OutlineInputBorder(),
+ ),
+ ),
+ SizedBox(height: 16),
+ TextFormField(
+ controller: eventSponsorController,
+ decoration: InputDecoration(
+ labelText: "Event sponsor",
+ border: OutlineInputBorder(),
+ ),
+ ),
+ SizedBox(height: 16),
+ TextFormField(
+ controller: eventThemeController,
+ decoration: InputDecoration(
+ labelText: "Event theme",
+ border: OutlineInputBorder(),
+ ),
+ ),
+ SizedBox(height: 16),
+ TextFormField(
+ controller: funderNameController,
+ decoration: InputDecoration(
+ labelText: "Funder name",
+ border: OutlineInputBorder(),
+ ),
+ ),
+ SizedBox(height: 16),
+ TextFormField(
+ controller: publisherController,
+ decoration: InputDecoration(
+ labelText: "Publisher location",
+ border: OutlineInputBorder(),
+ ),
+ ),
+ SizedBox(height: 16),
+ TextFormField(
+ controller: standardsBodyAcronymController,
+ decoration: InputDecoration(
+ labelText: "Standards body acronym",
+ border: OutlineInputBorder(),
+ ),
+ ),
+ SizedBox(height: 16),
+ TextFormField(
+ controller: standardsBodyNameController,
+ decoration: InputDecoration(
+ labelText: "Standards body name",
+ border: OutlineInputBorder(),
+ ),
+ ),
+ SizedBox(height: 16),
+ ],
+ ),
+ SizedBox(height: 16),
+ Text(
+ 'Save this query',
+ style: TextStyle(fontWeight: FontWeight.bold),
+ ),
+ Switch(
+ value: saveQuery,
+ onChanged: (bool value) {
+ setState(() {
+ saveQuery = value;
+ });
+ },
+ ),
+ SizedBox(height: 8),
+ if (saveQuery)
+ TextFormField(
+ controller: queryNameController,
+ decoration: InputDecoration(
+ labelText: 'Query name',
+ border: OutlineInputBorder(),
+ ),
+ ),
+ SizedBox(height: 16),
+ ],
+ ),
+ ),
+ ),
+ );
+ }
+}
diff --git a/lib/widgets/author_search_form.dart b/lib/widgets/author_search_form.dart
new file mode 100644
index 00000000..ca6ded62
--- /dev/null
+++ b/lib/widgets/author_search_form.dart
@@ -0,0 +1,45 @@
+import 'package:flutter/material.dart';
+
+class AuthorSearchForm extends StatefulWidget {
+ @override
+ _AuthorSearchFormState createState() => _AuthorSearchFormState();
+}
+
+class _AuthorSearchFormState extends State {
+ bool saveQuery = false;
+
+ @override
+ Widget build(BuildContext context) {
+ return Column(
+ crossAxisAlignment: CrossAxisAlignment.start,
+ children: [
+ Text("Search Authors"),
+ TextField(
+ decoration: InputDecoration(
+ labelText: 'Author Name',
+ border: OutlineInputBorder(),
+ ),
+ ),
+ SizedBox(height: 16),
+ Text('Save this query', style: TextStyle(fontWeight: FontWeight.bold)),
+ Switch(
+ value: saveQuery,
+ onChanged: (bool value) {
+ setState(() {
+ saveQuery = value;
+ });
+ },
+ ),
+ SizedBox(height: 16),
+ Center(
+ child: ElevatedButton(
+ onPressed: () {
+ print("Search for Authors");
+ },
+ child: Text('Search'),
+ ),
+ ),
+ ],
+ );
+ }
+}
diff --git a/lib/widgets/authors_tab_content.dart b/lib/widgets/authors_tab_content.dart
new file mode 100644
index 00000000..3938665c
--- /dev/null
+++ b/lib/widgets/authors_tab_content.dart
@@ -0,0 +1,164 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_gen/gen_l10n/app_localizations.dart';
+import '../models/journal_entity.dart';
+import '../widgets/sortbydialog.dart';
+import '../widgets/sortorderdialog.dart';
+import '../services/database_helper.dart';
+import '../widgets/journal_card.dart';
+
+class AuthorsTabContent extends StatefulWidget {
+ final int initialSortBy;
+ final int initialSortOrder;
+ final Function(int) onSortByChanged;
+ final Function(int) onSortOrderChanged;
+
+ const AuthorsTabContent({
+ Key? key,
+ required this.initialSortBy,
+ required this.initialSortOrder,
+ required this.onSortByChanged,
+ required this.onSortOrderChanged,
+ }) : super(key: key);
+
+ @override
+ _AuthorsTabContentState createState() => _AuthorsTabContentState();
+}
+
+class _AuthorsTabContentState extends State {
+ late DatabaseHelper dbHelper;
+
+ @override
+ void initState() {
+ super.initState();
+ dbHelper = DatabaseHelper();
+ }
+
+ @override
+ Widget build(BuildContext context) {
+ return Column(
+ children: [
+ // Sort options row
+ Padding(
+ padding: const EdgeInsets.all(8.0),
+ child: Row(
+ mainAxisAlignment: MainAxisAlignment.spaceBetween,
+ children: [
+ TextButton.icon(
+ onPressed: () => _showSortByDialog(context),
+ icon: Icon(Icons.sort),
+ label: Text(AppLocalizations.of(context)!.sortby),
+ style:
+ TextButton.styleFrom(visualDensity: VisualDensity.compact),
+ ),
+ TextButton.icon(
+ onPressed: () => _showSortOrderDialog(context),
+ icon: Icon(
+ widget.initialSortOrder == 0
+ ? Icons.arrow_downward
+ : Icons.arrow_upward,
+ ),
+ label: Text(AppLocalizations.of(context)!.sortorder),
+ style:
+ TextButton.styleFrom(visualDensity: VisualDensity.compact),
+ ),
+ ],
+ ),
+ ),
+ // Journal list
+ Expanded(
+ child: FutureBuilder>(
+ future: dbHelper.getJournals(),
+ builder: (context, snapshot) {
+ if (snapshot.connectionState == ConnectionState.waiting) {
+ return CircularProgressIndicator();
+ } else if (snapshot.hasError) {
+ return Text('Error: ${snapshot.error}');
+ } else if (!snapshot.hasData || snapshot.data!.isEmpty) {
+ return Center(
+ child: Wrap(
+ alignment: WrapAlignment.center,
+ children: [
+ Text(AppLocalizations.of(context)!.journalnotfollowing1),
+ Icon(Icons.search),
+ Text(AppLocalizations.of(context)!.journalnotfollowing2),
+ ],
+ ),
+ );
+ } else {
+ List journals = snapshot.data!;
+ journals.sort((a, b) {
+ switch (widget.initialSortBy) {
+ case 0:
+ return a.title.compareTo(b.title);
+ case 1:
+ return a.publisher.compareTo(b.publisher);
+ case 2:
+ return a.dateFollowed!.compareTo(b.dateFollowed!);
+ case 3:
+ return a.issn.compareTo(b.issn);
+ default:
+ return 0;
+ }
+ });
+
+ if (widget.initialSortOrder == 1) {
+ journals = journals.reversed.toList();
+ }
+
+ return ListView.builder(
+ itemCount: journals.length,
+ itemBuilder: (context, index) {
+ final currentJournal = journals[index];
+ return Column(
+ children: [
+ JournalCard(
+ journal: currentJournal,
+ unfollowCallback: _unfollowJournal,
+ ),
+ ],
+ );
+ },
+ );
+ }
+ },
+ ),
+ ),
+ ],
+ );
+ }
+
+ void _showSortByDialog(BuildContext context) {
+ showSortByDialog(
+ context: context,
+ initialSortBy: widget.initialSortBy,
+ onSortByChanged: widget.onSortByChanged,
+ sortOptions: [
+ AppLocalizations.of(context)!.journaltitle,
+ AppLocalizations.of(context)!.publisher,
+ AppLocalizations.of(context)!.followingdate,
+ 'ISSN',
+ ],
+ );
+ }
+
+ void _showSortOrderDialog(BuildContext context) {
+ showDialog(
+ context: context,
+ builder: (BuildContext context) {
+ return SortOrderDialog(
+ initialSortOrder: widget.initialSortOrder,
+ sortOrderOptions: [
+ AppLocalizations.of(context)!.ascending,
+ AppLocalizations.of(context)!.descending,
+ ],
+ onSortOrderChanged: widget.onSortOrderChanged,
+ );
+ },
+ );
+ }
+
+ Future _unfollowJournal(BuildContext context, Journal journal) async {
+ await dbHelper.removeJournal(journal.issn);
+ setState(() {});
+ }
+}
diff --git a/lib/widgets/downloaded_card.dart b/lib/widgets/downloaded_card.dart
index 36569510..ca600cee 100644
--- a/lib/widgets/downloaded_card.dart
+++ b/lib/widgets/downloaded_card.dart
@@ -64,8 +64,6 @@ class _DownloadedCardState extends State {
if (journalInfo != Null) {
String journalPublisher =
journalInfo?['publisher'];
- List journalSubjects =
- (journalInfo?['subjects'] ?? '').split(',');
Navigator.push(
context,
@@ -76,7 +74,6 @@ class _DownloadedCardState extends State {
widget.publicationCard.journalTitle,
publisher: journalPublisher,
issn: widget.publicationCard.issn,
- subjects: journalSubjects,
),
));
}
diff --git a/lib/widgets/journal_card.dart b/lib/widgets/journal_card.dart
index e47b77f2..3057cef5 100644
--- a/lib/widgets/journal_card.dart
+++ b/lib/widgets/journal_card.dart
@@ -1,4 +1,5 @@
import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
import 'package:flutter_gen/gen_l10n/app_localizations.dart';
import '../screens/journals_details_screen.dart';
import '../models/journal_entity.dart';
@@ -15,7 +16,6 @@ class JournalCard extends StatelessWidget {
margin: EdgeInsets.all(8.0),
child: ListTile(
onTap: () {
- List subjects = journal.subjects.split(', ');
Navigator.push(
context,
MaterialPageRoute(
@@ -23,11 +23,16 @@ class JournalCard extends StatelessWidget {
title: journal.title,
publisher: journal.publisher,
issn: journal.issn,
- subjects: subjects,
),
),
);
},
+ onLongPress: () {
+ Clipboard.setData(ClipboardData(text: journal.issn));
+ ScaffoldMessenger.of(context).showSnackBar(
+ SnackBar(content: Text('ISSN copied to clipboard')),
+ );
+ },
title: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
diff --git a/lib/widgets/journal_follow_button.dart b/lib/widgets/journal_follow_button.dart
index ded41b6d..060af8d2 100644
--- a/lib/widgets/journal_follow_button.dart
+++ b/lib/widgets/journal_follow_button.dart
@@ -39,14 +39,11 @@ class FollowButton extends StatelessWidget {
await dbHelper.removeJournal(item.issn.first);
} else {
// Follow
- List subjectNames =
- item.subjects.map((subject) => subject.name).toList();
await dbHelper.insertJournal(
Journal(
issn: item.issn.first,
title: item.title,
publisher: item.publisher,
- subjects: subjectNames.join(', '),
),
);
}
diff --git a/lib/widgets/journal_header.dart b/lib/widgets/journal_header.dart
index 6622f891..52ac43e1 100644
--- a/lib/widgets/journal_header.dart
+++ b/lib/widgets/journal_header.dart
@@ -4,12 +4,10 @@ import 'package:flutter_gen/gen_l10n/app_localizations.dart';
class JournalInfoHeader extends SliverPersistentHeaderDelegate {
final String publisher;
final String issn;
- final List subjects;
JournalInfoHeader({
required this.publisher,
required this.issn,
- required this.subjects,
});
@override
@@ -30,8 +28,6 @@ class JournalInfoHeader extends SliverPersistentHeaderDelegate {
SizedBox(height: 8.0),
Text('${AppLocalizations.of(context)!.publisher}: $publisher'),
Text('ISSN: $issn'),
- Text(
- '${AppLocalizations.of(context)!.subjects}: ${subjects.join(', ')}'),
SizedBox(height: 8.0),
Container(
height: 1,
diff --git a/lib/widgets/journal_search_form.dart b/lib/widgets/journal_search_form.dart
new file mode 100644
index 00000000..49742025
--- /dev/null
+++ b/lib/widgets/journal_search_form.dart
@@ -0,0 +1,154 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_gen/gen_l10n/app_localizations.dart';
+import '../screens/journals_search_results_screen.dart';
+import '../services/crossref_api.dart';
+import '../models/crossref_journals_models.dart' as Journals;
+
+class JournalSearchForm extends StatefulWidget {
+ @override
+ _JournalSearchFormState createState() => _JournalSearchFormState();
+}
+
+class _JournalSearchFormState extends State {
+ bool saveQuery = false;
+ int selectedSearchIndex = 0; // 0 for 'name', 1 for 'issn'
+ late Journals.Item selectedJournal;
+ TextEditingController _searchController = TextEditingController();
+
+ @override
+ void initState() {
+ super.initState();
+
+ _searchController.addListener(() {
+ if (selectedSearchIndex == 1) {
+ /*String text = _searchController.text;
+
+ // Limit input to 9 characters
+ if (text.length > 9) {
+ _searchController.value = TextEditingValue(
+ text: text.substring(0, 9),
+ selection: TextSelection.collapsed(offset: 9),
+ );
+ return;
+ }
+
+ // Automatically add a dash after the first 4 digits
+ if (text.length == 4 && !text.contains('-')) {
+ _searchController.value = TextEditingValue(
+ text: '${text}-',
+ selection: TextSelection.collapsed(offset: text.length + 1),
+ );
+ }*/
+ }
+ });
+ }
+
+ @override
+ void dispose() {
+ _searchController.dispose();
+ super.dispose();
+ }
+
+ @override
+ Widget build(BuildContext context) {
+ return Scaffold(
+ body: Padding(
+ padding: const EdgeInsets.all(16.0),
+ child: Column(
+ crossAxisAlignment: CrossAxisAlignment.start,
+ children: [
+ SizedBox(height: 16),
+ Center(
+ child: ToggleButtons(
+ isSelected: [
+ selectedSearchIndex == 0,
+ selectedSearchIndex == 1
+ ],
+ onPressed: (int index) {
+ setState(() {
+ selectedSearchIndex = index;
+ _searchController.clear();
+ });
+ },
+ children: [
+ Padding(
+ padding: const EdgeInsets.symmetric(horizontal: 16.0),
+ child: Text('Search by name'),
+ ),
+ Padding(
+ padding: const EdgeInsets.symmetric(horizontal: 16.0),
+ child: Text('Search by ISSN'),
+ ),
+ ],
+ borderRadius: BorderRadius.circular(8.0),
+ ),
+ ),
+ SizedBox(height: 32),
+ TextField(
+ controller: _searchController,
+ decoration: InputDecoration(
+ labelText: selectedSearchIndex == 0 ? 'Journal name' : 'ISSN',
+ border: OutlineInputBorder(),
+ ),
+ ),
+ SizedBox(height: 16),
+ ],
+ ),
+ ),
+ floatingActionButton: FloatingActionButton(
+ onPressed: () {
+ String query = _searchController.text.trim();
+ if (query.isNotEmpty) {
+ _handleSearch(query);
+ } else {
+ ScaffoldMessenger.of(context).showSnackBar(
+ SnackBar(content: Text('Please enter a search query')),
+ );
+ }
+ },
+ child: Icon(Icons.search),
+ shape: CircleBorder(),
+ ),
+ );
+ }
+
+ void _handleSearch(String query) async {
+ try {
+ showDialog(
+ context: context,
+ barrierDismissible: false,
+ builder: (BuildContext context) {
+ return Center(
+ child: CircularProgressIndicator(),
+ );
+ },
+ );
+
+ CrossRefApi.resetJournalCursor();
+
+ ListAndMore searchResults;
+ if (selectedSearchIndex == 0) {
+ searchResults = await CrossRefApi.queryJournalsByName(query);
+ } else if (selectedSearchIndex == 1) {
+ searchResults = await CrossRefApi.queryJournalsByISSN(query);
+ } else {
+ throw Exception('Invalid search type selected');
+ }
+
+ Navigator.pop(context);
+
+ Navigator.push(
+ context,
+ MaterialPageRoute(
+ builder: (context) => SearchResultsScreen(
+ searchResults: searchResults,
+ searchQuery: query,
+ ),
+ ),
+ );
+ } catch (e) {
+ print('Error handling search: $e');
+ Navigator.pop(context);
+ }
+ }
+}
diff --git a/lib/widgets/journal_search_results_card.dart b/lib/widgets/journal_search_results_card.dart
index 57c8c313..47638226 100644
--- a/lib/widgets/journal_search_results_card.dart
+++ b/lib/widgets/journal_search_results_card.dart
@@ -69,8 +69,6 @@ class _JournalsSearchResultCardState extends State {
},
),
onTap: () {
- List subjectNames =
- widget.item.subjects.map((subject) => subject.name).toList();
// Navigate to the detailed screen when the card is tapped
Navigator.push(
context,
@@ -79,7 +77,6 @@ class _JournalsSearchResultCardState extends State {
title: widget.item.title,
publisher: widget.item.publisher,
issn: widget.item.issn.first,
- subjects: subjectNames,
),
),
);
diff --git a/lib/widgets/journals_tab_content.dart b/lib/widgets/journals_tab_content.dart
new file mode 100644
index 00000000..ebf0aa05
--- /dev/null
+++ b/lib/widgets/journals_tab_content.dart
@@ -0,0 +1,164 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_gen/gen_l10n/app_localizations.dart';
+import '../models/journal_entity.dart';
+import '../widgets/sortbydialog.dart';
+import '../widgets/sortorderdialog.dart';
+import '../services/database_helper.dart';
+import '../widgets/journal_card.dart';
+
+class JournalsTabContent extends StatefulWidget {
+ final int initialSortBy;
+ final int initialSortOrder;
+ final Function(int) onSortByChanged;
+ final Function(int) onSortOrderChanged;
+
+ const JournalsTabContent({
+ Key? key,
+ required this.initialSortBy,
+ required this.initialSortOrder,
+ required this.onSortByChanged,
+ required this.onSortOrderChanged,
+ }) : super(key: key);
+
+ @override
+ _JournalsTabContentState createState() => _JournalsTabContentState();
+}
+
+class _JournalsTabContentState extends State {
+ late DatabaseHelper dbHelper;
+
+ @override
+ void initState() {
+ super.initState();
+ dbHelper = DatabaseHelper();
+ }
+
+ @override
+ Widget build(BuildContext context) {
+ return Column(
+ children: [
+ // Sort options row
+ Padding(
+ padding: const EdgeInsets.all(8.0),
+ child: Row(
+ mainAxisAlignment: MainAxisAlignment.spaceBetween,
+ children: [
+ TextButton.icon(
+ onPressed: () => _showSortByDialog(context),
+ icon: Icon(Icons.sort),
+ label: Text(AppLocalizations.of(context)!.sortby),
+ style:
+ TextButton.styleFrom(visualDensity: VisualDensity.compact),
+ ),
+ TextButton.icon(
+ onPressed: () => _showSortOrderDialog(context),
+ icon: Icon(
+ widget.initialSortOrder == 0
+ ? Icons.arrow_downward
+ : Icons.arrow_upward,
+ ),
+ label: Text(AppLocalizations.of(context)!.sortorder),
+ style:
+ TextButton.styleFrom(visualDensity: VisualDensity.compact),
+ ),
+ ],
+ ),
+ ),
+ // Journal list
+ Expanded(
+ child: FutureBuilder>(
+ future: dbHelper.getJournals(),
+ builder: (context, snapshot) {
+ if (snapshot.connectionState == ConnectionState.waiting) {
+ return CircularProgressIndicator();
+ } else if (snapshot.hasError) {
+ return Text('Error: ${snapshot.error}');
+ } else if (!snapshot.hasData || snapshot.data!.isEmpty) {
+ return Center(
+ child: Wrap(
+ alignment: WrapAlignment.center,
+ children: [
+ Text(AppLocalizations.of(context)!.journalnotfollowing1),
+ Icon(Icons.search),
+ Text(AppLocalizations.of(context)!.journalnotfollowing2),
+ ],
+ ),
+ );
+ } else {
+ List journals = snapshot.data!;
+ journals.sort((a, b) {
+ switch (widget.initialSortBy) {
+ case 0:
+ return a.title.compareTo(b.title);
+ case 1:
+ return a.publisher.compareTo(b.publisher);
+ case 2:
+ return a.dateFollowed!.compareTo(b.dateFollowed!);
+ case 3:
+ return a.issn.compareTo(b.issn);
+ default:
+ return 0;
+ }
+ });
+
+ if (widget.initialSortOrder == 1) {
+ journals = journals.reversed.toList();
+ }
+
+ return ListView.builder(
+ itemCount: journals.length,
+ itemBuilder: (context, index) {
+ final currentJournal = journals[index];
+ return Column(
+ children: [
+ JournalCard(
+ journal: currentJournal,
+ unfollowCallback: _unfollowJournal,
+ ),
+ ],
+ );
+ },
+ );
+ }
+ },
+ ),
+ ),
+ ],
+ );
+ }
+
+ void _showSortByDialog(BuildContext context) {
+ showSortByDialog(
+ context: context,
+ initialSortBy: widget.initialSortBy,
+ onSortByChanged: widget.onSortByChanged,
+ sortOptions: [
+ AppLocalizations.of(context)!.journaltitle,
+ AppLocalizations.of(context)!.publisher,
+ AppLocalizations.of(context)!.followingdate,
+ 'ISSN',
+ ],
+ );
+ }
+
+ void _showSortOrderDialog(BuildContext context) {
+ showDialog(
+ context: context,
+ builder: (BuildContext context) {
+ return SortOrderDialog(
+ initialSortOrder: widget.initialSortOrder,
+ sortOrderOptions: [
+ AppLocalizations.of(context)!.ascending,
+ AppLocalizations.of(context)!.descending,
+ ],
+ onSortOrderChanged: widget.onSortOrderChanged,
+ );
+ },
+ );
+ }
+
+ Future _unfollowJournal(BuildContext context, Journal journal) async {
+ await dbHelper.removeJournal(journal.issn);
+ setState(() {});
+ }
+}
diff --git a/lib/widgets/publication_card.dart b/lib/widgets/publication_card.dart
index f3c71c77..eddf1242 100644
--- a/lib/widgets/publication_card.dart
+++ b/lib/widgets/publication_card.dart
@@ -124,13 +124,13 @@ class _PublicationCardState extends State {
title: widget.journalTitle,
publisher: journalPublisher,
issn: widget.issn,
- subjects: journalSubjects,
),
));
}
},
child: Text(
widget.journalTitle,
+ style: TextStyle(fontSize: 16),
softWrap: true,
),
style: TextButton.styleFrom(
diff --git a/lib/widgets/queries_tab_content.dart b/lib/widgets/queries_tab_content.dart
new file mode 100644
index 00000000..5a5de53d
--- /dev/null
+++ b/lib/widgets/queries_tab_content.dart
@@ -0,0 +1,159 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_gen/gen_l10n/app_localizations.dart';
+import '../models/journal_entity.dart';
+import '../widgets/sortbydialog.dart';
+import '../widgets/sortorderdialog.dart';
+import '../services/database_helper.dart';
+import '../widgets/search_query_card.dart';
+
+class QueriesTabContent extends StatefulWidget {
+ final int initialSortBy;
+ final int initialSortOrder;
+ final Function(int) onSortByChanged;
+ final Function(int) onSortOrderChanged;
+
+ const QueriesTabContent({
+ Key? key,
+ required this.initialSortBy,
+ required this.initialSortOrder,
+ required this.onSortByChanged,
+ required this.onSortOrderChanged,
+ }) : super(key: key);
+
+ @override
+ _QueriesTabContentState createState() => _QueriesTabContentState();
+}
+
+class _QueriesTabContentState extends State {
+ final dbHelper = DatabaseHelper();
+ late Future>> savedQueriesFuture;
+
+ @override
+ void initState() {
+ super.initState();
+ savedQueriesFuture = dbHelper.getSavedQueries();
+ }
+
+ @override
+ Widget build(BuildContext context) {
+ return Column(
+ children: [
+ // Sort options row
+ Padding(
+ padding: const EdgeInsets.all(8.0),
+ child: Row(
+ mainAxisAlignment: MainAxisAlignment.spaceBetween,
+ children: [
+ TextButton.icon(
+ onPressed: () => _showSortByDialog(context),
+ icon: Icon(Icons.sort),
+ label: Text(AppLocalizations.of(context)!.sortby),
+ style:
+ TextButton.styleFrom(visualDensity: VisualDensity.compact),
+ ),
+ TextButton.icon(
+ onPressed: () => _showSortOrderDialog(context),
+ icon: Icon(
+ widget.initialSortOrder == 0
+ ? Icons.arrow_downward
+ : Icons.arrow_upward,
+ ),
+ label: Text(AppLocalizations.of(context)!.sortorder),
+ style:
+ TextButton.styleFrom(visualDensity: VisualDensity.compact),
+ ),
+ ],
+ ),
+ ),
+ // Saved queries list
+ Expanded(
+ child: FutureBuilder>>(
+ future: savedQueriesFuture,
+ builder: (context, snapshot) {
+ if (snapshot.connectionState == ConnectionState.waiting) {
+ return const Center(child: CircularProgressIndicator());
+ } else if (snapshot.hasError) {
+ return Center(child: Text('Error: ${snapshot.error}'));
+ } else if (!snapshot.hasData || snapshot.data!.isEmpty) {
+ return Center(
+ child: Wrap(
+ alignment: WrapAlignment.center,
+ children: [
+ Text('No saved queries.'),
+ Icon(Icons.search),
+ ],
+ ),
+ );
+ } else {
+ // Sorting logic
+ List> savedQueries =
+ List.from(snapshot.data!);
+ savedQueries.sort((a, b) {
+ switch (widget.initialSortBy) {
+ case 0: // Sort by query name
+ return a['queryName'].compareTo(b['queryName']);
+ case 1: // Sort by date saved
+ return a['dateSaved'].compareTo(b['dateSaved']);
+ default:
+ return 0;
+ }
+ });
+
+ if (widget.initialSortOrder == 1) {
+ savedQueries = savedQueries.reversed.toList();
+ }
+
+ // Display saved queries
+ return ListView.builder(
+ itemCount: savedQueries.length,
+ itemBuilder: (context, index) {
+ final query = savedQueries[index];
+ return SearchQueryCard(
+ queryName: query['queryName'],
+ queryParams: query['queryParams'],
+ dateSaved: query['dateSaved'],
+ onDelete: () async {
+ await dbHelper.deleteQuery(query['query_id']);
+ setState(() {
+ savedQueriesFuture = dbHelper.getSavedQueries();
+ });
+ },
+ );
+ },
+ );
+ }
+ },
+ ),
+ ),
+ ],
+ );
+ }
+
+ void _showSortByDialog(BuildContext context) {
+ showSortByDialog(
+ context: context,
+ initialSortBy: widget.initialSortBy,
+ onSortByChanged: widget.onSortByChanged,
+ sortOptions: [
+ "Query name",
+ "Date saved",
+ ],
+ );
+ }
+
+ void _showSortOrderDialog(BuildContext context) {
+ showDialog(
+ context: context,
+ builder: (BuildContext context) {
+ return SortOrderDialog(
+ initialSortOrder: widget.initialSortOrder,
+ sortOrderOptions: [
+ AppLocalizations.of(context)!.ascending,
+ AppLocalizations.of(context)!.descending,
+ ],
+ onSortOrderChanged: widget.onSortOrderChanged,
+ );
+ },
+ );
+ }
+}
diff --git a/lib/widgets/search_query_card.dart b/lib/widgets/search_query_card.dart
new file mode 100644
index 00000000..44a45202
--- /dev/null
+++ b/lib/widgets/search_query_card.dart
@@ -0,0 +1,101 @@
+import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
+import '../services/crossref_api.dart';
+import '../services/string_format_helper.dart';
+import '../screens/article_search_results_screen.dart';
+
+class SearchQueryCard extends StatelessWidget {
+ final String queryName;
+ final String queryParams;
+ final String dateSaved;
+ final VoidCallback? onDelete;
+
+ const SearchQueryCard({
+ Key? key,
+ required this.queryName,
+ required this.queryParams,
+ required this.dateSaved,
+ this.onDelete,
+ }) : super(key: key);
+
+ @override
+ Widget build(BuildContext context) {
+ DateTime? parsedDate = DateTime.tryParse(dateSaved);
+ String formattedDate = formatDate(parsedDate);
+ return GestureDetector(
+ onTap: () async {
+ // Show loading indicator
+ showDialog(
+ context: context,
+ barrierDismissible: false,
+ builder: (BuildContext context) {
+ return const Center(child: CircularProgressIndicator());
+ },
+ );
+ // Convert the params string to the needed mapstring
+ Map queryMap = Uri.splitQueryString(queryParams);
+ CrossRefApi.resetWorksQueryCursor(); // Reset the cursor on new search
+ var response = await CrossRefApi.getWorksByQuery(queryMap);
+
+ Navigator.pop(context);
+ // Navigate to the search results screen
+ Navigator.push(
+ context,
+ MaterialPageRoute(
+ builder: (context) => ArticleSearchResultsScreen(
+ initialSearchResults: response.list,
+ initialHasMore: response.hasMore,
+ queryParams: queryMap,
+ ),
+ ),
+ );
+ },
+ onLongPress: () {
+ // Copy the API request to clipboard
+ String request = 'https://api.crossref.org/works?$queryParams&rows=50';
+ Clipboard.setData(ClipboardData(text: request));
+ ScaffoldMessenger.of(context).showSnackBar(
+ SnackBar(content: Text('API request copied to clipboard')),
+ );
+ },
+ child: Card(
+ margin: const EdgeInsets.symmetric(vertical: 8.0, horizontal: 16.0),
+ child: Padding(
+ padding: const EdgeInsets.all(16.0),
+ child: Column(
+ crossAxisAlignment: CrossAxisAlignment.start,
+ children: [
+ Row(
+ mainAxisAlignment: MainAxisAlignment.spaceBetween,
+ children: [
+ Text(
+ queryName,
+ style: const TextStyle(
+ fontSize: 16.0,
+ fontWeight: FontWeight.bold,
+ ),
+ ),
+ if (onDelete != null)
+ IconButton(
+ icon: const Icon(Icons.delete_outline),
+ onPressed: onDelete,
+ ),
+ ],
+ ),
+ const SizedBox(height: 8.0),
+ Text(
+ queryParams,
+ style: const TextStyle(fontSize: 14.0),
+ ),
+ const SizedBox(height: 8.0),
+ Text(
+ "Saved on: $formattedDate",
+ style: const TextStyle(fontSize: 12.0, color: Colors.grey),
+ ),
+ ],
+ ),
+ ),
+ ),
+ );
+ }
+}
diff --git a/screenshots/dark_android_abstract.png b/screenshots/dark_android_abstract.png
index 916d482f..9d11ae62 100644
Binary files a/screenshots/dark_android_abstract.png and b/screenshots/dark_android_abstract.png differ
diff --git a/screenshots/dark_android_journals.png b/screenshots/dark_android_journals.png
deleted file mode 100644
index bfb75a2f..00000000
Binary files a/screenshots/dark_android_journals.png and /dev/null differ
diff --git a/screenshots/dark_ios_journal_details.png b/screenshots/dark_ios_journal_details.png
new file mode 100644
index 00000000..6dd32724
Binary files /dev/null and b/screenshots/dark_ios_journal_details.png differ
diff --git a/screenshots/dark_ios_library_journals.png b/screenshots/dark_ios_library_journals.png
new file mode 100644
index 00000000..66957f57
Binary files /dev/null and b/screenshots/dark_ios_library_journals.png differ
diff --git a/screenshots/dark_ios_library_queries.png b/screenshots/dark_ios_library_queries.png
new file mode 100644
index 00000000..d8faad7a
Binary files /dev/null and b/screenshots/dark_ios_library_queries.png differ
diff --git a/screenshots/light_android_search_results.png b/screenshots/light_android_search_results.png
deleted file mode 100644
index 7421423b..00000000
Binary files a/screenshots/light_android_search_results.png and /dev/null differ
diff --git a/screenshots/light_ios_feed.png b/screenshots/light_ios_feed.png
new file mode 100644
index 00000000..e85d4e57
Binary files /dev/null and b/screenshots/light_ios_feed.png differ
diff --git a/screenshots/light_ios_journal_details.png b/screenshots/light_ios_journal_details.png
deleted file mode 100644
index a476c94a..00000000
Binary files a/screenshots/light_ios_journal_details.png and /dev/null differ
diff --git a/screenshots/light_ios_search_screen.png b/screenshots/light_ios_search_screen.png
new file mode 100644
index 00000000..391e8701
Binary files /dev/null and b/screenshots/light_ios_search_screen.png differ