diff --git a/making_school_asignment_app/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/making_school_asignment_app/android/app/src/main/res/mipmap-hdpi/ic_launcher.png index 54f18fa..d4c7c6e 100644 Binary files a/making_school_asignment_app/android/app/src/main/res/mipmap-hdpi/ic_launcher.png and b/making_school_asignment_app/android/app/src/main/res/mipmap-hdpi/ic_launcher.png differ diff --git a/making_school_asignment_app/android/app/src/main/res/mipmap-hdpi/launch_image.png b/making_school_asignment_app/android/app/src/main/res/mipmap-hdpi/launch_image.png index 9dcfb75..63e4839 100644 Binary files a/making_school_asignment_app/android/app/src/main/res/mipmap-hdpi/launch_image.png and b/making_school_asignment_app/android/app/src/main/res/mipmap-hdpi/launch_image.png differ diff --git a/making_school_asignment_app/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/making_school_asignment_app/android/app/src/main/res/mipmap-mdpi/ic_launcher.png index bb112aa..e3b4759 100644 Binary files a/making_school_asignment_app/android/app/src/main/res/mipmap-mdpi/ic_launcher.png and b/making_school_asignment_app/android/app/src/main/res/mipmap-mdpi/ic_launcher.png differ diff --git a/making_school_asignment_app/android/app/src/main/res/mipmap-mdpi/launch_image.png b/making_school_asignment_app/android/app/src/main/res/mipmap-mdpi/launch_image.png index 9dcfb75..63e4839 100644 Binary files a/making_school_asignment_app/android/app/src/main/res/mipmap-mdpi/launch_image.png and b/making_school_asignment_app/android/app/src/main/res/mipmap-mdpi/launch_image.png differ diff --git a/making_school_asignment_app/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/making_school_asignment_app/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png index c32bcd5..bdb7212 100644 Binary files a/making_school_asignment_app/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png and b/making_school_asignment_app/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/making_school_asignment_app/android/app/src/main/res/mipmap-xhdpi/launch_image.png b/making_school_asignment_app/android/app/src/main/res/mipmap-xhdpi/launch_image.png index 9dcfb75..63e4839 100644 Binary files a/making_school_asignment_app/android/app/src/main/res/mipmap-xhdpi/launch_image.png and b/making_school_asignment_app/android/app/src/main/res/mipmap-xhdpi/launch_image.png differ diff --git a/making_school_asignment_app/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/making_school_asignment_app/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png index 863f4ef..87c6147 100644 Binary files a/making_school_asignment_app/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png and b/making_school_asignment_app/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/making_school_asignment_app/android/app/src/main/res/mipmap-xxhdpi/launch_image.png b/making_school_asignment_app/android/app/src/main/res/mipmap-xxhdpi/launch_image.png index 9dcfb75..63e4839 100644 Binary files a/making_school_asignment_app/android/app/src/main/res/mipmap-xxhdpi/launch_image.png and b/making_school_asignment_app/android/app/src/main/res/mipmap-xxhdpi/launch_image.png differ diff --git a/making_school_asignment_app/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/making_school_asignment_app/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png index 8931590..4764358 100644 Binary files a/making_school_asignment_app/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png and b/making_school_asignment_app/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/making_school_asignment_app/android/app/src/main/res/mipmap-xxxhdpi/launch_image.png b/making_school_asignment_app/android/app/src/main/res/mipmap-xxxhdpi/launch_image.png index 9dcfb75..63e4839 100644 Binary files a/making_school_asignment_app/android/app/src/main/res/mipmap-xxxhdpi/launch_image.png and b/making_school_asignment_app/android/app/src/main/res/mipmap-xxxhdpi/launch_image.png differ diff --git a/making_school_asignment_app/lib/page/home_page/children/annotate_class/annotate_class_view.dart b/making_school_asignment_app/lib/page/home_page/children/annotate_class/annotate_class_view.dart index 90c44df..638eb68 100644 --- a/making_school_asignment_app/lib/page/home_page/children/annotate_class/annotate_class_view.dart +++ b/making_school_asignment_app/lib/page/home_page/children/annotate_class/annotate_class_view.dart @@ -1,4 +1,5 @@ import 'package:flutter/material.dart'; +import 'package:flutter/services.dart'; import 'package:flutter_easyrefresh/easy_refresh.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:flutter_staggered_grid_view/flutter_staggered_grid_view.dart'; @@ -24,101 +25,111 @@ class _AnnotateClassPageState extends State { @override Widget build(BuildContext context) { String homeworkId = state.homeworkId.value; - return OrientationBuilder( - builder: (BuildContext context, Orientation orientation) { - return Scaffold( - backgroundColor: const Color.fromRGBO(245, 245, 245, 1), - appBar: AppBar( - backgroundColor: Colors.white, - title: Obx(() { - return Text(state.name.value, - style: - TextStyle(fontSize: 14.sp, color: const Color(0xFF333333))); - }), - centerTitle: true, - leading: IconButton( - icon: const Icon(Icons.arrow_back_ios, color: Colors.black), - onPressed: () { - Get.back(); - }, + return AnnotatedRegion( + value: const SystemUiOverlayStyle( + systemNavigationBarColor:Colors.transparent, + systemNavigationBarDividerColor: null, + statusBarColor: Colors.transparent, + systemNavigationBarIconBrightness: Brightness.light, + statusBarIconBrightness: Brightness.light, + statusBarBrightness: Brightness.light, + ), + child: OrientationBuilder( + builder: (BuildContext context, Orientation orientation) { + return Scaffold( + backgroundColor: const Color.fromRGBO(245, 245, 245, 1), + appBar: AppBar( + backgroundColor: Colors.white, + title: Obx(() { + return Text(state.name.value, + style: + TextStyle(fontSize: 14.sp, color: const Color(0xFF333333))); + }), + centerTitle: true, + leading: IconButton( + icon: const Icon(Icons.arrow_back_ios, color: Colors.black), + onPressed: () { + Get.back(); + }, + ), + actions: const [ + ReturnToHomepage(), + ], ), - actions: const [ - ReturnToHomepage(), - ], - ), - body: Padding( - padding: EdgeInsets.symmetric(vertical: 14.r, horizontal: 14.r), - child: Obx(() { - return EasyRefresh( - firstRefresh: false, - taskIndependence: true, - controller: logic.refreshController, - header: MaterialHeader(), - footer: TaurusFooter(), - onRefresh: () async { - return logic.getList(); - }, - child: state.completed.value - ? Utils.isPad() - ? GridView( - gridDelegate: - SliverGridDelegateWithFixedCrossAxisCount( - crossAxisCount: 2, //横轴三个子widget - mainAxisSpacing: 10.h, - crossAxisSpacing: 6.w, - childAspectRatio: 1.48 //宽高比为1时，子widget - ), - children: state.classList.map((taskItem) { - return CompletedAnnotateItem( - taskItem: taskItem, - logic: logic, - name: state.name.value, - ); - }).toList(), - ) - : ListView.builder( - itemCount: state.classList.length, - itemBuilder: (context, index) { - AnnotatedClass taskItem = state.classList[index]; - return CompletedAnnotateItem( - taskItem: taskItem, - logic: logic, - name: state.name.value, - ); - }) - : Utils.isPad() - ? MasonryGridView.count( - crossAxisCount: 2, //几列 - mainAxisSpacing: 4.w, // 间距 - crossAxisSpacing: 4.h, // 纵向间距？ - itemCount: state.classList.length, - itemBuilder: (context, index) { - AnnotatedClass item = state.classList[index]; - return AnnotateItem( - homeworkId: homeworkId, - item: item, - font: 11.sp, - name: state.name.value, - logic: logic, - ); - }, - ) - : ListView.builder( - itemCount: state.classList.length, - itemBuilder: (context, index) { - AnnotatedClass item = state.classList[index]; - return AnnotateItem( - homeworkId: homeworkId, - item: item, - font: 12.sp, - name: state.name.value, - logic: logic, - ); - })); - }), - ), - ); - }); + body: Padding( + padding: EdgeInsets.symmetric(vertical: 14.r, horizontal: 14.r), + child: Obx(() { + return EasyRefresh( + firstRefresh: false, + taskIndependence: true, + controller: logic.refreshController, + header: MaterialHeader(), + footer: TaurusFooter(), + onRefresh: () async { + return logic.getList(); + }, + child: state.completed.value + ? Utils.isPad() + ? GridView( + gridDelegate: + SliverGridDelegateWithFixedCrossAxisCount( + crossAxisCount: 2, //横轴三个子widget + mainAxisSpacing: 10.h, + crossAxisSpacing: 6.w, + childAspectRatio: 1.48 //宽高比为1时，子widget + ), + children: state.classList.map((taskItem) { + return CompletedAnnotateItem( + taskItem: taskItem, + logic: logic, + name: state.name.value, + ); + }).toList(), + ) + : ListView.builder( + itemCount: state.classList.length, + itemBuilder: (context, index) { + AnnotatedClass taskItem = state.classList[index]; + return CompletedAnnotateItem( + taskItem: taskItem, + logic: logic, + name: state.name.value, + ); + }) + : Utils.isPad() + ? MasonryGridView.count( + crossAxisCount: 2, //几列 + mainAxisSpacing: 4.w, // 间距 + crossAxisSpacing: 4.h, // 纵向间距？ + itemCount: state.classList.length, + itemBuilder: (context, index) { + AnnotatedClass item = state.classList[index]; + return AnnotateItem( + homeworkId: homeworkId, + item: item, + font: 11.sp, + name: state.name.value, + logic: logic, + ); + }, + ) + : ListView.builder( + itemCount: state.classList.length, + itemBuilder: (context, index) { + AnnotatedClass item = state.classList[index]; + return AnnotateItem( + homeworkId: homeworkId, + item: item, + font: 12.sp, + name: state.name.value, + logic: logic, + ); + })); + }), + ), + ); + }), + ); } @override 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 6622669..bac3e54 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 @@ -71,35 +71,6 @@ class _BottomAnnotationSwitchJobState extends State with // padding: EdgeInsets.symmetric(vertical: 1.h), child: Row( children: [ - Expanded( - flex: 3, - child: Row( - children: [ - Expanded( - child: SizedBox( - width: double.infinity, - height: double.infinity, - child: TextButton( - onPressed: () => easyThrottle('homework_bottom_operation_bar_scoring_related', () => _homeworkLogic.submit(context)), - child: quickText('提 交', size: 14.sp, color: Theme.of(context).primaryColor), - ), - ), - ), - Container(width: 0.3.w, height: double.infinity, color: Colors.white), - Expanded( - child: SizedBox( - width: double.infinity, - height: double.infinity, - child: TextButton( - onPressed: () => easyThrottle('homework_bottom_operation_bar_scoring_related', () => _homeworkLogic.cancelAllRatings()), - child: quickText('取 消', size: 14.sp, color: Colors.white), - ), - ), - ), - ], - ), - ), - Container(width: 0.3.w, height: double.infinity, color: Colors.white), Expanded( flex: 7, child: Column( @@ -218,6 +189,36 @@ class _BottomAnnotationSwitchJobState extends State with ], ), ), + Container(width: 0.3.w, height: double.infinity, color: Colors.white), + Expanded( + flex: 3, + child: Row( + children: [ + Expanded( + child: SizedBox( + width: double.infinity, + height: double.infinity, + child: TextButton( + onPressed: () => easyThrottle('homework_bottom_operation_bar_scoring_related', () => _homeworkLogic.submit(context)), + child: quickText('提 交', size: 14.sp, color: Theme.of(context).primaryColor), + ), + ), + ), + Container(width: 0.3.w, height: double.infinity, color: Colors.white), + Expanded( + child: SizedBox( + width: double.infinity, + height: double.infinity, + child: TextButton( + onPressed: () => easyThrottle('homework_bottom_operation_bar_scoring_related', () => _homeworkLogic.cancelAllRatings()), + child: quickText('取 消', size: 14.sp, color: Colors.white), + ), + ), + ), + ], + ), + ), + ], ), ); diff --git a/making_school_asignment_app/lib/page/home_page/children/homework_review/index.dart b/making_school_asignment_app/lib/page/home_page/children/homework_review/index.dart index a2dd411..a43bd33 100644 --- a/making_school_asignment_app/lib/page/home_page/children/homework_review/index.dart +++ b/making_school_asignment_app/lib/page/home_page/children/homework_review/index.dart @@ -1,4 +1,5 @@ import 'package:flutter/material.dart'; +import 'package:flutter/services.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:get/get.dart'; import 'package:making_school_asignment_app/page/global_widget/ReturnToHomepage.dart'; @@ -47,30 +48,40 @@ class _HomeworkReviewState extends State { _homeLogicController.getList(); } }, - child: SafeArea( - child: Scaffold( - appBar: AppBar( - // titleSpacing: 0, - leading: IconButton(icon: const Icon(Icons.arrow_back_ios), onPressed: () => Get.back()), - iconTheme: const IconThemeData(color: Colors.black), - title: quickText(sateData.param.value.homeworkName), - backgroundColor: Colors.white, - elevation: 0, - actions: [const FavoriteWidget(), SizedBox(width: 5.w), const ReturnToHomepage()], - ), - body: SafeArea( - child: Column( - children: [ - // 下拉切换 - const DropdownSwitchStudentsType(), - SizedBox(height: 1.h), - const Expanded(child: QuestionPaperView()), - const BottomAnnotationSwitch() - ], + child: AnnotatedRegion( + value: const SystemUiOverlayStyle( + systemNavigationBarColor: Color(0xFF000000), + systemNavigationBarDividerColor: null, + statusBarColor: Colors.transparent, + systemNavigationBarIconBrightness: Brightness.light, + statusBarIconBrightness: Brightness.light, + statusBarBrightness: Brightness.light, + ), + child: SafeArea( + child: Scaffold( + appBar: AppBar( + // titleSpacing: 0, + leading: IconButton(icon: const Icon(Icons.arrow_back_ios), onPressed: () => Get.back()), + iconTheme: const IconThemeData(color: Colors.black), + title: quickText(sateData.param.value.homeworkName), + backgroundColor: Colors.white, + elevation: 0, + actions: [const FavoriteWidget(), SizedBox(width: 5.w), const ReturnToHomepage()], ), + body: SafeArea( + child: Column( + children: [ + // 下拉切换 + const DropdownSwitchStudentsType(), + SizedBox(height: 1.h), + const Expanded(child: QuestionPaperView()), + const BottomAnnotationSwitch() + ], + ), + ), + // floatingActionButton: const ButtonFloatingAction(), + // floatingActionButtonLocation: FloatingActionButtonLocation.startFloat, ), - // floatingActionButton: const ButtonFloatingAction(), - // floatingActionButtonLocation: FloatingActionButtonLocation.startFloat, ), ), ); 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 1f4895e..918e0f2 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 @@ -24,7 +24,7 @@ class _MyInfoState extends State with AutomaticKeepAliveClientMixin { SystemChrome.setSystemUIOverlayStyle(const SystemUiOverlayStyle( statusBarIconBrightness: Brightness.light, statusBarColor: Colors.transparent, //状态栏背景颜色 - systemStatusBarContrastEnforced: false, + // systemStatusBarContrastEnforced: false, )); super.initState(); } diff --git a/making_school_asignment_app/lib/page/home_page/children/read_over/read_over_view.dart b/making_school_asignment_app/lib/page/home_page/children/read_over/read_over_view.dart index 0b9a202..88396c5 100644 --- a/making_school_asignment_app/lib/page/home_page/children/read_over/read_over_view.dart +++ b/making_school_asignment_app/lib/page/home_page/children/read_over/read_over_view.dart @@ -21,11 +21,6 @@ class _ReadOverPageState extends State { @override void initState() { - SystemChrome.setSystemUIOverlayStyle(const SystemUiOverlayStyle( - statusBarColor: Colors.transparent, //状态栏背景颜色 - statusBarIconBrightness: Brightness.light, - systemStatusBarContrastEnforced: false, - )); super.initState(); } @@ -33,9 +28,9 @@ class _ReadOverPageState extends State { Widget build(BuildContext context) { return AnnotatedRegion( value: const SystemUiOverlayStyle( - systemNavigationBarColor: Color(0xFF000000), - systemNavigationBarDividerColor: null, - statusBarColor: Colors.white, + /* systemNavigationBarColor: Color(0xFF000000), + systemNavigationBarDividerColor: null,*/ + statusBarColor: Colors.transparent, systemNavigationBarIconBrightness: Brightness.light, statusBarIconBrightness: Brightness.light, statusBarBrightness: Brightness.light,