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

Upgrade frontend #848

Merged
merged 5 commits into from
Mar 13, 2023
Merged
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 .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ jobs:
command: fvm flutter pub get
- run:
name: Check Formatting
command: fvm flutter format -l 120 -o none --set-exit-if-changed .
command: fvm dart format -l 120 -o none --set-exit-if-changed .
- run:
name: Build Runner
command: |
Expand Down
2 changes: 1 addition & 1 deletion .github/hooks/pre-commit
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ if [ ! -x "$(command -v fvm)" ]; then
fi

# Prettify all selected files
echo "$FILES" | xargs fvm flutter format -l 120
echo "$FILES" | xargs fvm dart format -l 120

# Add back the modified/prettified files to staging
echo "$FILES" | xargs git add
Expand Down
2 changes: 1 addition & 1 deletion .idea/runConfigurations/Format_frontend.xml

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

2 changes: 1 addition & 1 deletion frontend/.fvm/fvm_config.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"flutterSdkVersion": "3.3.0",
"flutterSdkVersion": "3.7.6",
"flavors": {}
}
2 changes: 1 addition & 1 deletion frontend/analysis_options.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
include: package:lint/analysis_options.yaml
include: package:lints/recommended.yaml

analyzer:
strong-mode:
Expand Down
32 changes: 17 additions & 15 deletions frontend/ios/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ PODS:
- Flutter
- ReachabilitySwift
- Flutter (1.0.0)
- flutter_secure_storage (3.3.1):
- flutter_secure_storage (6.0.0):
- Flutter
- geolocator_apple (1.2.0):
- Flutter
Expand Down Expand Up @@ -64,7 +64,7 @@ PODS:
- MLImage (= 1.0.0-beta3)
- MLKitCommon (~> 8.0)
- Protobuf (~> 3.12)
- mobile_scanner (0.0.1):
- mobile_scanner (3.0.0):
- Flutter
- GoogleMLKit/BarcodeScanning (~> 3.2.0)
- nanopb (2.30909.0):
Expand All @@ -74,15 +74,17 @@ PODS:
- nanopb/encode (2.30909.0)
- package_info_plus (0.4.5):
- Flutter
- path_provider_ios (0.0.1):
- path_provider_foundation (0.0.1):
- Flutter
- FlutterMacOS
- permission_handler_apple (9.0.4):
- Flutter
- PromisesObjC (2.1.1)
- Protobuf (3.21.12)
- ReachabilitySwift (5.0.0)
- shared_preferences_ios (0.0.1):
- shared_preferences_foundation (0.0.1):
- Flutter
- FlutterMacOS
- url_launcher_ios (0.0.1):
- Flutter

Expand All @@ -96,9 +98,9 @@ DEPENDENCIES:
- MapLibreAnnotationExtension
- mobile_scanner (from `.symlinks/plugins/mobile_scanner/ios`)
- package_info_plus (from `.symlinks/plugins/package_info_plus/ios`)
- path_provider_ios (from `.symlinks/plugins/path_provider_ios/ios`)
- path_provider_foundation (from `.symlinks/plugins/path_provider_foundation/ios`)
- permission_handler_apple (from `.symlinks/plugins/permission_handler_apple/ios`)
- shared_preferences_ios (from `.symlinks/plugins/shared_preferences_ios/ios`)
- shared_preferences_foundation (from `.symlinks/plugins/shared_preferences_foundation/ios`)
- url_launcher_ios (from `.symlinks/plugins/url_launcher_ios/ios`)

SPEC REPOS:
Expand Down Expand Up @@ -136,19 +138,19 @@ EXTERNAL SOURCES:
:path: ".symlinks/plugins/mobile_scanner/ios"
package_info_plus:
:path: ".symlinks/plugins/package_info_plus/ios"
path_provider_ios:
:path: ".symlinks/plugins/path_provider_ios/ios"
path_provider_foundation:
:path: ".symlinks/plugins/path_provider_foundation/ios"
permission_handler_apple:
:path: ".symlinks/plugins/permission_handler_apple/ios"
shared_preferences_ios:
:path: ".symlinks/plugins/shared_preferences_ios/ios"
shared_preferences_foundation:
:path: ".symlinks/plugins/shared_preferences_foundation/ios"
url_launcher_ios:
:path: ".symlinks/plugins/url_launcher_ios/ios"

