Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .fvmrc
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"flutter": "3.32.8",
"flutter": "3.38.10",
"updateVscodeSettings": false
}
12 changes: 6 additions & 6 deletions .github/workflows/dart.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,12 +50,12 @@ jobs:
git apply .github/workflows/dependency_overrides.patch
fvm dart pub downgrade
- name: Check formatting
run: melos run format:check
run: fvm exec melos run format:check
- name: Lint code
run: melos run analyze
run: fvm exec melos run analyze
- name: Run tests
run: |
mapfile -t packages < <(melos list --parsable --diff=${{ github.event.pull_request.head.sha }}~${{ github.event.pull_request.commits }}..${{ github.event.pull_request.head.sha }} --include-dependents | xargs -r -n1 basename)
mapfile -t packages < <(fvm exec melos list --parsable --diff=${{ github.event.pull_request.head.sha }}~${{ github.event.pull_request.commits }}..${{ github.event.pull_request.head.sha }} --include-dependents | xargs -r -n1 basename)
packages_glob="$(printf ",%s" "${packages[@]}")"
packages_glob="${packages_glob:1}"
if [ -n "$packages_glob" ]; then
Expand All @@ -65,10 +65,10 @@ jobs:
fi
./tool/build-dev-container.sh
fi
MELOS_PACKAGES="$packages_glob" melos test
MELOS_PACKAGES="$packages_glob" fvm exec melos test
else
./tool/build-dev-container.sh
melos test
fvm exec melos test
fi

- name: Setup Codecov
Expand All @@ -89,6 +89,6 @@ jobs:
if: ${{ matrix.dependencies == 'current' }}
run: |
export PATH="$PATH:/tmp/bin"
melos exec --file-exists="coverage/lcov.info" --concurrency=1 -- "
fvm exec melos exec --file-exists="coverage/lcov.info" --concurrency=1 -- "
codecov --verbose upload-process --fail-on-error -F MELOS_PACKAGE_NAME -f MELOS_PACKAGE_PATH/coverage/lcov.info -t ${{ secrets.CODECOV_TOKEN }}
"
39 changes: 0 additions & 39 deletions melos.yaml

This file was deleted.

2 changes: 1 addition & 1 deletion packages/neon_framework/example/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ dependencies:
vector_graphics: any

