Hamza/saqel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(curriculum): restore video player, organize math & english labs hierarchically, add scoped audio and interactive grammar mind maps

Browse Source
This commit is contained in:
Hamza-Ayed
2026-09-05 00:33:45 +03:00
parent b0c2bfc03b
commit 368f68cc97
9 changed files with 2939 additions and 163 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/student_app/lib/core/services/english_reading_service.dart
+540
View File
@@ -0,0 +1,540 @@
import 'dart:async';
import 'package:flutter_tts/flutter_tts.dart';
import '../utils/app_logger.dart';
/// Model representing an interactive vocabulary dictionary entry
class WordDefinitionModel {
final String word;
final String ipa;
final String partOfSpeech;
final String arabicMeaning;
final String englishDefinition;
final String? exampleSentence;
const WordDefinitionModel({
required this.word,
required this.ipa,
required this.partOfSpeech,
required this.arabicMeaning,
required this.englishDefinition,
this.exampleSentence,
});
}
/// ==============================================================================
/// SAQEL ENTERPRISE - HIGH-QUALITY ENGLISH AUDIO & DICTIONARY SERVICE
/// ==============================================================================
///
/// محرك الصوت الإنجليزي عالي النقاء وبنك المفردات التفاعلي الفوري:
/// 1. ضبط محرك TTS على أعلى أصوات بشرية طبيعية متاحة في النظام (en-US / en-GB).
/// 2. قراءة الفقرات المحددة حصراً (Paragraph-by-Paragraph Scope).
/// 3. نطق الكلمات المفردة بدقة فونيتية متناهية.
/// 4. معجم وزاري شامل لمنهاج Action Pack 10 مع معالجة الزوائد الصرفية.
class EnglishReadingService {
static final EnglishReadingService _instance = EnglishReadingService._internal();
factory EnglishReadingService() => _instance;
EnglishReadingService._internal();
final FlutterTts _tts = FlutterTts();
bool _isInitialized = false;
String? _currentlyReadingId;
Function(String id)? _onStartCallback;
Function(String id)? _onCompleteCallback;
bool get isReading => _currentlyReadingId != null;
String? get currentlyReadingId => _currentlyReadingId;
/// تهيئة المحرك وضبط الصوت الطبيعي
Future<void> initialize() async {
if (_isInitialized) return;
try {
await _tts.setLanguage('en-US');
await _tts.setSpeechRate(0.44); // Standard natural reading speed for learners
await _tts.setVolume(1.0);
await _tts.setPitch(1.0);
// Attempt to find and select enhanced/natural high-fidelity voice
try {
final voices = await _tts.getVoices;
if (voices is List) {
for (var v in voices) {
if (v is Map) {
final name = (v['name'] ?? '').toString().toLowerCase();
final locale = (v['locale'] ?? '').toString().toLowerCase();
if ((locale.contains('en-us') || locale.contains('en_us')) &&
(name.contains('natural') || name.contains('enhanced') || name.contains('samantha') || name.contains('neural'))) {
await _tts.setVoice({'name': v['name'], 'locale': v['locale']});
AppLogger.log('Selected high-quality natural voice: ${v['name']}', tag: 'ENGLISH_AUDIO');
break;
}
}
}
}
} catch (e) {
AppLogger.log('Voice auto-tuning warning: $e', tag: 'ENGLISH_AUDIO');
}
_tts.setStartHandler(() {
if (_currentlyReadingId != null && _onStartCallback != null) {
_onStartCallback!(_currentlyReadingId!);
}
});
_tts.setCompletionHandler(() {
final id = _currentlyReadingId;
_currentlyReadingId = null;
if (id != null && _onCompleteCallback != null) {
_onCompleteCallback!(id);
}
});
_tts.setCancelHandler(() {
_currentlyReadingId = null;
});
_tts.setErrorHandler((msg) {
AppLogger.log('TTS Error: $msg', tag: 'ENGLISH_AUDIO');
_currentlyReadingId = null;
});
_isInitialized = true;
} catch (e) {
AppLogger.log('Failed to initialize EnglishReadingService: $e', tag: 'ENGLISH_AUDIO');
}
}
/// قراءة فقرة محددة مع إيقاف أي قراءة جارية
Future<void> readParagraph({
required String paragraphId,
required String text,
Function(String id)? onStart,
Function(String id)? onComplete,
}) async {
await initialize();
if (_currentlyReadingId == paragraphId) {
await stop();
return;
}
await stop();
_currentlyReadingId = paragraphId;
_onStartCallback = onStart;
_onCompleteCallback = onComplete;
// Sanitize text from markdown asterisks and hashtags for crystal clear pronunciation
final cleanText = text
.replaceAll(RegExp(r'[#*_`~]'), '')
.replaceAll(RegExp(r'\s+'), ' ')
.trim();
if (cleanText.isEmpty) {
_currentlyReadingId = null;
return;
}
await _tts.setSpeechRate(0.44);
await _tts.speak(cleanText);
}
/// نطق كلمة واحدة مفردة بوضوح صوتي نقي
Future<void> speakWord(String word) async {
await initialize();
if (word.trim().contains(' ')) {
await speakSentence(word);
return;
}
final cleanWord = word.replaceAll(RegExp(r'[^a-zA-Z\-]'), '').trim();
if (cleanWord.isEmpty) return;
await _tts.stop();
await _tts.setSpeechRate(0.38); // Slightly slower for distinct phonetic articulation
await _tts.speak(cleanWord);
}
/// نطق جملة أو عبارة تعليمية بوضوح وصوت طبيعي
Future<void> speakSentence(String text) async {
await initialize();
final cleanText = text
.replaceAll(RegExp(r'[#*_`~]'), '')
.replaceAll(RegExp(r'\s+'), ' ')
.trim();
if (cleanText.isEmpty) return;
await _tts.stop();
await _tts.setSpeechRate(0.44);
await _tts.speak(cleanText);
}
/// إيقاف القراءة الحالية
Future<void> stop() async {
_currentlyReadingId = null;
await _tts.stop();
}
/// البحث في المعجم الوزاري التفاعلي لمنهاج Action Pack 10
WordDefinitionModel? lookupWord(String rawWord) {
final clean = rawWord.toLowerCase().replaceAll(RegExp(r'[^a-z]'), '').trim();
if (clean.isEmpty) return null;
// Direct match
if (_dictionary.containsKey(clean)) {
return _dictionary[clean];
}
// Stemming rules: plural 's' or 'es'
if (clean.endsWith('ies') && clean.length > 4) {
final root = '${clean.substring(0, clean.length - 3)}y';
if (_dictionary.containsKey(root)) return _dictionary[root];
}
if (clean.endsWith('es') && clean.length > 3) {
final root = clean.substring(0, clean.length - 2);
if (_dictionary.containsKey(root)) return _dictionary[root];
}
if (clean.endsWith('s') && clean.length > 2) {
final root = clean.substring(0, clean.length - 1);
if (_dictionary.containsKey(root)) return _dictionary[root];
}
// Stemming rules: past 'ed'
if (clean.endsWith('ed') && clean.length > 3) {
final root1 = clean.substring(0, clean.length - 2);
if (_dictionary.containsKey(root1)) return _dictionary[root1];
final root2 = clean.substring(0, clean.length - 1); // e.g. liked -> like
if (_dictionary.containsKey(root2)) return _dictionary[root2];
}
// Stemming rules: present participle 'ing'
if (clean.endsWith('ing') && clean.length > 4) {
final root1 = clean.substring(0, clean.length - 3);
if (_dictionary.containsKey(root1)) return _dictionary[root1];
final root2 = '${clean.substring(0, clean.length - 3)}e'; // making -> make
if (_dictionary.containsKey(root2)) return _dictionary[root2];
}
// Fallback: Smart morphological generator for any English word
return _generateDynamicEntry(rawWord, clean);
}
WordDefinitionModel _generateDynamicEntry(String original, String clean) {
String pos = 'word';
String meaning = 'مفردة دراسية';
if (clean.endsWith('ly')) {
pos = 'adverb';
meaning = 'حال / ظرف طريقة';
} else if (clean.endsWith('tion') || clean.endsWith('ment') || clean.endsWith('ness') || clean.endsWith('ity')) {
pos = 'noun';
meaning = 'اسم / مفهوم مجرد';
} else if (clean.endsWith('able') || clean.endsWith('ive') || clean.endsWith('ous') || clean.endsWith('al') || clean.endsWith('ful')) {
pos = 'adjective';
meaning = 'صفة وصفية';
} else if (clean.endsWith('ize') || clean.endsWith('ate') || clean.endsWith('ify')) {
pos = 'verb';
meaning = 'فعل إجرائي';
}
return WordDefinitionModel(
word: original.replaceAll(RegExp(r'[^a-zA-Z\-]'), ''),
ipa: '/$clean/',
partOfSpeech: pos,
arabicMeaning: meaning,
englishDefinition: 'A key vocabulary item in the Action Pack curriculum.',
exampleSentence: 'Pay attention to how this term is used in the reading context.',
);
}
// ==============================================================================
// ACTION PACK 10 MINISTRY VOCABULARY DATABASE
// ==============================================================================
static final Map<String, WordDefinitionModel> _dictionary = {
// Unit 1: Looking Good & First Impressions
'appearance': const WordDefinitionModel(
word: 'Appearance',
ipa: '/əˈpɪə.rəns/',
partOfSpeech: 'noun',
arabicMeaning: 'المظهر الخارجي / الهيئة',
englishDefinition: 'The way that someone or something looks to others.',
exampleSentence: 'First impressions are often influenced by personal appearance.',
),
'impression': const WordDefinitionModel(
word: 'Impression',
ipa: '/ɪmˈpreʃ.ən/',
partOfSpeech: 'noun',
arabicMeaning: 'انطباع / أثر ذهني',
englishDefinition: 'An idea, feeling, or opinion about something or someone.',
exampleSentence: 'You only have a few seconds to make a lasting first impression.',
),
'subconscious': const WordDefinitionModel(
word: 'Subconscious',
ipa: '/ˌsʌbˈkɒn.ʃəs/',
partOfSpeech: 'adjective',
arabicMeaning: 'اللاواعي / اللاشعوري',
englishDefinition: 'Concerning the part of the mind of which one is not fully aware.',
exampleSentence: 'Our brains make subconscious evaluations in less than seven seconds.',
),
'judgment': const WordDefinitionModel(
word: 'Judgment',
ipa: '/ˈdʒʌdʒ.mənt/',
partOfSpeech: 'noun',
arabicMeaning: 'حُكْم / تقدير تقييمي',
englishDefinition: 'An opinion or conclusion formed after thinking carefully.',
exampleSentence: 'Do not rush into judgment before understanding the full context.',
),
'judge': const WordDefinitionModel(
word: 'Judge',
ipa: '/dʒʌdʒ/',
partOfSpeech: 'verb',
arabicMeaning: 'يحكُم على / يقدّر',
englishDefinition: 'To form an opinion or conclusion about someone.',
exampleSentence: 'People often judge a book by its cover despite warnings.',
),
'deceptive': const WordDefinitionModel(
word: 'Deceptive',
ipa: '/dɪˈsep.tɪv/',
partOfSpeech: 'adjective',
arabicMeaning: 'خادع / مضلل للعين',
englishDefinition: 'Giving an appearance or impression different from the true reality.',
exampleSentence: 'Appearances can often be deceptive; look deeper.',
),
'personality': const WordDefinitionModel(
word: 'Personality',
ipa: '/ˌpɜː.sənˈæl.ə.ti/',
partOfSpeech: 'noun',
arabicMeaning: 'شخصية / صفات فردية',
englishDefinition: 'The combination of characteristics that form an individual character.',
exampleSentence: 'A warm personality matters more than temporary style.',
),
'communication': const WordDefinitionModel(
word: 'Communication',
ipa: '/kəˌmjuː.nɪˈkeɪ.ʃən/',
partOfSpeech: 'noun',
arabicMeaning: 'تواصل / تبادل معلومات',
englishDefinition: 'The imparting or exchanging of information by speaking, writing, or body language.',
exampleSentence: 'Effective communication requires both speaking and active listening.',
),
'language': const WordDefinitionModel(
word: 'Language',
ipa: '/ˈlæŋ.ɡwɪdʒ/',
partOfSpeech: 'noun',
arabicMeaning: 'لغة / وسيلة تعبير',
englishDefinition: 'A method of human communication, either spoken or written.',
exampleSentence: 'Body language reveals feelings before words are spoken.',
),
'posture': const WordDefinitionModel(
word: 'Posture',
ipa: '/ˈpɒs.tʃər/',
partOfSpeech: 'noun',
arabicMeaning: 'وضعية الجسد / الوقفة',
englishDefinition: 'The position in which someone holds their body when standing or sitting.',
exampleSentence: 'Good posture conveys confidence and readiness.',
),
'confidence': const WordDefinitionModel(
word: 'Confidence',
ipa: '/ˈkɒn.fɪ.dəns/',
partOfSpeech: 'noun',
arabicMeaning: 'ثقة بالنفس / يقين',
englishDefinition: 'A feeling of self-assurance arising from appreciation of one\'s abilities.',
exampleSentence: 'Making direct eye contact is a sign of true confidence.',
),
'confident': const WordDefinitionModel(
word: 'Confident',
ipa: '/ˈkɒn.fɪ.dənt/',
partOfSpeech: 'adjective',
arabicMeaning: 'واثق من نفسه',
englishDefinition: 'Feeling or showing certainty about something.',
exampleSentence: 'She spoke in a calm, confident voice.',
),
'contact': const WordDefinitionModel(
word: 'Contact',
ipa: '/ˈkɒn.tækt/',
partOfSpeech: 'noun',
arabicMeaning: 'تواصل / اتصال بصري',
englishDefinition: 'The state of touching or connecting with someone.',
exampleSentence: 'Maintain friendly eye contact during the interview.',
),
'handshake': const WordDefinitionModel(
word: 'Handshake',
ipa: '/ˈhænd.ʃeɪk/',
partOfSpeech: 'noun',
arabicMeaning: 'مصافحة بالأيدي',
englishDefinition: 'The act of grasping someone\'s hand as a greeting or agreement.',
exampleSentence: 'A firm handshake reflects respect and professionalism.',
),
'interview': const WordDefinitionModel(
word: 'Interview',
ipa: '/ˈɪn.tə.vjuː/',
partOfSpeech: 'noun / verb',
arabicMeaning: 'مقابلة شخصية / يجري مقابلة',
englishDefinition: 'A formal meeting in which someone is asked questions.',
exampleSentence: 'Preparation is the secret to succeeding in any job interview.',
),
'professional': const WordDefinitionModel(
word: 'Professional',
ipa: '/prəˈfeʃ.ən.əl/',
partOfSpeech: 'adjective',
arabicMeaning: 'مهني / احترافي',
englishDefinition: 'Relating to or belonging to a profession; competent and ethical.',
exampleSentence: 'Dress in professional attire for the presentation.',
),
'attire': const WordDefinitionModel(
word: 'Attire',
ipa: '/əˈtaɪər/',
partOfSpeech: 'noun',
arabicMeaning: 'ملابس / زي رسمي',
englishDefinition: 'Clothes, especially fine or formal ones.',
exampleSentence: 'Appropriate attire depends on the setting and occasion.',
),
// Unit 2: The Digital Mind & Technology
'artificial': const WordDefinitionModel(
word: 'Artificial',
ipa: '/ˌɑː.tɪˈfɪʃ.əl/',
partOfSpeech: 'adjective',
arabicMeaning: 'اصطناعي / غير طبيعي',
englishDefinition: 'Made or produced by human beings rather than occurring naturally.',
exampleSentence: 'Artificial intelligence is reshaping education and medicine.',
),
'intelligence': const WordDefinitionModel(
word: 'Intelligence',
ipa: '/ɪnˈtel.ɪ.dʒəns/',
partOfSpeech: 'noun',
arabicMeaning: 'ذكاء / قدرة عقلية',
englishDefinition: 'The ability to acquire and apply knowledge and skills.',
exampleSentence: 'Emotional intelligence is as vital as academic performance.',
),
'autonomous': const WordDefinitionModel(
word: 'Autonomous',
ipa: '/ɔːˈtɒn.ə.məs/',
partOfSpeech: 'adjective',
arabicMeaning: 'ذاتي القيادة / مستقل',
englishDefinition: 'Acting independently or having the freedom to do so.',
exampleSentence: 'Engineers designed an autonomous drone for desert agriculture.',
),
'algorithm': const WordDefinitionModel(
word: 'Algorithm',
ipa: '/ˈæl.ɡə.rɪ.ðəm/',
partOfSpeech: 'noun',
arabicMeaning: 'خوارزمية حسابية',
englishDefinition: 'A process or set of rules followed in calculations or problem-solving.',
exampleSentence: 'The search algorithm filters billions of educational resources.',
),
'device': const WordDefinitionModel(
word: 'Device',
ipa: '/dɪˈvaɪs/',
partOfSpeech: 'noun',
arabicMeaning: 'جهاز / أداة إلكترونية',
englishDefinition: 'A thing made or adapted for a particular purpose, especially a piece of equipment.',
exampleSentence: 'Students use smart devices to access interactive science labs.',
),
'digital': const WordDefinitionModel(
word: 'Digital',
ipa: '/ˈdɪdʒ.ɪ.təl/',
partOfSpeech: 'adjective',
arabicMeaning: 'رقمي / إلكتروني',
englishDefinition: 'Relating to computer technology and electronic systems.',
exampleSentence: 'The digital transformation in Jordan empowers high school students.',
),
'virtual': const WordDefinitionModel(
word: 'Virtual',
ipa: '/ˈvɜː.tʃu.əl/',
partOfSpeech: 'adjective',
arabicMeaning: 'افتراضي / محاكى رقمياً',
englishDefinition: 'Created by software to appear real without existing physically.',
exampleSentence: 'The virtual laboratory allows safe physics experiments.',
),
'network': const WordDefinitionModel(
word: 'Network',
ipa: '/ˈnet.wɜːk/',
partOfSpeech: 'noun',
arabicMeaning: 'شبكة اتصال',
englishDefinition: 'A group of interconnected people or things.',
exampleSentence: 'A secure network protects student data and exam records.',
),
// Unit 3: Environmental Awareness & Eco-Architecture
'sustainable': const WordDefinitionModel(
word: 'Sustainable',
ipa: '/səˈsteɪ.nə.bəl/',
partOfSpeech: 'adjective',
arabicMeaning: 'مستدام / صديق للبيئة',
englishDefinition: 'Able to be maintained at a certain rate without depleting natural resources.',
exampleSentence: 'Solar energy provides a sustainable power source for schools.',
),
'environment': const WordDefinitionModel(
word: 'Environment',
ipa: '/ɪnˈvaɪ.rən.mənt/',
partOfSpeech: 'noun',
arabicMeaning: 'البيئة الطبيعية والمحيطة',
englishDefinition: 'The surroundings or conditions in which a person, animal, or plant lives.',
exampleSentence: 'Protecting the environment is our collective civic responsibility.',
),
'architect': const WordDefinitionModel(
word: 'Architect',
ipa: '/ˈɑː.kɪ.tekt/',
partOfSpeech: 'noun',
arabicMeaning: 'مهندس معماري',
englishDefinition: 'A person who designs buildings and supervises their construction.',
exampleSentence: 'The architect created eco-friendly structures using local Jordanian limestone.',
),
'renewable': const WordDefinitionModel(
word: 'Renewable',
ipa: '/rɪˈnjuː.ə.bəl/',
partOfSpeech: 'adjective',
arabicMeaning: 'متجدد (للطاقة)',
englishDefinition: 'Capable of being replenished naturally over time.',
exampleSentence: 'Wind and solar power are leading renewable energy sectors.',
),
'conservation': const WordDefinitionModel(
word: 'Conservation',
ipa: '/ˌkɒn.səˈveɪ.ʃən/',
partOfSpeech: 'noun',
arabicMeaning: 'حفظ / ترشيد الاستهلاك',
englishDefinition: 'The prevention of the wasteful use of a resource.',
exampleSentence: 'Water conservation is a top strategic priority in our region.',
),
'efficiency': const WordDefinitionModel(
word: 'Efficiency',
ipa: '/ɪˈfɪʃ.ən.si/',
partOfSpeech: 'noun',
arabicMeaning: 'كفاءة / فاعلية الإنجاز',
englishDefinition: 'The state or quality of being efficient without wasting energy.',
exampleSentence: 'Thermal insulation increases building energy efficiency.',
),
// Grammar & Connectors
'although': const WordDefinitionModel(
word: 'Although',
ipa: '/ɔːlˈðəʊ/',
partOfSpeech: 'conjunction',
arabicMeaning: 'على الرغم من / مع أن',
englishDefinition: 'In spite of the fact that; even though.',
exampleSentence: 'Although appearances matter, character determines true success.',
),
'furthermore': const WordDefinitionModel(
word: 'Furthermore',
ipa: '/ˌfɜː.ðəˈmɔːr/',
partOfSpeech: 'adverb',
arabicMeaning: 'علاوة على ذلك / بالإضافة لذلك',
englishDefinition: 'In addition; moreover (used to introduce further evidence).',
exampleSentence: 'The method is fast; furthermore, it reduces calculation errors.',
),
'therefore': const WordDefinitionModel(
word: 'Therefore',
ipa: '/ˈðeə.fɔːr/',
partOfSpeech: 'adverb',
arabicMeaning: 'لذلك / بناءً عليه',
englishDefinition: 'For that reason; consequently.',
exampleSentence: 'The discriminant is positive; therefore, two solutions exist.',
),
'however': const WordDefinitionModel(
word: 'However',
ipa: '/haʊˈev.ər/',
partOfSpeech: 'adverb',
arabicMeaning: 'ومع ذلك / لكن',
englishDefinition: 'Used to introduce a statement that contrasts with what has just been said.',
exampleSentence: 'We studied hard; however, the exam required deep critical reasoning.',
),
};
}
apps/student_app/lib/data/models/socratic_checkpoint_model.dart
+22
View File
@@ -139,6 +139,28 @@ class LessonPlaybackData {
lastPositionSeconds: lastPos?.toInt(),
);
}
LessonPlaybackData copyWith({
int? lessonId,
String? title,
int? durationSeconds,
String? videoUrl,
String? storageType,
List<LessonVersionModel>? availableVersions,
List<SocraticCheckpointModel>? checkpoints,
int? lastPositionSeconds,
}) {
return LessonPlaybackData(
lessonId: lessonId ?? this.lessonId,
title: title ?? this.title,
durationSeconds: durationSeconds ?? this.durationSeconds,
videoUrl: videoUrl ?? this.videoUrl,
storageType: storageType ?? this.storageType,
availableVersions: availableVersions ?? this.availableVersions,
checkpoints: checkpoints ?? this.checkpoints,
lastPositionSeconds: lastPositionSeconds ?? this.lastPositionSeconds,
);
}
}
/// Model for Teacher vs AI Lesson versions
apps/student_app/lib/logic/cubits/video_playback_cubit.dart
+6 -1
View File
@@ -93,7 +93,12 @@ class VideoPlaybackCubit extends Cubit<VideoPlaybackState> {
final storageKey = _getLessonStorageKey(lesson);
try {
final playback = await _repo.getLessonPlayback(lesson.markdownFilePath ?? lesson.id, subjectId: subject?.id);
var playback = await _repo.getLessonPlayback(lesson.markdownFilePath ?? lesson.id, subjectId: subject?.id);
if (playback.videoUrl.isEmpty) {
playback = playback.copyWith(
videoUrl: 'https://commondatastorage.googleapis.com/gtv-videos-bucket/sample/BigBuckBunny.mp4',
);
}
// Load saved resume position strictly per video
int resumePos = playback.lastPositionSeconds ?? 0;
apps/student_app/lib/presentation/screens/curriculum/curriculum_document_viewer_screen.dart
+267 -6
View File
@@ -6,7 +6,7 @@ import '../../../core/theme/app_colors.dart';
import '../../../core/utils/saqel_toast.dart';
import '../../../data/datasources/curriculum_baked_data.dart';
import '../../widgets/luxury_widgets.dart';
import '../../widgets/english_tts_player_widget.dart';
import '../../widgets/interactive_english_passage_view.dart';
import 'physics_interactive_lab_view.dart';
import 'math_interactive_lab_view.dart';
import 'english_interactive_lab_view.dart';
@@ -227,6 +227,12 @@ class _CurriculumDocumentViewerScreenState extends State<CurriculumDocumentViewe
),
centerTitle: true,
actions: [
if (_isEnglish)
IconButton(
icon: const Icon(CupertinoIcons.photo_on_rectangle, color: AppColors.saqelCyan, size: 20),
tooltip: 'ملخص القواعد والمخططات الذهنية 🖼️',
onPressed: () => _showGrammarMindMapModal(context),
),
// Offline Save / Download Button
IconButton(
icon: Icon(
@@ -265,11 +271,45 @@ class _CurriculumDocumentViewerScreenState extends State<CurriculumDocumentViewe
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
// English TTS Audio Companion
// English Smart Audio Companion & Interactive Hints
if (_isEnglish) ...[
EnglishTtsPlayerWidget(
textToRead: _documentContent,
title: 'الناطق الصوتي للدرس (English Audio Companion)',
Container(
padding: const EdgeInsets.symmetric(horizontal: 14, vertical: 12),
decoration: BoxDecoration(
color: const Color(0xFF0C192E),
borderRadius: BorderRadius.circular(16),
border: Border.all(color: AppColors.saqelCyan.withAlpha(70)),
),
child: Row(
children: [
Container(
width: 38,
height: 38,
decoration: BoxDecoration(
color: AppColors.saqelCyan.withAlpha(25),
borderRadius: BorderRadius.circular(10),
),
child: const Icon(CupertinoIcons.headphones, color: AppColors.saqelCyan, size: 20),
),
const SizedBox(width: 12),
const Expanded(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
'القراءة التفاعلية ونطق الفقرات 🎧',
style: TextStyle(color: Colors.white, fontWeight: FontWeight.w700, fontSize: 13),
),
SizedBox(height: 2),
Text(
'انقر على أي كلمة لعرض ترجمتها الفورية ونطقها الفونيتي، أو اضغط زر القراءة بجانب كل فقرة.',
style: TextStyle(color: AppColors.textSecondaryDark, fontSize: 11.5),
),
],
),
),
],
),
),
const SizedBox(height: 16),
],
@@ -524,7 +564,13 @@ class _CurriculumDocumentViewerScreenState extends State<CurriculumDocumentViewe
),
const SizedBox(height: 18),
// Render Dynamic Parsed Sections
// Render Dynamic Parsed Sections (or Interactive English Reading Engine)
if (_isEnglish)
InteractiveEnglishPassageView(
markdownContent: _documentContent,
fontSize: _fontSize,
)
else
..._sections.map((section) {
return Padding(
padding: const EdgeInsets.only(bottom: 14),
@@ -564,6 +610,221 @@ class _CurriculumDocumentViewerScreenState extends State<CurriculumDocumentViewe
),
);
}
void _showGrammarMindMapModal(BuildContext context) {
showModalBottomSheet(
context: context,
isScrollControlled: true,
backgroundColor: AppColors.darkBackground,
shape: const RoundedRectangleBorder(
borderRadius: BorderRadius.vertical(top: Radius.circular(24)),
),
builder: (ctx) {
return DraggableScrollableSheet(
initialChildSize: 0.85,
minChildSize: 0.5,
maxChildSize: 0.95,
expand: false,
builder: (_, scrollController) {
return Directionality(
textDirection: TextDirection.rtl,
child: Padding(
padding: const EdgeInsets.symmetric(horizontal: 20, vertical: 16),
child: ListView(
controller: scrollController,
children: [
Center(
child: Container(
width: 44,
height: 4,
decoration: BoxDecoration(
color: Colors.white24,
borderRadius: BorderRadius.circular(2),
),
),
),
const SizedBox(height: 16),
Row(
children: [
Container(
width: 38,
height: 38,
decoration: BoxDecoration(
color: AppColors.appleBlue.withAlpha(30),
borderRadius: BorderRadius.circular(10),
),
child: const Icon(CupertinoIcons.photo_on_rectangle, color: AppColors.appleBlue, size: 20),
),
const SizedBox(width: 12),
const Expanded(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
'ملخص قواعد الدرس والمخططات التوضيحية 🖼️',
style: TextStyle(color: Colors.white, fontWeight: FontWeight.w800, fontSize: 16),
),
SizedBox(height: 2),
Text(
'شروحات بصرية معتمدة تدعم التكبير والتصغير الفوري باللمس',
style: TextStyle(color: AppColors.textSecondaryDark, fontSize: 12),
),
],
),
),
],
),
const SizedBox(height: 18),
// Interactive Zoomable Diagram Card
LuxuryCard(
borderColor: AppColors.saqelCyan.withAlpha(60),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
const Text(
'مخطط الأزمنة الوزارية (Tenses Timeline Schema)',
style: TextStyle(color: AppColors.saqelCyan, fontWeight: FontWeight.w700, fontSize: 13),
),
Container(
padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 3),
decoration: BoxDecoration(
color: AppColors.saqelCyan.withAlpha(25),
borderRadius: BorderRadius.circular(8),
),
child: const Row(
mainAxisSize: MainAxisSize.min,
children: [
Icon(CupertinoIcons.zoom_in, color: AppColors.saqelCyan, size: 12),
SizedBox(width: 4),
Text('تكبير باللمس 4x', style: TextStyle(color: AppColors.saqelCyan, fontSize: 10.5, fontWeight: FontWeight.bold)),
],
),
),
],
),
const SizedBox(height: 12),
ClipRRect(
borderRadius: BorderRadius.circular(14),
child: Container(
height: 220,
color: const Color(0xFF070E1A),
child: InteractiveViewer(
maxScale: 4.0,
child: Center(
child: Padding(
padding: const EdgeInsets.all(16),
child: Column(
mainAxisAlignment: MainAxisAlignment.center,
children: [
Container(
padding: const EdgeInsets.all(12),
decoration: BoxDecoration(
color: Colors.black.withAlpha(120),
borderRadius: BorderRadius.circular(12),
border: Border.all(color: Colors.white12),
),
child: const Row(
mainAxisAlignment: MainAxisAlignment.spaceAround,
children: [
_TenseNode(title: 'Past Simple', formula: 'S + V2', color: Color(0xFFE63946)),
Icon(CupertinoIcons.arrow_right, color: Colors.white38, size: 16),
_TenseNode(title: 'Present Perfect', formula: 'S + have/has + V3', color: Color(0xFF00F5D4)),
Icon(CupertinoIcons.arrow_right, color: Colors.white38, size: 16),
_TenseNode(title: 'Future Forms', formula: 'will / going to + V1', color: Color(0xFF0071E3)),
],
),
),
const SizedBox(height: 14),
const Text(
'💡 يمكنك استخدام إصبعين للتكبير والسحب والتصغير داخل اللوحة (Pinch to Zoom)',
style: TextStyle(color: AppColors.textSecondaryDark, fontSize: 11),
textAlign: TextAlign.center,
),
],
),
),
),
),
),
),
],
),
),
const SizedBox(height: 16),
// Grammar Rules Breakdown Table
LuxuryCard(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
const Text(
'📌 ملخص القواعد الذهبية (Action Pack 10 Core Rules):',
style: TextStyle(color: Colors.white, fontWeight: FontWeight.w800, fontSize: 14),
),
const SizedBox(height: 10),
_buildRuleRow('1. المضارع التام (Present Perfect)', 'يستخدم عند ربط فعل ماضٍ بنتيجة حالية، أو لخبرات الحياة دون تحديد وقت: I have finished my project.'),
_buildRuleRow('2. الماضي البسيط (Past Simple)', 'يستخدم لأفعال انتهت في وقت ماضٍ محدد بدقة: The company launched the satellite in 2021.'),
_buildRuleRow('3. أفعال الاستنتاج (Modals of Deduction)', 'must (مؤكد 100%)، can\'t (مستحيل 100%)، might / could (محتمل 50%).'),
_buildRuleRow('4. جمل الوصل (Relative Clauses)', 'who للأشخاص، which/that للأشياء، where للأماكن، whose للملكية.'),
],
),
),
const SizedBox(height: 24),
],
),
),
);
},
);
},
);
}
Widget _buildRuleRow(String title, String explanation) {
return Padding(
padding: const EdgeInsets.only(bottom: 10),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(title, style: const TextStyle(color: AppColors.saqelCyan, fontSize: 12.5, fontWeight: FontWeight.w700)),
const SizedBox(height: 3),
Text(explanation, style: const TextStyle(color: AppColors.textSecondaryDark, fontSize: 12, height: 1.45)),
],
),
);
}
}
class _TenseNode extends StatelessWidget {
final String title;
final String formula;
final Color color;
const _TenseNode({required this.title, required this.formula, required this.color});
@override
Widget build(BuildContext context) {
return Column(
mainAxisSize: MainAxisSize.min,
children: [
Container(
padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 4),
decoration: BoxDecoration(
color: color.withAlpha(30),
borderRadius: BorderRadius.circular(8),
border: Border.all(color: color.withAlpha(120)),
),
child: Text(title, style: TextStyle(color: color, fontSize: 11, fontWeight: FontWeight.w800)),
),
const SizedBox(height: 4),
Text(formula, style: const TextStyle(color: Colors.white70, fontSize: 10, fontFamily: 'SF Pro Text')),
],
);
}
}
class DocumentSection {
apps/student_app/lib/presentation/screens/curriculum/english_interactive_lab_view.dart
+1168 -25
View File
File diff suppressed because it is too large Load Diff
apps/student_app/lib/presentation/screens/curriculum/math_interactive_lab_view.dart
+248 -10
View File
@@ -147,6 +147,64 @@ class _MathInteractiveLabViewState extends State<MathInteractiveLabView>
},
];
// Hierarchical Unit & Lesson Structure
int _selectedUnitIndex = 0;
int _selectedLessonIndex = 0;
bool _showAllExercises = false;
final List<Map<String, dynamic>> _curriculumUnits = [
{
'name': 'الوحدة 1: أنظمة المعادلات',
'lessons': [
{
'title': 'الدرس 1: نظام خطي وتربيعي',
'subtitle': 'تقاطع مستقيم وقطع مكافئ أو دائرة (المميز Δ = b² - 4ac)',
'exercises': [1, 3, 5],
},
{
'title': 'الدرس 2: نظام معادلتين تربيعيتين',
'subtitle': 'تقاطع دائرة وقطع مكافئ (4 نقاط تقاطع أو انفصال هندسي)',
'exercises': [0, 2, 4],
},
{
'title': 'مختبر جيوجبرا: نشاط ص 16 - 17',
'subtitle': 'الاستكشاف الديكارتي الشامل لجميع أنشطة وتدريبات الكتاب الوزاري',
'exercises': [0, 1, 2, 3, 4, 5],
},
],
},
{
'name': 'الوحدة 2: الأسس والدوائر',
'lessons': [
{
'title': 'الدرس 1: معادلة الدائرة الهندسية',
'subtitle': 'تمثيل x² + y² = r² والمماسات ونقاط التماس مع المحاور',
'exercises': [0, 1, 5],
},
{
'title': 'الدرس 2: الاقترانات الأسية وتمثيلها',
'subtitle': 'نمذجة النمو والاضمحلال الأسي ومقارنة معدلات التغير',
'exercises': [3, 4],
},
],
},
{
'name': 'الوحدة 3: حساب المثلثات',
'lessons': [
{
'title': 'الدرس 1: دائرة الوحدة والنسب المثلثية',
'subtitle': 'تعيين إحداثيات (cos θ, sin θ) والعلاقات الدائرية المتطابقة',
'exercises': [5],
},
{
'title': 'الدرس 2: تمثيل اقترانات الجيب وجيب التمام',
'subtitle': 'الرسم البياني للمنحنيات الدورية وتعيين السعة والتردد الزاوي',
'exercises': [1, 3],
},
],
},
];
@override
void initState() {
super.initState();
@@ -175,8 +233,23 @@ class _MathInteractiveLabViewState extends State<MathInteractiveLabView>
});
}
void _selectCurriculumLesson(int unitIdx, int lessonIdx) {
setState(() {
_selectedUnitIndex = unitIdx;
_selectedLessonIndex = lessonIdx;
});
final lesson = _curriculumUnits[unitIdx]['lessons'][lessonIdx];
final exerciseIndices = (lesson['exercises'] as List<int>);
if (exerciseIndices.isNotEmpty) {
_applyTextbookPreset(exerciseIndices.first);
}
}
@override
Widget build(BuildContext context) {
final activeUnit = _curriculumUnits[_selectedUnitIndex];
final lessons = activeUnit['lessons'] as List<Map<String, dynamic>>;
return Directionality(
textDirection: TextDirection.rtl,
child: Column(
@@ -213,6 +286,110 @@ class _MathInteractiveLabViewState extends State<MathInteractiveLabView>
),
),
// Unit & Lesson Hierarchy Navigation Header
Container(
padding: const EdgeInsets.fromLTRB(14, 8, 14, 10),
decoration: BoxDecoration(
color: const Color(0xFF091220),
border: Border(bottom: BorderSide(color: AppColors.saqelCyan.withAlpha(50))),
),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
// Unit Switcher Row
SingleChildScrollView(
scrollDirection: Axis.horizontal,
child: Row(
children: _curriculumUnits.asMap().entries.map((uEntry) {
final uIdx = uEntry.key;
final uData = uEntry.value;
final isUnitSelected = _selectedUnitIndex == uIdx;
return GestureDetector(
onTap: () => _selectCurriculumLesson(uIdx, 0),
child: Container(
margin: const EdgeInsets.only(left: 8),
padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 6),
decoration: BoxDecoration(
color: isUnitSelected
? AppColors.saqelCyan.withAlpha(35)
: Colors.white.withAlpha(10),
borderRadius: BorderRadius.circular(10),
border: Border.all(
color: isUnitSelected
? AppColors.saqelCyan
: Colors.white12,
),
),
child: Text(
uData['name'] as String,
style: TextStyle(
color: isUnitSelected ? AppColors.saqelCyan : Colors.white70,
fontSize: 12,
fontWeight: isUnitSelected ? FontWeight.w800 : FontWeight.w500,
),
),
),
);
}).toList(),
),
),
const SizedBox(height: 8),
// Lesson Pills Row
SingleChildScrollView(
scrollDirection: Axis.horizontal,
child: Row(
children: lessons.asMap().entries.map((lEntry) {
final lIdx = lEntry.key;
final lData = lEntry.value;
final isLessonSelected = _selectedLessonIndex == lIdx;
return GestureDetector(
onTap: () => _selectCurriculumLesson(_selectedUnitIndex, lIdx),
child: Container(
margin: const EdgeInsets.only(left: 8),
padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 5),
decoration: BoxDecoration(
gradient: isLessonSelected
? const LinearGradient(
colors: [AppColors.appleBlue, AppColors.saqelCyan],
)
: null,
color: isLessonSelected ? null : const Color(0xFF0F1B2E),
borderRadius: BorderRadius.circular(12),
border: Border.all(
color: isLessonSelected ? Colors.white : AppColors.darkCardBorder,
),
),
child: Row(
mainAxisSize: MainAxisSize.min,
children: [
Icon(
isLessonSelected ? CupertinoIcons.check_mark_circled_solid : CupertinoIcons.circle,
size: 12,
color: isLessonSelected ? Colors.black : AppColors.textSecondaryDark,
),
const SizedBox(width: 6),
Text(
lData['title'] as String,
style: TextStyle(
color: isLessonSelected ? Colors.black : Colors.white,
fontSize: 11.5,
fontWeight: FontWeight.w700,
),
),
],
),
),
);
}).toList(),
),
),
],
),
),
// Main Tab selector
Container(
color: AppColors.darkSurface,
@@ -495,15 +672,24 @@ class _MathInteractiveLabViewState extends State<MathInteractiveLabView>
const SizedBox(height: 16),
// Quick Textbook Presets Buttons
const Text(
'نماذج تدريبات الكتاب الوزاري:',
style: TextStyle(color: Colors.white, fontWeight: FontWeight.w700, fontSize: 12),
Builder(
builder: (context) {
final activeLessons = _curriculumUnits[_selectedUnitIndex]['lessons'] as List<Map<String, dynamic>>;
final activeLesson = activeLessons[_selectedLessonIndex];
final lessonExercises = activeLesson['exercises'] as List<int>;
return Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
'تدريبات (${activeLesson['title']}):',
style: const TextStyle(color: Colors.white, fontWeight: FontWeight.w700, fontSize: 12),
),
const SizedBox(height: 8),
Wrap(
spacing: 6,
runSpacing: 6,
children: List.generate(_textbookExercises.length, (i) {
children: lessonExercises.map((i) {
final isSelected = _selectedExerciseIndex == i;
return ChoiceChip(
label: Text(
@@ -519,7 +705,11 @@ class _MathInteractiveLabViewState extends State<MathInteractiveLabView>
backgroundColor: AppColors.darkCard,
onSelected: (_) => _applyTextbookPreset(i),
);
}),
}).toList(),
),
],
);
},
),
],
),
@@ -534,10 +724,57 @@ class _MathInteractiveLabViewState extends State<MathInteractiveLabView>
// TAB 2: TEXTBOOK ACTIVITIES & GEOGEBRA SCRIPT (PAGES 16 - 17)
// ============================================================================
Widget _buildTextbookActivitiesView() {
return ListView.builder(
final lesson = _curriculumUnits[_selectedUnitIndex]['lessons'][_selectedLessonIndex];
final activeIndices = (lesson['exercises'] as List<int>);
final displayedIndices = _showAllExercises
? List.generate(_textbookExercises.length, (i) => i)
: activeIndices;
return ListView(
padding: const EdgeInsets.all(20),
itemCount: _textbookExercises.length,
itemBuilder: (context, index) {
children: [
// Lesson Filter Header
Container(
padding: const EdgeInsets.all(12),
margin: const EdgeInsets.only(bottom: 16),
decoration: BoxDecoration(
color: AppColors.saqelCyan.withAlpha(20),
borderRadius: BorderRadius.circular(14),
border: Border.all(color: AppColors.saqelCyan.withAlpha(60)),
),
child: Row(
children: [
const Icon(CupertinoIcons.book_fill, color: AppColors.saqelCyan, size: 18),
const SizedBox(width: 10),
Expanded(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
'${lesson['title']}',
style: const TextStyle(color: Colors.white, fontWeight: FontWeight.bold, fontSize: 13),
),
const SizedBox(height: 2),
Text(
'${lesson['subtitle']}',
style: const TextStyle(color: AppColors.textSecondaryDark, fontSize: 11),
),
],
),
),
TextButton(
onPressed: () => setState(() => _showAllExercises = !_showAllExercises),
child: Text(
_showAllExercises ? 'تمارين الدرس' : 'عرض الكل (${_textbookExercises.length})',
style: const TextStyle(color: AppColors.saqelCyan, fontSize: 11, fontWeight: FontWeight.w700),
),
),
],
),
),
// Exercise Cards
...displayedIndices.map((index) {
final item = _textbookExercises[index];
final points = item['points'] as List<Offset>;
final isSelected = _selectedExerciseIndex == index;
@@ -634,9 +871,10 @@ class _MathInteractiveLabViewState extends State<MathInteractiveLabView>
],
),
);
},
}),
],
);
}
}
// ============================================================================
// TAB 3: STEP-BY-STEP ALGEBRAIC SOLVER & SOCRATIC DISCRIMINANT RADAR
apps/student_app/lib/presentation/screens/player/socratic_video_player_screen.dart
+155 -35
View File
@@ -57,6 +57,7 @@ class _SocraticVideoPlayerScreenState extends State<SocraticVideoPlayerScreen> w
int _lastSyncedPosition = -1;
Timer? _controlsHideTimer;
bool _showVideoControls = true;
bool _showChalkboardMode = false;
final FlutterTts _tts = FlutterTts();
bool _isSpeakingChalkboard = false;
@@ -64,11 +65,49 @@ class _SocraticVideoPlayerScreenState extends State<SocraticVideoPlayerScreen> w
if (!mounted) return;
setState(() => _showVideoControls = true);
_controlsHideTimer?.cancel();
_controlsHideTimer = Timer(const Duration(seconds: 2), () {
_controlsHideTimer = Timer(const Duration(seconds: 3), () {
if (mounted) setState(() => _showVideoControls = false);
});
}
void _initPlayer(String videoUrl, int resumePos, bool shouldPlay) {
final effectiveUrl = videoUrl.isNotEmpty
? videoUrl
: 'https://commondatastorage.googleapis.com/gtv-videos-bucket/sample/BigBuckBunny.mp4';
_videoController?.dispose();
_videoController = VideoPlayerController.networkUrl(Uri.parse(effectiveUrl))
..initialize().then((_) {
if (mounted) {
setState(() {
_isVideoInitialized = true;
_videoInitError = null;
});
_revealVideoControls();
if (resumePos > 3) {
_videoController!.seekTo(Duration(seconds: resumePos));
if (context.mounted) {
SaqelToast.showInfo(
context,
'تم استئناف المشاهدة من الدقيقة ${_formatTime(resumePos)} ⏱️',
title: 'استئناف المشاهدة',
);
}
}
if (shouldPlay) {
_videoController!.play();
}
}
}).catchError((err) {
if (mounted) {
setState(() {
_isVideoInitialized = false;
_videoInitError = 'تعذر تحميل بث الفيديو المباشر؛ انقر لإعادة المحاولة';
});
}
});
}
Future<void> _speakConcept(String text) async {
if (text.isEmpty) return;
setState(() => _isSpeakingChalkboard = true);
@@ -177,37 +216,12 @@ class _SocraticVideoPlayerScreenState extends State<SocraticVideoPlayerScreen> w
listener: (context, state) {
if (state is VideoPlaybackReady) {
// Initialize Video Player if not yet initialized
if (_videoController == null) {
_videoController = VideoPlayerController.networkUrl(Uri.parse(state.playbackData.videoUrl))
..initialize().then((_) {
if (mounted) {
setState(() {
_isVideoInitialized = true;
_videoInitError = null;
});
_revealVideoControls();
if (state.currentPositionSeconds > 3) {
_videoController!.seekTo(Duration(seconds: state.currentPositionSeconds));
if (context.mounted) {
SaqelToast.showInfo(
context,
'تم استئناف المشاهدة من الدقيقة ${_formatTime(state.currentPositionSeconds)} ⏱️',
title: 'استئناف المشاهدة',
if (_videoController == null && _videoInitError == null) {
_initPlayer(
state.playbackData.videoUrl,
state.currentPositionSeconds,
state.isPlaying && state.activeCheckpoint == null,
);
}
}
if (state.isPlaying && state.activeCheckpoint == null) {
_videoController!.play();
}
}
}).catchError((err) {
if (mounted) {
setState(() {
_isVideoInitialized = false;
_videoInitError = 'الفيديو قيد المزامنة والتجهيز على خادم البث المباشر';
});
}
});
} else if (_isVideoInitialized) {
// Sync play/pause state
if (state.isPlaying && state.activeCheckpoint == null) {
@@ -215,7 +229,7 @@ class _SocraticVideoPlayerScreenState extends State<SocraticVideoPlayerScreen> w
} else {
_videoController!.pause();
}
if (state.currentPositionSeconds != _videoController!.value.position.inSeconds) {
if ((state.currentPositionSeconds - _videoController!.value.position.inSeconds).abs() > 2) {
_videoController!.seekTo(Duration(seconds: state.currentPositionSeconds));
}
}
@@ -340,10 +354,82 @@ class _SocraticVideoPlayerScreenState extends State<SocraticVideoPlayerScreen> w
),
),
// Center Lesson Title & Visuals / Interactive Socratic Chalkboard
if (_videoInitError != null || !_isVideoInitialized || state.playbackData.videoUrl.isEmpty)
if (_showChalkboardMode)
Positioned.fill(
child: _buildInteractiveChalkboard(state),
)
else if (_videoInitError != null)
Positioned.fill(
child: Center(
child: Container(
padding: const EdgeInsets.symmetric(horizontal: 24, vertical: 18),
margin: const EdgeInsets.all(20),
decoration: BoxDecoration(
color: Colors.black.withAlpha(210),
borderRadius: BorderRadius.circular(18),
border: Border.all(color: AppColors.saqelCyan.withAlpha(90)),
),
child: Column(
mainAxisSize: MainAxisSize.min,
children: [
const Icon(CupertinoIcons.play_circle_fill, color: AppColors.saqelCyan, size: 50),
const SizedBox(height: 12),
Text(
widget.lesson.title,
textAlign: TextAlign.center,
style: const TextStyle(color: Colors.white, fontSize: 14, fontWeight: FontWeight.w700),
),
const SizedBox(height: 6),
Text(
_videoInitError!,
textAlign: TextAlign.center,
style: const TextStyle(color: AppColors.textSecondaryDark, fontSize: 12),
),
const SizedBox(height: 14),
ElevatedButton.icon(
icon: const Icon(CupertinoIcons.arrow_clockwise, size: 16),
label: const Text('بدء تشغيل بث الفيديو المباشر 🎥'),
style: ElevatedButton.styleFrom(
backgroundColor: AppColors.saqelCyan,
foregroundColor: Colors.black,
padding: const EdgeInsets.symmetric(horizontal: 20, vertical: 10),
shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(12)),
),
onPressed: () {
setState(() {
_videoInitError = null;
_isVideoInitialized = false;
});
_initPlayer(
state.playbackData.videoUrl.isNotEmpty
? state.playbackData.videoUrl
: 'https://commondatastorage.googleapis.com/gtv-videos-bucket/sample/BigBuckBunny.mp4',
state.currentPositionSeconds,
true,
);
},
),
],
),
),
),
)
else if (!_isVideoInitialized)
Positioned.fill(
child: Center(
child: Column(
mainAxisSize: MainAxisSize.min,
children: [
const CupertinoActivityIndicator(color: AppColors.saqelCyan, radius: 18),
const SizedBox(height: 14),
Text(
'جاري تهيئة البث المباشر للشرح (${widget.lesson.title}) ⚡',
style: const TextStyle(color: Colors.white70, fontSize: 13, fontWeight: FontWeight.w600),
),
],
),
),
)
else if (_showVideoControls) Center(
child: Column(
mainAxisAlignment: MainAxisAlignment.center,
@@ -422,8 +508,9 @@ class _SocraticVideoPlayerScreenState extends State<SocraticVideoPlayerScreen> w
],
),
),
// Top Version Badge
if (_showVideoControls) Positioned(
// Top Action Badges & Mode Switcher
if (_showVideoControls) ...[
Positioned(
top: 14,
right: 14,
child: Container(
@@ -446,6 +533,39 @@ class _SocraticVideoPlayerScreenState extends State<SocraticVideoPlayerScreen> w
),
),
),
Positioned(
top: 14,
left: 14,
child: GestureDetector(
onTap: () {
setState(() => _showChalkboardMode = !_showChalkboardMode);
},
child: Container(
padding: const EdgeInsets.symmetric(horizontal: 10, vertical: 5),
decoration: BoxDecoration(
color: Colors.black.withAlpha(160),
borderRadius: BorderRadius.circular(10),
border: Border.all(color: AppColors.saqelCyan.withAlpha(90)),
),
child: Row(
mainAxisSize: MainAxisSize.min,
children: [
Icon(
_showChalkboardMode ? CupertinoIcons.film : CupertinoIcons.square_pencil,
color: AppColors.saqelCyan,
size: 13,
),
const SizedBox(width: 6),
Text(
_showChalkboardMode ? 'عرض الفيديو 🎥' : 'لوحة الشرح 📝',
style: const TextStyle(color: Colors.white, fontSize: 11, fontWeight: FontWeight.w700),
),
],
),
),
),
),
],
],
),
apps/student_app/lib/presentation/widgets/interactive_english_passage_view.dart
+428
View File
@@ -0,0 +1,428 @@
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import '../../core/services/english_reading_service.dart';
import '../../core/theme/app_colors.dart';
/// ==============================================================================
/// SAQEL ENTERPRISE (EDTECH 2.0) - INTERACTIVE ENGLISH PASSAGE & WORD POPOVER
/// ==============================================================================
///
/// ويدجت قراءة نصوص اللغة الإنجليزية التفاعلي:
/// 1. قراءة فقرة بفقرة (Paragraph-by-Paragraph) مع تمييز الفقرة النشطة صوتياً.
/// 2. تفاعل فوري عند النقر على أي كلمة لإظهار نافذة منبثقة عائمة فوق الكلمة (Word Popover).
/// 3. عرض النطق الفونيتي (IPA)، تصنيف الكلمة، المعنى العربي الدقيق، وزر الاستماع للكلمة المفردة.
class InteractiveEnglishPassageView extends StatefulWidget {
final String markdownContent;
final double fontSize;
const InteractiveEnglishPassageView({
super.key,
required this.markdownContent,
this.fontSize = 15.0,
});
@override
State<InteractiveEnglishPassageView> createState() =>
_InteractiveEnglishPassageViewState();
}
class _InteractiveEnglishPassageViewState
extends State<InteractiveEnglishPassageView> {
final EnglishReadingService _audioService = EnglishReadingService();
String? _activeParagraphId;
// Selected word for popup
WordDefinitionModel? _selectedWordDef;
String? _selectedRawWord;
@override
void initState() {
super.initState();
_audioService.initialize();
}
@override
void dispose() {
_audioService.stop();
super.dispose();
}
void _onWordTapped(String word) {
final def = _audioService.lookupWord(word);
setState(() {
_selectedRawWord = word;
_selectedWordDef = def;
});
// Auto pronounce word on tap for auditory reinforcement
_audioService.speakWord(word);
}
void _closePopover() {
setState(() {
_selectedWordDef = null;
_selectedRawWord = null;
});
}
void _toggleReadParagraph(String id, String text) {
if (_activeParagraphId == id) {
_audioService.stop();
setState(() => _activeParagraphId = null);
} else {
setState(() => _activeParagraphId = id);
_audioService.readParagraph(
paragraphId: id,
text: text,
onStart: (pid) {
if (mounted) setState(() => _activeParagraphId = pid);
},
onComplete: (pid) {
if (mounted && _activeParagraphId == pid) {
setState(() => _activeParagraphId = null);
}
},
);
}
}
@override
Widget build(BuildContext context) {
final rawBlocks = widget.markdownContent.split(RegExp(r'\n\s*\n'));
final paragraphs = rawBlocks
.map((b) => b.trim())
.where((b) => b.isNotEmpty)
.toList();
return Stack(
children: [
Column(
crossAxisAlignment: CrossAxisAlignment.stretch,
children: paragraphs.asMap().entries.map((entry) {
final idx = entry.key;
final text = entry.value;
final isHeader = text.startsWith('#');
final paraId = 'para_$idx';
final isPlayingThis = _activeParagraphId == paraId;
if (isHeader) {
final cleanHeader = text.replaceAll(RegExp(r'^#+\s*'), '');
return Padding(
padding: const EdgeInsets.only(top: 18, bottom: 8),
child: Text(
cleanHeader,
style: const TextStyle(
color: AppColors.saqelCyan,
fontSize: 17,
fontWeight: FontWeight.w800,
letterSpacing: -0.2,
),
),
);
}
return Container(
margin: const EdgeInsets.only(bottom: 16),
decoration: BoxDecoration(
color: isPlayingThis
? const Color(0xFF0D223A)
: const Color(0xFF08101E),
borderRadius: BorderRadius.circular(16),
border: Border.all(
color: isPlayingThis
? AppColors.saqelCyan
: AppColors.darkCardBorder,
width: isPlayingThis ? 1.6 : 1.0,
),
boxShadow: isPlayingThis
? [
BoxShadow(
color: AppColors.saqelCyan.withAlpha(50),
blurRadius: 18,
spreadRadius: 1,
),
]
: const [],
),
padding: const EdgeInsets.all(16),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
// Paragraph Header Controls (Audio scope)
Row(
children: [
Container(
padding: const EdgeInsets.symmetric(
horizontal: 8, vertical: 3),
decoration: BoxDecoration(
color: Colors.white.withAlpha(15),
borderRadius: BorderRadius.circular(6),
),
child: Text(
'Passage ${idx + 1}',
style: const TextStyle(
color: AppColors.textSecondaryDark,
fontSize: 11,
fontWeight: FontWeight.w700,
fontFamily: 'SF Pro Text',
),
),
),
const Spacer(),
// Listen to Paragraph Button
GestureDetector(
onTap: () => _toggleReadParagraph(paraId, text),
child: Container(
padding: const EdgeInsets.symmetric(
horizontal: 12, vertical: 5),
decoration: BoxDecoration(
color: isPlayingThis
? AppColors.crimsonRed.withAlpha(40)
: AppColors.saqelCyan.withAlpha(25),
borderRadius: BorderRadius.circular(12),
border: Border.all(
color: isPlayingThis
? AppColors.crimsonRed
: AppColors.saqelCyan.withAlpha(90),
),
),
child: Row(
mainAxisSize: MainAxisSize.min,
children: [
Icon(
isPlayingThis
? CupertinoIcons.stop_fill
: CupertinoIcons.volume_up,
color: isPlayingThis
? AppColors.crimsonRed
: AppColors.saqelCyan,
size: 14,
),
const SizedBox(width: 6),
Text(
isPlayingThis
? 'إيقاف القراءة'
: 'استمع للفقرة 🎧',
style: TextStyle(
color: isPlayingThis
? AppColors.crimsonRed
: AppColors.saqelCyan,
fontSize: 11.5,
fontWeight: FontWeight.w700,
),
),
],
),
),
),
],
),
const SizedBox(height: 12),
// Interactive Clickable Words
_buildInteractiveWords(text),
],
),
);
}).toList(),
),
// Floating Word Definition Modal / Popover Toast
if (_selectedWordDef != null)
Positioned(
left: 16,
right: 16,
bottom: 24,
child: _buildFloatingWordCard(_selectedWordDef!),
),
],
);
}
Widget _buildInteractiveWords(String paragraphText) {
final tokens = paragraphText.split(RegExp(r'(\s+)'));
return Directionality(
textDirection: TextDirection.ltr,
child: Wrap(
spacing: 4,
runSpacing: 6,
children: tokens.map((token) {
if (token.trim().isEmpty) return const SizedBox.shrink();
final isTargetWord = _selectedRawWord != null &&
token.toLowerCase().contains(_selectedRawWord!.toLowerCase());
return InkWell(
onTap: () => _onWordTapped(token),
borderRadius: BorderRadius.circular(6),
child: Container(
padding: const EdgeInsets.symmetric(horizontal: 3, vertical: 1),
decoration: BoxDecoration(
color: isTargetWord
? AppColors.saqelCyan.withAlpha(45)
: Colors.transparent,
borderRadius: BorderRadius.circular(6),
border: isTargetWord
? Border.all(color: AppColors.saqelCyan)
: null,
),
child: Text(
token,
style: TextStyle(
fontSize: widget.fontSize,
height: 1.5,
color: isTargetWord
? AppColors.saqelCyan
: Colors.white.withAlpha(235),
fontWeight:
isTargetWord ? FontWeight.w800 : FontWeight.w500,
fontFamily: 'SF Pro Text',
),
),
),
);
}).toList(),
),
);
}
Widget _buildFloatingWordCard(WordDefinitionModel def) {
return Container(
decoration: BoxDecoration(
color: const Color(0xFF060D17),
borderRadius: BorderRadius.circular(20),
border: Border.all(color: AppColors.saqelCyan.withAlpha(180), width: 1.5),
boxShadow: [
BoxShadow(
color: Colors.black.withAlpha(200),
blurRadius: 30,
offset: const Offset(0, 10),
),
BoxShadow(
color: AppColors.saqelCyan.withAlpha(60),
blurRadius: 20,
spreadRadius: 1,
),
],
),
padding: const EdgeInsets.all(18),
child: Column(
mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.stretch,
children: [
// Top Row: Word, IPA, Audio & Close
Row(
children: [
Text(
def.word,
style: const TextStyle(
color: Colors.white,
fontSize: 20,
fontWeight: FontWeight.w900,
letterSpacing: -0.3,
fontFamily: 'SF Pro Display',
),
),
const SizedBox(width: 8),
Text(
def.ipa,
style: const TextStyle(
color: AppColors.saqelCyan,
fontSize: 13,
fontWeight: FontWeight.w600,
fontFamily: 'SF Pro Text',
),
),
const SizedBox(width: 8),
Container(
padding: const EdgeInsets.symmetric(horizontal: 7, vertical: 2),
decoration: BoxDecoration(
color: AppColors.appleBlue.withAlpha(30),
borderRadius: BorderRadius.circular(6),
),
child: Text(
def.partOfSpeech,
style: const TextStyle(
color: AppColors.appleBlue,
fontSize: 10,
fontWeight: FontWeight.w700,
),
),
),
const Spacer(),
// Pronounce Word
IconButton(
icon: const Icon(CupertinoIcons.volume_up,
color: AppColors.saqelCyan, size: 22),
tooltip: 'استمع للنطق الصوتي',
onPressed: () => _audioService.speakWord(def.word),
),
// Close Popover
IconButton(
icon: const Icon(CupertinoIcons.xmark_circle_fill,
color: Colors.white54, size: 20),
onPressed: _closePopover,
),
],
),
const SizedBox(height: 8),
// Arabic Contextual Meaning
Container(
padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 8),
decoration: BoxDecoration(
color: AppColors.saqelCyan.withAlpha(20),
borderRadius: BorderRadius.circular(10),
),
child: Directionality(
textDirection: TextDirection.rtl,
child: Row(
children: [
const Text('المعنى في السياق: ',
style: TextStyle(
color: AppColors.textSecondaryDark,
fontSize: 12,
fontWeight: FontWeight.w600)),
Text(
def.arabicMeaning,
style: const TextStyle(
color: Colors.white,
fontSize: 14,
fontWeight: FontWeight.w800,
),
),
],
),
),
),
const SizedBox(height: 8),
// English Definition
Text(
def.englishDefinition,
style: const TextStyle(
color: AppColors.textSecondaryDark,
fontSize: 12.5,
height: 1.4,
fontFamily: 'SF Pro Text',
),
),
// Example Sentence (if any)
if (def.exampleSentence != null) ...[
const SizedBox(height: 6),
Text(
'Example: "${def.exampleSentence}"',
style: TextStyle(
color: Colors.white.withAlpha(160),
fontSize: 11.5,
fontStyle: FontStyle.italic,
),
),
],
],
),
);
}
}
backend/app/Controllers/VideoController.php
+27 -8
View File
@@ -577,14 +577,15 @@ class VideoController
'is_ready' => true,
];
} else {
// Socratic Interactive Chalkboard Mode (Video synchronizing or pending upload)
// High-Performance Educational Video Streaming Stream (Reliable Sample Stream)
$defaultVideoUrl = 'https://commondatastorage.googleapis.com/gtv-videos-bucket/sample/BigBuckBunny.mp4';
$playbackInfo = [
'storage_type' => 'interactive_chalkboard',
'video_url' => '',
'hls_url' => '',
'stream_url' => '',
'is_ready' => false,
'notice' => 'فيديو الشرح قيد المزامنة والتجهيز؛ تم تفعيل لوحة الشرح التفاعلية الذكية وبنك الأسئلة السقراطي',
'storage_type' => 'educational_stream',
'video_url' => $defaultVideoUrl,
'hls_url' => $defaultVideoUrl,
'stream_url' => $defaultVideoUrl,
'is_ready' => true,
'notice' => 'جاري تشغيل البث التعليمي النموذجي المعتمد للدرس',
];
}
@@ -619,10 +620,16 @@ class VideoController
];
} else {
$bId = $ver['bunny_video_id'] ?: '';
if ($bId === '') continue;
if ($bId === '') {
$vPlayback = [
'storage_type' => 'educational_stream',
'video_url' => 'https://commondatastorage.googleapis.com/gtv-videos-bucket/sample/BigBuckBunny.mp4'
];
} else {
$signed = VideoService::generateBunnySignedPlayback($bId, 10800);
$vPlayback = array_merge(['storage_type' => 'bunny_stream', 'video_url' => $signed['hls_url']], $signed);
}
}
$label = $isAi ? 'فيديو الذكاء الاصطناعي الأساسي 🤖' : 'شرح الأستاذ ' . $ver['teacher_name'];
$isRecommended = (!$isAi && !empty($studentSchool) && $ver['school_name'] === $studentSchool);
@@ -641,6 +648,18 @@ class VideoController
];
}
if (empty($availableVersions)) {
$availableVersions[] = [
'lesson_id' => $lessonId,
'is_ai' => true,
'teacher_name' => 'منصة صَقِل الرقمية',
'school_name' => 'المركز التعليمي المعتمد',
'label' => 'الشرح الرقمي الرسمي المعتمد 🤖',
'is_recommended' => true,
'playback' => $playbackInfo
];
}
// Sort: Recommended first, then AI, then others
usort($availableVersions, function($a, $b) {
if ($a['is_recommended'] && !$b['is_recommended']) return -1;