Creepso/mangayomi
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

refact

Browse source
This commit is contained in:
kodjomoustapha 2023-06-08 16:55:58 +01:00
parent 3d6b07de02
commit 2a45b1d993
8 changed files with 32 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
lib/modules/local_reader/local_reader_screen.dart → lib/modules/archive_reader/archive_reader_screen.dart
View file

@ -2,8 +2,8 @@ import 'package:file_picker/file_picker.dart';
import 'package:flutter/material.dart';
import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:go_router/go_router.dart';
import 'package:mangayomi/modules/local_reader/models/models.dart';
import 'package:mangayomi/modules/local_reader/providers/local_reader_providers.dart';
import 'package:mangayomi/modules/archive_reader/models/models.dart';
import 'package:mangayomi/modules/archive_reader/providers/archive_reader_providers.dart';
import 'package:mangayomi/modules/widgets/progress_center.dart';
import 'package:mangayomi/utils/media_query.dart';
@ -23,7 +23,7 @@ class _LocalReaderScreenState extends ConsumerState<LocalReaderScreen> {
children: [
Scaffold(
appBar: AppBar(
title: const Text('Local Reader'),
title: const Text('Archive Reader'),
),
body: Column(
crossAxisAlignment: CrossAxisAlignment.center,
@ -31,7 +31,7 @@ class _LocalReaderScreenState extends ConsumerState<LocalReaderScreen> {
Row(
mainAxisAlignment: MainAxisAlignment.spaceAround,
children: [
IconButton(
ElevatedButton.icon(
onPressed: () async {
setState(() {
isLoading = true;
@ -63,8 +63,9 @@ class _LocalReaderScreenState extends ConsumerState<LocalReaderScreen> {
});
}
},
icon: const Icon(Icons.file_open)),
IconButton(
label: const Text("Load cbz file"),
icon: const Icon(Icons.archive_rounded)),
ElevatedButton.icon(
onPressed: () async {
setState(() {
isLoading = true;
@ -88,6 +89,7 @@ class _LocalReaderScreenState extends ConsumerState<LocalReaderScreen> {
});
}
},
label: const Text("Load from directory"),
icon: const Icon(Icons.create_new_folder_rounded)),
],
),
@ -104,7 +106,7 @@ class _LocalReaderScreenState extends ConsumerState<LocalReaderScreen> {
clipBehavior: Clip.antiAliasWithSaveLayer,
child: InkWell(
onTap: () {
context.push("/localReaderReaderView",
context.push("/archiveReaderReaderView",
extra: images[index]);
},
child: Ink.image(

0
lib/modules/local_reader/models/models.dart → lib/modules/archive_reader/models/models.dart
View file

4
lib/modules/local_reader/providers/local_reader_providers.dart → lib/modules/archive_reader/providers/archive_reader_providers.dart
View file

@ -1,9 +1,9 @@
import 'dart:io';
import 'package:archive/archive_io.dart';
import 'package:flutter/foundation.dart';
import 'package:mangayomi/modules/local_reader/models/models.dart';
import 'package:mangayomi/modules/archive_reader/models/models.dart';
import 'package:riverpod_annotation/riverpod_annotation.dart';
part 'local_reader_providers.g.dart';
part 'archive_reader_providers.g.dart';
@riverpod
Future<List<LocalArchive>> getArchiveDataFromDirectory(

2
lib/modules/local_reader/providers/local_reader_providers.g.dart → lib/modules/archive_reader/providers/archive_reader_providers.g.dart
View file

@ -1,6 +1,6 @@
// GENERATED CODE - DO NOT MODIFY BY HAND
part of 'local_reader_providers.dart';
part of 'archive_reader_providers.dart';
// **************************************************************************
// RiverpodGenerator

6
lib/modules/local_reader/reader/local_reader_reader_view.dart → lib/modules/archive_reader/reader/archive_reader_reader_view.dart
View file

@ -7,7 +7,7 @@ import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:flutter/material.dart';
import 'package:mangayomi/main.dart';
import 'package:mangayomi/models/settings.dart';
import 'package:mangayomi/modules/local_reader/models/models.dart';
import 'package:mangayomi/modules/archive_reader/models/models.dart';
import 'package:mangayomi/utils/image_detail_info.dart';
import 'package:mangayomi/utils/media_query.dart';
import 'package:mangayomi/modules/manga/reader/widgets/circular_progress_indicator_animate_rotate.dart';
@ -18,9 +18,9 @@ import 'package:scrollable_positioned_list/scrollable_positioned_list.dart';
typedef DoubleClickAnimationListener = void Function();
class LocalReaderReaderView extends ConsumerWidget {
class ArchiveReaderReaderView extends ConsumerWidget {
final LocalArchive localArchive;
const LocalReaderReaderView({
const ArchiveReaderReaderView({
super.key,
required this.localArchive,
});

14
lib/modules/main_view/main_screen.dart
View file

@ -24,7 +24,7 @@ class _MainScreenState extends State<MainScreen> {
final route = GoRouter.of(context);
int currentIndex = route.location == '/library'
? 0
: route.location == '/localReader'
: route.location == '/archiveReader'
? 1
: route.location == '/history'
? 2
@ -79,7 +79,7 @@ class _MainScreenState extends State<MainScreen> {
width: isLongPressed
? 0
: route.location != '/library' &&
route.location != '/localReader' &&
route.location != '/archiveReader' &&
route.location != '/history' &&
route.location != '/browse' &&
route.location != '/more'
@ -113,7 +113,7 @@ class _MainScreenState extends State<MainScreen> {
),
label: Padding(
padding: EdgeInsets.only(top: 5),
child: Text('Local Reader'))),
child: Text('A-Reader'))),
NavigationRailDestination(
selectedIcon: Icon(
Icons.history,
@ -158,7 +158,7 @@ class _MainScreenState extends State<MainScreen> {
if (newIndex == 0) {
route.go('/library');
} else if (newIndex == 1) {
route.go('/localReader');
route.go('/archiveReader');
} else if (newIndex == 2) {
route.go('/history');
} else if (newIndex == 3) {
@ -186,7 +186,7 @@ class _MainScreenState extends State<MainScreen> {
height: isLongPressed
? 0
: route.location != '/library' &&
route.location != '/localReader' &&
route.location != '/archiveReader' &&
route.location != '/history' &&
route.location != '/browse' &&
route.location != '/more'
@ -217,7 +217,7 @@ class _MainScreenState extends State<MainScreen> {
icon: Icon(
Icons.library_books_outlined,
),
label: 'Local Reader'),
label: 'A-Reader'),
NavigationDestination(
selectedIcon: Icon(
Icons.history,
@ -252,7 +252,7 @@ class _MainScreenState extends State<MainScreen> {
if (newIndex == 0) {
route.go('/library');
} else if (newIndex == 1) {
route.go('/localReader');
route.go('/archiveReader');
} else if (newIndex == 2) {
route.go('/history');
} else if (newIndex == 3) {

18
lib/router/router.dart
View file

@ -3,9 +3,9 @@ import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:go_router/go_router.dart';
import 'package:mangayomi/models/chapter.dart';
import 'package:mangayomi/models/manga_type.dart';
import 'package:mangayomi/modules/local_reader/local_reader_screen.dart';
import 'package:mangayomi/modules/local_reader/models/models.dart';
import 'package:mangayomi/modules/local_reader/reader/local_reader_reader_view.dart';
import 'package:mangayomi/modules/archive_reader/archive_reader_screen.dart';
import 'package:mangayomi/modules/archive_reader/models/models.dart';
import 'package:mangayomi/modules/archive_reader/reader/archive_reader_reader_view.dart';
import 'package:mangayomi/modules/more/settings/downloads/downloads_screen.dart';
import 'package:mangayomi/modules/webview/webview.dart';
import 'package:mangayomi/modules/browse/browse_screen.dart';
@ -54,8 +54,8 @@ class AsyncRouterNotifier extends ChangeNotifier {
),
),
GoRoute(
name: "localReader",
path: '/localReader',
name: "archiveReader",
path: '/archiveReader',
builder: (context, state) => const LocalReaderScreen(),
pageBuilder: (context, state) => CustomTransition(
key: state.pageKey,
@ -336,11 +336,11 @@ class AsyncRouterNotifier extends ChangeNotifier {
},
),
GoRoute(
path: "/localReaderReaderView",
name: "localReaderReaderView",
path: "/archiveReaderReaderView",
name: "archiveReaderReaderView",
builder: (context, state) {
final localArchive = state.extra as LocalArchive;
return LocalReaderReaderView(
return ArchiveReaderReaderView(
localArchive: localArchive,
);
},
@ -348,7 +348,7 @@ class AsyncRouterNotifier extends ChangeNotifier {
final localArchive = state.extra as LocalArchive;
return CustomTransition(
key: state.pageKey,
child: LocalReaderReaderView(
child: ArchiveReaderReaderView(
localArchive: localArchive,
),
);

2
lib/services/get_chapter_url.dart
View file

@ -6,7 +6,7 @@ import 'package:mangayomi/main.dart';
import 'package:mangayomi/models/chapter.dart';
import 'package:mangayomi/models/settings.dart';
import 'package:mangayomi/models/source.dart';
import 'package:mangayomi/modules/local_reader/providers/local_reader_providers.dart';
import 'package:mangayomi/modules/archive_reader/providers/archive_reader_providers.dart';
import 'package:mangayomi/providers/storage_provider.dart';
import 'package:mangayomi/sources/multisrc/heancms/heancms.dart';
import 'package:mangayomi/sources/multisrc/madara/src/madara.dart';