Skip to content

N
ntManhBut
Commit bfc70b22 authored by NguyenTienManh's avatar NguyenTienManh
Browse files
Options

update 14-2

parent 1ddc347c
Hide whitespace changes
Inline Side-by-side
Showing with 90 additions and 42 deletions
lib/app/module/course/widgets/course_widget.dart
View file @ bfc70b22
...@@ -4,6 +4,7 @@ import 'package:flutter_bloc/flutter_bloc.dart'; ...@@ -4,6 +4,7 @@ import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flutter_swiper_view/flutter_swiper_view.dart'; import 'package:flutter_swiper_view/flutter_swiper_view.dart';
import 'package:ongbut_ntmanh/app/module/course/model/list_data.dart'; import 'package:ongbut_ntmanh/app/module/course/model/list_data.dart';
import 'package:ongbut_ntmanh/const/colors.dart'; import 'package:ongbut_ntmanh/const/colors.dart';
import '../../../ui/search_page.dart'; import '../../../ui/search_page.dart';
import '../../coursedetail/widgets/course_detail.dart'; import '../../coursedetail/widgets/course_detail.dart';
import '../bloc/course_bloc.dart'; import '../bloc/course_bloc.dart';
......
lib/app/module/coursedetail/widgets/course_detail.dart
View file @ bfc70b22
...@@ -5,9 +5,10 @@ import 'package:ongbut_ntmanh/app/module/coursedetail/model/chapters.dart'; ...@@ -5,9 +5,10 @@ import 'package:ongbut_ntmanh/app/module/coursedetail/model/chapters.dart';
import 'package:ongbut_ntmanh/app/module/coursedetail/model/course_detail_model.dart'; import 'package:ongbut_ntmanh/app/module/coursedetail/model/course_detail_model.dart';
import 'package:ongbut_ntmanh/app/module/lession/widgets/lession_widget.dart'; import 'package:ongbut_ntmanh/app/module/lession/widgets/lession_widget.dart';
import 'package:ongbut_ntmanh/const/colors.dart'; import 'package:ongbut_ntmanh/const/colors.dart';
import 'package:ongbut_ntmanh/widgets/widgets_util.dart';
import '../bloc/course_detail_bloc.dart'; import '../bloc/course_detail_bloc.dart';
// dang loi
class CourseDetailWidget extends StatelessWidget { class CourseDetailWidget extends StatelessWidget {
String courseId; String courseId;
String image; String image;
...@@ -26,12 +27,13 @@ class CourseDetailWidget extends StatelessWidget { ...@@ -26,12 +27,13 @@ class CourseDetailWidget extends StatelessWidget {
appBar: AppBar(title: const Text('Chi Tiet Khoa Hoc'),), appBar: AppBar(title: const Text('Chi Tiet Khoa Hoc'),),
body: body:
Column(children: [ Column(children: [
Image.network(image!=null?image:'https://oss.myitsol.com/imes-public/2022/12/11/neymar_145527553.PNG', Image.network(image, fit: BoxFit.fill,height: checkLandscape(context)?getHeight(context)*0.5:getHeight(context)*0.3,width: double.maxFinite,),
fit: BoxFit.fill,height: 200,width: double.maxFinite,),
Row( Row(
children: [ children: [
Text('ID Course = ',style: TextStyle(fontSize: 15,color: AppColors.red_light)), Text('ID Course = ',style: TextStyle(fontSize: 15,color: AppColors.red_light)),
Text(courseId), Text(courseId),
], ],
), ),
BlocConsumer<CourseDetailBloc, CourseDetailState>( BlocConsumer<CourseDetailBloc, CourseDetailState>(
...@@ -50,20 +52,41 @@ class CourseDetailWidget extends StatelessWidget { ...@@ -50,20 +52,41 @@ class CourseDetailWidget extends StatelessWidget {
return const CircularProgressIndicator(); return const CircularProgressIndicator();
} }
if(state is CourseDetailSuccess){ if(state is CourseDetailSuccess){
// Image.network('https://oss.myitsol.com/imes-public/2022/12/11/neymar_145527553.PNG',
// fit: BoxFit.fill,height: 200,width: double.maxFinite,);
chapters = state.courseDetailModel.data!.chapters!; chapters = state.courseDetailModel.data!.chapters!;
if(chapters.isEmpty == true){ if(chapters.isEmpty){
return const Text('Chua Co Noi Dung Khoa Hoc',style: TextStyle(fontSize: 15,color: AppColors.red_light),); return const Text('Chua Co Noi Dung Khoa Hoc',style: TextStyle(fontSize: 15,color: AppColors.red_light),);
} }
if(chapters.isEmpty == false){ if(chapters.isNotEmpty){
return return
Column(children: [ SingleChildScrollView(
// Image.network(image!=null?image:'https://oss.myitsol.com/imes-public/2022/12/11/neymar_145527553.PNG', child: Column(
// fit: BoxFit.fill,height: 200,width: double.maxFinite,), mainAxisSize: MainAxisSize.max,
LessionWidget( chapters[0].listLesson![0].lessonId!=null?chapters[0].listLesson![0].lessonId!:'fb228efa-7b32-419e-98b4-a6d5135f4361' ), mainAxisAlignment: MainAxisAlignment.center,
],); crossAxisAlignment: CrossAxisAlignment.center,
children: [
Padding(
padding: const EdgeInsets.fromLTRB(10, 10, 0, 0),
child: Row(
children: [
const Text('Thong Tin chi tiet',style: TextStyle(fontWeight: FontWeight.bold,fontSize: 15),),
const SizedBox(width: 100),
TextButton(
child: Text('Nhan xet ve khoa hoc'),
onPressed: () {
print('Pressed');
}
)
],
),
),
Text(chapters[0].name!),
Text(chapters[0].listLesson![0].name!),
Text(chapters[0].listLesson![0].createUser!),
Text(chapters[0].listLesson![0].listPart![0].partType!),
LessionWidget( chapters[0].listLesson![0].lessonId!=null?chapters[0].listLesson![0].lessonId!:'fb228efa-7b32-419e-98b4-a6d5135f4361' ),
],),
);
} }
} }
return const Text('Default CourseDetail!!!!!'); return const Text('Default CourseDetail!!!!!');
......
lib/app/module/lession/widgets/lession_widget.dart
View file @ bfc70b22
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:flutter_bloc/flutter_bloc.dart';
import '../../../../const/colors.dart';
import '../../playvideo/page/play_video.dart'; import '../../playvideo/page/play_video.dart';
import '../bloc/lesson_bloc.dart'; import '../bloc/lesson_bloc.dart';
import '../model/lesson_model.dart'; import '../model/lesson_model.dart';
...@@ -30,22 +31,28 @@ class _LessionWidgetState extends State<LessionWidget> { ...@@ -30,22 +31,28 @@ class _LessionWidgetState extends State<LessionWidget> {
mainAxisAlignment: MainAxisAlignment.center, mainAxisAlignment: MainAxisAlignment.center,
crossAxisAlignment: CrossAxisAlignment.center, crossAxisAlignment: CrossAxisAlignment.center,
children: [ children: [
Text(widget.lessonID), Row(
Padding( children: [
padding: const EdgeInsets.fromLTRB(10, 10, 0, 0), Text('ID Lesson = ',style: TextStyle(fontSize: 15,color: AppColors.red_light)),
child: Row( Text(widget.lessonID),
children: [ ],
const Text('Thong Tin chi tiet',style: TextStyle(fontWeight: FontWeight.bold,fontSize: 15),),
const SizedBox(width: 100),
TextButton(
child: Text('Nhan xet ve khoa hoc'),
onPressed: () {
print('Pressed');
}
)
],
),
), ),
// Padding(
// padding: const EdgeInsets.fromLTRB(10, 10, 0, 0),
// child: Row(
// children: [
// const Text('Thong Tin chi tiet',style: TextStyle(fontWeight: FontWeight.bold,fontSize: 15),),
// const SizedBox(width: 100),
// TextButton(
// child: Text('Nhan xet ve khoa hoc'),
// onPressed: () {
// print('Pressed');
// }
// )
// ],
// ),
// ),
BlocConsumer<LessonBloc, LessonState>( BlocConsumer<LessonBloc, LessonState>(
listener: (context, state) async {}, listener: (context, state) async {},
builder: (context, state) { builder: (context, state) {
...@@ -64,15 +71,30 @@ class _LessionWidgetState extends State<LessionWidget> { ...@@ -64,15 +71,30 @@ class _LessionWidgetState extends State<LessionWidget> {
} }
if(state is LessonSuccess){ if(state is LessonSuccess){
return return
// const Text('LessonSuccess'); // Column(children: [
// Text(state.lessonModel.data![2].title!=null?state.lessonModel.data![2].title!:'khong co Video'),
// //Text(state.lessonModel.data![index].playlist![0]!=null?state.lessonModel.data![index].playlist![0].link!:'....'),
// TextButton(
// onPressed: (){
// Navigator.push(
// context,
// MaterialPageRoute(builder: (context) => PlayVideoPage(link: state.lessonModel.data![2].playlist![0].link!)),
// );
// },
// child:
// Text(state.lessonModel.data![2].title == pl ?state.lessonModel.data![2].playlist![0].link!:'...'),
// // Text(state.lessonModel.data![index].playlist![0]!=null?state.lessonModel.data![index].playlist![0].link!:'....'),
// ),
// ],);
ListView.builder( ListView.builder(
shrinkWrap: true, shrinkWrap: true,
itemCount: state.lessonModel.data!.length, itemCount: state.lessonModel.data!.length,
itemBuilder: (context, index){ itemBuilder: (context, index){
return return
Column(children: [ Column(children: [
Text(state.lessonModel.data![index].title!=null?state.lessonModel.data![index].title!:'khong co du lieu'), // Text(state.lessonModel.data![index].title!=null?state.lessonModel.data![index].title!:'khong co du lieu'),
//Text(state.lessonModel.data![index].playlist![0]!=null?state.lessonModel.data![index].playlist![0].link!:'....'), //Text(state.lessonModel.data![index].playlist![0]!=null?state.lessonModel.data![index].playlist![0].link!:'....'),
TextButton( TextButton(
onPressed: (){ onPressed: (){
Navigator.push( Navigator.push(
...@@ -100,12 +122,12 @@ class _LessionWidgetState extends State<LessionWidget> { ...@@ -100,12 +122,12 @@ class _LessionWidgetState extends State<LessionWidget> {
} }
onPressHander() { // onPressHander() {
setState(() { // setState(() {
Container( // Container(
height: 200, // height: 200,
width: 200, // width: 200,
child: const Text('111111',style: TextStyle(fontWeight: FontWeight.bold,fontSize: 30),)); // child: const Text('111111',style: TextStyle(fontWeight: FontWeight.bold,fontSize: 30),));
}); // });
} // }
} }
lib/app/module/school/widgets/school_widget.dart
View file @ bfc70b22
...@@ -5,6 +5,7 @@ import 'package:flutter_swiper_view/flutter_swiper_view.dart'; ...@@ -5,6 +5,7 @@ import 'package:flutter_swiper_view/flutter_swiper_view.dart';
import 'package:ongbut_ntmanh/app/module/coursedetail/model/course_detail_model.dart'; import 'package:ongbut_ntmanh/app/module/coursedetail/model/course_detail_model.dart';
import 'package:ongbut_ntmanh/app/module/school/model/list_data.dart'; import 'package:ongbut_ntmanh/app/module/school/model/list_data.dart';
import 'package:ongbut_ntmanh/const/colors.dart'; import 'package:ongbut_ntmanh/const/colors.dart';
import '../../../ui/search_page.dart'; import '../../../ui/search_page.dart';
import '../../coursedetail/widgets/course_detail.dart'; import '../../coursedetail/widgets/course_detail.dart';
import '../bloc/school_bloc.dart'; import '../bloc/school_bloc.dart';
......
lib/app/ui/navigationbottom/home_page.dart
View file @ bfc70b22
...@@ -27,7 +27,6 @@ import '../search_page.dart'; ...@@ -27,7 +27,6 @@ import '../search_page.dart';
class HomePage extends StatefulWidget { class HomePage extends StatefulWidget {
HomePage({Key? key}) : super(key: key); HomePage({Key? key}) : super(key: key);
CommentModel? commentModel; CommentModel? commentModel;
@override @override
State<HomePage> createState() => _HomePageState(); State<HomePage> createState() => _HomePageState();
......
lib/app/ui/search_page.dart
View file @ bfc70b22
...@@ -78,9 +78,11 @@ Widget _courseList( listData, BuildContext context) { ...@@ -78,9 +78,11 @@ Widget _courseList( listData, BuildContext context) {
context, context,
MaterialPageRoute( MaterialPageRoute(
builder: (_) => CourseDetailWidget(listData.courseId!,listData.image!=null?listData.image!:'https://oss.myitsol.com/imes-public/2022/12/11/neymar_145527553.PNG'), builder: (_) => CourseDetailWidget(listData.courseId!,listData.image!=null?listData.image!:'https://oss.myitsol.com/imes-public/2022/12/11/neymar_145527553.PNG'),
)).then((value) { )
if (value != null && value is bool && value) {} );
}); // .then((value) {
// if (value != null && value is bool && value) {}
// });
}, },
child: Padding( child: Padding(
padding: const EdgeInsets.fromLTRB(15, 10, 15, 10), padding: const EdgeInsets.fromLTRB(15, 10, 15, 10),
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment