Lemmy
/
lemmur-app-android
mirror of https://github.com/krawieck/lemmur/
1
0
Fork 0
Code Issues Releases Wiki Activity

Upgrade to flutter 2.8.1 (#308)

This commit is contained in:
Marcin Wojnarowski 2022-01-06 16:05:46 +01:00 committed by GitHub
parent 6bb5ca4473
commit 8712691926
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
20 changed files with 95 additions and 227 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
analysis_options.yaml
View File

@ -91,6 +91,7 @@ linter:
- unawaited_futures
- unnecessary_brace_in_string_interps
- unnecessary_const
- unnecessary_constructor_name
- unnecessary_getters_setters
- unnecessary_lambdas
- unnecessary_new
@ -116,7 +117,6 @@ linter:
analyzer:
exclude:
- "**/*.g.dart"
- "**/*.freezed.dart"
- "lib/gen/assets.gen.dart"
- "lib/l10n/gen/*"
# strong-mode:

21
assets/l10n/intl_nb.arb
View File

@ -1 +1,20 @@
{}
{
"@@locale": "nb",
"posts": "innleggene",
"comments": "Kommentarer",
"post": "Innlegg",
"more": "mer",
"reply": "svare",
"edit": "Redigere",
"avatar": "Profilbilde",
"banner": "Banner",
"display_name": "Vis navn",
"communities": "Nettsamfunn",
"users": "Brukere",
"number_of_comments": "{formattedCount,plural, =1{{formattedCount} Kommentar} other{{formattedCount} Kommentarer}}",
"number_of_posts": "{formattedCount,plural, =1{{formattedCount} Innlegg} other{{formattedCount} innleggene}}",
"show_avatars": "Vis profilbilder",
"send_message": "Sende melding",
"bot_account": "Bot Konto",
"show_bot_accounts": "Vis Bot Kontoer"
}

20
assets/l10n/intl_nb_NO.arb
View File

@ -1,20 +0,0 @@
{
"@@locale": "nb_NO",
"posts": "innleggene",
"comments": "Kommentarer",
"post": "Innlegg",
"more": "mer",
"reply": "svare",
"edit": "Redigere",
"avatar": "Profilbilde",
"banner": "Banner",
"display_name": "Vis navn",
"communities": "Nettsamfunn",
"users": "Brukere",
"number_of_comments": "{formattedCount,plural, =1{{formattedCount} Kommentar} other{{formattedCount} Kommentarer}}",
"number_of_posts": "{formattedCount,plural, =1{{formattedCount} Innlegg} other{{formattedCount} innleggene}}",
"show_avatars": "Vis profilbilder",
"send_message": "Sende melding",
"bot_account": "Bot Konto",
"show_bot_accounts": "Vis Bot Kontoer"
}

136
assets/l10n/untranslated.json
View File

@ -959,142 +959,6 @@
],
"nb": [
"settings",
"password",
"email_or_username",
"posts",
"comments",
"modlog",
"community",
"url",
"title",
"body",
"nsfw",
"post",
"save",
"subscribed",
"local",
"all",
"replies",
"mentions",
"from",
"to",
"deleted_by_creator",
"more",
"mark_as_read",
"mark_as_unread",
"reply",
"edit",
"delete",
"restore",
"yes",
"no",
"avatar",
"banner",
"display_name",
"bio",
"email",
"matrix_user",
"sort_type",
"type",
"show_nsfw",
"send_notifications_to_email",
"delete_account",
"saved",
"communities",
"users",
"theme",
"language",
"hot",
"new_",
"old",
"top",
"chat",
"admin",
"by",
"not_a_mod_or_admin",
"not_an_admin",
"couldnt_find_post",
"not_logged_in",
"site_ban",
"community_ban",
"downvotes_disabled",
"invalid_url",
"locked",
"couldnt_create_comment",
"couldnt_like_comment",
"couldnt_update_comment",
"no_comment_edit_allowed",
"couldnt_save_comment",
"couldnt_get_comments",
"report_reason_required",
"report_too_long",
"couldnt_create_report",
"couldnt_resolve_report",
"invalid_post_title",
"couldnt_create_post",
"couldnt_like_post",
"couldnt_find_community",
"couldnt_get_posts",
"no_post_edit_allowed",
"couldnt_save_post",
"site_already_exists",
"couldnt_update_site",
"invalid_community_name",
"community_already_exists",
"community_moderator_already_exists",
"community_follower_already_exists",
"not_a_moderator",
"couldnt_update_community",
"no_community_edit_allowed",
"system_err_login",
"community_user_already_banned",
"couldnt_find_that_username_or_email",
"password_incorrect",
"registration_closed",
"invalid_password",
"passwords_dont_match",
"captcha_incorrect",
"invalid_username",
"bio_length_overflow",
"couldnt_update_user",
"couldnt_update_private_message",
"couldnt_update_post",
"couldnt_create_private_message",
"no_private_message_edit_allowed",
"post_title_too_long",
"email_already_exists",
"user_already_exists",
"number_of_users_online",
"number_of_comments",
"number_of_posts",
"number_of_subscribers",
"number_of_users",
"unsubscribe",
"subscribe",
"messages",
"banned_users",
"delete_account_confirm",
"new_password",
"verify_password",
"old_password",
"show_avatars",
"search",
"send_message",
"top_day",
"top_week",
"top_month",
"top_year",
"top_all",
"most_comments",
"new_comments",
"active",
"bot_account",
"show_bot_accounts",
"show_read_posts"
],
"nb_NO": [
"settings",
"password",
"email_or_username",

5
lib/comment_tree.dart
View File

@ -65,9 +65,8 @@ class CommentTree {
return parent;
}
final topLevelParents = comments
.where((e) => e.comment.parentId == null)
.map((e) => CommentTree(e));
final topLevelParents =
comments.where((e) => e.comment.parentId == null).map(CommentTree.new);
final result = topLevelParents.map(gatherChildren).toList();
return result;

2
lib/hooks/image_picker.dart
View File

@ -1,4 +1,4 @@
import 'package:flutter_hooks/flutter_hooks.dart';
import 'package:image_picker/image_picker.dart';
ImagePicker useImagePicker() => useMemoized(() => ImagePicker());
ImagePicker useImagePicker() => useMemoized(ImagePicker.new);

2
lib/hooks/infinite_scroll.dart
View File

@ -3,4 +3,4 @@ import 'package:flutter_hooks/flutter_hooks.dart';
import '../widgets/infinite_scroll.dart';
InfiniteScrollController useInfiniteScrollController() =>
useMemoized(() => InfiniteScrollController());
useMemoized(InfiniteScrollController.new);

1
lib/pages/full_post/full_post.dart
View File

@ -1,6 +1,5 @@
import 'dart:async';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:flutter_hooks/flutter_hooks.dart';
import 'package:lemmy_api_client/v3.dart';

3
lib/pages/settings/settings.dart
View File

@ -1,4 +1,3 @@
import 'package:flutter/foundation.dart';
import 'package:flutter/material.dart';
import 'package:flutter_hooks/flutter_hooks.dart';
import 'package:flutter_speed_dial/flutter_speed_dial.dart';
@ -83,7 +82,7 @@ class AppearanceConfigPage extends StatelessWidget {
for (final theme in ThemeMode.values)
RadioListTile<ThemeMode>(
value: theme,
title: Text(describeEnum(theme)),
title: Text(theme.name),
groupValue: store.theme,
onChanged: (selected) {
if (selected != null) store.theme = selected;

14
lib/util/async_store.freezed.dart
View File

@ -1,5 +1,6 @@
// coverage:ignore-file
// GENERATED CODE - DO NOT MODIFY BY HAND
// ignore_for_file: type=lint
// ignore_for_file: unused_element, deprecated_member_use, deprecated_member_use_from_same_package, use_function_type_syntax_for_parameters, unnecessary_const, avoid_init_to_null, invalid_override_different_default_values_named, prefer_expression_function_bodies, annotate_overrides, invalid_annotation_target
part of 'async_store.dart';
@ -307,13 +308,14 @@ class _$AsyncStateData<T>
(other.runtimeType == runtimeType &&
other is AsyncStateData<T> &&
const DeepCollectionEquality().equals(other.data, data) &&
(identical(other.errorTerm, errorTerm) ||
other.errorTerm == errorTerm));
const DeepCollectionEquality().equals(other.errorTerm, errorTerm));
}
@override
int get hashCode => Object.hash(
runtimeType, const DeepCollectionEquality().hash(data), errorTerm);
runtimeType,
const DeepCollectionEquality().hash(data),
const DeepCollectionEquality().hash(errorTerm));
@JsonKey(ignore: true)
@override
@ -591,12 +593,12 @@ class _$AsyncStateError<T>
return identical(this, other) ||
(other.runtimeType == runtimeType &&
other is AsyncStateError<T> &&
(identical(other.errorTerm, errorTerm) ||
other.errorTerm == errorTerm));
const DeepCollectionEquality().equals(other.errorTerm, errorTerm));
}
@override
int get hashCode => Object.hash(runtimeType, errorTerm);
int get hashCode =>
Object.hash(runtimeType, const DeepCollectionEquality().hash(errorTerm));
@JsonKey(ignore: true)
@override

