From 1c0a2508298168e69d894324cb84f6a1373b6912 Mon Sep 17 00:00:00 2001 From: violet-dev Date: Sun, 7 Jan 2024 13:59:46 +0900 Subject: [PATCH 1/3] Extract group name --- lib/pages/settings/settings_page.dart | 74 ++++++++++++++++----------- 1 file changed, 43 insertions(+), 31 deletions(-) diff --git a/lib/pages/settings/settings_page.dart b/lib/pages/settings/settings_page.dart index 358e19697..d978f7396 100644 --- a/lib/pages/settings/settings_page.dart +++ b/lib/pages/settings/settings_page.dart @@ -221,24 +221,6 @@ class _SettingsPageState extends State ); } - Padding _buildGroup(String name) { - return Padding( - padding: const EdgeInsets.fromLTRB(20, 16, 20, 8), - child: Row( - mainAxisAlignment: MainAxisAlignment.spaceBetween, - children: [ - Text(name, - style: TextStyle( - color: Settings.themeWhat ? Colors.white : Colors.black87, - fontSize: 24.0, - fontFamily: 'Calibre-Semibold', - letterSpacing: 1.0, - )), - ], - ), - ); - } - Container _buildItems(List items) { return Container( margin: const EdgeInsets.fromLTRB(16, 0, 16, 8), @@ -288,7 +270,7 @@ class _SettingsPageState extends State List _themeGroup() { return [ - _buildGroup(Translations.of(context).trans('theme')), + SettingGroupName(name: Translations.of(context).trans('theme')), _buildItems([ InkWell( customBorder: const RoundedRectangleBorder( @@ -603,7 +585,7 @@ class _SettingsPageState extends State List _communityGroup() { return [ - _buildGroup(Translations.of(context).trans('community')), + SettingGroupName(name: Translations.of(context).trans('community')), _buildItems( [ InkWell( @@ -715,7 +697,7 @@ class _SettingsPageState extends State List _searchGroup() { return [ - _buildGroup(Translations.of(context).trans('search')), + SettingGroupName(name: Translations.of(context).trans('search')), _buildItems( [ InkWell( @@ -877,7 +859,7 @@ class _SettingsPageState extends State List _systemGroup() { return [ - _buildGroup(Translations.of(context).trans('system')), + SettingGroupName(name: Translations.of(context).trans('system')), _buildItems( [ InkWell( @@ -1058,7 +1040,7 @@ class _SettingsPageState extends State List _securityGroup() { return [ - _buildGroup(Translations.of(context).trans('security')), + SettingGroupName(name: Translations.of(context).trans('security')), _buildItems( [ InkWell( @@ -1136,7 +1118,7 @@ class _SettingsPageState extends State List _databaseGroup() { return [ - _buildGroup(Translations.of(context).trans('database')), + SettingGroupName(name: Translations.of(context).trans('database')), _buildItems( [ InkWell( @@ -1299,7 +1281,7 @@ class _SettingsPageState extends State List _networkingGroup() { return [ - _buildGroup(Translations.of(context).trans('network')), + SettingGroupName(name: Translations.of(context).trans('network')), _buildItems( [ // InkWell( @@ -1484,7 +1466,7 @@ class _SettingsPageState extends State List _downloadGroup() { return [ - _buildGroup(Translations.of(context).trans('download')), + SettingGroupName(name: Translations.of(context).trans('download')), _buildItems( [ InkWell( @@ -1809,7 +1791,7 @@ class _SettingsPageState extends State */ return [ - _buildGroup(Translations.of(context).trans('bookmark')), + SettingGroupName(name: Translations.of(context).trans('bookmark')), _buildItems( [ InkWell( @@ -2406,7 +2388,7 @@ class _SettingsPageState extends State List _componetGroup() { return [ - _buildGroup(Translations.of(context).trans('component')), + SettingGroupName(name: Translations.of(context).trans('component')), _buildItems( [ InkWell( @@ -2722,7 +2704,7 @@ class _SettingsPageState extends State List _viewGroup() { return [ - _buildGroup(Translations.of(context).trans('view')), + SettingGroupName(name: Translations.of(context).trans('view')), _buildItems( [ InkWell( @@ -2762,7 +2744,7 @@ class _SettingsPageState extends State List _updateGroup() { return [ - _buildGroup(Translations.of(context).trans('update')), + SettingGroupName(name: Translations.of(context).trans('update')), _buildItems( [ InkWell( @@ -2866,7 +2848,7 @@ class _SettingsPageState extends State List _etcGroup() { return [ - _buildGroup(Translations.of(context).trans('etc')), + SettingGroupName(name: Translations.of(context).trans('etc')), _buildItems( [ if (!Settings.liteMode) @@ -3061,3 +3043,33 @@ class _SettingsPageState extends State ); } } + +class SettingGroupName extends StatelessWidget { + final String name; + + const SettingGroupName({ + super.key, + required this.name, + }); + + @override + Widget build(BuildContext context) { + return Padding( + padding: const EdgeInsets.fromLTRB(20, 16, 20, 8), + child: Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + Text( + name, + style: TextStyle( + color: Settings.themeWhat ? Colors.white : Colors.black87, + fontSize: 24.0, + fontFamily: 'Calibre-Semibold', + letterSpacing: 1.0, + ), + ), + ], + ), + ); + } +} From e7148e286f79371137bc5676a92a6693a753a019 Mon Sep 17 00:00:00 2001 From: violet-dev Date: Sun, 7 Jan 2024 14:18:11 +0900 Subject: [PATCH 2/3] Extract divider --- lib/pages/settings/settings_page.dart | 125 ++++++++++++++------------ 1 file changed, 66 insertions(+), 59 deletions(-) diff --git a/lib/pages/settings/settings_page.dart b/lib/pages/settings/settings_page.dart index d978f7396..a55e2912d 100644 --- a/lib/pages/settings/settings_page.dart +++ b/lib/pages/settings/settings_page.dart @@ -210,17 +210,6 @@ class _SettingsPageState extends State ); } - Container _buildDivider() { - return Container( - margin: const EdgeInsets.symmetric( - horizontal: 8.0, - ), - width: double.infinity, - height: 1.0, - color: Settings.themeWhat ? Colors.grey.shade600 : Colors.grey.shade400, - ); - } - Container _buildItems(List items) { return Container( margin: const EdgeInsets.fromLTRB(16, 0, 16, 8), @@ -315,7 +304,7 @@ class _SettingsPageState extends State }); }, ), - _buildDivider(), + const SettingGroupDivider(), ListTile( leading: ShaderMask( shaderCallback: (bounds) => const RadialGradient( @@ -352,7 +341,7 @@ class _SettingsPageState extends State ); }, ), - _buildDivider(), + const SettingGroupDivider(), InkWell( onTap: _themeSwitch ? () async { @@ -453,7 +442,7 @@ class _SettingsPageState extends State ), ), ), - if (!Settings.liteMode) _buildDivider(), + if (!Settings.liteMode) const SettingGroupDivider(), if (!Settings.liteMode) InkWell( child: ListTile( @@ -478,7 +467,7 @@ class _SettingsPageState extends State }); }, ), - _buildDivider(), + const SettingGroupDivider(), InkWell( child: ListTile( leading: Icon(MdiIcons.tabletDashboard, color: Settings.majorColor), @@ -502,7 +491,7 @@ class _SettingsPageState extends State }); }, ), - if (!Settings.liteMode) _buildDivider(), + if (!Settings.liteMode) const SettingGroupDivider(), if (!Settings.liteMode) InkWell( child: ListTile( @@ -539,7 +528,7 @@ class _SettingsPageState extends State }); }, ), - _buildDivider(), + const SettingGroupDivider(), InkWell( customBorder: const RoundedRectangleBorder( borderRadius: BorderRadius.only( @@ -608,7 +597,7 @@ class _SettingsPageState extends State } }, ), - _buildDivider(), + const SettingGroupDivider(), ListTile( leading: const Icon( MdiIcons.gmail, @@ -629,7 +618,7 @@ class _SettingsPageState extends State } }, ), - _buildDivider(), + const SettingGroupDivider(), ListTile( leading: Icon(MdiIcons.accessPointNetwork, color: Settings.majorColor), @@ -640,7 +629,7 @@ class _SettingsPageState extends State context, const LabRecentRecordsU()); }, ), - _buildDivider(), + const SettingGroupDivider(), ListTile( leading: Icon(MdiIcons.commentTextMultiple, color: Settings.majorColor), @@ -651,7 +640,7 @@ class _SettingsPageState extends State context, const LabGlobalComments()); }, ), - _buildDivider(), + const SettingGroupDivider(), ListTile( leading: Icon(MdiIcons.star, color: Settings.themeWhat @@ -664,7 +653,7 @@ class _SettingsPageState extends State context, const ArtistCollectionPage()); }, ), - _buildDivider(), + const SettingGroupDivider(), ListTile( leading: const Icon(MdiIcons.bookOpenPageVariant, color: Colors.brown), @@ -674,7 +663,7 @@ class _SettingsPageState extends State PlatformNavigator.navigateSlide(context, const UserManualPage()); }, ), - _buildDivider(), + const SettingGroupDivider(), InkWell( customBorder: const RoundedRectangleBorder( borderRadius: BorderRadius.only( @@ -738,7 +727,7 @@ class _SettingsPageState extends State } }, ), - _buildDivider(), + const SettingGroupDivider(), ListTile( leading: Icon( MdiIcons.tagOff, @@ -761,7 +750,7 @@ class _SettingsPageState extends State } }, ), - if (!Settings.liteMode) _buildDivider(), + if (!Settings.liteMode) const SettingGroupDivider(), if (!Settings.liteMode) ListTile( leading: Icon( @@ -796,7 +785,7 @@ class _SettingsPageState extends State } }, ), - if (!Settings.liteMode) _buildDivider(), + if (!Settings.liteMode) const SettingGroupDivider(), if (!Settings.liteMode) InkWell( child: ListTile( @@ -821,7 +810,7 @@ class _SettingsPageState extends State }); }, ), - _buildDivider(), + const SettingGroupDivider(), InkWell( customBorder: const RoundedRectangleBorder( borderRadius: BorderRadius.only( @@ -876,7 +865,7 @@ class _SettingsPageState extends State PlatformNavigator.navigateSlide(context, const LogPage()); }, ), - _buildDivider(), + const SettingGroupDivider(), ListTile( leading: Icon(Icons.language, color: Settings.majorColor), title: Text(Translations.of(context).trans('language')), @@ -928,7 +917,7 @@ class _SettingsPageState extends State ); }, ), - if (Settings.language == 'ko') _buildDivider(), + if (Settings.language == 'ko') const SettingGroupDivider(), if (Settings.language == 'ko') ListTile( leading: Icon(Icons.translate, color: Settings.majorColor), @@ -952,7 +941,7 @@ class _SettingsPageState extends State }); }, ), - _buildDivider(), + const SettingGroupDivider(), ListTile( leading: Icon(MdiIcons.imageSizeSelectLarge, color: Settings.majorColor), @@ -975,7 +964,7 @@ class _SettingsPageState extends State }); }, ), - if (!Settings.liteMode) _buildDivider(), + if (!Settings.liteMode) const SettingGroupDivider(), if (!Settings.liteMode) ListTile( leading: Icon(Mdi.tableArrowRight, color: Settings.majorColor), @@ -995,7 +984,7 @@ class _SettingsPageState extends State ); }, ), - _buildDivider(), + const SettingGroupDivider(), ListTile( leading: Icon(Icons.info_outline, color: Settings.majorColor), title: Text(Translations.of(context).trans('info')), @@ -1009,7 +998,7 @@ class _SettingsPageState extends State ); }, ), - _buildDivider(), + const SettingGroupDivider(), ListTile( leading: const Icon(MdiIcons.fileSign, color: Colors.cyan), title: Text(Translations.of(context).trans('patchnote')), @@ -1018,7 +1007,7 @@ class _SettingsPageState extends State PlatformNavigator.navigateSlide(context, const PatchNotePage()); }, ), - _buildDivider(), + const SettingGroupDivider(), InkWell( customBorder: const RoundedRectangleBorder( borderRadius: BorderRadius.only( @@ -1068,7 +1057,7 @@ class _SettingsPageState extends State ); }, ), - _buildDivider(), + const SettingGroupDivider(), InkWell( customBorder: const RoundedRectangleBorder( borderRadius: BorderRadius.only( @@ -1141,7 +1130,7 @@ class _SettingsPageState extends State trailing: const Icon(Icons.keyboard_arrow_right), ), ), - _buildDivider(), + const SettingGroupDivider(), InkWell( child: ListTile( leading: Icon( @@ -1174,7 +1163,7 @@ class _SettingsPageState extends State } }, ), - _buildDivider(), + const SettingGroupDivider(), InkWell( child: ListTile( leading: Icon( @@ -1202,7 +1191,7 @@ class _SettingsPageState extends State }); }, ), - _buildDivider(), + const SettingGroupDivider(), InkWell( customBorder: const RoundedRectangleBorder( borderRadius: BorderRadius.only( @@ -1296,7 +1285,7 @@ class _SettingsPageState extends State // ), // onTap: () {}, // ), - // _buildDivider(), + // const SettingGroupDivider(), InkWell( customBorder: const RoundedRectangleBorder( borderRadius: BorderRadius.only( @@ -1323,7 +1312,7 @@ class _SettingsPageState extends State ); }, ), - _buildDivider(), + const SettingGroupDivider(), ListTile( leading: Icon( Icons.router, @@ -1339,7 +1328,7 @@ class _SettingsPageState extends State ); }, ), - _buildDivider(), + const SettingGroupDivider(), ListTile( leading: Icon( MdiIcons.commentSearch, @@ -1395,7 +1384,7 @@ class _SettingsPageState extends State } }, ), - _buildDivider(), + const SettingGroupDivider(), InkWell( customBorder: const RoundedRectangleBorder( borderRadius: BorderRadius.only( @@ -1427,7 +1416,7 @@ class _SettingsPageState extends State }); }, ), - _buildDivider(), + const SettingGroupDivider(), InkWell( customBorder: const RoundedRectangleBorder( borderRadius: BorderRadius.only( @@ -1504,7 +1493,7 @@ class _SettingsPageState extends State ), ), ), - _buildDivider(), + const SettingGroupDivider(), ListTile( leading: Icon( MdiIcons.lan, @@ -1612,7 +1601,7 @@ class _SettingsPageState extends State } }, ), - _buildDivider(), + const SettingGroupDivider(), InkWell( // customBorder: RoundedRectangleBorder( // borderRadius: BorderRadius.all( @@ -1693,7 +1682,7 @@ class _SettingsPageState extends State trailing: const Icon(Icons.keyboard_arrow_right), ), ), - _buildDivider(), + const SettingGroupDivider(), InkWell( customBorder: const RoundedRectangleBorder( borderRadius: BorderRadius.only( @@ -1816,7 +1805,7 @@ class _SettingsPageState extends State ), ), ), - if (!Settings.liteMode) _buildDivider(), + if (!Settings.liteMode) const SettingGroupDivider(), if (!Settings.liteMode) ListTile( leading: Icon( @@ -1954,7 +1943,7 @@ class _SettingsPageState extends State ); }, ), - _buildDivider(), + const SettingGroupDivider(), ListTile( leading: Icon(MdiIcons.import, color: Settings.majorColor), title: Text(Translations.of(context).trans('importingbookmark')), @@ -1998,7 +1987,7 @@ class _SettingsPageState extends State ); }, ), - _buildDivider(), + const SettingGroupDivider(), ListTile( leading: Icon( MdiIcons.export, @@ -2042,7 +2031,7 @@ class _SettingsPageState extends State ); }, ), - _buildDivider(), + const SettingGroupDivider(), ListTile( leading: Icon( MdiIcons.export, @@ -2074,7 +2063,7 @@ class _SettingsPageState extends State } }, ), - _buildDivider(), + const SettingGroupDivider(), InkWell( child: ListTile( leading: Icon( @@ -2183,7 +2172,7 @@ class _SettingsPageState extends State } }, ), - _buildDivider(), + const SettingGroupDivider(), InkWell( child: ListTile( leading: Icon( @@ -2270,7 +2259,7 @@ class _SettingsPageState extends State } }, ), - _buildDivider(), + const SettingGroupDivider(), InkWell( customBorder: const RoundedRectangleBorder( borderRadius: BorderRadius.only( @@ -2789,7 +2778,7 @@ class _SettingsPageState extends State } }, ), - _buildDivider(), + const SettingGroupDivider(), InkWell( customBorder: const RoundedRectangleBorder( borderRadius: BorderRadius.only( @@ -2872,7 +2861,7 @@ class _SettingsPageState extends State } }, ), - if (!Settings.liteMode) _buildDivider(), + if (!Settings.liteMode) const SettingGroupDivider(), if (!Settings.liteMode) ListTile( leading: const Icon( @@ -2911,7 +2900,7 @@ class _SettingsPageState extends State } }, ), - if (!Settings.liteMode) _buildDivider(), + if (!Settings.liteMode) const SettingGroupDivider(), if (!Settings.liteMode) ListTile( leading: const Icon( @@ -2933,7 +2922,7 @@ class _SettingsPageState extends State } }, ), - _buildDivider(), + const SettingGroupDivider(), ListTile( leading: const Icon( MdiIcons.heart, @@ -2950,7 +2939,7 @@ class _SettingsPageState extends State } }, ), - _buildDivider(), + const SettingGroupDivider(), ListTile( leading: Icon( MdiIcons.humanHandsup, @@ -2967,7 +2956,7 @@ class _SettingsPageState extends State // } }, ), - _buildDivider(), + const SettingGroupDivider(), InkWell( customBorder: const RoundedRectangleBorder( borderRadius: BorderRadius.only( @@ -3044,6 +3033,24 @@ class _SettingsPageState extends State } } +class SettingGroupDivider extends StatelessWidget { + const SettingGroupDivider({ + super.key, + }); + + @override + Widget build(BuildContext context) { + return Container( + margin: const EdgeInsets.symmetric( + horizontal: 8.0, + ), + width: double.infinity, + height: 1.0, + color: Settings.themeWhat ? Colors.grey.shade600 : Colors.grey.shade400, + ); + } +} + class SettingGroupName extends StatelessWidget { final String name; From 2d25d183f7bbc30760229485bc1e59616df18655 Mon Sep 17 00:00:00 2001 From: violet-dev Date: Sun, 7 Jan 2024 14:54:09 +0900 Subject: [PATCH 3/3] Remove divider insertion explicitly --- lib/pages/settings/settings_page.dart | 63 ++++++--------------------- 1 file changed, 13 insertions(+), 50 deletions(-) diff --git a/lib/pages/settings/settings_page.dart b/lib/pages/settings/settings_page.dart index a55e2912d..f9183edf0 100644 --- a/lib/pages/settings/settings_page.dart +++ b/lib/pages/settings/settings_page.dart @@ -211,6 +211,12 @@ class _SettingsPageState extends State } Container _buildItems(List items) { + final itemsWithDividers = items + .map((e) => [e, const SettingGroupDivider()]) + .expand((e) => e) + .take(items.length * 2 - 1) + .toList(); + return Container( margin: const EdgeInsets.fromLTRB(16, 0, 16, 8), width: double.infinity, @@ -248,9 +254,9 @@ class _SettingsPageState extends State ? Palette.blackThemeBackground : Colors.black38 : Colors.white, - child: Column(children: items), + child: Column(children: itemsWithDividers), )) - : Column(children: items), + : Column(children: itemsWithDividers), ); } @@ -304,7 +310,6 @@ class _SettingsPageState extends State }); }, ), - const SettingGroupDivider(), ListTile( leading: ShaderMask( shaderCallback: (bounds) => const RadialGradient( @@ -341,7 +346,6 @@ class _SettingsPageState extends State ); }, ), - const SettingGroupDivider(), InkWell( onTap: _themeSwitch ? () async { @@ -442,7 +446,6 @@ class _SettingsPageState extends State ), ), ), - if (!Settings.liteMode) const SettingGroupDivider(), if (!Settings.liteMode) InkWell( child: ListTile( @@ -467,7 +470,6 @@ class _SettingsPageState extends State }); }, ), - const SettingGroupDivider(), InkWell( child: ListTile( leading: Icon(MdiIcons.tabletDashboard, color: Settings.majorColor), @@ -491,7 +493,6 @@ class _SettingsPageState extends State }); }, ), - if (!Settings.liteMode) const SettingGroupDivider(), if (!Settings.liteMode) InkWell( child: ListTile( @@ -528,7 +529,6 @@ class _SettingsPageState extends State }); }, ), - const SettingGroupDivider(), InkWell( customBorder: const RoundedRectangleBorder( borderRadius: BorderRadius.only( @@ -597,7 +597,6 @@ class _SettingsPageState extends State } }, ), - const SettingGroupDivider(), ListTile( leading: const Icon( MdiIcons.gmail, @@ -618,7 +617,6 @@ class _SettingsPageState extends State } }, ), - const SettingGroupDivider(), ListTile( leading: Icon(MdiIcons.accessPointNetwork, color: Settings.majorColor), @@ -629,7 +627,6 @@ class _SettingsPageState extends State context, const LabRecentRecordsU()); }, ), - const SettingGroupDivider(), ListTile( leading: Icon(MdiIcons.commentTextMultiple, color: Settings.majorColor), @@ -640,7 +637,6 @@ class _SettingsPageState extends State context, const LabGlobalComments()); }, ), - const SettingGroupDivider(), ListTile( leading: Icon(MdiIcons.star, color: Settings.themeWhat @@ -653,7 +649,6 @@ class _SettingsPageState extends State context, const ArtistCollectionPage()); }, ), - const SettingGroupDivider(), ListTile( leading: const Icon(MdiIcons.bookOpenPageVariant, color: Colors.brown), @@ -663,7 +658,6 @@ class _SettingsPageState extends State PlatformNavigator.navigateSlide(context, const UserManualPage()); }, ), - const SettingGroupDivider(), InkWell( customBorder: const RoundedRectangleBorder( borderRadius: BorderRadius.only( @@ -727,7 +721,6 @@ class _SettingsPageState extends State } }, ), - const SettingGroupDivider(), ListTile( leading: Icon( MdiIcons.tagOff, @@ -750,7 +743,6 @@ class _SettingsPageState extends State } }, ), - if (!Settings.liteMode) const SettingGroupDivider(), if (!Settings.liteMode) ListTile( leading: Icon( @@ -785,7 +777,6 @@ class _SettingsPageState extends State } }, ), - if (!Settings.liteMode) const SettingGroupDivider(), if (!Settings.liteMode) InkWell( child: ListTile( @@ -810,7 +801,6 @@ class _SettingsPageState extends State }); }, ), - const SettingGroupDivider(), InkWell( customBorder: const RoundedRectangleBorder( borderRadius: BorderRadius.only( @@ -865,7 +855,6 @@ class _SettingsPageState extends State PlatformNavigator.navigateSlide(context, const LogPage()); }, ), - const SettingGroupDivider(), ListTile( leading: Icon(Icons.language, color: Settings.majorColor), title: Text(Translations.of(context).trans('language')), @@ -917,7 +906,6 @@ class _SettingsPageState extends State ); }, ), - if (Settings.language == 'ko') const SettingGroupDivider(), if (Settings.language == 'ko') ListTile( leading: Icon(Icons.translate, color: Settings.majorColor), @@ -941,7 +929,6 @@ class _SettingsPageState extends State }); }, ), - const SettingGroupDivider(), ListTile( leading: Icon(MdiIcons.imageSizeSelectLarge, color: Settings.majorColor), @@ -964,7 +951,6 @@ class _SettingsPageState extends State }); }, ), - if (!Settings.liteMode) const SettingGroupDivider(), if (!Settings.liteMode) ListTile( leading: Icon(Mdi.tableArrowRight, color: Settings.majorColor), @@ -984,7 +970,6 @@ class _SettingsPageState extends State ); }, ), - const SettingGroupDivider(), ListTile( leading: Icon(Icons.info_outline, color: Settings.majorColor), title: Text(Translations.of(context).trans('info')), @@ -998,7 +983,6 @@ class _SettingsPageState extends State ); }, ), - const SettingGroupDivider(), ListTile( leading: const Icon(MdiIcons.fileSign, color: Colors.cyan), title: Text(Translations.of(context).trans('patchnote')), @@ -1007,7 +991,6 @@ class _SettingsPageState extends State PlatformNavigator.navigateSlide(context, const PatchNotePage()); }, ), - const SettingGroupDivider(), InkWell( customBorder: const RoundedRectangleBorder( borderRadius: BorderRadius.only( @@ -1057,7 +1040,6 @@ class _SettingsPageState extends State ); }, ), - const SettingGroupDivider(), InkWell( customBorder: const RoundedRectangleBorder( borderRadius: BorderRadius.only( @@ -1130,7 +1112,6 @@ class _SettingsPageState extends State trailing: const Icon(Icons.keyboard_arrow_right), ), ), - const SettingGroupDivider(), InkWell( child: ListTile( leading: Icon( @@ -1163,7 +1144,6 @@ class _SettingsPageState extends State } }, ), - const SettingGroupDivider(), InkWell( child: ListTile( leading: Icon( @@ -1191,7 +1171,6 @@ class _SettingsPageState extends State }); }, ), - const SettingGroupDivider(), InkWell( customBorder: const RoundedRectangleBorder( borderRadius: BorderRadius.only( @@ -1285,7 +1264,7 @@ class _SettingsPageState extends State // ), // onTap: () {}, // ), - // const SettingGroupDivider(), + // InkWell( customBorder: const RoundedRectangleBorder( borderRadius: BorderRadius.only( @@ -1312,7 +1291,7 @@ class _SettingsPageState extends State ); }, ), - const SettingGroupDivider(), + ListTile( leading: Icon( Icons.router, @@ -1328,7 +1307,7 @@ class _SettingsPageState extends State ); }, ), - const SettingGroupDivider(), + ListTile( leading: Icon( MdiIcons.commentSearch, @@ -1384,7 +1363,7 @@ class _SettingsPageState extends State } }, ), - const SettingGroupDivider(), + InkWell( customBorder: const RoundedRectangleBorder( borderRadius: BorderRadius.only( @@ -1416,7 +1395,7 @@ class _SettingsPageState extends State }); }, ), - const SettingGroupDivider(), + InkWell( customBorder: const RoundedRectangleBorder( borderRadius: BorderRadius.only( @@ -1493,7 +1472,6 @@ class _SettingsPageState extends State ), ), ), - const SettingGroupDivider(), ListTile( leading: Icon( MdiIcons.lan, @@ -1601,7 +1579,6 @@ class _SettingsPageState extends State } }, ), - const SettingGroupDivider(), InkWell( // customBorder: RoundedRectangleBorder( // borderRadius: BorderRadius.all( @@ -1682,7 +1659,6 @@ class _SettingsPageState extends State trailing: const Icon(Icons.keyboard_arrow_right), ), ), - const SettingGroupDivider(), InkWell( customBorder: const RoundedRectangleBorder( borderRadius: BorderRadius.only( @@ -1805,7 +1781,6 @@ class _SettingsPageState extends State ), ), ), - if (!Settings.liteMode) const SettingGroupDivider(), if (!Settings.liteMode) ListTile( leading: Icon( @@ -1943,7 +1918,6 @@ class _SettingsPageState extends State ); }, ), - const SettingGroupDivider(), ListTile( leading: Icon(MdiIcons.import, color: Settings.majorColor), title: Text(Translations.of(context).trans('importingbookmark')), @@ -1987,7 +1961,6 @@ class _SettingsPageState extends State ); }, ), - const SettingGroupDivider(), ListTile( leading: Icon( MdiIcons.export, @@ -2031,7 +2004,6 @@ class _SettingsPageState extends State ); }, ), - const SettingGroupDivider(), ListTile( leading: Icon( MdiIcons.export, @@ -2063,7 +2035,6 @@ class _SettingsPageState extends State } }, ), - const SettingGroupDivider(), InkWell( child: ListTile( leading: Icon( @@ -2172,7 +2143,6 @@ class _SettingsPageState extends State } }, ), - const SettingGroupDivider(), InkWell( child: ListTile( leading: Icon( @@ -2259,7 +2229,6 @@ class _SettingsPageState extends State } }, ), - const SettingGroupDivider(), InkWell( customBorder: const RoundedRectangleBorder( borderRadius: BorderRadius.only( @@ -2778,7 +2747,6 @@ class _SettingsPageState extends State } }, ), - const SettingGroupDivider(), InkWell( customBorder: const RoundedRectangleBorder( borderRadius: BorderRadius.only( @@ -2861,7 +2829,6 @@ class _SettingsPageState extends State } }, ), - if (!Settings.liteMode) const SettingGroupDivider(), if (!Settings.liteMode) ListTile( leading: const Icon( @@ -2900,7 +2867,6 @@ class _SettingsPageState extends State } }, ), - if (!Settings.liteMode) const SettingGroupDivider(), if (!Settings.liteMode) ListTile( leading: const Icon( @@ -2922,7 +2888,6 @@ class _SettingsPageState extends State } }, ), - const SettingGroupDivider(), ListTile( leading: const Icon( MdiIcons.heart, @@ -2939,7 +2904,6 @@ class _SettingsPageState extends State } }, ), - const SettingGroupDivider(), ListTile( leading: Icon( MdiIcons.humanHandsup, @@ -2956,7 +2920,6 @@ class _SettingsPageState extends State // } }, ), - const SettingGroupDivider(), InkWell( customBorder: const RoundedRectangleBorder( borderRadius: BorderRadius.only(