diff --git a/making_school_asignment_app/assets/images/ic_home_press.png b/making_school_asignment_app/assets/images/ic_home_active.png similarity index 100% rename from making_school_asignment_app/assets/images/ic_home_press.png rename to making_school_asignment_app/assets/images/ic_home_active.png diff --git a/making_school_asignment_app/assets/images/ic_mine_press.png b/making_school_asignment_app/assets/images/ic_mine_active.png similarity index 100% rename from making_school_asignment_app/assets/images/ic_mine_press.png rename to making_school_asignment_app/assets/images/ic_mine_active.png diff --git a/making_school_asignment_app/assets/images/ic_work_press.png b/making_school_asignment_app/assets/images/ic_work_active.png similarity index 100% rename from making_school_asignment_app/assets/images/ic_work_press.png rename to making_school_asignment_app/assets/images/ic_work_active.png diff --git a/making_school_asignment_app/assets/images/login_logo.png b/making_school_asignment_app/assets/images/login_logo_icon.png similarity index 100% rename from making_school_asignment_app/assets/images/login_logo.png rename to making_school_asignment_app/assets/images/login_logo_icon.png diff --git a/making_school_asignment_app/assets/images/out_icon.png b/making_school_asignment_app/assets/images/out_icon.png new file mode 100644 index 0000000..e9d0426 Binary files /dev/null and b/making_school_asignment_app/assets/images/out_icon.png differ diff --git a/making_school_asignment_app/assets/images/personal_bg.png b/making_school_asignment_app/assets/images/personal_bg.png new file mode 100644 index 0000000..167d734 Binary files /dev/null and b/making_school_asignment_app/assets/images/personal_bg.png differ diff --git a/making_school_asignment_app/assets/images/personal_bgi.png b/making_school_asignment_app/assets/images/personal_bgi.png deleted file mode 100644 index efe65ec..0000000 Binary files a/making_school_asignment_app/assets/images/personal_bgi.png and /dev/null differ diff --git a/making_school_asignment_app/lib/page/global_widget/start_page.dart b/making_school_asignment_app/lib/page/global_widget/start_page.dart index ce1952e..a04e750 100644 --- a/making_school_asignment_app/lib/page/global_widget/start_page.dart +++ b/making_school_asignment_app/lib/page/global_widget/start_page.dart @@ -170,17 +170,17 @@ class _StartPageState extends State with RequestToolMixin { BottomNavigationBarItem( label: '作业', icon: getItemIcon('assets/images/ic_home_normal.png'), - activeIcon: getItemIcon('assets/images/ic_home_press.png'), + activeIcon: getItemIcon('assets/images/ic_home_active.png'), ), BottomNavigationBarItem( label: '考试', icon: getItemIcon('assets/images/ic_work_normal.png'), - activeIcon: getItemIcon('assets/images/ic_work_press.png'), + activeIcon: getItemIcon('assets/images/ic_work_active.png'), ), BottomNavigationBarItem( label: '我的', icon: getItemIcon('assets/images/ic_mine_normal.png'), - activeIcon: getItemIcon('assets/images/ic_mine_press.png'), + activeIcon: getItemIcon('assets/images/ic_mine_active.png'), ), ], //设置显示的模式 diff --git a/making_school_asignment_app/lib/page/home_page/children/homework_review/components/bottom_operation_bar.dart b/making_school_asignment_app/lib/page/home_page/children/homework_review/components/bottom_operation_bar.dart index ae55890..0c60ca7 100644 --- a/making_school_asignment_app/lib/page/home_page/children/homework_review/components/bottom_operation_bar.dart +++ b/making_school_asignment_app/lib/page/home_page/children/homework_review/components/bottom_operation_bar.dart @@ -89,7 +89,7 @@ class _BottomAnnotationSwitchJobState extends State with return Icon( const IconData(0xe635, fontFamily: "AlibabaIcon"), size: iconSize, - color: _logicControl.pen.value ? actionColor : defaultColor, + color: _logicControl.pen.value ? Theme.of(context).primaryColor : defaultColor, ); }), onPressed: () => easyThrottle('homework_bottom_action_bar_annotations', () { @@ -211,7 +211,7 @@ class _BottomAnnotationSwitchJobState extends State with height: double.infinity, child: TextButton( onPressed: () => easyThrottle('homework_bottom_operation_bar_scoring_related', () => _homeworkLogic.submit(context)), - child: quickText('提 交', size: 14.sp, color: const Color.fromRGBO(76, 199, 147, 1)), + child: quickText('提 交', size: 14.sp, color: Theme.of(context).primaryColor), ), ), ), diff --git a/making_school_asignment_app/lib/page/home_page/children/homework_review/components/dropdown_switch_students_type.dart b/making_school_asignment_app/lib/page/home_page/children/homework_review/components/dropdown_switch_students_type.dart index f0fe943..6d0c40e 100644 --- a/making_school_asignment_app/lib/page/home_page/children/homework_review/components/dropdown_switch_students_type.dart +++ b/making_school_asignment_app/lib/page/home_page/children/homework_review/components/dropdown_switch_students_type.dart @@ -115,7 +115,7 @@ class _DropdownSwitchStudentsTypeState extends State Icon( const IconData(0xe63d, fontFamily: "AlibabaIcon"), size: 12.sp, - color: e.isPriority ? const Color.fromRGBO(76, 199, 147, 1) : const Color.fromRGBO(164, 164, 164, 1), + color: e.isPriority ? Theme.of(context).primaryColor : const Color.fromRGBO(164, 164, 164, 1), ), quickText('优先', size: 4.sp, color: Colors.white), ], @@ -142,7 +142,7 @@ class _DropdownSwitchStudentsTypeState extends State return Icon( const IconData(0xe63d, fontFamily: "AlibabaIcon"), size: 12.sp, - color: sateData.value?.priority ?? false ? const Color.fromRGBO(76, 199, 147, 1) : const Color.fromRGBO(164, 164, 164, 1), + color: sateData.value?.priority ?? false ? Theme.of(context).primaryColor : const Color.fromRGBO(164, 164, 164, 1), ); }), quickText('优先', size: 4.sp, color: Colors.white), diff --git a/making_school_asignment_app/lib/page/home_page/children/homework_review/components/question_paper_view.dart b/making_school_asignment_app/lib/page/home_page/children/homework_review/components/question_paper_view.dart index 2123b51..3a8959a 100644 --- a/making_school_asignment_app/lib/page/home_page/children/homework_review/components/question_paper_view.dart +++ b/making_school_asignment_app/lib/page/home_page/children/homework_review/components/question_paper_view.dart @@ -212,8 +212,7 @@ Widget $totalSubmitCountView( fontFamily: "AlibabaIcon"), size: 12.sp, color: e.isPriority - ? const Color.fromRGBO( - 76, 199, 147, 1) + ? Theme.of(context).primaryColor : const Color.fromRGBO( 164, 164, 164, 1), ), @@ -244,7 +243,7 @@ Widget $totalSubmitCountView( color: const Color.fromRGBO(117, 117, 117, 1), size: 10.sp), ), quickText(data.annotatedCount, - color: const Color.fromRGBO(76, 199, 147, 1), + color: Theme.of(context).primaryColor, size: 12.sp, fontWeight: FontWeight.bold), quickText('/', @@ -390,7 +389,7 @@ Widget $scoringQuestionsView( child: Icon( size: 22.sp, color: studentScore.value == 2 - ? const Color.fromRGBO(255, 152, 0, 1) + ? const Color(0xFF54971F) : const Color.fromRGBO(114, 114, 114, 1), const IconData(0xe62b, fontFamily: "AlibabaIcon"), ), @@ -416,7 +415,7 @@ Widget $scoringQuestionsView( child: Icon( size: 22.sp, color: studentScore.value == 1 - ? const Color.fromRGBO(255, 152, 0, 1) + ? const Color(0xFF54971F) : const Color.fromRGBO(114, 114, 114, 1), const IconData(0xe62c, fontFamily: "AlibabaIcon"), ), @@ -442,7 +441,7 @@ Widget $scoringQuestionsView( child: Icon( size: 22.sp, color: studentScore.value == 0 - ? const Color.fromRGBO(255, 152, 0, 1) + ? const Color(0xFF54971F) : const Color.fromRGBO(114, 114, 114, 1), const IconData(0xe62a, fontFamily: "AlibabaIcon"), ), @@ -472,7 +471,7 @@ Widget $scoringQuestionsView( percent: item.correctRate / 100, barRadius: Radius.circular(1.2.r), alignment: MainAxisAlignment.center, - progressColor: const Color.fromRGBO(76, 199, 147, 0.6), + progressColor: Theme.of(context).primaryColor, backgroundColor: const Color(0xFFB8C7CB).withOpacity(0.35), center: quickText("${item.correctRate}%", size: 5.sp, diff --git a/making_school_asignment_app/lib/page/home_page/children/my_info.dart b/making_school_asignment_app/lib/page/home_page/children/my_info.dart index 01fbeb5..3309e06 100644 --- a/making_school_asignment_app/lib/page/home_page/children/my_info.dart +++ b/making_school_asignment_app/lib/page/home_page/children/my_info.dart @@ -83,7 +83,7 @@ class _MyInfoState extends State with AutomaticKeepAliveClientMixin { width: double.infinity, decoration: const BoxDecoration( image: DecorationImage( - image: AssetImage('assets/images/personal_bgi.png'), + image: AssetImage('assets/images/personal_bg.png'), fit: BoxFit.cover, ), ), @@ -99,56 +99,52 @@ class _MyInfoState extends State with AutomaticKeepAliveClientMixin { child: Scaffold( backgroundColor: Colors.transparent, body: Column( + crossAxisAlignment: CrossAxisAlignment.start, children: [ - Stack( - alignment: const FractionalOffset(0.04, 0.1), - children: [ - Container( - height: 180.h, - alignment: Alignment.center, - child: Column( - mainAxisAlignment: MainAxisAlignment.center, - children: [ - SizedBox( - height: 10.r, - ), - Image.asset( - 'assets/images/default_user_dead.png', - ), - SizedBox( - height: 10.r, - ), - InkWell( - onTap: () { - /*if (tokenState == '' || userState.id == '') { + Container( + height: 150.h, + padding: EdgeInsets.only(left: 20.r,right: 20.r), + // alignment: Alignment.center, + child: Row( + mainAxisAlignment: MainAxisAlignment.start, + children: [ + Image.asset( + 'assets/images/default_user_dead.png', + ), + SizedBox( + width: 5.w, + ), + InkWell( + onTap: () { + /*if (tokenState == '' || userState.id == '') { toLoginPage(context); }*/ - }, - child: Container( - margin: EdgeInsets.only(top: 0.h), - child: Text( - userInfo.value?.name ?? '请前往登录', - style: TextStyle( - fontSize: 13.sp, color: Colors.white), - ), - ), + }, + child: Container( + margin: EdgeInsets.only(top: 0.h), + child: Text( + userInfo.value?.name ?? '请前往登录', + style: TextStyle( + fontSize: 16.sp, color: const Color(0xFF332A2A),fontWeight: FontWeight.w500), ), - ], + ), ), - ), - /* InkWell( - onTap: () => Get.back(), - child: Icon(Icons.arrow_back_ios_new_rounded, color: Colors.white, size: 24.sp), - ),*/ - ], + const Spacer(), + InkWell( + onTap: (){ + _showAlertDialog(context); + }, + child: Image.asset('assets/images/out_icon.png'), + ) + ], + ), ), SizedBox(height: 14.h), Container( - margin: - EdgeInsets.symmetric(vertical: 22.h, horizontal: 16.w), + margin: EdgeInsets.symmetric(vertical: 5.h, horizontal: 16.w), padding: - EdgeInsets.symmetric(vertical: 22.h, horizontal: 16.w), - height: 180.h, + EdgeInsets.symmetric(vertical: 15.h, horizontal: 16.w), + alignment: Alignment.center, decoration: BoxDecoration( borderRadius: BorderRadius.all(Radius.circular(6.w)), color: Colors.white, @@ -161,143 +157,77 @@ class _MyInfoState extends State with AutomaticKeepAliveClientMixin { ) ], ), - child: Column( + child: Row( mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [ - Row( - mainAxisAlignment: MainAxisAlignment.spaceBetween, - children: [ - Text('账号', style: personalInfoTitleStly), - Text(userInfo.value?.name ?? '请前往登录', - style: personalInfoValStly) - ], - ), - Container( - height: 1.w, - color: const Color.fromRGBO(240, 243, 255, 1), - ), - Row( - mainAxisAlignment: MainAxisAlignment.spaceBetween, - children: [ - Text('所在学校', style: personalInfoTitleStly), - Text(userInfo.value?.schoolName ?? '', - style: personalInfoValStly) - ], - ), - /* Row( - mainAxisAlignment: MainAxisAlignment.spaceBetween, - children: [ - Text('担任职位', style: personalInfoTitleStly), - SizedBox(width: 20.w), - Expanded( - child: Text( - userInfo.value?.gender??'', - maxLines: 2, - textAlign: TextAlign.right, - overflow: TextOverflow.ellipsis, - style: personalInfoValStly, - ), - ) - ], - ), - Container(height: 1.w, color: const Color.fromRGBO(240, 243, 255, 1)), - Row( - mainAxisAlignment: MainAxisAlignment.spaceBetween, - children: [ - Text('所授科目', style: personalInfoTitleStly), - Expanded( - child: Text( - userState.subjectIds.map((e) => getSubjectEnumName(e)).toList().join(','), - maxLines: 2, - textAlign: TextAlign.right, - overflow: TextOverflow.ellipsis, - style: personalInfoValStly, - ), - ) - ], - ),*/ - Container( - height: 1.w, - color: const Color.fromRGBO(240, 243, 255, 1)), - Padding( - padding: EdgeInsets.only(top: 10.h), - child: InkWell( - onTap: () { - Get.toNamed(Routes.otherPage); - }, - child: Row( - mainAxisAlignment: MainAxisAlignment.spaceBetween, - children: [ - Text('其他', style: personalInfoTitleStly), - Icon( - Icons.arrow_forward_ios, - color: const Color.fromRGBO(80, 87, 103, 1), - size: 13.sp, - ) - ], - ), - ), + Text('账号', style: personalInfoTitleStly), + Text(userInfo.value?.name ?? '请前往登录', + style: personalInfoValStly) + ], + ), + ), + Container( + margin: EdgeInsets.symmetric(vertical: 5.h, horizontal: 16.w), + padding: + EdgeInsets.symmetric(vertical: 15.h, horizontal: 16.w), + alignment: Alignment.center, + decoration: BoxDecoration( + borderRadius: BorderRadius.all(Radius.circular(6.w)), + color: Colors.white, + boxShadow: const [ + BoxShadow( + color: Color.fromRGBO(46, 91, 255, 0.1), + offset: Offset.zero, //阴影y轴偏移量 + blurRadius: 20, //阴影模糊程度 + spreadRadius: 10, //阴影扩散程度 ) ], ), - ), - Expanded( - child: Column( + child:Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [ - const Expanded(child: SizedBox()), - Container( - margin: EdgeInsets.only(bottom: 40.h), - alignment: Alignment.bottomCenter, - child: InkWell( - child: Container( - padding: EdgeInsets.symmetric(vertical: 14.h), - margin: EdgeInsets.only(right: 16.w, left: 16.w), - decoration: BoxDecoration( - borderRadius: BorderRadius.all( - Radius.circular(6.w), - ), - color: Colors.white, - boxShadow: [ - BoxShadow( - color: - const Color.fromRGBO(46, 91, 255, 0.2), - offset: Offset(2.w, 2.h), //阴影y轴偏移量 - blurRadius: 14, //阴影模糊程度 - spreadRadius: 0.5, //阴影扩散程度 - ) - ], - ), - child: Row( - crossAxisAlignment: CrossAxisAlignment.center, - mainAxisAlignment: MainAxisAlignment.center, - children: [ - Icon( - Icons.exit_to_app_outlined, - size: 13.sp, - color: - const Color.fromRGBO(148, 163, 182, 1), - ), - Container( - width: 6.w, - ), - Text( - '退出登录', - style: TextStyle( - color: const Color.fromRGBO( - 148, 163, 182, 1), - fontSize: 13.sp), - ), - ], - ), - ), - onTap: () { - _showAlertDialog(context); - }, - ), - ), + Text('所在学校', style: personalInfoTitleStly), + Text(userInfo.value?.schoolName ?? '', + style: personalInfoValStly) ], ), ), + Container( + margin: EdgeInsets.symmetric(vertical: 5.h, horizontal: 16.w), + padding: + EdgeInsets.symmetric(vertical: 15.h, horizontal: 16.w), + alignment: Alignment.center, + decoration: BoxDecoration( + borderRadius: BorderRadius.all(Radius.circular(6.w)), + color: Colors.white, + boxShadow: const [ + BoxShadow( + color: Color.fromRGBO(46, 91, 255, 0.1), + offset: Offset.zero, //阴影y轴偏移量 + blurRadius: 20, //阴影模糊程度 + spreadRadius: 10, //阴影扩散程度 + ) + ], + ), + child:InkWell( + onTap: () { + Get.toNamed(Routes.otherPage); + }, + child: Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + Text('其他', style: personalInfoTitleStly), + Icon( + Icons.arrow_forward_ios, + color: const Color.fromRGBO(80, 87, 103, 1), + size: 13.sp, + ) + ], + ), + ), + ), + + ], ), ), diff --git a/making_school_asignment_app/lib/page/home_page/children/read_over/widget/top_user_info.dart b/making_school_asignment_app/lib/page/home_page/children/read_over/widget/top_user_info.dart index 7061bb6..16e188c 100644 --- a/making_school_asignment_app/lib/page/home_page/children/read_over/widget/top_user_info.dart +++ b/making_school_asignment_app/lib/page/home_page/children/read_over/widget/top_user_info.dart @@ -34,7 +34,7 @@ class TopUserInfo extends StatelessWidget { alignment: Alignment.center, color: const Color.fromRGBO(163, 211, 255, 1), padding: EdgeInsets.all(1.r), - child: Image.asset('assets/images/login_logo.png', width: 32.w, height: 32.w), + child: Image.asset('assets/images/login_logo_icon.png', width: 32.w, height: 32.w), ), ), Container( diff --git a/making_school_asignment_app/lib/page/home_page/widget/top_user_info.dart b/making_school_asignment_app/lib/page/home_page/widget/top_user_info.dart index 7061bb6..16e188c 100644 --- a/making_school_asignment_app/lib/page/home_page/widget/top_user_info.dart +++ b/making_school_asignment_app/lib/page/home_page/widget/top_user_info.dart @@ -34,7 +34,7 @@ class TopUserInfo extends StatelessWidget { alignment: Alignment.center, color: const Color.fromRGBO(163, 211, 255, 1), padding: EdgeInsets.all(1.r), - child: Image.asset('assets/images/login_logo.png', width: 32.w, height: 32.w), + child: Image.asset('assets/images/login_logo_icon.png', width: 32.w, height: 32.w), ), ), Container( diff --git a/making_school_asignment_app/lib/page/login_page/children/register.dart b/making_school_asignment_app/lib/page/login_page/children/register.dart index a8ea5d4..f88454b 100644 --- a/making_school_asignment_app/lib/page/login_page/children/register.dart +++ b/making_school_asignment_app/lib/page/login_page/children/register.dart @@ -123,7 +123,7 @@ class _RegisterState extends State with RequestToolMixin { child: SizedBox( height: 86.w, width: 86.w, - child: Image.asset('assets/images/login_logo.png', fit: BoxFit.cover), + child: Image.asset('assets/images/login_logo_icon.png', fit: BoxFit.cover), ), ), Container( diff --git a/making_school_asignment_app/lib/page/login_page/login_view.dart b/making_school_asignment_app/lib/page/login_page/login_view.dart index d708ec7..b97f160 100644 --- a/making_school_asignment_app/lib/page/login_page/login_view.dart +++ b/making_school_asignment_app/lib/page/login_page/login_view.dart @@ -75,7 +75,7 @@ class _LoginPageState extends State { child: SizedBox( height: 77.w, width: 77.w, - child: Image.asset('assets/images/login_logo.png', + child: Image.asset('assets/images/login_logo_icon.png', fit: BoxFit.cover), ), ),