Skip to content

Commit

Permalink
Merge pull request #106 from atsign-foundation/fix/package-missing-fo…
Browse files Browse the repository at this point in the history
…ntweight

Fix/package missing fontweight
  • Loading branch information
sarika01 authored Apr 29, 2022
2 parents 88d55d5 + a2b88b4 commit ac5586b
Show file tree
Hide file tree
Showing 3 changed files with 69 additions and 35 deletions.
23 changes: 18 additions & 5 deletions lib/app.dart
Original file line number Diff line number Diff line change
Expand Up @@ -57,11 +57,17 @@ class _MyAppState extends State<MyApp> {
child: MaterialApp(
builder: (BuildContext context, Widget? child) {
final MediaQueryData data = MediaQuery.of(context);
return MediaQuery(
data: data.copyWith(
textScaleFactor:
data.textScaleFactor > 1.1 ? 1.1 : data.textScaleFactor),
child: child!,
return GestureDetector(
onVerticalDragDown: (__) {
// When running in iOS, dismiss the keyboard when when user scrolls
if (Platform.isIOS) hideKeyboard(context);
},
child: MediaQuery(
data: data.copyWith(
textScaleFactor:
data.textScaleFactor > 1.1 ? 1.1 : data.textScaleFactor),
child: child!,
),
);
},
title: 'AtSign Atmosphere Pro',
Expand All @@ -83,4 +89,11 @@ class _MyAppState extends State<MyApp> {
),
);
}

void hideKeyboard(BuildContext context) {
FocusScopeNode currentFocus = FocusScope.of(context);
if (!currentFocus.hasPrimaryFocus && currentFocus.focusedChild != null) {
FocusManager.instance.primaryFocus?.unfocus();
}
}
}
63 changes: 37 additions & 26 deletions pubspec.lock
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ packages:
name: at_client
url: "https://pub.dartlang.org"
source: hosted
version: "3.0.18"
version: "3.0.20"
at_client_mobile:
dependency: "direct main"
description:
Expand All @@ -74,17 +74,19 @@ packages:
at_common_flutter:
dependency: "direct main"
description:
name: at_common_flutter
url: "https://pub.dartlang.org"
source: hosted
path: at_common_flutter
ref: "fix/missing-fontweight"
resolved-ref: "983b874300a112db1a968c500bf9fe0e0e10fd14"
url: "[email protected]:atsign-foundation/at_widgets.git"
source: git
version: "2.0.6"
at_commons:
dependency: "direct main"
description:
name: at_commons
url: "https://pub.dartlang.org"
source: hosted
version: "3.0.13"
version: "3.0.14"
at_contact:
dependency: "direct main"
description:
Expand All @@ -96,17 +98,17 @@ packages:
dependency: "direct main"
description:
path: at_contacts_flutter
ref: trunk
resolved-ref: "28c79e2fca4727750497a71b648ae36bb3858c8e"
ref: "fix/missing-fontweight"
resolved-ref: "983b874300a112db1a968c500bf9fe0e0e10fd14"
url: "[email protected]:atsign-foundation/at_widgets.git"
source: git
version: "4.0.3"
at_contacts_group_flutter:
dependency: "direct main"
description:
path: at_contacts_group_flutter
ref: trunk
resolved-ref: "28c79e2fca4727750497a71b648ae36bb3858c8e"
ref: "fix/missing-fontweight"
resolved-ref: "983b874300a112db1a968c500bf9fe0e0e10fd14"
url: "[email protected]:atsign-foundation/at_widgets.git"
source: git
version: "4.0.3"
Expand All @@ -116,21 +118,23 @@ packages:
name: at_lookup
url: "https://pub.dartlang.org"
source: hosted
version: "3.0.19"
version: "3.0.20"
at_onboarding_flutter:
dependency: "direct main"
description:
name: at_onboarding_flutter
url: "https://pub.dartlang.org"
source: hosted
path: at_onboarding_flutter
ref: "fix/missing-fontweight"
resolved-ref: "983b874300a112db1a968c500bf9fe0e0e10fd14"
url: "[email protected]:atsign-foundation/at_widgets.git"
source: git
version: "4.0.1"
at_persistence_secondary_server:
dependency: transitive
description:
name: at_persistence_secondary_server
url: "https://pub.dartlang.org"
source: hosted
version: "3.0.23"
version: "3.0.24"
at_persistence_spec:
dependency: transitive
description:
Expand Down Expand Up @@ -186,7 +190,7 @@ packages:
name: carousel_slider
url: "https://pub.dartlang.org"
source: hosted
version: "4.0.0"
version: "4.1.1"
characters:
dependency: transitive
description:
Expand Down Expand Up @@ -436,7 +440,7 @@ packages:
name: flutter_local_notifications
url: "https://pub.dartlang.org"
source: hosted
version: "9.4.0"
version: "9.4.1"
flutter_local_notifications_linux:
dependency: transitive
description:
Expand Down Expand Up @@ -503,6 +507,13 @@ packages:
url: "https://pub.dartlang.org"
source: hosted
version: "2.1.2"
get_it:
dependency: transitive
description:
name: get_it
url: "https://pub.dartlang.org"
source: hosted
version: "7.2.0"
glob:
dependency: transitive
description:
Expand All @@ -516,7 +527,7 @@ packages:
name: google_fonts
url: "https://pub.dartlang.org"
source: hosted
version: "2.3.1"
version: "2.3.2"
hive:
dependency: transitive
description:
Expand Down Expand Up @@ -600,7 +611,7 @@ packages:
name: local_notifier
url: "https://pub.dartlang.org"
source: hosted
version: "0.1.1"
version: "0.1.2"
logging:
dependency: transitive
description:
Expand Down Expand Up @@ -649,7 +660,7 @@ packages:
name: msix
url: "https://pub.dartlang.org"
source: hosted
version: "3.4.1"
version: "3.5.1"
mutex:
dependency: transitive
description:
Expand Down Expand Up @@ -817,7 +828,7 @@ packages:
name: permission_handler_apple
url: "https://pub.dartlang.org"
source: hosted
version: "9.0.3"
version: "9.0.4"
permission_handler_platform_interface:
dependency: transitive
description:
Expand Down Expand Up @@ -929,7 +940,7 @@ packages:
name: share_plus
url: "https://pub.dartlang.org"
source: hosted
version: "4.0.3"
version: "4.0.4"
share_plus_linux:
dependency: transitive
description:
Expand Down Expand Up @@ -1144,7 +1155,7 @@ packages:
name: url_launcher
url: "https://pub.dartlang.org"
source: hosted
version: "6.0.20"
version: "6.1.0"
url_launcher_android:
dependency: transitive
description:
Expand Down Expand Up @@ -1256,14 +1267,14 @@ packages:
name: webview_flutter
url: "https://pub.dartlang.org"
source: hosted
version: "3.0.1"
version: "3.0.2"
webview_flutter_android:
dependency: transitive
description:
name: webview_flutter_android
url: "https://pub.dartlang.org"
source: hosted
version: "2.8.3"
version: "2.8.5"
webview_flutter_platform_interface:
dependency: transitive
description:
Expand All @@ -1277,14 +1288,14 @@ packages:
name: webview_flutter_wkwebview
url: "https://pub.dartlang.org"
source: hosted
version: "2.7.1"
version: "2.7.2"
win32:
dependency: transitive
description:
name: win32
url: "https://pub.dartlang.org"
source: hosted
version: "2.5.1"
version: "2.5.2"
xdg_directories:
dependency: transitive
description:
Expand Down
18 changes: 14 additions & 4 deletions pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -79,13 +79,23 @@ dependency_overrides:
at_contacts_flutter:
git:
url: [email protected]:atsign-foundation/at_widgets.git
ref: trunk
ref: fix/missing-fontweight
path: at_contacts_flutter
at_contacts_group_flutter:
at_common_flutter:
git:
url: [email protected]:atsign-foundation/at_widgets.git
ref: trunk
path: at_contacts_group_flutter
ref: fix/missing-fontweight
path: at_common_flutter
at_onboarding_flutter:
git:
url: [email protected]:atsign-foundation/at_widgets.git
ref: fix/missing-fontweight
path: at_onboarding_flutter
at_contacts_group_flutter:
git:
url: [email protected]:atsign-foundation/at_widgets.git
ref: fix/missing-fontweight
path: at_contacts_flutter

dev_dependencies:
flutter_test:
Expand Down

0 comments on commit ac5586b

Please sign in to comment.