浏览代码

added option to make text bold in CaptionedTextWidget + removed boilerplate code

ashilkn 2 年之前
父节点
当前提交
766a99ee46

+ 7 - 1
lib/ui/components/captioned_text_widget.dart

@@ -6,11 +6,13 @@ class CaptionedTextWidget extends StatelessWidget {
   final String text;
   final String? subText;
   final TextStyle? textStyle;
+  final bool makeTextBold;
   final Color? textColor;
   const CaptionedTextWidget({
     required this.text,
     this.subText,
     this.textStyle,
+    this.makeTextBold = false,
     this.textColor,
     Key? key,
   }) : super(key: key);
@@ -28,7 +30,11 @@ class CaptionedTextWidget extends StatelessWidget {
               child: RichText(
                 text: TextSpan(
                   style: textStyle ??
-                      enteTheme.textTheme.bodyBold.copyWith(color: textColor),
+                      (makeTextBold
+                          ? enteTheme.textTheme.bodyBold
+                              .copyWith(color: textColor)
+                          : enteTheme.textTheme.body
+                              .copyWith(color: textColor)),
                   children: [
                     TextSpan(
                       text: text,

+ 1 - 0
lib/ui/settings/account_section_widget.dart

@@ -38,6 +38,7 @@ class AccountSectionWidgetState extends State<AccountSectionWidget> {
       header: MenuItemWidget(
         captionedTextWidget: const CaptionedTextWidget(
           text: "Account",
+          makeTextBold: true,
         ),
         isHeaderOfExpansion: true,
         leadingIcon: Icons.account_circle_outlined,

+ 7 - 14
lib/ui/settings/backup_section_widget.dart

@@ -45,6 +45,7 @@ class BackupSectionWidgetState extends State<BackupSectionWidget> {
       header: MenuItemWidget(
         captionedTextWidget: const CaptionedTextWidget(
           text: "Backup",
+          makeTextBold: true,
         ),
         isHeaderOfExpansion: true,
         leadingIcon: Icons.backup_outlined,
@@ -61,14 +62,11 @@ class BackupSectionWidgetState extends State<BackupSectionWidget> {
   }
 
   Widget _getSectionOptions(BuildContext context) {
-    final bodyTextTheme =
-        Theme.of(context).colorScheme.enteTheme.textTheme.body;
     final List<Widget> sectionOptions = [
       sectionOptionDivider,
       MenuItemWidget(
-        captionedTextWidget: CaptionedTextWidget(
+        captionedTextWidget: const CaptionedTextWidget(
           text: "Backed up folders",
-          textStyle: bodyTextTheme,
         ),
         trailingIcon: Icons.chevron_right_outlined,
         trailingIconIsMuted: true,
@@ -82,9 +80,8 @@ class BackupSectionWidgetState extends State<BackupSectionWidget> {
         },
       ),
       MenuItemWidget(
-        captionedTextWidget: CaptionedTextWidget(
+        captionedTextWidget: const CaptionedTextWidget(
           text: "Backup over mobile data",
-          textStyle: bodyTextTheme,
         ),
         trailingSwitch: Switch.adaptive(
           value: Configuration.instance.shouldBackupOverMobileData(),
@@ -95,9 +92,8 @@ class BackupSectionWidgetState extends State<BackupSectionWidget> {
         ),
       ),
       MenuItemWidget(
-        captionedTextWidget: CaptionedTextWidget(
+        captionedTextWidget: const CaptionedTextWidget(
           text: "Backup videos",
-          textStyle: bodyTextTheme,
         ),
         trailingSwitch: Switch.adaptive(
           value: Configuration.instance.shouldBackupVideos(),
@@ -111,9 +107,8 @@ class BackupSectionWidgetState extends State<BackupSectionWidget> {
     if (Platform.isIOS) {
       sectionOptions.addAll([
         MenuItemWidget(
-          captionedTextWidget: CaptionedTextWidget(
+          captionedTextWidget: const CaptionedTextWidget(
             text: "Disable auto lock",
-            textStyle: bodyTextTheme,
           ),
           trailingSwitch: Switch.adaptive(
             value: Configuration.instance.shouldKeepDeviceAwake(),
@@ -140,9 +135,8 @@ class BackupSectionWidgetState extends State<BackupSectionWidget> {
     sectionOptions.addAll(
       [
         MenuItemWidget(
-          captionedTextWidget: CaptionedTextWidget(
+          captionedTextWidget: const CaptionedTextWidget(
             text: "Free up space",
-            textStyle: bodyTextTheme,
           ),
           trailingIcon: Icons.chevron_right_outlined,
           trailingIconIsMuted: true,
@@ -175,9 +169,8 @@ class BackupSectionWidgetState extends State<BackupSectionWidget> {
           },
         ),
         MenuItemWidget(
-          captionedTextWidget: CaptionedTextWidget(
+          captionedTextWidget: const CaptionedTextWidget(
             text: "Deduplicate files",
-            textStyle: bodyTextTheme,
           ),
           trailingIcon: Icons.chevron_right_outlined,
           trailingIconIsMuted: true,

+ 1 - 0
lib/ui/settings/danger_section_widget.dart

@@ -33,6 +33,7 @@ class _DangerSectionWidgetState extends State<DangerSectionWidget> {
       header: MenuItemWidget(
         captionedTextWidget: const CaptionedTextWidget(
           text: "Exit",
+          makeTextBold: true,
         ),
         isHeaderOfExpansion: true,
         leadingIcon: Icons.logout_outlined,

+ 1 - 0
lib/ui/settings/debug_section_widget.dart

@@ -36,6 +36,7 @@ class _DebugSectionWidgetState extends State<DebugSectionWidget> {
       header: MenuItemWidget(
         captionedTextWidget: const CaptionedTextWidget(
           text: "Debug",
+          makeTextBold: true,
         ),
         isHeaderOfExpansion: true,
         leadingIcon: Icons.bug_report_outlined,

+ 1 - 0
lib/ui/settings/info_section_widget.dart

@@ -36,6 +36,7 @@ class _InfoSectionWidgetState extends State<InfoSectionWidget> {
       header: MenuItemWidget(
         captionedTextWidget: const CaptionedTextWidget(
           text: "About",
+          makeTextBold: true,
         ),
         isHeaderOfExpansion: true,
         leadingIcon: Icons.info_outlined,

+ 1 - 0
lib/ui/settings/security_section_widget.dart

@@ -56,6 +56,7 @@ class _SecuritySectionWidgetState extends State<SecuritySectionWidget> {
       header: MenuItemWidget(
         captionedTextWidget: const CaptionedTextWidget(
           text: "Security",
+          makeTextBold: true,
         ),
         isHeaderOfExpansion: true,
         leadingIcon: Icons.local_police_outlined,

+ 1 - 0
lib/ui/settings/social_section_widget.dart

@@ -34,6 +34,7 @@ class _SocialSectionWidgetState extends State<SocialSectionWidget> {
       header: MenuItemWidget(
         captionedTextWidget: const CaptionedTextWidget(
           text: "Social",
+          makeTextBold: true,
         ),
         isHeaderOfExpansion: true,
         leadingIcon: Icons.interests_outlined,

+ 1 - 0
lib/ui/settings/support_section_widget.dart

@@ -36,6 +36,7 @@ class _SupportSectionWidgetState extends State<SupportSectionWidget> {
       header: MenuItemWidget(
         captionedTextWidget: const CaptionedTextWidget(
           text: "Support",
+          makeTextBold: true,
         ),
         isHeaderOfExpansion: true,
         leadingIcon: Icons.help_outline_outlined,

+ 1 - 0
lib/ui/settings/theme_switch_widget.dart

@@ -46,6 +46,7 @@ class _ThemeSwitchWidgetState extends State<ThemeSwitchWidget> {
       header: MenuItemWidget(
         captionedTextWidget: const CaptionedTextWidget(
           text: "Theme",
+          makeTextBold: true,
         ),
         isHeaderOfExpansion: true,
         leadingIcon: Theme.of(context).brightness == Brightness.light

+ 0 - 11
lib/ui/settings_page.dart

@@ -61,17 +61,6 @@ class SettingsPage extends StatelessWidget {
       contents.addAll([
         const DetailsSectionWidget(),
         const Padding(padding: EdgeInsets.only(bottom: 24)),
-        // MenuItemWidget(
-        //   captionedTextWidget: CaptionedTextWidget(
-        //     text: "Button",
-        //     subText: "Sub text",
-        //   ),
-        //   isHeaderOfExpansion: false,
-        //   trailingSwitch: ToggleSwitch(
-        //     value: true,
-        //     onChanged: () {},
-        //   ),
-        // ),
         const BackupSectionWidget(),
         sectionSpacing,
         const AccountSectionWidget(),