Skip to content

Commit

Permalink
feat: beercrackerz #6 add restaurant type
Browse files Browse the repository at this point in the history
  • Loading branch information
@ArthurBeaulieu
ArthurBeaulieu committed Nov 18, 2024
1 parent c5eb99c commit ef7319b
Show file tree
Hide file tree
Showing 10 changed files with 99 additions and 22 deletions.
76 changes: 76 additions & 0 deletions assets/images/icon/restaurant.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
14 changes: 7 additions & 7 deletions lib/src/help/about_view.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ class AboutView extends StatelessWidget {
SizeConfig().init(context);

return Scaffold(
backgroundColor: Theme.of(context).colorScheme.primary,
backgroundColor: Theme.of(context).colorScheme.surfaceContainer,
appBar: AppBar(
title: Text(
AppLocalizations.of(context)!.helpAboutTitle,
Expand Down Expand Up @@ -51,7 +51,7 @@ class AboutView extends StatelessWidget {
Text(
AppLocalizations.of(context)!.helpAboutPar1,
style: TextStyle(
color: Theme.of(context).colorScheme.onPrimary,
color: Theme.of(context).colorScheme.onSurface,
fontSize: SizeConfig.fontTextSize,
),
textAlign: TextAlign.center,
Expand All @@ -62,7 +62,7 @@ class AboutView extends StatelessWidget {
Text(
AppLocalizations.of(context)!.helpAboutPar2,
style: TextStyle(
color: Theme.of(context).colorScheme.onPrimary,
color: Theme.of(context).colorScheme.onSurface,
fontSize: SizeConfig.fontTextSize,
),
textAlign: TextAlign.center,
Expand Down Expand Up @@ -100,7 +100,7 @@ class AboutView extends StatelessWidget {
Text(
AppLocalizations.of(context)!.helpAboutPar3,
style: TextStyle(
color: Theme.of(context).colorScheme.onPrimary,
color: Theme.of(context).colorScheme.onSurface,
fontSize: SizeConfig.fontTextSize,
),
textAlign: TextAlign.center,
Expand All @@ -111,7 +111,7 @@ class AboutView extends StatelessWidget {
Text(
AppLocalizations.of(context)!.helpAboutPar4,
style: TextStyle(
color: Theme.of(context).colorScheme.onPrimary,
color: Theme.of(context).colorScheme.onSurface,
fontSize: SizeConfig.fontTextSize,
),
textAlign: TextAlign.center,
Expand Down Expand Up @@ -149,7 +149,7 @@ class AboutView extends StatelessWidget {
Text(
AppLocalizations.of(context)!.helpAboutDisclaimer,
style: TextStyle(
color: Theme.of(context).colorScheme.onPrimary,
color: Theme.of(context).colorScheme.onSurface,
fontSize: SizeConfig.fontTextSize,
fontStyle: FontStyle.italic,
fontWeight: FontWeight.bold,
Expand All @@ -162,7 +162,7 @@ class AboutView extends StatelessWidget {
Text(
AppLocalizations.of(context)!.helpAboutVersion(AppConst.appVersion, AppConst.serverVersion),
style: TextStyle(
color: Theme.of(context).colorScheme.onPrimary,
color: Theme.of(context).colorScheme.onSurface,
fontSize: SizeConfig.fontTextSize,
),
textAlign: TextAlign.center,
Expand Down
18 changes: 9 additions & 9 deletions lib/src/help/welcome_screen_view.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ class WelcomeScreenViewState extends State<WelcomeScreenView> {
style: TextStyle(
fontSize: SizeConfig.fontTextTitleSize,
fontWeight: FontWeight.w600,
color: Theme.of(context).colorScheme.onPrimary,
color: Theme.of(context).colorScheme.onSurface,
),
textAlign: TextAlign.center,
),
Expand All @@ -73,7 +73,7 @@ class WelcomeScreenViewState extends State<WelcomeScreenView> {
Text(
AppLocalizations.of(context)!.helpWelcomeSlideDescription,
style: TextStyle(
color: Theme.of(context).colorScheme.onPrimary,
color: Theme.of(context).colorScheme.onSurface,
fontSize: SizeConfig.fontTextSize,
),
textAlign: TextAlign.center,
Expand Down Expand Up @@ -101,7 +101,7 @@ class WelcomeScreenViewState extends State<WelcomeScreenView> {
Text(
AppLocalizations.of(context)!.helpWelcomeMapSlideDescription,
style: TextStyle(
color: Theme.of(context).colorScheme.onPrimary,
color: Theme.of(context).colorScheme.onSurface,
fontSize: SizeConfig.fontTextSize,
),
textAlign: TextAlign.center,
Expand Down Expand Up @@ -129,7 +129,7 @@ class WelcomeScreenViewState extends State<WelcomeScreenView> {
Text(
AppLocalizations.of(context)!.helpWelcomeMarkSlideDescription,
style: TextStyle(
color: Theme.of(context).colorScheme.onPrimary,
color: Theme.of(context).colorScheme.onSurface,
fontSize: SizeConfig.fontTextSize,
),
textAlign: TextAlign.center,
Expand Down Expand Up @@ -157,7 +157,7 @@ class WelcomeScreenViewState extends State<WelcomeScreenView> {
Text(
AppLocalizations.of(context)!.helpWelcomeNewMarkSlideDescription,
style: TextStyle(
color: Theme.of(context).colorScheme.onPrimary,
color: Theme.of(context).colorScheme.onSurface,
fontSize: SizeConfig.fontTextSize,
),
textAlign: TextAlign.center,
Expand Down Expand Up @@ -185,7 +185,7 @@ class WelcomeScreenViewState extends State<WelcomeScreenView> {
Text(
AppLocalizations.of(context)!.helpWelcomeCTASlideDescription,
style: TextStyle(
color: Theme.of(context).colorScheme.onPrimary,
color: Theme.of(context).colorScheme.onSurface,
fontSize: SizeConfig.fontTextSize,
),
textAlign: TextAlign.center,
Expand Down Expand Up @@ -315,8 +315,8 @@ class WelcomeScreenViewState extends State<WelcomeScreenView> {
SizeConfig.paddingSmall,
),
color: (currentPage.round() == index)
? Theme.of(context).colorScheme.onPrimary
: Theme.of(context).colorScheme.onPrimary.withOpacity(0.2),
? Theme.of(context).colorScheme.onSurface
: Theme.of(context).colorScheme.onSurface.withOpacity(0.2),
),
),
);
Expand All @@ -330,7 +330,7 @@ class WelcomeScreenViewState extends State<WelcomeScreenView> {
slides = buildSlides(context);

return Scaffold(
backgroundColor: Theme.of(context).colorScheme.primary,
backgroundColor: Theme.of(context).colorScheme.surfaceContainer,
appBar: AppBar(
title: Text(
AppLocalizations.of(context)!.helpWelcomeTitle,
Expand Down
2 changes: 1 addition & 1 deletion lib/src/localization/app_de.arb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,7 @@
"feature": {}
}
},
"barFeatures": "{feature, select, regular{Regulär} snack{Snack} cellar{Brauerei} rooftop{Auf dem Dach} tobacco{Zigaretten} food{Essen} card{Kreditkarte} choice{Große Auswahl} outdoor{Draussen} other{Andere}}",
"barFeatures": "{feature, select, regular{Regulär} snack{Snack} cellar{Brauerei} rooftop{Auf dem Dach} restaurant{Restaurant} tobacco{Zigaretten} food{Essen} card{Kreditkarte} choice{Große Auswahl} outdoor{Draussen} other{Andere}}",
"@barFeatures": {
"placeholders": {
"feature": {}
Expand Down
2 changes: 1 addition & 1 deletion lib/src/localization/app_en.arb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,7 @@
"feature": {}
}
},
"barFeatures": "{feature, select, regular{Regular} snack{Snack} cellar{Brewery} rooftop{Rooftop} tobacco{Cigarets} food{Food} card{Credit card} choice{Wide choice} outdoor{Outdoor} other{Other}}",
"barFeatures": "{feature, select, regular{Regular} snack{Snack} cellar{Brewery} rooftop{Rooftop} restaurant{Restaurant} tobacco{Cigarets} food{Food} card{Credit card} choice{Wide choice} outdoor{Outdoor} other{Other}}",
"@barFeatures": {
"placeholders": {
"feature": {}
Expand Down
2 changes: 1 addition & 1 deletion lib/src/localization/app_es.arb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,7 @@
"feature": {}
}
},
"barFeatures": "{feature, select, regular{Regular} snack{Bocadillo} cellar{Cervecería} rooftop{Techo} tobacco{Cigarrillos} food{Alimento} card{Tarjeta de crédito} choice{Amplia selección} outdoor{Exterior} other{Otro}}",
"barFeatures": "{feature, select, regular{Regular} snack{Bocadillo} cellar{Cervecería} rooftop{Techo} restaurant{Restaurante} tobacco{Cigarrillos} food{Alimento} card{Tarjeta de crédito} choice{Amplia selección} outdoor{Exterior} other{Otro}}",
"@barFeatures": {
"placeholders": {
"feature": {}
Expand Down
2 changes: 1 addition & 1 deletion lib/src/localization/app_fr.arb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,7 @@
"feature": {}
}
},
"barFeatures": "{feature, select, regular{Classique} snack{Snack} cellar{Brasserie} rooftop{Rooftop} tobacco{Cigarette} food{Nourriture} card{Carte de crédit} choice{Large choix} outdoor{Extérieur} other{Autre}}",
"barFeatures": "{feature, select, regular{Classique} snack{Snack} cellar{Brasserie} rooftop{Rooftop} restaurant{Restaurant} tobacco{Cigarette} food{Nourriture} card{Carte de crédit} choice{Large choix} outdoor{Extérieur} other{Autre}}",
"@barFeatures": {
"placeholders": {
"feature": {}
Expand Down
2 changes: 1 addition & 1 deletion lib/src/localization/app_it.arb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,7 @@
"feature": {}
}
},
"barFeatures": "{feature, select, regular{Normale} snack{Merenda} cellar{Birrificio} rooftop{Sul tetto} tobacco{Sigarette} food{Cibo} card{Carta di credito} choice{Ampia scelta} outdoor{All'aperto} other{Altro}}",
"barFeatures": "{feature, select, regular{Normale} snack{Merenda} cellar{Birrificio} rooftop{Sul tetto} restaurant{Ristorante} tobacco{Sigarette} food{Cibo} card{Carta di credito} choice{Ampia scelta} outdoor{All'aperto} other{Altro}}",
"@barFeatures": {
"placeholders": {
"feature": {}
Expand Down
2 changes: 1 addition & 1 deletion lib/src/localization/app_pt.arb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,7 @@
"feature": {}
}
},
"barFeatures": "{feature, select, regular{Normal} snack{Lanche} cellar{Cervejaria} rooftop{Telhado} tobacco{Cigarros} food{Comida} card{Cartão de crédito} choice{Ampla escolha} outdoor{Ar livre} other{Outro}}",
"barFeatures": "{feature, select, regular{Normal} snack{Lanche} cellar{Cervejaria} rooftop{Telhado} restaurant{Restaurante} tobacco{Cigarros} food{Comida} card{Cartão de crédito} choice{Ampla escolha} outdoor{Ar livre} other{Outro}}",
"@barFeatures": {
"placeholders": {
"feature": {}
Expand Down
1 change: 1 addition & 0 deletions lib/src/map/marker/marker_enums.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ enum BarTypes {
snack,
cellar,
rooftop,
restaurant,
}

enum BarModifiers {
Expand Down

0 comments on commit ef7319b

Please sign in to comment.