Skip to content

B
book-app
提交 bce01c8c authored 作者: yueweilu's avatar yueweilu
浏览文件
操作

UI根据设计调整

上级 1550099f
隐藏空白字符变更
内嵌 并排
正在显示 包含 94 行增加 和 185 行删除
lib/pages/user_discuss/view.dart
浏览文件 @ bce01c8c
...@@ -17,30 +17,19 @@ class _UserDiscussPageState extends State<UserDiscussPage> { ...@@ -17,30 +17,19 @@ class _UserDiscussPageState extends State<UserDiscussPage> {
centerTitle: true, centerTitle: true,
title: const Text('讨论'), title: const Text('讨论'),
), ),
body: Container( body: Column(
color: Colors.transparent, crossAxisAlignment: CrossAxisAlignment.start,
child: CustomPullScrollView( children: [
controller: controller.refreshController, Container(
// onRefresh: controller.onRefresh, margin: EdgeInsets.only(left: 22.5.w,top: 16.w),
onLoading: controller.onLoading, child: Text('共${controller.discuss.length}本书',style: TextStyle(fontSize: 13.w,height: 1.5,color: Colours.c6,fontWeight: Fonts.medium),)
child:SingleChildScrollView( ),
child: Container( Expanded(
margin: EdgeInsets.all(10.w), child: CustomPullScrollView(
decoration: BoxDecoration( controller: controller.refreshController,
borderRadius: BorderRadius.circular(8.w), onRefresh: controller.onRefresh,
color: Colors.white, onLoading: controller.onLoading,
boxShadow: [ child:ListView.builder(
BoxShadow(
color: const Color(0xFFC7C7C7).withOpacity(0.5),
offset: Offset(3.w, 0),
blurRadius: 10.w,
spreadRadius: 0.w,
),
],
),
child: ListView.builder(
physics: const NeverScrollableScrollPhysics(),
shrinkWrap: true,
itemBuilder: (BuildContext context, int index){ itemBuilder: (BuildContext context, int index){
return GestureDetector( return GestureDetector(
onTap: (){ onTap: (){
...@@ -50,10 +39,10 @@ class _UserDiscussPageState extends State<UserDiscussPage> { ...@@ -50,10 +39,10 @@ class _UserDiscussPageState extends State<UserDiscussPage> {
); );
}, },
itemCount: controller.discuss.length, itemCount: controller.discuss.length,
), )
), ),
) ),
), ],
), ),
), ),
); );
......
lib/pages/user_discuss/widgets/item.dart
浏览文件 @ bce01c8c
...@@ -14,43 +14,23 @@ class BuildItem extends StatelessWidget { ...@@ -14,43 +14,23 @@ class BuildItem extends StatelessWidget {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Container( return Container(
color: Colors.transparent,
// margin: const EdgeInsets.symmetric(horizontal: 10), // margin: const EdgeInsets.symmetric(horizontal: 10),
padding: EdgeInsets.symmetric(horizontal: 10.w), padding: EdgeInsets.symmetric(horizontal: 10.w),
// color: Colors.red, margin: const EdgeInsets.all(10),
// margin: const EdgeInsets.all(10), decoration: BoxDecoration(
// decoration: BoxDecoration( borderRadius: BorderRadius.circular(8),
// borderRadius: BorderRadius.circular(8), color: Colors.white,
// color: Colors.white, boxShadow: [
// boxShadow: [ BoxShadow(
// BoxShadow( color: const Color(0xFFC7C7C7).withOpacity(0.5),
// color: const Color(0xFFC7C7C7).withOpacity(0.5), offset: Offset(3.w, 0),
// offset: const Offset(3, 0), blurRadius: 10.w,
// blurRadius: 10.w, spreadRadius: 0.w,
// spreadRadius: 0.w, ),
// ), ],
// ], ),
// ),
child: Column( child: Column(
children: [ children: [
index == 0 ? Container(
// padding: const EdgeInsets.only(left: 10),
height: 32.w,
width: double.infinity,
decoration: BoxDecoration(
borderRadius: BorderRadius.only(
topLeft: Radius.circular(8.w),
topRight: Radius.circular(8.w),
),
color: Colors.white,
),
alignment: Alignment.centerLeft,
child: Text('共$num本书',style: TextStyle(fontSize: 13.w,height: 1.5,color: Colours.c6),),
):const SizedBox(),
Container(
height: 0.5.w,
color: Colours.cF0,
),
Container( Container(
padding: EdgeInsets.only(top: 12.w,bottom: 15.w), padding: EdgeInsets.only(top: 12.w,bottom: 15.w),
// color: Colors.red, // color: Colors.red,
......
lib/pages/user_notes/view.dart
浏览文件 @ bce01c8c
...@@ -17,43 +17,34 @@ class _UserNotePageState extends State<UserNotePage> { ...@@ -17,43 +17,34 @@ class _UserNotePageState extends State<UserNotePage> {
centerTitle: true, centerTitle: true,
title: const Text('笔记'), title: const Text('笔记'),
), ),
body: CustomPullScrollView( body: Column(
controller: controller.refreshController, crossAxisAlignment: CrossAxisAlignment.start,
// onRefresh: controller.onRefresh, children: [
onLoading: controller.onLoading, Container(
child:SingleChildScrollView( margin: EdgeInsets.only(left: 22.5.w,top: 16.w),
child: Container( child: Text('共${controller.notes.length}本书',style: TextStyle(fontSize: 13.w,height: 1.5,color: Colours.c6,fontWeight: Fonts.medium),)
margin: EdgeInsets.all(10.w), ),
decoration: BoxDecoration( Expanded(
borderRadius: BorderRadius.circular(8.w), child: CustomPullScrollView(
color: Colors.white, controller: controller.refreshController,
boxShadow: [ onRefresh: controller.onRefresh,
BoxShadow( onLoading: controller.onLoading,
color: const Color(0xFFC7C7C7).withOpacity(0.5), child:ListView.builder(
offset: Offset(3.w, 0), // physics: const NeverScrollableScrollPhysics(),
blurRadius: 10.w, // shrinkWrap: true,
spreadRadius: 0.w,
),
],
),
child: ClipRRect(
borderRadius: BorderRadius.circular(8.w),
child: ListView.builder(
physics: const NeverScrollableScrollPhysics(),
shrinkWrap: true,
itemBuilder: (BuildContext context, int index){ itemBuilder: (BuildContext context, int index){
return GestureDetector( return GestureDetector(
onTap: (){ onTap: (){
context.pushNamed(Routes.noteDes,extra: controller.notes[index]); context.pushNamed(Routes.noteDes,extra: controller.notes[index]);
}, },
child: BuildItem(model: controller.notes[index],index: index,num: controller.notes.length,) child: BuildItem(model: controller.notes[index],)
); );
}, },
itemCount: controller.notes.length, itemCount: controller.notes.length,
), )
),
), ),
) ),
],
), ),
), ),
); );
......
lib/pages/user_notes/widgets/item.dart
浏览文件 @ bce01c8c
...@@ -2,54 +2,30 @@ part of user_notes; ...@@ -2,54 +2,30 @@ part of user_notes;
class BuildItem extends StatelessWidget { class BuildItem extends StatelessWidget {
final CourseModel model; final CourseModel model;
final int index;
final int num;
const BuildItem({ const BuildItem({
Key? key, Key? key,
required this.model, required this.model,
required this.index,
required this.num
}) : super(key: key); }) : super(key: key);
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Container( return Container(
color: Colors.white,
// margin: const EdgeInsets.symmetric(horizontal: 10),
padding: EdgeInsets.symmetric(horizontal: 10.w), padding: EdgeInsets.symmetric(horizontal: 10.w),
// margin: const EdgeInsets.all(10), margin: const EdgeInsets.all(10),
// decoration: BoxDecoration( decoration: BoxDecoration(
// borderRadius: BorderRadius.circular(8), borderRadius: BorderRadius.circular(8),
// color: Colors.white, color: Colors.white,
// boxShadow: [ boxShadow: [
// BoxShadow( BoxShadow(
// color: const Color(0xFFC7C7C7).withOpacity(0.5), color: const Color(0xFFC7C7C7).withOpacity(0.5),
// offset: const Offset(3, 0), offset: Offset(3.w, 0),
// blurRadius: 10.w, blurRadius: 10.w,
// spreadRadius: 0.w, spreadRadius: 0.w,
// ), ),
// ], ],
// ), ),
child: Column( child: Column(
children: [ children: [
index == 0 ? Container(
// padding: const EdgeInsets.only(left: 10),
height: 32.w,
width: double.infinity,
decoration: BoxDecoration(
borderRadius: BorderRadius.only(
topLeft: Radius.circular(8.w),
topRight: Radius.circular(8.w),
),
color: Colors.white,
),
alignment: Alignment.centerLeft,
child: Text('共$num本书',style: TextStyle(fontSize: 13.w,height: 1.5,color: Colours.c6),),
):const SizedBox(),
Container(
height: 0.5,
color: Colours.cF0,
),
Container( Container(
padding: EdgeInsets.only(top: 12.w,bottom: 15.w), padding: EdgeInsets.only(top: 12.w,bottom: 15.w),
// color: Colors.red, // color: Colors.red,
......
lib/pages/user_wrong/view.dart
浏览文件 @ bce01c8c
...@@ -17,35 +17,27 @@ class _UserWrongPageState extends State<UserWrongPage> { ...@@ -17,35 +17,27 @@ class _UserWrongPageState extends State<UserWrongPage> {
centerTitle: true, centerTitle: true,
title: const Text('错题'), title: const Text('错题'),
), ),
body: CustomPullScrollView( body: Column(
controller: controller.refreshController, crossAxisAlignment: CrossAxisAlignment.start,
// onRefresh: controller.onRefresh, children: [
onLoading: controller.onLoading, Container(
child:SingleChildScrollView( margin: EdgeInsets.only(left: 22.5.w,top: 16.w),
child: Container( child: Text('共${controller.wrongs.length}本书',style: TextStyle(fontSize: 13.w,height: 1.5,color: Colours.c6,fontWeight: Fonts.medium),)
margin: EdgeInsets.all(10.w), ),
decoration: BoxDecoration( Expanded(
borderRadius: BorderRadius.circular(8.w), child: CustomPullScrollView(
color: Colors.white, controller: controller.refreshController,
boxShadow: [ onRefresh: controller.onRefresh,
BoxShadow( onLoading: controller.onLoading,
color: const Color(0xFFC7C7C7).withOpacity(0.5), child:ListView.builder(
offset: Offset(3.w, 0), itemBuilder: (BuildContext context, int index){
blurRadius: 10.w, return BuildItem(model: controller.wrongs[index],index: index,num: controller.wrongs.length,);
spreadRadius: 0.w, },
), itemCount: controller.wrongs.length,
], )
),
child: ListView.builder(
physics: const NeverScrollableScrollPhysics(),
shrinkWrap: true,
itemBuilder: (BuildContext context, int index){
return BuildItem(model: controller.wrongs[index],index: index,num: controller.wrongs.length,);
},
itemCount: controller.wrongs.length,
),
), ),
) ),
],
), ),
), ),
); );
......
lib/pages/user_wrong/widgets/item.dart
浏览文件 @ bce01c8c
...@@ -14,41 +14,22 @@ class BuildItem extends StatelessWidget { ...@@ -14,41 +14,22 @@ class BuildItem extends StatelessWidget {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Container( return Container(
// margin: const EdgeInsets.symmetric(horizontal: 10),
padding: EdgeInsets.symmetric(horizontal: 10.w), padding: EdgeInsets.symmetric(horizontal: 10.w),
// margin: const EdgeInsets.all(10), margin: const EdgeInsets.all(10),
// decoration: BoxDecoration( decoration: BoxDecoration(
// borderRadius: BorderRadius.circular(8), borderRadius: BorderRadius.circular(8),
// color: Colors.white, color: Colors.white,
// boxShadow: [ boxShadow: [
// BoxShadow( BoxShadow(
// color: const Color(0xFFC7C7C7).withOpacity(0.5), color: const Color(0xFFC7C7C7).withOpacity(0.5),
// offset: const Offset(3, 0), offset: const Offset(3, 0),
// blurRadius: 10.w, blurRadius: 10.w,
// spreadRadius: 0.w, spreadRadius: 0.w,
// ), ),
// ], ],
// ), ),
child: Column( child: Column(
children: [ children: [
index == 0 ? Container(
// padding: const EdgeInsets.only(left: 10),
height: 32.w,
width: double.infinity,
decoration: const BoxDecoration(
borderRadius: BorderRadius.only(
topLeft: Radius.circular(8),
topRight: Radius.circular(8),
),
color: Colors.white,
),
alignment: Alignment.centerLeft,
child: Text('共$num本书',style: TextStyle(fontSize: 13.w,height: 1.5,color: Colours.c6),),
):const SizedBox(),
Container(
height: 0.5.w,
color: Colours.cF0,
),
Container( Container(
padding: EdgeInsets.only(top: 12.w,bottom: 15.w), padding: EdgeInsets.only(top: 12.w,bottom: 15.w),
// color: Colors.red, // color: Colors.red,
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论