Merge pull request #3 from ngomile/main

Rely on source sorting listings and other changes

Author: ngomile

lib/custom_widgets/job_list_retriever.dart

@@ -4,21 +4,18 @@ import 'package:flutter/material.dart';
 import 'package:katswiri/custom_widgets/custom_widgets.dart';
 import 'package:katswiri/models/models.dart';
 import 'package:katswiri/sources/sources.dart';
-import 'package:katswiri/utils/utils.dart';
 
 class JobListRetriever extends StatefulWidget {
   const JobListRetriever({
     super.key,
     required this.source,
     this.filter,
     this.primary,
-    this.sortJobs = true,
   });
 
   final Source source;
   final Map<String, String>? filter;
   final bool? primary;
-  final bool sortJobs;
 
   @override
   State<JobListRetriever> createState() => _JobListRetrieverState();
@@ -33,7 +30,7 @@ class _JobListRetrieverState extends State<JobListRetriever>
   bool _loading = true;
   bool _hasError = false;
   String _errMsg = '';
-  bool _showButton = false;
+  bool _showScrollTop = false;
 
   late final StreamController<List<Job>> _streamController =
       StreamController.broadcast();
@@ -79,15 +76,14 @@ class _JobListRetrieverState extends State<JobListRetriever>
           stream: _streamController.stream,
           builder: _builder,
         ),
-        if (_showButton)
-          Positioned(
-            bottom: 16,
-            right: 16,
-            child: FloatingActionButton(
-              onPressed: _scrollToTop,
-              child: const Icon(Icons.arrow_upward),
-            ),
+        Positioned(
+          right: 16.0,
+          bottom: 16.0,
+          child: _ScrollToTop(
+            onPressed: _scrollToTop,
+            showScrollTop: _showScrollTop,
           ),
+        ),
       ],
     );
   }
@@ -134,7 +130,6 @@ class _JobListRetrieverState extends State<JobListRetriever>
         controller: _scrollController,
         padding: const EdgeInsets.only(top: 4.0),
         primary: widget.primary,
-        shrinkWrap: true,
         itemBuilder: (context, index) => widgetList[index],
         itemCount: widgetList.length,
       );
@@ -176,26 +171,20 @@ class _JobListRetrieverState extends State<JobListRetriever>
   }
 
   void _onShowToTop() {
-    if (_scrollController.offset >= 100 && !_showButton) {
+    if (_scrollController.offset >= 100 && !_showScrollTop) {
       setState(() {
-        _showButton = true;
+        _showScrollTop = true;
       });
-    } else if (_scrollController.offset < 100 && _showButton) {
+    } else if (_scrollController.offset < 100 && _showScrollTop) {
       setState(() {
-        _showButton = false;
+        _showScrollTop = false;
       });
     }
   }
 
   void _onData(List<Job> jobs) {
     _jobs.addAll(jobs);
 
-    if (widget.sortJobs) {
-      _jobs.sort(
-        (a, b) => postedDate(b.posted).compareTo(postedDate(a.posted)),
-      );
-    }
-
     setState(() {
       _page++;
       _loading = false;
@@ -239,3 +228,34 @@ class _JobListRetrieverState extends State<JobListRetriever>
     );
   }
 }
+
+class _ScrollToTop extends StatefulWidget {
+  const _ScrollToTop({
+    required this.onPressed,
+    required this.showScrollTop,
+  });
+
+  final void Function() onPressed;
+  final bool showScrollTop;
+
+  @override
+  State<_ScrollToTop> createState() => __ScrollToTopState();
+}
+
+class __ScrollToTopState extends State<_ScrollToTop> {
+  @override
+  Widget build(BuildContext context) {
+    return AnimatedOpacity(
+      opacity: widget.showScrollTop ? 1.0 : 0.0,
+      duration: const Duration(milliseconds: 800),
+      curve: Curves.elasticIn,
+      child: Visibility(
+        visible: widget.showScrollTop,
+        child: FloatingActionButton(
+          onPressed: widget.onPressed,
+          child: const Icon(Icons.arrow_upward),
+        ),
+      ),
+    );
+  }
+}

lib/custom_widgets/tabbed_sources.dart

@@ -61,7 +61,6 @@ class _TabbedSourcesState extends State<TabbedSources>
             tabController: _tabController,
             sources: _sources,
             filter: widget.filter,
-            sortJobs: widget.sortJobs,
           ),
         ),
       ],
@@ -122,14 +121,12 @@ class TabBarViewSection extends StatefulWidget {
     required this.tabController,
     required this.sources,
     this.filter,
-    this.sortJobs = true,
     super.key,
   });
 
   final TabController tabController;
   final List<Source> sources;
   final Map<String, String>? filter;
-  final bool sortJobs;
 
   @override
   State<TabBarViewSection> createState() => _TabBarViewSectionState();
@@ -145,7 +142,6 @@ class _TabBarViewSectionState extends State<TabBarViewSection> {
             (source) => JobListRetriever(
               source: source,
               filter: widget.filter,
-              sortJobs: widget.sortJobs,
             ),
           )
           .toList(),

lib/screens/about_screen.dart

@@ -65,7 +65,7 @@ class _AppDetailSection extends StatelessWidget {
                 ),
               ),
               TextSpan(
-                text: 'Version 1.0.1\n',
+                text: 'Version 1.0.2\n',
                 style: TextStyle(
                   color: Theme.of(context).colorScheme.secondary,
                 ),

lib/screens/webview_screen.dart

@@ -37,23 +37,28 @@ class _WebViewScreenState extends State<WebViewScreen> {
       ..setJavaScriptMode(JavaScriptMode.unrestricted)
       ..loadRequest(Uri.parse(_url))
       ..setNavigationDelegate(
-        NavigationDelegate(onProgress: (progress) {
-          setState(() {
-            _progressValue = progress / 100;
-          });
-        }, onPageStarted: (_) {
-          setState(() {
-            _progressValue = 0.0;
-          });
-        }, onPageFinished: (_) {
-          setState(() {
-            _progressValue = 1.0;
-          });
-        }, onUrlChange: (UrlChange urlChange) {
-          setState(() {
-            _url = urlChange.url ?? '';
-          });
-        }),
+        NavigationDelegate(
+          onProgress: (progress) {
+            setState(() {
+              _progressValue = progress / 100;
+            });
+          },
+          onPageStarted: (_) {
+            setState(() {
+              _progressValue = 0.0;
+            });
+          },
+          onPageFinished: (_) {
+            setState(() {
+              _progressValue = 1.0;
+            });
+          },
+          onUrlChange: (UrlChange urlChange) {
+            setState(() {
+              _url = urlChange.url ?? '';
+            });
+          },
+        ),
       );
 
     super.initState();

pubspec.yaml

@@ -17,7 +17,7 @@ publish_to: "none" # Remove this line if you wish to publish to pub.dev
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
 # In Windows, build-name is used as the major, minor, and patch parts
 # of the product and file versions while build-number is used as the build suffix.
-version: 1.0.1+2
+version: 1.0.2+3
 
 environment:
   sdk: ">=3.0.2"