Compare commits

..

No commits in common. "45602d0da7be93a43d33e9b323264c3c54db42ca" and "f71220fa801b602067694eceae256f8ad16d0f97" have entirely different histories.

11 changed files with 15 additions and 65 deletions

View File

@ -27,16 +27,9 @@ class AccountPrivacyView extends StackedView<AccountPrivacyViewModel> {
Widget _buildScaffoldWrapper(AccountPrivacyViewModel viewModel) => Scaffold(
backgroundColor: kcBackgroundColor,
body: _buildScaffoldContainer(viewModel),
body: _buildScaffold(viewModel),
);
Widget _buildScaffoldContainer( AccountPrivacyViewModel viewModel) => Container(
decoration: bgDecoration,
child: _buildScaffold( viewModel),
);
Widget _buildScaffold(AccountPrivacyViewModel viewModel) =>
SafeArea(child: _buildBodyWrapper(viewModel));

View File

@ -28,14 +28,9 @@ class CallSupportView extends StackedView<CallSupportViewModel> {
Widget _buildScaffoldWrapper(CallSupportViewModel viewModel) => Scaffold(
backgroundColor: kcBackgroundColor,
body: _buildScaffoldContainer(viewModel),
body: _buildScaffold(viewModel),
);
Widget _buildScaffoldContainer(CallSupportViewModel viewModel) =>
Container(
decoration: bgDecoration,
child: _buildScaffold(viewModel),
);
Widget _buildScaffold(CallSupportViewModel viewModel) =>
SafeArea(child: _buildBodyWrapper(viewModel));

View File

@ -98,13 +98,7 @@ class PrivacyPolicyView extends StackedView<PrivacyPolicyViewModel> {
Widget _buildScaffoldWrapper(PrivacyPolicyViewModel viewModel) => Scaffold(
backgroundColor: kcBackgroundColor,
body: _buildScaffoldContainer(viewModel),
);
Widget _buildScaffoldContainer(PrivacyPolicyViewModel viewModel) =>
Container(
decoration: bgDecoration,
child: _buildScaffold(viewModel),
body: _buildScaffold(viewModel),
);
Widget _buildScaffold(PrivacyPolicyViewModel viewModel) =>

View File

@ -52,15 +52,9 @@ class ProfileView extends StackedView<ProfileViewModel> {
required ProfileViewModel viewModel}) =>
Scaffold(
backgroundColor: kcBackgroundColor,
body: _buildScaffoldContainer(context: context, viewModel: viewModel),
body: _buildScaffold(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}) =>

View File

@ -113,16 +113,9 @@ class ProfileDetailView extends StackedView<ProfileDetailViewModel>
required ProfileDetailViewModel viewModel}) =>
Scaffold(
backgroundColor: kcBackgroundColor,
body: _buildScaffoldContainer(context: context, viewModel: viewModel),
body: _buildScaffoldStack(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}) =>

View File

@ -25,13 +25,7 @@ class SupportView extends StackedView<SupportViewModel> {
Widget _buildScaffoldWrapper(SupportViewModel viewModel) => Scaffold(
backgroundColor: kcBackgroundColor,
body: _buildScaffoldContainer(viewModel),
);
Widget _buildScaffoldContainer(SupportViewModel viewModel) =>
Container(
decoration: bgDecoration,
child: _buildScaffold(viewModel),
body: _buildScaffold(viewModel),
);
Widget _buildScaffold(SupportViewModel viewModel) =>

View File

@ -29,14 +29,7 @@ class TelegramSupportView extends StackedView<TelegramSupportViewModel> {
Widget _buildScaffoldWrapper(TelegramSupportViewModel viewModel) => Scaffold(
backgroundColor: kcBackgroundColor,
body: _buildScaffoldContainer(viewModel),
);
Widget _buildScaffoldContainer(TelegramSupportViewModel viewModel) =>
Container(
decoration: bgDecoration,
child: _buildScaffold(viewModel),
body: _buildScaffold(viewModel),
);
Widget _buildScaffold(TelegramSupportViewModel viewModel) =>

View File

@ -28,13 +28,7 @@ class TermsAndConditionsView extends StackedView<TermsAndConditionsViewModel> {
Widget _buildScaffoldWrapper(TermsAndConditionsViewModel viewModel) =>
Scaffold(
backgroundColor: kcBackgroundColor,
body: _buildScaffoldContainer(viewModel),
);
Widget _buildScaffoldContainer(TermsAndConditionsViewModel viewModel) =>
Container(
decoration: bgDecoration,
child: _buildScaffold(viewModel),
body: _buildScaffold(viewModel),
);
Widget _buildScaffold(TermsAndConditionsViewModel viewModel) =>

View File

@ -70,7 +70,7 @@ class LearnLessonTile extends ViewModelWidget<LearnLessonViewModel> {
? 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)

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),
);

View File

@ -1,5 +1,5 @@
name: yimaru_app
version: 0.1.23+25
version: 0.1.22+24
publish_to: 'none'
description: A new Flutter project.