eduvia/workavia-mail-front
11
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

TF-1632 Fix elements are cut in each other in language and region

Browse Source 
(cherry picked from commit 514e513b46981e360d70781a71930d53e5a16e0f)
This commit is contained in:
dab246
2023-03-24 10:59:20 +07:00
committed by Dat Vu
parent fed514e40b
commit 13fe2300dc
1 changed files with 47 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/features/manage_account/presentation/menu/settings/settings_view.dart
+47 -42
View File
@@ -121,53 +121,58 @@ class SettingsView extends GetWidget<SettingsController> {
} }
Widget _buildSettingLevel1AppBar(BuildContext context) { Widget _buildSettingLevel1AppBar(BuildContext context) {
return Stack(children: [ return Row(children: [
Align( Material(
alignment: Alignment.centerLeft, color: Colors.transparent,
child: Material( child: InkWell(
color: Colors.transparent, onTap: controller.backToUniversalSettings,
child: InkWell( customBorder: const RoundedRectangleBorder(
onTap: controller.backToUniversalSettings, borderRadius: BorderRadius.all(Radius.circular(15))),
customBorder: const RoundedRectangleBorder( child: Tooltip(
borderRadius: BorderRadius.all(Radius.circular(15))), message: AppLocalizations.of(context).back,
child: Tooltip( child: Container(
message: AppLocalizations.of(context).back, color: Colors.transparent,
child: Container( height: 40,
color: Colors.transparent, padding: const EdgeInsets.symmetric(horizontal: 4),
height: 40, child: Row(mainAxisSize: MainAxisSize.min, children: [
padding: const EdgeInsets.symmetric(horizontal: 8), SvgPicture.asset(
child: Row(mainAxisSize: MainAxisSize.min, children: [ AppUtils.isDirectionRTL(context)
SvgPicture.asset( ? _imagePaths.icCollapseFolder
AppUtils.isDirectionRTL(context) ? _imagePaths.icCollapseFolder : _imagePaths.icBack, : _imagePaths.icBack,
colorFilter: AppColor.colorTextButton.asFilter(), colorFilter: AppColor.colorTextButton.asFilter(),
fit: BoxFit.fill), fit: BoxFit.fill),
Container( Container(
margin: EdgeInsets.only( margin: EdgeInsets.only(
left: AppUtils.isDirectionRTL(context) ? 0 : 8, left: AppUtils.isDirectionRTL(context) ? 0 : 4,
right: AppUtils.isDirectionRTL(context) ? 8 : 0, right: AppUtils.isDirectionRTL(context) ? 4 : 0,
),
constraints: const BoxConstraints(maxWidth: 100),
child: Text(
AppLocalizations.of(context).settings,
maxLines: 1,
overflow: CommonTextStyle.defaultTextOverFlow,
softWrap: CommonTextStyle.defaultSoftWrap,
style: const TextStyle(fontSize: 17, color: AppColor.colorTextButton)),
), ),
]), constraints: const BoxConstraints(maxWidth: 80),
), child: Text(
AppLocalizations.of(context).settings,
maxLines: 1,
overflow: CommonTextStyle.defaultTextOverFlow,
softWrap: CommonTextStyle.defaultSoftWrap,
style: const TextStyle(fontSize: 17, color: AppColor.colorTextButton)
)
),
]),
), ),
), ),
), ),
), ),
Align( Expanded(child: Text(
alignment: Alignment.center, controller.manageAccountDashboardController.accountMenuItemSelected.value.getName(context),
child: Text( maxLines: 1,
controller.manageAccountDashboardController.accountMenuItemSelected.value.getName(context), textAlign: TextAlign.center,
maxLines: 1, overflow: CommonTextStyle.defaultTextOverFlow,
overflow: CommonTextStyle.defaultTextOverFlow, softWrap: CommonTextStyle.defaultSoftWrap,
softWrap: CommonTextStyle.defaultSoftWrap, style: const TextStyle(
style: const TextStyle(fontSize: 20, color: Colors.black, fontWeight: FontWeight.bold))) fontSize: 20,
color: Colors.black,
fontWeight: FontWeight.bold
)
)),
Container(constraints: const BoxConstraints(maxWidth: 80))
]); ]);
} }