fix theme && locale text

packages/zefyr/lib/src/widgets/buttons.dart

@@ -560,6 +560,13 @@ class _ImageButtonState extends State<ImageButton> {
     }
   }
 
+  String get uploadText => Localizations.localeOf(context) == Locale('zh', 'CN') ? '上传' : 'Upload';
+  String get fullImageText => Localizations.localeOf(context) == Locale('zh', 'CN') ? '原图' : 'Full image';
+  String get camera => Localizations.localeOf(context) == Locale('zh', 'CN') ? '拍照' : 'Camera';
+  String get album => Localizations.localeOf(context) == Locale('zh', 'CN') ? '相册' : 'Album';
+  I18nProvider get locale => Localizations.localeOf(context) == Locale('zh', 'CN') ? I18nProvider.chinese : I18nProvider.english;
+
+
   Widget buildOverlay(BuildContext context) {
     final theme = ZefyrTheme.of(context).toolbarTheme;
     final toolbar = ZefyrToolbar.of(context);
@@ -586,7 +593,8 @@ class _ImageButtonState extends State<ImageButton> {
                           Expanded(
                             child: FlatButton(
                                 shape: RoundedRectangleBorder(),
-                                color: Color(0xFFF6F6F6),
+                                color: theme.captionColor,
+                                padding: EdgeInsets.zero,
                                 onPressed: () async {
                                   // toolbar.editor.tapHandle =
                                   //     TapHandle.takePhoto;
@@ -594,7 +602,7 @@ class _ImageButtonState extends State<ImageButton> {
                                       source: ImageSource.camera);
                                   if (file != null) {
                                     toolbar.closeOverlay();
-                                    final image = await toolbar
+                                    await toolbar
                                         .editor.imageDelegate
                                         .picked(file, true);
                                   }
@@ -612,7 +620,7 @@ class _ImageButtonState extends State<ImageButton> {
                                       Padding(
                                         padding: EdgeInsets.only(top: 6),
                                         child: Text(
-                                          '拍照',
+                                          camera,
                                           style: TextStyle(
                                             fontSize: 12,
                                             color: Color(0xFF8C8C8C),
@@ -626,7 +634,8 @@ class _ImageButtonState extends State<ImageButton> {
                           Expanded(
                             child: FlatButton(
                                 shape: RoundedRectangleBorder(),
-                                color: Color(0xFFF6F6F6),
+                                color: theme.captionColor,
+                                padding: EdgeInsets.zero,
                                 onPressed: () {
                                   final editor =
                                       ZefyrToolbar.of(context).editor;
@@ -637,7 +646,7 @@ class _ImageButtonState extends State<ImageButton> {
                                     rowCount: 4,
                                     itemRadio: 1,
                                     padding: 4,
-                                    provider: I18nProvider.chinese,
+                                    provider: locale,
                                     sortDelegate: SortDelegate.common,
                                     pickType: PickType.onlyImage,
                                     photoPathList: null,
@@ -670,7 +679,7 @@ class _ImageButtonState extends State<ImageButton> {
                                       Padding(
                                         padding: EdgeInsets.only(top: 6),
                                         child: Text(
-                                          '相册',
+                                          album,
                                           style: TextStyle(
                                             fontSize: 12,
                                             color: Color(0xFF8C8C8C),
@@ -699,7 +708,7 @@ class _ImageButtonState extends State<ImageButton> {
                               padding: 4,
                               thumbSize: 300,
                               itemRadio: 0.5,
-                              provider: I18nProvider.chinese,
+                              provider: locale,
                               sortDelegate: SortDelegate.common,
                               pickType: PickType.onlyImage,
                               photoPathList: null,
@@ -743,7 +752,7 @@ class _ImageButtonState extends State<ImageButton> {
                                     padding:
                                         EdgeInsets.symmetric(horizontal: 8),
                                     child: Text(
-                                      '原图',
+                                      fullImageText,
                                       style: TextStyle(
                                           color: theme.iconColor, fontSize: 16),
                                     ),
@@ -800,7 +809,7 @@ class _ImageButtonState extends State<ImageButton> {
                           alignment: Alignment.center,
                           padding: EdgeInsets.symmetric(horizontal: 20),
                           child: Text(
-                            '上传 ${snapshot.data.asset.isNotEmpty ? "(${snapshot.data.asset.length})" : ''}',
+                            '$uploadText ${snapshot.data.asset.isNotEmpty ? "(${snapshot.data.asset.length})" : ''}',
                             style: TextStyle(
                               color: Colors.white,
                               fontSize: 14,

packages/zefyr/lib/src/widgets/theme.dart

@@ -595,6 +595,8 @@ class ToolbarTheme {
   
   final Color dividerColor;
 
+  final Color captionColor;
+
   /// Creates default theme for editor toolbar.
   factory ToolbarTheme.fallback(BuildContext context) {
     final theme = Theme.of(context);
@@ -605,6 +607,7 @@ class ToolbarTheme {
       iconFillColor: theme.brightness == Brightness.light ? Color(0xFFF2F2F2) : Color(0xFF1F1F1F),
       iconColor: Color(0xFF595959),
       disabledIconColor: theme.brightness == Brightness.light ? Color(0xFFBFBFBF) : Color(0xFF363636),
+      captionColor: theme.brightness == Brightness.light ? Color(0xFFF6F6F6) : Color(0xFF1B1B1B),
       dividerColor: theme.brightness == Brightness.light ? Color(0x0D1C202B) : Color(0xFF3B3B3B),
     );
   }
@@ -617,6 +620,7 @@ class ToolbarTheme {
     @required this.iconColor,
     @required this.disabledIconColor,
     @required this.dividerColor,
+    @required this.captionColor,
   });
 
   /// Creates a new [ToolbarTheme] where each property from this object has
@@ -629,6 +633,7 @@ class ToolbarTheme {
     Color iconColor,
     Color disabledIconColor,
     Color dividerColor,
+    Color captionColor,
   }) {
     return ToolbarTheme._(
       color: color ?? this.color,
@@ -638,6 +643,7 @@ class ToolbarTheme {
       iconColor: iconColor ?? this.iconColor,
       disabledIconColor: disabledIconColor ?? this.disabledIconColor,
       dividerColor: dividerColor ?? this.dividerColor,
+      captionColor: captionColor ?? this.captionColor,
     );
   }
 
@@ -653,6 +659,7 @@ class ToolbarTheme {
       iconColor: other.iconColor ?? iconColor,
       disabledIconColor: other.disabledIconColor ?? disabledIconColor,
       dividerColor: other.dividerColor ?? dividerColor,
+      captionColor: other.captionColor ?? captionColor,
     );
   }
 
@@ -666,10 +673,11 @@ class ToolbarTheme {
         (otherTheme.iconFillColor == iconFillColor) &&
         (otherTheme.iconColor == iconColor) &&
         (otherTheme.disabledIconColor == disabledIconColor) &&
+        (otherTheme.captionColor == captionColor) &&
         (otherTheme.dividerColor == dividerColor);
   }
 
   @override
   int get hashCode =>
-      hashValues(color, surfaceColor, toggleColor, iconFillColor, iconColor, disabledIconColor, dividerColor);
+      hashValues(color, surfaceColor, toggleColor, iconFillColor, iconColor, disabledIconColor, dividerColor, captionColor);
 }