marking
/
Making.School.Asignment.app
19
1
Fork 0
Code Pull Requests Actions Releases Activity

Compare commits

base: marking:a61f52e25f40e9e1e678f1c88bc5da62bd8e33a5
Branches Tags
marking:master
marking:glassy_state
marking:the_windows
marking:mcy_new
marking:zoom_pic
..
compare: marking:07d0b999bc6f5fd786389455dcde054747bb5978
Branches Tags
marking:master
marking:glassy_state
marking:the_windows
marking:mcy_new
marking:zoom_pic

No commits in common. "a61f52e25f40e9e1e678f1c88bc5da62bd8e33a5" and "07d0b999bc6f5fd786389455dcde054747bb5978" have entirely different histories.
a61f52e25f ... 07d0b999bc

15 changed files with 180 additions and 199 deletions
Show Stats Expand all files Collapse all files

BIN
making_school_asignment_app/android/app/src/main/res/mipmap-hdpi/ic_launcher.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.2 KiB

After

Width:  |  Height:  |  Size: 3.3 KiB

BIN
making_school_asignment_app/android/app/src/main/res/mipmap-hdpi/launch_image.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 341 KiB

After

Width:  |  Height:  |  Size: 305 KiB

BIN
making_school_asignment_app/android/app/src/main/res/mipmap-mdpi/ic_launcher.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 2.4 KiB

BIN
making_school_asignment_app/android/app/src/main/res/mipmap-mdpi/launch_image.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 341 KiB

After

Width:  |  Height:  |  Size: 305 KiB

BIN
making_school_asignment_app/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.1 KiB

After

Width:  |  Height:  |  Size: 6.1 KiB

BIN
making_school_asignment_app/android/app/src/main/res/mipmap-xhdpi/launch_image.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 341 KiB

After

Width:  |  Height:  |  Size: 305 KiB

BIN
making_school_asignment_app/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.9 KiB

After

Width:  |  Height:  |  Size: 12 KiB

BIN
making_school_asignment_app/android/app/src/main/res/mipmap-xxhdpi/launch_image.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 341 KiB

After

Width:  |  Height:  |  Size: 305 KiB

BIN
making_school_asignment_app/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 7.2 KiB

After

Width:  |  Height:  |  Size: 20 KiB

BIN
making_school_asignment_app/android/app/src/main/res/mipmap-xxxhdpi/launch_image.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 341 KiB

After

Width:  |  Height:  |  Size: 305 KiB

15
making_school_asignment_app/lib/page/home_page/children/annotate_class/annotate_class_view.dart
View File

@ -1,5 +1,4 @@
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';
@ -25,16 +24,7 @@ class _AnnotateClassPageState extends State<AnnotateClassPage> {
@override
Widget build(BuildContext context) {
String homeworkId = state.homeworkId.value;
return AnnotatedRegion(
value: const SystemUiOverlayStyle(
systemNavigationBarColor:Colors.transparent,
systemNavigationBarDividerColor: null,
statusBarColor: Colors.transparent,
systemNavigationBarIconBrightness: Brightness.light,
statusBarIconBrightness: Brightness.light,
statusBarBrightness: Brightness.light,
),
child: OrientationBuilder(
return OrientationBuilder(
builder: (BuildContext context, Orientation orientation) {
return Scaffold(
backgroundColor: const Color.fromRGBO(245, 245, 245, 1),
@ -128,8 +118,7 @@ class _AnnotateClassPageState extends State<AnnotateClassPage> {
}),
),
);
}),
);
});
}
@override

98
making_school_asignment_app/lib/page/home_page/children/homework_review/components/bottom_operation_bar.dart
View File

