Skip to content

Commit 1dd6172

Browse files
author
Jonas Heinle
committed
resolved deprecation warning
1 parent 23462cc commit 1dd6172

36 files changed

+1291
-407
lines changed

Diff for: ‎.metadata

+5-20
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# This file should be version controlled and should not be manually edited.
55

66
version:
7-
revision: "dec2ee5c1f98f8e84a7d5380c05eb8a3d0a81668"
7+
revision: "c23637390482d4cf9598c3ce3f2be31aa7332daf"
88
channel: "stable"
99

1010
project_type: app
@@ -13,26 +13,11 @@ project_type: app
1313
migration:
1414
platforms:
1515
- platform: root
16-
create_revision: dec2ee5c1f98f8e84a7d5380c05eb8a3d0a81668
17-
base_revision: dec2ee5c1f98f8e84a7d5380c05eb8a3d0a81668
18-
- platform: android
19-
create_revision: dec2ee5c1f98f8e84a7d5380c05eb8a3d0a81668
20-
base_revision: dec2ee5c1f98f8e84a7d5380c05eb8a3d0a81668
21-
- platform: ios
22-
create_revision: dec2ee5c1f98f8e84a7d5380c05eb8a3d0a81668
23-
base_revision: dec2ee5c1f98f8e84a7d5380c05eb8a3d0a81668
16+
create_revision: c23637390482d4cf9598c3ce3f2be31aa7332daf
17+
base_revision: c23637390482d4cf9598c3ce3f2be31aa7332daf
2418
- platform: linux
25-
create_revision: dec2ee5c1f98f8e84a7d5380c05eb8a3d0a81668
26-
base_revision: dec2ee5c1f98f8e84a7d5380c05eb8a3d0a81668
27-
- platform: macos
28-
create_revision: dec2ee5c1f98f8e84a7d5380c05eb8a3d0a81668
29-
base_revision: dec2ee5c1f98f8e84a7d5380c05eb8a3d0a81668
30-
- platform: web
31-
create_revision: dec2ee5c1f98f8e84a7d5380c05eb8a3d0a81668
32-
base_revision: dec2ee5c1f98f8e84a7d5380c05eb8a3d0a81668
33-
- platform: windows
34-
create_revision: dec2ee5c1f98f8e84a7d5380c05eb8a3d0a81668
35-
base_revision: dec2ee5c1f98f8e84a7d5380c05eb8a3d0a81668
19+
create_revision: c23637390482d4cf9598c3ce3f2be31aa7332daf
20+
base_revision: c23637390482d4cf9598c3ce3f2be31aa7332daf
3621

3722
# User provided section
3823

Diff for: ‎l10n.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
synthetic-package: false
12
arb-dir: lib/l10n
23
template-arb-file: app_en.arb
34
output-localization-file: app_localizations.dart

Diff for: ‎lib/Pages/AboutMePage/Widgets/about_me_table.dart

+3-8
Original file line numberDiff line numberDiff line change
@@ -6,24 +6,19 @@ import 'package:jotrockenmitlockenrepo/Media/email_button.dart';
66
import 'package:jotrockenmitlockenrepo/SocialMedia/social_media_widgets.dart';
77
import 'package:font_awesome_flutter/font_awesome_flutter.dart';
88
import 'package:jotrockenmitlockenrepo/Decoration/col_divider.dart';
9-
import 'package:flutter_gen/gen_l10n/app_localizations.dart';
9+
import 'package:jotrockenmitlocken/l10n/app_localizations.dart';
1010
import 'package:jotrockenmitlockenrepo/user_settings.dart';
1111

1212
class AboutMeTable extends StatefulWidget {
13-
const AboutMeTable({
14-
super.key,
15-
required this.userSettings,
16-
});
13+
const AboutMeTable({super.key, required this.userSettings});
1714

1815
final UserSettings userSettings;
1916
@override
2017
AboutMeTableState createState() => AboutMeTableState();
2118
}
2219

