From 3b76e5fafa669aab01b811e55890fbdfbebb57b6 Mon Sep 17 00:00:00 2001 From: BisratHailu Date: Tue, 26 May 2026 16:56:16 +0300 Subject: [PATCH 1/2] fix: Apply UAT comments --- lib/ui/views/account_privacy/account_privacy_view.dart | 9 ++++++++- lib/ui/views/call_support/call_support_view.dart | 7 ++++++- lib/ui/views/privacy_policy/privacy_policy_view.dart | 8 +++++++- lib/ui/views/profile/profile_view.dart | 8 +++++++- lib/ui/views/profile_detail/profile_detail_view.dart | 9 ++++++++- lib/ui/views/support/support_view.dart | 8 +++++++- .../views/telegram_support/telegram_support_view.dart | 9 ++++++++- .../terms_and_conditions_view.dart | 8 +++++++- lib/ui/widgets/learn_lesson_tile.dart | 2 +- lib/ui/widgets/learn_module_tile.dart | 10 +++++----- 10 files changed, 64 insertions(+), 14 deletions(-) diff --git a/lib/ui/views/account_privacy/account_privacy_view.dart b/lib/ui/views/account_privacy/account_privacy_view.dart index b04d213..bc23adb 100644 --- a/lib/ui/views/account_privacy/account_privacy_view.dart +++ b/lib/ui/views/account_privacy/account_privacy_view.dart @@ -27,9 +27,16 @@ class AccountPrivacyView extends StackedView { Widget _buildScaffoldWrapper(AccountPrivacyViewModel viewModel) => Scaffold( backgroundColor: kcBackgroundColor, - body: _buildScaffold(viewModel), + body: _buildScaffoldContainer(viewModel), ); + + Widget _buildScaffoldContainer( AccountPrivacyViewModel viewModel) => Container( + decoration: bgDecoration, + child: _buildScaffold( viewModel), + ); + + Widget _buildScaffold(AccountPrivacyViewModel viewModel) => SafeArea(child: _buildBodyWrapper(viewModel)); diff --git a/lib/ui/views/call_support/call_support_view.dart b/lib/ui/views/call_support/call_support_view.dart index b47b545..1b60927 100644 --- a/lib/ui/views/call_support/call_support_view.dart +++ b/lib/ui/views/call_support/call_support_view.dart @@ -28,9 +28,14 @@ class CallSupportView extends StackedView { Widget _buildScaffoldWrapper(CallSupportViewModel viewModel) => Scaffold( backgroundColor: kcBackgroundColor, - body: _buildScaffold(viewModel), + body: _buildScaffoldContainer(viewModel), ); + Widget _buildScaffoldContainer(CallSupportViewModel viewModel) => + Container( + decoration: bgDecoration, + child: _buildScaffold(viewModel), + ); Widget _buildScaffold(CallSupportViewModel viewModel) => SafeArea(child: _buildBodyWrapper(viewModel)); diff --git a/lib/ui/views/privacy_policy/privacy_policy_view.dart b/lib/ui/views/privacy_policy/privacy_policy_view.dart index c417f81..a52dbcb 100644 --- a/lib/ui/views/privacy_policy/privacy_policy_view.dart +++ b/lib/ui/views/privacy_policy/privacy_policy_view.dart @@ -98,7 +98,13 @@ class PrivacyPolicyView extends StackedView { Widget _buildScaffoldWrapper(PrivacyPolicyViewModel viewModel) => Scaffold( backgroundColor: kcBackgroundColor, - body: _buildScaffold(viewModel), + body: _buildScaffoldContainer(viewModel), + ); + + Widget _buildScaffoldContainer(PrivacyPolicyViewModel viewModel) => + Container( + decoration: bgDecoration, + child: _buildScaffold(viewModel), ); Widget _buildScaffold(PrivacyPolicyViewModel viewModel) => diff --git a/lib/ui/views/profile/profile_view.dart b/lib/ui/views/profile/profile_view.dart index 4e28737..9349bee 100644 --- a/lib/ui/views/profile/profile_view.dart +++ b/lib/ui/views/profile/profile_view.dart @@ -52,9 +52,15 @@ class ProfileView extends StackedView { required ProfileViewModel viewModel}) => Scaffold( backgroundColor: kcBackgroundColor, - body: _buildScaffold(context: context, viewModel: viewModel), + body: _buildScaffoldContainer(context: context, viewModel: viewModel), ); + Widget _buildScaffoldContainer( {required BuildContext context, + required ProfileViewModel viewModel}) => Container( + decoration: bgDecoration, + child: _buildScaffold(context: context, viewModel: viewModel), + ); + Widget _buildScaffold( {required BuildContext context, required ProfileViewModel viewModel}) => diff --git a/lib/ui/views/profile_detail/profile_detail_view.dart b/lib/ui/views/profile_detail/profile_detail_view.dart index 396251e..fd558e7 100644 --- a/lib/ui/views/profile_detail/profile_detail_view.dart +++ b/lib/ui/views/profile_detail/profile_detail_view.dart @@ -113,9 +113,16 @@ class ProfileDetailView extends StackedView required ProfileDetailViewModel viewModel}) => Scaffold( backgroundColor: kcBackgroundColor, - body: _buildScaffoldStack(context: context, viewModel: viewModel), + body: _buildScaffoldContainer(context: context, viewModel: viewModel), ); + Widget _buildScaffoldContainer( {required BuildContext context, + required ProfileDetailViewModel viewModel}) => Container( + decoration: bgDecoration, + child: _buildScaffoldStack(context: context, viewModel: viewModel), + ); + + Widget _buildScaffoldStack( {required BuildContext context, required ProfileDetailViewModel viewModel}) => diff --git a/lib/ui/views/support/support_view.dart b/lib/ui/views/support/support_view.dart index 2b6f59b..189a856 100644 --- a/lib/ui/views/support/support_view.dart +++ b/lib/ui/views/support/support_view.dart @@ -25,7 +25,13 @@ class SupportView extends StackedView { Widget _buildScaffoldWrapper(SupportViewModel viewModel) => Scaffold( backgroundColor: kcBackgroundColor, - body: _buildScaffold(viewModel), + body: _buildScaffoldContainer(viewModel), + ); + + Widget _buildScaffoldContainer(SupportViewModel viewModel) => + Container( + decoration: bgDecoration, + child: _buildScaffold(viewModel), ); Widget _buildScaffold(SupportViewModel viewModel) => diff --git a/lib/ui/views/telegram_support/telegram_support_view.dart b/lib/ui/views/telegram_support/telegram_support_view.dart index 48dad38..96144d2 100644 --- a/lib/ui/views/telegram_support/telegram_support_view.dart +++ b/lib/ui/views/telegram_support/telegram_support_view.dart @@ -29,7 +29,14 @@ class TelegramSupportView extends StackedView { Widget _buildScaffoldWrapper(TelegramSupportViewModel viewModel) => Scaffold( backgroundColor: kcBackgroundColor, - body: _buildScaffold(viewModel), + body: _buildScaffoldContainer(viewModel), + ); + + + Widget _buildScaffoldContainer(TelegramSupportViewModel viewModel) => + Container( + decoration: bgDecoration, + child: _buildScaffold(viewModel), ); Widget _buildScaffold(TelegramSupportViewModel viewModel) => diff --git a/lib/ui/views/terms_and_conditions/terms_and_conditions_view.dart b/lib/ui/views/terms_and_conditions/terms_and_conditions_view.dart index 16bc250..0a68f2a 100644 --- a/lib/ui/views/terms_and_conditions/terms_and_conditions_view.dart +++ b/lib/ui/views/terms_and_conditions/terms_and_conditions_view.dart @@ -28,7 +28,13 @@ class TermsAndConditionsView extends StackedView { Widget _buildScaffoldWrapper(TermsAndConditionsViewModel viewModel) => Scaffold( backgroundColor: kcBackgroundColor, - body: _buildScaffold(viewModel), + body: _buildScaffoldContainer(viewModel), + ); + + Widget _buildScaffoldContainer(TermsAndConditionsViewModel viewModel) => + Container( + decoration: bgDecoration, + child: _buildScaffold(viewModel), ); Widget _buildScaffold(TermsAndConditionsViewModel viewModel) => diff --git a/lib/ui/widgets/learn_lesson_tile.dart b/lib/ui/widgets/learn_lesson_tile.dart index 8c74cc4..b246698 100644 --- a/lib/ui/widgets/learn_lesson_tile.dart +++ b/lib/ui/widgets/learn_lesson_tile.dart @@ -70,7 +70,7 @@ class LearnLessonTile extends ViewModelWidget { ? kcGreen.withOpacity(0.1) : kcPrimaryColor.withOpacity(0.1), childrenPadding: const EdgeInsets.fromLTRB(15, 0, 15, 15), - initiallyExpanded: (lesson.access?.isAccessible ?? false) && + initiallyExpanded: (lesson.access?.isAccessible ?? false) && !(lesson.access?.isCompleted ?? false), collapsedBackgroundColor: (lesson.access?.isCompleted ?? false) ? kcGreen.withOpacity(0.1) diff --git a/lib/ui/widgets/learn_module_tile.dart b/lib/ui/widgets/learn_module_tile.dart index 579fb2f..9a629b7 100644 --- a/lib/ui/widgets/learn_module_tile.dart +++ b/lib/ui/widgets/learn_module_tile.dart @@ -51,7 +51,7 @@ class LearnModuleTile extends ViewModelWidget { Stack( children: [ _buildExpansionTile(context: context, viewModel: viewModel), - // _buildContainerShaderState() + _buildContainerShaderState() ], ); @@ -70,14 +70,14 @@ class LearnModuleTile extends ViewModelWidget { shape: Border.all(color: kcTransparent), expandedAlignment: Alignment.centerLeft, collapsedBackgroundColor: kcBackgroundColor, - //enabled: (module.access?.isAccessible ?? false), + enabled: (module.access?.isAccessible ?? false), controlAffinity: ListTileControlAffinity.trailing, expandedCrossAxisAlignment: CrossAxisAlignment.start, tilePadding: const EdgeInsets.symmetric(horizontal: 15), childrenPadding: const EdgeInsets.fromLTRB(70, 0, 15, 15), - //initiallyExpanded: (module.access?.isAccessible ?? false), - // showTrailingIcon: - // !(module.access?.isAccessible ?? false) ? true : false, + initiallyExpanded: (module.access?.isAccessible ?? false), + showTrailingIcon: + !(module.access?.isAccessible ?? false) ? true : false, children: _buildExpansionTileChildren(context: context, viewModel: viewModel), ); From 25ca644626ad1e783b2e4187a91fde7d0235de6a Mon Sep 17 00:00:00 2001 From: BisratHailu Date: Tue, 26 May 2026 16:56:44 +0300 Subject: [PATCH 2/2] fix: Apply UAT comments --- pubspec.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pubspec.yaml b/pubspec.yaml index 8526672..7a5088c 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,5 +1,5 @@ name: yimaru_app -version: 0.1.22+24 +version: 0.1.23+25 publish_to: 'none' description: A new Flutter project.