198 bug snackbar without action text positioning (#320)

* app : delete l10n keys * app : add json exemple in snackbar * library : fix two lines content text * app and library : add changelog
Orange-OpenSource · Feb 12, 2024 · 2dd9c3f · 2dd9c3f
1 parent e4ee508
commit 2dd9c3f
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 24 deletions.
diff --git a/app/CHANGELOG.md b/app/CHANGELOG.md
@@ -19,6 +19,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Vertical Card customization updates ([#189](https://github.com/Orange-OpenSource/ods-flutter/issues/189))
 - Update Copyright in files ([#303](https://github.com/Orange-OpenSource/ods-flutter/issues/303))
 - Typographie flutter ios ([#293](https://github.com/Orange-OpenSource/ods-flutter/issues/293))
+- [Bug]: Snackbar without action text positioning ([#198](https://github.com/Orange-OpenSource/ods-flutter/issues/198))
 
 ### [0.7.O](https://github.com/Orange-OpenSource/ods-flutter/compare/0.1.1...0.7.0) - 2023-02-02
 

diff --git a/app/lib/l10n/ods_flutter_en.arb b/app/lib/l10n/ods_flutter_en.arb
@@ -152,10 +152,7 @@
   "componentSnackbarsDescription": "There are two ways to show users short, non permanent messages giving system information or feedback about an operation.",
   "componentSnackbarsDescriptionExampleText": "Customize the snackbar before displaying it",
   "componentSnackbarsDescriptionExampleButton": "Show snackbar",
-  "componentSnackbarsSingleText": "Single line snackbar",
-  "componentSnackbarsTwoLineActionText": "Two lines snackbar with action",
   "componentSnackbarsActionExampleButtonText": "Close",
-  "componentSnackbarsTwoLineLongerActionText": "Two lines snackbar with longer action",
   "componentSnackbarsTwoLineLongerActionButton": "Longer action",
   "componentSnackBarsCustomizeAction": "Action button",
   "componentSnackBarsTwoLineCustomizeText": "Two Lines",

diff --git a/app/lib/ui/components/snackbars/snackbars.dart b/app/lib/ui/components/snackbars/snackbars.dart
@@ -17,6 +17,7 @@ import 'package:ods_flutter/components/lists/ods_list_switch.dart';
 import 'package:ods_flutter/components/sheets_bottom/ods_sheets_bottom.dart';
 import 'package:ods_flutter/components/snackbars/ods_snackbar.dart';
 import 'package:ods_flutter/guidelines/spacings.dart';
+import 'package:ods_flutter_demo/main.dart';
 import 'package:ods_flutter_demo/ui/components/snackbars/snackbars_customization.dart';
 import 'package:ods_flutter_demo/ui/main_app_bar.dart';
 
@@ -89,8 +90,7 @@ class _SnackBarsVariants extends StatelessWidget {
                   customizationState?.hasLongerAction == false) {
                 OdsSnackbar.showSnackbarSingleLine(
                   context: context,
-                  message: AppLocalizations.of(context)!
-                      .componentSnackbarsSingleText,
+                  message: OdsApplication.recipes[21].description,
                   actionLabel: customizationState?.hasActionButton == true
                       ? AppLocalizations.of(context)!
                           .componentSnackbarsActionExampleButtonText
@@ -103,8 +103,7 @@ class _SnackBarsVariants extends StatelessWidget {
                   customizationState?.hasLongerAction == false) {
                 OdsSnackbar.showSnackbarTwoLines(
                   context: context,
-                  message: AppLocalizations.of(context)!
-                      .componentSnackbarsTwoLineActionText,
+                  message: OdsApplication.recipes[7].description,
                   actionLabel: customizationState?.hasActionButton == true
                       ? AppLocalizations.of(context)!
                           .componentSnackbarsActionExampleButtonText
@@ -117,8 +116,7 @@ class _SnackBarsVariants extends StatelessWidget {
               if (customizationState?.hasLongerAction == true) {
                 OdsSnackbar.showSnackbarLongerAction(
                   context: context,
-                  message: AppLocalizations.of(context)!
-                      .componentSnackbarsTwoLineLongerActionText,
+                  message: OdsApplication.recipes[7].description,
                   actionLabel: AppLocalizations.of(context)!
                       .componentSnackbarsTwoLineLongerActionButton,
                   onPressed: () {},

diff --git a/library/CHANGELOG.md b/library/CHANGELOG.md
@@ -17,6 +17,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Update Copyright in files ([#303](https://github.com/Orange-OpenSource/ods-flutter/issues/303))
 - Vertical Card customization updates ([#189](https://github.com/Orange-OpenSource/ods-flutter/issues/189))
 - Typographie flutter ios ([#293](https://github.com/Orange-OpenSource/ods-flutter/issues/293))
+- [Bug]: Snackbar without action text positioning ([#198](https://github.com/Orange-OpenSource/ods-flutter/issues/198))
 
 ## [0.7.0](https://github.com/Orange-OpenSource/ods-flutter/compare/0.1.1...0.7.0) - 2023-02-02
 

diff --git a/library/lib/components/snackbars/ods_snackbar.dart b/library/lib/components/snackbars/ods_snackbar.dart
@@ -66,7 +66,7 @@ extension OdsSnackbarsSingleLineExtension on OdsSnackbar {
   }) {
     final snackbar = SnackBar(
       width: double.infinity,
-      content: Text(message),
+      content: Text(message, maxLines: 1),
       behavior: SnackBarBehavior.floating,
       action: actionLabel != null && actionLabel.isNotEmpty && onPressed != null
           ? SnackBarAction(
@@ -91,17 +91,17 @@ extension OdsSnackbarsTwoLinesExtension on OdsSnackbar {
   }) {
     SnackBar snackbar = SnackBar(
       width: double.infinity,
-      content: Wrap(
-        crossAxisAlignment: WrapCrossAlignment.center,
-        children: [
-          SizedBox(
-            width: MediaQuery.of(context).size.width / 2.5,
-            child: Text(
-              message,
-            ),
-          ),
-        ],
-      ),
+      content: actionLabel != null
+          ? Wrap(
+              crossAxisAlignment: WrapCrossAlignment.center,
+              children: [
+                SizedBox(
+                  width: MediaQuery.of(context).size.width / 2.5,
+                  child: Text(message, maxLines: 2),
+                ),
+              ],
+            )
+          : Text(message, maxLines: 2),
       action: actionLabel != null && actionLabel.isNotEmpty && onPressed != null
           ? SnackBarAction(
               label: actionLabel,
@@ -135,9 +135,7 @@ extension OdsSnackbarsLongerActionExtension on OdsSnackbar {
               children: [
                 SizedBox(
                   width: MediaQuery.of(context).size.width / 2.5,
-                  child: Text(
-                    message,
-                  ),
+                  child: Text(message, maxLines: 2),
                 ),
               ],
             ),