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.35.3",
"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 }}
"
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 @@ -132,33 +132,36 @@ class _SelectSettingsTileDialogState<T> extends State<SelectSettingsTileDialog<T
}

void submit() => Navigator.pop(context, (value: value));

void cancel() => Navigator.pop(context);

@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<T>(
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 +207,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<T>(
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
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<AccountDeletion>(
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 @@ 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
Original file line number Diff line number Diff line change
Expand Up @@ -69,49 +69,51 @@ class _TalkCreateRoomDialogState extends State<TalkCreateRoomDialog> {

@override
Widget build(BuildContext context) {
final body = Column(
crossAxisAlignment: CrossAxisAlignment.end,
mainAxisSize: MainAxisSize.min,
children: [
for (final type in [
spreed.RoomType.oneToOne,
spreed.RoomType.group,
spreed.RoomType.public,
])
RadioListTile.adaptive(
title: Text(TalkLocalizations.of(context).roomType(type.name)),
secondary: Icon(
// coverage:ignore-start
switch (type) {
// coverage:ignore-end
spreed.RoomType.oneToOne => AdaptiveIcons.person,
spreed.RoomType.group => AdaptiveIcons.group,
spreed.RoomType.public => AdaptiveIcons.link,
_ => throw UnimplementedError('$type is not a valid type'), // coverage:ignore-line
},
),
value: type,
groupValue: selectedType,
onChanged: changeType,
),
const Divider(),
switch (selectedType) {
spreed.RoomType.oneToOne || spreed.RoomType.group => buildAutocomplete(),
spreed.RoomType.public => TextFormField(
controller: controller,
focusNode: focusNode,
validator: (input) => validateNotEmpty(context, input),
decoration: InputDecoration(
hintText: TalkLocalizations.of(context).roomCreateRoomName,
final body = RadioGroup<spreed.RoomType>(
groupValue: selectedType,
onChanged: changeType,
child: Column(
crossAxisAlignment: CrossAxisAlignment.end,
mainAxisSize: MainAxisSize.min,
children: [
for (final type in [
spreed.RoomType.oneToOne,
spreed.RoomType.group,
spreed.RoomType.public,
])
RadioListTile.adaptive(
title: Text(TalkLocalizations.of(context).roomType(type.name)),
secondary: Icon(
// coverage:ignore-start
switch (type) {
// coverage:ignore-end
spreed.RoomType.oneToOne => AdaptiveIcons.person,
spreed.RoomType.group => AdaptiveIcons.group,
spreed.RoomType.public => AdaptiveIcons.link,
_ => throw UnimplementedError('$type is not a valid type'), // coverage:ignore-line
},
),
onFieldSubmitted: (_) {
submit();
},
value: type,
),
null => const SizedBox(),
_ => throw StateError('$selectedType is not a valid type'), // coverage:ignore-line
},
],
const Divider(),
switch (selectedType) {
spreed.RoomType.oneToOne || spreed.RoomType.group => buildAutocomplete(),
spreed.RoomType.public => TextFormField(
controller: controller,
focusNode: focusNode,
validator: (input) => validateNotEmpty(context, input),
decoration: InputDecoration(
hintText: TalkLocalizations.of(context).roomCreateRoomName,
),
onFieldSubmitted: (_) {
submit();
},
),
null => const SizedBox(),
_ => throw StateError('$selectedType is not a valid type'), // coverage:ignore-line
},
],
),
);

return NeonDialog(
Expand Down
28 changes: 14 additions & 14 deletions pubspec.lock
Original file line number Diff line number Diff line change
Expand Up @@ -931,26 +931,26 @@ packages:
dependency: transitive
description:
name: leak_tracker
sha256: "6bb818ecbdffe216e81182c2f0714a2e62b593f4a4f13098713ff1685dfb6ab0"
sha256: "8dcda04c3fc16c14f48a7bb586d4be1f0d1572731b6d81d51772ef47c02081e0"
url: "https://pub.dev"
source: hosted
version: "10.0.9"
version: "11.0.1"
leak_tracker_flutter_testing:
dependency: transitive
description:
name: leak_tracker_flutter_testing
sha256: f8b613e7e6a13ec79cfdc0e97638fddb3ab848452eff057653abd3edba760573
sha256: "1dbc140bb5a23c75ea9c4811222756104fbcd1a27173f0c34ca01e16bea473c1"
url: "https://pub.dev"
source: hosted
version: "3.0.9"
version: "3.0.10"
leak_tracker_testing:
dependency: transitive
description:
name: leak_tracker_testing
sha256: "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3"
sha256: "8d5a2d49f4a66b49744b23b018848400d23e54caf9463f4eb20df3eb8acb2eb1"
url: "https://pub.dev"
source: hosted
version: "3.0.1"
version: "3.0.2"
lint_maker:
dependency: transitive
description:
Expand Down Expand Up @@ -1696,26 +1696,26 @@ packages:
dependency: transitive
description:
name: test
sha256: "301b213cd241ca982e9ba50266bd3f5bd1ea33f1455554c5abb85d1be0e2d87e"
sha256: "65e29d831719be0591f7b3b1a32a3cda258ec98c58c7b25f7b84241bc31215bb"
url: "https://pub.dev"
source: hosted
version: "1.25.15"
version: "1.26.2"
test_api:
dependency: transitive
description:
name: test_api
sha256: fb31f383e2ee25fbbfe06b40fe21e1e458d14080e3c67e7ba0acfde4df4e0bbd
sha256: "522f00f556e73044315fa4585ec3270f1808a4b186c936e612cab0b565ff1e00"
url: "https://pub.dev"
source: hosted
version: "0.7.4"
version: "0.7.6"
test_core:
dependency: transitive
description:
name: test_core
sha256: "84d17c3486c8dfdbe5e12a50c8ae176d15e2a771b96909a9442b40173649ccaa"
sha256: "80bf5a02b60af04b09e14f6fe68b921aad119493e26e490deaca5993fef1b05a"
url: "https://pub.dev"
source: hosted
version: "0.6.8"
version: "0.6.11"
timezone:
dependency: transitive
description:
Expand Down Expand Up @@ -1880,10 +1880,10 @@ packages:
dependency: transitive
description:
name: vector_math
sha256: "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803"
sha256: d530bd74fea330e6e364cda7a85019c434070188383e1cd8d9777ee586914c5b
url: "https://pub.dev"
source: hosted
version: "2.1.4"
version: "2.2.0"
version:
dependency: transitive
description:
Expand Down
Loading