feat: UI 2.0 and other Improvements (#357)

Co-authored-by: PartyDonut <PartyDonut@users.noreply.github.com>
This commit is contained in:
PartyDonut 2025-06-01 10:37:19 +02:00 committed by GitHub
parent 9ca06eaa37
commit e7b5bb40ff
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
169 changed files with 4584 additions and 3626 deletions

View file

@ -51,6 +51,7 @@ final List<AutoRoute> homeRoutes = [
_dashboardRoute,
_favouritesRoute,
_syncedRoute,
_librariesRoute,
];
final List<AutoRoute> _defaultRoutes = [
@ -79,6 +80,13 @@ final AutoRoute _syncedRoute = CustomRoute(
path: 'synced',
);
final AutoRoute _librariesRoute = CustomRoute(
page: LibraryRoute.page,
transitionsBuilder: TransitionsBuilders.fadeIn,
maintainState: false,
path: 'libraries',
);
final List<AutoRoute> _settingsChildren = [
CustomRoute(page: SettingsSelectionRoute.page, transitionsBuilder: TransitionsBuilders.fadeIn, path: 'list'),
CustomRoute(page: ClientSettingsRoute.page, transitionsBuilder: TransitionsBuilders.fadeIn, path: 'client'),

View file

@ -8,35 +8,36 @@
// coverage:ignore-file
// ignore_for_file: no_leading_underscores_for_library_prefixes
import 'package:auto_route/auto_route.dart' as _i16;
import 'package:fladder/models/item_base_model.dart' as _i17;
import 'package:fladder/models/items/photos_model.dart' as _i20;
import 'package:auto_route/auto_route.dart' as _i17;
import 'package:fladder/models/item_base_model.dart' as _i18;
import 'package:fladder/models/items/photos_model.dart' as _i21;
import 'package:fladder/models/library_search/library_search_options.dart'
as _i19;
as _i20;
import 'package:fladder/routes/nested_details_screen.dart' as _i4;
import 'package:fladder/screens/dashboard/dashboard_screen.dart' as _i3;
import 'package:fladder/screens/favourites/favourites_screen.dart' as _i5;
import 'package:fladder/screens/home_screen.dart' as _i6;
import 'package:fladder/screens/library/library_screen.dart' as _i7;
import 'package:fladder/screens/library_search/library_search_screen.dart'
as _i7;
import 'package:fladder/screens/login/lock_screen.dart' as _i8;
import 'package:fladder/screens/login/login_screen.dart' as _i9;
as _i8;
import 'package:fladder/screens/login/lock_screen.dart' as _i9;
import 'package:fladder/screens/login/login_screen.dart' as _i10;
import 'package:fladder/screens/settings/about_settings_page.dart' as _i1;
import 'package:fladder/screens/settings/client_settings_page.dart' as _i2;
import 'package:fladder/screens/settings/player_settings_page.dart' as _i10;
import 'package:fladder/screens/settings/security_settings_page.dart' as _i11;
import 'package:fladder/screens/settings/settings_screen.dart' as _i12;
import 'package:fladder/screens/settings/player_settings_page.dart' as _i11;
import 'package:fladder/screens/settings/security_settings_page.dart' as _i12;
import 'package:fladder/screens/settings/settings_screen.dart' as _i13;
import 'package:fladder/screens/settings/settings_selection_screen.dart'
as _i13;
import 'package:fladder/screens/splash_screen.dart' as _i14;
import 'package:fladder/screens/syncing/synced_screen.dart' as _i15;
import 'package:flutter/foundation.dart' as _i18;
import 'package:flutter/material.dart' as _i21;
as _i14;
import 'package:fladder/screens/splash_screen.dart' as _i15;
import 'package:fladder/screens/syncing/synced_screen.dart' as _i16;
import 'package:flutter/foundation.dart' as _i19;
import 'package:flutter/material.dart' as _i22;
/// generated route for
/// [_i1.AboutSettingsPage]
class AboutSettingsRoute extends _i16.PageRouteInfo<void> {
const AboutSettingsRoute({List<_i16.PageRouteInfo>? children})
class AboutSettingsRoute extends _i17.PageRouteInfo<void> {
const AboutSettingsRoute({List<_i17.PageRouteInfo>? children})
: super(
AboutSettingsRoute.name,
initialChildren: children,
@ -44,7 +45,7 @@ class AboutSettingsRoute extends _i16.PageRouteInfo<void> {
static const String name = 'AboutSettingsRoute';
static _i16.PageInfo page = _i16.PageInfo(
static _i17.PageInfo page = _i17.PageInfo(
name,
builder: (data) {
return const _i1.AboutSettingsPage();
@ -54,8 +55,8 @@ class AboutSettingsRoute extends _i16.PageRouteInfo<void> {
/// generated route for
/// [_i2.ClientSettingsPage]
class ClientSettingsRoute extends _i16.PageRouteInfo<void> {
const ClientSettingsRoute({List<_i16.PageRouteInfo>? children})
class ClientSettingsRoute extends _i17.PageRouteInfo<void> {
const ClientSettingsRoute({List<_i17.PageRouteInfo>? children})
: super(
ClientSettingsRoute.name,
initialChildren: children,
@ -63,7 +64,7 @@ class ClientSettingsRoute extends _i16.PageRouteInfo<void> {
static const String name = 'ClientSettingsRoute';
static _i16.PageInfo page = _i16.PageInfo(
static _i17.PageInfo page = _i17.PageInfo(
name,
builder: (data) {
return const _i2.ClientSettingsPage();
@ -73,8 +74,8 @@ class ClientSettingsRoute extends _i16.PageRouteInfo<void> {
/// generated route for
/// [_i3.DashboardScreen]
class DashboardRoute extends _i16.PageRouteInfo<void> {
const DashboardRoute({List<_i16.PageRouteInfo>? children})
class DashboardRoute extends _i17.PageRouteInfo<void> {
const DashboardRoute({List<_i17.PageRouteInfo>? children})
: super(
DashboardRoute.name,
initialChildren: children,
@ -82,7 +83,7 @@ class DashboardRoute extends _i16.PageRouteInfo<void> {
static const String name = 'DashboardRoute';
static _i16.PageInfo page = _i16.PageInfo(
static _i17.PageInfo page = _i17.PageInfo(
name,
builder: (data) {
return const _i3.DashboardScreen();
@ -92,12 +93,12 @@ class DashboardRoute extends _i16.PageRouteInfo<void> {
/// generated route for
/// [_i4.DetailsScreen]
class DetailsRoute extends _i16.PageRouteInfo<DetailsRouteArgs> {
class DetailsRoute extends _i17.PageRouteInfo<DetailsRouteArgs> {
DetailsRoute({
String id = '',
_i17.ItemBaseModel? item,
_i18.Key? key,
List<_i16.PageRouteInfo>? children,
_i18.ItemBaseModel? item,
_i19.Key? key,
List<_i17.PageRouteInfo>? children,
}) : super(
DetailsRoute.name,
args: DetailsRouteArgs(
@ -111,7 +112,7 @@ class DetailsRoute extends _i16.PageRouteInfo<DetailsRouteArgs> {
static const String name = 'DetailsRoute';
static _i16.PageInfo page = _i16.PageInfo(
static _i17.PageInfo page = _i17.PageInfo(
name,
builder: (data) {
final queryParams = data.queryParams;
@ -139,9 +140,9 @@ class DetailsRouteArgs {
final String id;
final _i17.ItemBaseModel? item;
final _i18.ItemBaseModel? item;
final _i18.Key? key;
final _i19.Key? key;
@override
String toString() {
@ -151,8 +152,8 @@ class DetailsRouteArgs {
/// generated route for
/// [_i5.FavouritesScreen]
class FavouritesRoute extends _i16.PageRouteInfo<void> {
const FavouritesRoute({List<_i16.PageRouteInfo>? children})
class FavouritesRoute extends _i17.PageRouteInfo<void> {
const FavouritesRoute({List<_i17.PageRouteInfo>? children})
: super(
FavouritesRoute.name,
initialChildren: children,
@ -160,7 +161,7 @@ class FavouritesRoute extends _i16.PageRouteInfo<void> {
static const String name = 'FavouritesRoute';
static _i16.PageInfo page = _i16.PageInfo(
static _i17.PageInfo page = _i17.PageInfo(
name,
builder: (data) {
return const _i5.FavouritesScreen();
@ -170,8 +171,8 @@ class FavouritesRoute extends _i16.PageRouteInfo<void> {
/// generated route for
/// [_i6.HomeScreen]
class HomeRoute extends _i16.PageRouteInfo<void> {
const HomeRoute({List<_i16.PageRouteInfo>? children})
class HomeRoute extends _i17.PageRouteInfo<void> {
const HomeRoute({List<_i17.PageRouteInfo>? children})
: super(
HomeRoute.name,
initialChildren: children,
@ -179,7 +180,7 @@ class HomeRoute extends _i16.PageRouteInfo<void> {
static const String name = 'HomeRoute';
static _i16.PageInfo page = _i16.PageInfo(
static _i17.PageInfo page = _i17.PageInfo(
name,
builder: (data) {
return const _i6.HomeScreen();
@ -188,17 +189,36 @@ class HomeRoute extends _i16.PageRouteInfo<void> {
}
/// generated route for
/// [_i7.LibrarySearchScreen]
class LibrarySearchRoute extends _i16.PageRouteInfo<LibrarySearchRouteArgs> {
/// [_i7.LibraryScreen]
class LibraryRoute extends _i17.PageRouteInfo<void> {
const LibraryRoute({List<_i17.PageRouteInfo>? children})
: super(
LibraryRoute.name,
initialChildren: children,
);
static const String name = 'LibraryRoute';
static _i17.PageInfo page = _i17.PageInfo(
name,
builder: (data) {
return const _i7.LibraryScreen();
},
);
}
/// generated route for
/// [_i8.LibrarySearchScreen]
class LibrarySearchRoute extends _i17.PageRouteInfo<LibrarySearchRouteArgs> {
LibrarySearchRoute({
String? viewModelId,
List<String>? folderId,
bool? favourites,
_i19.SortingOrder? sortOrder,
_i19.SortingOptions? sortingOptions,
_i20.PhotoModel? photoToView,
_i18.Key? key,
List<_i16.PageRouteInfo>? children,
_i20.SortingOrder? sortOrder,
_i20.SortingOptions? sortingOptions,
_i21.PhotoModel? photoToView,
_i19.Key? key,
List<_i17.PageRouteInfo>? children,
}) : super(
LibrarySearchRoute.name,
args: LibrarySearchRouteArgs(
@ -222,7 +242,7 @@ class LibrarySearchRoute extends _i16.PageRouteInfo<LibrarySearchRouteArgs> {
static const String name = 'LibrarySearchRoute';
static _i16.PageInfo page = _i16.PageInfo(
static _i17.PageInfo page = _i17.PageInfo(
name,
builder: (data) {
final queryParams = data.queryParams;
@ -234,7 +254,7 @@ class LibrarySearchRoute extends _i16.PageRouteInfo<LibrarySearchRouteArgs> {
sortOrder: queryParams.get('sortOrder'),
sortingOptions: queryParams.get('sortOptions'),
));
return _i7.LibrarySearchScreen(
return _i8.LibrarySearchScreen(
viewModelId: args.viewModelId,
folderId: args.folderId,
favourites: args.favourites,
@ -264,13 +284,13 @@ class LibrarySearchRouteArgs {
final bool? favourites;
final _i19.SortingOrder? sortOrder;
final _i20.SortingOrder? sortOrder;
final _i19.SortingOptions? sortingOptions;
final _i20.SortingOptions? sortingOptions;
final _i20.PhotoModel? photoToView;
final _i21.PhotoModel? photoToView;
final _i18.Key? key;
final _i19.Key? key;
@override
String toString() {
@ -279,9 +299,9 @@ class LibrarySearchRouteArgs {
}
/// generated route for
/// [_i8.LockScreen]
class LockRoute extends _i16.PageRouteInfo<void> {
const LockRoute({List<_i16.PageRouteInfo>? children})
/// [_i9.LockScreen]
class LockRoute extends _i17.PageRouteInfo<void> {
const LockRoute({List<_i17.PageRouteInfo>? children})
: super(
LockRoute.name,
initialChildren: children,
@ -289,18 +309,18 @@ class LockRoute extends _i16.PageRouteInfo<void> {
static const String name = 'LockRoute';
static _i16.PageInfo page = _i16.PageInfo(
static _i17.PageInfo page = _i17.PageInfo(
name,
builder: (data) {
return const _i8.LockScreen();
return const _i9.LockScreen();
},
);
}
/// generated route for
/// [_i9.LoginScreen]
class LoginRoute extends _i16.PageRouteInfo<void> {
const LoginRoute({List<_i16.PageRouteInfo>? children})
/// [_i10.LoginScreen]
class LoginRoute extends _i17.PageRouteInfo<void> {
const LoginRoute({List<_i17.PageRouteInfo>? children})
: super(
LoginRoute.name,
initialChildren: children,
@ -308,18 +328,18 @@ class LoginRoute extends _i16.PageRouteInfo<void> {
static const String name = 'LoginRoute';
static _i16.PageInfo page = _i16.PageInfo(
static _i17.PageInfo page = _i17.PageInfo(
name,
builder: (data) {
return const _i9.LoginScreen();
return const _i10.LoginScreen();
},
);
}
/// generated route for
/// [_i10.PlayerSettingsPage]
class PlayerSettingsRoute extends _i16.PageRouteInfo<void> {
const PlayerSettingsRoute({List<_i16.PageRouteInfo>? children})
/// [_i11.PlayerSettingsPage]
class PlayerSettingsRoute extends _i17.PageRouteInfo<void> {
const PlayerSettingsRoute({List<_i17.PageRouteInfo>? children})
: super(
PlayerSettingsRoute.name,
initialChildren: children,
@ -327,18 +347,18 @@ class PlayerSettingsRoute extends _i16.PageRouteInfo<void> {
static const String name = 'PlayerSettingsRoute';
static _i16.PageInfo page = _i16.PageInfo(
static _i17.PageInfo page = _i17.PageInfo(
name,
builder: (data) {
return const _i10.PlayerSettingsPage();
return const _i11.PlayerSettingsPage();
},
);
}
/// generated route for
/// [_i11.SecuritySettingsPage]
class SecuritySettingsRoute extends _i16.PageRouteInfo<void> {
const SecuritySettingsRoute({List<_i16.PageRouteInfo>? children})
/// [_i12.SecuritySettingsPage]
class SecuritySettingsRoute extends _i17.PageRouteInfo<void> {
const SecuritySettingsRoute({List<_i17.PageRouteInfo>? children})
: super(
SecuritySettingsRoute.name,
initialChildren: children,
@ -346,18 +366,18 @@ class SecuritySettingsRoute extends _i16.PageRouteInfo<void> {
static const String name = 'SecuritySettingsRoute';
static _i16.PageInfo page = _i16.PageInfo(
static _i17.PageInfo page = _i17.PageInfo(
name,
builder: (data) {
return const _i11.SecuritySettingsPage();
return const _i12.SecuritySettingsPage();
},
);
}
/// generated route for
/// [_i12.SettingsScreen]
class SettingsRoute extends _i16.PageRouteInfo<void> {
const SettingsRoute({List<_i16.PageRouteInfo>? children})
/// [_i13.SettingsScreen]
class SettingsRoute extends _i17.PageRouteInfo<void> {
const SettingsRoute({List<_i17.PageRouteInfo>? children})
: super(
SettingsRoute.name,
initialChildren: children,
@ -365,18 +385,18 @@ class SettingsRoute extends _i16.PageRouteInfo<void> {
static const String name = 'SettingsRoute';
static _i16.PageInfo page = _i16.PageInfo(
static _i17.PageInfo page = _i17.PageInfo(
name,
builder: (data) {
return const _i12.SettingsScreen();
return const _i13.SettingsScreen();
},
);
}
/// generated route for
/// [_i13.SettingsSelectionScreen]
class SettingsSelectionRoute extends _i16.PageRouteInfo<void> {
const SettingsSelectionRoute({List<_i16.PageRouteInfo>? children})
/// [_i14.SettingsSelectionScreen]
class SettingsSelectionRoute extends _i17.PageRouteInfo<void> {
const SettingsSelectionRoute({List<_i17.PageRouteInfo>? children})
: super(
SettingsSelectionRoute.name,
initialChildren: children,
@ -384,21 +404,21 @@ class SettingsSelectionRoute extends _i16.PageRouteInfo<void> {
static const String name = 'SettingsSelectionRoute';
static _i16.PageInfo page = _i16.PageInfo(
static _i17.PageInfo page = _i17.PageInfo(
name,
builder: (data) {
return const _i13.SettingsSelectionScreen();
return const _i14.SettingsSelectionScreen();
},
);
}
/// generated route for
/// [_i14.SplashScreen]
class SplashRoute extends _i16.PageRouteInfo<SplashRouteArgs> {
/// [_i15.SplashScreen]
class SplashRoute extends _i17.PageRouteInfo<SplashRouteArgs> {
SplashRoute({
dynamic Function(bool)? loggedIn,
_i21.Key? key,
List<_i16.PageRouteInfo>? children,
_i22.Key? key,
List<_i17.PageRouteInfo>? children,
}) : super(
SplashRoute.name,
args: SplashRouteArgs(
@ -410,12 +430,12 @@ class SplashRoute extends _i16.PageRouteInfo<SplashRouteArgs> {
static const String name = 'SplashRoute';
static _i16.PageInfo page = _i16.PageInfo(
static _i17.PageInfo page = _i17.PageInfo(
name,
builder: (data) {
final args =
data.argsAs<SplashRouteArgs>(orElse: () => const SplashRouteArgs());
return _i14.SplashScreen(
return _i15.SplashScreen(
loggedIn: args.loggedIn,
key: args.key,
);
@ -431,7 +451,7 @@ class SplashRouteArgs {
final dynamic Function(bool)? loggedIn;
final _i21.Key? key;
final _i22.Key? key;
@override
String toString() {
@ -440,12 +460,12 @@ class SplashRouteArgs {
}
/// generated route for
/// [_i15.SyncedScreen]
class SyncedRoute extends _i16.PageRouteInfo<SyncedRouteArgs> {
/// [_i16.SyncedScreen]
class SyncedRoute extends _i17.PageRouteInfo<SyncedRouteArgs> {
SyncedRoute({
_i21.ScrollController? navigationScrollController,
_i21.Key? key,
List<_i16.PageRouteInfo>? children,
_i22.ScrollController? navigationScrollController,
_i22.Key? key,
List<_i17.PageRouteInfo>? children,
}) : super(
SyncedRoute.name,
args: SyncedRouteArgs(
@ -457,12 +477,12 @@ class SyncedRoute extends _i16.PageRouteInfo<SyncedRouteArgs> {
static const String name = 'SyncedRoute';
static _i16.PageInfo page = _i16.PageInfo(
static _i17.PageInfo page = _i17.PageInfo(
name,
builder: (data) {
final args =
data.argsAs<SyncedRouteArgs>(orElse: () => const SyncedRouteArgs());
return _i15.SyncedScreen(
return _i16.SyncedScreen(
navigationScrollController: args.navigationScrollController,
key: args.key,
);
@ -476,9 +496,9 @@ class SyncedRouteArgs {
this.key,
});
final _i21.ScrollController? navigationScrollController;
final _i22.ScrollController? navigationScrollController;
final _i21.Key? key;
final _i22.Key? key;
@override
String toString() {