aurora
/
nextcloud-neon
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge pull request #371 from Leptopoda/fix/notifications_navigaator 

neon: fix blocProvider of notifications app
pull/378/head
Nikolas Rimikis 1 year ago committed by GitHub
parent
5a7e60e846 81fd46a707
commit
3c34cb6298
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 68 additions and 81 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 7
      packages/neon/neon/lib/neon.dart
  2. 19
      packages/neon/neon/lib/src/app.dart
  3. 22
      packages/neon/neon/lib/src/blocs/apps.dart
  4. 8
      packages/neon/neon/lib/src/interfaces/notifications.dart
  5. 62
      packages/neon/neon/lib/src/pages/home.dart
  6. 13
      packages/neon/neon/lib/src/utils/app_implementation.dart
  7. 11
      packages/neon/neon_notifications/lib/blocs/notifications.dart
  8. 3
      packages/neon/neon_notifications/lib/neon_notifications.dart
  9. 2
      packages/neon/neon_notifications/lib/options.dart
  10. 2
      packages/neon/neon_notifications/lib/pages/main.dart

7
packages/neon/neon/lib/neon.dart
Unescape View File

@ -194,12 +194,7 @@ Future runNeon({
create: (final _) => branding,
),
],
child: NeonApp(
accountsBloc: accountsBloc,
sharedPreferences: sharedPreferences,
platform: platform,
globalOptions: globalOptions,
),
child: const NeonApp(),
),
);
}

19
packages/neon/neon/lib/src/app.dart
Unescape View File