SPEC CHECKSUMS:
connectivity_plus: 413a8857dd5d9f1c399a39130850d02fe0feaf7e
Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854
flutter_secure_storage: 7953c38a04c3fdbb00571bcd87d8e3b5ceb9daec
flutter_secure_storage: 23fc622d89d073675f2eaa109381aefbcf5a49be
geolocator_apple: cc556e6844d508c95df1e87e3ea6fa4e58c50401
GoogleDataTransport: 1c8145da7117bd68bbbed00cf304edb6a24de00f
GoogleMLKit: 0017a6a8372e1a182139b9def4d89be5d87ca5a7
Expand All @@ -163,16 +165,16 @@ SPEC CHECKSUMS:
MLKitBarcodeScanning: d92fe1911001ec36870162c5a0eb206f612b7169
MLKitCommon: f6da6c5659618c070b50a80db01248ebe2964175
MLKitVision: 96c96571190b7f63eddf4a12068ce8a8689e0d2c
mobile_scanner: 0cf06f3d5224576aa24ade02a6f73d8b2551c7bf
mobile_scanner: 004f7ad2fe4e2b5a3e6ed0bc4b83ca9c5b5dd975
nanopb: b552cce312b6c8484180ef47159bc0f65a1f0431
package_info_plus: 6c92f08e1f853dc01228d6f553146438dafcd14e
path_provider_ios: 14f3d2fd28c4fdb42f44e0f751d12861c43cee02
path_provider_foundation: c68054786f1b4f3343858c1e1d0caaded73f0be9
permission_handler_apple: 44366e37eaf29454a1e7b1b7d736c2cceaeb17ce
PromisesObjC: ab77feca74fa2823e7af4249b8326368e61014cb
Protobuf: 120350fc38646e2dedc26f49ecba778184ea1de2
ReachabilitySwift: 985039c6f7b23a1da463388634119492ff86c825
shared_preferences_ios: 548a61f8053b9b8a49ac19c1ffbc8b92c50d68ad
url_launcher_ios: 839c58cdb4279282219f5e248c3321761ff3c4de
shared_preferences_foundation: 986fc17f3d3251412d18b0265f9c64113a8c2472
url_launcher_ios: 08a3dfac5fb39e8759aeb0abbd5d9480f30fc8b4

PODFILE CHECKSUM: 9e624ef9ea1950d5ac2524cf89093b7a29070f86

