Skip to content

Commit

Permalink
Run flutter format on all files
Browse files Browse the repository at this point in the history
  • Loading branch information
@matzebond
matzebond committed Jan 22, 2022
1 parent 386075a commit a8d48b7
Show file tree
Hide file tree
Showing 29 changed files with 297 additions and 266 deletions.
24 changes: 13 additions & 11 deletions lib/app_config.dart
View file
Original file line number Diff line number Diff line change
@@ -1,34 +1,36 @@
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';

enum AppFlavor {
googleplay,
foss
}
enum AppFlavor { googleplay, foss }

AppFlavor appFlavorFromString(String flavorStr) {
if (flavorStr == "googleplay") {return AppFlavor.googleplay;}
else if (flavorStr == 'foss') {return AppFlavor.foss;}
if (flavorStr == "googleplay") {
return AppFlavor.googleplay;
} else if (flavorStr == 'foss') {
return AppFlavor.foss;
}

// default case: googleplay
return AppFlavor.googleplay;
}

String versionCodeSuffixFromAppFlavor(AppFlavor flavor) {
if (flavor == AppFlavor.foss) {return " (f)";}
if (flavor == AppFlavor.foss) {
return " (f)";
}

// default case: googleplay
return " (g)";
}

class AppConfig extends InheritedWidget{
class AppConfig extends InheritedWidget {
final Widget child;
final AppFlavor buildFlavor;

const AppConfig({
required this.child,
required this.buildFlavor,
}): super(child: child);
required this.child,
required this.buildFlavor,
}) : super(child: child);

