fontFamily v1.0.8

YYFlutter · Oct 10, 2019 · 3024cf3 · 3024cf3
1 parent 7a96b32
commit 3024cf3
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -29,4 +29,8 @@
 
 ## 1.0.7
 
-* Fix Gradle build Aar
+* Fix Gradle build Aar
+
+## 1.0.8
+
+* Fix Gradle build Aar for iOS
diff --git a/README.md b/README.md
@@ -17,7 +17,7 @@ Global dialog function encapsulation, with a semantic way to fill the content in
 
 ```yaml
 dependencies:
-  flutter_custom_dialog: ^1.0.7
+  flutter_custom_dialog: ^1.0.8
 ```
 
 **2、import**

diff --git a/README_CN.md b/README_CN.md
@@ -15,7 +15,7 @@
 
 ```yaml
 dependencies:
-  flutter_custom_dialog: ^1.0.7
+  flutter_custom_dialog: ^1.0.8
 ```
 
 **2、import**

diff --git a/lib/flutter_custom_dialog.dart b/lib/flutter_custom_dialog.dart
@@ -45,7 +45,8 @@ class YYDialog {
     return this;
   }
 
-  YYDialog text({padding, text, color, fontSize, alignment, fontWeight}) {
+  YYDialog text(
+      {padding, text, color, fontSize, alignment, fontWeight, fontFamily}) {
     return this.widget(
       Padding(
         padding: padding ?? EdgeInsets.all(0.0),
@@ -57,6 +58,7 @@ class YYDialog {
               color: color ?? Colors.black,
               fontSize: fontSize ?? 14.0,
               fontWeight: fontWeight,
+              fontFamily: fontFamily,
             ),
           ),
         ),
@@ -74,11 +76,13 @@ class YYDialog {
     color1,
     fontSize1,
     fontWeight1,
+    fontFamily1,
     VoidCallback onTap1,
     text2,
     color2,
     fontSize2,
     fontWeight2,
+    fontFamily2,
     onTap2,
   }) {
     return this.widget(
@@ -100,7 +104,8 @@ class YYDialog {
                 style: TextStyle(
                   color: color1 ?? null,
                   fontSize: fontSize1 ?? null,
-                  fontWeight: fontWeight1 ?? null,
+                  fontWeight: fontWeight1,
+                  fontFamily: fontFamily1,
                 ),
               ),
             ),
@@ -121,7 +126,8 @@ class YYDialog {
                 style: TextStyle(
                   color: color2 ?? Colors.black,
                   fontSize: fontSize2 ?? 14.0,
-                  fontWeight: fontWeight2 ?? null,
+                  fontWeight: fontWeight2,
+                  fontFamily: fontFamily2,
                 ),
               ),
             )
@@ -164,7 +170,8 @@ class YYDialog {
                     style: TextStyle(
                       color: items[index].color ?? null,
                       fontSize: items[index].fontSize ?? null,
-                      fontWeight: items[index].fontWeight ?? null,
+                      fontWeight: items[index].fontWeight,
+                      fontFamily: items[index].fontFamily,
                     ),
                   ),
                 ),
@@ -226,7 +233,6 @@ class YYDialog {
   void show([x, y]) {
     var mainAxisAlignment = getColumnMainAxisAlignment(gravity);
     var crossAxisAlignment = getColumnCrossAxisAlignment(gravity);
-    Size size = MediaQuery.of(this.context).size;
     if (x != null && y != null) {
       gravity = Gravity.leftTop;
       margin = EdgeInsets.only(left: x, top: y);
@@ -523,6 +529,7 @@ class ListTileItem {
     this.color,
     this.fontSize,
     this.fontWeight,
+    this.fontFamily,
   });
 
   EdgeInsets padding;
@@ -531,6 +538,7 @@ class ListTileItem {
   Color color;
   double fontSize;
   FontWeight fontWeight;
+  String fontFamily;
 }
 
 class RadioItem {

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -1,6 +1,6 @@
 name: flutter_custom_dialog
 description: Semantic dialog
-version: 1.0.7
+version: 1.0.8
 author: AndroidHensen <xyj510402535@qq.com>
 homepage: https://github.com/YYFlutter/flutter-custom-dialog.git