@ -2,18 +2,9 @@ part of '../../neon.dart';
class NeonApp extends StatefulWidget {
const NeonApp({
required this.accountsBloc,
required this.sharedPreferences,
required this.platform,
required this.globalOptions,
super.key,
});
final AccountsBloc accountsBloc;
final SharedPreferences sharedPreferences;
final NeonPlatform platform;
final GlobalOptions globalOptions;
@override
State<NeonApp> createState() => _NeonAppState();
}
@ -253,13 +244,13 @@ class _NeonAppState extends State<NeonApp> with WidgetsBindingObserver, tray.Tra
@override
Widget build(final BuildContext context) => OptionBuilder(
option: widget.globalOptions.themeMode,
option: _globalOptions.themeMode,
builder: (final context, final themeMode) => OptionBuilder(
option: widget.globalOptions.themeOLEDAsDark,
option: _globalOptions.themeOLEDAsDark,
builder: (final context, final themeOLEDAsDark) => OptionBuilder(
option: widget.globalOptions.themeKeepOriginalAccentColor,
option: _globalOptions.themeKeepOriginalAccentColor,
builder: (final context, final themeKeepOriginalAccentColor) => StreamBuilder<Account?>(
stream: widget.accountsBloc.activeAccount,
stream: _accountsBloc.activeAccount,
builder: (final context, final activeAccountSnapshot) {
if (themeMode == null || themeOLEDAsDark == null) {
return Container();
@ -268,7 +259,7 @@ class _NeonAppState extends State<NeonApp> with WidgetsBindingObserver, tray.Tra
FlutterNativeSplash.remove();
return ResultBuilder<Capabilities?>(
stream: activeAccountSnapshot.hasData
? widget.accountsBloc.getCapabilitiesBlocFor(activeAccountSnapshot.data!).capabilities
? _accountsBloc.getCapabilitiesBlocFor(activeAccountSnapshot.data!).capabilities
: null,
builder: (final context, final capabilitiesSnapshot) {
final nextcloudTheme = capabilitiesSnapshot.data?.capabilities.theming;

22
packages/neon/neon/lib/src/blocs/apps.dart
Unescape View File

@ -82,8 +82,6 @@ class AppsBloc extends InteractiveBloc implements AppsBlocEvents, AppsBlocStates
final Account _account;
final Iterable<AppImplementation> _allAppImplementations;
final Map<String, Bloc> _blocs = {};
@override
void dispose() {
unawaited(apps.close());
@ -91,8 +89,11 @@ class AppsBloc extends InteractiveBloc implements AppsBlocEvents, AppsBlocStates
unawaited(notificationsAppImplementation.close());
unawaited(activeAppID.close());
unawaited(openNotifications.close());
for (final key in _blocs.keys) {
_blocs[key]!.dispose();
for (final app in _allAppImplementations) {
for (final bloc in app.blocs.values) {
bloc.dispose();
}
}
}
@ -137,15 +138,8 @@ class AppsBloc extends InteractiveBloc implements AppsBlocEvents, AppsBlocStates
}
}
T getAppBloc<T extends Bloc>(final AppImplementation appImplementation) {
if (_blocs[appImplementation.id] != null) {
return _blocs[appImplementation.id]! as T;
}
return _blocs[appImplementation.id] = appImplementation.buildBloc(_account.client) as T;
}
T getAppBloc<T extends Bloc>(final AppImplementation appImplementation) => appImplementation.getBloc(_account) as T;
List<Provider>? getAppProviders() => appImplementations.valueOrNull?.data
?.map((final appImplementation) => appImplementation.blocProvider(_account.client))
.toList();
List<Provider> get appBlocProviders =>
_allAppImplementations.map((final appImplementation) => appImplementation.blocProvider).toList();
}

8
packages/neon/neon/lib/src/interfaces/notifications.dart
Unescape View File

@ -1,7 +1,7 @@
part of '../../neon.dart';
abstract class NotificationsAppInterface
extends AppImplementation<NotificationsBlocInterface, NotificationsOptionsInterface> {
abstract interface class NotificationsAppInterface<T extends NotificationsBlocInterface,
R extends NotificationsOptionsInterface> extends AppImplementation<T, R> {
NotificationsAppInterface(
super.sharedPreferences,
super.requestManager,
@ -9,13 +9,13 @@ abstract class NotificationsAppInterface
);
}
abstract class NotificationsBlocInterface extends InteractiveBloc {
abstract interface class NotificationsBlocInterface extends InteractiveBloc {
NotificationsBlocInterface(this.options);
final NotificationsOptionsInterface options;
void deleteNotification(final int id);
}
abstract class NotificationsOptionsInterface extends NextcloudAppSpecificOptions {
abstract interface class NotificationsOptionsInterface extends NextcloudAppSpecificOptions {
NotificationsOptionsInterface(super.storage);
}

62
packages/neon/neon/lib/src/pages/home.dart
Unescape View File

@ -132,25 +132,30 @@ class _HomePageState extends State<HomePage> {
final List<Account> accounts,
final Account account,
) async {
final page = Scaffold(
resizeToAvoidBottomInset: false,
appBar: AppBar(
title: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(app.name(context)),
if (accounts.length > 1) ...[
Text(
account.client.humanReadableID,
style: Theme.of(context).textTheme.bodySmall,
),
],
],
),
),
body: app.page,
);
await Navigator.of(context).push(
MaterialPageRoute(
builder: (final context) => Scaffold(
resizeToAvoidBottomInset: false,
appBar: AppBar(
title: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(app.name(context)),
if (accounts.length > 1) ...[
Text(
account.client.humanReadableID,
style: Theme.of(context).textTheme.bodySmall,
),
],
],
),
),
body: app.page,
builder: (final context) => Provider<NotificationsBlocInterface>(
create: (final context) => app.getBloc(account),
child: page,
),
),
);
@ -171,17 +176,9 @@ class _HomePageState extends State<HomePage> {
stream: _appsBloc.notificationsAppImplementation,
builder: (final context, final notificationsAppImplementation) => StreamBuilder<String?>(
stream: _appsBloc.activeAppID,
builder: (
final context,
final activeAppIDSnapshot,
) =>
StreamBuilder<List<Account>>(
builder: (final context, final activeAppIDSnapshot) => StreamBuilder<List<Account>>(
stream: _accountsBloc.accounts,
builder: (
final context,
final accountsSnapshot,
) =>
OptionBuilder<NavigationMode>(
builder: (final context, final accountsSnapshot) => OptionBuilder<NavigationMode>(
option: _globalOptions.navigationMode,
builder: (final context, final navigationMode) {
final accounts = accountsSnapshot.data;
@ -536,13 +533,10 @@ class _HomePageState extends State<HomePage> {
),
);
final appProviders = _appsBloc.getAppProviders();
if (appProviders != null) {
body = MultiProvider(
providers: appProviders,
child: body,
);
}
body = MultiProvider(
providers: _appsBloc.appBlocProviders,
child: body,
);
return WillPopScope(
onWillPop: () async {

13
packages/neon/neon/lib/src/utils/app_implementation.dart
Unescape View File

@ -22,10 +22,19 @@ abstract class AppImplementation<T extends Bloc, R extends NextcloudAppSpecificO
late final R options;
R buildOptions(final AppStorage storage);
final Map<String, T> blocs = {};
T getBloc(final Account account) => blocs[account.id] ??= buildBloc(account.client);
T buildBloc(final NextcloudClient client);
Provider<T> blocProvider(final NextcloudClient client) => Provider<T>(
create: (final _) => buildBloc(client),
Provider<T> get blocProvider => Provider<T>(
create: (final context) {
final accountsBloc = Provider.of<AccountsBloc>(context, listen: false);
final account = accountsBloc.activeAccount.value!;
return getBloc(account);
},
);
BehaviorSubject<int>? getUnreadCounter(final AppsBloc appsBloc);

11
packages/neon/neon_notifications/lib/blocs/notifications.dart
Unescape View File

@ -1,20 +1,21 @@
part of '../neon_notifications.dart';
abstract class NotificationsBlocEvents {
abstract interface class NotificationsBlocEvents {
void deleteNotification(final int id);
void deleteAllNotifications();
}
abstract class NotificationsBlocStates {
abstract interface class NotificationsBlocStates {
BehaviorSubject<Result<List<NextcloudNotificationsNotification>>> get notifications;
BehaviorSubject<int> get unreadCounter;
}
class NotificationsBloc extends NotificationsBlocInterface implements NotificationsBlocEvents, NotificationsBlocStates {
class NotificationsBloc extends InteractiveBloc
implements NotificationsBlocInterface, NotificationsBlocEvents, NotificationsBlocStates {
NotificationsBloc(
super.options,
this.options,
this._requestManager,
this._client,
) {
@ -27,6 +28,8 @@ class NotificationsBloc extends NotificationsBlocInterface implements Notificati
unawaited(refresh());
}
@override
final NotificationsAppSpecificOptions options;
final RequestManager _requestManager;
final NextcloudClient _client;

3
packages/neon/neon_notifications/lib/neon_notifications.dart
Unescape View File

@ -14,7 +14,8 @@ part 'blocs/notifications.dart';
part 'options.dart';
part 'pages/main.dart';
class NotificationsApp extends NotificationsAppInterface {
class NotificationsApp extends AppImplementation<NotificationsBloc, NotificationsAppSpecificOptions>
implements NotificationsAppInterface<NotificationsBloc, NotificationsAppSpecificOptions> {
NotificationsApp(super.sharedPreferences, super.requestManager, super.platform);
@override

2
packages/neon/neon_notifications/lib/options.dart
Unescape View File

@ -1,6 +1,6 @@
part of 'neon_notifications.dart';
class NotificationsAppSpecificOptions extends NotificationsOptionsInterface {
class NotificationsAppSpecificOptions extends NextcloudAppSpecificOptions implements NotificationsOptionsInterface {
NotificationsAppSpecificOptions(super.storage) {
super.categories = [];
super.options = [];

2
packages/neon/neon_notifications/lib/pages/main.dart
Unescape View File

@ -16,7 +16,7 @@ class _NotificationsMainPageState extends State<NotificationsMainPage> {
void initState() {
super.initState();
bloc = Provider.of<NotificationsBloc>(context, listen: false);
bloc = Provider.of<NotificationsBlocInterface>(context, listen: false) as NotificationsBloc;
bloc.errors.listen((final error) {
NeonException.showSnackbar(context, error);

Write Preview
Loading…
Cancel
Save