GitLab/fluffychat
2
0
Fork 0
mirror of https://gitlab.com/famedly/fluffychat.git synced 2024-11-27 14:59:29 +01:00
Code Issues Projects Releases Wiki Activity

refactor: Upgrade to Flutter 2.5

Browse Source
This commit is contained in:
Krille Fear 2021-09-13 17:41:53 +02:00
parent 7aa72c3c08
commit e5b62d893d
7 changed files with 39 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.gitlab-ci.yml
View File

@ -168,10 +168,6 @@ build_linux_x86:
build_linux_arm64:
stage: coverage
before_script:
- flutter channel stable
# - flutter upgrade --force
- $(cd $(which flutter | xargs dirname) && git checkout 2.2.3)
script: [./scripts/build-linux.sh]
tags: [docker_arm64]
only:
@ -315,5 +311,3 @@ docker-branches:
before_script:
- docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
allow_failure: true

20
lib/config/themes.dart
View File

@ -107,13 +107,11 @@ abstract class FluffyThemes {
),
appBarTheme: AppBarTheme(
elevation: 2,
brightness: Brightness.light,
systemOverlayStyle: SystemUiOverlayStyle.dark,
color: Colors.white,
textTheme: TextTheme(
headline6: TextStyle(
color: Colors.black,
fontSize: 20,
),
titleTextStyle: TextStyle(
color: Colors.black,
fontSize: 20,
),
iconTheme: IconThemeData(color: Colors.black),
),
@ -197,13 +195,11 @@ abstract class FluffyThemes {
snackBarTheme: SnackBarThemeData(behavior: SnackBarBehavior.floating),
appBarTheme: AppBarTheme(
elevation: 2,
brightness: Brightness.dark,
systemOverlayStyle: SystemUiOverlayStyle.light,
color: Color(0xff1D1D1D),
textTheme: TextTheme(
headline6: TextStyle(
color: Colors.white,
fontSize: 20,
),
titleTextStyle: TextStyle(
color: Colors.white,
fontSize: 20,
),
iconTheme: IconThemeData(color: Colors.white),
),

6
lib/pages/views/chat_details_view.dart
View File

@ -79,10 +79,10 @@ class ChatDetailsView extends StatelessWidget {
style: TextStyle(
color: Theme.of(context)
.appBarTheme
.textTheme
.headline6
.titleTextStyle
.color)),
backgroundColor: Theme.of(context).appBarTheme.color,
backgroundColor:
Theme.of(context).appBarTheme.backgroundColor,
flexibleSpace: FlexibleSpaceBar(
background: ContentBanner(room.avatar,
onEdit: room.canSendEvent('m.room.avatar')

2
lib/pages/views/settings_view.dart
View File

@ -25,7 +25,7 @@ class SettingsView extends StatelessWidget {
floating: true,
pinned: true,
title: Text(L10n.of(context).settings),
backgroundColor: Theme.of(context).appBarTheme.color,
backgroundColor: Theme.of(context).appBarTheme.backgroundColor,
flexibleSpace: FlexibleSpaceBar(
background: ContentBanner(
controller.profile?.avatarUrl,

2
lib/widgets/list_items/chat_list_item.dart
View File

@ -150,7 +150,7 @@ class ChatListItem extends StatelessWidget {
room.lastEvent?.senderId == Matrix.of(context).client.userID;
final unread = room.isUnread || room.membership == Membership.invite;
final unreadBubbleSize = unread
? room.notificationCount > 0.0
? room.notificationCount > 0
? 20.0
: 14.0
: 0.0;

30
pubspec.lock
View File

@ -63,7 +63,7 @@ packages:
name: audioplayers
url: "https://pub.dartlang.org"
source: hosted
version: "0.19.1"
version: "0.20.1"
base58check:
dependency: transitive
description:
@ -231,7 +231,7 @@ packages:
name: emoji_picker_flutter
url: "https://pub.dartlang.org"
source: hosted
version: "1.0.6"
version: "1.0.7"
fake_async:
dependency: transitive
description:
@ -324,7 +324,7 @@ packages:
name: filesystem_picker
url: "https://pub.dartlang.org"
source: hosted
version: "1.0.4"
version: "2.0.0-nullsafety.0"
firebase_core:
dependency: transitive
description:
@ -439,7 +439,7 @@ packages:
name: flutter_map
url: "https://pub.dartlang.org"
source: hosted
version: "0.13.1"
version: "0.14.0"
flutter_math_fork:
dependency: transitive
description:
@ -507,7 +507,7 @@ packages:
name: flutter_typeahead
url: "https://pub.dartlang.org"
source: hosted
version: "3.2.0"
version: "3.2.1"
flutter_web_plugins:
dependency: transitive
description: flutter
@ -533,7 +533,7 @@ packages:
name: geolocator
url: "https://pub.dartlang.org"
source: hosted
version: "7.4.0"
version: "7.6.0"
geolocator_android:
dependency: transitive
description:
@ -547,14 +547,14 @@ packages:
name: geolocator_apple
url: "https://pub.dartlang.org"
source: hosted
version: "1.0.0"
version: "1.2.0"
geolocator_platform_interface:
dependency: transitive
description:
name: geolocator_platform_interface
url: "https://pub.dartlang.org"
source: hosted
version: "2.3.2"
version: "2.3.4"
geolocator_web:
dependency: transitive
description:
@ -631,7 +631,7 @@ packages:
name: image_picker
url: "https://pub.dartlang.org"
source: hosted
version: "0.8.3+2"
version: "0.8.4"
image_picker_for_web:
dependency: transitive
description:
@ -645,7 +645,7 @@ packages:
name: image_picker_platform_interface
url: "https://pub.dartlang.org"
source: hosted
version: "2.2.0"
version: "2.4.1"
intl:
dependency: "direct main"
description:
@ -729,7 +729,7 @@ packages:
name: matrix
url: "https://pub.dartlang.org"
source: hosted
version: "0.5.0"
version: "0.5.1"
matrix_api_lite:
dependency: transitive
description:
@ -1102,7 +1102,7 @@ packages:
name: sentry
url: "https://pub.dartlang.org"
source: hosted
version: "5.1.0"
version: "6.0.0"
share:
dependency: "direct main"
description:
@ -1158,7 +1158,7 @@ packages:
name: shared_preferences
url: "https://pub.dartlang.org"
source: hosted
version: "2.0.5"
version: "2.0.7"
shared_preferences_linux:
dependency: transitive
description:
@ -1422,7 +1422,7 @@ packages:
name: url_launcher
url: "https://pub.dartlang.org"
source: hosted
version: "6.0.9"
version: "6.0.10"
url_launcher_linux:
dependency: transitive
description:
@ -1520,7 +1520,7 @@ packages:
name: wakelock
url: "https://pub.dartlang.org"
source: hosted
version: "0.5.3+3"
version: "0.5.4"
wakelock_macos:
dependency: transitive
description:

22
pubspec.yaml
View File

@ -9,17 +9,17 @@ environment:
dependencies:
adaptive_dialog: ^1.1.0
adaptive_theme: ^2.2.0
audioplayers: ^0.19.1
audioplayers: ^0.20.1
cached_network_image: ^3.1.0
chewie: ^1.2.2
cupertino_icons: any
desktop_notifications: ">=0.4.0 <0.5.0" # Version 0.5.0 breaks web builds: https://github.com/canonical/dbus.dart/issues/250
email_validator: ^2.0.1
emoji_picker_flutter: ^1.0.6
emoji_picker_flutter: ^1.0.7
fcm_shared_isolate:
git: https://gitlab.com/famedly/libraries/fcm_shared_isolate.git
file_picker_cross: ^4.4.2
filesystem_picker: ^1.0.4
filesystem_picker: 2.0.0-nullsafety.0 # Using pre release to be compatible with Flutter 2.5
flutter:
sdk: flutter
flutter_app_badger: ^1.2.0
@ -30,22 +30,22 @@ dependencies:
flutter_local_notifications: ^6.0.0
flutter_localizations:
sdk: flutter
flutter_map: ^0.13.1
flutter_map: ^0.14.0
flutter_matrix_html: ^1.0.2
flutter_olm: ^1.1.2
flutter_openssl_crypto: ^0.0.1
flutter_secure_storage: ^4.2.1
flutter_slidable: ^0.6.0
flutter_svg: ^0.22.0
flutter_typeahead: ^3.2.0
flutter_typeahead: ^3.2.1
future_loading_dialog: ^0.2.1
geolocator: ^7.4.0
geolocator: ^7.6.0
hive_flutter: ^1.1.0
image_picker: ^0.8.3+2
image_picker: ^0.8.4
intl: any
localstorage: ^4.0.0+1
lottie: ^1.1.0
matrix: ^0.5.0
matrix: ^0.5.1
matrix_link_text: ^1.0.2
native_imaging:
git: https://gitlab.com/famedly/libraries/native_imaging.git
@ -61,16 +61,16 @@ dependencies:
receive_sharing_intent: ^1.4.5
record: ^3.0.0
scroll_to_index: ^2.0.0
sentry: ^5.1.0
sentry: ^6.0.0
share: ^2.0.4
slugify: ^2.0.0
swipe_to_action: ^0.2.0
uni_links: ^0.5.1
unifiedpush: ^1.0.6
universal_html: ^2.0.8
url_launcher: ^6.0.9
url_launcher: ^6.0.10
vrouter: 1.2.0+11
wakelock: ^0.5.3+3
wakelock: ^0.5.4
dev_dependencies:
dapackages: ^1.6.0