assets/translations/am.json

@@ -1,7 +1,6 @@
 {
-  "loading": "በመጫን ላይ",
+
   "welcome_back": "እንኳን በደህና ተመለሱ",
-  "checking_user_info": "የተጠቃሚ መረጃን በማረጋገጥ ላይ",
   "dont_have_account": "መለያ የለዎትም? ይመዝገቡ",
   "email": "ኢሜይል",
   "password": "የይለፍ ቃል",
@@ -20,18 +19,7 @@
   "login_with_email": "በኢሜይል ይግቡ",
   "create_password": "የይለፍ ቃል ይፍጠሩ",
   "confirm_password": "የይለፍ ቃል ያረጋግጡ",
-  "eight_character_minimum": "ቢያንስ 8 ፊደላት",
-  "password_match": "የይለፍ ቃሉ ተመሳስሏል",
   "sign_up_agreement":  "‘ይመዝገቡ’ የሚለውን ሲጫኑ በ‘አገልግሎት ውሎች’ እና ‘በግላዊነት ፖሊሲ’ ይስማማሉ።" ,
-  "terms_of_services": "የአገልግሎት ውሎች",
-  "and": "እና",
-  "privacy_policy": "የግላዊነት ፖሊሲ",
-  "register_with_email": "በኢሜል ይመዝገቡ",
-  "verification_code": "የማረጋገጫ ኮድ",
-  "resend_code": "ኮዱን እንደገና ላክ",
-  "code_sent_to_phone": "ኮዱ ወደ ስልክ ቁጥርዎ ተልኳል",
-  "code_sent_to_email": "ኮዱ ወደ ኢሜል ተልኳል",
-  "resend_code_in": "ኮዱን እንደገና ለመላክ የቀረው ጊዜ",
   "reset_password": " የይለፍ ቃልን ይቀይሩ ",
   "enter_email_reset_code":  "ኢሜይልዎን ያስገቡ። የይለፍ ቃል መለወጫ ኮድ እንልክልዎታለን።" ,
   "please_wait": "እባክዎ ይጠብቁ",

assets/translations/en.json

@@ -1,7 +1,6 @@
 
-  {"loading": "Loading",
+  {
     "welcome_back": "Welcome back",
-    "checking_user_info": "Checking user info",
     "dont_have_account": "Don't have an account? Register",
     "email": "Email",
     "password": "Password",
@@ -20,18 +19,7 @@
     "login_with_email": "Login with email",
     "create_password": "Create password",
     "confirm_password": "Confirm password",
-    "eight_character_minimum": "8 characters minimum",
-    "password_math": "password match",
     "sign_up_agreement": "By clicking ‘Sign Up’, you agree to our ‘Terms of Service’ and ‘Privacy Policy’",
-    "terms_of_services": "Terms of Service",
-    "and": "and",
-    "privacy_policy": "Privacy Policy",
-    "register_with_email": "Register with email",
-    "verification_code": "Verification Code",
-    "resend_code": "Resend Code",
-    "code_sent_to_phone": "Code sent to your number",
-    "code_sent_to_email": "Code sent to your email",
-    "resend_code_in": "Resend code in",
     "reset_password": "Reset Password",
     "enter_email_reset_code": "Enter your email. We will send you a reset code.",
     "please_wait": "Please wait",

lib/app/app.dart

@@ -59,7 +59,6 @@ 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';
 import 'package:yimaru_app/services/localization_service.dart';
-import 'package:yimaru_app/ui/views/landing/landing_view.dart';
 // @stacked-import
 
 @StackedApp(
@@ -101,7 +100,6 @@ import 'package:yimaru_app/ui/views/landing/landing_view.dart';
     MaterialRoute(page: ArifPayView),
     MaterialRoute(page: CourseCatalogView),
     MaterialRoute(page: CourseUnitView),
-    MaterialRoute(page: LandingView),
 // @stacked-route
   ],
   dependencies: [

lib/services/course_service.dart

@@ -1,3 +1,4 @@
+import 'package:flutter_html/flutter_html.dart';
 import 'package:stacked/stacked.dart';
 import 'package:yimaru_app/app/app.locator.dart';
 import 'package:yimaru_app/models/course_progress.dart';

lib/ui/common/app_strings.dart

@@ -9,299 +9,52 @@ const String ksCategorySubtitle =
 const String ksHomeBottomSheetDescription =
     'Stacked is built to help you build better apps. Give us a chance and we\'ll prove it to you. Check out stacked.filledstacks.com to learn more';
 
-const String ksPrivacyPolicy = """
+const String ksPrivacyPolicy =
-<p style="color:#9C2C91;font-size:13px;">
+    'A brief, simple overview of Yimaru’s commitment to user privacy. Our goal is to be transparent about the data we collect and how we use it to enhance your learning experience.';
-Last updated: May 12, 2026
-</p>
-
-<h1>Privacy Policy</h1>
-
-<p>
-Yimaru Academy App• May 12, 2026
-</p>
-
-<h2>Introduction</h2>
-<p>
-Welcome to Yimaru Academy (“we,” “our,” “us”). Your privacy is very important to us. This Privacy Policy explains how we collect, use, store, and protect your personal data when you use our mobile application, website, and related services (collectively, the “Platform”).
-</p>
-
-<h2>Contact Details</h2>
-<p>
-If you have any questions about this Privacy Policy, please contact us:
-</p>
-
-<p>
-<strong>Yimaru Academy</strong><br>
-22 Djibouti St, Addis Ababa, Ethiopia<br>
-+251 946396655<br>
-Email: yimaruacademy@gmail.com
-</p>
-
-<h2>Consent</h2>
-<p>
-By using our Platform, you consent to the collection and processing of your personal information as described in this Privacy Policy. Where required by law (e.g., for minors or sensitive data), we will request explicit consent.
-</p>
-
-<h2>Information We Collect</h2>
-
-<p>
-When you interact with Yimaru Academy, we may collect the following types of information:
-</p>
-
-<ul>
-  <li><strong>Identity Data:</strong> Full name, username, date of birth, and profile information.</li>
-  <li><strong>Contact Data:</strong> Email address, phone number, and billing information.</li>
-  <li><strong>Account & Learning Data:</strong> Lessons accessed, progress, scores, achievements, streaks, and certificates.</li>
-  <li><strong>Voice & AI Interaction Data:</strong> Voice recordings, pronunciation samples, AI chat messages, prompts, and feedback.</li>
-  <li><strong>Usage Data:</strong> App activity, feature usage, and interaction history.</li>
-  <li><strong>Technical Data:</strong> Device type, IP address, OS, app version, language, crash logs, and identifiers.</li>
-  <li><strong>Payment Data:</strong> Subscription and transaction details processed via third-party payment providers.</li>
-</ul>
-
-<p>
-We do not intentionally collect sensitive personal data such as health, biometric, religious, or political information unless required by law and with proper consent.
-</p>
-
-<h2>How We Use Your Data</h2>
-
-<p>
-We use your personal data for the following purposes:
-</p>
-
-<ul>
-  <li>To create and manage your account</li>
-  <li>To deliver personalized learning experiences and AI features</li>
-  <li>To communicate updates, alerts, and support messages</li>
-  <li>To process payments and subscriptions</li>
-  <li>To improve app performance and services</li>
-  <li>To detect fraud or misuse</li>
-  <li>To comply with legal obligations</li>
-</ul>
-
-<h2>Third-Party Links</h2>
-<p>
-Our Platform may contain links to third-party websites or services. We are not responsible for their privacy practices and encourage you to review their policies.
-</p>
-
-<h2>Cookies</h2>
-<p>
-We may use cookies or similar technologies to improve user experience, analyze usage, and enhance functionality. You can disable cookies in your browser, but some features may not work properly.
-</p>
-
-<h2>User Profiles</h2>
-<p>
-Users may create learning profiles. You can update or delete your profile information at any time. For minors, parents or guardians may request account deletion.
-</p>
-
-<h2>Data Security</h2>
-<p>
-We use appropriate technical and organizational measures such as encryption, secure servers, and access controls to protect your data.
-</p>
-
-<p>
-In the event of a data breach that affects user rights or freedoms, we will notify affected users and relevant authorities where required by law.
-</p>
-
-<h2>Data Retention</h2>
-<p>
-We retain personal data only as long as necessary to fulfill the purposes described in this Privacy Policy or as required by Ethiopian law. After that, data is securely deleted or anonymized.
-</p>
-
-<h2>Your Rights</h2>
-
-<p>
-Under applicable law, you may have the right to:
-</p>
-
-<ul>
-  <li>Access your personal data</li>
-  <li>Correct inaccurate information</li>
-  <li>Request deletion of your data</li>
-  <li>Restrict or object to processing</li>
-  <li>Request data portability</li>
-  <li>Withdraw consent (via parent/guardian if under 16)</li>
-</ul>
-
-<p>
-To exercise these rights, contact us using the details above. You may also contact the relevant authority if you believe your rights are violated.
-</p>
-
-<h2>Cross-Border Data Transfers</h2>
-<p>
-Your data is primarily stored within Ethiopia. If data is transferred outside Ethiopia, it will only occur when adequate protection is ensured, with your consent, or for legal/contractual reasons.
-</p>
-
-<h2>Changes to This Privacy Policy</h2>
-<p>
-We may update this Privacy Policy from time to time. Significant changes will be communicated through the app, website, or email. We encourage you to review this page regularly.
-</p>
-
-<h2>Disclaimer</h2>
-<p>
-We take reasonable steps to protect your data and process it lawfully. However, no system is completely secure, and you acknowledge these inherent risks when using our Platform.
-</p>
-""";
 
 const String ksTerms = """
 <p style="color:#9C2C91;font-size:13px;">
-Last updated: May 12, 2026
+Last updated: October 26, 2025
-</p>
-
-<h1>Terms of Service</h1>
-<p>
-Yimaru Academy App
 </p>
 
 <h2>Introduction</h2>
 <p>
-Welcome to Yimaru Academy (“we,” “our,” “us”), a service operated by :contentReference[oaicite:0]{index=0}. These Terms & Conditions (“Terms”) govern your use of our website, mobile application, and online learning services (collectively, the “Platform”).
+Welcome to Yimaru! These terms and conditions outline the rules and regulations
+for the use of our application. By accessing this app, we assume you accept
+these terms and conditions.
 </p>
 
+<h2>User Accounts</h2>
 <p>
-By accessing or using our Platform, you agree to comply with and be bound by these Terms. If you do not agree, please do not use our services.
+When you create an account with us, you must provide us with information that is
+accurate, complete, and current at all times. Failure to do so constitutes a
+breach of the Terms, which may result in immediate termination of your account
+on our Service.
 </p>
 
-<h2>Definitions</h2>
+<h2>Content & Services</h2>
 <p>
-“Platform” refers to the Yimaru Academy mobile app, website, and related services.<br>
+Our Service allows you to access learning materials. You are granted a limited
-“Content” refers to all lessons, videos, quizzes, exams, AI feedback, and learning materials.<br>
+license to access and use the app content for personal, non-commercial purposes.
-“Subscription” refers to paid access plans for premium content and services.
+You agree not to:
 </p>
 
-<h2>Eligibility</h2>
-<p>
-Our services are intended for users who are at least 8 years old.
-</p>
-
-<p>
-Users under the age of 16 may require parental or guardian consent under applicable law.
-</p>
-
-<p>
-By using the Platform, you confirm that you meet these eligibility requirements.
-</p>
-
-<h2>Acceptance of Terms</h2>
-<p>
-By creating an account, subscribing, or accessing our content, you accept these Terms and our Privacy Policy.
-</p>
-
-<p>
-We may update these Terms from time to time. Continued use of the Platform means you accept the updated version.
-</p>
-
-<h2>Subscription & Fees</h2>
-<p>
-Certain features, courses, and English proficiency exam preparation materials require a paid subscription.
-</p>
-
-<p>
-Subscription pricing, billing periods, and available plans are displayed on the Platform and may be updated from time to time.
-</p>
-
-<p>
-By purchasing a subscription, you authorize us to charge the applicable fees through your selected payment method.
-</p>
-
-<h2>No Refund Policy</h2>
-<p>
-We do not offer refunds once a subscription has been purchased. Please review available content carefully before subscribing.
-</p>
-
-<h2>Use of Service</h2>
-<p>
-You agree to use the Platform only for lawful, personal, and educational purposes.
-</p>
-
-<p>You must not:</p>
 <ul>
-  <li>Share your account credentials with others.</li>
+  <li>Reproduce, duplicate, copy, or sell any material from the app.</li>
-  <li>Copy, reproduce, or distribute our content without written permission.</li>
+  <li>Redistribute content from Yimaru.</li>
-  <li>Use the Platform for harmful, abusive, or fraudulent activities.</li>
+  <li>Use the app in any way that is damaging or harmful.</li>
-  <li>Attempt to access or modify the system in any unauthorized way.</li>
 </ul>
 
-<h2>Intellectual Property</h2>
+<h2>Privacy Policy</h2>
 <p>
-All content, including lessons, videos, exams, quizzes, AI-generated feedback, and learning materials, is the intellectual property of Yimaru Academy.
+Your privacy is important to us. Please read our
-</p>
+<a href="#">Privacy Policy</a>
-
+to understand how we collect, use, and share information about you.
-<p>
-You are granted a limited, non-exclusive, non-transferable license to use the content for personal learning only.
-</p>
-
-<p>
-Unauthorized use, resale, or redistribution of our materials is strictly prohibited.
-</p>
-
-<h2>AI-Generated Content Disclaimer</h2>
-<p>
-Some features of the Platform may provide AI-generated feedback, recommendations, or learning assistance.
-</p>
-
-<p>
-While we strive for accuracy, AI-generated content may contain errors and should not be considered professional or guaranteed academic advice.
-</p>
-
-<h2>Privacy</h2>
-<p>
-Your use of the Platform is also governed by our Privacy Policy, which explains how we collect, use, and protect your information.
-</p>
-
-<h2>Account Security</h2>
-<p>
-You are responsible for maintaining the confidentiality of your account credentials.
-</p>
-
-<p>
-If you suspect unauthorized access, contact us immediately at <strong>yimaruacademy@gmail.com</strong>.
-</p>
-
-<p>
-We are not responsible for losses caused by failure to secure your account.
-</p>
-
-<h2>Termination</h2>
-<p>
-We reserve the right to suspend or terminate your account if you violate these Terms, misuse the Platform, or engage in harmful or fraudulent behavior.
-</p>
-
-<p>
-After termination, access to the Platform and content may be removed.
-</p>
-
-<h2>Limitation of Liability</h2>
-<p>
-We aim to provide high-quality learning content but do not guarantee uninterrupted access, error-free performance, or specific learning outcomes (including exam results or fluency improvement).
-</p>
-
-<p>
-To the fullest extent permitted by law, Yimaru Academy is not liable for any indirect or consequential damages resulting from your use of the Platform.
-</p>
-
-<h2>Governing Law & Jurisdiction</h2>
-<p>
-These Terms are governed by the laws of the Federal Democratic Republic of Ethiopia. Any disputes shall be handled under Ethiopian jurisdiction.
-</p>
-
-<h2>Changes to Terms</h2>
-<p>
-We may update these Terms from time to time. Users will be notified of major changes through the Platform or email.
-</p>
-
-<p>
-Continued use of the Platform means acceptance of the updated Terms.
 </p>
 
 <h2>Contact Us</h2>
 <p>
-If you have any questions about these Terms & Conditions, contact us:
+If you have any questions about these Terms, please contact us at
-</p>
+<strong>support@yimaru.et</strong>.
-
-<p>
-<strong>Yimaru Academy</strong><br>
-22 Djibouti St, Addis Ababa, Ethiopia<br>
-+251 946396655<br>
-yimaruacademy@gmail.com
 </p>
 """;

lib/ui/common/translations/codegen_loader.g.dart

@@ -6,7 +6,7 @@ import 'dart:ui';
 
 import 'package:easy_localization/easy_localization.dart' show AssetLoader;
 
-class CodegenLoader extends AssetLoader {
+class CodegenLoader extends AssetLoader{
   const CodegenLoader();
 
   @override
@@ -14,203 +14,169 @@ class CodegenLoader extends AssetLoader {
     return Future.value(mapLocales[locale.toString()]);
   }
 
-  static const Map<String, dynamic> _am = {
+  static const Map<String,dynamic> _am = {
-    "loading": "በመጫን ላይ",
+  "welcome_back": "እንኳን በደህና ተመለሱ",
-    "welcome_back": "እንኳን በደህና ተመለሱ",
+  "dont_have_account": "መለያ የለዎትም? ይመዝገቡ",
-    "checking_user_info": "የተጠቃሚ መረጃን በማረጋገጥ ላይ",
+  "email": "ኢሜይል",
-    "dont_have_account": "መለያ የለዎትም? ይመዝገቡ",
+  "password": "የይለፍ ቃል",
-    "email": "ኢሜይል",
+  "forgot_password": "የይለፍ ቃል ረሱ?",
-    "password": "የይለፍ ቃል",
+  "cont": "ቀጥል",
-    "forgot_password": "የይለፍ ቃል ረሱ?",
+  "register": "ይመዝገቡ",
-    "cont": "ቀጥል",
+  "login_with_google": "በጉግል ይግቡ",
-    "register": "ይመዝገቡ",
+  "or": "ወይም",
-    "login_with_google": "በጉግል ይግቡ",
+  "login_with_phone": "በስልክ ቁጥር ይግቡ",
-    "or": "ወይም",
+  "create_account": "አዲስ መለያ ይፍጠሩ",
-    "login_with_phone": "በስልክ ቁጥር ይግቡ",
+  "already_have_account": "መለያ አለዎት?",
-    "create_account": "አዲስ መለያ ይፍጠሩ",
+  "login": " ይግቡ ",
-    "already_have_account": "መለያ አለዎት?",
+  "register_with_google": "በጉግል ይመዝገቡ",
-    "login": " ይግቡ ",
+  "register_with_phone": "በስልክ ቁጥር ይመዝገቡ",
-    "register_with_google": "በጉግል ይመዝገቡ",
+  "enter_phone_number": "የስልክ ቁጥርዎን ያስገቡ። የማረጋገጫ ኮድ እንልክልዎታለን።",
-    "register_with_phone": "በስልክ ቁጥር ይመዝገቡ",
+  "login_with_email": "በኢሜይል ይግቡ",
-    "enter_phone_number": "የስልክ ቁጥርዎን ያስገቡ። የማረጋገጫ ኮድ እንልክልዎታለን።",
+  "create_password": "የይለፍ ቃል ይፍጠሩ",
-    "login_with_email": "በኢሜይል ይግቡ",
+  "confirm_password": "የይለፍ ቃል ያረጋግጡ",
-    "create_password": "የይለፍ ቃል ይፍጠሩ",
+  "sign_up_agreement": "‘ይመዝገቡ’ የሚለውን ሲጫኑ በ‘አገልግሎት ውሎች’ እና ‘በግላዊነት ፖሊሲ’ ይስማማሉ።",
-    "confirm_password": "የይለፍ ቃል ያረጋግጡ",
+  "reset_password": " የይለፍ ቃልን ይቀይሩ ",
-    "eight_character_minimum": "ቢያንስ 8 ፊደላት",
+  "enter_email_reset_code": "ኢሜይልዎን ያስገቡ። የይለፍ ቃል መለወጫ ኮድ እንልክልዎታለን።",
-    "password_match": "የይለፍ ቃሉ ተመሳስሏል",
+  "please_wait": "እባክዎ ይጠብቁ",
-    "sign_up_agreement":
+  "reset_code_sent": "የመቀየሪያ ኮድ በተሳካ ሁኔታ ተልኳል",
-        "‘ይመዝገቡ’ የሚለውን ሲጫኑ በ‘አገልግሎት ውሎች’ እና ‘በግላዊነት ፖሊሲ’ ይስማማሉ።",
+  "reset_code": " የመቀየሪያ ኮድ ",
-    "terms_of_services": "የአገልግሎት ውሎች",
+  "new_password": "አዲስ የይለፍ ቃል",
-    "and": "እና",
+  "logged_in_successfully": "በተሳካ ሁኔታ ገብተዋል",
-    "privacy_policy": "የግላዊነት ፖሊሲ",
+  "view_course": " ኮርሱን ይመልከቱ ",
-    "register_with_email": "በኢሜል ይመዝገቡ",
+  "take_practice": " ልምምድ ያድርጉ ",
-    "verification_code": "የማረጋገጫ ኮድ",
+  "your_current_level": "የአሁኑ ደረጃዎ",
-    "resend_code": "ኮዱን እንደገና ላክ",
+  "overall_progress": "አጠቃላይ እድገት",
-    "code_sent_to_phone": "ኮዱ ወደ ስልክ ቁጥርዎ ተልኳል",
+  "great_work": "በርቱ! በጣም ጥሩ እየሰሩ ነው ",
-    "code_sent_to_email": "ኮዱ ወደ ኢሜል ተልኳል",
+  "view_module": "ሞጁሉን ይመልከቱ",
-    "resend_code_in": "ኮዱን እንደገና ለመላክ የቀረው ጊዜ",
+  "progress": "እድገት",
-    "reset_password": " የይለፍ ቃልን ይቀይሩ ",
+  "keep_going": " ይቀጥሉ - ከግማሽ በላይ ጨርሰዋል ",
-    "enter_email_reset_code": "ኢሜይልዎን ያስገቡ። የይለፍ ቃል መለወጫ ኮድ እንልክልዎታለን።",
+  "lessons_in_module": " በዚህ ሞጁል ውስጥ ያሉ ትምህርቶች ",
-    "please_wait": "እባክዎ ይጠብቁ",
+  "practice": "ልምምድ",
-    "reset_code_sent": "የመቀየሪያ ኮድ በተሳካ ሁኔታ ተልኳል",
+  "start": "ጀምር",
-    "reset_code": " የመቀየሪያ ኮድ ",
+  "in_progress": "በሂደት ላይ",
-    "new_password": "አዲስ የይለፍ ቃል",
+  "hello": "ሰላም",
-    "logged_in_successfully": "በተሳካ ሁኔታ ገብተዋል",
+  "ready_to_learn": " ዛሬ እንግሊዝኛ ለመማር ተዘጋጅተዋል? ",
-    "view_course": " ኮርሱን ይመልከቱ ",
+  "learn": "ይማሩ ",
-    "take_practice": " ልምምድ ያድርጉ ",
+  "course": "ኮርስ",
-    "your_current_level": "የአሁኑ ደረጃዎ",
+  "profile": " ፕሮፋይል ",
-    "overall_progress": "አጠቃላይ እድገት",
+  "speaking_partner": "የንግግር  ጓደኛ ",
-    "great_work": "በርቱ! በጣም ጥሩ እየሰሩ ነው ",
+  "practice_what_you_learned": "አሁን የተማሩትን እንለማመድ",
-    "view_module": "ሞጁሉን ይመልከቱ",
+  "practice_questions": "ጥቂት ጥያቄዎችን እጠይቃለሁ እና መልስ መስጠት ይችላሉ",
-    "progress": "እድገት",
+  "start_practice": "ልምምድ ጀምር",
-    "keep_going": " ይቀጥሉ - ከግማሽ በላይ ጨርሰዋል ",
+  "almost_there": "ሊጨርሱ ተቃርበዋል",
-    "lessons_in_module": " በዚህ ሞጁል ውስጥ ያሉ ትምህርቶች ",
+  "finish_session": "እድገትዎን ለማየት ክፍለ ጊዜውን ያጠናቅቁ",
-    "practice": "ልምምድ",
+  "continue_practice": "ልምምዱን ይቀጥሉ",
-    "start": "ጀምር",
+  "end_session": "ክፍለ ጊዜውን ያብቁ ",
-    "in_progress": "በሂደት ላይ",
+  "tap_start_to_listen": "ለማዳመጥ የጀምር ቁልፉን ይጫኑ",
-    "hello": "ሰላም",
+  "practice_speaking": "ንግግርን ይለማመዱ ",
-    "ready_to_learn": " ዛሬ እንግሊዝኛ ለመማር ተዘጋጅተዋል? ",
+  "tap_microphone": "ለመናገር ማይክሮፎኑን ይጫኑ",
-    "learn": "ይማሩ ",
+  "reply": "እንደገና አዳምጥ",
-    "course": "ኮርስ",
+  "cancel": "ይቅር",
-    "profile": " ፕሮፋይል ",
+  "you_are_speaking": "እየተናገሩ ነው",
-    "speaking_partner": "የንግግር  ጓደኛ ",
+  "practice_completed": "ልምምዱ ተጠናቅቋል",
-    "practice_what_you_learned": "አሁን የተማሩትን እንለማመድ",
+  "great_improvement": "በዚህኛው በራስ መተማመንዎ ጨምሯል፤ ትልቅ መሻሻል ነው",
-    "practice_questions": "ጥቂት ጥያቄዎችን እጠይቃለሁ እና መልስ መስጠት ይችላሉ",
+  "practice_again": "እንደገና ይለማመዱ",
-    "start_practice": "ልምምድ ጀምር",
+  "conversation_review": "የንግግር ግምገማ ",
-    "almost_there": "ሊጨርሱ ተቃርበዋል",
+  "result": "ውጤት",
-    "finish_session": "እድገትዎን ለማየት ክፍለ ጊዜውን ያጠናቅቁ",
+  "quick_tip": "ጠቃሚ ምክር",
-    "continue_practice": "ልምምዱን ይቀጥሉ",
+  "retry": "እንደገና ይሞክሩ",
-    "end_session": "ክፍለ ጊዜውን ያብቁ ",
+  "completed_a1": "እንኳን ደስ አለዎት! A1 ደረጃን አጠናቅቀዋል",
-    "tap_start_to_listen": "ለማዳመጥ የጀምር ቁልፉን ይጫኑ",
+  "analyzing_speaking": "የንግግር ችሎታዎን እየገመገምን ነው",
-    "practice_speaking": "ንግግርን ይለማመዱ ",
+  "view_profile": "ፕሮፋይሎን ይመልከቱ ",
-    "tap_microphone": "ለመናገር ማይክሮፎኑን ይጫኑ",
+  "hi": "ሰላም",
-    "reply": "እንደገና አዳምጥ",
+  "edit_profile": "መገለጫ ያስተካክሉ",
-    "cancel": "ይቅር",
+  "first_name": "የመጀመሪያ ስም",
-    "you_are_speaking": "እየተናገሩ ነው",
+  "last_name": "የአባት ስም",
-    "practice_completed": "ልምምዱ ተጠናቅቋል",
+  "gender": "ፆታ",
-    "great_improvement": "በዚህኛው በራስ መተማመንዎ ጨምሯል፤ ትልቅ መሻሻል ነው",
+  "male": "ወንድ",
-    "practice_again": "እንደገና ይለማመዱ",
+  "female": "ሴት",
-    "conversation_review": "የንግግር ግምገማ ",
+  "phone_number": "የስልክ ቁጥር",
-    "result": "ውጤት",
+  "country": "ሀገር",
-    "quick_tip": "ጠቃሚ ምክር",
+  "region": "ክልል",
-    "retry": "እንደገና ይሞክሩ",
+  "occupation": "የስራ መስክ ",
-    "completed_a1": "እንኳን ደስ አለዎት! A1 ደረጃን አጠናቅቀዋል",
+  "save_changes": "ለውጦችን ያስቀምጡ"
-    "analyzing_speaking": "የንግግር ችሎታዎን እየገመገምን ነው",
+};
-    "view_profile": "ፕሮፋይሎን ይመልከቱ ",
+static const Map<String,dynamic> _en = {
-    "hi": "ሰላም",
+  "welcome_back": "Welcome back",
-    "edit_profile": "መገለጫ ያስተካክሉ",
+  "dont_have_account": "Don't have an account? Register",
-    "first_name": "የመጀመሪያ ስም",
+  "email": "Email",
-    "last_name": "የአባት ስም",
+  "password": "Password",
-    "gender": "ፆታ",
+  "forgot_password": "Forgot password?",
-    "male": "ወንድ",
+  "cont": "Continue",
-    "female": "ሴት",
+  "register": "Register",
-    "phone_number": "የስልክ ቁጥር",
+  "login_with_google": "Login with Google",
-    "country": "ሀገር",
+  "or": "Or",
-    "region": "ክልል",
+  "login_with_phone": "Login with phone number",
-    "occupation": "የስራ መስክ ",
+  "create_account": "Create an account",
-    "save_changes": "ለውጦችን ያስቀምጡ"
+  "already_have_account": "Already have an account?",
-  };
+  "login": "Login",
-  static const Map<String, dynamic> _en = {
+  "register_with_google": "Register with Google",
-    "loading": "Loading",
+  "register_with_phone": "Register with phone number",
-    "welcome_back": "Welcome back",
+  "enter_phone_number": "Enter your phone number. We will send you a confirmation code there.",
-    "checking_user_info": "Checking user info",
+  "login_with_email": "Login with email",
-    "dont_have_account": "Don't have an account? Register",
+  "create_password": "Create password",
-    "email": "Email",
+  "confirm_password": "Confirm password",
-    "password": "Password",
+  "sign_up_agreement": "By clicking ‘Sign Up’, you agree to our ‘Terms of Service’ and ‘Privacy Policy’",
-    "forgot_password": "Forgot password?",
+  "reset_password": "Reset Password",
-    "cont": "Continue",
+  "enter_email_reset_code": "Enter your email. We will send you a reset code.",
-    "register": "Register",
+  "please_wait": "Please wait",
-    "login_with_google": "Login with Google",
+  "reset_code_sent": "Reset code sent successfully",
-    "or": "Or",
+  "reset_code": "Reset code",
-    "login_with_phone": "Login with phone number",
+  "new_password": "New password",
-    "create_account": "Create an account",
+  "logged_in_successfully": "Logged in successfully",
-    "already_have_account": "Already have an account?",
+  "view_course": "View course",
-    "login": "Login",
+  "take_practice": "Take practice",
-    "register_with_google": "Register with Google",
+  "your_current_level": "Your current level",
-    "register_with_phone": "Register with phone number",
+  "overall_progress": "Overall progress",
-    "enter_phone_number":
+  "great_work": "Keep up the great work! You're doing amazing",
-        "Enter your phone number. We will send you a confirmation code there.",
+  "view_module": "View module",
-    "login_with_email": "Login with email",
+  "progress": "Progress",
-    "create_password": "Create password",
+  "keep_going": "Let's keep going - you're more than half there",
-    "confirm_password": "Confirm password",
+  "lessons_in_module": "Lessons in this module",
-    "eight_character_minimum": "8 characters minimum",
+  "practice": "Practice",
-    "password_math": "password match",
+  "start": "Start",
-    "sign_up_agreement":
+  "in_progress": "In Progress",
-        "By clicking ‘Sign Up’, you agree to our ‘Terms of Service’ and ‘Privacy Policy’",
+  "hello": "Hello",
-    "terms_of_services": "Terms of Service",
+  "ready_to_learn": "Ready to keep learning English today",
-    "and": "and",
+  "learn": "Learn",
-    "privacy_policy": "Privacy Policy",
+  "course": "Course",
-    "register_with_email": "Register with email",
+  "profile": "Profile",
-    "verification_code": "Verification Code",
+  "speaking_partner": "Speaking partner",
-    "resend_code": "Resend Code",
+  "practice_what_you_learned": "Let's practice what you just learnt",
-    "code_sent_to_phone": "Code sent to your number",
+  "practice_questions": "I will ask you a few questions and you can respond",
-    "code_sent_to_email": "Code sent to your email",
+  "start_practice": "Start practice",
-    "resend_code_in": "Resend code in",
+  "almost_there": "You're almost there",
-    "reset_password": "Reset Password",
+  "finish_session": "Finish the session to see your progress",
-    "enter_email_reset_code":
+  "continue_practice": "Continue practice",
-        "Enter your email. We will send you a reset code.",
+  "end_session": "End session",
-    "please_wait": "Please wait",
+  "tap_start_to_listen": "Tap the start button to listen",
-    "reset_code_sent": "Reset code sent successfully",
+  "practice_speaking": "Practice speaking",
-    "reset_code": "Reset code",
+  "tap_microphone": "Tap the microphone to speak",
-    "new_password": "New password",
+  "reply": "Reply",
-    "logged_in_successfully": "Logged in successfully",
+  "cancel": "Cancel",
-    "view_course": "View course",
+  "you_are_speaking": "You're speaking",
-    "take_practice": "Take practice",
+  "practice_completed": "Practice completed",
-    "your_current_level": "Your current level",
+  "great_improvement": "You sound more confident this time, great improvement",
-    "overall_progress": "Overall progress",
+  "practice_again": "Practice again",
-    "great_work": "Keep up the great work! You're doing amazing",
+  "conversation_review": "Conversation review",
-    "view_module": "View module",
+  "result": "Result",
-    "progress": "Progress",
+  "quick_tip": "Quick tip",
-    "keep_going": "Let's keep going - you're more than half there",
+  "retry": "Retry",
-    "lessons_in_module": "Lessons in this module",
+  "completed_a1": "Yay, you've completed A1",
-    "practice": "Practice",
+  "analyzing_speaking": "We're now analyzing your speaking skill",
-    "start": "Start",
+  "view_profile": "View profile",
-    "in_progress": "In Progress",
+  "hi": "Hi",
-    "hello": "Hello",
+  "edit_profile": "Edit profile",
-    "ready_to_learn": "Ready to keep learning English today",
+  "first_name": "First name",
-    "learn": "Learn",
+  "last_name": "Last name",
-    "course": "Course",
+  "gender": "Gender",
-    "profile": "Profile",
+  "male": "Male",
-    "speaking_partner": "Speaking partner",
+  "female": "Female",
-    "practice_what_you_learned": "Let's practice what you just learnt",
+  "phone_number": "Phone number",
-    "practice_questions": "I will ask you a few questions and you can respond",
+  "country": "Country",
-    "start_practice": "Start practice",
+  "region": "Region",
-    "almost_there": "You're almost there",
+  "occupation": "Occupation",
-    "finish_session": "Finish the session to see your progress",
+  "save_changes": "Save changes"
-    "continue_practice": "Continue practice",
+};
-    "end_session": "End session",
+static const Map<String, Map<String,dynamic>> mapLocales = {"am": _am, "en": _en};
-    "tap_start_to_listen": "Tap the start button to listen",
-    "practice_speaking": "Practice speaking",
-    "tap_microphone": "Tap the microphone to speak",
-    "reply": "Reply",
-    "cancel": "Cancel",
-    "you_are_speaking": "You're speaking",
-    "practice_completed": "Practice completed",
-    "great_improvement":
-        "You sound more confident this time, great improvement",
-    "practice_again": "Practice again",
-    "conversation_review": "Conversation review",
-    "result": "Result",
-    "quick_tip": "Quick tip",
-    "retry": "Retry",
-    "completed_a1": "Yay, you've completed A1",
-    "analyzing_speaking": "We're now analyzing your speaking skill",
-    "view_profile": "View profile",
-    "hi": "Hi",
-    "edit_profile": "Edit profile",
-    "first_name": "First name",
-    "last_name": "Last name",
-    "gender": "Gender",
-    "male": "Male",
-    "female": "Female",
-    "phone_number": "Phone number",
-    "country": "Country",
-    "region": "Region",
-    "occupation": "Occupation",
-    "save_changes": "Save changes"
-  };
-  static const Map<String, Map<String, dynamic>> mapLocales = {
-    "am": _am,
-    "en": _en
-  };
 }

lib/ui/common/translations/locale_keys.g.dart

@@ -2,10 +2,8 @@
 
 // ignore_for_file: constant_identifier_names
 
-abstract class LocaleKeys {
+abstract class  LocaleKeys {
-  static const loading = 'loading';
   static const welcome_back = 'welcome_back';
-  static const checking_user_info = 'checking_user_info';
   static const dont_have_account = 'dont_have_account';
   static const email = 'email';
   static const password = 'password';
@@ -24,18 +22,7 @@ abstract class LocaleKeys {
   static const login_with_email = 'login_with_email';
   static const create_password = 'create_password';
   static const confirm_password = 'confirm_password';
-  static const eight_character_minimum = 'eight_character_minimum';
-  static const password_match = 'password_match';
   static const sign_up_agreement = 'sign_up_agreement';
-  static const terms_of_services = 'terms_of_services';
-  static const and = 'and';
-  static const privacy_policy = 'privacy_policy';
-  static const register_with_email = 'register_with_email';
-  static const verification_code = 'verification_code';
-  static const resend_code = 'resend_code';
-  static const code_sent_to_phone = 'code_sent_to_phone';
-  static const code_sent_to_email = 'code_sent_to_email';
-  static const resend_code_in = 'resend_code_in';
   static const reset_password = 'reset_password';
   static const enter_email_reset_code = 'enter_email_reset_code';
   static const please_wait = 'please_wait';
@@ -94,4 +81,5 @@ abstract class LocaleKeys {
   static const region = 'region';
   static const occupation = 'occupation';
   static const save_changes = 'save_changes';
+
 }

lib/ui/common/ui_helpers.dart

@@ -100,12 +100,6 @@ double getResponsiveFontSize(
   return responsiveSize;
 }
 
-BoxDecoration bgDecoration = const BoxDecoration(
-  image: DecorationImage(
-    image: AssetImage('assets/images/pattern.png'),
-  ),
-);
-
 InputDecoration inputDecoration(
         {String? hint,
         Widget? suffix,
@@ -197,13 +191,6 @@ TextStyle style18W600 = const TextStyle(
   fontWeight: FontWeight.w600,
 );
 
-TextStyle style25W400 = const TextStyle(
-  fontSize: 25,
-  color: kcWhite,
-  fontWeight: FontWeight.w400
-);
-
-
 TextStyle style25W600 = const TextStyle(
   fontSize: 25,
   color: kcWhite,
@@ -251,12 +238,6 @@ TextStyle style25P600 = const TextStyle(
   fontWeight: FontWeight.w600,
 );
 
-TextStyle style25P400 = const TextStyle(
-  fontSize: 25,
-  color: kcPrimaryColor,
-  fontWeight: FontWeight.w400,
-);
-
 TextStyle style40P900 = const TextStyle(
   fontSize: 40,
   color: kcPrimaryColor,

lib/ui/views/arif_pay/arif_pay_view.dart

@@ -1,11 +1,13 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_inappwebview/flutter_inappwebview.dart';
 import 'package:stacked/stacked.dart';
+import 'package:yimaru_app/models/learn_subscription.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 '../../../models/learn_subscription_request.dart';
 import 'arif_pay_viewmodel.dart';
 
 class ArifPayView extends StackedView<ArifPayViewModel> {

lib/ui/views/assessment/assessment_viewmodel.dart

@@ -26,8 +26,7 @@ class AssessmentViewModel extends ReactiveViewModel {
   List<ListenableServiceMixin> get listenableServices => [_localizationService];
 
   // Languages
-  Map<String, dynamic> get _selectedLanguage =>
+  Map<String, dynamic> get _selectedLanguage => _localizationService.selectedLanguage;
-      _localizationService.selectedLanguage;
 
   Map<String, dynamic> get selectedLanguage => _selectedLanguage;
 

lib/ui/views/assessment/screens/assessment_intro_screen.dart

@@ -67,8 +67,8 @@ class AssessmentIntroScreen extends ViewModelWidget<AssessmentViewModel> {
         showBackButton: true,
         onPop: viewModel.goBack,
         showLanguageSelection: true,
-        language: viewModel.selectedLanguage['code'],
+    language: viewModel.selectedLanguage['code'],
-        onLanguage: () async => await viewModel.navigateToLanguage(),
+    onLanguage: () async => await viewModel.navigateToLanguage(),
       );
 
   Widget _buildTitle() => Text(

lib/ui/views/assessment/screens/assessment_result_screen.dart

@@ -35,8 +35,9 @@ class AssessmentResultScreen extends ViewModelWidget<AssessmentViewModel> {
         showBackButton: true,
         onPop: viewModel.goBack,
         showLanguageSelection: true,
-        language: viewModel.selectedLanguage['code'],
+    language: viewModel.selectedLanguage['code'],
-        onLanguage: () async => await viewModel.navigateToLanguage(),
+
+    onLanguage: () async => await viewModel.navigateToLanguage(),
       );
 
   Widget _buildExpandedBody(AssessmentViewModel viewModel) =>

lib/ui/views/course/course_view.dart

@@ -1,10 +1,16 @@
 import 'package:flutter/material.dart';
 import 'package:stacked/stacked.dart';
 
+import '../../../models/course_detail.dart';
+import '../../../models/course_catalog.dart';
 import '../../common/app_colors.dart';
+import '../../common/enmus.dart';
 import '../../common/ui_helpers.dart';
 import '../../widgets/course_category_card.dart';
+import '../../widgets/course_tile.dart';
+import '../../widgets/custom_circular_progress_indicator.dart';
 import '../../widgets/profile_app_bar.dart';
+import '../../widgets/small_app_bar.dart';
 import 'course_viewmodel.dart';
 
 class CourseView extends StackedView<CourseViewModel> {

lib/ui/views/course/course_viewmodel.dart

@@ -3,8 +3,13 @@ import 'package:stacked_services/stacked_services.dart';
 
 import '../../../app/app.locator.dart';
 import '../../../app/app.router.dart';
+import '../../../models/course.dart';
+import '../../../models/course_detail.dart';
 import '../../../models/user.dart';
 import '../../../services/authentication_service.dart';
+import '../../../services/course_service.dart';
+import '../../../services/status_checker_service.dart';
+import '../../common/enmus.dart';
 
 class CourseViewModel extends ReactiveViewModel {
   // Dependency injection

lib/ui/views/course_catalog/course_catalog_viewmodel.dart

@@ -4,6 +4,7 @@ import 'package:yimaru_app/models/course_catalog.dart';
 
 import '../../../app/app.locator.dart';
 import '../../../app/app.router.dart';
+import '../../../services/api_service.dart';
 import '../../../services/course_service.dart';
 import '../../../services/status_checker_service.dart';
 import '../../common/enmus.dart';

lib/ui/views/course_practice_question/course_practice_question_viewmodel.dart

@@ -3,6 +3,7 @@ import 'package:stacked/stacked.dart';
 import 'package:stacked_services/stacked_services.dart';
 
 import '../../../app/app.locator.dart';
+import '../../../app/app.router.dart';
 import '../../../models/option.dart';
 import '../../../models/assessment_question.dart';
 import '../../../services/api_service.dart';
@@ -153,6 +154,8 @@ class CoursePracticeQuestionViewModel extends FormViewModel {
   // Navigation
   void pop() => _navigationService.back();
 
+
+
   // Remote api call
 
   // Question navigation

lib/ui/views/course_practice_question/screens/question_loading_screen.dart

@@ -44,7 +44,8 @@ class QuestionLoadingScreen extends StatelessWidget {
         onPop: onPop,
         showBackButton: true,
         showLanguageSelection: false,
-      );
+
+  );
 
   Widget _buildBody() => Expanded(child: Container());
 

lib/ui/views/course_unit/course_unit_viewmodel.dart

@@ -1,8 +1,10 @@
 import 'package:stacked/stacked.dart';
 import 'package:stacked_services/stacked_services.dart';
+import 'package:yimaru_app/models/course_module.dart';
 
 import '../../../app/app.locator.dart';
 import '../../../models/course_unit.dart';
+import '../../../services/api_service.dart';
 import '../../../services/course_service.dart';
 import '../../../services/status_checker_service.dart';
 import '../../common/enmus.dart';

lib/ui/views/forget_password/forget_password_viewmodel.dart

@@ -24,8 +24,7 @@ class ForgetPasswordViewModel extends ReactiveViewModel
   List<ListenableServiceMixin> get listenableServices => [_localizationService];
 
   // Languages
-  Map<String, dynamic> get _selectedLanguage =>
+  Map<String, dynamic> get _selectedLanguage => _localizationService.selectedLanguage;
-      _localizationService.selectedLanguage;
 
   Map<String, dynamic> get selectedLanguage => _selectedLanguage;
 
@@ -182,6 +181,7 @@ class ForgetPasswordViewModel extends ReactiveViewModel
   Future<void> navigateToLanguage() async =>
       await _navigationService.navigateToLanguageView();
 
+
   Future<void> replaceWithLogin() async =>
       await _navigationService.clearStackAndShow(Routes.loginView);
 

lib/ui/views/forget_password/screens/request_reset_code_screen.dart

@@ -53,15 +53,7 @@ class RequestCodeScreen extends ViewModelWidget<ForgetPasswordViewModel> {
           required ForgetPasswordViewModel viewModel}) =>
       Scaffold(
         backgroundColor: kcBackgroundColor,
-        body: _buildScaffoldContainer(context: context, viewModel: viewModel),
+        body: _buildScaffoldStack(context: context, viewModel: viewModel),
-      );
-
-  Widget _buildScaffoldContainer(
-          {required BuildContext context,
-          required ForgetPasswordViewModel viewModel}) =>
-      Container(
-        decoration: bgDecoration,
-        child: _buildScaffoldStack(context: context, viewModel: viewModel),
       );
 
   Widget _buildScaffoldStack(
@@ -96,9 +88,11 @@ class RequestCodeScreen extends ViewModelWidget<ForgetPasswordViewModel> {
         showBackButton: true,
         showLanguageSelection: true,
         onPop: () => _inAppPop(viewModel),
-        language: viewModel.selectedLanguage['code'],
+    language: viewModel.selectedLanguage['code'],
-        onLanguage: () async => await viewModel.navigateToLanguage(),
+
-      );
+    onLanguage: ()async => await viewModel.navigateToLanguage(),
+
+  );
 
   Widget _buildExpandedBody(
           {required BuildContext context,

lib/ui/views/forget_password/screens/reset_password_screen.dart

@@ -1,10 +1,8 @@
-import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:stacked/stacked.dart';
 
 import '../../../common/app_colors.dart';
 import '../../../common/enmus.dart';
-import '../../../common/translations/locale_keys.g.dart';
 import '../../../common/ui_helpers.dart';
 import '../../../widgets/custom_elevated_button.dart';
 import '../../../widgets/custom_form_label.dart';
@@ -60,15 +58,7 @@ class ResetPasswordScreen extends ViewModelWidget<ForgetPasswordViewModel> {
           required ForgetPasswordViewModel viewModel}) =>
       Scaffold(
         backgroundColor: kcBackgroundColor,
-        body: _buildScaffoldContainer(context: context, viewModel: viewModel),
+        body: _buildScaffoldStack(context: context, viewModel: viewModel),
-      );
-
-  Widget _buildScaffoldContainer(
-          {required BuildContext context,
-          required ForgetPasswordViewModel viewModel}) =>
-      Container(
-        decoration: bgDecoration,
-        child: _buildScaffoldStack(context: context, viewModel: viewModel),
       );
 
   Widget _buildScaffoldStack(
@@ -96,9 +86,11 @@ class ResetPasswordScreen extends ViewModelWidget<ForgetPasswordViewModel> {
         showBackButton: true,
         showLanguageSelection: true,
         onPop: () => _inAppPop(viewModel),
-        language: viewModel.selectedLanguage['code'],
+    language: viewModel.selectedLanguage['code'],
-        onLanguage: () async => await viewModel.navigateToLanguage(),
+
-      );
+    onLanguage: ()async => await viewModel.navigateToLanguage(),
+
+  );
 
   Widget _buildExpandedBody(ForgetPasswordViewModel viewModel) =>
       Expanded(child: _buildColumnScroller(viewModel));
@@ -123,7 +115,7 @@ class ResetPasswordScreen extends ViewModelWidget<ForgetPasswordViewModel> {
         verticalSpaceMedium,
         _buildTitle(),
         verticalSpaceMedium,
-        _buildFormLabel(LocaleKeys.reset_code.tr()),
+        _buildFormLabel('Reset code'),
         verticalSpaceSmall,
         _buildResetCodeFormField(viewModel),
         if (viewModel.hasResetCodeValidationMessage && viewModel.focusResetCode)
@@ -131,7 +123,7 @@ class ResetPasswordScreen extends ViewModelWidget<ForgetPasswordViewModel> {
         if (viewModel.hasResetCodeValidationMessage && viewModel.focusResetCode)
           _buildResetCodeValidationWrapper(viewModel),
         verticalSpaceMedium,
-        _buildFormLabel(LocaleKeys.new_password.tr()),
+        _buildFormLabel('New Password'),
         verticalSpaceSmall,
         _buildPasswordFormField(viewModel),
         if (viewModel.hasPasswordValidationMessage && viewModel.focusPassword)
@@ -139,7 +131,7 @@ class ResetPasswordScreen extends ViewModelWidget<ForgetPasswordViewModel> {
         if (viewModel.hasPasswordValidationMessage && viewModel.focusPassword)
           _buildPasswordValidationWrapper(viewModel),
         verticalSpaceMedium,
-        _buildFormLabel(LocaleKeys.confirm_password.tr()),
+        _buildFormLabel('Confirm Password'),
         verticalSpaceSmall,
         _buildConfirmPasswordFormField(viewModel),
         if (viewModel.hasConfirmPasswordValidationMessage &&
@@ -159,7 +151,7 @@ class ResetPasswordScreen extends ViewModelWidget<ForgetPasswordViewModel> {
       ];
 
   Widget _buildTitle() => Text(
-        LocaleKeys.reset_password.tr(),
+        'Reset password',
         style: style25DG600,
       );
 
@@ -173,7 +165,7 @@ class ResetPasswordScreen extends ViewModelWidget<ForgetPasswordViewModel> {
         controller: resetCodeController,
         onTap: viewModel.setResetCodeFocus,
         decoration: inputDecoration(
-            hint: LocaleKeys.reset_code.tr(),
+            hint: 'Reset code',
             focus: viewModel.focusResetCode,
             filled: passwordController.text.isNotEmpty),
       );
@@ -194,7 +186,7 @@ class ResetPasswordScreen extends ViewModelWidget<ForgetPasswordViewModel> {
         onTap: viewModel.setPasswordFocus,
         obscureText: viewModel.obscurePassword,
         decoration: inputDecoration(
-            hint: LocaleKeys.password.tr(),
+            hint: 'Password',
             focus: viewModel.focusPassword,
             suffix: _buildObscurePassword(viewModel),
             filled: passwordController.text.isNotEmpty),
@@ -229,7 +221,7 @@ class ResetPasswordScreen extends ViewModelWidget<ForgetPasswordViewModel> {
             password: passwordController.text,
             confirmPassword: confirmPasswordController.text),
         decoration: inputDecoration(
-            hint: LocaleKeys.confirm_password.tr(),
+            hint: 'Confirm Password',
             focus: viewModel.focusConfirmPassword,
             suffix: _buildObscureConfirmPassword(viewModel),
             filled: confirmPasswordController.text.isNotEmpty),
@@ -263,22 +255,21 @@ class ResetPasswordScreen extends ViewModelWidget<ForgetPasswordViewModel> {
 
   Widget _buildCharLengthValidator(ForgetPasswordViewModel viewModel) =>
       ValidatorListTile(
-        label: LocaleKeys.eight_character_minimum.tr(),
+          backgroundColor: viewModel.length ? kcPrimaryColor : kcLightGrey,
-        backgroundColor: viewModel.length ? kcPrimaryColor : kcLightGrey,
+          label: '8 characters minimum');
-      );
 
   Widget _buildPasswordMatchValidator(ForgetPasswordViewModel viewModel) =>
       ValidatorListTile(
-        label: LocaleKeys.password_match.tr(),
+          backgroundColor:
-        backgroundColor: viewModel.passwordMatch ? kcPrimaryColor : kcLightGrey,
+              viewModel.passwordMatch ? kcPrimaryColor : kcLightGrey,
-      );
+          label: 'password match');
 
   Widget _buildSignUpButton(ForgetPasswordViewModel viewModel) =>
       CustomElevatedButton(
         height: 55,
+        text: 'Continue',
         borderRadius: 12,
         foregroundColor: kcWhite,
-        text: LocaleKeys.cont.tr(),
         onTap: passwordController.text.isNotEmpty &&
                 confirmPasswordController.text.isNotEmpty &&
                 resetCodeController.text.isNotEmpty &&

lib/ui/views/home/home_view.dart

@@ -3,6 +3,7 @@ import 'package:stacked/stacked.dart';
 import 'package:yimaru_app/ui/common/app_colors.dart';
 import 'package:yimaru_app/ui/views/learn_program/learn_program_view.dart';
 import 'package:yimaru_app/ui/views/profile/profile_view.dart';
+import 'package:yimaru_app/ui/widgets/coming_soon.dart';
 
 import '../course/course_view.dart';
 import 'home_viewmodel.dart';

lib/ui/views/landing/landing_view.dart

@@ -1,52 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:flutter_carousel_widget/flutter_carousel_widget.dart';
-import 'package:stacked/stacked.dart';
-import 'package:yimaru_app/ui/views/landing/screens/first_landing_screen.dart';
-import 'package:yimaru_app/ui/views/landing/screens/second_landing_screen.dart';
-import 'package:yimaru_app/ui/views/landing/screens/third_landing_screen.dart';
-
-import 'landing_viewmodel.dart';
-
-class LandingView extends StackedView<LandingViewModel> {
-  const LandingView({Key? key}) : super(key: key);
-
-
-  @override
-  LandingViewModel viewModelBuilder(
-      BuildContext context,
-      ) =>
-      LandingViewModel();
-
-  @override
-  Widget builder(
-    BuildContext context,
-    LandingViewModel viewModel,
-    Widget? child,
-  )=> _buildLandingScreens(viewModel);
-
-  Widget _buildLandingScreens(LandingViewModel viewModel) => FlutterCarousel(
-    options: FlutterCarouselOptions(
-      autoPlay: true,
-      viewportFraction: 1,
-      showIndicator: true,
-      indicatorMargin: 40,
-      height: double.maxFinite,
-      slideIndicator: CircularSlideIndicator(
-        slideIndicatorOptions:
-        const SlideIndicatorOptions(indicatorRadius: 2.5),
-      ),
-    ),
-    items: _buildScreens(),
-  );
-
-  List<Widget> _buildScreens() =>
-      [_buildFirstWelcome(), _buildSecondWelcome(), _buildThirdWelcome()];
-
-  Widget _buildFirstWelcome() => const FirstLandingScreen();
-
-  Widget _buildSecondWelcome() => const SecondLandingScreen();
-
-  Widget _buildThirdWelcome() => const ThirdLandingScreen();
-
-
-}

lib/ui/views/landing/landing_viewmodel.dart

@@ -1,29 +0,0 @@
-import 'package:stacked/stacked.dart';
-import 'package:stacked_services/stacked_services.dart';
-
-import '../../../app/app.locator.dart';
-import '../../../app/app.router.dart';
-import '../../../services/authentication_service.dart';
-
-class LandingViewModel extends BaseViewModel {
-  // Dependency Injection
-  final _navigationService = locator<NavigationService>();
-
-  final _authenticationService = locator<AuthenticationService>();
-
-  // Navigation
-  Future<void> navigateToLogin() async =>
-      await _navigationService.replaceWithLoginView();
-
-  // Remote api call
-
-  // First time install
-  Future<void> setFirstTimeInstall() async {
-    await runBusyFuture(_setFirstTimeInstall());
-  }
-
-  Future<void> _setFirstTimeInstall() async {
-    await _authenticationService.setFirstTimeInstall(false);
-    await navigateToLogin();
-  }
-}

lib/ui/views/landing/screens/first_landing_screen.dart

@@ -1,145 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:flutter_svg/svg.dart';
-import 'package:stacked/stacked.dart';
-import 'package:yimaru_app/ui/common/app_colors.dart';
-import 'package:yimaru_app/ui/common/ui_helpers.dart';
-import 'package:yimaru_app/ui/widgets/custom_elevated_button.dart';
-
-import '../../../widgets/custom_circular_progress_indicator.dart';
-import '../landing_viewmodel.dart';
-
-class FirstLandingScreen extends ViewModelWidget<LandingViewModel> {
-  const FirstLandingScreen({super.key});
-
-  @override
-  Widget build(BuildContext context, LandingViewModel viewModel) =>
-      _buildScaffoldWrapper(viewModel);
-
-  Widget _buildScaffoldWrapper(LandingViewModel viewModel) => Scaffold(
-        backgroundColor: kcPrimaryColor,
-        body: _buildScaffoldPadding(viewModel),
-      );
-  Widget _buildScaffoldPadding(LandingViewModel viewModel)=>  Padding(
-      padding: const EdgeInsets.symmetric(horizontal: 15),
-  child: _buildScaffold(viewModel),);
-
-  Widget _buildScaffold(LandingViewModel viewModel) => Column(
-    mainAxisSize: MainAxisSize.min,
-    crossAxisAlignment: CrossAxisAlignment.stretch,
-    mainAxisAlignment: MainAxisAlignment.spaceBetween,
-    children: _buildScaffoldChildren(viewModel),
-      );
-
-  List<Widget> _buildScaffoldChildren(LandingViewModel viewModel) =>
-      [ _buildUpperColumn(),_buildLowerColumnWrapper(viewModel)];
-
-
-
-
-  Widget _buildUpperColumn() => Column(
-        mainAxisSize: MainAxisSize.min,
-        crossAxisAlignment: CrossAxisAlignment.stretch,
-        children: _buildUpperColumnChildren(),
-      );
-
-  List<Widget> _buildUpperColumnChildren() => [
-        verticalSpaceLarge,
-    _buildIconWrapper(),
-    verticalSpaceLarge
-
-      ];
-
-  Widget _buildIconWrapper()=> Align(alignment: Alignment.topLeft,child: _buildIcon(),);
-
-  Widget _buildIcon() => SvgPicture.asset(
-        'assets/icons/logo.svg',
-        height: 25,
-      );
-
-
-
-  Widget _buildLowerColumnWrapper(LandingViewModel viewModel) => Expanded(
-    child: _buildLowerColumn(viewModel),
-  );
-
-  Widget _buildLowerColumn(LandingViewModel viewModel) => Column(
-    mainAxisSize: MainAxisSize.min,
-    crossAxisAlignment: CrossAxisAlignment.stretch,
-    children: _buildLowerColumnChildren(viewModel),
-  );
-
-  List<Widget> _buildLowerColumnChildren(LandingViewModel viewModel) => [
-   _buildTitle(),
-    verticalSpaceMedium,
-    _buildImageWrapper(),
-    verticalSpaceMedium,
-    _buildSafeWrapper(viewModel)
-  ];
-
-  Widget _buildTitle() =>
-
-      Text.rich(
-        TextSpan(
-          text: 'እንግሊዝኛ\n',
-          style: style25W600,
-          children: [
-            TextSpan(
-              text: 'በማንኛውም',
-              style: style25W400,
-            ),
-            TextSpan(
-              text: ' ሰዓት ',
-              style: style25W600,
-
-            ),
-
-            TextSpan(
-              text: 'ይማሩ!',
-              style: style25W400,
-
-            ),
-          ],
-        ),
-      );
-
-  Widget _buildImageWrapper()=> Expanded(child: _buildImageClipper());
-
-  Widget _buildImageClipper()=> ClipRRect(
-    borderRadius: BorderRadius.circular(25),
-    child: _buildImage(),
-  );
-
-
-
-  Widget _buildImage()=> Image.asset('assets/images/profile.png',fit: BoxFit.cover,);
-
-
-  Widget _buildSafeWrapper(LandingViewModel viewModel) =>
-      SafeArea(child: _buildContinueButtonWrapper(viewModel));
-
-  Widget _buildContinueButtonWrapper(LandingViewModel viewModel) => Align(
-        alignment: Alignment.bottomCenter,
-        child: _buildButtonContainer(viewModel),
-      );
-
-  Widget _buildButtonContainer(LandingViewModel viewModel) => Padding(
-        padding: const EdgeInsets.only(bottom: 50),
-        child: _buildContinueButtonState(viewModel),
-      );
-
-  Widget _buildContinueButtonState(LandingViewModel viewModel) =>
-      viewModel.isBusy ? _buildIndicator() : _buildContinueButton(viewModel);
-
-  Widget _buildIndicator() =>
-      const CustomCircularProgressIndicator(color: kcWhite);
-
-  Widget _buildContinueButton(LandingViewModel viewModel) =>
-      CustomElevatedButton(
-        height: 55,
-        borderRadius: 25,
-        text: 'Get Started',
-        backgroundColor: kcWhite,
-        foregroundColor: kcPrimaryColor,
-        onTap: () async => await viewModel.setFirstTimeInstall(),
-      );
-}

lib/ui/views/landing/screens/second_landing_screen.dart

@@ -1,146 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:flutter_svg/svg.dart';
-import 'package:stacked/stacked.dart';
-import 'package:yimaru_app/ui/common/app_colors.dart';
-import 'package:yimaru_app/ui/common/ui_helpers.dart';
-import 'package:yimaru_app/ui/widgets/custom_elevated_button.dart';
-
-import '../../../widgets/custom_circular_progress_indicator.dart';
-import '../landing_viewmodel.dart';
-
-class SecondLandingScreen extends ViewModelWidget<LandingViewModel> {
-  const SecondLandingScreen({super.key});
-
-  @override
-  Widget build(BuildContext context, LandingViewModel viewModel) =>
-      _buildScaffoldWrapper(viewModel);
-
-  Widget _buildScaffoldWrapper(LandingViewModel viewModel) => Scaffold(
-    backgroundColor: Colors.amber,
-    body: _buildScaffoldPadding(viewModel),
-  );
-  Widget _buildScaffoldPadding(LandingViewModel viewModel)=>  Padding(
-    padding: const EdgeInsets.symmetric(horizontal: 15),
-    child: _buildScaffold(viewModel),);
-
-  Widget _buildScaffold(LandingViewModel viewModel) => Column(
-    mainAxisSize: MainAxisSize.min,
-    crossAxisAlignment: CrossAxisAlignment.stretch,
-    mainAxisAlignment: MainAxisAlignment.spaceBetween,
-    children: _buildScaffoldChildren(viewModel),
-  );
-
-  List<Widget> _buildScaffoldChildren(LandingViewModel viewModel) =>
-      [ _buildUpperColumn(),_buildLowerColumnWrapper(viewModel)];
-
-
-
-
-  Widget _buildUpperColumn() => Column(
-    mainAxisSize: MainAxisSize.min,
-    crossAxisAlignment: CrossAxisAlignment.stretch,
-    children: _buildUpperColumnChildren(),
-  );
-
-  List<Widget> _buildUpperColumnChildren() => [
-    verticalSpaceLarge,
-    _buildIconWrapper(),
-    verticalSpaceLarge
-
-  ];
-
-  Widget _buildIconWrapper()=> Align(alignment: Alignment.topLeft,child: _buildIcon(),);
-
-  Widget _buildIcon() => SvgPicture.asset(
-    'assets/icons/logo.svg',
-    color: kcPrimaryColor,
-    height: 25,
-  );
-
-
-
-  Widget _buildLowerColumnWrapper(LandingViewModel viewModel) => Expanded(
-    child: _buildLowerColumn(viewModel),
-  );
-
-  Widget _buildLowerColumn(LandingViewModel viewModel) => Column(
-    mainAxisSize: MainAxisSize.min,
-    crossAxisAlignment: CrossAxisAlignment.stretch,
-    children: _buildLowerColumnChildren(viewModel),
-  );
-
-  List<Widget> _buildLowerColumnChildren(LandingViewModel viewModel) => [
-    _buildTitle(),
-    verticalSpaceMedium,
-    _buildImageWrapper(),
-    verticalSpaceMedium,
-    _buildSafeWrapper(viewModel)
-  ];
-
-  Widget _buildTitle() =>
-
-      Text.rich(
-        TextSpan(
-          text: 'እንግሊዝኛ\n',
-          style: style25P600,
-          children: [
-            TextSpan(
-              text: 'በማንኛውም',
-              style: style25P400,
-            ),
-            TextSpan(
-              text: ' እድሜ ',
-              style: style25P600,
-
-            ),
-
-            TextSpan(
-              text: 'ይማሩ!',
-              style: style25P400,
-
-            ),
-          ],
-        ),
-      );
-
-  Widget _buildImageWrapper()=> Expanded(child: _buildImageClipper());
-
-  Widget _buildImageClipper()=> ClipRRect(
-    borderRadius: BorderRadius.circular(25),
-    child: _buildImage(),
-  );
-
-
-
-  Widget _buildImage()=> Image.asset('assets/images/profile.png',fit: BoxFit.cover,);
-
-
-  Widget _buildSafeWrapper(LandingViewModel viewModel) =>
-      SafeArea(child: _buildContinueButtonWrapper(viewModel));
-
-  Widget _buildContinueButtonWrapper(LandingViewModel viewModel) => Align(
-    alignment: Alignment.bottomCenter,
-    child: _buildButtonContainer(viewModel),
-  );
-
-  Widget _buildButtonContainer(LandingViewModel viewModel) => Padding(
-    padding: const EdgeInsets.only(bottom: 50),
-    child: _buildContinueButtonState(viewModel),
-  );
-
-  Widget _buildContinueButtonState(LandingViewModel viewModel) =>
-      viewModel.isBusy ? _buildIndicator() : _buildContinueButton(viewModel);
-
-  Widget _buildIndicator() =>
-      const CustomCircularProgressIndicator(color: kcWhite);
-
-  Widget _buildContinueButton(LandingViewModel viewModel) =>
-      CustomElevatedButton(
-        height: 55,
-        borderRadius: 25,
-        text: 'Get Started',
-        foregroundColor: kcWhite,
-        backgroundColor: kcPrimaryColor,
-        onTap: () async => await viewModel.setFirstTimeInstall(),
-      );
-}

lib/ui/views/landing/screens/third_landing_screen.dart

@@ -1,146 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:flutter_svg/svg.dart';
-import 'package:stacked/stacked.dart';
-import 'package:yimaru_app/ui/common/app_colors.dart';
-import 'package:yimaru_app/ui/common/ui_helpers.dart';
-import 'package:yimaru_app/ui/widgets/custom_elevated_button.dart';
-
-import '../../../widgets/custom_circular_progress_indicator.dart';
-import '../landing_viewmodel.dart';
-
-class ThirdLandingScreen extends ViewModelWidget<LandingViewModel> {
-  const ThirdLandingScreen({super.key});
-
-  @override
-  Widget build(BuildContext context, LandingViewModel viewModel) =>
-      _buildScaffoldWrapper(viewModel);
-
-  Widget _buildScaffoldWrapper(LandingViewModel viewModel) => Scaffold(
-    backgroundColor: kcWhite,
-    body: _buildScaffoldPadding(viewModel),
-  );
-  Widget _buildScaffoldPadding(LandingViewModel viewModel)=>  Padding(
-    padding: const EdgeInsets.symmetric(horizontal: 15),
-    child: _buildScaffold(viewModel),);
-
-  Widget _buildScaffold(LandingViewModel viewModel) => Column(
-    mainAxisSize: MainAxisSize.min,
-    crossAxisAlignment: CrossAxisAlignment.stretch,
-    mainAxisAlignment: MainAxisAlignment.spaceBetween,
-    children: _buildScaffoldChildren(viewModel),
-  );
-
-  List<Widget> _buildScaffoldChildren(LandingViewModel viewModel) =>
-      [ _buildUpperColumn(),_buildLowerColumnWrapper(viewModel)];
-
-
-
-
-  Widget _buildUpperColumn() => Column(
-    mainAxisSize: MainAxisSize.min,
-    crossAxisAlignment: CrossAxisAlignment.stretch,
-    children: _buildUpperColumnChildren(),
-  );
-
-  List<Widget> _buildUpperColumnChildren() => [
-    verticalSpaceLarge,
-    _buildIconWrapper(),
-    verticalSpaceLarge
-
-  ];
-
-  Widget _buildIconWrapper()=> Align(alignment: Alignment.topLeft,child: _buildIcon(),);
-
-  Widget _buildIcon() => SvgPicture.asset(
-    'assets/icons/logo.svg',
-    color: kcPrimaryColor,
-    height: 25,
-  );
-
-
-
-  Widget _buildLowerColumnWrapper(LandingViewModel viewModel) => Expanded(
-    child: _buildLowerColumn(viewModel),
-  );
-
-  Widget _buildLowerColumn(LandingViewModel viewModel) => Column(
-    mainAxisSize: MainAxisSize.min,
-    crossAxisAlignment: CrossAxisAlignment.stretch,
-    children: _buildLowerColumnChildren(viewModel),
-  );
-
-  List<Widget> _buildLowerColumnChildren(LandingViewModel viewModel) => [
-    _buildTitle(),
-    verticalSpaceMedium,
-    _buildImageWrapper(),
-    verticalSpaceMedium,
-    _buildSafeWrapper(viewModel)
-  ];
-
-  Widget _buildTitle() =>
-
-      Text.rich(
-        TextSpan(
-          text: 'እንግሊዝኛ\n',
-          style: style25P600,
-          children: [
-            TextSpan(
-              text: 'በማንኛውም',
-              style: style25P400,
-            ),
-            TextSpan(
-              text: ' እድሜ ',
-              style: style25P600,
-
-            ),
-
-            TextSpan(
-              text: 'ይማሩ!',
-              style: style25P400,
-
-            ),
-          ],
-        ),
-      );
-
-  Widget _buildImageWrapper()=> Expanded(child: _buildImageClipper());
-
-  Widget _buildImageClipper()=> ClipRRect(
-    borderRadius: BorderRadius.circular(25),
-    child: _buildImage(),
-  );
-
-
-
-  Widget _buildImage()=> Image.asset('assets/images/profile.png',fit: BoxFit.cover,);
-
-
-  Widget _buildSafeWrapper(LandingViewModel viewModel) =>
-      SafeArea(child: _buildContinueButtonWrapper(viewModel));
-
-  Widget _buildContinueButtonWrapper(LandingViewModel viewModel) => Align(
-    alignment: Alignment.bottomCenter,
-    child: _buildButtonContainer(viewModel),
-  );
-
-  Widget _buildButtonContainer(LandingViewModel viewModel) => Padding(
-    padding: const EdgeInsets.only(bottom: 50),
-    child: _buildContinueButtonState(viewModel),
-  );
-
-  Widget _buildContinueButtonState(LandingViewModel viewModel) =>
-      viewModel.isBusy ? _buildIndicator() : _buildContinueButton(viewModel);
-
-  Widget _buildIndicator() =>
-      const CustomCircularProgressIndicator(color: kcWhite);
-
-  Widget _buildContinueButton(LandingViewModel viewModel) =>
-      CustomElevatedButton(
-        height: 55,
-        borderRadius: 25,
-        text: 'Get Started',
-        foregroundColor: kcWhite,
-        backgroundColor: kcPrimaryColor,
-        onTap: () async => await viewModel.setFirstTimeInstall(),
-      );
-}

lib/ui/views/language/language_view.dart

@@ -29,15 +29,7 @@ class LanguageView extends StackedView<LanguageViewModel> {
           required LanguageViewModel viewModel}) =>
       Scaffold(
         backgroundColor: kcBackgroundColor,
-        body: _buildScaffoldContainer(context: context, viewModel: viewModel),
+        body: _buildScaffold(context: context, viewModel: viewModel),
-      );
-
-  Widget _buildScaffoldContainer(
-          {required BuildContext context,
-          required LanguageViewModel viewModel}) =>
-      Container(
-        decoration: bgDecoration,
-        child: _buildScaffold(context: context, viewModel: viewModel),
       );
 
   Widget _buildScaffold(

lib/ui/views/language/language_viewmodel.dart

@@ -14,13 +14,14 @@ class LanguageViewModel extends ReactiveViewModel {
   @override
   List<ListenableServiceMixin> get listenableServices => [_localizationService];
 
+
+
   // Languages
   List<Map<String, dynamic>> get _languages => _localizationService.languages;
 
   List<Map<String, dynamic>> get languages => _languages;
 
-  Map<String, dynamic> get _selectedLanguage =>
+  Map<String, dynamic> get _selectedLanguage => _localizationService.selectedLanguage;
-      _localizationService.selectedLanguage;
 
   Map<String, dynamic> get selectedLanguage => _selectedLanguage;
   // Languages

lib/ui/views/learn_course/learn_course_view.dart

@@ -34,12 +34,7 @@ class LearnCourseView extends StackedView<LearnCourseViewModel> {
 
   Widget _buildScaffoldWrapper(LearnCourseViewModel viewModel) => Scaffold(
         backgroundColor: kcBackgroundColor,
-        body: _buildScaffoldContainer(viewModel),
+        body: _buildScaffold(viewModel),
-      );
-
-  Widget _buildScaffoldContainer(LearnCourseViewModel viewModel) => Container(
-        decoration: bgDecoration,
-        child: _buildScaffold(viewModel),
       );
 
   Widget _buildScaffold(LearnCourseViewModel viewModel) =>

lib/ui/views/learn_course/learn_course_viewmodel.dart

@@ -4,6 +4,7 @@ import 'package:yimaru_app/app/app.router.dart';
 
 import '../../../app/app.locator.dart';
 import '../../../models/learn_course.dart';
+import '../../../services/api_service.dart';
 import '../../../services/learn_service.dart';
 import '../../../services/status_checker_service.dart';
 import '../../common/enmus.dart';

lib/ui/views/learn_lesson/learn_lesson_view.dart

@@ -48,15 +48,7 @@ class LearnLessonView extends StackedView<LearnLessonViewModel> {
           required LearnLessonViewModel viewModel}) =>
       Scaffold(
         backgroundColor: kcBackgroundColor,
-        body: _buildScaffoldContainer(context: context, viewModel: viewModel),
+        body: _buildScaffold(context: context, viewModel: viewModel),
-      );
-
-  Widget _buildScaffoldContainer(
-          {required BuildContext context,
-          required LearnLessonViewModel viewModel}) =>
-      Container(
-        decoration: bgDecoration,
-        child: _buildScaffold(context: context, viewModel: viewModel),
       );
 
   Widget _buildScaffold(

lib/ui/views/learn_lesson_detail/learn_lesson_detail_view.dart

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

lib/ui/views/learn_module/learn_module_view.dart

@@ -37,12 +37,7 @@ class LearnModuleView extends StackedView<LearnModuleViewModel> {
 
   Widget _buildScaffoldWrapper(LearnModuleViewModel viewModel) => Scaffold(
         backgroundColor: kcBackgroundColor,
-        body: _buildScaffoldContainer(viewModel),
+        body: _buildScaffold(viewModel),
-      );
-
-  Widget _buildScaffoldContainer(LearnModuleViewModel viewModel) => Container(
-        decoration: bgDecoration,
-        child: _buildScaffold(viewModel),
       );
 
   Widget _buildScaffold(LearnModuleViewModel viewModel) =>

lib/ui/views/learn_module/learn_module_viewmodel.dart

@@ -4,6 +4,7 @@ import 'package:yimaru_app/app/app.router.dart';
 import 'package:yimaru_app/models/learn_module.dart';
 
 import '../../../app/app.locator.dart';
+import '../../../services/api_service.dart';
 import '../../../services/learn_service.dart';
 import '../../../services/status_checker_service.dart';
 import '../../common/enmus.dart';

lib/ui/views/learn_practice/learn_practice_view.dart

@@ -1,9 +1,8 @@
 import 'package:flutter/material.dart';
 import 'package:stacked/stacked.dart';
 import 'package:yimaru_app/ui/common/enmus.dart';
-import 'package:yimaru_app/ui/views/learn_practice/screens/learn_practice_finish_screen.dart';
+import 'package:yimaru_app/ui/views/learn_practice/screens/finish_learn_practice_screen.dart';
 import 'package:yimaru_app/ui/views/learn_practice/screens/learn_loading_screen.dart';
-import 'package:yimaru_app/ui/views/learn_practice/screens/learn_practice_appreciation_screen.dart';
 import 'package:yimaru_app/ui/views/learn_practice/screens/learn_practice_completion_screen.dart';
 import 'package:yimaru_app/ui/views/learn_practice/screens/learn_practice_description_screen.dart';
 import 'package:yimaru_app/ui/views/learn_practice/screens/learn_practice_result_screen.dart';
@@ -116,12 +115,10 @@ class LearnPracticeView extends StackedView<LearnPracticeViewModel> {
 
   List<Widget> _buildScreens(LearnPracticeViewModel viewModel) => [
         _buildLearnPracticeIntroScreen(),
-        if (practice != LearnPractices.lesson)
+        _buildLearnPracticeElementsScreen(),
-          _buildLearnPracticeElementsScreen(),
         _buildLearnPracticeQuestionsScreen(),
-        _buildLearnPracticeAppreciationScreen(),
+        _buildFinishLearnPracticeScreen(),
         _buildLearnPracticeResultScreen(),
-        _buildLearnPracticeFinishScreen(),
         if (practice == LearnPractices.course)
           _buildLearnPracticeCompletionScreen()
       ];
@@ -140,14 +137,12 @@ class LearnPracticeView extends StackedView<LearnPracticeViewModel> {
   Widget _buildLearnPracticeQuestionsScreen() =>
       const LearnPracticeQuestionsScreen();
 
-  Widget _buildLearnPracticeAppreciationScreen() =>
+  Widget _buildFinishLearnPracticeScreen() => const FinishLearnPracticeScreen();
-      const LearnPracticeAppreciationScreen();
 
   Widget _buildLearnPracticeResultScreen() =>
       LearnPracticeResultScreen(practice: practice);
 
-  Widget _buildLearnPracticeFinishScreen() => const LearnPracticeFinishScreen();
+  Widget _buildLearnPracticeCompletionScreen() => LearnPracticeCompletionScreen(
-
+        level: level ?? '',
-  Widget _buildLearnPracticeCompletionScreen() =>
+      );
-      LearnPracticeCompletionScreen(level: level ?? '');
 }

lib/ui/views/learn_practice/screens/finish_learn_practice_screen.dart

@@ -8,9 +8,9 @@ import '../../../common/ui_helpers.dart';
 import '../../../widgets/custom_elevated_button.dart';
 import '../../../widgets/small_app_bar.dart';
 
-class LearnPracticeFinishScreen
+class FinishLearnPracticeScreen
     extends ViewModelWidget<LearnPracticeViewModel> {
-  const LearnPracticeFinishScreen({super.key});
+  const FinishLearnPracticeScreen({super.key});
 
   Future<void> _reset(LearnPracticeViewModel viewModel) async =>
       await viewModel.reset();
@@ -21,12 +21,7 @@ class LearnPracticeFinishScreen
 
   Widget _buildScaffoldWrapper(LearnPracticeViewModel viewModel) => Scaffold(
         backgroundColor: kcBackgroundColor,
-        body: _buildScaffoldContainer(viewModel),
+        body: _buildScaffold(viewModel),
-      );
-
-  Widget _buildScaffoldContainer(LearnPracticeViewModel viewModel) => Container(
-        decoration: bgDecoration,
-        child: _buildScaffold(viewModel),
       );
 
   Widget _buildScaffold(LearnPracticeViewModel viewModel) =>
@@ -115,9 +110,9 @@ class LearnPracticeFinishScreen
       CustomElevatedButton(
         height: 55,
         borderRadius: 12,
-        onTap: viewModel.pop,
         foregroundColor: kcWhite,
         text: 'Continue Practice',
+        onTap: () => viewModel.goTo(4),
         backgroundColor: kcPrimaryColor,
       );
 

lib/ui/views/learn_practice/screens/interact_learn_practice_screen.dart

@@ -55,15 +55,7 @@ class InteractLearnPracticeScreen
           required LearnPracticeViewModel viewModel}) =>
       Scaffold(
         backgroundColor: kcBackgroundColor,
-        body: _buildScaffoldContainer(context: context, viewModel: viewModel),
+        body: _buildScaffold(context: context, viewModel: viewModel),
-      );
-
-  Widget _buildScaffoldContainer(
-          {required BuildContext context,
-          required LearnPracticeViewModel viewModel}) =>
-      Container(
-        decoration: bgDecoration,
-        child: _buildScaffold(context: context, viewModel: viewModel),
       );
 
   Widget _buildScaffold(

lib/ui/views/learn_practice/screens/learn_loading_screen.dart

@@ -24,12 +24,7 @@ class LearnLoadingScreen extends StatelessWidget {
 
   Widget _buildScaffoldWrapper() => Scaffold(
         backgroundColor: kcBackgroundColor,
-        body: _buildScaffoldContainer(),
+        body: _buildScaffold(),
-      );
-
-  Widget _buildScaffoldContainer() => Container(
-        decoration: bgDecoration,
-        child: _buildScaffold(),
       );
 
   Widget _buildScaffold() => SafeArea(child: _buildStack());

lib/ui/views/learn_practice/screens/learn_practice_appreciation_screen.dart

@@ -1,160 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:flutter_svg/svg.dart';
-import 'package:stacked/stacked.dart';
-import 'package:yimaru_app/ui/views/learn_practice/learn_practice_viewmodel.dart';
-
-import '../../../common/app_colors.dart';
-import '../../../common/ui_helpers.dart';
-import '../../../widgets/cancel_learn_practice_sheet.dart';
-import '../../../widgets/custom_elevated_button.dart';
-import '../../../widgets/small_app_bar.dart';
-
-class LearnPracticeAppreciationScreen
-    extends ViewModelWidget<LearnPracticeViewModel> {
-  const LearnPracticeAppreciationScreen({super.key});
-
-  Future<void> _reset(LearnPracticeViewModel viewModel) async =>
-      await viewModel.reset();
-
-  Future<void> _cancel(LearnPracticeViewModel viewModel) async {
-    await viewModel.stopRecording();
-    viewModel.pop();
-    viewModel.pop();
-  }
-
-  Future<void> _showSheet(
-          {required BuildContext context,
-          required LearnPracticeViewModel viewModel}) async =>
-      await showModalBottomSheet(
-        context: context,
-        isScrollControlled: true,
-        backgroundColor: kcTransparent,
-        builder: (cxt) => _buildSheet(viewModel),
-      );
-
-  @override
-  Widget build(BuildContext context, LearnPracticeViewModel viewModel) =>
-      _buildScaffoldWrapper(context: context, viewModel: viewModel);
-
-  Widget _buildScaffoldWrapper(
-          {required BuildContext context,
-          required LearnPracticeViewModel viewModel}) =>
-      Scaffold(
-        backgroundColor: kcBackgroundColor,
-        body: _buildScaffoldContainer(context: context, viewModel: viewModel),
-      );
-
-  Widget _buildScaffoldContainer(
-          {required BuildContext context,
-          required LearnPracticeViewModel viewModel}) =>
-      Container(
-        decoration: bgDecoration,
-        child: _buildScaffold(context: context, viewModel: viewModel),
-      );
-
-  Widget _buildScaffold(
-          {required BuildContext context,
-          required LearnPracticeViewModel viewModel}) =>
-      SafeArea(
-          child:
-              _buildBodyColumnWrapper(context: context, viewModel: viewModel));
-
-  Widget _buildBodyColumnWrapper(
-          {required BuildContext context,
-          required LearnPracticeViewModel viewModel}) =>
-      Padding(
-        padding: const EdgeInsets.symmetric(horizontal: 15),
-        child: _buildBodyColumn(context: context, viewModel: viewModel),
-      );
-
-  Widget _buildBodyColumn(
-          {required BuildContext context,
-          required LearnPracticeViewModel viewModel}) =>
-      Column(
-        mainAxisAlignment: MainAxisAlignment.spaceBetween,
-        children:
-            _buildBodyColumnChildren(context: context, viewModel: viewModel),
-      );
-
-  List<Widget> _buildBodyColumnChildren(
-          {required BuildContext context,
-          required LearnPracticeViewModel viewModel}) =>
-      [
-        _buildAppBarWrapper(context: context, viewModel: viewModel),
-        _buildSpeakingIndicatorWrapper(viewModel),
-        _buildLowerButtonsSectionWrapper(viewModel)
-      ];
-
-  Widget _buildAppBarWrapper(
-          {required BuildContext context,
-          required LearnPracticeViewModel viewModel}) =>
-      Column(
-        children: [
-          verticalSpaceMedium,
-          _buildAppBar(context: context, viewModel: viewModel),
-          verticalSpaceMedium,
-        ],
-      );
-
-  Widget _buildAppBar(
-          {required BuildContext context,
-          required LearnPracticeViewModel viewModel}) =>
-      SmallAppBar(
-        showBackButton: true,
-        onPop: () async =>
-            await _showSheet(context: context, viewModel: viewModel),
-      );
-
-  Widget _buildSheet(LearnPracticeViewModel viewModel) =>
-      CancelLearnPracticeSheet(
-        onClose: viewModel.pop,
-        onContinue: viewModel.pop,
-        user: viewModel.user?.firstName ?? '',
-        onCancel: () async => await _cancel(viewModel),
-      );
-  Widget _buildSpeakingIndicatorWrapper(LearnPracticeViewModel viewModel) =>
-      Column(
-        mainAxisSize: MainAxisSize.min,
-        mainAxisAlignment: MainAxisAlignment.start,
-        children: _buildSpeakingIndicatorChildren(viewModel),
-      );
-
-  List<Widget> _buildSpeakingIndicatorChildren(
-          LearnPracticeViewModel viewModel) =>
-      [
-        _buildIcon(),
-        verticalSpaceMedium,
-        _buildTitle(viewModel),
-        _buildSubtitle(),
-      ];
-
-  Widget _buildIcon() => SvgPicture.asset('assets/icons/success.svg');
-
-  Widget _buildTitle(LearnPracticeViewModel viewModel) => Text(
-        'Great work, ${viewModel.user?.firstName}',
-        style: style25DG600,
-        textAlign: TextAlign.center,
-      );
-
-  Widget _buildSubtitle() => Text(
-        'You have finished your practice',
-        style: style14DG400,
-        textAlign: TextAlign.center,
-      );
-
-  Widget _buildLowerButtonsSectionWrapper(LearnPracticeViewModel viewModel) =>
-      Padding(
-        padding: const EdgeInsets.symmetric(vertical: 50),
-        child: _buildContinueButton(viewModel),
-      );
-
-  Widget _buildContinueButton(LearnPracticeViewModel viewModel) =>
-      CustomElevatedButton(
-        height: 55,
-        borderRadius: 12,
-        text: 'View My Results',
-        foregroundColor: kcWhite,
-        onTap: () => viewModel.goTo(4),
-        backgroundColor: kcPrimaryColor,
-      );
-}

lib/ui/views/learn_practice/screens/learn_practice_completion_screen.dart

@@ -3,9 +3,12 @@ import 'package:flutter_svg/svg.dart';
 import 'package:stacked/stacked.dart';
 import 'package:yimaru_app/ui/views/learn_practice/learn_practice_viewmodel.dart';
 
+import '../../../../models/learn_practice.dart';
 import '../../../common/app_colors.dart';
+import '../../../common/enmus.dart';
 import '../../../common/ui_helpers.dart';
 import '../../../widgets/custom_elevated_button.dart';
+import '../../../widgets/page_loading_indicator.dart';
 
 class LearnPracticeCompletionScreen
     extends ViewModelWidget<LearnPracticeViewModel> {
@@ -18,12 +21,7 @@ class LearnPracticeCompletionScreen
 
   Widget _buildScaffoldWrapper(LearnPracticeViewModel viewModel) => Scaffold(
         backgroundColor: kcBackgroundColor,
-        body: _buildScaffoldContainer(viewModel),
+        body: _buildBodyWrapper(viewModel),
-      );
-
-  Widget _buildScaffoldContainer(LearnPracticeViewModel viewModel) => Container(
-        decoration: bgDecoration,
-        child: _buildBodyWrapper(viewModel),
       );
 
   Widget _buildBodyWrapper(LearnPracticeViewModel viewModel) => Padding(
@@ -31,18 +29,14 @@ class LearnPracticeCompletionScreen
         child: _buildBody(viewModel),
       );
 
-  Widget _buildBody(LearnPracticeViewModel viewModel) => Stack(
+  Widget _buildBody(LearnPracticeViewModel viewModel) => Column(
+        crossAxisAlignment: CrossAxisAlignment.stretch,
+        mainAxisAlignment: MainAxisAlignment.spaceBetween,
         children: _buildBodyChildren(viewModel),
       );
 
-  List<Widget> _buildBodyChildren(LearnPracticeViewModel viewModel) => [
+  List<Widget> _buildBodyChildren(LearnPracticeViewModel viewModel) =>
-        _buildUpperColumnWrapper(viewModel),
+      [_buildUpperColumn(viewModel), _buildContinueButtonWrapper(viewModel)];
-        _buildContinueButtonWrapper(viewModel)
-      ];
-  Widget _buildUpperColumnWrapper(LearnPracticeViewModel viewModel) => Align(
-        alignment: Alignment.center,
-        child: _buildUpperColumn(viewModel),
-      );
 
   Widget _buildUpperColumn(LearnPracticeViewModel viewModel) => Column(
         mainAxisSize: MainAxisSize.min,
@@ -51,13 +45,16 @@ class LearnPracticeCompletionScreen
       );
 
   List<Widget> _buildUpperColumnChildren(LearnPracticeViewModel viewModel) => [
+        verticalSpaceMassive,
         _buildIcon(),
         verticalSpaceMedium,
         _buildTitle(),
+        verticalSpaceSmall,
+        _buildSubtitle(),
       ];
 
   Widget _buildIcon() => SvgPicture.asset(
-        'assets/icons/mascot.svg',
+        'assets/icons/complete.svg',
       );
 
   Widget _buildTitle() => Text(
@@ -66,12 +63,13 @@ class LearnPracticeCompletionScreen
         textAlign: TextAlign.center,
       );
 
-  Widget _buildContinueButtonWrapper(LearnPracticeViewModel viewModel) => Align(
+  Widget _buildSubtitle() => Text(
-        alignment: Alignment.bottomCenter,
+        'We’re now analyzing your speaking skills',
-        child: _buildContinueButtonPadding(viewModel),
+        textAlign: TextAlign.center,
+        style: style14MG400,
       );
 
-  Widget _buildContinueButtonPadding(LearnPracticeViewModel viewModel) =>
+  Widget _buildContinueButtonWrapper(LearnPracticeViewModel viewModel) =>
       Padding(
         padding: const EdgeInsets.only(bottom: 50),
         child: _buildContinueButton(viewModel),

lib/ui/views/learn_practice/screens/learn_practice_description_screen.dart

@@ -39,15 +39,7 @@ class LearnPracticeDescriptionScreen
           required LearnPracticeViewModel viewModel}) =>
       Scaffold(
         backgroundColor: kcBackgroundColor,
-        body: _buildScaffoldContainer(context: context, viewModel: viewModel),
+        body: _buildScaffold(context: context, viewModel: viewModel),
-      );
-
-  Widget _buildScaffoldContainer(
-          {required BuildContext context,
-          required LearnPracticeViewModel viewModel}) =>
-      Container(
-        decoration: bgDecoration,
-        child: _buildScaffold(context: context, viewModel: viewModel),
       );
 
   Widget _buildScaffold(

lib/ui/views/learn_practice/screens/learn_practice_intro_screen.dart

@@ -50,15 +50,7 @@ class LearnPracticeIntroScreen extends ViewModelWidget<LearnPracticeViewModel> {
           required LearnPracticeViewModel viewModel}) =>
       Scaffold(
         backgroundColor: kcBackgroundColor,
-        body: _buildScaffoldContainer(context: context, viewModel: viewModel),
+        body: _buildScaffold(context: context, viewModel: viewModel),
-      );
-
-  Widget _buildScaffoldContainer(
-          {required BuildContext context,
-          required LearnPracticeViewModel viewModel}) =>
-      Container(
-        decoration: bgDecoration,
-        child: _buildScaffold(context: context, viewModel: viewModel),
       );
 
   Widget _buildScaffold(

lib/ui/views/learn_practice/screens/learn_practice_result_screen.dart

@@ -21,11 +21,9 @@ class LearnPracticeResultScreen
   Future<void> _navigate(LearnPracticeViewModel viewModel) async {
     await viewModel.completeLearnPractices();
     if (practice == LearnPractices.course) {
-      viewModel.goTo(6);
-    } else if (practice == LearnPractices.module) {
       viewModel.goTo(5);
     } else {
-      viewModel.goTo(4);
+      viewModel.pop();
     }
   }
 
@@ -57,15 +55,7 @@ class LearnPracticeResultScreen
           required LearnPracticeViewModel viewModel}) =>
       Scaffold(
         backgroundColor: kcBackgroundColor,
-        body: _buildScaffoldContainer(context: context, viewModel: viewModel),
+        body: _buildScaffoldState(context: context, viewModel: viewModel),
-      );
-
-  Widget _buildScaffoldContainer(
-          {required BuildContext context,
-          required LearnPracticeViewModel viewModel}) =>
-      Container(
-        decoration: bgDecoration,
-        child: _buildScaffoldState(context: context, viewModel: viewModel),
       );
 
   Widget _buildScaffoldState(

lib/ui/views/learn_practice/screens/start_learn_practice_screen.dart

@@ -44,15 +44,7 @@ class StartLearnPracticeScreen extends ViewModelWidget<LearnPracticeViewModel> {
           required LearnPracticeViewModel viewModel}) =>
       Scaffold(
         backgroundColor: kcBackgroundColor,
-        body: _buildScaffoldContainer(context: context, viewModel: viewModel),
+        body: _buildScaffold(context: context, viewModel: viewModel),
-      );
-
-  Widget _buildScaffoldContainer(
-          {required BuildContext context,
-          required LearnPracticeViewModel viewModel}) =>
-      Container(
-        decoration: bgDecoration,
-        child: _buildScaffold(context: context, viewModel: viewModel),
       );
 
   Widget _buildScaffold(

lib/ui/views/learn_program/learn_program_view.dart

@@ -33,12 +33,7 @@ class LearnProgramView extends StackedView<LearnProgramViewModel> {
 
   Widget _buildScaffoldWrapper(LearnProgramViewModel viewModel) => Scaffold(
         backgroundColor: kcBackgroundColor,
-        body: _buildScaffoldContainer(viewModel),
+        body: _buildScaffold(viewModel),
-      );
-
-  Widget _buildScaffoldContainer(LearnProgramViewModel viewModel) => Container(
-        decoration: bgDecoration,
-        child: _buildScaffold(viewModel),
       );
 
   Widget _buildScaffold(LearnProgramViewModel viewModel) =>

lib/ui/views/learn_program/learn_program_viewmodel.dart

@@ -5,6 +5,7 @@ import 'package:yimaru_app/models/learn_program.dart';
 
 import '../../../app/app.locator.dart';
 import '../../../models/user.dart';
+import '../../../services/api_service.dart';
 import '../../../services/authentication_service.dart';
 import '../../../services/learn_service.dart';
 import '../../../services/status_checker_service.dart';

lib/ui/views/learn_subscription/learn_subscription_view.dart

@@ -4,8 +4,14 @@ import 'package:stacked/stacked_annotations.dart';
 import 'package:yimaru_app/ui/views/learn_subscription/learn_subscription_view.form.dart';
 import 'package:yimaru_app/ui/views/learn_subscription/screens/learn_subscription_form_screen.dart';
 import 'package:yimaru_app/ui/views/learn_subscription/screens/learn_subscription_package_screen.dart';
+import 'package:yimaru_app/ui/widgets/learn_subscription_card.dart';
+import 'package:yimaru_app/ui/widgets/learn_subscription_pricing_section.dart';
 
+import '../../common/app_colors.dart';
+import '../../common/ui_helpers.dart';
 import '../../common/validators/form_validator.dart';
+import '../../widgets/custom_elevated_button.dart';
+import '../../widgets/small_app_bar.dart';
 import 'learn_subscription_viewmodel.dart';
 
 @FormView(fields: [

lib/ui/views/learn_subscription/learn_subscription_viewmodel.dart

@@ -2,6 +2,7 @@ import 'package:stacked/stacked.dart';
 import 'package:stacked_services/stacked_services.dart';
 import 'package:yimaru_app/app/app.router.dart';
 import 'package:yimaru_app/models/learn_subscription.dart';
+import 'package:yimaru_app/models/learn_subscription_request.dart';
 
 import '../../../app/app.locator.dart';
 import '../../../services/api_service.dart';

lib/ui/views/learn_subscription/screens/learn_subscription_form_screen.dart

@@ -3,10 +3,13 @@ import 'package:flutter/services.dart';
 import 'package:stacked/stacked.dart';
 import 'package:yimaru_app/ui/views/learn_subscription/learn_subscription_viewmodel.dart';
 import 'package:yimaru_app/ui/widgets/phone_number_prefix.dart';
+import 'package:yimaru_app/ui/widgets/speaking_partner_image.dart';
 
 import '../../../common/app_colors.dart';
 import '../../../common/ui_helpers.dart';
 import '../../../widgets/small_app_bar.dart';
+import '../../course_practice_question/course_practice_question_view.form.dart';
+import '../../../widgets/custom_bottom_sheet.dart';
 import '../../../widgets/custom_elevated_button.dart';
 import '../learn_subscription_view.form.dart';
 
@@ -26,13 +29,7 @@ class LearnSubscriptionFormScreen
   Widget _buildScaffoldWrapper(LearnSubscriptionViewModel viewModel) =>
       Scaffold(
         backgroundColor: kcBackgroundColor,
-        body: _buildScaffoldContainer(viewModel),
+        body: _buildScaffold(viewModel),
-      );
-
-  Widget _buildScaffoldContainer(LearnSubscriptionViewModel viewModel) =>
-      Container(
-        decoration: bgDecoration,
-        child: _buildScaffold(viewModel),
       );
 
   Widget _buildScaffold(LearnSubscriptionViewModel viewModel) =>

lib/ui/views/learn_subscription/screens/learn_subscription_package_screen.dart

@@ -22,13 +22,7 @@ class LearnSubscriptionPackageScreen
   Widget _buildScaffoldWrapper(LearnSubscriptionViewModel viewModel) =>
       Scaffold(
         backgroundColor: kcBackgroundColor,
-        body: _buildScaffoldContainer(viewModel),
+        body: _buildScaffoldState(viewModel),
-      );
-
-  Widget _buildScaffoldContainer(LearnSubscriptionViewModel viewModel) =>
-      Container(
-        decoration: bgDecoration,
-        child: _buildScaffoldState(viewModel),
       );
 
   Widget _buildScaffoldState(LearnSubscriptionViewModel viewModel) =>

lib/ui/views/login/login_viewmodel.dart

@@ -30,8 +30,7 @@ class LoginViewModel extends ReactiveViewModel
   final _authenticationService = locator<AuthenticationService>();
 
   @override
-  List<ListenableServiceMixin> get listenableServices =>
+  List<ListenableServiceMixin> get listenableServices => [_googleAuthService,_localizationService];
-      [_googleAuthService, _localizationService];
 
   // Google user
   GoogleSignInAccount? get _googleUser => _googleAuthService.googleUser;
@@ -39,8 +38,7 @@ class LoginViewModel extends ReactiveViewModel
   GoogleSignInAccount? get googleUser => _googleUser;
 
   // Languages
-  Map<String, dynamic> get _selectedLanguage =>
+  Map<String, dynamic> get _selectedLanguage => _localizationService.selectedLanguage;
-      _localizationService.selectedLanguage;
 
   Map<String, dynamic> get selectedLanguage => _selectedLanguage;
 
@@ -174,6 +172,8 @@ class LoginViewModel extends ReactiveViewModel
   Future<void> navigateToForgetPassword() async =>
       await _navigationService.navigateToForgetPasswordView();
 
+
+
   Future<void> replaceWithStartUp() async =>
       await _navigationService.clearStackAndShow(Routes.startupView);
 

lib/ui/views/login/screens/login_otp_screen.dart

@@ -1,11 +1,9 @@
-import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_timer_countdown/flutter_timer_countdown.dart';
 import 'package:pinput/pinput.dart';
 import 'package:stacked/stacked.dart';
 import 'package:yimaru_app/app/app.locator.dart';
 import 'package:yimaru_app/services/smart_auth_service.dart';
-import 'package:yimaru_app/ui/common/translations/locale_keys.g.dart';
 import 'package:yimaru_app/ui/widgets/custom_cursor.dart';
 
 import '../../../common/app_colors.dart';
@@ -54,14 +52,7 @@ class LoginOtpScreen extends ViewModelWidget<LoginViewModel> {
           {required BuildContext context, required LoginViewModel viewModel}) =>
       Scaffold(
         backgroundColor: kcBackgroundColor,
-        body: _buildScaffoldContainer(context: context, viewModel: viewModel),
+        body: _buildScaffoldStack(context: context, viewModel: viewModel),
-      );
-
-  Widget _buildScaffoldContainer(
-          {required BuildContext context, required LoginViewModel viewModel}) =>
-      Container(
-        decoration: bgDecoration,
-        child: _buildScaffoldStack(context: context, viewModel: viewModel),
       );
 
   Widget _buildScaffoldStack(
@@ -89,12 +80,14 @@ class LoginOtpScreen extends ViewModelWidget<LoginViewModel> {
         _buildExpandedBody(context: context, viewModel: viewModel)
       ];
 
-  Widget _buildAppBar(LoginViewModel viewModel) => LargeAppBar(
+  Widget _buildAppBar(LoginViewModel viewModel) =>  LargeAppBar(
         showBackButton: false,
         showLanguageSelection: true,
-        language: viewModel.selectedLanguage['code'],
+    language: viewModel.selectedLanguage['code'],
-        onLanguage: () async => await viewModel.navigateToLanguage(),
+
-      );
+    onLanguage: ()async => await viewModel.navigateToLanguage(),
+
+  );
 
   Widget _buildExpandedBody(
           {required BuildContext context, required LoginViewModel viewModel}) =>
@@ -152,7 +145,7 @@ class LoginOtpScreen extends ViewModelWidget<LoginViewModel> {
       ];
 
   Widget _buildTitle() => Text(
-        LocaleKeys.verification_code.tr(),
+        'Verification Code',
         style: style25DG600,
       );
 
@@ -160,7 +153,7 @@ class LoginOtpScreen extends ViewModelWidget<LoginViewModel> {
       phoneNumberController.text.length == 9 ? _buildSubtitle() : Container();
 
   Widget _buildSubtitle() => Text(
-        '${LocaleKeys.code_sent_to_phone.tr()} +251${phoneNumberController.text.substring(0, 3)}******',
+        'Code sent to your number +251${phoneNumberController.text.substring(0, 5)}****',
         style: style14DG400,
       );
 
@@ -206,7 +199,7 @@ class LoginOtpScreen extends ViewModelWidget<LoginViewModel> {
       child: _buildResendText());
 
   Widget _buildResendText() => Text(
-        LocaleKeys.reset_code.tr(),
+        'Resend code',
         style: style14P600.copyWith(fontStyle: FontStyle.italic),
       );
 
@@ -218,8 +211,7 @@ class LoginOtpScreen extends ViewModelWidget<LoginViewModel> {
         ],
       );
 
-  Widget _buildCountdownText() =>
+  Widget _buildCountdownText() => Text('Resend code in ', style: style14DG400);
-      Text('${LocaleKeys.resend_code_in.tr()} ', style: style14DG400);
 
   Widget _buildTimer(LoginViewModel viewModel) => TimerCountdown(
         enableDescriptions: false,
@@ -237,9 +229,9 @@ class LoginOtpScreen extends ViewModelWidget<LoginViewModel> {
 
   Widget _buildContinueButton(LoginViewModel viewModel) => CustomElevatedButton(
         height: 55,
+        text: 'Continue',
         borderRadius: 12,
         foregroundColor: kcWhite,
-        text: LocaleKeys.cont.tr(),
         backgroundColor:
             otpController.text.length == 6 && !viewModel.hasOtpValidationMessage
                 ? kcPrimaryColor

lib/ui/views/login/screens/login_with_email_screen.dart

@@ -51,14 +51,7 @@ class LoginWithEmailScreen extends ViewModelWidget<LoginViewModel> {
           {required BuildContext context, required LoginViewModel viewModel}) =>
       Scaffold(
         backgroundColor: kcBackgroundColor,
-        body: _buildScaffoldContainer(context: context, viewModel: viewModel),
+        body: _buildScaffoldStack(context: context, viewModel: viewModel),
-      );
-
-  Widget _buildScaffoldContainer(
-          {required BuildContext context, required LoginViewModel viewModel}) =>
-      Container(
-        decoration: bgDecoration,
-        child: _buildScaffoldStack(context: context, viewModel: viewModel),
       );
 
   Widget _buildScaffoldStack(
@@ -267,14 +260,15 @@ class LoginWithEmailScreen extends ViewModelWidget<LoginViewModel> {
 
   Widget _buildLoginWithPhoneButton(LoginViewModel viewModel) =>
       CustomElevatedButton(
-          height: 55,
+        height: 55,
-          borderRadius: 12,
+        borderRadius: 12,
-          backgroundColor: kcWhite,
+        backgroundColor: kcWhite,
-          leadingIcon: Icons.phone,
+        leadingIcon: Icons.phone,
-          borderColor: kcPrimaryColor,
+        borderColor: kcPrimaryColor,
-          onTap: () => viewModel.goTo(1),
+        onTap: () => viewModel.goTo(1),
-          foregroundColor: kcPrimaryColor,
+        foregroundColor: kcPrimaryColor,
-          text: LocaleKeys.login_with_phone.tr());
+        text: LocaleKeys.login_with_phone.tr()
+      );
 
   Widget _buildLoginWithEmailState(LoginViewModel viewModel) =>
       viewModel.busy(StateObjects.loginWithEmail)

lib/ui/views/login/screens/login_with_phone_number_screen.dart

@@ -1,8 +1,6 @@
-import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:stacked/stacked.dart';
-import 'package:yimaru_app/ui/common/translations/locale_keys.g.dart';
 import 'package:yimaru_app/ui/views/login/login_viewmodel.dart';
 import 'package:yimaru_app/ui/widgets/option_text_divider.dart';
 import 'package:yimaru_app/ui/widgets/register_for_account.dart';
@@ -48,14 +46,7 @@ class LoginWithPhoneNumberScreen extends ViewModelWidget<LoginViewModel> {
           {required BuildContext context, required LoginViewModel viewModel}) =>
       Scaffold(
         backgroundColor: kcBackgroundColor,
-        body: _buildScaffoldContainer(context: context, viewModel: viewModel),
+        body: _buildScaffoldStack(context: context, viewModel: viewModel),
-      );
-
-  Widget _buildScaffoldContainer(
-          {required BuildContext context, required LoginViewModel viewModel}) =>
-      Container(
-        decoration: bgDecoration,
-        child: _buildScaffoldStack(context: context, viewModel: viewModel),
       );
 
   Widget _buildScaffoldStack(
@@ -85,9 +76,11 @@ class LoginWithPhoneNumberScreen extends ViewModelWidget<LoginViewModel> {
         showBackButton: true,
         showLanguageSelection: true,
         onPop: () => viewModel.goTo(0),
-        language: viewModel.selectedLanguage['code'],
+    language: viewModel.selectedLanguage['code'],
-        onLanguage: () async => await viewModel.navigateToLanguage(),
+
-      );
+    onLanguage: ()async => await viewModel.navigateToLanguage(),
+
+  );
 
   Widget _buildExpandedBody(
           {required BuildContext context, required LoginViewModel viewModel}) =>
@@ -145,7 +138,7 @@ class LoginWithPhoneNumberScreen extends ViewModelWidget<LoginViewModel> {
       ];
 
   Widget _buildTitle() => Text(
-        LocaleKeys.welcome_back.tr(),
+        'Welcome Back',
         style: style25DG600,
       );
 
@@ -154,7 +147,7 @@ class LoginWithPhoneNumberScreen extends ViewModelWidget<LoginViewModel> {
       );
 
   Widget _buildSubtitle() => Text(
-        LocaleKeys.enter_phone_number.tr(),
+        'Enter your phone number. We will send you a confirmation code there',
         style: style14MG400,
       );
 
@@ -212,9 +205,9 @@ class LoginWithPhoneNumberScreen extends ViewModelWidget<LoginViewModel> {
 
   Widget _buildContinueButton(LoginViewModel viewModel) => CustomElevatedButton(
         height: 55,
+        text: 'Continue',
         borderRadius: 12,
         foregroundColor: kcWhite,
-        text: LocaleKeys.cont.tr(),
         onTap: phoneNumberController.text.isNotEmpty
             ? () async => await _login(viewModel)
             : null,
@@ -227,12 +220,12 @@ class LoginWithPhoneNumberScreen extends ViewModelWidget<LoginViewModel> {
       CustomElevatedButton(
         height: 55,
         borderRadius: 12,
+        text: 'Login with Email',
         backgroundColor: kcWhite,
         leadingIcon: Icons.email,
         borderColor: kcPrimaryColor,
-        onTap: () => viewModel.goTo(0),
         foregroundColor: kcPrimaryColor,
-        text: LocaleKeys.login_with_email.tr(),
+        onTap: () => viewModel.goTo(0),
       );
 
   Widget _buildLoginWithPhoneNumber(LoginViewModel viewModel) =>

lib/ui/views/onboarding/onboarding_viewmodel.dart

@@ -17,18 +17,19 @@ class OnboardingViewModel extends ReactiveViewModel
 
   final _localizationService = locator<LocalizationService>();
 
+
+
   @override
-  List<ListenableServiceMixin> get listenableServices =>
+  List<ListenableServiceMixin> get listenableServices => [_googleAuthService,_localizationService];
-      [_googleAuthService, _localizationService];
 
   // Google user
   GoogleSignInAccount? get _googleUser => _googleAuthService.googleUser;
 
   GoogleSignInAccount? get googleUser => _googleUser;
 
+
   // Languages
-  Map<String, dynamic> get _selectedLanguage =>
+  Map<String, dynamic> get _selectedLanguage => _localizationService.selectedLanguage;
-      _localizationService.selectedLanguage;
 
   Map<String, dynamic> get selectedLanguage => _selectedLanguage;
 
@@ -217,6 +218,7 @@ class OnboardingViewModel extends ReactiveViewModel
 
   List<String> get topics => _topics;
 
+
   // User data
   final Map<String, dynamic> _userData = {};
 

lib/ui/views/onboarding/screens/age_group_form_screen.dart

@@ -88,8 +88,9 @@ class AgeGroupFormScreen extends ViewModelWidget<OnboardingViewModel> {
         showBackButton: true,
         showLanguageSelection: true,
         onPop: () => _pop(viewModel),
-        language: viewModel.selectedLanguage['code'],
+    language: viewModel.selectedLanguage['code'],
-        onLanguage: () async => await viewModel.navigateToLanguage(),
+
+    onLanguage: () async => await viewModel.navigateToLanguage(),
       );
 
   Widget _buildTitle() => Text(

lib/ui/views/onboarding/screens/challenge_form_screen.dart

@@ -102,8 +102,9 @@ class ChallengeFormScreen extends ViewModelWidget<OnboardingViewModel> {
         showBackButton: true,
         showLanguageSelection: true,
         onPop: () => _pop(viewModel),
-        language: viewModel.selectedLanguage['code'],
+    language: viewModel.selectedLanguage['code'],
-        onLanguage: () async => await viewModel.navigateToLanguage(),
+
+    onLanguage: () async => await viewModel.navigateToLanguage(),
       );
 
   Widget _buildTitle() => Text(

lib/ui/views/onboarding/screens/country_region_form_screen.dart

@@ -112,8 +112,8 @@ class CountryRegionFormScreen extends ViewModelWidget<OnboardingViewModel> {
         showBackButton: true,
         showLanguageSelection: true,
         onPop: () => _pop(viewModel),
-        language: viewModel.selectedLanguage['code'],
+    language: viewModel.selectedLanguage['code'],
-        onLanguage: () async => await viewModel.navigateToLanguage(),
+    onLanguage: () async => await viewModel.navigateToLanguage(),
       );
 
   Widget _buildTitle() => Text(

lib/ui/views/onboarding/screens/educational_background_form_screen.dart

@@ -88,8 +88,8 @@ class EducationalBackgroundFormScreen
         showBackButton: true,
         showLanguageSelection: true,
         onPop: () => _pop(viewModel),
-        language: viewModel.selectedLanguage['code'],
+    language: viewModel.selectedLanguage['code'],
-        onLanguage: () async => await viewModel.navigateToLanguage(),
+    onLanguage: () async => await viewModel.navigateToLanguage(),
       );
 
   Widget _buildTitle() => const Text(

lib/ui/views/onboarding/screens/full_name_form_screen.dart

@@ -88,8 +88,8 @@ class FullNameFormScreen extends ViewModelWidget<OnboardingViewModel> {
   Widget _buildAppBar(OnboardingViewModel viewModel) => LargeAppBar(
         showBackButton: false,
         showLanguageSelection: true,
-        language: viewModel.selectedLanguage['code'],
+    language: viewModel.selectedLanguage['code'],
-        onLanguage: () async => await viewModel.navigateToLanguage(),
+    onLanguage: () async => await viewModel.navigateToLanguage(),
       );
 
   Widget _buildTitle() => const Text(

lib/ui/views/onboarding/screens/gender_form_screen.dart

@@ -80,8 +80,9 @@ class GenderFormScreen extends ViewModelWidget<OnboardingViewModel> {
         showBackButton: true,
         showLanguageSelection: true,
         onPop: () => _pop(viewModel),
-        language: viewModel.selectedLanguage['code'],
+    language: viewModel.selectedLanguage['code'],
-        onLanguage: () async => await viewModel.navigateToLanguage(),
+
+    onLanguage: () async => await viewModel.navigateToLanguage(),
       );
 
   Widget _buildTitle() => Text(

lib/ui/views/onboarding/screens/language_goal_form_screen.dart

@@ -103,8 +103,8 @@ class LanguageGoalFormScreen extends ViewModelWidget<OnboardingViewModel> {
         showBackButton: true,
         showLanguageSelection: true,
         onPop: () => _pop(viewModel),
-        language: viewModel.selectedLanguage['code'],
+    language: viewModel.selectedLanguage['code'],
-        onLanguage: () async => await viewModel.navigateToLanguage(),
+    onLanguage: () async => await viewModel.navigateToLanguage(),
       );
 
   Widget _buildTitle() => Text(

lib/ui/views/onboarding/screens/learning_goal_form_screen.dart

@@ -98,8 +98,9 @@ class LearningGoalFormScreen extends ViewModelWidget<OnboardingViewModel> {
         showBackButton: true,
         showLanguageSelection: true,
         onPop: () => _pop(viewModel),
-        language: viewModel.selectedLanguage['code'],
+    language: viewModel.selectedLanguage['code'],
-        onLanguage: () async => await viewModel.navigateToLanguage(),
+
+    onLanguage: () async => await viewModel.navigateToLanguage(),
       );
 
   Widget _buildTitle(OnboardingViewModel viewModel) => Text.rich(

lib/ui/views/onboarding/screens/occupation_form_screen.dart

@@ -86,8 +86,9 @@ class OccupationFormScreen extends ViewModelWidget<OnboardingViewModel> {
         showBackButton: true,
         showLanguageSelection: true,
         onPop: () => _pop(viewModel),
-        language: viewModel.selectedLanguage['code'],
+    language: viewModel.selectedLanguage['code'],
-        onLanguage: () async => await viewModel.navigateToLanguage(),
+
+    onLanguage: () async => await viewModel.navigateToLanguage(),
       );
 
   Widget _buildTitle() => Text(

lib/ui/views/onboarding/screens/topic_form_screen.dart

@@ -58,8 +58,9 @@ class TopicFormScreen extends ViewModelWidget<OnboardingViewModel> {
         showBackButton: true,
         showLanguageSelection: true,
         onPop: () => _pop(viewModel),
-        language: viewModel.selectedLanguage['code'],
+    language: viewModel.selectedLanguage['code'],
-        onLanguage: () async => await viewModel.navigateToLanguage(),
+
+    onLanguage: () async => await viewModel.navigateToLanguage(),
       );
 
   Widget _buildExpandedBody(OnboardingViewModel viewModel) =>

lib/ui/views/privacy_policy/privacy_policy_view.dart

@@ -1,7 +1,5 @@
 import 'package:flutter/material.dart';
-import 'package:flutter_html/flutter_html.dart';
 import 'package:stacked/stacked.dart';
-import 'package:yimaru_app/ui/common/app_strings.dart';
 import 'package:yimaru_app/ui/widgets/privacy_policy_tile.dart';
 
 import '../../common/app_colors.dart';
@@ -24,7 +22,7 @@ class PrivacyPolicyView extends StackedView<PrivacyPolicyViewModel> {
   ) =>
       _buildScaffoldWrapper(viewModel);
 
-/* Widget _buildScaffoldWrapper(PrivacyPolicyViewModel viewModel) => Scaffold(
+  Widget _buildScaffoldWrapper(PrivacyPolicyViewModel viewModel) => Scaffold(
         backgroundColor: kcBackgroundColor,
         body: _buildScaffold(viewModel),
       );
@@ -93,62 +91,4 @@ class PrivacyPolicyView extends StackedView<PrivacyPolicyViewModel> {
       );
 
   Widget _buildTile(String title) => PrivacyPolicyTile(title: title);
-*/
-
-  Widget _buildScaffoldWrapper(PrivacyPolicyViewModel viewModel) => Scaffold(
-        backgroundColor: kcBackgroundColor,
-        body: _buildScaffold(viewModel),
-      );
-
-  Widget _buildScaffold(PrivacyPolicyViewModel viewModel) =>
-      SafeArea(child: _buildBodyWrapper(viewModel));
-
-  Widget _buildBodyWrapper(PrivacyPolicyViewModel viewModel) =>
-      _buildBody(viewModel);
-
-  Widget _buildBody(PrivacyPolicyViewModel viewModel) =>
-      _buildColumn(viewModel);
-
-  Widget _buildColumn(PrivacyPolicyViewModel viewModel) => Column(
-        crossAxisAlignment: CrossAxisAlignment.start,
-        children: _buildColumnChildren(viewModel),
-      );
-
-  List<Widget> _buildColumnChildren(PrivacyPolicyViewModel viewModel) => [
-        verticalSpaceMedium,
-        _buildAppBarWrapper(viewModel),
-        verticalSpaceSmall,
-        _buildContentWrapper(viewModel)
-      ];
-
-  Widget _buildAppBarWrapper(PrivacyPolicyViewModel viewModel) => Padding(
-        padding: const EdgeInsets.symmetric(horizontal: 15),
-        child: _buildAppbar(viewModel),
-      );
-
-  Widget _buildAppbar(PrivacyPolicyViewModel viewModel) => SmallAppBar(
-        onPop: viewModel.pop,
-        showBackButton: true,
-        title: 'Privacy Policy',
-      );
-
-  Widget _buildContentWrapper(PrivacyPolicyViewModel viewModel) =>
-      Expanded(child: _buildContentColumnWrapper(viewModel));
-
-  Widget _buildContentColumnWrapper(PrivacyPolicyViewModel viewModel) =>
-      Padding(
-        padding: const EdgeInsets.symmetric(horizontal: 15),
-        child: _buildMenuColumnScrollView(viewModel),
-      );
-
-  Widget _buildMenuColumnScrollView(PrivacyPolicyViewModel viewModel) =>
-      SingleChildScrollView(
-        child: _buildContent(),
-      );
-
-  Widget _buildContent() => Html(
-        shrinkWrap: true,
-        style: htmlStyle,
-        data: ksPrivacyPolicy,
-      );
 }

lib/ui/views/register/register_viewmodel.dart

@@ -30,8 +30,7 @@ class RegisterViewModel extends ReactiveViewModel
   final _authenticationService = locator<AuthenticationService>();
 
   @override
-  List<ListenableServiceMixin> get listenableServices =>
+  List<ListenableServiceMixin> get listenableServices => [_googleAuthService,_localizationService];
-      [_googleAuthService, _localizationService];
 
   // Google user
   GoogleSignInAccount? get _googleUser => _googleAuthService.googleUser;
@@ -39,11 +38,11 @@ class RegisterViewModel extends ReactiveViewModel
   GoogleSignInAccount? get googleUser => _googleUser;
 
   // Languages
-  Map<String, dynamic> get _selectedLanguage =>
+  Map<String, dynamic> get _selectedLanguage => _localizationService.selectedLanguage;
-      _localizationService.selectedLanguage;
 
   Map<String, dynamic> get selectedLanguage => _selectedLanguage;
 
+
   // Navigation
   int _currentPage = 0;
 
@@ -276,9 +275,11 @@ class RegisterViewModel extends ReactiveViewModel
   Future<void> navigateToLanguage() async =>
       await _navigationService.navigateToLanguageView();
 
+
   Future<void> navigateToPrivacyPolicy() async =>
       await _navigationService.navigateToPrivacyPolicyView();
 
+
   Future<void> navigateToTermsAndConditions() async =>
       await _navigationService.navigateToTermsAndConditionsView();
 

lib/ui/views/register/screens/create_password_screen.dart

@@ -1,4 +1,3 @@
-import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/gestures.dart';
 import 'package:flutter/material.dart';
 import 'package:stacked/stacked.dart';
@@ -9,7 +8,6 @@ import 'package:yimaru_app/ui/widgets/validator_list_tile.dart';
 
 import '../../../common/app_colors.dart';
 import '../../../common/enmus.dart';
-import '../../../common/translations/locale_keys.g.dart';
 import '../../../common/ui_helpers.dart';
 import '../../../widgets/custom_elevated_button.dart';
 import '../../../widgets/large_app_bar.dart';
@@ -45,12 +43,7 @@ class CreatePasswordScreen extends ViewModelWidget<RegisterViewModel> {
 
   Widget _buildScaffoldWrapper(RegisterViewModel viewModel) => Scaffold(
         backgroundColor: kcBackgroundColor,
-        body: _buildScaffoldContainer(viewModel),
+        body: _buildScaffoldStack(viewModel),
-      );
-
-  Widget _buildScaffoldContainer(RegisterViewModel viewModel) => Container(
-        decoration: bgDecoration,
-        child: _buildScaffoldStack(viewModel),
       );
 
   Widget _buildScaffoldStack(RegisterViewModel viewModel) => Stack(
@@ -75,9 +68,11 @@ class CreatePasswordScreen extends ViewModelWidget<RegisterViewModel> {
         showBackButton: true,
         onPop: viewModel.goBack,
         showLanguageSelection: true,
-        language: viewModel.selectedLanguage['code'],
+    language: viewModel.selectedLanguage['code'],
-        onLanguage: () async => await viewModel.navigateToLanguage(),
+
-      );
+    onLanguage: ()async => await viewModel.navigateToLanguage(),
+
+  );
 
   Widget _buildExpandedBody(RegisterViewModel viewModel) =>
       Expanded(child: _buildColumnScroller(viewModel));
@@ -102,7 +97,7 @@ class CreatePasswordScreen extends ViewModelWidget<RegisterViewModel> {
         verticalSpaceMedium,
         _buildTitle(),
         verticalSpaceMedium,
-        _buildPasswordLabel(LocaleKeys.password.tr()),
+        _buildPasswordLabel('Password'),
         verticalSpaceSmall,
         _buildPasswordFormField(viewModel),
         if (viewModel.hasPasswordValidationMessage && viewModel.focusPassword)
@@ -110,7 +105,7 @@ class CreatePasswordScreen extends ViewModelWidget<RegisterViewModel> {
         if (viewModel.hasPasswordValidationMessage && viewModel.focusPassword)
           _buildPasswordValidationWrapper(viewModel),
         verticalSpaceMedium,
-        _buildPasswordLabel(LocaleKeys.confirm_password.tr()),
+        _buildPasswordLabel('Confirm Password'),
         verticalSpaceSmall,
         _buildConfirmPasswordFormField(viewModel),
         if (viewModel.hasConfirmPasswordValidationMessage &&
@@ -130,9 +125,13 @@ class CreatePasswordScreen extends ViewModelWidget<RegisterViewModel> {
         verticalSpaceMedium
       ];
 
-  Widget _buildTitle() => Text(
+  Widget _buildTitle() => const Text(
-        LocaleKeys.create_password.tr(),
+        'Create Password',
-        style: style25DG600,
+        style: TextStyle(
+          fontSize: 25,
+          color: kcDarkGrey,
+          fontWeight: FontWeight.w600,
+        ),
       );
 
   Widget _buildPasswordLabel(String label) => CustomFormLabel(
@@ -145,7 +144,7 @@ class CreatePasswordScreen extends ViewModelWidget<RegisterViewModel> {
         onTap: viewModel.setPasswordFocus,
         obscureText: viewModel.obscurePassword,
         decoration: inputDecoration(
-            hint: LocaleKeys.password.tr(),
+            hint: 'Password',
             focus: viewModel.focusPassword,
             suffix: _buildObscurePassword(viewModel),
             filled: passwordController.text.isNotEmpty),
@@ -167,7 +166,11 @@ class CreatePasswordScreen extends ViewModelWidget<RegisterViewModel> {
 
   Widget _buildPasswordValidator(RegisterViewModel viewModel) => Text(
         viewModel.passwordValidationMessage!,
-        style: style12R700,
+        style: const TextStyle(
+          fontSize: 12,
+          color: Colors.red,
+          fontWeight: FontWeight.w700,
+        ),
       );
 
   Widget _buildConfirmPasswordFormField(RegisterViewModel viewModel) =>
@@ -179,8 +182,8 @@ class CreatePasswordScreen extends ViewModelWidget<RegisterViewModel> {
             password: passwordController.text,
             confirmPassword: confirmPasswordController.text),
         decoration: inputDecoration(
+            hint: 'Confirm Password',
             focus: viewModel.focusConfirmPassword,
-            hint: LocaleKeys.confirm_password.tr(),
             suffix: _buildObscureConfirmPassword(viewModel),
             filled: confirmPasswordController.text.isNotEmpty),
       );
@@ -211,15 +214,14 @@ class CreatePasswordScreen extends ViewModelWidget<RegisterViewModel> {
 
   Widget _buildCharLengthValidator(RegisterViewModel viewModel) =>
       ValidatorListTile(
-        label: LocaleKeys.eight_character_minimum.tr(),
+          backgroundColor: viewModel.length ? kcPrimaryColor : kcLightGrey,
-        backgroundColor: viewModel.length ? kcPrimaryColor : kcLightGrey,
+          label: '8 characters minimum');
-      );
 
   Widget _buildPasswordMatchValidator(RegisterViewModel viewModel) =>
       ValidatorListTile(
-        label: LocaleKeys.password_match.tr(),
+          backgroundColor:
-        backgroundColor: viewModel.passwordMatch ? kcPrimaryColor : kcLightGrey,
+              viewModel.passwordMatch ? kcPrimaryColor : kcLightGrey,
-      );
+          label: 'password match');
 
   Widget _buildCheckBox(RegisterViewModel viewMode) => CheckboxListTile(
       value: viewMode.agree,
@@ -230,18 +232,18 @@ class CreatePasswordScreen extends ViewModelWidget<RegisterViewModel> {
 
   Widget _buildCheckBoxTitle(RegisterViewModel viewMode) => Text.rich(
         TextSpan(
-            text: LocaleKeys.sign_up_agreement.tr(),
+            text: 'By clicking "Sign Up", you agree to our',
             style: style14DG400,
             children: [
               TextSpan(
-                  text: ' ${LocaleKeys.terms_of_services.tr()}',
+                  text: ' Terms of Service',
                   style: style14P600,
                   recognizer: TapGestureRecognizer()
                     ..onTap = () => viewMode.navigateToTermsAndConditions()),
-              TextSpan(text: ' ${LocaleKeys.and.tr()} ', style: style14DG400),
+              TextSpan(text: ' and ', style: style14DG400),
               TextSpan(
+                  text: 'Privacy Policy',
                   style: style14P600,
-                  text: LocaleKeys.privacy_policy.tr(),
                   recognizer: TapGestureRecognizer()
                     ..onTap = () => viewMode.navigateToPrivacyPolicy()),
             ]),
@@ -250,9 +252,9 @@ class CreatePasswordScreen extends ViewModelWidget<RegisterViewModel> {
   Widget _buildSignUpButton(RegisterViewModel viewModel) =>
       CustomElevatedButton(
         height: 55,
+        text: 'Sign Up',
         borderRadius: 12,
         foregroundColor: kcWhite,
-        text: LocaleKeys.register.tr(),
         onTap: passwordController.text.isNotEmpty &&
                 confirmPasswordController.text.isNotEmpty &&
                 viewModel.length &&

lib/ui/views/register/screens/register_with_email_screen.dart

@@ -1,11 +1,9 @@
-import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:stacked/stacked.dart';
 import 'package:yimaru_app/ui/common/enmus.dart';
 import 'package:yimaru_app/ui/widgets/login_account.dart';
 
 import '../../../common/app_colors.dart';
-import '../../../common/translations/locale_keys.g.dart';
 import '../../../common/ui_helpers.dart';
 import '../../../widgets/custom_elevated_button.dart';
 import '../../../widgets/large_app_bar.dart';
@@ -48,15 +46,7 @@ class RegisterWithEmailScreen extends ViewModelWidget<RegisterViewModel> {
           required RegisterViewModel viewModel}) =>
       Scaffold(
         backgroundColor: kcBackgroundColor,
-        body: _buildScaffoldContainer(context: context, viewModel: viewModel),
+        body: _buildScaffoldStack(context: context, viewModel: viewModel),
-      );
-
-  Widget _buildScaffoldContainer(
-          {required BuildContext context,
-          required RegisterViewModel viewModel}) =>
-      Container(
-        decoration: bgDecoration,
-        child: _buildScaffoldStack(context: context, viewModel: viewModel),
       );
 
   Widget _buildScaffoldStack(
@@ -91,9 +81,11 @@ class RegisterWithEmailScreen extends ViewModelWidget<RegisterViewModel> {
         showBackButton: true,
         onPop: viewModel.goBack,
         showLanguageSelection: true,
-        language: viewModel.selectedLanguage['code'],
+    language: viewModel.selectedLanguage['code'],
-        onLanguage: () async => await viewModel.navigateToLanguage(),
+
-      );
+    onLanguage: ()async => await viewModel.navigateToLanguage(),
+
+  );
 
   Widget _buildExpandedBody(
           {required BuildContext context,
@@ -152,9 +144,13 @@ class RegisterWithEmailScreen extends ViewModelWidget<RegisterViewModel> {
           _buildEmailValidatorWrapper(viewModel),
       ];
 
-  Widget _buildTitle() => Text(
+  Widget _buildTitle() => const Text(
-        LocaleKeys.create_account.tr(),
+        'Create an Account',
-        style: style25DG600,
+        style: TextStyle(
+          fontSize: 25,
+          color: kcDarkGrey,
+          fontWeight: FontWeight.w600,
+        ),
       );
 
   Widget _buildSubtitleWrapper(RegisterViewModel viewModel) => LoginAccount(
@@ -163,10 +159,10 @@ class RegisterWithEmailScreen extends ViewModelWidget<RegisterViewModel> {
 
   Widget _buildEmailFormField(RegisterViewModel viewModel) => TextFormField(
         controller: emailController,
-        onTap: viewModel.setEmailFocus,
         keyboardType: TextInputType.emailAddress,
+        onTap: viewModel.setEmailFocus,
         decoration: inputDecoration(
-            hint: LocaleKeys.email.tr(),
+            hint: 'Email',
             focus: viewModel.focusEmail,
             filled: emailController.text.isNotEmpty),
       );
@@ -178,7 +174,11 @@ class RegisterWithEmailScreen extends ViewModelWidget<RegisterViewModel> {
 
   Widget _buildEmailValidator(RegisterViewModel viewModel) => Text(
         viewModel.emailValidationMessage!,
-        style: style12R700,
+        style: const TextStyle(
+          fontSize: 12,
+          color: Colors.red,
+          fontWeight: FontWeight.w700,
+        ),
       );
 
   Widget _buildLowerColumn(RegisterViewModel viewModel) => Column(
@@ -198,9 +198,9 @@ class RegisterWithEmailScreen extends ViewModelWidget<RegisterViewModel> {
       CustomElevatedButton(
         height: 55,
         safe: false,
+        text: 'Continue',
         borderRadius: 12,
         foregroundColor: kcWhite,
-        text: LocaleKeys.cont.tr(),
         onTap: emailController.text.isNotEmpty &&
                 !viewModel.hasEmailValidationMessage
             ? () => _addUserData(viewModel)
@@ -216,9 +216,9 @@ class RegisterWithEmailScreen extends ViewModelWidget<RegisterViewModel> {
         height: 55,
         borderRadius: 12,
         backgroundColor: kcWhite,
+        text: 'Login with Google',
         borderColor: kcPrimaryColor,
         foregroundColor: kcPrimaryColor,
-        text: LocaleKeys.register_with_google.tr(),
         leadingImage: 'assets/icons/google.png',
         onTap: () async => await viewModel.registerWithGoogle(),
       );
@@ -233,8 +233,8 @@ class RegisterWithEmailScreen extends ViewModelWidget<RegisterViewModel> {
         leadingIcon: Icons.phone,
         borderColor: kcPrimaryColor,
         foregroundColor: kcPrimaryColor,
+        text: 'Register with Phone Number',
         onTap: () => viewModel.goTo(page: 1),
-        text: LocaleKeys.register_with_phone.tr(),
       );
 
   Widget _buildRegisterWithEmailState(RegisterViewModel viewModel) =>

lib/ui/views/register/screens/register_with_phone_number_screen.dart

@@ -1,8 +1,6 @@
-import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:stacked/stacked.dart';
-import 'package:yimaru_app/ui/common/translations/locale_keys.g.dart';
 import 'package:yimaru_app/ui/widgets/login_account.dart';
 import 'package:yimaru_app/ui/widgets/option_text_divider.dart';
 
@@ -51,15 +49,7 @@ class RegisterWithPhoneNumberScreen extends ViewModelWidget<RegisterViewModel> {
           required RegisterViewModel viewModel}) =>
       Scaffold(
         backgroundColor: kcBackgroundColor,
-        body: _buildScaffoldContainer(context: context, viewModel: viewModel),
+        body: _buildScaffoldStack(context: context, viewModel: viewModel),
-      );
-
-  Widget _buildScaffoldContainer(
-          {required BuildContext context,
-          required RegisterViewModel viewModel}) =>
-      Container(
-        decoration: bgDecoration,
-        child: _buildScaffoldStack(context: context, viewModel: viewModel),
       );
 
   Widget _buildScaffoldStack(
@@ -94,9 +84,11 @@ class RegisterWithPhoneNumberScreen extends ViewModelWidget<RegisterViewModel> {
         showBackButton: true,
         onPop: viewModel.goBack,
         showLanguageSelection: true,
-        language: viewModel.selectedLanguage['code'],
+    language: viewModel.selectedLanguage['code'],
-        onLanguage: () async => await viewModel.navigateToLanguage(),
+
-      );
+    onLanguage: ()async => await viewModel.navigateToLanguage(),
+
+  );
 
   Widget _buildExpandedBody(
           {required BuildContext context,
@@ -160,7 +152,7 @@ class RegisterWithPhoneNumberScreen extends ViewModelWidget<RegisterViewModel> {
       ];
 
   Widget _buildTitle() => Text(
-        LocaleKeys.create_account.tr(),
+        'Create an Account',
         style: style25DG600,
       );
 
@@ -169,7 +161,7 @@ class RegisterWithPhoneNumberScreen extends ViewModelWidget<RegisterViewModel> {
       );
 
   Widget _buildSubtitle() => Text(
-        LocaleKeys.enter_phone_number.tr(),
+        'Enter your phone number. We will send you a confirmation code there',
         style: style14MG400,
       );
 
@@ -229,9 +221,9 @@ class RegisterWithPhoneNumberScreen extends ViewModelWidget<RegisterViewModel> {
   Widget _buildContinueButton(RegisterViewModel viewModel) =>
       CustomElevatedButton(
         height: 55,
+        text: 'Continue',
         borderRadius: 12,
         foregroundColor: kcWhite,
-        text: LocaleKeys.cont.tr(),
         onTap: phoneNumberController.text.isNotEmpty
             ? () async => await _addUserData(viewModel)
             : null,
@@ -247,9 +239,9 @@ class RegisterWithPhoneNumberScreen extends ViewModelWidget<RegisterViewModel> {
         backgroundColor: kcWhite,
         leadingIcon: Icons.email,
         borderColor: kcPrimaryColor,
+        text: 'Register with Email',
         foregroundColor: kcPrimaryColor,
         onTap: () => viewModel.goTo(page: 0),
-        text: LocaleKeys.register_with_email.tr(),
       );
 
   Widget _buildRegisterWithPhoneState(RegisterViewModel viewModel) =>

lib/ui/views/register/screens/registration_otp_screen.dart

@@ -1,9 +1,7 @@
-import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_timer_countdown/flutter_timer_countdown.dart';
 import 'package:pinput/pinput.dart';
 import 'package:stacked/stacked.dart';
-import 'package:yimaru_app/ui/common/translations/locale_keys.g.dart';
 import 'package:yimaru_app/ui/views/register/register_viewmodel.dart';
 import 'package:yimaru_app/ui/widgets/custom_cursor.dart';
 
@@ -62,15 +60,7 @@ class RegistrationOtpScreen extends ViewModelWidget<RegisterViewModel> {
           required RegisterViewModel viewModel}) =>
       Scaffold(
         backgroundColor: kcBackgroundColor,
-        body: _buildScaffoldContainer(context: context, viewModel: viewModel),
+        body: _buildScaffoldStack(context: context, viewModel: viewModel),
-      );
-
-  Widget _buildScaffoldContainer(
-          {required BuildContext context,
-          required RegisterViewModel viewModel}) =>
-      Container(
-        decoration: bgDecoration,
-        child: _buildScaffoldStack(context: context, viewModel: viewModel),
       );
 
   Widget _buildScaffoldStack(
@@ -170,7 +160,7 @@ class RegistrationOtpScreen extends ViewModelWidget<RegisterViewModel> {
       ];
 
   Widget _buildTitle() => Text(
-        LocaleKeys.verification_code.tr(),
+        'Verification Code',
         style: style25DG600,
       );
 
@@ -184,7 +174,7 @@ class RegistrationOtpScreen extends ViewModelWidget<RegisterViewModel> {
       : Container();
 
   Widget _buildPhoneSubtitle() => Text(
-        '${LocaleKeys.code_sent_to_phone.tr()} +251${phoneNumberController.text.substring(0, 3)}******',
+        'Code sent to your number +251${phoneNumberController.text.substring(0, 5)}****',
         softWrap: false,
         style: style14DG400,
       );
@@ -193,7 +183,7 @@ class RegistrationOtpScreen extends ViewModelWidget<RegisterViewModel> {
       emailController.text.isNotEmpty ? _buildEmailSubtitle() : Container();
 
   Widget _buildEmailSubtitle() => Text(
-        '${LocaleKeys.code_sent_to_email.tr()} ${emailController.text.substring(0, 2)}******${emailController.text.split('@').last}',
+        'Code sent to your number email ${emailController.text.substring(0, 3)}****${emailController.text.split('@').last}',
         softWrap: false,
         style: style14DG400,
       );
@@ -239,7 +229,7 @@ class RegistrationOtpScreen extends ViewModelWidget<RegisterViewModel> {
       child: _buildResendText());
 
   Widget _buildResendText() => Text(
-        LocaleKeys.resend_code.tr(),
+        'Resend code',
         style: style14P600.copyWith(fontStyle: FontStyle.italic),
       );
 
@@ -251,8 +241,7 @@ class RegistrationOtpScreen extends ViewModelWidget<RegisterViewModel> {
         ],
       );
 
-  Widget _buildCountdownText() =>
+  Widget _buildCountdownText() => Text('Resend code in ', style: style14DG400);
-      Text('${LocaleKeys.resend_code_in.tr()} ', style: style14DG400);
 
   Widget _buildTimer(RegisterViewModel viewModel) => TimerCountdown(
         enableDescriptions: false,
@@ -271,9 +260,9 @@ class RegistrationOtpScreen extends ViewModelWidget<RegisterViewModel> {
   Widget _buildContinueButton(RegisterViewModel viewModel) =>
       CustomElevatedButton(
         height: 55,
+        text: 'Continue',
         borderRadius: 12,
         foregroundColor: kcWhite,
-        text: LocaleKeys.cont.tr(),
         backgroundColor:
             otpController.text.length == 6 && !viewModel.hasOtpValidationMessage
                 ? kcPrimaryColor

lib/ui/views/startup/startup_view.dart

@@ -1,4 +1,3 @@
-import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/scheduler.dart';
 import 'package:flutter_svg/svg.dart';
@@ -8,12 +7,11 @@ import 'package:yimaru_app/ui/widgets/custom_circular_progress_indicator.dart';
 
 import '../../common/app_colors.dart';
 import '../../common/enmus.dart';
-import '../../common/translations/locale_keys.g.dart';
 import 'startup_viewmodel.dart';
 
 class StartupView extends StackedView<StartupViewModel> {
-  final String? label;
+  final String label;
-  const StartupView({Key? key, this.label}) : super(key: key);
+  const StartupView({Key? key, this.label = 'Loading'}) : super(key: key);
 
   @override
   Widget builder(
@@ -33,8 +31,7 @@ class StartupView extends StackedView<StartupViewModel> {
           ? _buildStartUpView()
           : _buildScaffold();
 
-  Widget _buildStartUpView() =>
+  Widget _buildStartUpView() => const StartupView(label: 'Checking user info');
-      StartupView(label: LocaleKeys.checking_user_info.tr());
 
   Widget _buildScaffold() => Stack(
         children: _buildScaffoldChildren(),
@@ -81,8 +78,7 @@ class StartupView extends StackedView<StartupViewModel> {
         _buildIndicatorWrapper(),
       ];
 
-  Widget _buildLoadingText() =>
+  Widget _buildLoadingText() => Text('$label ...', style: style16W600);
-      Text('${label ?? LocaleKeys.loading.tr()} ...', style: style16W600);
 
   Widget _buildIndicatorWrapper() => SizedBox(
         width: 16,

lib/ui/views/startup/startup_viewmodel.dart

@@ -34,7 +34,7 @@ class StartupViewModel extends ReactiveViewModel {
     final firstTimeInstall = await _authenticationService.isFirstTimeInstall();
 
     if (firstTimeInstall) {
-      await _navigationService.replaceWithLandingView();
+      await _navigationService.replaceWithWelcomeView();
     } else {
       if (loggedIn) {
         await _authenticationService.getUser();
@@ -56,9 +56,12 @@ class StartupViewModel extends ReactiveViewModel {
           label: 'Check you internet connection',
           onTap: () async => await _getProfileStatus());
 
+
+
   Future<void> replaceWithOnboarding() async =>
       await _navigationService.replaceWithOnboardingView();
 
+
   // Remote api calls
 
   // Get profile status

lib/ui/views/terms_and_conditions/terms_and_conditions_view.dart

@@ -73,12 +73,38 @@ class TermsAndConditionsView extends StackedView<TermsAndConditionsViewModel> {
 
   Widget _buildMenuColumnScrollView(TermsAndConditionsViewModel viewModel) =>
       SingleChildScrollView(
-        child: _buildContent(),
+        child: _buildContentColumn(),
       );
 
+  Widget _buildContentColumn() => Column(
+        mainAxisSize: MainAxisSize.min,
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: _buildContentColumnChildren(),
+      );
+
+  List<Widget> _buildContentColumnChildren() => [
+        _buildContent(),
+        verticalSpaceMedium,
+        //  _buildDownloadButtonWrapper(),
+      ];
+
   Widget _buildContent() => Html(
         data: ksTerms,
         shrinkWrap: true,
         style: htmlStyle,
       );
+
+  Widget _buildDownloadButtonWrapper() => Padding(
+        padding: const EdgeInsets.only(bottom: 50),
+        child: _buildDownloadButton(),
+      );
+
+  Widget _buildDownloadButton() => const CustomElevatedButton(
+        height: 55,
+        borderRadius: 12,
+        text: 'Download PDF',
+        leadingIcon: Icons.download,
+        foregroundColor: kcWhite,
+        backgroundColor: kcPrimaryColor,
+      );
 }

lib/ui/widgets/course_category_card.dart

@@ -2,6 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:yimaru_app/ui/common/helper_functions.dart';
 
 import '../common/app_colors.dart';
+import '../common/app_strings.dart';
 import '../common/ui_helpers.dart';
 import 'custom_elevated_button.dart';
 

lib/ui/widgets/course_unit_tile.dart

@@ -1,6 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:stacked/stacked.dart';
 import 'package:yimaru_app/models/course_unit.dart';
+import 'package:yimaru_app/models/submodule.dart';
 import 'package:yimaru_app/ui/common/enmus.dart';
 import 'package:yimaru_app/ui/widgets/course_module_tile_small.dart';
 import 'package:yimaru_app/ui/widgets/custom_linear_progress_indicator.dart';

lib/ui/widgets/login_account.dart

@@ -1,7 +1,6 @@
-import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 
-import '../common/translations/locale_keys.g.dart';
+import '../common/app_colors.dart';
 import '../common/ui_helpers.dart';
 
 class LoginAccount extends StatelessWidget {
@@ -19,9 +18,9 @@ class LoginAccount extends StatelessWidget {
         ],
       );
 
-  Widget _buildLeadingText() => Text(
+  Widget _buildLeadingText() => const Text(
-        LocaleKeys.already_have_account.tr(),
+        'Already have an account? ',
-        style: style14MG400,
+        style: TextStyle(color: kcMediumGrey),
       );
 
   Widget _buildRegisterTextButton() => TextButton(
@@ -32,8 +31,8 @@ class LoginAccount extends StatelessWidget {
         child: _buildRegisterText(),
       );
 
-  Widget _buildRegisterText() => Text(
+  Widget _buildRegisterText() => const Text(
-        LocaleKeys.login.tr(),
+        'Login',
-        style: style14P400,
+        style: TextStyle(color: kcPrimaryColor),
       );
 }

lib/ui/widgets/page_loading_indicator.dart

@@ -1,7 +1,5 @@
-import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.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 'custom_circular_progress_indicator.dart';
@@ -55,8 +53,8 @@ class PageLoadingIndicator extends StatelessWidget {
         child: CustomCircularProgressIndicator(color: kcPrimaryColor),
       );
 
-  Widget _buildText() => Text(
+  Widget _buildText() => const Text(
-        LocaleKeys.please_wait.tr(),
+        'Please wait',
-        style: style14P400,
+        style: TextStyle(color: kcPrimaryColor),
       );
 }

lib/ui/widgets/privacy_policy_tile.dart

@@ -1,7 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:iconsax/iconsax.dart';
 import 'package:yimaru_app/ui/common/app_strings.dart';
-import 'package:yimaru_app/ui/common/ui_helpers.dart';
 
 import '../common/app_colors.dart';
 
@@ -65,11 +64,17 @@ class PrivacyPolicyTile extends StatelessWidget {
 
   Widget _buildTitle() => Text(
         title,
-        style: style16DG600,
+        style: const TextStyle(
+          fontSize: 16,
+          color: kcDarkGrey,
+          fontWeight: FontWeight.w600,
+        ),
       );
 
-  Widget _buildContent() => Text(
+  Widget _buildContent() => const Text(
         ksPrivacyPolicy,
-        style: style14DG400,
+        style: TextStyle(
+          color: kcDarkGrey,
+        ),
       );
 }

lib/ui/widgets/register_for_account.dart

@@ -2,6 +2,7 @@ import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:yimaru_app/ui/common/translations/locale_keys.g.dart';
 
+import '../common/app_colors.dart';
 import '../common/ui_helpers.dart';
 
 class RegisterForAccount extends StatelessWidget {
@@ -19,7 +20,7 @@ class RegisterForAccount extends StatelessWidget {
         ],
       );
 
-  Widget _buildLeadingText() => Text(
+  Widget _buildLeadingText() =>  Text(
         '${LocaleKeys.dont_have_account.tr()} ',
         style: style14MG400,
       );
@@ -32,8 +33,8 @@ class RegisterForAccount extends StatelessWidget {
         child: _buildRegisterText(),
       );
 
-  Widget _buildRegisterText() => Text(
+  Widget _buildRegisterText() =>  Text(
-        LocaleKeys.register.tr(),
+       LocaleKeys.register.tr(),
-        style: style14P400,
+        style:style14P400 ,
       );
 }

pubspec.yaml

@@ -1,5 +1,5 @@
 name: yimaru_app
-version: 0.1.17+19
+version: 0.1.16+18
 publish_to: 'none'
 description: A new Flutter project.
 

test/viewmodels/landing_viewmodel_test.dart

@@ -1,11 +0,0 @@
-import 'package:flutter_test/flutter_test.dart';
-import 'package:yimaru_app/app/app.locator.dart';
-
-import '../helpers/test_helpers.dart';
-
-void main() {
-  group('LandingViewModel Tests -', () {
-    setUp(() => registerServices());
-    tearDown(() => locator.reset());
-  });
-}