Merge branch 'd-dev' of http://svn.ouj.com:3000/ouj/flutter-sport into k-dev-20210122

lib/pages/game/game_info.dart

@@ -293,7 +293,7 @@ class GameItem extends StatelessWidget {
                     "$name",
                     style: bold
                         ? Theme.of(context).textTheme.headline1.copyWith(fontSize: 16.0, fontWeight: FontWeight.w600)
-                        : Theme.of(context).textTheme.headline1.copyWith(fontSize: 16.0,fontWeight: FontWeight.bold),
+                        : Theme.of(context).textTheme.headline1.copyWith(fontSize: 16.0,fontWeight: FontWeight.w600),
                   ),
                   SizedBox(
                     height: 3,

lib/pages/home/duration_setting_page.dart

@@ -163,6 +163,7 @@ class _FormState extends State<_Form> {
                             autofocus: true,
                             maxLength: 4,
                             inputFormatters: [WhitelistingTextInputFormatter.digitsOnly],
+                            style: TextStyle(fontWeight: FontWeight.w600,fontSize: 20.0),
                             decoration: InputDecoration(
                                 counterText: '',
                                 helperText: '',

lib/pages/my/achievement_detail_page.dart

@@ -468,7 +468,7 @@ Future<bool> showSharePopup(
                                                     fontSize: 18.0,
                                                     color: Colors.white,
                                                     fontWeight:
-                                                        FontWeight.bold),
+                                                        FontWeight.w600),
                                               ),
                                               Space(
                                                 height: 10.0,
@@ -523,7 +523,7 @@ Future<bool> showSharePopup(
                                                     fontSize: 18.0,
                                                     color: Colors.white,
                                                     fontWeight:
-                                                    FontWeight.bold
+                                                    FontWeight.w600
                                                 ),
                                               ),
                                               Space(

lib/pages/my/my_page.dart

@@ -91,7 +91,7 @@ class _MyPageState extends State<MyPage> with InjectApi {
                                           mainAxisAlignment: MainAxisAlignment.center,
                                           crossAxisAlignment: CrossAxisAlignment.start,
                                           children: <Widget>[
-                                            Text(model.user.name ?? "", style: TextStyle(color: Color(0xff333333), fontSize: 18,fontWeight: FontWeight.bold)),
+                                            Text(model.user.name ?? "", style: TextStyle(color: Color(0xff333333), fontSize: 18,fontWeight: FontWeight.w600)),
                                             Space(
                                               height: 7,
                                             ),