Merge pull request #9 from ajxv/updates

Updates
ajxv · Dec 31, 2023 · ce83cc7 · ce83cc7
2 parents f4eb712 + 221f082
commit ce83cc7
Show file tree

Hide file tree

Showing 6 changed files with 60 additions and 38 deletions.
diff --git a/lib/providers/entry_status_provider.dart b/lib/providers/entry_status_provider.dart
@@ -4,7 +4,9 @@ import 'package:fluttertoast/fluttertoast.dart';
 import '../services/mal_services.dart';
 
 class EntryStatusProvider extends ChangeNotifier {
-  String initialStatus = '';
+  String _initialStatus = '';
+  int _totalCount = 0;
+
   final _myListStatus = {};
 
   get myListStatus => _myListStatus;
@@ -21,7 +23,9 @@ class EntryStatusProvider extends ChangeNotifier {
 
   // load status from myliststatus object
   void loadListStatus(isAnime, myListStatus, totalCount) {
-    initialStatus = myListStatus.status;
+    _initialStatus = myListStatus.status;
+    _totalCount = totalCount;
+
     setMyListStatus(
       status: myListStatus.status,
       score: myListStatus.score,
@@ -34,6 +38,11 @@ class EntryStatusProvider extends ChangeNotifier {
 
   // update status
   void updateStatus(entryId, isAnime, refreshFunction) {
+    // if all episodes watched / chapters read, automatically mark as completed
+    if (_totalCount != 0 && _myListStatus['completed'] == _totalCount) {
+      _myListStatus['status'] = 'completed';
+    }
+
     if (isAnime) {
       MyAnimelistApi()
           .updateListAnime(
@@ -47,9 +56,9 @@ class EntryStatusProvider extends ChangeNotifier {
           Fluttertoast.showToast(msg: "Updated");
 
           // refresh lists
-          if (initialStatus.isNotEmpty &&
-              initialStatus != _myListStatus['status']) {
-            refreshFunction(initialStatus);
+          if (_initialStatus.isNotEmpty &&
+              _initialStatus != _myListStatus['status']) {
+            refreshFunction(_initialStatus);
           }
 
           refreshFunction(_myListStatus['status']);
@@ -71,8 +80,8 @@ class EntryStatusProvider extends ChangeNotifier {
           Fluttertoast.showToast(msg: "Updated");
 
           // refresh lists
-          if (initialStatus != _myListStatus['status']) {
-            refreshFunction(initialStatus);
+          if (_initialStatus != _myListStatus['status']) {
+            refreshFunction(_initialStatus);
           }
 
           refreshFunction(_myListStatus['status']);
@@ -89,7 +98,7 @@ class EntryStatusProvider extends ChangeNotifier {
     if (isAnime) {
       MyAnimelistApi().removeListAnime(animeId: entryId).then((value) {
         // refresh list
-        refreshFunction(initialStatus);
+        refreshFunction(_initialStatus);
         // show toast
         Fluttertoast.showToast(msg: "Removed from List");
       }).catchError((error) {
@@ -98,7 +107,7 @@ class EntryStatusProvider extends ChangeNotifier {
     } else {
       MyAnimelistApi().removeListManga(mangaId: entryId).then((value) {
         // refresh list
-        refreshFunction(initialStatus);
+        refreshFunction(_initialStatus);
         // show toast
         Fluttertoast.showToast(msg: "Removed from List");
       }).catchError((error) {

diff --git a/lib/screens/entry_details_screen.dart b/lib/screens/entry_details_screen.dart
@@ -126,7 +126,7 @@ class _EntryDetailPageState extends State<EntryDetailPage> {
                   // basic details
                   BasicDetailSection(
                     imageUrl: entryDetails.mainPicture.large,
-                    animeTitle: entryDetails.title,
+                    title: entryDetails.title,
                     mediaType: entryDetails.mediaType,
                     airingStatus: entryDetails.status,
                     meanScore: entryDetails.mean,
@@ -480,7 +480,7 @@ class _EntryDetailPageState extends State<EntryDetailPage> {
 
 class BasicDetailSection extends StatelessWidget {
   final String imageUrl;
-  final String animeTitle;
+  final String title;
   final String mediaType;
   final String airingStatus;
   final double meanScore;
@@ -490,7 +490,7 @@ class BasicDetailSection extends StatelessWidget {
   const BasicDetailSection({
     super.key,
     required this.imageUrl,
-    required this.animeTitle,
+    required this.title,
     required this.mediaType,
     required this.airingStatus,
     required this.meanScore,
@@ -530,11 +530,11 @@ class BasicDetailSection extends StatelessWidget {
                 children: [
                   GestureDetector(
                     onLongPress: () async {
-                      await Clipboard.setData(ClipboardData(text: animeTitle));
+                      await Clipboard.setData(ClipboardData(text: title));
                       Fluttertoast.showToast(msg: "Title copied to clipboard");
                     },
                     child: Text(
-                      animeTitle,
+                      title,
                       style: const TextStyle(
                         fontSize: 20,
                         fontWeight: FontWeight.bold,

diff --git a/lib/screens/homepage.dart b/lib/screens/homepage.dart
@@ -42,16 +42,20 @@ class _HomePageState extends State<HomePage> {
                 ),
               );
             },
-            icon: CircleAvatar(
-                radius: 15,
-                backgroundImage: Provider.of<SessionProvider>(context)
-                        .user
-                        .picture
-                        .isNotEmpty
-                    ? CachedNetworkImageProvider(
-                        context.read<SessionProvider>().user.picture)
-                    : const AssetImage("assets/images/profile_placeholder.jpeg")
-                        as ImageProvider)),
+            icon: Hero(
+              tag: "profileImage",
+              child: CircleAvatar(
+                  radius: 15,
+                  backgroundImage: Provider.of<SessionProvider>(context)
+                          .user
+                          .picture
+                          .isNotEmpty
+                      ? CachedNetworkImageProvider(
+                          context.read<SessionProvider>().user.picture)
+                      : const AssetImage(
+                              "assets/images/profile_placeholder.jpeg")
+                          as ImageProvider),
+            )),
         title: Text(
           "ฅᨐฅ",
           style: TextStyle(

diff --git a/lib/screens/profile.dart b/lib/screens/profile.dart
@@ -32,7 +32,10 @@ class Profile extends StatelessWidget {
                 ),
               );
             },
-            icon: const Icon(Icons.settings),
+            icon: const Hero(
+              tag: "settings",
+              child: Icon(Icons.settings),
+            ),
           )
         ],
       ),
@@ -46,19 +49,22 @@ class Profile extends StatelessWidget {
             padding: const EdgeInsets.all(10),
             children: [
               const SizedBox(height: 20),
-              Container(
-                decoration: BoxDecoration(
-                  image: DecorationImage(
-                    image: value.user.picture.isNotEmpty
-                        ? CachedNetworkImageProvider(value.user.picture)
-                        : const AssetImage(
-                                "assets/images/profile_placeholder.jpeg")
-                            as ImageProvider,
-                    fit: BoxFit.contain,
+              Hero(
+                tag: "profileImage",
+                child: Container(
+                  decoration: BoxDecoration(
+                    image: DecorationImage(
+                      image: value.user.picture.isNotEmpty
+                          ? CachedNetworkImageProvider(value.user.picture)
+                          : const AssetImage(
+                                  "assets/images/profile_placeholder.jpeg")
+                              as ImageProvider,
+                      fit: BoxFit.contain,
+                    ),
+                    shape: BoxShape.circle,
                   ),
-                  shape: BoxShape.circle,
+                  height: 150,
                 ),
-                height: 150,
               ),
               const SizedBox(height: 15),
               Text(

diff --git a/lib/screens/settings_screen.dart b/lib/screens/settings_screen.dart
@@ -104,7 +104,10 @@ class SettingsPage extends StatelessWidget {
         backgroundColor: Theme.of(context).colorScheme.background,
         leading: IconButton(
           onPressed: () => Navigator.of(context).pop(),
-          icon: const Icon(Icons.chevron_left),
+          icon: Hero(
+            tag: "settings",
+            child: const Icon(Icons.chevron_left),
+          ),
         ),
         title: const Text(
           "Settings",

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -16,7 +16,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.2+1
+version: 1.1.0+1
 
 environment:
   sdk: '>=3.0.5 <4.0.0'