Yimaru/Yimaru-Mobile
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'release/0.1.23'

Browse Source 
-fix: Apply UAT comments
This commit is contained in:
BisratHailu 2026-05-26 16:57:29 +03:00
commit 45602d0da7
11 changed files with 65 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/ui/views/account_privacy/account_privacy_view.dart
View File

@ -27,9 +27,16 @@ class AccountPrivacyView extends StackedView<AccountPrivacyViewModel> {
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));

7
lib/ui/views/call_support/call_support_view.dart
View File

@ -28,9 +28,14 @@ class CallSupportView extends StackedView<CallSupportViewModel> {
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));

8
lib/ui/views/privacy_policy/privacy_policy_view.dart
View File

@ -98,7 +98,13 @@ class PrivacyPolicyView extends StackedView<PrivacyPolicyViewModel> {
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) =>

8
lib/ui/views/profile/profile_view.dart
View File

@ -52,7 +52,13 @@ class ProfileView extends StackedView<ProfileViewModel> {
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(

9
lib/ui/views/profile_detail/profile_detail_view.dart
View File

@ -113,9 +113,16 @@ class ProfileDetailView extends StackedView<ProfileDetailViewModel>
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}) =>

8
lib/ui/views/support/support_view.dart
View File

@ -25,7 +25,13 @@ class SupportView extends StackedView<SupportViewModel> {
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) =>

9
lib/ui/views/telegram_support/telegram_support_view.dart
View File

@ -29,7 +29,14 @@ class TelegramSupportView extends StackedView<TelegramSupportViewModel> {
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) =>

8
lib/ui/views/terms_and_conditions/terms_and_conditions_view.dart
View File

@ -28,7 +28,13 @@ class TermsAndConditionsView extends StackedView<TermsAndConditionsViewModel> {
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) =>

10
lib/ui/widgets/learn_module_tile.dart
View File

@ -51,7 +51,7 @@ class LearnModuleTile extends ViewModelWidget<LearnModuleViewModel> {
Stack(
children: [
_buildExpansionTile(context: context, viewModel: viewModel),
// _buildContainerShaderState()
_buildContainerShaderState()
],
);
@ -70,14 +70,14 @@ class LearnModuleTile extends ViewModelWidget<LearnModuleViewModel> {
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),
);

2
pubspec.yaml
View File

@ -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.