1
lib/util/async_store_listener.dart
View File

@ -1,4 +1,3 @@
import 'package:flutter/foundation.dart';
import 'package:flutter/material.dart';
import 'package:provider/single_child_widget.dart';

1
lib/widgets/post/post.dart
View File

@ -1,4 +1,3 @@
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:lemmy_api_client/v3.dart';
import 'package:nested/nested.dart';

1
lib/widgets/post/post_actions.dart
View File

@ -1,4 +1,3 @@
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:flutter_hooks/flutter_hooks.dart';

1
lib/widgets/post/post_body.dart
View File

@ -1,4 +1,3 @@
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import '../../util/observer_consumers.dart';

1
lib/widgets/post/post_info_section.dart
View File

@ -1,4 +1,3 @@
import 'package:flutter/cupertino.dart';
import 'package:flutter/gestures.dart';
import 'package:flutter/material.dart';

1
lib/widgets/post/post_more_menu.dart
View File

@ -1,4 +1,3 @@
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:flutter_hooks/flutter_hooks.dart';
import 'package:url_launcher/url_launcher.dart' as ul;

1
lib/widgets/post_list_options.dart
View File

@ -1,4 +1,3 @@
import 'package:flutter/foundation.dart';
import 'package:flutter/material.dart';
import 'package:lemmy_api_client/v3.dart';

