Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Flutter update - v3.22.3 #75

Merged
merged 16 commits into from
Jan 3, 2025
Merged
Show file tree
Hide file tree
Changes from 15 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 .fvm/fvm_config.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"flutterSdkVersion": "3.16.5"
"flutterSdkVersion": "3.22.3"
}
2 changes: 1 addition & 1 deletion .fvmrc
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"flutter": "3.16.5",
"flutter": "3.22.3",
"flavors": {}
}
2 changes: 1 addition & 1 deletion .github/workflows/android_package.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:

- uses: subosito/flutter-action@v1
with:
flutter-version: '3.16.5'
flutter-version: '3.22.3'
channel: 'stable'

- name: Install dependencies
Expand Down
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
- #35 | Android - opening only specific file types
- #39 | When sharing document, set file name
- #36 | Implement first version of Document validation
- #76 | Replace Main menu buttons with built-in TextButton to resolve Google UX warning
- #75 | Update to Flutter SDK v3.22.3

## 2024-07-16 - v1.0.4(35)

Expand Down
16 changes: 8 additions & 8 deletions ios/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -261,7 +261,7 @@ SPEC CHECKSUMS:
FirebaseCrashlytics: e568d68ce89117c80cddb04073ab9018725fbb8c
FirebaseInstallations: 8f581fca6478a50705d2bd2abd66d306e0f5736e
FirebaseSessions: 2651b464e241c93fd44112f995d5ab663c970487
Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854
Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7
GoogleDataTransport: 6c09b596d841063d76d4288cc2d2f42cc36e1e2a
GoogleMLKit: 2bd0dc6253c4d4f227aad460f69215a504b2980e
GoogleToolboxForMac: 8bef7c7c5cf7291c687cf5354f39f9db6399ad34
Expand All @@ -277,18 +277,18 @@ SPEC CHECKSUMS:
mobile_scanner: 38dcd8a49d7d485f632b7de65e4900010187aef2
nanopb: 438bc412db1928dac798aa6fd75726007be04262
OpenSSL-Universal: 6e1ae0555546e604dbc632a2b9a24a9c46c41ef6
package_info_plus: 115f4ad11e0698c8c1c5d8a689390df880f47e85
path_provider_foundation: 3784922295ac71e43754bd15e0653ccfd36a147c
package_info_plus: c0502532a26c7662a62a356cebe2692ec5fe4ec4
path_provider_foundation: 2b6b4c569c0fb62ec74538f866245ac84301af46
printing: 233e1b73bd1f4a05615548e9b5a324c98588640b
PromisesObjC: f5707f49cb48b9636751c5b2e7d227e43fba9f47
PromisesSwift: 9d77319bbe72ebf6d872900551f7eeba9bce2851
SDWebImage: 981fd7e860af070920f249fd092420006014c3eb
share_plus: c3fef564749587fc939ef86ffb283ceac0baf9f5
shared_preferences_foundation: b4c3b4cddf1c21f02770737f147a3f5da9d39695
share_plus: 8b6f8b3447e494cca5317c8c3073de39b3600d1f
shared_preferences_foundation: fcdcbc04712aee1108ac7fda236f363274528f78
SwiftyGif: 93a1cc87bf3a51916001cf8f3d63835fb64c819f
url_launcher_ios: bbd758c6e7f9fd7b5b1d4cde34d2b95fcce5e812
wakelock_plus: 8b09852c8876491e4b6d179e17dfe2a0b5f60d47
webview_flutter_wkwebview: 4f3e50f7273d31e5500066ed267e3ae4309c5ae4
url_launcher_ios: 5334b05cef931de560670eeae103fd3e431ac3fe
wakelock_plus: 373cfe59b235a6dd5837d0fb88791d2f13a90d56
webview_flutter_wkwebview: 2a23822e9039b7b1bc52e5add778e5d89ad488d1

PODFILE CHECKSUM: a57f30d18f102dd3ce366b1d62a55ecbef2158e5

Expand Down
147 changes: 74 additions & 73 deletions lib/di.config.dart

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion lib/file_extensions.dart
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@ extension FileExtensions on File {
/// Returns redacted file info usable for logging.
///
/// In case of [kDebugMode], full [File.path] is returned;
/// "???.[FileExtensions.extension]" otherwise.
/// "???.[extension]" otherwise.
String get redactedInfo => (kDebugMode ? path : "???$extension");
}
18 changes: 12 additions & 6 deletions lib/ui/app_theme.dart
Original file line number Diff line number Diff line change
Expand Up @@ -28,30 +28,31 @@ ThemeData appTheme(
BuildContext context, {
Brightness? brightness,
}) {
const color = Color(0xFF126DFF);
const primaryColor = Color(0xFF126DFF);
final colorScheme = ColorScheme.fromSeed(
brightness: brightness ?? MediaQuery.platformBrightnessOf(context),
seedColor: color,
seedColor: primaryColor,
primary: primaryColor,
);
final textTheme = Theme.of(context).textTheme.apply(
fontSizeFactor: 1.2,
);
final appBarTheme = AppBarTheme(
titleTextStyle: TextStyle(
color: colorScheme.onBackground,
color: colorScheme.onSurface,
fontSize: 20,
fontWeight: FontWeight.w700,
letterSpacing: 0.15,
),
);
final dialogTheme = DialogTheme(
titleTextStyle: TextStyle(
color: colorScheme.onBackground,
color: colorScheme.onSurface,
fontSize: 20,
fontWeight: FontWeight.w700,
letterSpacing: 0.15,
),
surfaceTintColor: colorScheme.background,
surfaceTintColor: colorScheme.surface,
shape: const RoundedRectangleBorder(
borderRadius: BorderRadius.all(Radius.circular(8)),
),
Expand All @@ -72,7 +73,7 @@ ThemeData appTheme(

return ThemeData(
useMaterial3: true,
primaryColor: color,
primaryColor: primaryColor,
colorScheme: colorScheme,
fontFamily: "Source Sans 3",
// see /assets/fonts
Expand All @@ -89,6 +90,11 @@ ThemeData appTheme(
textStyle: buttonTextStyle,
),
),
elevatedButtonTheme: ElevatedButtonThemeData(
style: ElevatedButton.styleFrom(
textStyle: buttonTextStyle,
),
),
filledButtonTheme: FilledButtonThemeData(
style: FilledButton.styleFrom(
shape: buttonShape,
Expand Down
2 changes: 1 addition & 1 deletion lib/ui/fragment/show_web_page_fragment.dart
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ class _ShowWebPageFragmentState extends State<ShowWebPageFragment> {
if (!kIsWeb) {
controller
..setJavaScriptMode(JavaScriptMode.unrestricted)
..setBackgroundColor(Theme.of(context).colorScheme.background)
..setBackgroundColor(Theme.of(context).colorScheme.surface)
// In HTML, onPageFinished could be iframe.onload,
// however there is no case for onPageStarted, onWebResourceError
..setNavigationDelegate(NavigationDelegate(
Expand Down
Loading
Loading