fix: fixed analyzer issues and merge conflicts

This commit is contained in:
Username1548
2025-07-02 19:01:37 +07:00
parent d42604dc87
commit e80b660210
85 changed files with 276 additions and 272 deletions

View File

@@ -86,7 +86,7 @@ class _SettingsScreenState extends State<SettingsScreen> {
);
}
_additionalInfo(SettingsStateLoaded state) {
Column _additionalInfo(SettingsStateLoaded state) {
return Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
@@ -189,7 +189,7 @@ class _SettingsScreenState extends State<SettingsScreen> {
);
}
_notifications(SettingsStateLoaded state) {
Column _notifications(SettingsStateLoaded state) {
return Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
@@ -323,7 +323,7 @@ class _SettingsScreenState extends State<SettingsScreen> {
);
}
_aboutEatvio(SettingsStateLoaded state) {
Column _aboutEatvio(SettingsStateLoaded state) {
return Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
@@ -351,7 +351,7 @@ class _SettingsScreenState extends State<SettingsScreen> {
);
}
_becomeConsultantButton(SettingsStateLoaded state) {
SingleChildRenderObjectWidget _becomeConsultantButton(SettingsStateLoaded state) {
if (state.consultationRequestModel == null) {
return Padding(
padding: const EdgeInsets.symmetric(horizontal: 16) + const EdgeInsets.only(bottom: 8),
@@ -432,7 +432,7 @@ class _SettingsScreenState extends State<SettingsScreen> {
return const SizedBox.shrink();
}
_deleteAccountButton(SettingsStateLoaded state) {
Padding _deleteAccountButton(SettingsStateLoaded state) {
return Padding(
padding: const EdgeInsets.symmetric(horizontal: 16),
child: InkWell(
@@ -460,7 +460,7 @@ class _SettingsScreenState extends State<SettingsScreen> {
);
}
_tile({
ListTile _tile({
required String title,
required Function() onTap,
Widget? trailing,
@@ -486,7 +486,7 @@ class _SettingsScreenState extends State<SettingsScreen> {
);
}
_divider(BuildContext context) {
Center _divider(BuildContext context) {
return Center(
child: Container(
height: 0.4,