diff --git a/assets/translations/am.json b/assets/translations/am.json index 7c1f645..119a1c3 100644 --- a/assets/translations/am.json +++ b/assets/translations/am.json @@ -22,7 +22,7 @@ "confirm_password": "የይለፍ ቃል ያረጋግጡ", "eight_character_minimum": "ቢያንስ 8 ፊደላት", "password_match": "የይለፍ ቃሉ ተመሳስሏል", - "sign_up_agreement": "‘ይመዝገቡ’ የሚለውን ሲጫኑ በ‘አገልግሎት ውሎች’ እና ‘በግላዊነት ፖሊሲ’ ይስማማሉ።" , + "sign_up_agreement": "‘ይመዝገቡ’ የሚለውን ሲጫኑ በ‘አገልግሎት ውሎች’ እና ‘በግላዊነት ፖሊሲ’ ይስማማሉ።", "terms_of_services": "የአገልግሎት ውሎች", "and": "እና", "privacy_policy": "የግላዊነት ፖሊሲ", @@ -33,9 +33,9 @@ "code_sent_to_email": "ኮዱ ወደ ኢሜል ተልኳል", "resend_code_in": "ኮዱን እንደገና ለመላክ የቀረው ጊዜ", "reset_password": " የይለፍ ቃልን ይቀይሩ", - "enter_email_reset_code": "ኢሜይልዎን ያስገቡ። የይለፍ ቃል መለወጫ ኮድ እንልክልዎታለን።" , + "enter_email_reset_code": "ኢሜይልዎን ያስገቡ። የይለፍ ቃል መለወጫ ኮድ እንልክልዎታለን።", "please_wait": "እባክዎ ይጠብቁ", - "reset_code_sent": "የመቀየሪያ ኮድ በተሳካ ሁኔታ ተልኳል" , + "reset_code_sent": "የመቀየሪያ ኮድ በተሳካ ሁኔታ ተልኳል", "reset_code": " የመቀየሪያ ኮድ ", "new_password": "አዲስ የይለፍ ቃል", "logged_in_successfully": "በተሳካ ሁኔታ ገብተዋል", @@ -183,13 +183,10 @@ "welcome_abroad": "እንኳን ደህና መጣህ", "ready_to_explore": "የግል ትምህርቶችህን ለማሰስ ዝግጁ ነህ።", "finish": "አጠናቅቅ", - - "finish_all_practice": "ልምምዱን ለመውሰድ በትምህርቶቹ ውስጥ ያሉትን ሁሉንም ልምምዶች ያጠናቅቁ።" - - - - - - + "finish_all_practice_lesson": "ይህን ልምምድ ለመውሰድ የቀድሞውን የትምህርት ልምምድ ያጠናቅቁ", + "finish_all_practice_module": "የሞጁሉን ልምምድ ለመውሰድ የትምህርት ልምምዶችን ያጠናቅቁ", + "finish_all_practice_course": "የኮርሱን ልምምድ ለመውሰድ የሞጁል ልምምዶችን ያጠናቅቁ", + "finish_all_practice_previouse_module": "ይህን ልምምድ ለመውሰድ የቀድሞውን የሞጁል ልምምድ ያጠናቅቁ", + "finish_all_practice_previouse_course": "ይህን ለመውሰድ የቀድሞውን የኮርስ ልምምድ ያጠናቅቁ" } diff --git a/assets/translations/en.json b/assets/translations/en.json index 7ce626a..0ff6d30 100644 --- a/assets/translations/en.json +++ b/assets/translations/en.json @@ -183,5 +183,10 @@ "welcome_abroad": "Welcome aboard", "ready_to_explore": "You’re ready to explore your personalized lessons.", "finish": "Finish", - "finish_all_practice": "Finish all the practices in the lessons to take this practice" + "finish_all_practice_lesson": "Finish the previous lesson practice to take this practice", + "finish_all_practice_module": "Finish the lesson practices to take the Module Practice", + "finish_all_practice_course": "Finish the Module practices to take the Course practice", + "finish_all_practice_previouse_module": "Finish the previous Module practice to take this practice", + "finish_all_practice_previouse_course": "Finish the previous course practice to take this" + } diff --git a/lib/app/app.dart b/lib/app/app.dart index 1838082..b50252d 100644 --- a/lib/app/app.dart +++ b/lib/app/app.dart @@ -49,7 +49,6 @@ import 'package:yimaru_app/services/vimeo_service.dart'; import 'package:yimaru_app/services/url_launcher_service.dart'; import 'package:yimaru_app/services/phone_caller_service.dart'; import 'package:yimaru_app/ui/views/learn_subscription/learn_subscription_view.dart'; -import 'package:yimaru_app/ui/views/arif_pay/arif_pay_view.dart'; import 'package:yimaru_app/services/learn_service.dart'; import 'package:yimaru_app/ui/views/course_catalog/course_catalog_view.dart'; import 'package:yimaru_app/ui/views/course_unit/course_unit_view.dart'; @@ -58,6 +57,7 @@ import 'package:yimaru_app/ui/views/landing/landing_view.dart'; import 'package:yimaru_app/ui/views/course_module/course_module_view.dart'; import 'package:yimaru_app/services/onboarding_service.dart'; import 'package:yimaru_app/ui/views/learn_course/learn_course_view.dart'; +import 'package:yimaru_app/ui/views/payment/payment_view.dart'; // @stacked-import @StackedApp( @@ -91,12 +91,12 @@ import 'package:yimaru_app/ui/views/learn_course/learn_course_view.dart'; MaterialRoute(page: LearnProgramView), MaterialRoute(page: AssessmentView), MaterialRoute(page: LearnSubscriptionView), - MaterialRoute(page: ArifPayView), MaterialRoute(page: CourseCatalogView), MaterialRoute(page: CourseUnitView), MaterialRoute(page: LandingView), MaterialRoute(page: CourseModuleView), MaterialRoute(page: LearnCourseView), + MaterialRoute(page: PaymentView), // @stacked-route ], dependencies: [ diff --git a/lib/app/app.router.dart b/lib/app/app.router.dart index 90e8e84..7fcdcb3 100644 --- a/lib/app/app.router.dart +++ b/lib/app/app.router.dart @@ -9,7 +9,7 @@ import 'package:flutter/material.dart'; import 'package:flutter/material.dart' as _i37; import 'package:stacked/stacked.dart' as _i1; -import 'package:stacked_services/stacked_services.dart' as _i46; +import 'package:stacked_services/stacked_services.dart' as _i47; import 'package:yimaru_app/models/course.dart' as _i42; import 'package:yimaru_app/models/course_catalog.dart' as _i44; import 'package:yimaru_app/models/course_lesson.dart' as _i43; @@ -17,33 +17,33 @@ import 'package:yimaru_app/models/course_module.dart' as _i45; import 'package:yimaru_app/models/learn_course.dart' as _i38; import 'package:yimaru_app/models/learn_lesson.dart' as _i40; import 'package:yimaru_app/models/learn_module.dart' as _i39; +import 'package:yimaru_app/models/learn_subscription.dart' as _i46; import 'package:yimaru_app/ui/common/enmus.dart' as _i41; import 'package:yimaru_app/ui/views/account_privacy/account_privacy_view.dart' as _i9; -import 'package:yimaru_app/ui/views/arif_pay/arif_pay_view.dart' as _i31; import 'package:yimaru_app/ui/views/assessment/assessment_view.dart' as _i29; import 'package:yimaru_app/ui/views/call_support/call_support_view.dart' as _i12; import 'package:yimaru_app/ui/views/course/course_view.dart' as _i27; import 'package:yimaru_app/ui/views/course_catalog/course_catalog_view.dart' - as _i32; + as _i31; import 'package:yimaru_app/ui/views/course_lesson_detail/course_lesson_detail_view.dart' as _i25; import 'package:yimaru_app/ui/views/course_module/course_module_view.dart' - as _i35; + as _i34; import 'package:yimaru_app/ui/views/course_payment/course_payment_view.dart' as _i23; -import 'package:yimaru_app/ui/views/course_unit/course_unit_view.dart' as _i33; +import 'package:yimaru_app/ui/views/course_unit/course_unit_view.dart' as _i32; import 'package:yimaru_app/ui/views/downloads/downloads_view.dart' as _i7; import 'package:yimaru_app/ui/views/duolingo/duolingo_view.dart' as _i26; import 'package:yimaru_app/ui/views/failure/failure_view.dart' as _i24; import 'package:yimaru_app/ui/views/forget_password/forget_password_view.dart' as _i20; import 'package:yimaru_app/ui/views/home/home_view.dart' as _i2; -import 'package:yimaru_app/ui/views/landing/landing_view.dart' as _i34; +import 'package:yimaru_app/ui/views/landing/landing_view.dart' as _i33; import 'package:yimaru_app/ui/views/language/language_view.dart' as _i13; import 'package:yimaru_app/ui/views/learn_course/learn_course_view.dart' - as _i36; + as _i35; import 'package:yimaru_app/ui/views/learn_lesson/learn_lesson_view.dart' as _i19; import 'package:yimaru_app/ui/views/learn_lesson_detail/learn_lesson_detail_view.dart' @@ -58,6 +58,7 @@ import 'package:yimaru_app/ui/views/learn_subscription/learn_subscription_view.d as _i30; import 'package:yimaru_app/ui/views/login/login_view.dart' as _i17; import 'package:yimaru_app/ui/views/onboarding/onboarding_view.dart' as _i3; +import 'package:yimaru_app/ui/views/payment/payment_view.dart' as _i36; import 'package:yimaru_app/ui/views/privacy_policy/privacy_policy_view.dart' as _i14; import 'package:yimaru_app/ui/views/profile/profile_view.dart' as _i5; @@ -131,8 +132,6 @@ class Routes { static const learnSubscriptionView = '/learn-subscription-view'; - static const arifPayView = '/arif-pay-view'; - static const courseCatalogView = '/course-catalog-view'; static const courseUnitView = '/course-unit-view'; @@ -143,6 +142,8 @@ class Routes { static const learnCourseView = '/learn-course-view'; + static const paymentView = '/payment-view'; + static const all = { homeView, onboardingView, @@ -173,12 +174,12 @@ class Routes { learnProgramView, assessmentView, learnSubscriptionView, - arifPayView, courseCatalogView, courseUnitView, landingView, courseModuleView, learnCourseView, + paymentView, }; } @@ -300,29 +301,29 @@ class StackedRouter extends _i1.RouterBase { Routes.learnSubscriptionView, page: _i30.LearnSubscriptionView, ), - _i1.RouteDef( - Routes.arifPayView, - page: _i31.ArifPayView, - ), _i1.RouteDef( Routes.courseCatalogView, - page: _i32.CourseCatalogView, + page: _i31.CourseCatalogView, ), _i1.RouteDef( Routes.courseUnitView, - page: _i33.CourseUnitView, + page: _i32.CourseUnitView, ), _i1.RouteDef( Routes.landingView, - page: _i34.LandingView, + page: _i33.LandingView, ), _i1.RouteDef( Routes.courseModuleView, - page: _i35.CourseModuleView, + page: _i34.CourseModuleView, ), _i1.RouteDef( Routes.learnCourseView, - page: _i36.LearnCourseView, + page: _i35.LearnCourseView, + ), + _i1.RouteDef( + Routes.paymentView, + page: _i36.PaymentView, ), ]; @@ -590,52 +591,52 @@ class StackedRouter extends _i1.RouterBase { settings: data, ); }, - _i31.ArifPayView: (data) { - final args = data.getArgs(nullOk: false); - return _i37.MaterialPageRoute( - builder: (context) => - _i31.ArifPayView(key: args.key, phone: args.phone), - settings: data, - ); - }, - _i32.CourseCatalogView: (data) { + _i31.CourseCatalogView: (data) { final args = data.getArgs( orElse: () => const CourseCatalogViewArguments(), ); return _i37.MaterialPageRoute( - builder: (context) => _i32.CourseCatalogView(key: args.key), + builder: (context) => _i31.CourseCatalogView(key: args.key), settings: data, ); }, - _i33.CourseUnitView: (data) { + _i32.CourseUnitView: (data) { final args = data.getArgs(nullOk: false); return _i37.MaterialPageRoute( builder: (context) => - _i33.CourseUnitView(key: args.key, catalog: args.catalog), + _i32.CourseUnitView(key: args.key, catalog: args.catalog), settings: data, ); }, - _i34.LandingView: (data) { + _i33.LandingView: (data) { final args = data.getArgs( orElse: () => const LandingViewArguments(), ); return _i37.MaterialPageRoute( - builder: (context) => _i34.LandingView(key: args.key), + builder: (context) => _i33.LandingView(key: args.key), settings: data, ); }, - _i35.CourseModuleView: (data) { + _i34.CourseModuleView: (data) { final args = data.getArgs(nullOk: false); return _i37.MaterialPageRoute( - builder: (context) => _i35.CourseModuleView( + builder: (context) => _i34.CourseModuleView( key: args.key, module: args.module, catalog: args.catalog), settings: data, ); }, - _i36.LearnCourseView: (data) { + _i35.LearnCourseView: (data) { final args = data.getArgs(nullOk: false); return _i37.MaterialPageRoute( - builder: (context) => _i36.LearnCourseView(key: args.key, id: args.id), + builder: (context) => _i35.LearnCourseView(key: args.key, id: args.id), + settings: data, + ); + }, + _i36.PaymentView: (data) { + final args = data.getArgs(nullOk: false); + return _i37.MaterialPageRoute( + builder: (context) => _i36.PaymentView( + key: args.key, phone: args.phone, subscription: args.subscription), settings: data, ); }, @@ -1378,33 +1379,6 @@ class LearnSubscriptionViewArguments { } } -class ArifPayViewArguments { - const ArifPayViewArguments({ - this.key, - required this.phone, - }); - - final _i37.Key? key; - - final String phone; - - @override - String toString() { - return '{"key": "$key", "phone": "$phone"}'; - } - - @override - bool operator ==(covariant ArifPayViewArguments other) { - if (identical(this, other)) return true; - return other.key == key && other.phone == phone; - } - - @override - int get hashCode { - return key.hashCode ^ phone.hashCode; - } -} - class CourseCatalogViewArguments { const CourseCatalogViewArguments({this.key}); @@ -1535,7 +1509,39 @@ class LearnCourseViewArguments { } } -extension NavigatorStateExtension on _i46.NavigationService { +class PaymentViewArguments { + const PaymentViewArguments({ + this.key, + required this.phone, + required this.subscription, + }); + + final _i37.Key? key; + + final String phone; + + final _i46.LearnSubscription subscription; + + @override + String toString() { + return '{"key": "$key", "phone": "$phone", "subscription": "$subscription"}'; + } + + @override + bool operator ==(covariant PaymentViewArguments other) { + if (identical(this, other)) return true; + return other.key == key && + other.phone == phone && + other.subscription == subscription; + } + + @override + int get hashCode { + return key.hashCode ^ phone.hashCode ^ subscription.hashCode; + } +} + +extension NavigatorStateExtension on _i47.NavigationService { Future navigateToHomeView({ _i37.Key? key, int? routerId, @@ -2030,23 +2036,6 @@ extension NavigatorStateExtension on _i46.NavigationService { transition: transition); } - Future navigateToArifPayView({ - _i37.Key? key, - required String phone, - int? routerId, - bool preventDuplicates = true, - Map? parameters, - Widget Function(BuildContext, Animation, Animation, Widget)? - transition, - }) async { - return navigateTo(Routes.arifPayView, - arguments: ArifPayViewArguments(key: key, phone: phone), - id: routerId, - preventDuplicates: preventDuplicates, - parameters: parameters, - transition: transition); - } - Future navigateToCourseCatalogView({ _i37.Key? key, int? routerId, @@ -2132,6 +2121,25 @@ extension NavigatorStateExtension on _i46.NavigationService { transition: transition); } + Future navigateToPaymentView({ + _i37.Key? key, + required String phone, + required _i46.LearnSubscription subscription, + int? routerId, + bool preventDuplicates = true, + Map? parameters, + Widget Function(BuildContext, Animation, Animation, Widget)? + transition, + }) async { + return navigateTo(Routes.paymentView, + arguments: PaymentViewArguments( + key: key, phone: phone, subscription: subscription), + id: routerId, + preventDuplicates: preventDuplicates, + parameters: parameters, + transition: transition); + } + Future replaceWithHomeView({ _i37.Key? key, int? routerId, @@ -2626,23 +2634,6 @@ extension NavigatorStateExtension on _i46.NavigationService { transition: transition); } - Future replaceWithArifPayView({ - _i37.Key? key, - required String phone, - int? routerId, - bool preventDuplicates = true, - Map? parameters, - Widget Function(BuildContext, Animation, Animation, Widget)? - transition, - }) async { - return replaceWith(Routes.arifPayView, - arguments: ArifPayViewArguments(key: key, phone: phone), - id: routerId, - preventDuplicates: preventDuplicates, - parameters: parameters, - transition: transition); - } - Future replaceWithCourseCatalogView({ _i37.Key? key, int? routerId, @@ -2727,4 +2718,23 @@ extension NavigatorStateExtension on _i46.NavigationService { parameters: parameters, transition: transition); } + + Future replaceWithPaymentView({ + _i37.Key? key, + required String phone, + required _i46.LearnSubscription subscription, + int? routerId, + bool preventDuplicates = true, + Map? parameters, + Widget Function(BuildContext, Animation, Animation, Widget)? + transition, + }) async { + return replaceWith(Routes.paymentView, + arguments: PaymentViewArguments( + key: key, phone: phone, subscription: subscription), + id: routerId, + preventDuplicates: preventDuplicates, + parameters: parameters, + transition: transition); + } } diff --git a/lib/ui/common/app_constants.dart b/lib/ui/common/app_constants.dart index d376bd3..d03bd02 100644 --- a/lib/ui/common/app_constants.dart +++ b/lib/ui/common/app_constants.dart @@ -122,7 +122,7 @@ String kTelegramSupport = '@yimaruacademy2026'; String kTelegramSupportLink = 'https://t.me/yimaruacademy2026'; -String kErrorUrl = 'https://yimaru.net/api/v1/payments/arifpay/error'; +String kErrorUrl = 'https://yimaru.net/api/v1/payments/chapa/error'; String kSuccessUrl = - 'https://api.yimaruacademy.com/api/v1/payments/arifpay/success'; + 'https://api.yimaruacademy.com/api/v1/payments/chapa/success'; diff --git a/lib/ui/common/enmus.dart b/lib/ui/common/enmus.dart index 7eb039a..0edfb44 100644 --- a/lib/ui/common/enmus.dart +++ b/lib/ui/common/enmus.dart @@ -25,6 +25,9 @@ enum ProgressStatuses { pending, started, completed } // Duolingo types enum DuolingoAssessments { speaking, reading, writing, listening } +// Practice reason +enum PracticeReason { course, module, lesson, previousModule, previousCourse } + // State object enum StateObjects { none, diff --git a/lib/ui/common/translations/codegen_loader.g.dart b/lib/ui/common/translations/codegen_loader.g.dart index 1c12ca5..a1254ed 100644 --- a/lib/ui/common/translations/codegen_loader.g.dart +++ b/lib/ui/common/translations/codegen_loader.g.dart @@ -202,7 +202,12 @@ class CodegenLoader extends AssetLoader { "welcome_abroad": "እንኳን ደህና መጣህ", "ready_to_explore": "የግል ትምህርቶችህን ለማሰስ ዝግጁ ነህ።", "finish": "አጠናቅቅ", - "finish_all_practice": "ልምምዱን ለመውሰድ በትምህርቶቹ ውስጥ ያሉትን ሁሉንም ልምምዶች ያጠናቅቁ።" + "finish_all_practice_lesson": "ይህን ልምምድ ለመውሰድ የቀድሞውን የትምህርት ልምምድ ያጠናቅቁ", + "finish_all_practice_module": "የሞጁሉን ልምምድ ለመውሰድ የትምህርት ልምምዶችን ያጠናቅቁ", + "finish_all_practice_course": "የኮርሱን ልምምድ ለመውሰድ የሞጁል ልምምዶችን ያጠናቅቁ", + "finish_all_practice_previouse_module": + "ይህን ልምምድ ለመውሰድ የቀድሞውን የሞጁል ልምምድ ያጠናቅቁ", + "finish_all_practice_previouse_course": "ይህን ለመውሰድ የቀድሞውን የኮርስ ልምምድ ያጠናቅቁ" }; static const Map _en = { "loading": "Loading", @@ -406,8 +411,16 @@ class CodegenLoader extends AssetLoader { "welcome_abroad": "Welcome aboard", "ready_to_explore": "You’re ready to explore your personalized lessons.", "finish": "Finish", - "finish_all_practice": - "Finish all the practices in the lessons to take this practice" + "finish_all_practice_lesson": + "Finish the previous lesson practice to take this practice", + "finish_all_practice_module": + "Finish the lesson practices to take the Module Practice", + "finish_all_practice_course": + "Finish the Module practices to take the Course practice", + "finish_all_practice_previouse_module": + "Finish the previous Module practice to take this practice", + "finish_all_practice_previouse_course": + "Finish the previous course practice to take this" }; static const Map> mapLocales = { "am": _am, diff --git a/lib/ui/common/translations/locale_keys.g.dart b/lib/ui/common/translations/locale_keys.g.dart index a3c563d..9db9a77 100644 --- a/lib/ui/common/translations/locale_keys.g.dart +++ b/lib/ui/common/translations/locale_keys.g.dart @@ -186,5 +186,11 @@ abstract class LocaleKeys { static const welcome_abroad = 'welcome_abroad'; static const ready_to_explore = 'ready_to_explore'; static const finish = 'finish'; - static const finish_all_practice = 'finish_all_practice'; + static const finish_all_practice_lesson = 'finish_all_practice_lesson'; + static const finish_all_practice_module = 'finish_all_practice_module'; + static const finish_all_practice_course = 'finish_all_practice_course'; + static const finish_all_practice_previouse_module = + 'finish_all_practice_previouse_module'; + static const finish_all_practice_previouse_course = + 'finish_all_practice_previouse_course'; } diff --git a/lib/ui/views/assessment/assessment_view.dart b/lib/ui/views/assessment/assessment_view.dart index d5210b8..ff9be72 100644 --- a/lib/ui/views/assessment/assessment_view.dart +++ b/lib/ui/views/assessment/assessment_view.dart @@ -52,9 +52,9 @@ class AssessmentView extends StackedView { ]; Widget _buildAssessmentIntroWrapper(AssessmentViewModel viewModel) => - viewModel.busy(StateObjects.assessments) || viewModel.assessments.isEmpty + viewModel.busy(StateObjects.assessments) ? _buildPageLoadingIndicator(viewModel) - : _buildAssessmentIntro(); + : _buildAssessmentIntro(viewModel); Widget _buildPageLoadingIndicator(AssessmentViewModel viewModel) => AssessmentLoadingScreen( @@ -64,7 +64,10 @@ class AssessmentView extends StackedView { onPop: viewModel.assessments.isEmpty ? viewModel.pop : null, ); - Widget _buildAssessmentIntro() => const AssessmentIntroScreen(); + Widget _buildAssessmentIntro(AssessmentViewModel viewModel) => + AssessmentIntroScreen( + hasAssessments: viewModel.assessments.isNotEmpty, + ); Widget _buildAssessment() => const AssessmentQuestionsScreen(); diff --git a/lib/ui/views/assessment/screens/assessment_intro_screen.dart b/lib/ui/views/assessment/screens/assessment_intro_screen.dart index 8315824..b4f1ab0 100644 --- a/lib/ui/views/assessment/screens/assessment_intro_screen.dart +++ b/lib/ui/views/assessment/screens/assessment_intro_screen.dart @@ -10,7 +10,9 @@ import 'package:yimaru_app/ui/widgets/large_app_bar.dart'; import '../assessment_viewmodel.dart'; class AssessmentIntroScreen extends ViewModelWidget { - const AssessmentIntroScreen({super.key}); + final bool hasAssessments; + + const AssessmentIntroScreen({super.key, required this.hasAssessments}); Future _next(AssessmentViewModel viewModel) async => viewModel.setFirstAssessment(); @@ -29,11 +31,8 @@ class AssessmentIntroScreen extends ViewModelWidget { children: _buildScaffoldChildren(viewModel), ); - List _buildScaffoldChildren(AssessmentViewModel viewModel) => [ - _buildAppBar(viewModel), - verticalSpaceMedium, - _buildExpandedBody(viewModel) - ]; + List _buildScaffoldChildren(AssessmentViewModel viewModel) => + [_buildAppBar(viewModel), _buildExpandedBody(viewModel)]; Widget _buildExpandedBody(AssessmentViewModel viewModel) => Expanded(child: _buildBodyWrapper(viewModel)); @@ -59,7 +58,7 @@ class AssessmentIntroScreen extends ViewModelWidget { ); List _buildUpperColumnChildren(AssessmentViewModel viewModel) => [ - verticalSpaceMedium, + verticalSpaceLarge, _buildTitle(), verticalSpaceSmall, _buildSubtitle(), @@ -91,7 +90,7 @@ class AssessmentIntroScreen extends ViewModelWidget { ); List _buildLowerColumnChildren(AssessmentViewModel viewModel) => [ - _buildContinueButton(viewModel), + if (hasAssessments) _buildContinueButton(viewModel), verticalSpaceSmall, _buildSkipButtonWrapper(viewModel) ]; diff --git a/lib/ui/views/assessment/screens/assessment_result_screen.dart b/lib/ui/views/assessment/screens/assessment_result_screen.dart index 51fa739..b12f32f 100644 --- a/lib/ui/views/assessment/screens/assessment_result_screen.dart +++ b/lib/ui/views/assessment/screens/assessment_result_screen.dart @@ -27,11 +27,8 @@ class AssessmentResultScreen extends ViewModelWidget { children: _buildScaffoldChildren(viewModel), ); - List _buildScaffoldChildren(AssessmentViewModel viewModel) => [ - _buildAppBar(viewModel), - verticalSpaceMedium, - _buildExpandedBody(viewModel) - ]; + List _buildScaffoldChildren(AssessmentViewModel viewModel) => + [_buildAppBar(viewModel), _buildExpandedBody(viewModel)]; Widget _buildAppBar(AssessmentViewModel viewModel) => LargeAppBar( showBackButton: true, diff --git a/lib/ui/views/assessment/screens/start_lesson_screen.dart b/lib/ui/views/assessment/screens/start_lesson_screen.dart index b43ba38..c5a4969 100644 --- a/lib/ui/views/assessment/screens/start_lesson_screen.dart +++ b/lib/ui/views/assessment/screens/start_lesson_screen.dart @@ -44,11 +44,8 @@ class StartLessonScreen extends ViewModelWidget { children: _buildScaffoldChildren(viewModel), ); - List _buildScaffoldChildren(AssessmentViewModel viewModel) => [ - _buildAppBar(viewModel), - verticalSpaceMedium, - _buildExpandedBody(viewModel) - ]; + List _buildScaffoldChildren(AssessmentViewModel viewModel) => + [_buildAppBar(viewModel), _buildExpandedBody(viewModel)]; Widget _buildAppBar(AssessmentViewModel viewModel) => LargeAppBar( showBackButton: true, diff --git a/lib/ui/views/forget_password/screens/request_reset_code_screen.dart b/lib/ui/views/forget_password/screens/request_reset_code_screen.dart index 936c0e9..d3bb1ae 100644 --- a/lib/ui/views/forget_password/screens/request_reset_code_screen.dart +++ b/lib/ui/views/forget_password/screens/request_reset_code_screen.dart @@ -88,7 +88,6 @@ class RequestCodeScreen extends ViewModelWidget { required ForgetPasswordViewModel viewModel}) => [ _buildAppBar(viewModel), - verticalSpaceMedium, _buildExpandedBody(context: context, viewModel: viewModel) ]; diff --git a/lib/ui/views/forget_password/screens/reset_password_screen.dart b/lib/ui/views/forget_password/screens/reset_password_screen.dart index 0ffcfaf..6ed75b7 100644 --- a/lib/ui/views/forget_password/screens/reset_password_screen.dart +++ b/lib/ui/views/forget_password/screens/reset_password_screen.dart @@ -86,11 +86,8 @@ class ResetPasswordScreen extends ViewModelWidget { children: _buildScaffoldChildren(viewModel), ); - List _buildScaffoldChildren(ForgetPasswordViewModel viewModel) => [ - _buildAppBar(viewModel), - verticalSpaceMedium, - _buildExpandedBody(viewModel) - ]; + List _buildScaffoldChildren(ForgetPasswordViewModel viewModel) => + [_buildAppBar(viewModel), _buildExpandedBody(viewModel)]; Widget _buildAppBar(ForgetPasswordViewModel viewModel) => LargeAppBar( showBackButton: true, diff --git a/lib/ui/views/learn_course/learn_course_view.dart b/lib/ui/views/learn_course/learn_course_view.dart index 4d97831..076dc27 100644 --- a/lib/ui/views/learn_course/learn_course_view.dart +++ b/lib/ui/views/learn_course/learn_course_view.dart @@ -24,17 +24,28 @@ class LearnCourseView extends StackedView { await viewModel.navigateToLearnPractice( id: course.id ?? 0, level: course.name ?? ''); } else { - await _showSheet(context: context, viewModel: viewModel); + if (course.access?.isAccessible ?? false) { + await _showSheet( + context: context, + viewModel: viewModel, + practice: PracticeReason.course); + } else { + await _showSheet( + context: context, + viewModel: viewModel, + practice: PracticeReason.previousCourse); + } } } Future _showSheet( {required BuildContext context, + required PracticeReason practice, required LearnCourseViewModel viewModel}) async => await showModalBottomSheet( context: context, backgroundColor: kcTransparent, - builder: (_) => _buildSheet(viewModel), + builder: (_) => _buildSheet(viewModel: viewModel, practice: practice), ); @override @@ -156,6 +167,11 @@ class LearnCourseView extends StackedView { onPracticeTap: onPracticeTap, ); - Widget _buildSheet(LearnCourseViewModel viewModel) => - FinishPracticeSheet(onTap: viewModel.pop); + Widget _buildSheet( + {required PracticeReason practice, + required LearnCourseViewModel viewModel}) => + FinishPracticeSheet( + practice: practice, + onTap: viewModel.pop, + ); } diff --git a/lib/ui/views/learn_lesson/learn_lesson_view.dart b/lib/ui/views/learn_lesson/learn_lesson_view.dart index 7307f3e..25d3c8f 100644 --- a/lib/ui/views/learn_lesson/learn_lesson_view.dart +++ b/lib/ui/views/learn_lesson/learn_lesson_view.dart @@ -26,20 +26,27 @@ class LearnLessonView extends StackedView { required LearnLesson lesson, required BuildContext context, required LearnLessonViewModel viewModel}) async { - if (lesson.access?.isAccessible ?? false) { + if (lesson.access?.isAccessible ?? false) { await viewModel.navigateToLearnPractice(lesson.id ?? 0); } else { await _showSheet(context: context, viewModel: viewModel); } - - /* if (index > 1) { +/* if (index > 1) { if (viewModel.user?.subscriptionStatus?.toLowerCase() == 'subscribed') { - await viewModel.navigateToLearnPractice(lesson.id ?? 0); + if (lesson.access?.isAccessible ?? false) { + await viewModel.navigateToLearnPractice(lesson.id ?? 0); + } else { + await _showSheet(context: context, viewModel: viewModel); + } } else { await viewModel.navigateToLearnSubscription(); } } else { - await viewModel.navigateToLearnPractice(lesson.id ?? 0); + if (lesson.access?.isAccessible ?? false) { + await viewModel.navigateToLearnPractice(lesson.id ?? 0); + } else { + await _showSheet(context: context, viewModel: viewModel); + } }*/ } @@ -162,7 +169,7 @@ class LearnLessonView extends StackedView { verticalSpaceLarge, _buildHeader(), verticalSpaceMedium, - _buildListViewBuilder(context: context,viewModel: viewModel), + _buildListViewBuilder(context: context, viewModel: viewModel), ]; Widget _buildTitle() => Text( @@ -197,24 +204,28 @@ class LearnLessonView extends StackedView { style: style18DG700, ); - Widget _buildListViewBuilder( {required BuildContext context, - required LearnLessonViewModel viewModel}) => + Widget _buildListViewBuilder( + {required BuildContext context, + required LearnLessonViewModel viewModel}) => viewModel.busy(StateObjects.learnLessons) ? _buildProgressIndicator() - : _buildListView(context: context,viewModel: viewModel); + : _buildListView(context: context, viewModel: viewModel); Widget _buildProgressIndicator() => const Center( child: CustomCircularProgressIndicator(color: kcPrimaryColor), ); - Widget _buildListView( {required BuildContext context, -required LearnLessonViewModel viewModel}) => ListView.builder( + Widget _buildListView( + {required BuildContext context, + required LearnLessonViewModel viewModel}) => + ListView.builder( shrinkWrap: true, itemCount: viewModel.lessons.length, physics: const NeverScrollableScrollPhysics(), itemBuilder: (context, index) => _buildTile( index: index, lesson: viewModel.lessons[index], + last: index == viewModel.lessons.length - 1, onPracticeTap: () async => await _onPractice( index: index, context: context, @@ -231,18 +242,22 @@ required LearnLessonViewModel viewModel}) => ListView.builder( ); Widget _buildTile({ + required bool last, required int index, required LearnLesson lesson, required GestureTapCallback? onLessonTap, required GestureTapCallback? onPracticeTap, }) => LearnLessonTile( + last: last, index: index, lesson: lesson, onLessonTap: onLessonTap, onPracticeTap: onPracticeTap, ); - Widget _buildSheet(LearnLessonViewModel viewModel) => - FinishPracticeSheet(onTap: viewModel.pop); + Widget _buildSheet(LearnLessonViewModel viewModel) => FinishPracticeSheet( + onTap: viewModel.pop, + practice: PracticeReason.lesson, + ); } diff --git a/lib/ui/views/learn_lesson/learn_lesson_viewmodel.dart b/lib/ui/views/learn_lesson/learn_lesson_viewmodel.dart index 326a1e4..8340801 100644 --- a/lib/ui/views/learn_lesson/learn_lesson_viewmodel.dart +++ b/lib/ui/views/learn_lesson/learn_lesson_viewmodel.dart @@ -59,14 +59,15 @@ class LearnLessonViewModel extends ReactiveViewModel { await _navigationService.navigateToLearnSubscriptionView(); Future navigateToLearnLessonDetail( - { - required int index, - required bool hasPractice, + {required int index, + required bool hasPractice, required LearnLesson lesson, required LearnModule module}) async => await _navigationService.navigateToLearnLessonDetailView( - index: index, - lesson: lesson, module: module, hasPractice: hasPractice); + index: index, + lesson: lesson, + module: module, + hasPractice: hasPractice); // Remote api call diff --git a/lib/ui/views/learn_lesson_detail/learn_lesson_detail_view.dart b/lib/ui/views/learn_lesson_detail/learn_lesson_detail_view.dart index 5f502de..f2708ae 100644 --- a/lib/ui/views/learn_lesson_detail/learn_lesson_detail_view.dart +++ b/lib/ui/views/learn_lesson_detail/learn_lesson_detail_view.dart @@ -31,15 +31,19 @@ class LearnLessonDetailView extends StackedView { Future _onPractice( {required LearnLesson lesson, required LearnLessonDetailViewModel viewModel}) async { - await viewModel.pause(); + await viewModel.pause(); await viewModel.navigateToLearnPractice(lesson.id ?? 0); - /*if (index > 1) { + +/* if (index > 1) { if (viewModel.user?.subscriptionStatus?.toLowerCase() == 'subscribed') { + await viewModel.pause(); await viewModel.navigateToLearnPractice(lesson.id ?? 0); } else { + await viewModel.pause(); await viewModel.navigateToLearnSubscription(); } } else { + await viewModel.pause(); await viewModel.navigateToLearnPractice(lesson.id ?? 0); }*/ } diff --git a/lib/ui/views/learn_module/learn_module_view.dart b/lib/ui/views/learn_module/learn_module_view.dart index e9a4e18..3a5d599 100644 --- a/lib/ui/views/learn_module/learn_module_view.dart +++ b/lib/ui/views/learn_module/learn_module_view.dart @@ -17,6 +17,7 @@ import 'learn_module_viewmodel.dart'; class LearnModuleView extends StackedView { final LearnCourse course; + const LearnModuleView({Key? key, required this.course}) : super(key: key); Future _onPractice( @@ -27,17 +28,31 @@ class LearnModuleView extends StackedView { await viewModel.navigateToLearnPractice( id: module.id ?? 0, module: module.name ?? ''); } else { - await _showSheet(context: context, viewModel: viewModel); + if (module.access?.isAccessible ?? false) { + print('Accessible'); + await _showSheet( + context: context, + viewModel: viewModel, + practice: PracticeReason.module); + } else { + print('Inaccessible'); + + await _showSheet( + context: context, + viewModel: viewModel, + practice: PracticeReason.previousModule); + } } } Future _showSheet( {required BuildContext context, + required PracticeReason practice, required LearnModuleViewModel viewModel}) async => await showModalBottomSheet( context: context, backgroundColor: kcTransparent, - builder: (_) => _buildSheet(viewModel), + builder: (_) => _buildSheet(viewModel: viewModel, practice: practice), ); @override @@ -201,6 +216,11 @@ class LearnModuleView extends StackedView { onModuleTap: onModuleTap, onPracticeTap: onPracticeTap); - Widget _buildSheet(LearnModuleViewModel viewModel) => - FinishPracticeSheet(onTap: viewModel.pop); + Widget _buildSheet( + {required PracticeReason practice, + required LearnModuleViewModel viewModel}) => + FinishPracticeSheet( + practice: practice, + onTap: viewModel.pop, + ); } diff --git a/lib/ui/views/learn_subscription/learn_subscription_viewmodel.dart b/lib/ui/views/learn_subscription/learn_subscription_viewmodel.dart index dbd6e96..a581729 100644 --- a/lib/ui/views/learn_subscription/learn_subscription_viewmodel.dart +++ b/lib/ui/views/learn_subscription/learn_subscription_viewmodel.dart @@ -31,6 +31,10 @@ class LearnSubscriptionViewModel extends FormViewModel { int get selectedIndex => _selectedIndex; + LearnSubscription? _selectedSubscription; + + LearnSubscription? get selectedSubscription => _selectedSubscription; + List _subscriptions = []; List get subscriptions => _subscriptions; @@ -40,6 +44,13 @@ class LearnSubscriptionViewModel extends FormViewModel { _focusPhoneNumber = true; rebuildUi(); } + //Learn subscriptions + + void setSelectedPricing(int index) { + _selectedIndex = index; + _selectedSubscription = _subscriptions[index]; + rebuildUi(); + } // In-app navigation @@ -60,16 +71,11 @@ class LearnSubscriptionViewModel extends FormViewModel { // Navigation void pop() => _navigationService.back(); - Future navigateToArifPay(String phone) async { + Future navigateToArifPay( + {required String phone, required LearnSubscription? subscription}) async { pop(); - await _navigationService.navigateToArifPayView(phone: phone); - } - - //Learn subscriptions - - void setSelectedPricing(int index) { - _selectedIndex = index; - rebuildUi(); + await _navigationService.navigateToPaymentView( + phone: phone, subscription: subscription ?? _subscriptions[0]); } // Remote api call diff --git a/lib/ui/views/learn_subscription/screens/learn_subscription_form_screen.dart b/lib/ui/views/learn_subscription/screens/learn_subscription_form_screen.dart index 3894f7f..af04586 100644 --- a/lib/ui/views/learn_subscription/screens/learn_subscription_form_screen.dart +++ b/lib/ui/views/learn_subscription/screens/learn_subscription_form_screen.dart @@ -178,8 +178,9 @@ class LearnSubscriptionFormScreen ? kcPrimaryColor : kcPrimaryColor.withOpacity(0.1), onTap: phoneNumberController.text.isNotEmpty - ? () async => - await viewModel.navigateToArifPay(phoneNumberController.text) + ? () async => await viewModel.navigateToArifPay( + phone: phoneNumberController.text, + subscription: viewModel.selectedSubscription) : null, ); diff --git a/lib/ui/views/onboarding/onboarding_view.dart b/lib/ui/views/onboarding/onboarding_view.dart index 4226d4c..436671a 100644 --- a/lib/ui/views/onboarding/onboarding_view.dart +++ b/lib/ui/views/onboarding/onboarding_view.dart @@ -8,8 +8,8 @@ import 'package:yimaru_app/ui/views/onboarding/screens/country_region_form_scree import 'package:yimaru_app/ui/views/onboarding/screens/educational_background_form_screen.dart'; import 'package:yimaru_app/ui/views/onboarding/screens/full_name_form_screen.dart'; import 'package:yimaru_app/ui/views/onboarding/screens/gender_form_screen.dart'; -import 'package:yimaru_app/ui/views/onboarding/screens/language_goal_form_screen.dart'; import 'package:yimaru_app/ui/views/onboarding/screens/learning_goal_form_screen.dart'; +import 'package:yimaru_app/ui/views/onboarding/screens/language_goal_form_screen.dart'; import 'package:yimaru_app/ui/views/onboarding/screens/occupation_form_screen.dart'; import 'package:yimaru_app/ui/views/onboarding/screens/topic_form_screen.dart'; @@ -129,9 +129,9 @@ class OnboardingView extends StackedView Widget _buildCountryRegionForm() => CountryRegionFormScreen(regionController: regionController); - Widget _buildLearningGoalForm() => const LearningGoalFormScreen(); + Widget _buildLearningGoalForm() => const LanguageGoalFormScreens(); - Widget _buildLanguageGoalForm() => const LanguageGoalFormScreen(); + Widget _buildLanguageGoalForm() => const LearningGoalFormScreen(); Widget _buildChallengeForm() => const ChallengeFormScreen(); diff --git a/lib/ui/views/onboarding/onboarding_viewmodel.dart b/lib/ui/views/onboarding/onboarding_viewmodel.dart index d57e5f4..ef06bb9 100644 --- a/lib/ui/views/onboarding/onboarding_viewmodel.dart +++ b/lib/ui/views/onboarding/onboarding_viewmodel.dart @@ -243,8 +243,7 @@ class OnboardingViewModel extends ReactiveViewModel bool isSelectedLearningGoal(FieldOption value) => _selectedLearningGoal == value; - // Learning reason - + // Language goal void setSelectedLanguageGoal(FieldOption value) { _selectedLanguageGoal = value; diff --git a/lib/ui/views/onboarding/screens/age_group_form_screen.dart b/lib/ui/views/onboarding/screens/age_group_form_screen.dart index 6a6e351..f7b25b1 100644 --- a/lib/ui/views/onboarding/screens/age_group_form_screen.dart +++ b/lib/ui/views/onboarding/screens/age_group_form_screen.dart @@ -41,11 +41,8 @@ class AgeGroupFormScreen extends ViewModelWidget { children: _buildScaffoldChildren(viewModel), ); - List _buildScaffoldChildren(OnboardingViewModel viewModel) => [ - _buildAppBar(viewModel), - verticalSpaceMedium, - _buildExpandedBody(viewModel) - ]; + List _buildScaffoldChildren(OnboardingViewModel viewModel) => + [_buildAppBar(viewModel), _buildExpandedBody(viewModel)]; Widget _buildExpandedBody(OnboardingViewModel viewModel) => Expanded(child: _buildColumnScroller(viewModel)); @@ -76,7 +73,7 @@ class AgeGroupFormScreen extends ViewModelWidget { ); List _buildUpperColumnChildren(OnboardingViewModel viewModel) => [ - verticalSpaceMedium, + verticalSpaceLarge, _buildTitle(), verticalSpaceSmall, _buildSubtitle(), diff --git a/lib/ui/views/onboarding/screens/challenge_form_screen.dart b/lib/ui/views/onboarding/screens/challenge_form_screen.dart index 0da8457..246c6d4 100644 --- a/lib/ui/views/onboarding/screens/challenge_form_screen.dart +++ b/lib/ui/views/onboarding/screens/challenge_form_screen.dart @@ -42,11 +42,8 @@ class ChallengeFormScreen extends ViewModelWidget { children: _buildScaffoldChildren(viewModel), ); - List _buildScaffoldChildren(OnboardingViewModel viewModel) => [ - _buildAppBar(viewModel), - verticalSpaceMedium, - _buildExpandedBody(viewModel) - ]; + List _buildScaffoldChildren(OnboardingViewModel viewModel) => + [_buildAppBar(viewModel), _buildExpandedBody(viewModel)]; Widget _buildExpandedBody(OnboardingViewModel viewModel) => Expanded(child: _buildBodyScroller(viewModel)); @@ -77,7 +74,7 @@ class ChallengeFormScreen extends ViewModelWidget { ); List _buildUpperColumnChildren(OnboardingViewModel viewModel) => [ - verticalSpaceMedium, + verticalSpaceLarge, _buildTitle(), verticalSpaceSmall, _buildSubtitle(), diff --git a/lib/ui/views/onboarding/screens/country_region_form_screen.dart b/lib/ui/views/onboarding/screens/country_region_form_screen.dart index 64f00ff..8970cf0 100644 --- a/lib/ui/views/onboarding/screens/country_region_form_screen.dart +++ b/lib/ui/views/onboarding/screens/country_region_form_screen.dart @@ -58,11 +58,8 @@ class CountryRegionFormScreen extends ViewModelWidget { children: _buildScaffoldChildren(viewModel), ); - List _buildScaffoldChildren(OnboardingViewModel viewModel) => [ - _buildAppBar(viewModel), - verticalSpaceMedium, - _buildExpandedBody(viewModel) - ]; + List _buildScaffoldChildren(OnboardingViewModel viewModel) => + [_buildAppBar(viewModel), _buildExpandedBody(viewModel)]; Widget _buildExpandedBody(OnboardingViewModel viewModel) => Expanded(child: _buildBodyWrapper(viewModel)); @@ -93,7 +90,7 @@ class CountryRegionFormScreen extends ViewModelWidget { ); List _buildUpperColumnChildren(OnboardingViewModel viewModel) => [ - verticalSpaceMedium, + verticalSpaceLarge, _buildTitle(), verticalSpaceSmall, _buildSubtitle(), diff --git a/lib/ui/views/onboarding/screens/educational_background_form_screen.dart b/lib/ui/views/onboarding/screens/educational_background_form_screen.dart index b01743c..f4ce8a7 100644 --- a/lib/ui/views/onboarding/screens/educational_background_form_screen.dart +++ b/lib/ui/views/onboarding/screens/educational_background_form_screen.dart @@ -43,11 +43,8 @@ class EducationalBackgroundFormScreen children: _buildScaffoldChildren(viewModel), ); - List _buildScaffoldChildren(OnboardingViewModel viewModel) => [ - _buildAppBar(viewModel), - verticalSpaceMedium, - _buildExpandedBody(viewModel) - ]; + List _buildScaffoldChildren(OnboardingViewModel viewModel) => + [_buildAppBar(viewModel), _buildExpandedBody(viewModel)]; Widget _buildExpandedBody(OnboardingViewModel viewModel) => Expanded(child: _buildColumnScroller(viewModel)); @@ -78,7 +75,7 @@ class EducationalBackgroundFormScreen ); List _buildUpperColumnChildren(OnboardingViewModel viewModel) => [ - verticalSpaceMedium, + verticalSpaceLarge, _buildTitle(), verticalSpaceSmall, _buildSubtitle(), diff --git a/lib/ui/views/onboarding/screens/full_name_form_screen.dart b/lib/ui/views/onboarding/screens/full_name_form_screen.dart index 7a03fda..1da32ff 100644 --- a/lib/ui/views/onboarding/screens/full_name_form_screen.dart +++ b/lib/ui/views/onboarding/screens/full_name_form_screen.dart @@ -40,11 +40,8 @@ class FullNameFormScreen extends ViewModelWidget { children: _buildScaffoldChildren(viewModel), ); - List _buildScaffoldChildren(OnboardingViewModel viewModel) => [ - _buildAppBar(viewModel), - verticalSpaceMedium, - _buildExpandedBody(viewModel) - ]; + List _buildScaffoldChildren(OnboardingViewModel viewModel) => + [_buildAppBar(viewModel), _buildExpandedBody(viewModel)]; Widget _buildExpandedBody(OnboardingViewModel viewModel) => Expanded(child: _buildBodyWrapper(viewModel)); @@ -75,7 +72,7 @@ class FullNameFormScreen extends ViewModelWidget { ); List _buildUpperColumnChildren(OnboardingViewModel viewModel) => [ - verticalSpaceMedium, + verticalSpaceLarge, _buildTitle(), verticalSpaceSmall, _buildSubtitle(), diff --git a/lib/ui/views/onboarding/screens/gender_form_screen.dart b/lib/ui/views/onboarding/screens/gender_form_screen.dart index 3aaafb8..b6f0e48 100644 --- a/lib/ui/views/onboarding/screens/gender_form_screen.dart +++ b/lib/ui/views/onboarding/screens/gender_form_screen.dart @@ -40,11 +40,8 @@ class GenderFormScreen extends ViewModelWidget { children: _buildScaffoldChildren(viewModel), ); - List _buildScaffoldChildren(OnboardingViewModel viewModel) => [ - _buildAppBar(viewModel), - verticalSpaceMedium, - _buildExpandedBody(viewModel) - ]; + List _buildScaffoldChildren(OnboardingViewModel viewModel) => + [_buildAppBar(viewModel), _buildExpandedBody(viewModel)]; Widget _buildExpandedBody(OnboardingViewModel viewModel) => Expanded(child: _buildBodyWrapper(viewModel)); @@ -70,7 +67,7 @@ class GenderFormScreen extends ViewModelWidget { ); List _buildUpperColumnChildren(OnboardingViewModel viewModel) => [ - verticalSpaceMedium, + verticalSpaceLarge, _buildTitle(), verticalSpaceSmall, _buildSubtitle(), diff --git a/lib/ui/views/onboarding/screens/language_goal_form_screen.dart b/lib/ui/views/onboarding/screens/language_goal_form_screen.dart index 767cdf5..fb9d5c3 100644 --- a/lib/ui/views/onboarding/screens/language_goal_form_screen.dart +++ b/lib/ui/views/onboarding/screens/language_goal_form_screen.dart @@ -1,16 +1,41 @@ import 'package:easy_localization/easy_localization.dart'; import 'package:flutter/material.dart'; +import 'package:iconsax/iconsax.dart'; import 'package:stacked/stacked.dart'; import 'package:yimaru_app/ui/common/app_colors.dart'; import 'package:yimaru_app/ui/common/translations/locale_keys.g.dart'; import 'package:yimaru_app/ui/common/ui_helpers.dart'; import 'package:yimaru_app/ui/widgets/custom_elevated_button.dart'; import 'package:yimaru_app/ui/views/onboarding/onboarding_viewmodel.dart'; -import 'package:yimaru_app/ui/widgets/custom_small_radio_button.dart'; +import 'package:yimaru_app/ui/widgets/custom_large_radio_button.dart'; import 'package:yimaru_app/ui/widgets/large_app_bar.dart'; -class LanguageGoalFormScreen extends ViewModelWidget { - const LanguageGoalFormScreen({super.key}); +class LanguageGoalFormScreens extends ViewModelWidget { + const LanguageGoalFormScreens({super.key}); + + IconData getIcon(int index) { + switch (index) { + case 0: + return Iconsax.book; + case 1: + return Iconsax.microphone; + case 2: + return Iconsax.bag; + } + return Icons.book; + } + + String getSubtitle(int index) { + switch (index) { + case 0: + return 'I know some English, but i want to learn to speak it'; + case 1: + return 'I already speak English, but I want more practice.'; + case 2: + return 'I want courses for IELTS, TOEFL, Duolingo, or work'; + } + return ''; + } void _pop(OnboardingViewModel viewModel) { viewModel.resetLanguageGoalFormScreen(); @@ -42,11 +67,8 @@ class LanguageGoalFormScreen extends ViewModelWidget { children: _buildScaffoldChildren(viewModel), ); - List _buildScaffoldChildren(OnboardingViewModel viewModel) => [ - _buildAppBar(viewModel), - verticalSpaceMedium, - _buildExpandedBody(viewModel) - ]; + List _buildScaffoldChildren(OnboardingViewModel viewModel) => + [_buildAppBar(viewModel), _buildExpandedBody(viewModel)]; Widget _buildExpandedBody(OnboardingViewModel viewModel) => Expanded(child: _buildBodyScroller(viewModel)); @@ -77,13 +99,10 @@ class LanguageGoalFormScreen extends ViewModelWidget { ); List _buildUpperColumnChildren(OnboardingViewModel viewModel) => [ + verticalSpaceLarge, + _buildTitle(viewModel), verticalSpaceMedium, - _buildTitle(), - verticalSpaceSmall, - _buildSubtitle(), - verticalSpaceMedium, - _buildReasons(viewModel), - verticalSpaceMedium, + _buildLanguageGoals(viewModel) ]; Widget _buildAppBar(OnboardingViewModel viewModel) => LargeAppBar( @@ -96,22 +115,26 @@ class LanguageGoalFormScreen extends ViewModelWidget { : viewModel.selectedLanguage['code'], ); - Widget _buildTitle() => Text( - LocaleKeys.language_goal.tr(), - style: style25DG600, + Widget _buildTitle(OnboardingViewModel viewModel) => Text.rich( + TextSpan( + text: + '${LocaleKeys.hello.tr()} ${viewModel.userData['first_name']},', + style: style18P600.copyWith(fontSize: 22), + children: [ + TextSpan( + text: ' ${LocaleKeys.language_goal.tr()}', + style: style16DG600.copyWith(fontSize: 22), + ) + ]), ); - Widget _buildSubtitle() => Text( - LocaleKeys.your_goal.tr(), - style: style14MG400, - ); - - Widget _buildReasons(OnboardingViewModel viewModel) => ListView.builder( + Widget _buildLanguageGoals(OnboardingViewModel viewModel) => ListView.builder( shrinkWrap: true, - padding: EdgeInsets.zero, itemCount: viewModel.languageGoals.length, physics: const NeverScrollableScrollPhysics(), itemBuilder: (context, index) => _buildLanguageGoal( + icon: getIcon(index), + subtitle: getSubtitle(index), title: viewModel.languageGoals[index].label ?? '', selected: viewModel.isSelectedLanguageGoal(viewModel.languageGoals[index]), @@ -123,10 +146,14 @@ class LanguageGoalFormScreen extends ViewModelWidget { Widget _buildLanguageGoal( {required String title, required bool selected, + required IconData icon, + required String subtitle, required GestureTapCallback onTap}) => - CustomSmallRadioButton( + CustomLargeRadioButton( + icon: icon, title: title, onTap: onTap, + subtitle: subtitle, selected: selected, ); @@ -137,14 +164,15 @@ class LanguageGoalFormScreen extends ViewModelWidget { Widget _buildContinueButton(OnboardingViewModel viewModel) => CustomElevatedButton( - height: 55, - borderRadius: 12, - foregroundColor: kcWhite, - text: LocaleKeys.cont.tr(), - onTap: viewModel.selectedLanguageGoal != null - ? () => _next(viewModel) - : null, - backgroundColor: viewModel.selectedLanguageGoal != null - ? kcPrimaryColor - : kcPrimaryColor.withOpacity(0.1)); + height: 55, + borderRadius: 12, + foregroundColor: kcWhite, + text: LocaleKeys.cont.tr(), + onTap: viewModel.selectedLanguageGoal != null + ? () => _next(viewModel) + : null, + backgroundColor: viewModel.selectedLanguageGoal != null + ? kcPrimaryColor + : kcPrimaryColor.withOpacity(0.1), + ); } diff --git a/lib/ui/views/onboarding/screens/learning_goal_form_screen.dart b/lib/ui/views/onboarding/screens/learning_goal_form_screen.dart index 6bbd51a..e480ff2 100644 --- a/lib/ui/views/onboarding/screens/learning_goal_form_screen.dart +++ b/lib/ui/views/onboarding/screens/learning_goal_form_screen.dart @@ -1,54 +1,17 @@ import 'package:easy_localization/easy_localization.dart'; import 'package:flutter/material.dart'; -import 'package:iconsax/iconsax.dart'; import 'package:stacked/stacked.dart'; import 'package:yimaru_app/ui/common/app_colors.dart'; import 'package:yimaru_app/ui/common/translations/locale_keys.g.dart'; import 'package:yimaru_app/ui/common/ui_helpers.dart'; import 'package:yimaru_app/ui/widgets/custom_elevated_button.dart'; import 'package:yimaru_app/ui/views/onboarding/onboarding_viewmodel.dart'; -import 'package:yimaru_app/ui/widgets/custom_large_radio_button.dart'; +import 'package:yimaru_app/ui/widgets/custom_small_radio_button.dart'; import 'package:yimaru_app/ui/widgets/large_app_bar.dart'; class LearningGoalFormScreen extends ViewModelWidget { const LearningGoalFormScreen({super.key}); - IconData getIcon(int index) { - switch (index) { - case 0: - return Iconsax.book; - case 1: - return Iconsax.microphone; - case 2: - return Iconsax.bag; - } - return Icons.book; - } - - String getTitles(int index) { - switch (index) { - case 0: - return 'Learn to Speak English'; - case 1: - return 'Practice Speaking English'; - case 2: - return 'Skill-based Courses'; - } - return ''; - } - - String getSubtitle(int index) { - switch (index) { - case 0: - return 'I know some English, but i want to learn to speak it'; - case 1: - return 'I already speak English, but I want more practice.'; - case 2: - return 'I want courses for IELTS, TOEFL, Duolingo, or work'; - } - return ''; - } - void _pop(OnboardingViewModel viewModel) { viewModel.resetLearningGoalFormScreen(); viewModel.goBack(); @@ -79,11 +42,8 @@ class LearningGoalFormScreen extends ViewModelWidget { children: _buildScaffoldChildren(viewModel), ); - List _buildScaffoldChildren(OnboardingViewModel viewModel) => [ - _buildAppBar(viewModel), - verticalSpaceMedium, - _buildExpandedBody(viewModel) - ]; + List _buildScaffoldChildren(OnboardingViewModel viewModel) => + [_buildAppBar(viewModel), _buildExpandedBody(viewModel)]; Widget _buildExpandedBody(OnboardingViewModel viewModel) => Expanded(child: _buildBodyScroller(viewModel)); @@ -114,10 +74,13 @@ class LearningGoalFormScreen extends ViewModelWidget { ); List _buildUpperColumnChildren(OnboardingViewModel viewModel) => [ + verticalSpaceLarge, + _buildTitle(), + verticalSpaceSmall, + _buildSubtitle(), verticalSpaceMedium, - _buildTitle(viewModel), + _buildGoals(viewModel), verticalSpaceMedium, - _buildLearningGoals(viewModel) ]; Widget _buildAppBar(OnboardingViewModel viewModel) => LargeAppBar( @@ -130,27 +93,23 @@ class LearningGoalFormScreen extends ViewModelWidget { : viewModel.selectedLanguage['code'], ); - Widget _buildTitle(OnboardingViewModel viewModel) => Text.rich( - TextSpan( - text: - '${LocaleKeys.hello.tr()} ${viewModel.userData['first_name']},', - style: style18P600.copyWith(fontSize: 22), - children: [ - TextSpan( - text: ' ${LocaleKeys.learning_goal.tr()}', - style: style16DG600.copyWith(fontSize: 22), - ) - ]), + Widget _buildTitle() => Text( + LocaleKeys.learning_goal.tr(), + style: style25DG600, ); - Widget _buildLearningGoals(OnboardingViewModel viewModel) => ListView.builder( + Widget _buildSubtitle() => Text( + LocaleKeys.your_goal.tr(), + style: style14MG400, + ); + + Widget _buildGoals(OnboardingViewModel viewModel) => ListView.builder( shrinkWrap: true, - itemCount: 3, // viewModel.learningGoals.length, + padding: EdgeInsets.zero, + itemCount: viewModel.learningGoals.length, physics: const NeverScrollableScrollPhysics(), itemBuilder: (context, index) => _buildLearningGoal( - icon: getIcon(index), - title: getTitles(index), - subtitle: getSubtitle(index), + title: viewModel.learningGoals[index].label ?? '', selected: viewModel.isSelectedLearningGoal(viewModel.learningGoals[index]), onTap: () => @@ -161,14 +120,10 @@ class LearningGoalFormScreen extends ViewModelWidget { Widget _buildLearningGoal( {required String title, required bool selected, - required IconData icon, - required String subtitle, required GestureTapCallback onTap}) => - CustomLargeRadioButton( - icon: icon, + CustomSmallRadioButton( title: title, onTap: onTap, - subtitle: subtitle, selected: selected, ); @@ -179,15 +134,14 @@ class LearningGoalFormScreen extends ViewModelWidget { Widget _buildContinueButton(OnboardingViewModel viewModel) => CustomElevatedButton( - height: 55, - borderRadius: 12, - foregroundColor: kcWhite, - text: LocaleKeys.cont.tr(), - onTap: viewModel.selectedLearningGoal != null - ? () => _next(viewModel) - : null, - backgroundColor: viewModel.selectedLearningGoal != null - ? kcPrimaryColor - : kcPrimaryColor.withOpacity(0.1), - ); + height: 55, + borderRadius: 12, + foregroundColor: kcWhite, + text: LocaleKeys.cont.tr(), + onTap: viewModel.selectedLearningGoal != null + ? () => _next(viewModel) + : null, + backgroundColor: viewModel.selectedLearningGoal != null + ? kcPrimaryColor + : kcPrimaryColor.withOpacity(0.1)); } diff --git a/lib/ui/views/onboarding/screens/occupation_form_screen.dart b/lib/ui/views/onboarding/screens/occupation_form_screen.dart index 731d8cc..513d0a9 100644 --- a/lib/ui/views/onboarding/screens/occupation_form_screen.dart +++ b/lib/ui/views/onboarding/screens/occupation_form_screen.dart @@ -43,11 +43,8 @@ class OccupationFormScreen extends ViewModelWidget { children: _buildScaffoldChildren(viewModel), ); - List _buildScaffoldChildren(OnboardingViewModel viewModel) => [ - _buildAppBar(viewModel), - verticalSpaceMedium, - _buildExpandedBody(viewModel) - ]; + List _buildScaffoldChildren(OnboardingViewModel viewModel) => + [_buildAppBar(viewModel), _buildExpandedBody(viewModel)]; Widget _buildExpandedBody(OnboardingViewModel viewModel) => Expanded(child: _buildBodyWrapper(viewModel)); @@ -78,7 +75,7 @@ class OccupationFormScreen extends ViewModelWidget { ); List _buildUpperColumnChildren(OnboardingViewModel viewModel) => [ - verticalSpaceMedium, + verticalSpaceLarge, _buildTitle(), verticalSpaceSmall, _buildSubtitle(), diff --git a/lib/ui/views/onboarding/screens/topic_form_screen.dart b/lib/ui/views/onboarding/screens/topic_form_screen.dart index 9d46a25..354d3e8 100644 --- a/lib/ui/views/onboarding/screens/topic_form_screen.dart +++ b/lib/ui/views/onboarding/screens/topic_form_screen.dart @@ -45,11 +45,8 @@ class TopicFormScreen extends ViewModelWidget { children: _buildScaffoldChildren(viewModel), ); - List _buildScaffoldChildren(OnboardingViewModel viewModel) => [ - _buildAppBar(viewModel), - verticalSpaceMedium, - _buildExpandedBody(viewModel) - ]; + List _buildScaffoldChildren(OnboardingViewModel viewModel) => + [_buildAppBar(viewModel), _buildExpandedBody(viewModel)]; Widget _buildAppBar(OnboardingViewModel viewModel) => LargeAppBar( showBackButton: true, @@ -90,7 +87,7 @@ class TopicFormScreen extends ViewModelWidget { ); List _buildUpperColumnChildren(OnboardingViewModel viewModel) => [ - verticalSpaceMedium, + verticalSpaceLarge, _buildTitle(), verticalSpaceSmall, _buildSubtitle(), diff --git a/lib/ui/views/arif_pay/arif_pay_view.dart b/lib/ui/views/payment/payment_view.dart similarity index 51% rename from lib/ui/views/arif_pay/arif_pay_view.dart rename to lib/ui/views/payment/payment_view.dart index baaa5d5..f6754c9 100644 --- a/lib/ui/views/arif_pay/arif_pay_view.dart +++ b/lib/ui/views/payment/payment_view.dart @@ -1,55 +1,61 @@ import 'package:flutter/material.dart'; import 'package:flutter_inappwebview/flutter_inappwebview.dart'; import 'package:stacked/stacked.dart'; -import 'package:yimaru_app/ui/common/app_constants.dart'; -import 'package:yimaru_app/ui/common/enmus.dart'; -import 'package:yimaru_app/ui/common/ui_helpers.dart'; -import 'package:yimaru_app/ui/widgets/page_loading_indicator.dart'; -import 'arif_pay_viewmodel.dart'; +import '../../../models/learn_subscription.dart'; +import '../../common/app_constants.dart'; +import '../../common/enmus.dart'; +import '../../common/ui_helpers.dart'; +import '../../widgets/page_loading_indicator.dart'; +import 'payment_viewmodel.dart'; -class ArifPayView extends StackedView { +class PaymentView extends StackedView { final String phone; + final LearnSubscription subscription; - const ArifPayView({Key? key, required this.phone}) : super(key: key); + const PaymentView({Key? key, required this.phone, required this.subscription}) + : super(key: key); - void _error(ArifPayViewModel viewModel) => viewModel.pop(); + void _error(PaymentViewModel viewModel) => viewModel.pop(); - Future _success(ArifPayViewModel viewModel) async { + Future _success(PaymentViewModel viewModel) async { await viewModel.updatePaymentStatus(); await viewModel.replaceWithHome(); } @override - void onViewModelReady(ArifPayViewModel viewModel) async { - await viewModel.createLearnSubscriptionRequest(phone); + void onViewModelReady(PaymentViewModel viewModel) async { + await viewModel.createLearnSubscriptionRequest(phone: phone,subscription: subscription); super.onViewModelReady(viewModel); } @override - ArifPayViewModel viewModelBuilder(BuildContext context) => ArifPayViewModel(); + PaymentViewModel viewModelBuilder( + BuildContext context, + ) => + PaymentViewModel(); @override Widget builder( BuildContext context, - ArifPayViewModel viewModel, + PaymentViewModel viewModel, Widget? child, ) => _buildScaffoldWrapper(viewModel); - Widget _buildScaffoldWrapper(ArifPayViewModel viewModel) => + Widget _buildScaffoldWrapper(PaymentViewModel viewModel) => Scaffold(body: _buildScaffoldState(viewModel)); - Widget _buildScaffoldState(ArifPayViewModel viewModel) => + Widget _buildScaffoldState(PaymentViewModel viewModel) => viewModel.busy(StateObjects.learnSubscription) ? const PageLoadingIndicator() : _buildScaffold(viewModel); - Widget _buildScaffold(ArifPayViewModel viewModel) => + Widget _buildScaffold(PaymentViewModel viewModel) => SafeArea(child: _buildBody(viewModel)); - Widget _buildBody(ArifPayViewModel viewModel) => InAppWebView( + Widget _buildBody(PaymentViewModel viewModel) => InAppWebView( initialUrlRequest: URLRequest(url: WebUri(viewModel.request?.paymentUrl ?? '')), onUpdateVisitedHistory: (controller, url, androidIsReload) async { diff --git a/lib/ui/views/arif_pay/arif_pay_viewmodel.dart b/lib/ui/views/payment/payment_viewmodel.dart similarity index 79% rename from lib/ui/views/arif_pay/arif_pay_viewmodel.dart rename to lib/ui/views/payment/payment_viewmodel.dart index e616ddf..71896ed 100644 --- a/lib/ui/views/arif_pay/arif_pay_viewmodel.dart +++ b/lib/ui/views/payment/payment_viewmodel.dart @@ -1,17 +1,17 @@ import 'package:stacked/stacked.dart'; import 'package:stacked_services/stacked_services.dart'; -import 'package:yimaru_app/ui/common/enmus.dart'; import '../../../app/app.locator.dart'; import '../../../app/app.router.dart'; +import '../../../models/learn_subscription.dart'; import '../../../models/learn_subscription_request.dart'; import '../../../models/user.dart'; import '../../../services/api_service.dart'; import '../../../services/authentication_service.dart'; import '../../../services/status_checker_service.dart'; -import '../../common/ui_helpers.dart'; +import '../../common/enmus.dart'; -class ArifPayViewModel extends ReactiveViewModel { +class PaymentViewModel extends ReactiveViewModel { // Dependency injection final _apiService = locator(); @@ -30,6 +30,7 @@ class ArifPayViewModel extends ReactiveViewModel { User? get _user => _authenticationService.user; User? get user => _user; + // Learn subscription request LearnSubscriptionRequest? _request; @@ -44,18 +45,18 @@ class ArifPayViewModel extends ReactiveViewModel { // Remote api call // Learn subscription - Future createLearnSubscriptionRequest(String phone) async => - await runBusyFuture(_createLearnSubscriptionRequest(phone), + Future createLearnSubscriptionRequest({required String phone,required LearnSubscription subscription}) async => + await runBusyFuture(_createLearnSubscriptionRequest(phone: phone,subscription: subscription), busyObject: StateObjects.learnSubscription); - Future _createLearnSubscriptionRequest(String phone) async { - print('MY SUMMARIES : PAYMENT'); + Future _createLearnSubscriptionRequest({required String phone,required LearnSubscription subscription}) async { if (await _statusChecker.checkConnection()) { Map data = { - 'plan_id': 1, + 'provider': 'CHAPA', 'phone': '251$phone', - 'provider': 'ARIFPAY', 'email': 'test@gmail.com', + 'plan_id': subscription.id, + }; Map response = diff --git a/lib/ui/widgets/course_module_tile_large.dart b/lib/ui/widgets/course_module_tile_large.dart index a8c0c2f..78ad57b 100644 --- a/lib/ui/widgets/course_module_tile_large.dart +++ b/lib/ui/widgets/course_module_tile_large.dart @@ -2,6 +2,7 @@ import 'package:flutter/material.dart'; import 'package:stacked/stacked.dart'; import 'package:yimaru_app/models/course_lesson.dart'; import 'package:yimaru_app/models/course_module.dart'; +import 'package:yimaru_app/ui/common/enmus.dart'; import 'package:yimaru_app/ui/views/course_module/course_module_viewmodel.dart'; import 'package:yimaru_app/ui/widgets/course_lesson_tile.dart'; import 'package:yimaru_app/ui/widgets/custom_linear_progress_indicator.dart'; @@ -182,6 +183,7 @@ class CourseModuleTileLarge extends ViewModelWidget { Widget _buildSheet(CourseModuleViewModel viewModel) => FinishPracticeSheet( onTap: viewModel.pop, + practice: PracticeReason.lesson, ); Widget _buildCourseModules(CourseModuleViewModel viewModel) => diff --git a/lib/ui/widgets/course_unit_tile.dart b/lib/ui/widgets/course_unit_tile.dart index 70877d0..a084d7e 100644 --- a/lib/ui/widgets/course_unit_tile.dart +++ b/lib/ui/widgets/course_unit_tile.dart @@ -8,6 +8,7 @@ import 'package:yimaru_app/ui/widgets/finish_practice_sheet.dart'; import '../../models/course_catalog.dart'; import '../common/app_colors.dart'; +import '../common/enmus.dart'; import '../common/ui_helpers.dart'; import '../views/course_unit/course_unit_viewmodel.dart'; import 'custom_circular_progress_indicator.dart'; @@ -228,6 +229,7 @@ class CourseUnitTile extends ViewModelWidget { Widget _buildSheet(CourseUnitViewModel viewModel) => FinishPracticeSheet( onTap: viewModel.pop, + practice: PracticeReason.course, ); Widget _buildCourseModulesState(CourseUnitViewModel viewModel) => @@ -240,6 +242,7 @@ class CourseUnitTile extends ViewModelWidget { width: double.maxFinite, child: _buildProgressIndicator(), ); + Widget _buildProgressIndicator() => const Center( child: CustomCircularProgressIndicator(color: kcPrimaryColor), ); diff --git a/lib/ui/widgets/finish_practice_sheet.dart b/lib/ui/widgets/finish_practice_sheet.dart index 075f9a8..678d8a6 100644 --- a/lib/ui/widgets/finish_practice_sheet.dart +++ b/lib/ui/widgets/finish_practice_sheet.dart @@ -2,6 +2,7 @@ import 'package:easy_localization/easy_localization.dart'; import 'package:flutter/material.dart'; import 'package:flutter_svg/svg.dart'; import 'package:yimaru_app/ui/common/app_colors.dart'; +import 'package:yimaru_app/ui/common/enmus.dart'; import 'package:yimaru_app/ui/common/translations/locale_keys.g.dart'; import 'package:yimaru_app/ui/common/ui_helpers.dart'; import 'package:yimaru_app/ui/widgets/custom_bottom_sheet.dart'; @@ -9,9 +10,24 @@ import 'package:yimaru_app/ui/widgets/custom_bottom_sheet.dart'; import 'custom_elevated_button.dart'; class FinishPracticeSheet extends StatelessWidget { + final PracticeReason practice; final GestureTapCallback? onTap; - const FinishPracticeSheet({super.key, this.onTap}); + const FinishPracticeSheet({super.key, this.onTap, required this.practice}); + + String getWarning() { + if (practice == PracticeReason.lesson) { + return LocaleKeys.finish_all_practice_lesson.tr(); + } else if (practice == PracticeReason.module) { + return LocaleKeys.finish_all_practice_module.tr(); + } else if (practice == PracticeReason.previousModule) { + return LocaleKeys.finish_all_practice_previouse_module.tr(); + } else if (practice == PracticeReason.previousCourse) { + return LocaleKeys.finish_all_practice_previouse_course.tr(); + } else { + return LocaleKeys.finish_all_practice_course.tr(); + } + } @override Widget build(BuildContext context) => _buildSheetWrapper(); @@ -44,7 +60,7 @@ class FinishPracticeSheet extends StatelessWidget { ); Widget _buildMessage() => Text( - LocaleKeys.finish_all_practice.tr(), + getWarning(), style: style16DG600, textAlign: TextAlign.center, ); diff --git a/lib/ui/widgets/learn_course_tile.dart b/lib/ui/widgets/learn_course_tile.dart index 39f8397..dab8d41 100644 --- a/lib/ui/widgets/learn_course_tile.dart +++ b/lib/ui/widgets/learn_course_tile.dart @@ -24,7 +24,13 @@ class LearnCourseTile extends ViewModelWidget { @override Widget build(BuildContext context, LearnCourseViewModel viewModel) => - _buildExpansionTileCard(viewModel); + _buildExpansionTileCardWrapper(viewModel); + + Widget _buildExpansionTileCardWrapper(LearnCourseViewModel viewModel) => + GestureDetector( + onTap: !(course.access?.isAccessible ?? false) ? onPracticeTap : null, + child: _buildExpansionTileCard(viewModel), + ); Widget _buildExpansionTileCard(LearnCourseViewModel viewModel) => Container( margin: const EdgeInsets.only(bottom: 15), diff --git a/lib/ui/widgets/learn_lesson_tile.dart b/lib/ui/widgets/learn_lesson_tile.dart index 92f21bc..891c420 100644 --- a/lib/ui/widgets/learn_lesson_tile.dart +++ b/lib/ui/widgets/learn_lesson_tile.dart @@ -16,6 +16,7 @@ import 'custom_linear_progress_indicator.dart'; class LearnLessonTile extends ViewModelWidget { final int index; + final bool last; final LearnLesson lesson; final GestureTapCallback? onLessonTap; final GestureTapCallback? onPracticeTap; @@ -24,6 +25,7 @@ class LearnLessonTile extends ViewModelWidget { {super.key, this.onLessonTap, this.onPracticeTap, + required this.last, required this.index, required this.lesson}); @@ -31,10 +33,12 @@ class LearnLessonTile extends ViewModelWidget { Widget build(BuildContext context, LearnLessonViewModel viewModel) => _buildContainerWrapper(viewModel); - Widget _buildContainerWrapper(LearnLessonViewModel viewModel)=> GestureDetector( - onTap: !(lesson.access?.isAccessible ?? false) ? onPracticeTap:null, - child: _buildContainer(viewModel), - ); + Widget _buildContainerWrapper(LearnLessonViewModel viewModel) => + GestureDetector( + onTap: !(lesson.access?.isAccessible ?? false) ? onPracticeTap : null, + child: _buildContainer(viewModel), + ); + Widget _buildContainer(LearnLessonViewModel viewModel) => Container( width: double.maxFinite, margin: const EdgeInsets.only(bottom: 15), @@ -70,12 +74,14 @@ class LearnLessonTile extends ViewModelWidget { controlAffinity: ListTileControlAffinity.trailing, expandedCrossAxisAlignment: CrossAxisAlignment.start, tilePadding: const EdgeInsets.fromLTRB(15, 15, 15, 15), - backgroundColor: (lesson.access?.isCompleted ?? false) - ? kcGreen.withOpacity(0.1) - : kcPrimaryColor.withOpacity(0.1), childrenPadding: const EdgeInsets.fromLTRB(15, 0, 15, 15), initiallyExpanded: (lesson.access?.isAccessible ?? false) && !(lesson.access?.isCompleted ?? false), + backgroundColor: last && (lesson.access?.isAccessible ?? false) + ? kcGreen.withOpacity(0.1) + : (lesson.access?.isCompleted ?? false) + ? kcGreen.withOpacity(0.1) + : kcPrimaryColor.withOpacity(0.1), collapsedBackgroundColor: (lesson.access?.isCompleted ?? false) ? kcGreen.withOpacity(0.1) : kcPrimaryColor.withOpacity(0.1), @@ -92,9 +98,11 @@ class LearnLessonTile extends ViewModelWidget { style: style16DG600, ); - Widget _buildIconState() => (lesson.access?.isCompleted ?? false) + Widget _buildIconState() => last && (lesson.access?.isAccessible ?? false) ? _buildCompleteIcon() - : _buildPendingIcon(); + : (lesson.access?.isCompleted ?? false) + ? _buildCompleteIcon() + : _buildPendingIcon(); Widget _buildCompleteIcon() => const Icon( Icons.check, @@ -128,13 +136,17 @@ class LearnLessonTile extends ViewModelWidget { Widget _buildProgress() => CustomLinearProgressIndicator( activeColor: kcPrimaryColor, backgroundColor: kcVeryLightGrey, - progress: (lesson.access?.progressPercent ?? 0) / 100, + progress: last && (lesson.access?.isAccessible ?? false) + ? 1 + : (lesson.access?.progressPercent ?? 0) / 100, ); Widget _buildProgressText() => Text( - (lesson.access?.isCompleted ?? false) + last && (lesson.access?.isAccessible ?? false) ? LocaleKeys.completed.tr() - : LocaleKeys.in_progress.tr(), + : (lesson.access?.isCompleted ?? false) + ? LocaleKeys.completed.tr() + : LocaleKeys.in_progress.tr(), style: style14P600, ); diff --git a/lib/ui/widgets/learn_module_tile.dart b/lib/ui/widgets/learn_module_tile.dart index f7f9f3a..24b6dd7 100644 --- a/lib/ui/widgets/learn_module_tile.dart +++ b/lib/ui/widgets/learn_module_tile.dart @@ -23,8 +23,15 @@ class LearnModuleTile extends ViewModelWidget { @override Widget build(BuildContext context, LearnModuleViewModel viewModel) => - _buildExpansionTileCard(context: context, viewModel: viewModel); + _buildExpansionTileCardWrapper(context: context, viewModel: viewModel); + Widget _buildExpansionTileCardWrapper( + {required BuildContext context, + required LearnModuleViewModel viewModel}) => + GestureDetector( + onTap: !(module.access?.isAccessible ?? false) ? onPracticeTap : null, + child: _buildExpansionTileCard(context: context, viewModel: viewModel), + ); Widget _buildExpansionTileCard( {required BuildContext context, required LearnModuleViewModel viewModel}) => diff --git a/pubspec.yaml b/pubspec.yaml index 103e8ed..d56ad63 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,5 +1,5 @@ name: yimaru_app -version: 0.1.28+31 +version: 0.1.30+32 publish_to: 'none' description: A new Flutter project. diff --git a/test/viewmodels/arif_pay_viewmodel_test.dart b/test/viewmodels/payment_viewmodel_test.dart similarity index 85% rename from test/viewmodels/arif_pay_viewmodel_test.dart rename to test/viewmodels/payment_viewmodel_test.dart index e0d875e..7753ade 100644 --- a/test/viewmodels/arif_pay_viewmodel_test.dart +++ b/test/viewmodels/payment_viewmodel_test.dart @@ -4,7 +4,7 @@ import 'package:yimaru_app/app/app.locator.dart'; import '../helpers/test_helpers.dart'; void main() { - group('ArifPayViewModel Tests -', () { + group('PaymentViewModel Tests -', () { setUp(() => registerServices()); tearDown(() => locator.reset()); });