@ -71,6 +71,35 @@ class _BottomAnnotationSwitchJobState extends State<BottomAnnotationSwitch> 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(
@ -79,18 +108,6 @@ class _BottomAnnotationSwitchJobState extends State<BottomAnnotationSwitch> with
Expanded(
child: Row(
children: [
// 全对按钮
Expanded(
child: SizedBox(
width: double.infinity,
height: double.infinity,
child: TextButton(
child: quickText('全 对', color: Colors.white, size: 12.sp),
onPressed: () => easyThrottle('homework_bottom_operation_bar_scoring_related', () => _homeworkLogic.allPairs(context)),
),
),
),
Container(width: 0.3.w, height: double.infinity, color: Colors.white),
// 注解笔
Expanded(
child: SizedBox(
@ -134,6 +151,18 @@ class _BottomAnnotationSwitchJobState extends State<BottomAnnotationSwitch> with
),
),
),
Container(width: 0.3.w, height: double.infinity, color: Colors.white),
// 全对按钮
Expanded(
child: SizedBox(
width: double.infinity,
height: double.infinity,
child: TextButton(
child: quickText('全 对', color: Colors.white, size: 12.sp),
onPressed: () => easyThrottle('homework_bottom_operation_bar_scoring_related', () => _homeworkLogic.allPairs(context)),
),
),
),
],
),
),
@ -141,19 +170,6 @@ class _BottomAnnotationSwitchJobState extends State<BottomAnnotationSwitch> with
Expanded(
child: Row(
children: [
// 全错按钮
Expanded(
child: SizedBox(
width: double.infinity,
height: double.infinity,
child: TextButton(
onPressed: () =>
easyThrottle('homework_bottom_operation_bar_scoring_related', () => _homeworkLogic.allWrongRating(context)),
child: quickText('全 错', color: Colors.white, size: 12.sp),
),
),
),
Container(width: 0.3.w, height: double.infinity, color: Colors.white),
// 撤销上一步
Expanded(
child: SizedBox(
@ -183,43 +199,25 @@ class _BottomAnnotationSwitchJobState extends State<BottomAnnotationSwitch> 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.cancelAllRatings()),
child: quickText('取 消', size: 14.sp, color: Colors.white),
),
),
),
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.submit(context)),
child: quickText('提 交', size: 14.sp, color: Theme.of(context).primaryColor),
onPressed: () =>
easyThrottle('homework_bottom_operation_bar_scoring_related', () => _homeworkLogic.allWrongRating(context)),
child: quickText('全 错', color: Colors.white, size: 12.sp),
),
),
),
],
),
),
],
),
),
],
),
);

11
making_school_asignment_app/lib/page/home_page/children/homework_review/index.dart
View File

@ -1,5 +1,4 @@
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';
@ -48,15 +47,6 @@ class _HomeworkReviewState extends State<HomeworkReview> {
_homeLogicController.getList();
}
},
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(
@ -83,7 +73,6 @@ class _HomeworkReviewState extends State<HomeworkReview> {
// floatingActionButtonLocation: FloatingActionButtonLocation.startFloat,
),
),
),
);
}
}

2
making_school_asignment_app/lib/page/home_page/children/my_info.dart
View File

@ -24,7 +24,7 @@ class _MyInfoState extends State<MyInfo> with AutomaticKeepAliveClientMixin {
SystemChrome.setSystemUIOverlayStyle(const SystemUiOverlayStyle(
statusBarIconBrightness: Brightness.light,
statusBarColor: Colors.transparent, //状态栏背景颜色
// systemStatusBarContrastEnforced: false,
systemStatusBarContrastEnforced: false,
));
super.initState();
}

11
making_school_asignment_app/lib/page/home_page/children/read_over/read_over_view.dart
View File

@ -21,6 +21,11 @@ class _ReadOverPageState extends State<ReadOverPage> {
@override
void initState() {
SystemChrome.setSystemUIOverlayStyle(const SystemUiOverlayStyle(
statusBarColor: Colors.transparent, //状态栏背景颜色
statusBarIconBrightness: Brightness.light,
systemStatusBarContrastEnforced: false,
));
super.initState();
}
@ -28,9 +33,9 @@ class _ReadOverPageState extends State<ReadOverPage> {
Widget build(BuildContext context) {
return AnnotatedRegion(
value: const SystemUiOverlayStyle(
/* systemNavigationBarColor: Color(0xFF000000),
systemNavigationBarDividerColor: null,*/
statusBarColor: Colors.transparent,
systemNavigationBarColor: Color(0xFF000000),
systemNavigationBarDividerColor: null,
statusBarColor: Colors.white,
systemNavigationBarIconBrightness: Brightness.light,
statusBarIconBrightness: Brightness.light,
statusBarBrightness: Brightness.light,