Expand Down
10 changes: 5 additions & 5 deletions frontend/lib/about/about_page.dart
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,10 @@ class AboutPage extends StatelessWidget {
),
),
Center(
child: Text(packageInfo.appName, style: Theme.of(context).textTheme.headline5),
child: Text(packageInfo.appName, style: Theme.of(context).textTheme.headlineSmall),
),
Center(
child: Text(packageInfo.version, style: Theme.of(context).textTheme.bodyText2),
child: Text(packageInfo.version, style: Theme.of(context).textTheme.bodyMedium),
),
const SizedBox(height: 20),
const Divider(
Expand All @@ -55,17 +55,17 @@ class AboutPage extends StatelessWidget {
child: Column(
children: [
Center(
child: Text("Herausgeber", style: Theme.of(context).textTheme.subtitle2),
child: Text("Herausgeber", style: Theme.of(context).textTheme.titleSmall),
),
Padding(
padding: const EdgeInsets.only(left: 10, right: 10, top: 16, bottom: 16),
child: Text(buildConfig.publisherAddress, style: Theme.of(context).textTheme.bodyText1),
child: Text(buildConfig.publisherAddress, style: Theme.of(context).textTheme.bodyLarge),
),
Text(
"Mehr Informationen",
style: Theme.of(context)
.textTheme
.bodyText2
.bodyMedium
?.merge(TextStyle(color: Theme.of(context).colorScheme.secondary)),
),
],
Expand Down
2 changes: 1 addition & 1 deletion frontend/lib/about/content_tile.dart
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ class ContentPage extends StatelessWidget {
Widget build(BuildContext context) {
final theme = Theme.of(context);
return DecoratedBox(
decoration: BoxDecoration(color: theme.backgroundColor),
decoration: BoxDecoration(color: theme.colorScheme.background),
child: CustomScrollView(
slivers: <Widget>[
CustomSliverAppBar(title: title),
Expand Down
2 changes: 1 addition & 1 deletion frontend/lib/about/license_page.dart
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ class SingleLicensePage extends StatelessWidget {
(BuildContext context, int index) {
final paragraph = paragraphs.toList()[index];

return Text("\t" * paragraph.indent * 2 + paragraph.text, style: Theme.of(context).textTheme.bodyText1);
return Text("\t" * paragraph.indent * 2 + paragraph.text, style: Theme.of(context).textTheme.bodyLarge);
},
childCount: paragraphs.length,
),
Expand Down
4 changes: 2 additions & 2 deletions frontend/lib/about/texts.dart
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ List<Widget> toWidgets(ThemeData theme, List<Paragraph> paragraphs) {
final title = e.title;
final content = e.content;
return [
if (title != null) Text(title, style: theme.textTheme.headline6),
if (content != null) Text(content, style: theme.textTheme.bodyText1)
if (title != null) Text(title, style: theme.textTheme.titleLarge),
if (content != null) Text(content, style: theme.textTheme.bodyLarge)
];
})
.expand((i) => i)
Expand Down
4 changes: 2 additions & 2 deletions frontend/lib/home/home_page.dart
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ class HomePage extends StatefulWidget {
const HomePage({super.key});

@override
_HomePageState createState() => _HomePageState();
HomePageState createState() => HomePageState();
}

class _HomePageState extends State<HomePage> {
class HomePageState extends State<HomePage> {
int _currentTabIndex = 0;
late List<AppFlow> appFlows;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ class AnimatedProgressbar extends StatefulWidget {
const AnimatedProgressbar({super.key, required this.initialProgress});

@override
_AnimatedProgressbarState createState() => _AnimatedProgressbarState();
AnimatedProgressbarState createState() => AnimatedProgressbarState();
}

class _AnimatedProgressbarState extends State<AnimatedProgressbar> with SingleTickerProviderStateMixin {
class AnimatedProgressbarState extends State<AnimatedProgressbar> with SingleTickerProviderStateMixin {
late AnimationController controller;
late Animation<double> animation;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ class VerificationCodeView extends StatefulWidget {
VerificationCodeView({super.key, required this.userCode}) : _otpGenerator = OTPGenerator(userCode.totpSecret);

@override
_VerificationCodeViewState createState() => _VerificationCodeViewState();
VerificationCodeViewState createState() => VerificationCodeViewState();
}

class _VerificationCodeViewState extends State<VerificationCodeView> {
class VerificationCodeViewState extends State<VerificationCodeView> {
OTPCode? _otpCode;

@override
Expand Down Expand Up @@ -69,7 +69,7 @@ class _VerificationCodeViewState extends State<VerificationCodeView> {
child: qr.QrImage.withQr(
qr: qrCode,
version: qr.QrVersions.auto,
foregroundColor: Theme.of(context).textTheme.bodyText2?.color,
foregroundColor: Theme.of(context).textTheme.bodyMedium?.color,
gapless: false,
),
),
Expand Down
2 changes: 1 addition & 1 deletion frontend/lib/identification/info_dialog.dart
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ class InfoDialog extends StatelessWidget {
return AlertDialog(
title: ListTile(
leading: Icon(icon, color: iconColor ?? theme.colorScheme.primaryContainer, size: 30),
title: Text(title, style: theme.textTheme.headline5),
title: Text(title, style: theme.textTheme.headlineSmall),
),
content: child,
actions: [TextButton(onPressed: () => Navigator.of(context).pop(), child: const Text("OK"))],
Expand Down
2 changes: 1 addition & 1 deletion frontend/lib/identification/no_card_view.dart
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ class _TapableCardWithArea extends StatelessWidget {
Expanded(
child: Text(
title,
style: Theme.of(context).textTheme.headline6,
style: Theme.of(context).textTheme.titleLarge,
textAlign: TextAlign.left,
),
),
Expand Down
Loading