static AppConfig of(BuildContext context) {
var result = context.dependOnInheritedWidgetOfExactType<AppConfig>();
Expand Down
39 changes: 21 additions & 18 deletions lib/components/food_details_dialog.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,16 @@ class FoodDetailsState extends State<FoodDetailsDialog> {
children: <Widget>[
Row(
mainAxisAlignment: MainAxisAlignment.spaceEvenly,
children: [for (var i = 0; i < 4; i += 1) getAvailabilityInfoCard(context, i)],
children: [
for (var i = 0; i < 4; i += 1) getAvailabilityInfoCard(context, i)
],
),
SizedBox(height: 5),
Row(
mainAxisAlignment: MainAxisAlignment.spaceEvenly,
children: [for (var i = 4; i < 8; i += 1) getAvailabilityInfoCard(context, i)],
children: [
for (var i = 4; i < 8; i += 1) getAvailabilityInfoCard(context, i)
],
),
SizedBox(height: 5),
Row(
Expand All @@ -51,14 +55,16 @@ class FoodDetailsState extends State<FoodDetailsDialog> {
if (isPortrait) {
imgAndAvailabilities = Column(
children: <Widget>[
widget._foodImage, SizedBox(height: 10),
widget._foodImage,
SizedBox(height: 10),
SizedBox(width: 5),
regionInfo,
SizedBox(width: 5),
availabilities,
],
);
} else { // isLandscape
} else {
// isLandscape
imgAndAvailabilities = Row(
children: <Widget>[
Expanded(
Expand Down Expand Up @@ -94,23 +100,19 @@ class FoodDetailsState extends State<FoodDetailsDialog> {
Widget getAvailabilityInfoCard(BuildContext context, int monthIndex) {
Widget containerChild;

int fstModeIdx = widget._allAvailabilities[monthIndex].indexWhere((
mode) => mode != Availability.none);
int sndModeIdx = widget._allAvailabilities[monthIndex].indexWhere((
mode) => mode != Availability.none, fstModeIdx + 1);
int fstModeIdx = widget._allAvailabilities[monthIndex]
.indexWhere((mode) => mode != Availability.none);
int sndModeIdx = widget._allAvailabilities[monthIndex]
.indexWhere((mode) => mode != Availability.none, fstModeIdx + 1);

if (fstModeIdx == -1) {
int iconAlpha = getIconAlphaFromAvailability(Availability.none);
containerChild = Icon(
availabilityModeIcons[fstModeIdx],
containerChild = Icon(availabilityModeIcons[fstModeIdx],
color: Colors.black.withAlpha(iconAlpha));
}

else if (sndModeIdx == -1) {
} else if (sndModeIdx == -1) {
int iconAlpha = getIconAlphaFromAvailability(
widget._allAvailabilities[monthIndex][fstModeIdx]);
containerChild = Icon(
availabilityModeIcons[fstModeIdx],
containerChild = Icon(availabilityModeIcons[fstModeIdx],
color: Colors.black.withAlpha(iconAlpha));
} else {
int primaryIconAlpha = getIconAlphaFromAvailability(
Expand Down Expand Up @@ -140,8 +142,9 @@ class FoodDetailsState extends State<FoodDetailsDialog> {
padding: const EdgeInsets.all(2),
child: Column(
children: <Widget>[
Text(getMonthNameFromIndex(context, monthIndex).substring(
0, 3),
Text(
getMonthNameFromIndex(context, monthIndex)
.substring(0, 3),
style: TextStyle(fontWeight: FontWeight.bold)),
FittedBox(
fit: BoxFit.contain,
Expand All @@ -153,4 +156,4 @@ class FoodDetailsState extends State<FoodDetailsDialog> {
),
);
}
}
}
77 changes: 40 additions & 37 deletions lib/components/food_tile.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,13 @@ class FoodTile extends StatefulWidget {
FoodTile(Food foodToDisplay, int curMonthIndex)
: _food = foodToDisplay,
_curMonthIndex = curMonthIndex,
_allAvailabilities = List.generate(12,
(monthIndex) => foodToDisplay.getAvailabilitiesByMonth(monthIndex)) {
_allAvailabilities = List.generate(
12,
(monthIndex) =>
foodToDisplay.getAvailabilitiesByMonth(monthIndex)) {
_curAvailabilities = _allAvailabilities[_curMonthIndex];
int fstModeIdx = _curAvailabilities.indexWhere((mode) => mode != Availability.none);
int fstModeIdx =
_curAvailabilities.indexWhere((mode) => mode != Availability.none);
_curAvailabilityColor = availabilityModeColor[fstModeIdx]!;
}

Expand All @@ -40,7 +43,7 @@ class FoodTileState extends State<FoodTile> {
builder: (context, AsyncSnapshot<bool> snapshot) {
if (snapshot.hasData) {
_isFavorite =
snapshot.hasData ? (snapshot.data! ? 1 : -1) : _isFavorite;
snapshot.hasData ? (snapshot.data! ? 1 : -1) : _isFavorite;
}
return _buildFoodTile();
},
Expand Down Expand Up @@ -84,8 +87,7 @@ class FoodTileState extends State<FoodTile> {
// TODO feature for editing availabilities
if (false) {
actions.add(MaterialButton(
onPressed: () async {
},
onPressed: () async {},
child: Text("Edit"), // TODO l10n
));
}
Expand Down Expand Up @@ -116,12 +118,10 @@ class FoodTileState extends State<FoodTile> {
builder: (_) => AlertDialog(
backgroundColor: Colors.white,
content: FoodDetailsDialog(
widget._food,
foodImage,
widget._allAvailabilities),
widget._food, foodImage, widget._allAvailabilities),
elevation: 10,
actions: actions,
// actionsPadding: EdgeInsets.symmetric(horizontal: 4),
// actionsPadding: EdgeInsets.symmetric(horizontal: 4),
),
barrierDismissible: true,
);
Expand Down Expand Up @@ -161,7 +161,7 @@ class FoodTileState extends State<FoodTile> {
child: InkWell(
onTap: tapCallback,
child:
new LayoutBuilder(builder: (context, constraint) {
new LayoutBuilder(builder: (context, constraint) {
return getFavIcon(context, constraint, _isFavorite);
}),
),
Expand All @@ -173,24 +173,24 @@ class FoodTileState extends State<FoodTile> {
flex: 2,
child: Container(
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
crossAxisAlignment: CrossAxisAlignment.center,
children: <Widget>[
Expanded(
child: Container(
padding: const EdgeInsets.fromLTRB(5, 5, 5, 5),
child: FittedBox(
fit: BoxFit.contain,
child: Text(
widget._food.displayName,
style: foodText,
),
),
mainAxisAlignment: MainAxisAlignment.spaceBetween,
crossAxisAlignment: CrossAxisAlignment.center,
children: <Widget>[
Expanded(
child: Container(
padding: const EdgeInsets.fromLTRB(5, 5, 5, 5),
child: FittedBox(
fit: BoxFit.contain,
child: Text(
widget._food.displayName,
style: foodText,
),
),
availabilityIconContainer
],
)))
),
),
availabilityIconContainer
],
)))
],
));
}
Expand All @@ -207,24 +207,27 @@ Icon getFavIcon(context, constraint, int isFavorite) {

Container getAvailabilityIconContainer(
BuildContext context, constraint, List<Availability> availabilities) {

Widget containerChild;
int fstModeIdx = availabilities.indexWhere((mode) => mode != Availability.none);
int sndModeIdx = availabilities.indexWhere((mode) => mode != Availability.none, fstModeIdx + 1);

int fstModeIdx =
availabilities.indexWhere((mode) => mode != Availability.none);
int sndModeIdx = availabilities.indexWhere(
(mode) => mode != Availability.none, fstModeIdx + 1);

if (fstModeIdx == -1) {
int iconAlpha = getIconAlphaFromAvailability(Availability.none);
containerChild = Icon(availabilityModeIcons[fstModeIdx],
size: constraint.biggest.height, color: Colors.black.withAlpha(iconAlpha));
}
else if (sndModeIdx == -1) {
size: constraint.biggest.height,
color: Colors.black.withAlpha(iconAlpha));
} else if (sndModeIdx == -1) {
int iconAlpha = getIconAlphaFromAvailability(availabilities[fstModeIdx]);
containerChild = Icon(availabilityModeIcons[fstModeIdx],
size: constraint.biggest.height, color: Colors.black.withAlpha(iconAlpha));
size: constraint.biggest.height,
color: Colors.black.withAlpha(iconAlpha));
} else {
int primaryIconAlpha = getIconAlphaFromAvailability(availabilities[fstModeIdx]);
int secondaryIconAlpha = getIconAlphaFromAvailability(availabilities[sndModeIdx]);
int primaryIconAlpha =
getIconAlphaFromAvailability(availabilities[fstModeIdx]);
int secondaryIconAlpha =
getIconAlphaFromAvailability(availabilities[sndModeIdx]);
containerChild = Row(
crossAxisAlignment: CrossAxisAlignment.center,
mainAxisAlignment: MainAxisAlignment.spaceBetween,
Expand Down
4 changes: 3 additions & 1 deletion lib/components/month_selector.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,9 @@ class MonthSelector extends StatelessWidget {
itemBuilder: (context, i) {
if (i % 2 == 0) {
return ListTileTheme(
selectedTileColor: Theme.of(context).colorScheme.primary,
selectedTileColor: Theme.of(context)
.colorScheme
.primary,
selectedColor: Colors.black,
child: ListTile(
title: Text(
Expand Down
2 changes: 1 addition & 1 deletion lib/helpers/availabilities.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,4 @@ final List<String> avSettingsKeys = [
"showAvLand",
"showAvSea",
"showAvAir",
];
];
21 changes: 17 additions & 4 deletions lib/helpers/db_provider.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ class DBProvider {
FROM foods AS f
INNER JOIN food_region_availability AS fr ON (f.id == fr.food_id)
WHERE fr.region_id = ?)
""", [region.id, fallbackRegion, region.id ]);
""", [region.id, fallbackRegion, region.id]);

return results.map((item) {
String foodId = item['id'];
Expand All @@ -143,7 +143,8 @@ class DBProvider {
String assetImgSourceUrl = item['assetImgSourceUrl'];
String assetImgInfo = item['assetImgInfo'];

Region region = allRegions.firstWhere((region) => region.id == item['region_id']);
Region region =
allRegions.firstWhere((region) => region.id == item['region_id']);
int isCommon = item['is_common'];
String avLocal = item['avLocal'];
String avLand = item['avLand'];
Expand All @@ -153,8 +154,20 @@ class DBProvider {
String foodNamesString = getTranslationByKey(foodId + "_names");
String infoUrl = getTranslationByKey(foodId + "_infoUrl");

return Food(foodId, foodNamesString, type, isCommon, avLocal, avLand,
avSea, avAir, infoUrl, assetImgPath, assetImgSourceUrl, assetImgInfo, region);
return Food(
foodId,
foodNamesString,
type,
isCommon,
avLocal,
avLand,
avSea,
avAir,
infoUrl,
assetImgPath,
assetImgSourceUrl,
assetImgInfo,
region);
}).toList();
}
}
7 changes: 4 additions & 3 deletions lib/helpers/json_asset_loader.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@ import 'dart:convert';

import 'package:flutter/services.dart' show rootBundle;

Future<Map<String, dynamic>> loadAssetFromJson(String assetPath) async{
return rootBundle.loadString(assetPath)
.then((String content) => json.decode(content));
Future<Map<String, dynamic>> loadAssetFromJson(String assetPath) async {
return rootBundle
.loadString(assetPath)
.then((String content) => json.decode(content));
}
2 changes: 1 addition & 1 deletion lib/helpers/text_selector.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,4 +33,4 @@ String getMonthNameFromIndex(BuildContext context, int monthIndex) {
default:
return L10n.of(context).december;
}
}
}

0 comments on commit a8d48b7

Please sign in to comment.