Merge pull request #522 from bannzai/refactor/color/to_const

Color,Font に const つける
bannzai · Feb 27, 2022 · 264508a · 264508a
2 parents e575596 + 85b1a25
commit 264508a
Show file tree

Hide file tree

Showing 68 changed files with 168 additions and 168 deletions.
diff --git a/lib/components/atoms/button.dart b/lib/components/atoms/button.dart
@@ -3,7 +3,7 @@ import 'package:pilll/components/atoms/font.dart';
 import 'package:flutter/material.dart';
 
 abstract class ButtonTextStyle {
-  static final TextStyle main = TextStyle(
+  static final TextStyle main = const TextStyle(
     fontFamily: FontFamily.japanese,
     fontWeight: FontWeight.w700,
     fontSize: FontSize.sLarge,

diff --git a/lib/components/atoms/buttons.dart b/lib/components/atoms/buttons.dart
@@ -173,7 +173,7 @@ class SmallAppOutlinedButton extends StatelessWidget {
         child: Center(
           child: Text(
             text,
-            style: TextStyle(
+            style: const TextStyle(
               color: TextColor.main,
               fontSize: 12,
               fontFamily: FontFamily.japanese,
@@ -224,7 +224,7 @@ class AppOutlinedButton extends StatelessWidget {
         child: Center(
           child: Text(
             text,
-            style: TextStyle(
+            style: const TextStyle(
               color: TextColor.main,
               fontSize: 16,
               fontFamily: FontFamily.japanese,
@@ -271,7 +271,7 @@ class AlertButton extends StatelessWidget {
     return TextButton(
       child: Text(
         text,
-        style: TextStyle(
+        style: const TextStyle(
           fontFamily: FontFamily.japanese,
           fontWeight: FontWeight.w600,
           fontSize: FontSize.normal,

diff --git a/lib/components/atoms/font.dart b/lib/components/atoms/font.dart
@@ -3,142 +3,142 @@ import 'package:flutter/material.dart';
 class FontFamily {
   static String get standarad => japanese;
 
-  static final String number = "Avenir Next";
-  static final String japanese = "Noto Sans CJK JP";
-  static final String roboto = "Roboto";
+  static const String number = "Avenir Next";
+  static const String japanese = "Noto Sans CJK JP";
+  static const String roboto = "Roboto";
 }
 
 class FontSize {
-  static final double xHuge = 40;
-  static final double huge = 34;
-  static final double xBig = 24;
-  static final double big = 22;
-  static final double sBig = 20;
-  static final double large = 17;
-  static final double sLarge = 16;
-  static final double normal = 14;
-  static final double small = 12;
-  static final double sSmall = 10;
+  static const double xHuge = 40;
+  static const double huge = 34;
+  static const double xBig = 24;
+  static const double big = 22;
+  static const double sBig = 20;
+  static const double large = 17;
+  static const double sLarge = 16;
+  static const double normal = 14;
+  static const double small = 12;
+  static const double sSmall = 10;
 }
 
 class FontType {
-  static final TextStyle xHugeNumber = TextStyle(
+  static const TextStyle xHugeNumber = TextStyle(
     fontFamily: FontFamily.number,
     fontWeight: FontWeight.w500,
     fontSize: FontSize.xHuge,
   );
-  static final TextStyle largeNumber = TextStyle(
+  static const TextStyle largeNumber = TextStyle(
     fontFamily: FontFamily.japanese,
     fontWeight: FontWeight.w500,
     fontSize: FontSize.huge,
   );
-  static final TextStyle title = TextStyle(
+  static const TextStyle title = TextStyle(
     fontFamily: FontFamily.japanese,
     fontWeight: FontWeight.w600,
     fontSize: FontSize.large,
   );
-  static final TextStyle subTitle = TextStyle(
+  static const TextStyle subTitle = TextStyle(
     fontFamily: FontFamily.japanese,
     fontWeight: FontWeight.w600,
     fontSize: FontSize.sLarge,
   );
-  static final TextStyle xBigTitle = TextStyle(
+  static const TextStyle xBigTitle = TextStyle(
     fontFamily: FontFamily.number,
     fontWeight: FontWeight.w500,
     fontSize: FontSize.xBig,
   );
-  static final TextStyle xBigNumber = TextStyle(
+  static const TextStyle xBigNumber = TextStyle(
     fontFamily: FontFamily.number,
     fontWeight: FontWeight.w600,
     fontSize: FontSize.xBig,
   );
-  static final TextStyle sBigTitle = TextStyle(
+  static const TextStyle sBigTitle = TextStyle(
     fontFamily: FontFamily.japanese,
     fontWeight: FontWeight.w500,
     fontSize: FontSize.sBig,
   );
-  static final TextStyle cardHeader = TextStyle(
+  static const TextStyle cardHeader = TextStyle(
     fontFamily: FontFamily.number,
     fontWeight: FontWeight.w600,
     fontSize: FontSize.big,
   );
-  static final TextStyle thinTitle = TextStyle(
+  static const TextStyle thinTitle = TextStyle(
     fontFamily: FontFamily.japanese,
     fontWeight: FontWeight.w300,
     fontSize: FontSize.sLarge,
   );
-  static final TextStyle done = TextStyle(
+  static const TextStyle done = TextStyle(
     fontFamily: FontFamily.japanese,
     fontWeight: FontWeight.w600,
     fontSize: FontSize.sLarge,
   );
-  static final TextStyle close = TextStyle(
+  static const TextStyle close = TextStyle(
     fontFamily: FontFamily.japanese,
     fontWeight: FontWeight.w600,
     fontSize: FontSize.normal,
   );
-  static final TextStyle componentTitle = TextStyle(
+  static const TextStyle componentTitle = TextStyle(
     fontFamily: FontFamily.japanese,
     fontWeight: FontWeight.w300,
     fontSize: FontSize.sLarge,
   );
-  static final TextStyle gridElement = TextStyle(
+  static const TextStyle gridElement = TextStyle(
     fontFamily: FontFamily.number,
     fontWeight: FontWeight.w600,
     fontSize: FontSize.sLarge,
   );
 
-  static final TextStyle helpRow = TextStyle(
+  static const TextStyle helpRow = TextStyle(
     fontFamily: FontFamily.roboto,
     fontWeight: FontWeight.w400,
     fontSize: FontSize.normal,
   );
-  static final TextStyle listRow = TextStyle(
+  static const TextStyle listRow = TextStyle(
     fontFamily: FontFamily.roboto,
     fontWeight: FontWeight.w300,
     fontSize: FontSize.sLarge,
   );
-  static final TextStyle assisting = TextStyle(
+  static const TextStyle assisting = TextStyle(
     fontFamily: FontFamily.japanese,
     fontWeight: FontWeight.w300,
     fontSize: FontSize.normal,
   );
-  static final TextStyle assistingBold = TextStyle(
+  static const TextStyle assistingBold = TextStyle(
     fontFamily: FontFamily.japanese,
     fontWeight: FontWeight.w600,
     fontSize: FontSize.normal,
   );
-  static final TextStyle inputNumber = TextStyle(
+  static const TextStyle inputNumber = TextStyle(
     fontFamily: FontFamily.japanese,
     fontWeight: FontWeight.w700,
     fontSize: FontSize.sLarge,
   );
-  static final TextStyle description = TextStyle(
+  static const TextStyle description = TextStyle(
     fontFamily: FontFamily.japanese,
     fontWeight: FontWeight.w400,
     fontSize: FontSize.small,
   );
-  static final TextStyle descriptionBold = TextStyle(
+  static const TextStyle descriptionBold = TextStyle(
     fontFamily: FontFamily.japanese,
     fontWeight: FontWeight.w700,
     fontSize: FontSize.small,
   );
-  static final TextStyle smallTitle = TextStyle(
+  static const TextStyle smallTitle = TextStyle(
     fontFamily: FontFamily.number,
     fontWeight: FontWeight.w500,
     fontSize: FontSize.small,
   );
-  static final TextStyle sSmallTitle = TextStyle(
+  static const TextStyle sSmallTitle = TextStyle(
     fontFamily: FontFamily.japanese,
     fontWeight: FontWeight.w600,
     fontSize: FontSize.sSmall,
   );
-  static final TextStyle sSmallNumber = TextStyle(
+  static const TextStyle sSmallNumber = TextStyle(
     fontFamily: FontFamily.number,
     fontWeight: FontWeight.w600,
     fontSize: FontSize.sSmall,
   );
-  static final TextStyle sSmallSentence = TextStyle(
+  static const TextStyle sSmallSentence = TextStyle(
     fontFamily: FontFamily.japanese,
     fontWeight: FontWeight.w300,
     fontSize: FontSize.sSmall,

diff --git a/lib/components/atoms/text_color.dart b/lib/components/atoms/text_color.dart
@@ -3,30 +3,30 @@ import 'package:flutter/material.dart';
 
 class TextColor {
   static Color get standard => black;
-  static final Color black = Colors.black;
-  static final Color white = Colors.white;
+  static const Color black = Colors.black;
+  static const Color white = Colors.white;
   static final Color darkGray = const Color(0xFF000000).withAlpha(153);
-  static final Color gray = const Color(0xFF7E7E7E);
-  static final Color lightGray = const Color(0xFFB1B1B1);
-  static final Color lightGray2 = const Color(0xFF666666);
-  static final Color noshime = const Color(0xFF3D4662);
-  static final Color primary = PilllColors.primary;
-  static final Color main = const Color(0xFF29304D);
-  static final Color link = primary;
-  static final Color danger = PilllColors.red;
+  static const Color gray = const Color(0xFF7E7E7E);
+  static const Color lightGray = const Color(0xFFB1B1B1);
+  static const Color lightGray2 = const Color(0xFF666666);
+  static const Color noshime = const Color(0xFF3D4662);
+  static const Color primary = PilllColors.primary;
+  static const Color main = const Color(0xFF29304D);
+  static const Color link = primary;
+  static const Color danger = PilllColors.red;
 }
 
 class TextColorStyle {
   static TextStyle get standard => black;
-  static final TextStyle black = TextStyle(color: TextColor.black);
-  static final TextStyle white = TextStyle(color: TextColor.white);
+  static const TextStyle black = TextStyle(color: TextColor.black);
+  static const TextStyle white = TextStyle(color: TextColor.white);
   static final TextStyle darkGray = TextStyle(color: TextColor.darkGray);
-  static final TextStyle gray = TextStyle(color: TextColor.gray);
-  static final TextStyle lightGray = TextStyle(color: TextColor.lightGray);
-  static final TextStyle lightGray2 = TextStyle(color: TextColor.lightGray2);
-  static final TextStyle noshime = TextStyle(color: TextColor.noshime);
-  static final TextStyle primary = TextStyle(color: TextColor.primary);
-  static final TextStyle main = TextStyle(color: TextColor.main);
-  static final TextStyle link = TextStyle(color: TextColor.link);
-  static final TextStyle danger = TextStyle(color: TextColor.danger);
+  static const TextStyle gray = TextStyle(color: TextColor.gray);
+  static const TextStyle lightGray = TextStyle(color: TextColor.lightGray);
+  static const TextStyle lightGray2 = TextStyle(color: TextColor.lightGray2);
+  static const TextStyle noshime = TextStyle(color: TextColor.noshime);
+  static const TextStyle primary = TextStyle(color: TextColor.primary);
+  static const TextStyle main = TextStyle(color: TextColor.main);
+  static const TextStyle link = TextStyle(color: TextColor.link);
+  static const TextStyle danger = TextStyle(color: TextColor.danger);
 }
diff --git a/lib/components/molecules/counter_unit_layout.dart b/lib/components/molecules/counter_unit_layout.dart
@@ -19,7 +19,7 @@ class CounterUnitLayout extends StatelessWidget {
       children: [
         Text(
           title,
-          style: TextStyle(
+          style: const TextStyle(
             color: TextColor.main,
             fontFamily: FontFamily.japanese,
             fontSize: 12,
@@ -33,7 +33,7 @@ class CounterUnitLayout extends StatelessWidget {
           children: [
             Text(
               number,
-              style: TextStyle(
+              style: const TextStyle(
                 color: TextColor.main,
                 fontFamily: FontFamily.number,
                 fontSize: 24,
@@ -42,7 +42,7 @@ class CounterUnitLayout extends StatelessWidget {
             ),
             Text(
               unit,
-              style: TextStyle(
+              style: const TextStyle(
                 color: TextColor.main,
                 fontFamily: FontFamily.japanese,
                 fontSize: 12,

diff --git a/lib/components/molecules/premium_badge.dart b/lib/components/molecules/premium_badge.dart
@@ -13,7 +13,7 @@ class PremiumBadge extends StatelessWidget {
         color: PilllColors.gold,
         borderRadius: BorderRadius.circular(41),
       ),
-      child: Text("Premium",
+      child: const Text("Premium",
           style: TextStyle(
             color: TextColor.white,
             fontFamily: FontFamily.number,

diff --git a/lib/components/template/setting_menstruation/setting_menstruation_page_template.dart b/lib/components/template/setting_menstruation/setting_menstruation_page_template.dart
@@ -32,7 +32,7 @@ class SettingMenstruationPageTemplate extends StatelessWidget {
         ),
         title: Text(
           this.title,
-          style: TextStyle(color: TextColor.black),
+          style: const TextStyle(color: TextColor.black),
         ),
         backgroundColor: PilllColors.white,
       ),

diff --git a/...nents/template/setting_pill_sheet_group/pill_sheet_group_select_pill_sheet_type_page.dart b/...nents/template/setting_pill_sheet_group/pill_sheet_group_select_pill_sheet_type_page.dart
@@ -36,7 +36,7 @@ class PillSheetGroupSelectPillSheetTypePage extends StatelessWidget {
                   mainAxisAlignment: MainAxisAlignment.start,
                   children: [
                     const SizedBox(width: 16),
-                    Text(
+                    const Text(
                       "ピルの種類を選択",
                       style: TextStyle(
                         color: TextColor.main,

diff --git a/lib/components/template/setting_pill_sheet_group/pill_sheet_type_add_button.dart b/lib/components/template/setting_pill_sheet_group/pill_sheet_type_add_button.dart
@@ -34,13 +34,13 @@ class PillSheetTypeAddButton extends StatelessWidget {
         child: Row(
           mainAxisAlignment: MainAxisAlignment.center,
           children: [
-            Icon(
+            const Icon(
               Icons.add,
               color: TextColor.noshime,
               size: 20,
             ),
             const SizedBox(width: 4),
-            Text(
+            const Text(
               "ピルシートを追加",
               style: TextStyle(
                 color: TextColor.main,

diff --git a/lib/domain/calendar/components/pill_sheet_modified_history/components/core/day.dart b/lib/domain/calendar/components/pill_sheet_modified_history/components/core/day.dart
@@ -22,7 +22,7 @@ class Day extends StatelessWidget {
           width: 28,
           child: Text(
             "$_day",
-            style: TextStyle(
+            style: const TextStyle(
               color: TextColor.main,
               fontFamily: FontFamily.number,
               fontSize: 23,
@@ -34,7 +34,7 @@ class Day extends StatelessWidget {
         const SizedBox(width: 4),
         Text(
           "(${_weekday.weekdayString()})",
-          style: TextStyle(
+          style: const TextStyle(
             color: TextColor.main,
             fontFamily: FontFamily.japanese,
             fontSize: 12,

diff --git a/...alendar/components/pill_sheet_modified_history/components/core/effective_pill_number.dart b/...alendar/components/pill_sheet_modified_history/components/core/effective_pill_number.dart
@@ -15,7 +15,7 @@ class EffectivePillNumber extends StatelessWidget {
   Widget build(BuildContext context) {
     return Text(
       "$effectivePillNumber",
-      style: TextStyle(
+      style: const TextStyle(
         color: TextColor.main,
         fontFamily: FontFamily.japanese,
         fontSize: 12,

diff --git a/lib/domain/calendar/components/pill_sheet_modified_history/components/core/time.dart b/lib/domain/calendar/components/pill_sheet_modified_history/components/core/time.dart
@@ -14,7 +14,7 @@ class Time extends StatelessWidget {
   Widget build(BuildContext context) {
     return Text(
       time,
-      style: TextStyle(
+      style: const TextStyle(
         decoration: TextDecoration.underline,
         letterSpacing: 1.5,
         color: TextColor.main,

diff --git a/...ts/pill_sheet_modified_history/components/pill_sheet_modified_history_monthly_header.dart b/...ts/pill_sheet_modified_history/components/pill_sheet_modified_history_monthly_header.dart
@@ -14,7 +14,7 @@ class PillSheetModifiedHistoryMonthlyHeader extends StatelessWidget {
   Widget build(BuildContext context) {
     return Text(
       DateTimeFormatter.jaMonth(dateTimeOfMonth),
-      style: TextStyle(
+      style: const TextStyle(
         color: TextColor.main,
         fontFamily: FontFamily.japanese,
         fontSize: 12,

diff --git a/...nents/rows/pill_sheet_modified_history_automatically_recorded_last_taken_date_action.dart b/...nents/rows/pill_sheet_modified_history_automatically_recorded_last_taken_date_action.dart
@@ -27,7 +27,7 @@ class PillSheetModifiedHistoryAutomaticallyRecordedLastTakenDateAction
       effectiveNumbersOrHyphen: EffectivePillNumber(
           effectivePillNumber:
               PillSheetModifiedHistoryDateEffectivePillNumber.autoTaken(value)),
-      detail: Text(
+      detail: const Text(
         "-",
         style: TextStyle(
           color: TextColor.main,

diff --git a/...eet_modified_history/components/rows/pill_sheet_modified_history_began_rest_duration.dart b/...eet_modified_history/components/rows/pill_sheet_modified_history_began_rest_duration.dart
@@ -27,7 +27,7 @@ class PillSheetModifiedHistoryBeganRestDuration extends StatelessWidget {
       effectiveNumbersOrHyphen: EffectivePillNumber(
           effectivePillNumber:
               PillSheetModifiedHistoryDateEffectivePillNumber.hyphen()),
-      detail: Text(
+      detail: const Text(
         "休薬開始",
         style: TextStyle(
           color: TextColor.main,