fixed theme and also loading issue

some other minor bugs as well
HQAnime · Jun 14, 2021 · b62504d · b62504d
1 parent c06cd66
commit b62504d
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 6 deletions.
diff --git a/animego/lib/core/Util.dart b/animego/lib/core/Util.dart
@@ -9,7 +9,7 @@ class Util {
   Util(this.context);
 
   bool isDarkMode() {
-    return MediaQuery.of(context).platformBrightness == Brightness.dark;
+    return Theme.of(context).brightness == Brightness.dark;
   }
 
   static bool isMobile() {

diff --git a/animego/lib/core/model/AnimeDetailedInfo.dart b/animego/lib/core/model/AnimeDetailedInfo.dart
@@ -60,6 +60,8 @@ class AnimeDetailedInfo {
         this.episodes.add(EpisodeSection(element, animeID));
       }
     });
-    lastEpisode = this.episodes.last.episodeEnd;
+
+    // Make sure it is not empty at least
+    if (this.episodes.length > 0) lastEpisode = this.episodes.last.episodeEnd;
   }
 }
diff --git a/animego/lib/main.dart b/animego/lib/main.dart
@@ -17,6 +17,7 @@ class MyApp extends StatelessWidget {
   final darkTheme = ThemeData(
     brightness: Brightness.dark,
     primarySwatch: Colors.orange,
+    accentColor: Colors.orange,
     appBarTheme: AppBarTheme(
       brightness: Brightness.dark,
     ),
@@ -36,7 +37,7 @@ class MyApp extends StatelessWidget {
   Widget build(BuildContext context) {
     return MaterialApp(
       title: 'AnimeGo Re',
-      theme: darkTheme,
+      theme: lightTheme,
       darkTheme: darkTheme,
       home: FutureBuilder(
         future: Global().init(),

diff --git a/animego/lib/ui/page/AnimeDetailPage.dart b/animego/lib/ui/page/AnimeDetailPage.dart
@@ -131,7 +131,8 @@ class _AnimeDetailPageState extends State<AnimeDetailPage> {
                       centeredListTile(
                           'Episode(s)', info?.lastEpisode ?? 'Unkown'),
                       ListTile(
-                        title: Text('Catagory', textAlign: TextAlign.center),
+                        title: Text('Category', textAlign: TextAlign.center),
+                        // TODO: This button is very hidden so the user may not know about this
                         subtitle: AnimeFlatButton(
                           onPressed: () {
                             Navigator.pushReplacement(

diff --git a/animego/lib/ui/widget/AnimeGrid.dart b/animego/lib/ui/widget/AnimeGrid.dart
@@ -58,8 +58,8 @@ class _AnimeGridState extends State<AnimeGrid> {
 
   /// Increase page and load more data
   void loadData({bool refresh = false}) {
-    // Reset page to 0
-    if (refresh) page = 0;
+    // Reset page to 1, start from 1 not ZERO
+    if (refresh) page = 1;
 
     setState(() {
       canLoadMore = false;