x1ongzhu 6 năm trước cách đây
mục cha
commit
54e4013139

+ 1 - 3
lib/pages/BonusDialog.dart

@@ -69,8 +69,6 @@ class BonusDialogState extends State<BonusDialog> {
             ];
             for (CompetitionInfo competitionInfo in widget.competitions) {
               list.add(bonusItem(competitionInfo));
-              list.add(bonusItem(competitionInfo));
-              list.add(bonusItem(competitionInfo));
             }
             return ListView(
               children: list,
@@ -173,7 +171,7 @@ Future showBonusDialog(context, List<CompetitionInfo> competitions) async {
       );
     },
     barrierLabel: MaterialLocalizations.of(context).modalBarrierDismissLabel,
-    barrierColor: Colors.black26,
+    barrierColor: Colors.black54,
     transitionDuration: const Duration(milliseconds: 300),
   );
 }

+ 1 - 1
lib/pages/CompetitionRooms.dart

@@ -261,7 +261,7 @@ class _CompetitionRoomsState extends State<CompetitionRooms> {
         );
       },
       barrierLabel: MaterialLocalizations.of(context).modalBarrierDismissLabel,
-      barrierColor: Colors.black26,
+      barrierColor: Colors.black54,
       transitionDuration: const Duration(milliseconds: 300),
     );
   }

+ 1 - 1
lib/pages/Home.dart

@@ -197,7 +197,7 @@ class _HomePageState extends State<HomePage>
           },
           barrierLabel:
               MaterialLocalizations.of(context).modalBarrierDismissLabel,
-          barrierColor: Colors.black26,
+          barrierColor: Colors.black54,
           transitionDuration: const Duration(milliseconds: 300),
         );
       }

+ 2 - 2
lib/widget/CheckUpgrade.dart

@@ -35,7 +35,7 @@ Future showUpgradeDialog(context, upgradeInfo, key) async {
       );
     },
     barrierLabel: MaterialLocalizations.of(context).modalBarrierDismissLabel,
-    barrierColor: Colors.black26,
+    barrierColor: Colors.black54,
     transitionDuration: const Duration(milliseconds: 300),
   );
 }
@@ -53,7 +53,7 @@ Future downloadApk(context, url) async {
       );
     },
     barrierLabel: MaterialLocalizations.of(context).modalBarrierDismissLabel,
-    barrierColor: Colors.black26,
+    barrierColor: Colors.black54,
     transitionDuration: const Duration(milliseconds: 300),
   );
 }

+ 1 - 1
lib/widget/CheckinDialog.dart

@@ -19,7 +19,7 @@ void showCheckinDialog(BuildContext context) {
     },
     barrierDismissible: true,
     barrierLabel: MaterialLocalizations.of(context).modalBarrierDismissLabel,
