diff --git a/lib/Screens/Lists/mangalist.dart b/lib/Screens/Lists/mangalist.dart index b90014b..7949d26 100644 --- a/lib/Screens/Lists/mangalist.dart +++ b/lib/Screens/Lists/mangalist.dart @@ -1,3 +1,5 @@ +// ignore_for_file: library_private_types_in_public_api + import 'package:daizy_tv/auth/auth_provider.dart'; import 'package:daizy_tv/components/Manga/all_manga_lists.dart'; import 'package:daizy_tv/components/Manga/manga_user_data.dart'; @@ -29,8 +31,7 @@ return Consumer( {"name": "All", "view": AllMangaLists(data: provider['mangaList'])}, {"name": "Completed", "view": MangaLists(data: provider['mangaList'], status: "COMPLETED")}, {"name": "Planning", "view": MangaLists(data: provider['mangaList'], status: "PLANNING")}, - {"name": "Releasing", "view": MangaLists(data: provider['mangaList'], status: "RELEASING")}, - {"name": "Reading", "view": MangaLists(data: provider['mangaList'], status: "READING")}, + {"name": "Reading", "view": MangaLists(data: provider['mangaList'], status: "CURRENT")}, {"name": "Repeating", "view": MangaLists(data: provider['mangaList'], status: "REPEATING")}, {"name": "Paused", "view": MangaLists(data: provider['mangaList'], status: "PAUSED")}, {"name": "Dropped","view": MangaLists(data: provider['mangaList'], status: "DROPPED")}, @@ -48,6 +49,11 @@ return Consumer( _scaffoldKey.currentState?.openDrawer(); }, ), + actions: [ + IconButton(onPressed: (){ + Navigator.pop(context); + }, icon: const Icon(Icons.close)) + ], ), drawer: Drawer( width: 200, diff --git a/lib/Screens/Manga/mangaDetails.dart b/lib/Screens/Manga/mangaDetails.dart index 3e979a1..681053b 100644 --- a/lib/Screens/Manga/mangaDetails.dart +++ b/lib/Screens/Manga/mangaDetails.dart @@ -288,6 +288,7 @@ class _DetailsState extends State { child: CircularProgressIndicator(), ) : ListView.builder( + physics: const BouncingScrollPhysics(), itemCount: wrongTitleSearchData.length, itemBuilder: (context, index) { final title = @@ -303,11 +304,7 @@ class _DetailsState extends State { child: Container( decoration: BoxDecoration( borderRadius: BorderRadius.circular(5), - border: Border.all( - color: Theme.of(context) - .colorScheme - .primary, - ), + color:Theme.of(context).colorScheme.surfaceContainerHigh ), height: 90, child: Row( @@ -735,6 +732,7 @@ class _DetailsState extends State { height: 400, child: chapterList != null && chapterList!.isNotEmpty ? ListView( + physics: const BouncingScrollPhysics(), children: chapterList!.map((chapter) { return Chapterlist( id: widget.id, diff --git a/lib/Screens/settings/_about.dart b/lib/Screens/settings/_about.dart index a19bb4e..ce98888 100644 --- a/lib/Screens/settings/_about.dart +++ b/lib/Screens/settings/_about.dart @@ -1,3 +1,5 @@ +// ignore_for_file: non_constant_identifier_names + import 'package:flutter/material.dart'; import 'package:ionicons/ionicons.dart'; import 'package:url_launcher/url_launcher.dart'; @@ -19,7 +21,8 @@ class About extends StatelessWidget { final width = MediaQuery.of(context).size.width; return Scaffold( backgroundColor: Theme.of(context).colorScheme.surface, - body: Column( + body: ListView( + physics: const BouncingScrollPhysics(), children: [ Stack( children: [ @@ -79,7 +82,7 @@ class About extends StatelessWidget { ), ), GestureDetector( - onTap: (){ + onTap: () { _launchURL("https://github.com/reyyuuki"); }, child: Container( @@ -127,6 +130,15 @@ class About extends StatelessWidget { ), ), ), + Positioned( + top: 10, + left: 0, + child: IconButton( + onPressed: () { + Navigator.pop(context); + }, + iconSize: 35, + icon: const Icon(Icons.arrow_back_ios))) ], ), const SizedBox( @@ -136,23 +148,43 @@ class About extends StatelessWidget { padding: const EdgeInsets.all(15.0), child: Column( children: [ - list_tile(width, context, const Icon(Ionicons.logo_github), - "Github", "Explore and contribute to the code.", "https://github.com/reyyuuki/Azyx"), + list_tile( + width, + context, + const Icon(Ionicons.logo_github), + "Github", + "Explore and contribute to the code.", + "https://github.com/reyyuuki/Azyx"), const SizedBox( height: 10, ), - list_tile(width, context, const Icon(Ionicons.logo_discord), - "Discord", "Chat and collaborate with community.","https://discord.com/channels/@me"), + list_tile( + width, + context, + const Icon(Ionicons.logo_discord), + "Discord", + "Chat and collaborate with community.", + "https://discord.com/channels/@me"), const SizedBox( height: 10, ), - list_tile(width, context, const Icon(Icons.telegram), - "Telegram", "Stay updated and connect with others.","https://t.me/Azyxanime"), + list_tile( + width, + context, + const Icon(Icons.telegram), + "Telegram", + "Stay updated and connect with others.", + "https://t.me/Azyxanime"), const SizedBox( height: 10, ), - list_tile(width, context, const Icon(Ionicons.logo_reddit), - "Reddit", "Discuss features and share feedback.","https://www.reddit.com/?rdt=44738"), + list_tile( + width, + context, + const Icon(Ionicons.logo_reddit), + "Reddit", + "Discuss features and share feedback.", + "https://www.reddit.com/?rdt=44738"), ], ), ) @@ -164,7 +196,7 @@ class About extends StatelessWidget { GestureDetector list_tile(double width, BuildContext context, Icon icon, String name, String subTitle, String url) { return GestureDetector( - onTap: (){ + onTap: () { _launchURL(url); }, child: Container(