1
lib/widgets/pull_to_refresh.dart
View File

@ -1,4 +1,3 @@
import 'package:flutter/foundation.dart';
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';

100
pubspec.lock
View File

@ -7,21 +7,21 @@ packages:
name: _fe_analyzer_shared
url: "https://pub.dartlang.org"
source: hosted
version: "30.0.0"
version: "32.0.0"
analyzer:
dependency: transitive
description:
name: analyzer
url: "https://pub.dartlang.org"
source: hosted
version: "2.7.0"
version: "3.0.0"
archive:
dependency: transitive
description:
name: archive
url: "https://pub.dartlang.org"
source: hosted
version: "3.1.6"
version: "3.1.8"
args:
dependency: transitive
description:
@ -35,7 +35,7 @@ packages:
name: async
url: "https://pub.dartlang.org"
source: hosted
version: "2.8.1"
version: "2.8.2"
boolean_selector:
dependency: transitive
description:
@ -49,7 +49,7 @@ packages:
name: build
url: "https://pub.dartlang.org"
source: hosted
version: "2.1.1"
version: "2.2.1"
build_config:
dependency: transitive
description:
@ -70,21 +70,21 @@ packages:
name: build_resolvers
url: "https://pub.dartlang.org"
source: hosted
version: "2.0.5"
version: "2.0.6"
build_runner:
dependency: "direct dev"
description:
name: build_runner
url: "https://pub.dartlang.org"
source: hosted
version: "2.1.5"
version: "2.1.7"
build_runner_core:
dependency: transitive
description:
name: build_runner_core
url: "https://pub.dartlang.org"
source: hosted
version: "7.2.2"
version: "7.2.3"
built_collection:
dependency: transitive
description:
@ -105,7 +105,7 @@ packages:
name: characters
url: "https://pub.dartlang.org"
source: hosted
version: "1.1.0"
version: "1.2.0"
charcode:
dependency: transitive
description:
@ -175,21 +175,21 @@ packages:
name: dart_style
url: "https://pub.dartlang.org"
source: hosted
version: "2.2.0"
version: "2.2.1"
extended_image:
dependency: "direct main"
description:
name: extended_image
url: "https://pub.dartlang.org"
source: hosted
version: "5.1.3"
version: "6.0.1"
extended_image_library:
dependency: transitive
description:
name: extended_image_library
url: "https://pub.dartlang.org"
source: hosted
version: "3.1.0"
version: "3.1.1"
fake_async:
dependency: transitive
description:
@ -229,7 +229,7 @@ packages:
name: flutter_hooks
url: "https://pub.dartlang.org"
source: hosted
version: "0.18.1"
version: "0.18.2"
flutter_keyboard_visibility:
dependency: transitive
description:
@ -269,14 +269,14 @@ packages:
name: flutter_markdown
url: "https://pub.dartlang.org"
source: hosted
version: "0.6.8"
version: "0.6.9"
flutter_mobx:
dependency: "direct main"
description:
name: flutter_mobx
url: "https://pub.dartlang.org"
source: hosted
version: "2.0.2"
version: "2.0.3+2"
flutter_plugin_android_lifecycle:
dependency: transitive
description:
@ -290,7 +290,7 @@ packages:
name: flutter_speed_dial
url: "https://pub.dartlang.org"
source: hosted
version: "4.6.6"
version: "5.0.0+1"
flutter_test:
dependency: "direct dev"
description: flutter
@ -302,7 +302,7 @@ packages:
name: flutter_typeahead
url: "https://pub.dartlang.org"
source: hosted
version: "3.2.3"
version: "3.2.4"
flutter_web_plugins:
dependency: transitive
description: flutter
@ -314,14 +314,14 @@ packages:
name: freezed
url: "https://pub.dartlang.org"
source: hosted
version: "1.0.0"
version: "1.1.1"
freezed_annotation:
dependency: "direct main"
description:
name: freezed_annotation
url: "https://pub.dartlang.org"
source: hosted
version: "1.0.0"
version: "1.1.0"
frontend_server_client:
dependency: transitive
description:
@ -384,7 +384,7 @@ packages:
name: image
url: "https://pub.dartlang.org"
source: hosted
version: "3.0.8"
version: "3.1.0"
image_picker:
dependency: "direct main"
description:
@ -433,14 +433,14 @@ packages:
name: json_annotation
url: "https://pub.dartlang.org"
source: hosted
version: "4.3.0"
version: "4.4.0"
json_serializable:
dependency: "direct dev"
description:
name: json_serializable
url: "https://pub.dartlang.org"
source: hosted
version: "6.0.1"
version: "6.1.3"
keyboard_dismisser:
dependency: "direct main"
description:
@ -482,7 +482,7 @@ packages:
name: matcher
url: "https://pub.dartlang.org"
source: hosted
version: "0.12.10"
version: "0.12.11"
matrix4_transform:
dependency: "direct main"
description:
@ -510,14 +510,14 @@ packages:
name: mobx
url: "https://pub.dartlang.org"
source: hosted
version: "2.0.5"
version: "2.0.6+1"
mobx_codegen:
dependency: "direct dev"
description:
name: mobx_codegen
url: "https://pub.dartlang.org"
source: hosted
version: "2.0.4"
version: "2.0.5+2"
modal_bottom_sheet:
dependency: "direct main"
description:
@ -594,14 +594,14 @@ packages:
name: path_provider
url: "https://pub.dartlang.org"
source: hosted
version: "2.0.7"
version: "2.0.8"
path_provider_android:
dependency: transitive
description:
name: path_provider_android
url: "https://pub.dartlang.org"
source: hosted
version: "2.0.9"
version: "2.0.11"
path_provider_ios:
dependency: transitive
description:
@ -615,14 +615,14 @@ packages:
name: path_provider_linux
url: "https://pub.dartlang.org"
source: hosted
version: "2.1.2"
version: "2.1.4"
path_provider_macos:
dependency: transitive
description:
name: path_provider_macos
url: "https://pub.dartlang.org"
source: hosted
version: "2.0.3"
version: "2.0.4"
path_provider_platform_interface:
dependency: transitive
description:
@ -657,14 +657,14 @@ packages:
name: platform
url: "https://pub.dartlang.org"
source: hosted
version: "3.0.2"
version: "3.1.0"
plugin_platform_interface:
dependency: transitive
description:
name: plugin_platform_interface
url: "https://pub.dartlang.org"
source: hosted
version: "2.0.2"
version: "2.1.0"
pool:
dependency: transitive
description:
@ -685,7 +685,7 @@ packages:
name: provider
url: "https://pub.dartlang.org"
source: hosted
version: "6.0.1"
version: "6.0.2"
pub_semver:
dependency: transitive
description:
@ -699,7 +699,7 @@ packages:
name: pubspec_parse
url: "https://pub.dartlang.org"
source: hosted
version: "1.1.0"
version: "1.2.0"
share_plus:
dependency: "direct main"
description:
@ -748,7 +748,7 @@ packages:
name: shared_preferences
url: "https://pub.dartlang.org"
source: hosted
version: "2.0.9"
version: "2.0.11"
shared_preferences_android:
dependency: transitive
description:
@ -823,14 +823,14 @@ packages:
name: source_gen
url: "https://pub.dartlang.org"
source: hosted
version: "1.1.1"
version: "1.2.1"
source_helper:
dependency: transitive
description:
name: source_helper
url: "https://pub.dartlang.org"
source: hosted
version: "1.3.0"
version: "1.3.1"
source_span:
dependency: transitive
description:
@ -879,7 +879,7 @@ packages:
name: test_api
url: "https://pub.dartlang.org"
source: hosted
version: "0.4.2"
version: "0.4.3"
timeago:
dependency: "direct main"
description:
@ -907,7 +907,21 @@ packages:
name: url_launcher
url: "https://pub.dartlang.org"
source: hosted
version: "6.0.15"
version: "6.0.17"
url_launcher_android:
dependency: transitive
description:
name: url_launcher_android
url: "https://pub.dartlang.org"
source: hosted
version: "6.0.13"
url_launcher_ios:
dependency: transitive
description:
name: url_launcher_ios
url: "https://pub.dartlang.org"
source: hosted
version: "6.0.13"
url_launcher_linux:
dependency: transitive
description:
@ -935,7 +949,7 @@ packages:
name: url_launcher_web
url: "https://pub.dartlang.org"
source: hosted
version: "2.0.4"
version: "2.0.5"
url_launcher_windows:
dependency: transitive
description:
@ -949,7 +963,7 @@ packages:
name: vector_math
url: "https://pub.dartlang.org"
source: hosted
version: "2.1.0"
version: "2.1.1"
watcher:
dependency: transitive
description:
@ -970,7 +984,7 @@ packages:
name: win32
url: "https://pub.dartlang.org"
source: hosted
version: "2.3.1"
version: "2.3.3"
xdg_directories:
dependency: transitive
description:
@ -993,5 +1007,5 @@ packages:
source: hosted
version: "3.1.0"
sdks:
dart: ">=2.14.0 <3.0.0"
flutter: ">=2.5.0"
dart: ">=2.15.0 <3.0.0"
flutter: ">=2.8.0"

8
pubspec.yaml
View File

@ -18,11 +18,12 @@ publish_to: "none" # Remove this line if you wish to publish to pub.dev
version: 0.7.0+18
environment:
sdk: ">=2.14.0 <3.0.0"
sdk: ">=2.15.0 <3.0.0"
flutter: ">=2.8.0 <3.0.0"
dependencies:
# widgets
flutter_speed_dial: ^4.3.0
flutter_speed_dial: ^5.0.0
photo_view: ^0.13.0
markdown: ^4.0.0
flutter_markdown: ^0.6.1
@ -35,7 +36,7 @@ dependencies:
shared_preferences: ^2.0.5
package_info_plus: ^1.0.6
image_picker: ^0.8.4
extended_image: ^5.1.2
extended_image: ^6.0.1
# state management
flutter_hooks: ^0.18.0
@ -80,7 +81,6 @@ flutter_icons:
# following page: https://dart.dev/tools/pub/pubspec
# The following section is specific to Flutter.
flutter:
generate: true
# The following line ensures that the Material Icons font is
# included with your application, so that you can use the icons in
# the material Icons class.