-    barrierColor: Colors.black26,
+    barrierColor: Colors.black54,
     transitionBuilder: (BuildContext context, Animation<double> animation, Animation<double> secondaryAnimation, Widget child) {
       final curvedValue = Curves.easeInOutBack.transform(animation.value) - 1.0;
       return Transform(

+ 46 - 14
lib/widget/Competition.dart

@@ -33,7 +33,9 @@ class Competition extends StatelessWidget {
                 ),
                 Align(
                   alignment: Alignment.topLeft,
-                  child: Image.asset('images/home_icon_vip.png'),
+                  child: competitionInfo.type == 2
+                      ? Image.asset('images/home_icon_vip.png')
+                      : Container(),
                 ),
                 Positioned(
                   right: 10,
@@ -46,12 +48,15 @@ class Competition extends StatelessWidget {
                       child: Builder(
                         builder: (context) {
                           var src = 'images/icon_paimingno.png';
-                          if (competitionInfo.participatingInfo != null && competitionInfo.participatingInfo.rank > 0) {
+                          if (competitionInfo.participatingInfo != null &&
+                              competitionInfo.participatingInfo.rank > 0) {
                             if (competitionInfo.participatingInfo.rank == 1) {
                               src = 'images/icon_paiming01.png';
-                            } else if (competitionInfo.participatingInfo.rank == 2) {
+                            } else if (competitionInfo.participatingInfo.rank ==
+                                2) {
                               src = 'images/icon_paiming02.png';
-                            } else if (competitionInfo.participatingInfo.rank == 3) {
+                            } else if (competitionInfo.participatingInfo.rank ==
+                                3) {
                               src = 'images/icon_paiming03.png';
                             } else {
                               return Stack(
@@ -62,7 +67,8 @@ class Competition extends StatelessWidget {
                                     child: Container(
                                       margin: EdgeInsets.only(top: 10),
                                       child: Text(
-                                        competitionInfo.participatingInfo.rank.toString(),
+                                        competitionInfo.participatingInfo.rank
+                                            .toString(),
                                         style: TextStyle(
                                           fontSize: 16,
                                           fontWeight: FontWeight.bold,
@@ -80,7 +86,11 @@ class Competition extends StatelessWidget {
                       ),
                     ),
                     onTap: () {
-                      Navigator.push(context, CupertinoPageRoute(builder: (context) => CompetitionRank(competitionId: competitionInfo.id)));
+                      Navigator.push(
+                          context,
+                          CupertinoPageRoute(
+                              builder: (context) => CompetitionRank(
+                                  competitionId: competitionInfo.id)));
                     },
                   ),
                 ),
@@ -100,7 +110,10 @@ class Competition extends StatelessWidget {
         ),
       ),
       onTap: () {
-        Navigator.push(context, CupertinoPageRoute(builder: (context) => CompetitionRooms(competitionInfo)));
+        Navigator.push(
+            context,
+            CupertinoPageRoute(
+                builder: (context) => CompetitionRooms(competitionInfo)));
       },
     );
   }
@@ -108,6 +121,7 @@ class Competition extends StatelessWidget {
 
 class CompetitionOld extends StatelessWidget {
   final CompetitionInfo competitionInfo;
+
   CompetitionOld(this.competitionInfo);
 
   @override
@@ -144,9 +158,18 @@ class CompetitionOld extends StatelessWidget {
                           ),
                           Expanded(
                             child: GradientText(
-                                '¥' + competitionInfo.bonus.toString().replaceAllMapped(RegExp(r'(\d{1,3})(?=(\d{3})+(?!\d))'), (Match m) => '${m[1]},'),
+                                '¥' +
+                                    competitionInfo.bonus
+                                        .toString()
+                                        .replaceAllMapped(
+                                            RegExp(
+                                                r'(\d{1,3})(?=(\d{3})+(?!\d))'),
+                                            (Match m) => '${m[1]},'),
                                 gradient: LinearGradient(
-                                  colors: [Color(0xFFFFC84B), Color(0xFFA26A23)],
+                                  colors: [
+                                    Color(0xFFFFC84B),
+                                    Color(0xFFA26A23)
+                                  ],
                                   begin: Alignment.topCenter,
                                   end: Alignment.bottomCenter,
                                 ),
@@ -155,9 +178,13 @@ class CompetitionOld extends StatelessWidget {
                           ),
                           Text(
                             '比赛时间' +
-                                DateFormat('yyyy.MM.dd').format(DateTime.fromMicrosecondsSinceEpoch(competitionInfo.startTime * 1000)) +
+                                DateFormat('yyyy.MM.dd').format(
+                                    DateTime.fromMicrosecondsSinceEpoch(
+                                        competitionInfo.startTime * 1000)) +
                                 '-' +
-                                DateFormat('yyyy.MM.dd').format(DateTime.fromMicrosecondsSinceEpoch(competitionInfo.endTime * 1000)),
+                                DateFormat('yyyy.MM.dd').format(
+                                    DateTime.fromMicrosecondsSinceEpoch(
+                                        competitionInfo.endTime * 1000)),
                             style: TextStyle(
                               color: Color(0xFF9A9CA2),
                               fontSize: 11,
@@ -201,7 +228,8 @@ class CompetitionOld extends StatelessWidget {
                 child: Builder(
                   builder: (context) {
                     var src = 'images/icon_paimingno.png';
-                    if (competitionInfo.participatingInfo != null && competitionInfo.participatingInfo.rank > 0) {
+                    if (competitionInfo.participatingInfo != null &&
+                        competitionInfo.participatingInfo.rank > 0) {
                       if (competitionInfo.participatingInfo.rank == 1) {
                         src = 'images/icon_paiming01.png';
                       } else if (competitionInfo.participatingInfo.rank == 2) {
@@ -217,7 +245,8 @@ class CompetitionOld extends StatelessWidget {
                               child: Container(
                                 margin: EdgeInsets.only(top: 10),
                                 child: Text(
-                                  competitionInfo.participatingInfo.rank.toString(),
+                                  competitionInfo.participatingInfo.rank
+                                      .toString(),
                                   style: TextStyle(
                                     fontSize: 16,
                                     fontWeight: FontWeight.bold,
@@ -250,7 +279,10 @@ class CompetitionOld extends StatelessWidget {
         ),
       ),
       onTap: () {
-        Navigator.push(context, CupertinoPageRoute(builder: (context) => CompetitionRooms(competitionInfo)));
+        Navigator.push(
+            context,
+            CupertinoPageRoute(
+                builder: (context) => CompetitionRooms(competitionInfo)));
       },
     );
   }