dev_dependencies:
custom_lint: ^0.7.6
custom_lint: ^0.8.0
neon_lints:
path: ../../neon_lints
vector_graphics_compiler: any
Expand Down
1 change: 0 additions & 1 deletion packages/neon_framework/lib/src/router.dart
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ import 'package:flutter/foundation.dart';
import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:go_router/go_router.dart';
import 'package:meta/meta.dart';
import 'package:neon_framework/models.dart';
import 'package:neon_framework/src/login/login.dart';
import 'package:neon_framework/src/pages/account_settings.dart';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -137,28 +137,30 @@ class _SelectSettingsTileDialogState<T> extends State<SelectSettingsTileDialog<T
@override
Widget build(BuildContext context) {
final content = SingleChildScrollView(
child: Column(
children: [
...widget.option.values.keys.map(
(k) => RadioListTile(
title: Text(
widget.option.values[k]!(context),
overflow: TextOverflow.ellipsis,
child: RadioGroup(
groupValue: value,
onChanged: (value) {
setState(() {
this.value = value as T;
});

if (widget.immediateSelection) {
submit();
}
},
child: Column(
children: [
...widget.option.values.keys.map(
(k) => RadioListTile(
title: Text(
widget.option.values[k]!(context),
overflow: TextOverflow.ellipsis,
),
value: k,
),
value: k,
groupValue: value,
onChanged: (value) {
setState(() {
this.value = value as T;
});

if (widget.immediateSelection) {
submit();
}
},
),
),
],
],
),
),
);

Expand Down Expand Up @@ -204,25 +206,27 @@ class SelectSettingsTileScreen<T> extends StatelessWidget {

final selector = ValueListenableBuilder(
valueListenable: option,
builder: (context, value, child) => CupertinoListSection.insetGrouped(
hasLeading: false,
header: child,
children: [
...option.values.keys.map(
(k) => RadioListTile.adaptive(
controlAffinity: ListTileControlAffinity.trailing,
title: Text(
option.values[k]!(context),
overflow: TextOverflow.ellipsis,
builder: (context, value, child) => RadioGroup(
groupValue: value,
onChanged: (value) {
option.value = value as T;
},
child: CupertinoListSection.insetGrouped(
hasLeading: false,
header: child,
children: [
...option.values.keys.map(
(k) => RadioListTile.adaptive(
controlAffinity: ListTileControlAffinity.trailing,
title: Text(
option.values[k]!(context),
overflow: TextOverflow.ellipsis,
),
value: k,
),
value: k,
groupValue: value,
onChanged: (value) {
option.value = value as T;
},
),
),
],
],
),
),
child: Text(
option.label(context),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import 'dart:convert';
import 'package:built_collection/built_collection.dart';
import 'package:flutter/foundation.dart';
import 'package:logging/logging.dart';
import 'package:meta/meta.dart' show internal;
import 'package:neon_framework/platform.dart';
import 'package:neon_framework/src/storage/persistence.dart';
import 'package:path/path.dart' as p;
Expand Down
1 change: 0 additions & 1 deletion packages/neon_framework/lib/src/utils/push_utils.dart
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ import 'package:flutter_svg/flutter_svg.dart' show SvgBytesLoader, vg;
import 'package:http/http.dart' as http;
import 'package:image/image.dart' as img;
import 'package:logging/logging.dart';
import 'package:meta/meta.dart';
import 'package:neon_framework/l10n/localizations.dart';
import 'package:neon_framework/src/bloc/result.dart';
import 'package:neon_framework/src/storage/keys.dart';
Expand Down
1 change: 0 additions & 1 deletion packages/neon_framework/lib/src/utils/request_manager.dart
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import 'package:dynamite_runtime/http_client.dart';
import 'package:flutter/foundation.dart';
import 'package:http/http.dart' as http;
import 'package:logging/logging.dart';
import 'package:meta/meta.dart';
import 'package:neon_framework/models.dart';
import 'package:neon_framework/src/bloc/result.dart';
import 'package:neon_framework/storage.dart';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ extension ClearAt on user_status.ClearAt {
}

tz.TZDateTime? toDateTime([tz.TZDateTime? base]) {
// ignore: parameter_assignments
base = base?.toUtc() ?? tz.TZDateTime.now(tz.UTC);

switch (type) {
Expand Down
33 changes: 17 additions & 16 deletions packages/neon_framework/lib/src/widgets/dialog.dart
Original file line number Diff line number Diff line change
Expand Up @@ -646,22 +646,23 @@ class _NeonAccountDeletionDialogState extends State<NeonAccountDeletionDialog> {
icon: icon,
title: Text(title),
content: SingleChildScrollView(
child: Column(
children: [
RadioListTile(
value: AccountDeletion.local,
groupValue: value,
onChanged: (value) => update(value!),
title: Text(localizations.accountOptionsRemoveLocal),
),
RadioListTile<AccountDeletion>(
value: AccountDeletion.remote,
groupValue: value,
onChanged: capabilities.enabled ? (value) => update(value!) : null,
title: Text(localizations.accountOptionsRemoveRemote),
subtitle: subtitle,
),
],
child: RadioGroup(
groupValue: value,
onChanged: (value) => update(value!),
child: Column(
children: [
RadioListTile(
value: AccountDeletion.local,
title: Text(localizations.accountOptionsRemoveLocal),
),
RadioListTile<AccountDeletion>(
value: AccountDeletion.remote,
enabled: capabilities.enabled,
title: Text(localizations.accountOptionsRemoveRemote),
subtitle: subtitle,
),
],
),
),
),
actions: [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ dependencies:

dev_dependencies:
build_runner: ^2.5.4
custom_lint: ^0.7.6
custom_lint: ^0.8.0
flutter_test:
sdk: flutter
go_router_builder: ^3.0.0
Expand Down
2 changes: 1 addition & 1 deletion packages/neon_framework/packages/files_app/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ dependencies:

dev_dependencies:
build_runner: ^2.5.4
custom_lint: ^0.7.6
custom_lint: ^0.8.0
go_router_builder: ^3.0.0
neon_lints:
path: ../../../neon_lints
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ TextSpan buildRichTextSpan({
);

if (isPreview) {
// ignore: parameter_assignments
text = text.replaceAll('\n', ' ');
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ dependencies:
nextcloud: ^9.0.0

dev_dependencies:
custom_lint: ^0.7.6
custom_lint: ^0.8.0
flutter_test:
sdk: flutter
mocktail: ^1.0.4
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ class NewsFolderSelect extends StatelessWidget {
decoration: InputDecoration(
hintText: NewsLocalizations.of(context).folder,
),
value: value,
initialValue: value,
items: [
DropdownMenuItem(
child: Text(NewsLocalizations.of(context).folderRoot),
Expand Down
2 changes: 1 addition & 1 deletion packages/neon_framework/packages/news_app/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ dependencies:

dev_dependencies:
build_runner: ^2.5.4
custom_lint: ^0.7.6
custom_lint: ^0.8.0
go_router_builder: ^3.0.0
neon_lints:
path: ../../../neon_lints
Expand Down
2 changes: 1 addition & 1 deletion packages/neon_framework/packages/notes_app/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ dependencies:

dev_dependencies:
build_runner: ^2.5.4
custom_lint: ^0.7.6
custom_lint: ^0.8.0
go_router_builder: ^3.0.0
neon_lints:
path: ../../../neon_lints
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ dependencies:
dev_dependencies:
build_runner: ^2.5.4
built_value: ^8.10.1
custom_lint: ^0.7.6
custom_lint: ^0.8.0
flutter_test:
sdk: flutter
go_router_builder: ^3.0.0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -510,6 +510,7 @@ class _TalkRoomBloc extends InteractiveBloc implements TalkRoomBloc {
data: data.rebuild((b) {
b.map((m) {
if (m.id == messageId) {
// ignore: parameter_assignments
m = m.rebuild(updates);
}

Expand Down
Loading
Loading