Merge pull request #20 from naaando/54-melhoria-na-interface

54 - melhoria na interface
naaando · Jan 7, 2024 · df35b65 · df35b65
2 parents 23873bb + 8a091a5
commit df35b65
Show file tree

Hide file tree

Showing 23 changed files with 1,327 additions and 121 deletions.
diff --git a/pets/README.md b/pets/README.md
@@ -14,3 +14,14 @@ A few resources to get you started if this is your first Flutter project:
 For help getting started with Flutter development, view the
 [online documentation](https://docs.flutter.dev/), which offers tutorials,
 samples, guidance on mobile development, and a full API reference.
+
+# Atualizando Traduções
+
+Para atualizar as traduções do seu aplicativo Flutter, siga os passos abaixo:
+
+1. Adicione o novo texto no arquivo de localização (geralmente `lib/l10n/app_en.arb` para inglês).
+2. Traduza o texto para os idiomas suportados adicionando entradas correspondentes nos respectivos arquivos de localização (como `lib/l10n/app_pt.arb` para português).
+3. Execute o comando `flutter gen-l10n` no terminal para gerar os arquivos de classe de localização.
+4. Use as classes geradas para exibir texto traduzido em seu aplicativo.
+
+Lembre-se de que você precisa ter a internacionalização configurada em seu projeto Flutter para usar esse recurso. Se você ainda não configurou, consulte a [documentação de internacionalização do Flutter](https://flutter.dev/docs/development/accessibility-and-localization/internationalization).
diff --git a/pets/assets/images/3778546.svg b/pets/assets/images/3778546.svg
diff --git a/pets/l10n.yaml b/pets/l10n.yaml
@@ -1,3 +1,4 @@
 arb-dir: lib/l10n
 template-arb-file: app_en.arb
-output-localization-file: app_localizations.dart
+output-localization-file: app_localizations.dart
+untranslated-messages-file: untranslated_messages.json
diff --git a/pets/lib/components/lista_pets.dart b/pets/lib/components/lista_pets.dart
@@ -17,17 +17,6 @@ class ListaPets extends HookConsumerWidget {
     return Column(
       crossAxisAlignment: CrossAxisAlignment.start,
       children: [
-        Padding(
-          padding: const EdgeInsets.only(left: 12),
-          child: Text(
-            t(context).dashboardMyPets,
-            textAlign: TextAlign.start,
-            style: theme.textTheme.titleLarge!.copyWith(
-              color: theme.colorScheme.onBackground,
-            ),
-          ),
-        ),
-        const SizedBox(height: 8),
         Container(
           padding: const EdgeInsets.symmetric(vertical: 8),
           decoration: BoxDecoration(

diff --git a/pets/lib/components/pet_avatar.dart b/pets/lib/components/pet_avatar.dart
@@ -1,5 +1,6 @@
 import 'package:fast_cached_network_image/fast_cached_network_image.dart';
 import 'package:flutter/material.dart';
+import 'package:pets/magic_colors.dart';
 import 'package:pets/models/pet.dart';
 
 class PetAvatar extends StatelessWidget {
@@ -28,12 +29,13 @@ class PetAvatar extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    final backgroundColor = Theme.of(context).colorScheme.primary;
-    final iconColor = Theme.of(context).colorScheme.primaryContainer;
+    final colorScheme = Theme.of(context).colorScheme;
+    final backgroundColor = colorScheme.onPrimaryContainer;
+
+    final iconColor = magicColors(colorScheme.brightness);
 
     return CircleAvatar(
       radius: size,
-      foregroundColor: Colors.black,
       backgroundColor: backgroundColor,
       foregroundImage: image,
       child: Icon(

diff --git a/pets/lib/components/pet_square_avatar.dart b/pets/lib/components/pet_square_avatar.dart
@@ -1,5 +1,6 @@
 import 'package:fast_cached_network_image/fast_cached_network_image.dart';
 import 'package:flutter/material.dart';
+import 'package:pets/magic_colors.dart';
 import 'package:pets/models/pet.dart';
 
 class PetSquareAvatar extends StatelessWidget {
@@ -28,8 +29,9 @@ class PetSquareAvatar extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    final backgroundColor = Theme.of(context).colorScheme.onPrimaryContainer;
-    final iconColor = Theme.of(context).colorScheme.onPrimary;
+    final colorScheme = Theme.of(context).colorScheme;
+    final backgroundColor = colorScheme.onPrimaryContainer;
+    final iconColor = magicColors(colorScheme.brightness);
     final placeholder = Container(
       width: size! * 2,
       height: size! * 2,

diff --git a/pets/lib/components/placeholder_ocorridos.dart b/pets/lib/components/placeholder_ocorridos.dart
@@ -9,25 +9,37 @@ class PlaceholderOcorridos extends HookWidget {
 
   @override
   Widget build(BuildContext context) {
-    final theme = Theme.of(context);
+    final colorScheme = Theme.of(context).colorScheme;
+
+    final textColor = colorScheme.brightness == Brightness.light
+        ? colorScheme.primaryContainer
+        : colorScheme.onBackground;
+
+    final backgroundColor = colorScheme.brightness == Brightness.light
+        ? colorScheme.onPrimaryContainer
+        : colorScheme.primaryContainer;
 
     return Stack(
       clipBehavior: Clip.none,
       children: [
         Column(
           children: [
             Container(
-              padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 16),
+              padding: const EdgeInsets.only(
+                top: 8,
+                left: 8,
+                right: 8,
+                bottom: 30,
+              ),
               alignment: Alignment.center,
               decoration: BoxDecoration(
-                color: theme.colorScheme.surfaceVariant,
+                color: backgroundColor,
                 borderRadius: BorderRadius.circular(8),
               ),
               child: Text.rich(
                 TextSpan(children: [
                   TextSpan(
                     text: t(context).placeholderTimeline1,
-                    style: Theme.of(context).textTheme.bodyMedium,
                   ),
                   TextSpan(
                     children: [
@@ -36,9 +48,8 @@ class PlaceholderOcorridos extends HookWidget {
                       ),
                       TextSpan(
                         text: t(context).placeholderTimeline3,
-                        style: TextStyle(
+                        style: const TextStyle(
                           fontWeight: FontWeight.bold,
-                          color: theme.colorScheme.onPrimaryContainer,
                         ),
                       ),
                       TextSpan(
@@ -53,9 +64,8 @@ class PlaceholderOcorridos extends HookWidget {
                       ),
                       TextSpan(
                         text: t(context).placeholderTimeline5,
-                        style: TextStyle(
+                        style: const TextStyle(
                           fontWeight: FontWeight.bold,
-                          color: theme.colorScheme.onPrimaryContainer,
                         ),
                       ),
                       TextSpan(
@@ -64,7 +74,10 @@ class PlaceholderOcorridos extends HookWidget {
                     ],
                   )
                 ]),
-                style: Theme.of(context).textTheme.bodyMedium,
+                style: Theme.of(context)
+                    .textTheme
+                    .bodyMedium
+                    ?.copyWith(color: textColor),
               ),
             ),
             const SizedBox(height: 22),

diff --git a/pets/lib/components/placeholder_proximos.dart b/pets/lib/components/placeholder_proximos.dart
@@ -10,16 +10,30 @@ class PlaceholderProximos extends HookWidget {
   @override
   Widget build(BuildContext context) {
     final theme = Theme.of(context);
+    final colorScheme = Theme.of(context).colorScheme;
+
+    final textColor = colorScheme.brightness == Brightness.light
+        ? colorScheme.primaryContainer
+        : colorScheme.onBackground;
+
+    final backgroundColor = colorScheme.brightness == Brightness.light
+        ? colorScheme.onPrimaryContainer
+        : colorScheme.primaryContainer;
 
     return Stack(
       clipBehavior: Clip.none,
       children: [
         Column(children: [
           Container(
-            padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 16),
+            padding: const EdgeInsets.only(
+              top: 8,
+              left: 8,
+              right: 8,
+              bottom: 30,
+            ),
             alignment: Alignment.center,
             decoration: BoxDecoration(
-              color: theme.colorScheme.surfaceVariant,
+              color: backgroundColor,
               borderRadius: BorderRadius.circular(8),
             ),
             child: Text.rich(
@@ -32,9 +46,8 @@ class PlaceholderProximos extends HookWidget {
                       ),
                       TextSpan(
                         text: t(context).placeholderProximos2,
-                        style: TextStyle(
+                        style: const TextStyle(
                           fontWeight: FontWeight.bold,
-                          color: theme.colorScheme.onPrimaryContainer,
                         ),
                       ),
                       TextSpan(
@@ -49,26 +62,27 @@ class PlaceholderProximos extends HookWidget {
                       ),
                       TextSpan(
                         text: t(context).placeholderProximos5,
-                        style: TextStyle(
+                        style: const TextStyle(
                           fontWeight: FontWeight.bold,
-                          color: theme.colorScheme.onPrimaryContainer,
                         ),
                       ),
                       TextSpan(
                         text: t(context).placeholderProximos6,
                       ),
                       TextSpan(
                         text: t(context).placeholderProximos7,
-                        style: TextStyle(
+                        style: const TextStyle(
                           fontWeight: FontWeight.bold,
-                          color: theme.colorScheme.onPrimaryContainer,
                         ),
                       ),
                     ],
                   )
                 ],
               ),
-              style: Theme.of(context).textTheme.bodyMedium,
+              style: Theme.of(context)
+                  .textTheme
+                  .bodyMedium
+                  ?.copyWith(color: textColor),
             ),
           ),
           const SizedBox(

diff --git a/pets/lib/components/small_native_ad.dart b/pets/lib/components/small_native_ad.dart
@@ -4,7 +4,9 @@ import 'package:flutter/material.dart';
 import 'package:google_mobile_ads/google_mobile_ads.dart';
 
 class SmallNativeAd extends StatefulWidget {
-  const SmallNativeAd({super.key});
+  ColorScheme scheme;
+
+  SmallNativeAd({super.key, required this.scheme});
 
   @override
   SmallNativeAdState createState() => SmallNativeAdState();
@@ -22,7 +24,56 @@ class SmallNativeAdState extends State<SmallNativeAd> {
   void initState() {
     super.initState();
 
-    _loadAd();
+    final naviteListener = NativeAdListener(
+      onAdLoaded: (ad) {
+        // ignore: avoid_print
+        print('$NativeAd loaded.');
+        setState(() {
+          _nativeAdIsLoaded = true;
+        });
+      },
+      onAdFailedToLoad: (ad, error) {
+        // ignore: avoid_print
+        print('$NativeAd failedToLoad: $error');
+        ad.dispose();
+      },
+      onAdClicked: (ad) {},
+      onAdImpression: (ad) {},
+      onAdClosed: (ad) {},
+      onAdOpened: (ad) {},
+      onAdWillDismissScreen: (ad) {},
+      onPaidEvent: (ad, valueMicros, precision, currencyCode) {},
+    );
+
+    final nativeTemplateStyle = NativeTemplateStyle(
+      templateType: TemplateType.small,
+      mainBackgroundColor: widget.scheme.background,
+      callToActionTextStyle: NativeTemplateTextStyle(
+        textColor: widget.scheme.surface,
+        style: NativeTemplateFontStyle.bold,
+        size: 16.0,
+      ),
+      primaryTextStyle: NativeTemplateTextStyle(
+        textColor: widget.scheme.primary,
+        style: NativeTemplateFontStyle.bold,
+        size: 16.0,
+      ),
+      secondaryTextStyle: NativeTemplateTextStyle(
+        textColor: widget.scheme.onBackground,
+        style: NativeTemplateFontStyle.italic,
+        size: 14.0,
+      ),
+      tertiaryTextStyle: NativeTemplateTextStyle(
+        textColor: widget.scheme.onBackground,
+        style: NativeTemplateFontStyle.normal,
+        size: 14.0,
+      ),
+    );
+
+    _loadAd(
+      naviteListener,
+      nativeTemplateStyle,
+    );
   }
 
   @override
@@ -37,54 +88,19 @@ class SmallNativeAdState extends State<SmallNativeAd> {
   }
 
   /// Loads a native ad.
-  void _loadAd() {
+  void _loadAd(naviteListener, nativeTemplateStyle) {
     setState(() {
       _nativeAdIsLoaded = false;
     });
 
     _nativeAd = NativeAd(
-        adUnitId: _adUnitId,
-        listener: NativeAdListener(
-          onAdLoaded: (ad) {
-            // ignore: avoid_print
-            print('$NativeAd loaded.');
-            setState(() {
-              _nativeAdIsLoaded = true;
-            });
-          },
-          onAdFailedToLoad: (ad, error) {
-            // ignore: avoid_print
-            print('$NativeAd failedToLoad: $error');
-            ad.dispose();
-          },
-          onAdClicked: (ad) {},
-          onAdImpression: (ad) {},
-          onAdClosed: (ad) {},
-          onAdOpened: (ad) {},
-          onAdWillDismissScreen: (ad) {},
-          onPaidEvent: (ad, valueMicros, precision, currencyCode) {},
-        ),
-        request: const AdRequest(),
-        nativeTemplateStyle: NativeTemplateStyle(
-            templateType: TemplateType.small,
-            mainBackgroundColor: const Color(0xfffffbed),
-            callToActionTextStyle: NativeTemplateTextStyle(
-                textColor: Colors.white,
-                style: NativeTemplateFontStyle.monospace,
-                size: 16.0),
-            primaryTextStyle: NativeTemplateTextStyle(
-                textColor: Colors.black,
-                style: NativeTemplateFontStyle.bold,
-                size: 16.0),
-            secondaryTextStyle: NativeTemplateTextStyle(
-                textColor: Colors.black,
-                style: NativeTemplateFontStyle.italic,
-                size: 16.0),
-            tertiaryTextStyle: NativeTemplateTextStyle(
-                textColor: Colors.black,
-                style: NativeTemplateFontStyle.normal,
-                size: 16.0)))
-      ..load();
+      adUnitId: _adUnitId,
+      listener: naviteListener,
+      request: const AdRequest(),
+      nativeTemplateStyle: nativeTemplateStyle,
+    );
+
+    _nativeAd!.load();
   }
 
   @override

diff --git a/pets/lib/l10n/app_en.arb b/pets/lib/l10n/app_en.arb
@@ -79,11 +79,9 @@
   "medicineProducer": "Producer",
   "medicineVeterinary": "Veterinary",
   "onboardingTitle": "Welcome",
-  "onboardingContent1": "You still ",
-  "onboardingContent2": "didn''t register",
-  "onboardingContent3": " any of your pets.",
-  "onboardingContent4": "Que tal cadastrar um agora?",
-  "onboardingNoPetsCta": "Cadastrar novo pet",
+  "onboardingContent1": "Here you can keep track of your pets health.",
+  "onboardingContent4": "What about registering your first pet now?",
+  "onboardingNoPetsCta": "Register new pet",
   "onboardingAcessibleLabel": "A person with a dog walking",
   "petsNewPet": "New pet",
   "petsAnimalName": "Animal name",
@@ -133,5 +131,6 @@
   "placeholderProximos4": "Appointments can be ",
   "placeholderProximos5": "repetitions for routine tasks",
   "placeholderProximos6": " or ",
-  "placeholderProximos7": "by quantity, like doses in medications.\n"
+  "placeholderProximos7": "by quantity, like doses in medications.\n",
+  "spaces": "Spaces"
 }