2320
class AboutMeTableState extends State<AboutMeTable> {
24-
AboutMeTableState({
25-
Key? key,
26-
});
21+
AboutMeTableState({Key? key});
2722

2823
@override
2924
Widget build(BuildContext context) {

Diff for: ‎lib/Pages/AboutMePage/Widgets/donation.dart

+29-30
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,10 @@ import 'package:flutter/material.dart';
22
import 'package:jotrockenmitlockenrepo/Decoration/row_divider.dart';
33
import 'package:jotrockenmitlockenrepo/Media/Image/openable_image.dart';
44

5-
import 'package:flutter_gen/gen_l10n/app_localizations.dart';
5+
import 'package:jotrockenmitlocken/l10n/app_localizations.dart';
66

77
class Donation extends StatefulWidget {
8-
const Donation({
9-
super.key,
10-
});
8+
const Donation({super.key});
119

1210
@override
1311
State<Donation> createState() => _DonationState();
@@ -17,33 +15,34 @@ class _DonationState extends State<Donation> {
1715
@override
1816
Widget build(BuildContext context) {
1917
return Column(
20-
crossAxisAlignment: CrossAxisAlignment.center,
21-
mainAxisAlignment: MainAxisAlignment.center,
22-
children: [
23-
Row(
24-
mainAxisAlignment: MainAxisAlignment.start,
25-
crossAxisAlignment: CrossAxisAlignment.start,
26-
children: <Widget>[
27-
Flexible(
28-
child: OpenableImage(
29-
displayedImage: "assets/images/Pages/AboutMe/paypal.jpg",
30-
disableOpen: true,
31-
),
18+
crossAxisAlignment: CrossAxisAlignment.center,
19+
mainAxisAlignment: MainAxisAlignment.center,
20+
children: [
21+
Row(
22+
mainAxisAlignment: MainAxisAlignment.start,
23+
crossAxisAlignment: CrossAxisAlignment.start,
24+
children: <Widget>[
25+
Flexible(
26+
child: OpenableImage(
27+
displayedImage: "assets/images/Pages/AboutMe/paypal.jpg",
28+
disableOpen: true,
3229
),
33-
Flexible(
34-
child: OpenableImage(
35-
displayedImage:
36-
"assets/images/Pages/AboutMe/Coffee-removebg.png",
37-
disableOpen: false,
38-
),
30+
),
31+
Flexible(
32+
child: OpenableImage(
33+
displayedImage:
34+
"assets/images/Pages/AboutMe/Coffee-removebg.png",
35+
disableOpen: false,
3936
),
40-
],
41-
),
42-
rowDivider,
43-
Text(
44-
"${AppLocalizations.of(context)!.spendCoffe}\u2615",
45-
style: Theme.of(context).textTheme.titleLarge,
46-
)
47-
]);
37+
),
38+
],
39+
),
40+
rowDivider,
41+
Text(
42+
"${AppLocalizations.of(context)!.spendCoffe}\u2615",
43+
style: Theme.of(context).textTheme.titleLarge,
44+
),
45+
],
46+
);
4847
}
4948
}

Diff for: ‎lib/Pages/AboutMePage/Widgets/perfect_day_chart.dart

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import 'package:flutter/material.dart';
22
import 'package:jotrockenmitlockenrepo/Decoration/Charts/pie_chart.dart';
33
import 'package:jotrockenmitlockenrepo/Decoration/Charts/pie_chart_data_entry.dart';
4-
import 'package:flutter_gen/gen_l10n/app_localizations.dart';
4+
import 'package:jotrockenmitlocken/l10n/app_localizations.dart';
55
import 'package:jotrockenmitlockenrepo/constants.dart';
66

77
class PerfectDay extends StatefulWidget {
@@ -25,7 +25,7 @@ class PerfectDayState extends State<PerfectDay> {
2525
AppLocalizations.of(context)!.sports: getDayHourPercantage(2),
2626
AppLocalizations.of(context)!.meditation: getDayHourPercantage(1),
2727
AppLocalizations.of(context)!.guitar: getDayHourPercantage(1),
28-
AppLocalizations.of(context)!.familyFriends: getDayHourPercantage(4)
28+
AppLocalizations.of(context)!.familyFriends: getDayHourPercantage(4),
2929
};
3030

3131
final List<PieChartDataEntry> chartData = [];

Diff for: ‎lib/Pages/AboutMePage/about_me_page_navbar_config.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import 'package:flutter/material.dart';
22
import 'package:jotrockenmitlockenrepo/Pages/navbar_page_config.dart';
3-
import 'package:flutter_gen/gen_l10n/app_localizations.dart';
3+
import 'package:jotrockenmitlocken/l10n/app_localizations.dart';
44

55
class AboutMePageNavBarConfig extends NavBarPageConfig {
66
@override

Diff for: ‎lib/Pages/DataPage/BlockOverviewPage/block_overview_page.dart

+14-11
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,19 @@ import 'package:jotrockenmitlocken/Pages/DataPage/BlockOverviewPage/block_entry_
44
import 'package:jotrockenmitlocken/blog_dependent_app_attributes.dart';
55
import 'package:jotrockenmitlockenrepo/Pages/Footer/footer.dart';
66
import 'package:jotrockenmitlockenrepo/app_attributes.dart';
7-
import 'package:flutter_gen/gen_l10n/app_localizations.dart';
7+
import 'package:jotrockenmitlocken/l10n/app_localizations.dart';
88
import 'package:jotrockenmitlockenrepo/Layout/ResponsiveDesign/single_page.dart';
99

1010
class BlockOverviewPage extends StatefulWidget {
1111
final AppAttributes appAttributes;
1212
final BlogDependentAppAttributes blogDependentAppAttributes;
1313
final Footer footer;
14-
const BlockOverviewPage(
15-
{super.key,
16-
required this.appAttributes,
17-
required this.footer,
18-
required this.blogDependentAppAttributes});
14+
const BlockOverviewPage({
15+
super.key,
16+
required this.appAttributes,
17+
required this.footer,
18+
required this.blogDependentAppAttributes,
19+
});
1920

2021
@override
2122
State<StatefulWidget> createState() => BlockOverviewPageState();
@@ -28,11 +29,13 @@ class BlockOverviewPageState extends State<BlockOverviewPage> {
2829
widget.blogDependentAppAttributes.blockSettings
2930
.map(
3031
(config) => BlockEntry(
31-
title: (Localizations.localeOf(context) == const Locale("de"))
32-
? config.shortDescriptionDE
33-
: config.shortDescriptionEN,
34-
date: config.lastModified,
35-
comment: config.routingName),
32+
title:
33+
(Localizations.localeOf(context) == const Locale("de"))
34+
? config.shortDescriptionDE
35+
: config.shortDescriptionEN,
36+
date: config.lastModified,
37+
comment: config.routingName,
38+
),
3639
)
3740
.toList();
3841
return SinglePage(

Diff for: ‎lib/Pages/DataPage/BooksPage/books_page.dart

+15-13
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,19 @@ import 'package:jotrockenmitlocken/Pages/DataPage/BooksPage/books_list.dart';
33
import 'package:jotrockenmitlocken/blog_dependent_app_attributes.dart';
44
import 'package:jotrockenmitlockenrepo/Pages/Footer/footer.dart';
55
import 'package:jotrockenmitlockenrepo/app_attributes.dart';
6-
import 'package:flutter_gen/gen_l10n/app_localizations.dart';
6+
import 'package:jotrockenmitlocken/l10n/app_localizations.dart';
77
import 'package:jotrockenmitlockenrepo/Layout/ResponsiveDesign/single_page.dart';
88

99
class BooksPage extends StatefulWidget {
1010
final AppAttributes appAttributes;
1111
final BlogDependentAppAttributes blogDependentAppAttributes;
1212
final Footer footer;
13-
const BooksPage(
14-
{super.key,
15-
required this.appAttributes,
16-
required this.footer,
17-
required this.blogDependentAppAttributes});
13+
const BooksPage({
14+
super.key,
15+
required this.appAttributes,
16+
required this.footer,
17+
required this.blogDependentAppAttributes,
18+
});
1819

1920
@override
2021
State<StatefulWidget> createState() => BooksPageState();
@@ -30,13 +31,14 @@ class BooksPageState extends State<BooksPage> {
3031
showLargeSizeLayout: widget.appAttributes.showLargeSizeLayout,
3132
children: [
3233
BooksList(
33-
blogDependentAppAttributes: widget.blogDependentAppAttributes,
34-
entryRedirectText: AppLocalizations.of(context)!.entryRedirectText,
35-
appAttributes: widget.appAttributes,
36-
title: AppLocalizations.of(context)!.books,
37-
description:
38-
"${AppLocalizations.of(context)!.booksDescription}\u{1F63A}",
39-
dataFilePath: "assets/data/Buecherliste_gelesen.csv"),
34+
blogDependentAppAttributes: widget.blogDependentAppAttributes,
35+
entryRedirectText: AppLocalizations.of(context)!.entryRedirectText,
36+
appAttributes: widget.appAttributes,
37+
title: AppLocalizations.of(context)!.books,
38+
description:
39+
"${AppLocalizations.of(context)!.booksDescription}\u{1F63A}",
40+
dataFilePath: "assets/data/Buecherliste_gelesen.csv",
41+
),
4042
],
4143
);
4244
}

Diff for: ‎lib/Pages/DataPage/FilmsPage/films_page.dart

+12-8
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,17 @@ import 'package:flutter/material.dart';
22
import 'package:jotrockenmitlocken/Pages/DataPage/FilmsPage/films_list.dart';
33
import 'package:jotrockenmitlockenrepo/Pages/Footer/footer.dart';
44
import 'package:jotrockenmitlockenrepo/app_attributes.dart';
5-
import 'package:flutter_gen/gen_l10n/app_localizations.dart';
5+
import 'package:jotrockenmitlocken/l10n/app_localizations.dart';
66
import 'package:jotrockenmitlockenrepo/Layout/ResponsiveDesign/single_page.dart';
77

88
class FilmsPage extends StatefulWidget {
99
final AppAttributes appAttributes;
1010
final Footer footer;
11-
const FilmsPage(
12-
{super.key, required this.appAttributes, required this.footer});
11+
const FilmsPage({
12+
super.key,
13+
required this.appAttributes,
14+
required this.footer,
15+
});
1316

1417
@override
1518
State<StatefulWidget> createState() => FilmsPageState();
@@ -25,11 +28,12 @@ class FilmsPageState extends State<FilmsPage> {
2528
showLargeSizeLayout: widget.appAttributes.showLargeSizeLayout,
2629
children: [
2730
FilmsList(
28-
entryRedirectText: AppLocalizations.of(context)!.entryRedirectText,
29-
title: AppLocalizations.of(context)!.films,
30-
description:
31-
"${AppLocalizations.of(context)!.filmsDescription}\u{1F63A}",
32-
dataFilePath: "assets/data/Filmliste_gesehen.csv"),
31+
entryRedirectText: AppLocalizations.of(context)!.entryRedirectText,
32+
title: AppLocalizations.of(context)!.films,
33+
description:
34+
"${AppLocalizations.of(context)!.filmsDescription}\u{1F63A}",
35+
dataFilePath: "assets/data/Filmliste_gesehen.csv",
36+
),
3337
],
3438
);
3539
}

Diff for: ‎lib/Pages/DataPage/GamesPage/games_page.dart

+15-13
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,19 @@ import 'package:jotrockenmitlocken/Pages/DataPage/GamesPage/games_list.dart';
33
import 'package:jotrockenmitlocken/blog_dependent_app_attributes.dart';
44
import 'package:jotrockenmitlockenrepo/Pages/Footer/footer.dart';
55
import 'package:jotrockenmitlockenrepo/app_attributes.dart';
6-
import 'package:flutter_gen/gen_l10n/app_localizations.dart';
6+
import 'package:jotrockenmitlocken/l10n/app_localizations.dart';
77
import 'package:jotrockenmitlockenrepo/Layout/ResponsiveDesign/single_page.dart';
88

99
class GamesPage extends StatefulWidget {
1010
final AppAttributes appAttributes;
1111
final Footer footer;
1212
final BlogDependentAppAttributes blogDependentAppAttributes;
13-
const GamesPage(
14-
{super.key,
15-
required this.appAttributes,
16-
required this.footer,
17-
required this.blogDependentAppAttributes});
13+
const GamesPage({
14+
super.key,
15+
required this.appAttributes,
16+
required this.footer,
17+
required this.blogDependentAppAttributes,
18+
});
1819

1920
@override
2021
State<StatefulWidget> createState() => GamesPageState();
@@ -30,13 +31,14 @@ class GamesPageState extends State<GamesPage> {
3031
showLargeSizeLayout: widget.appAttributes.showLargeSizeLayout,
3132
children: [
3233
GamesList(
33-
blogDependentAppAttributes: widget.blogDependentAppAttributes,
34-
entryRedirectText: AppLocalizations.of(context)!.entryRedirectText,
35-
appAttributes: widget.appAttributes,
36-
title: AppLocalizations.of(context)!.games,
37-
description:
38-
"${AppLocalizations.of(context)!.gamesDescription}\u{1F63A}",
39-
dataFilePath: "assets/data/Spiele.csv"),
34+
blogDependentAppAttributes: widget.blogDependentAppAttributes,
35+
entryRedirectText: AppLocalizations.of(context)!.entryRedirectText,
36+
appAttributes: widget.appAttributes,
37+
title: AppLocalizations.of(context)!.games,
38+
description:
39+
"${AppLocalizations.of(context)!.gamesDescription}\u{1F63A}",
40+
dataFilePath: "assets/data/Spiele.csv",
41+
),
4042
],
4143
);
4244
}

Diff for: ‎lib/Pages/DataPage/QuotesPage/quotes_page.dart

+12-8
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,17 @@ import 'package:flutter/material.dart';
22
import 'package:jotrockenmitlockenrepo/Pages/Footer/footer.dart';
33
import 'package:jotrockenmitlocken/Pages/DataPage/QuotesPage/quotes_list.dart';
44
import 'package:jotrockenmitlockenrepo/app_attributes.dart';
5-
import 'package:flutter_gen/gen_l10n/app_localizations.dart';
5+
import 'package:jotrockenmitlocken/l10n/app_localizations.dart';
66
import 'package:jotrockenmitlockenrepo/Layout/ResponsiveDesign/single_page.dart';
77

88
class QuotesPage extends StatefulWidget {
99
final AppAttributes appAttributes;
1010
final Footer footer;
11-
const QuotesPage(
12-
{super.key, required this.appAttributes, required this.footer});
11+
const QuotesPage({
12+
super.key,
13+
required this.appAttributes,
14+
required this.footer,
15+
});
1316

1417
@override
1518
State<StatefulWidget> createState() => QuotesPageState();
@@ -25,11 +28,12 @@ class QuotesPageState extends State<QuotesPage> {
2528
showLargeSizeLayout: widget.appAttributes.showLargeSizeLayout,
2629
children: [
2730
QuotesList(
28-
entryRedirectText: AppLocalizations.of(context)!.entryRedirectText,
29-
title: AppLocalizations.of(context)!.quotations,
30-
description:
31-
"${AppLocalizations.of(context)!.quotationsDescription}\u{1F63A}",
32-
dataFilePath: "assets/data/Zitate.csv"),
31+
entryRedirectText: AppLocalizations.of(context)!.entryRedirectText,
32+
title: AppLocalizations.of(context)!.quotations,
33+
description:
34+
"${AppLocalizations.of(context)!.quotationsDescription}\u{1F63A}",
35+
dataFilePath: "assets/data/Zitate.csv",
36+
),
3337
],
3438
);
3539
}

0 commit comments

Comments
 (0)