Skip to content

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

update 14-2

parent 1dcc0d8a
Hide whitespace changes
Inline Side-by-side
Showing with 42 additions and 25 deletions
lib/app/module/coursedetail/widgets/course_detail.dart
View file @ 443fb4cb
...@@ -71,10 +71,6 @@ class CourseDetailWidget extends StatelessWidget { ...@@ -71,10 +71,6 @@ class CourseDetailWidget extends StatelessWidget {
padding: const EdgeInsets.fromLTRB(10, 10, 0, 0), padding: const EdgeInsets.fromLTRB(10, 10, 0, 0),
child: Column( child: Column(
children: [ children: [
// Text(chapters[0].name.toString(),style: const TextStyle(fontSize: 15,fontWeight: FontWeight.bold),
// softWrap: false,
// maxLines: 1,
// overflow: TextOverflow.ellipsis),
Row( Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween, mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [ children: [
...@@ -111,16 +107,6 @@ class CourseDetailWidget extends StatelessWidget { ...@@ -111,16 +107,6 @@ class CourseDetailWidget extends StatelessWidget {
), ),
), ),
), ),
// ExpansionTile(
// title: null,
//
// ),
// 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' ),
],); ],);
} }
} }
......
lib/app/module/lession/widgets/lession_widget.dart
View file @ 443fb4cb
...@@ -47,23 +47,50 @@ class _LessionWidgetState extends State<LessionWidget> { ...@@ -47,23 +47,50 @@ class _LessionWidgetState extends State<LessionWidget> {
return return
InkWell( InkWell(
onTap: (){ onTap: (){
PlayVideoPage(link: state.lessonModel.data![index].playlist![0].link!); state.lessonModel.data![index].partType == 'YOUTUBE'?
Navigator.push(
context,
MaterialPageRoute(builder: (context) => PlayVideoPage(link: state.lessonModel.data![index].playlist![0].link!)),
):const Text('---------');
// PlayVideoPage(link: state.lessonModel.data![index].playlist![0].link!):const Text('---');
// nPt8bK2gbaU
// Navigator.push(
// // //context,
// // //MaterialPageRoute(builder: (context) => PlayVideoPage(link: state.lessonModel.data![index].playlist![0].link!)),
// // //);
}, },
child: Row( child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween, mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [ children: [
Padding( Padding(
padding: const EdgeInsets.fromLTRB(20, 3, 0, 3), padding: const EdgeInsets.fromLTRB(30, 3, 0, 3),
child: Image.asset(Images.o,height: 10,width: 10,)), child: Image.asset(Images.o,height: 10,width: 10,)),
Padding( Padding(
padding: const EdgeInsets.fromLTRB(0, 0, 0, 0), padding: const EdgeInsets.fromLTRB(0, 0, 0, 0),
child: Text(state.lessonModel.data![index].title!=null?state.lessonModel.data![index].title!:'Null'),), child:
Text(state.lessonModel.data![index].title!=null?state.lessonModel.data![index].title!:'Null'),
),
Padding( Padding(
padding: const EdgeInsets.fromLTRB(20, 3, 20, 3), padding: const EdgeInsets.fromLTRB(20, 3, 20, 3),
child: Image.asset(Images.see,height: 20,width: 20,), child: state.lessonModel.data![index].partType=='YOUTUBE'?Padding(
padding: const EdgeInsets.fromLTRB(20, 3, 20, 3),
child: Image.asset(Images.see,height: 20,width: 20,),
):Padding(
padding: const EdgeInsets.fromLTRB(20, 3, 20, 3),
child: Image.asset(Images.uneye,height: 20,width: 20,),
),
), ),
],), // Padding(
// padding: const EdgeInsets.fromLTRB(20, 3, 20, 3),
// child: Image.asset(Images.see,height: 20,width: 20,),
// ),
// Padding(
// padding: const EdgeInsets.fromLTRB(20, 3, 20, 3),
// child: Image.asset(Images.uneye,height: 20,width: 20,),
// ),
],),
); );
// Column(children: [ // Column(children: [
// Text(state.lessonModel.data![index].title!), // Text(state.lessonModel.data![index].title!),
......
lib/app/ui/navigationbottom/home_page.dart
View file @ 443fb4cb
...@@ -96,8 +96,12 @@ class _HomePageState extends State<HomePage> { ...@@ -96,8 +96,12 @@ class _HomePageState extends State<HomePage> {
), ),
],), ],),
child: Row(children: [ child: Row(children: [
Image.asset(Images.ongbut_happy,height: 60,width: 60,),
const Text('ngBụt',style: TextStyle(fontWeight: FontWeight.bold,fontSize: 25,color: AppColors.white),), Padding(
padding: const EdgeInsets.fromLTRB(10, 0, 0, 0),
child: Image.asset(Images.logoWhite,height: checkLandscape(context)?getHeight(context)*0.25:getHeight(context)*0.07,width: 90,),
),
InkWell( InkWell(
onTap: (){ onTap: (){
Navigator.push( Navigator.push(
...@@ -123,14 +127,14 @@ class _HomePageState extends State<HomePage> { ...@@ -123,14 +127,14 @@ class _HomePageState extends State<HomePage> {
], ],
), ),
height: 40, height: 40,
width: checkLandscape(context)?getWidth(context)*0.7:getWidth(context)*0.5, width: checkLandscape(context)?getWidth(context)*0.7:getWidth(context)*0.6,
child: const Padding( child: const Padding(
padding: EdgeInsets.fromLTRB(5, 10, 0, 10), padding: EdgeInsets.fromLTRB(5, 10, 0, 10),
child: Text('Tim Kiem',style: TextStyle(fontSize: 15,color: Colors.white),), child: Text('Tim Kiem',style: TextStyle(fontSize: 15,color: Colors.white),),
), ),
), ),
), ),
Image.asset(Images.notify,height: 30,width: 30,), Image.asset(Images.notify,height: 25,width: 25,),
],), ],),
); );
} }
......
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