diff --git a/assets/images/icon/restaurant.svg b/assets/images/icon/restaurant.svg new file mode 100644 index 0000000..384c48f --- /dev/null +++ b/assets/images/icon/restaurant.svg @@ -0,0 +1,76 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + diff --git a/lib/src/help/about_view.dart b/lib/src/help/about_view.dart index dcfdee0..f740215 100644 --- a/lib/src/help/about_view.dart +++ b/lib/src/help/about_view.dart @@ -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, @@ -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, @@ -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, @@ -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, @@ -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, @@ -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, @@ -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, diff --git a/lib/src/help/welcome_screen_view.dart b/lib/src/help/welcome_screen_view.dart index c386e25..823fb0d 100644 --- a/lib/src/help/welcome_screen_view.dart +++ b/lib/src/help/welcome_screen_view.dart @@ -63,7 +63,7 @@ class WelcomeScreenViewState extends State { style: TextStyle( fontSize: SizeConfig.fontTextTitleSize, fontWeight: FontWeight.w600, - color: Theme.of(context).colorScheme.onPrimary, + color: Theme.of(context).colorScheme.onSurface, ), textAlign: TextAlign.center, ), @@ -73,7 +73,7 @@ class WelcomeScreenViewState extends State { 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, @@ -101,7 +101,7 @@ class WelcomeScreenViewState extends State { 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, @@ -129,7 +129,7 @@ class WelcomeScreenViewState extends State { 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, @@ -157,7 +157,7 @@ class WelcomeScreenViewState extends State { 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, @@ -185,7 +185,7 @@ class WelcomeScreenViewState extends State { 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, @@ -315,8 +315,8 @@ class WelcomeScreenViewState extends State { 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), ), ), ); @@ -330,7 +330,7 @@ class WelcomeScreenViewState extends State { 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, diff --git a/lib/src/localization/app_de.arb b/lib/src/localization/app_de.arb index 5a91512..a1616c9 100644 --- a/lib/src/localization/app_de.arb +++ b/lib/src/localization/app_de.arb @@ -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": {} diff --git a/lib/src/localization/app_en.arb b/lib/src/localization/app_en.arb index 9157655..29ad30d 100644 --- a/lib/src/localization/app_en.arb +++ b/lib/src/localization/app_en.arb @@ -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": {} diff --git a/lib/src/localization/app_es.arb b/lib/src/localization/app_es.arb index d3402e0..6f00b01 100644 --- a/lib/src/localization/app_es.arb +++ b/lib/src/localization/app_es.arb @@ -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": {} diff --git a/lib/src/localization/app_fr.arb b/lib/src/localization/app_fr.arb index c352109..7775c17 100644 --- a/lib/src/localization/app_fr.arb +++ b/lib/src/localization/app_fr.arb @@ -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": {} diff --git a/lib/src/localization/app_it.arb b/lib/src/localization/app_it.arb index 6da95c7..3916fe7 100644 --- a/lib/src/localization/app_it.arb +++ b/lib/src/localization/app_it.arb @@ -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": {} diff --git a/lib/src/localization/app_pt.arb b/lib/src/localization/app_pt.arb index 9cfa001..21353c0 100644 --- a/lib/src/localization/app_pt.arb +++ b/lib/src/localization/app_pt.arb @@ -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": {} diff --git a/lib/src/map/marker/marker_enums.dart b/lib/src/map/marker/marker_enums.dart index 2594784..6989b1e 100644 --- a/lib/src/map/marker/marker_enums.dart +++ b/lib/src/map/marker/marker_enums.dart @@ -45,6 +45,7 @@ enum BarTypes { snack, cellar, rooftop, + restaurant, } enum BarModifiers {